circlecloud/dayu
1
0
Fork 0
Code Releases Activity

feat: add more docker api

Browse Source
This commit is contained in:
MiaoWoo 2019-08-27 15:03:30 +08:00
parent f0810cc9d9
commit 3e480da539
20 changed files with 117 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
http/dayu.http
View File

@ -1,4 +1,4 @@
@url=https://dayu.n.yumc.pw
@url=https://dayu-api.miaowoo.cc
### System
##### Info
@ -25,11 +25,22 @@ POST {{swarm}}/init
@stack={{url}}/stack
##### Stack List
GET {{stack}}/list
##### Stack Info
GET {{stack}}/faas
##### Stack Remove
POST {{stack}}/develop/remove
### Service
@service={{url}}/service
##### Service List
GET {{service}}/list
##### Service Info
GET {{service}}/3gchxsmjld0fuex216w56jl5g
##### Service Remove
POST {{service}}/develop/remove
### Container
@container={{url}}/container

2
package.json
View File

@ -7,7 +7,7 @@
"license": "MIT",
"scripts": {
"clean": "npx lerna run clean",
"watch": "npx lerna run watch --concurrency 10",
"watch": "npx lerna run watch --parallel",
"build": "npx lerna run build",
"lp": "npx lerna publish"
},

3
packages/core/package.json
View File

@ -26,6 +26,7 @@
"devDependencies": {
"@types/express": "^4.17.0",
"@types/socket.io": "^2.1.2",
"nodemon": "^1.19.1",
"rimraf": "^2.6.3",
"ts-node-dev": "^1.0.0-pre.40",
"typescript": "^3.5.2"
@ -43,4 +44,4 @@
"delay": "1500",
"ext": "js,json"
}
}
}

19
packages/core/src/controller/service.ts Normal file
View File

@ -0,0 +1,19 @@
import { controller, httpGet, requestParam } from 'inversify-express-utils';
import * as docker from '@dayu/docker-api'
@controller('/service')
class ServiceController {
@httpGet('/list')
public async list() {
let services = await docker.service.list();
return services.map(s => ({
id: s.ID,
name: s.Spec.Name
}));
}
@httpGet('/:id')
public async details(@requestParam('id') id: string) {
return await docker.service.inspect(id)
}
}

17
packages/core/src/controller/stack.ts
View File

@ -6,18 +6,25 @@ const STACK_LABEL = 'com.docker.stack.namespace';
@controller('/stack')
class StackController {
@httpGet('/list')
public async list() {
public async list(): Promise<any> {
let stacks: { [key: string]: string[] } = {};
let result = [];
let services = await docker.service.list();
for (const service of services) {
let stackName = service.Spec.Labels[STACK_LABEL]
if (stackName) {
let stack = stacks[stackName] || [];
let stack = stacks[stackName];
if (!stack) {
result.push({
name: stackName,
services: stack = []
})
stacks[stackName] = stack;
}
stack.push(service.Spec.Name);
stacks[stackName] = stack;
}
}
return stacks;
return result;
}
@httpGet('/:stack')
@ -31,11 +38,9 @@ class StackController {
}
let services = await docker.service.list(filterOpt)
let networks = await docker.network.list(filterOpt)
let containers = await docker.container.list(filterOpt);
return {
services: services.map(service => service.Spec.Name),
networks: networks.map(network => network.Name),
containers: containers.map(container => container.Names[0].substring(1))
}
}
}

2
packages/core/src/index.ts
View File

@ -19,4 +19,4 @@ for (let file of list) {
}
}
server.static().build().start();
server.static().build().start(81);

11
packages/core/tsconfig.json
View File

@ -1,7 +1,14 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"baseUrl": "src",
"outDir": "dist"
"outDir": "dist",
"target": "es6",
"module": "commonjs",
"sourceMap": true,
"declaration": true,
"noImplicitAny": true,
"allowUnreachableCode": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true
}
}

2
packages/docker-api/package.json
View File

@ -17,7 +17,7 @@
"test": "echo \"Error: run tests from root\" && exit 1"
},
"dependencies": {
"@cc-server/core": "^0.3.3",
"@cc-server/core": "^0.6.1",
"axios": "^0.19.0"
},
"devDependencies": {

6
packages/docker-api/src/api/opts/node.ts Normal file
View File

@ -0,0 +1,6 @@
import * as common from './common'
export declare namespace node {
export interface ListOpts extends common.query.FilterOpt {
}
}

12
packages/docker-api/src/api/opts/swarm.ts
View File

@ -3,6 +3,18 @@ import { Labels } from '../common'
export declare namespace swarm {
type NodeAvailability = string;
export interface UnlockOpts {
UnlockKey: string;
}
export interface JoinOpts {
ListenAddr?: string;
AdvertiseAddr?: string;
DataPathAddr?: string;
RemoteAddrs?: string[];
JoinToken?: string;
}
export interface InitOpts {
ListenAddr?: string;
AdvertiseAddr?: string;

5
packages/docker-api/src/api/types/container.ts
View File

@ -297,4 +297,9 @@ export declare namespace container {
NetworkSettings: SummaryNetworkSettings;
Mounts: Mount[];
}
export interface ContainerPrune {
ContainersDeleted: string[];
SpaceReclaimed: number;
}
}

14
packages/docker-api/src/client/container.ts
View File

@ -8,16 +8,22 @@ export namespace container {
return await api.get<types.container.Container[]>('/containers/json', filters)
}
export async function info(id: string, query: { size: boolean } = { size: false }) {
export async function inspect(id: string, query: { size: boolean } = { size: false }) {
return await api.get<types.container.ContainerJSON>(`/containers/${id}/json`, query);
}
export function prune() {
return api.post<types.container.ContainerPrune>('/containers/prune');
}
export async function logs(id: string, opts: opts.container.LogsOpts = {}): Promise<http.ServerResponse> {
return await api.stream(`/containers/${id}/logs`, Object.assign({
let data = {
follow: true,
stdout: true,
stderr: true,
tail: 10
}, opts));
tail: 10,
...opts
}
return await api.stream(`/containers/${id}/logs`, data);
}
}

7
packages/docker-api/src/client/service.ts
View File

@ -7,6 +7,9 @@ export namespace service {
return await api.get<types.service.Service[]>('/services', filters);
}
export async function create() {
}
}
export async function inspect(id: string, query: { insertDefaults: boolean } = { insertDefaults: false }) {
return await api.get<any>(`/services/${id}`, query);
}
}

0
packages/docker-api/src/client/stack.ts Normal file
View File

16
packages/docker-api/src/client/swarm.ts
View File

@ -10,4 +10,20 @@ export namespace swarm {
export async function init(opts: opts.swarm.InitOpts) {
return await api.post<string>('/swarm/init', opts);
}
export async function join(opts: opts.swarm.JoinOpts) {
return await api.post<string>('/swarm/join', opts);
}
export async function leave(force: boolean = false) {
return await api.post<string>(`/swarm/leave?force=${force}`);
}
export async function unlockkey() {
return await api.get<string>(`/swarm/unlockkey`);
}
export async function unlock(opts: opts.swarm.UnlockOpts) {
return await api.post<string>(`/swarm/unlockkey`, opts);
}
}

6
packages/docker-api/src/utils/api.ts
View File

@ -23,9 +23,9 @@ async function handle<T>(method: Method, path: string, reqConfig?: AxiosRequestC
let config: AxiosRequestConfig = {
method,
url: path,
...reqConfig
};
let startTime = Date.now();
Object.assign(config, reqConfig)
let response: AxiosResponse;
try {
response = await api.request(config);
@ -57,10 +57,6 @@ RESPONSE BODY : ${toString.call(response.data.pipe) === "[object Function]" ?
HANDLE TIME : ${Date.now() - startTime}ms
=======================================`);
}
// console.log(`${method} ${path} HTTP/1.1
// ${config.data ? JSON.stringify(config.data, null, 2) + '\n' : ''}
// HTTP/1.1 ${response.status} ${response.statusText}
// ${config.responseType != 'stream' ? JSON.stringify(response.data, null, 2) : config.responseType}`);
}
}

3
packages/vscode/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@dayu/vscode",
"displayName": "vscode",
"description": "",
"description": "Dayu VsCode Plugin",
"publisher": "MiaoWoo",
"version": "0.0.1",
"engines": {
@ -56,6 +56,7 @@
}
},
"scripts": {
"package": "vsce package",
"vscode:prepublish": "yarn run compile",
"compile": "tsc -p ./",
"watch": "tsc -watch -p ./",

1
packages/vscode/src/extension.ts
View File

@ -7,6 +7,7 @@ import { OpenFaasProvider, DockerProvider } from './provider'
// this method is called when your extension is activated
// your extension is activated the very first time the command is executed
export function activate(context: vscode.ExtensionContext) {
console.log('init...')
new DockerProvider(context);
new OpenFaasProvider(context);
}

2
packages/vscode/src/provider/docker.ts
View File

@ -28,7 +28,7 @@ export class DockerProvider extends BaseProvider<vscode.TreeItem> {
context.subscriptions.push(
vscode.commands.registerCommand('dayu.container.logs', (item: vscode.TreeItem) => {
let value: ItemContextValue = JSON.parse(item.contextValue);
let url = `https://faas.n.yumc.pw?action=container&data=${value.data.id}`;
let url = `https://dayu-api.miaowoo.cc?action=container&data=${value.data.id}`;
return vscode.commands.executeCommand("mini-browser.openUrl", url);
}),
vscode.window.registerTreeDataProvider('docker-explorer', this)

2
packages/vscode/src/provider/faas.ts
View File

@ -35,7 +35,7 @@ export class OpenFaasProvider extends BaseProvider<vscode.TreeItem> {
switch (value.type) {
case Type.ROOT:
let funcs = await faas.getFunctions();
return funcs.map(f => {
return funcs.map((f: any) => {
return this.createTreeItem({
label: f.name,
tooltip: JSON.stringify(f, undefined, 2)