@wocker/ws 1.0.7 → 1.0.9

package/lib/services/AppConfigService.js

@@ -15,6 +15,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -22,24 +28,32 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppConfigService = void 0;
+const core_1 = require("@wocker/core");
 const Path = __importStar(require("path"));
 const env_1 = require("../env");
 const makes_1 = require("../makes");
-class AppConfigService {
+let AppConfigService = class AppConfigService extends core_1.AppConfigService {
     constructor() {
+        super();
         this.mapTypes = {
             image: "Image",
             dockerfile: "Dockerfile"
         };
         this.pwd = (process.cwd() || process.env.PWD);
     }
-    dataPath(...args) {
-        return Path.join(env_1.DATA_DIR, ...args);
+    dataPath(...parts) {
+        return Path.join(env_1.DATA_DIR, ...parts);
+    }
+    pluginsPath(...parts) {
+        return Path.join(env_1.PLUGINS_DIR, ...parts);
     }
-    pluginsPath(...args) {
-        return Path.join(env_1.PLUGINS_DIR, ...args);
+    presetPath(...parts) {
+        return Path.join(env_1.PRESETS_DIR, ...parts);
     }
     getPWD() {
         return this.pwd;
@@ -47,121 +61,37 @@ class AppConfigService {
     setPWD(pwd) {
         this.pwd = pwd;
     }
-    async getAppConfig() {
-        return makes_1.FS.readJSON(env_1.MAP_PATH);
-    }
-    async saveAppConfig(config) {
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, config);
-    }
-    async getMeta(name, defaultValue) {
-        const config = await this.getAppConfig();
-        const value = (config.meta || {})[name];
-        if (!value) {
-            return defaultValue;
-        }
-        return value;
-    }
-    async setMeta(name, value) {
-        const config = await this.getAppConfig();
-        if (!config.meta) {
-            config.meta = {};
-        }
-        config.meta[name] = value ? value.toString() : undefined;
-        await this.saveAppConfig(config);
-    }
-    async getAllEnvVariables() {
-        const { env = {} } = await makes_1.FS.readJSON(env_1.MAP_PATH);
-        return env;
-    }
-    async getEnvVariable(name, defaultValue) {
-        const { [name]: value = defaultValue } = await this.getAllEnvVariables();
-        if (value === null) {
-            return defaultValue;
-        }
-        return value;
-    }
-    async setEnv(env) {
-        const config = await makes_1.FS.readJSON(env_1.MAP_PATH);
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-            ...config,
-            env: {
-                ...config.env || {},
-                ...env
-            }
-        });
-    }
-    async setEnvVariable(name, value) {
-        const config = await makes_1.FS.readJSON(env_1.MAP_PATH);
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-            ...config,
-            env: {
-                ...config.env || {},
-                [name]: value
-            }
-        });
-    }
-    async unsetEnv(...keys) {
-        const config = await makes_1.FS.readJSON(env_1.MAP_PATH);
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-            ...config,
-            env: Object.keys(config.env || {}).reduce((res, key) => {
-                if (!keys.includes(key)) {
-                    res[key] = config.env[key];
-                }
-                return res;
-            }, {})
-        });
-    }
     getProjectTypes() {
         return this.mapTypes;
     }
     registerProjectType(name, title) {
         this.mapTypes[name] = title || name;
     }
-    async setProjectConfig(id, path) {
-        const { projects, ...rest } = await this.getAppConfig();
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-            ...rest,
-            projects: [
-                ...(projects || []).filter((project) => {
-                    return project.id !== id;
-                }).filter((project) => {
-                    return project.src !== path;
-                }),
-                {
-                    id: id,
-                    src: path
+    async loadConfig() {
+        const data = makes_1.FS.existsSync(env_1.MAP_PATH)
+            ? await makes_1.FS.readJSON(env_1.MAP_PATH)
+            : {};
+        return new class extends core_1.Config {
+            constructor(data) {
+                super(data);
+            }
+            addPlugin(plugin) {
+                if (!this.plugins) {
+                    this.plugins = [];
                 }
-            ]
-        });
-    }
-    async activatePlugin(name) {
-        const { default: Plugin } = await Promise.resolve(`${name}`).then(s => __importStar(require(s)));
-        if (!Plugin) {
-            throw new Error("No plugin");
-        }
-        const { plugins = [], ...rest } = await this.getAppConfig();
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-            plugins: [
-                ...plugins.filter((plugin) => {
-                    return plugin !== name;
-                }),
-                name
-            ],
-            ...rest
-        });
-    }
-    async deactivatePlugin(name) {
-        const { plugins = [], ...rest } = await this.getAppConfig();
-        if (!plugins.includes(name)) {
-            return;
-        }
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-            plugins: plugins.filter((plugin) => {
-                return plugin !== name;
-            }),
-            ...rest
-        });
+                if (this.plugins.includes(plugin)) {
+                    return;
+                }
+                this.plugins.push(plugin);
+            }
+            async save() {
+                await makes_1.FS.writeJSON(env_1.MAP_PATH, this.toJson());
+            }
+        }(data);
     }
-}
+};
 exports.AppConfigService = AppConfigService;
+exports.AppConfigService = AppConfigService = __decorate([
+    (0, core_1.Injectable)("APP_CONFIG"),
+    __metadata("design:paramtypes", [])
+], AppConfigService);

package/lib/services/AppEventsService.d.ts

@@ -1,5 +1,5 @@
 import { AppEventsService as CoreAppEventsService, AppEventHandle } from "@wocker/core";
-declare class AppEventsService extends CoreAppEventsService {
+export declare class AppEventsService extends CoreAppEventsService {
     protected handles: ({
         [event: string]: AppEventHandle[];
     });
@@ -7,4 +7,3 @@ declare class AppEventsService extends CoreAppEventsService {
     off(event: string, handle: AppEventHandle): void;
     emit(event: string, ...args: any[]): Promise<void>;
 }
-export { AppEventsService };

package/lib/services/AppEventsService.js

@@ -1,8 +1,14 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppEventsService = void 0;
 const core_1 = require("@wocker/core");
-class AppEventsService extends core_1.AppEventsService {
+let AppEventsService = class AppEventsService extends core_1.AppEventsService {
     constructor() {
         super(...arguments);
         this.handles = {};
@@ -26,5 +32,8 @@ class AppEventsService extends core_1.AppEventsService {
             await handles[i](...args);
         }
     }
-}
+};
 exports.AppEventsService = AppEventsService;
+exports.AppEventsService = AppEventsService = __decorate([
+    (0, core_1.Injectable)("APP_EVENTS_SERVICE")
+], AppEventsService);

package/lib/services/DockerService.d.ts

@@ -1,51 +1,21 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import Docker, { Container } from "dockerode";
-import { DI } from "../makes";
-declare namespace Params {
-    type CreateContainer = {
-        name: string;
-        image: string;
-        restart?: "always";
-        projectId?: string;
-        tty?: boolean;
-        ulimits?: {
-            [key: string]: {
-                hard?: number;
-                soft?: number;
-            };
-        };
-        links?: string[];
-        env?: {
-            [key: string]: string;
-        };
-        networkMode?: string;
-        extraHosts?: any;
-        volumes?: string[];
-        ports?: string[];
-        cmd?: string[];
-    };
-    type BuildImage = {
-        tag: string;
-        buildArgs?: {
-            [key: string]: string;
-        };
-        labels?: {
-            [key: string]: string;
-        };
-        context: string;
-        src: string;
-    };
-}
-declare class DockerService {
+import { DockerServiceParams as Params } from "@wocker/core";
+import { LogService } from "./LogService";
+export declare class DockerService {
+    protected readonly logService: LogService;
     protected docker: Docker;
-    constructor(di: DI);
+    constructor(logService: LogService);
     createContainer(params: Params.CreateContainer): Promise<Container>;
     getContainer(name: string): Promise<Container | null>;
     removeContainer(name: string): Promise<void>;
     buildImage(params: Params.BuildImage): Promise<void>;
     imageExists(tag: string): Promise<boolean>;
     imageRm(tag: string): Promise<void>;
+    imageLs(options?: Params.ImageList): Promise<Docker.ImageInfo[]>;
     pullImage(tag: string): Promise<void>;
+    attach(name: string): Promise<void>;
     attachStream(stream: NodeJS.ReadWriteStream): Promise<void>;
+    exec(name: string, args?: string[], tty?: boolean): Promise<import("stream").Duplex>;
 }
-export { DockerService };

package/lib/services/DockerService.js

@@ -1,20 +1,32 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DockerService = void 0;
 const dockerode_1 = __importDefault(require("dockerode"));
+const core_1 = require("@wocker/core");
 const utils_1 = require("../utils");
 const makes_1 = require("../makes");
-class DockerService {
-    constructor(di) {
+const LogService_1 = require("./LogService");
+let DockerService = class DockerService {
+    constructor(logService) {
+        this.logService = logService;
         this.docker = new dockerode_1.default({
             socketPath: "/var/run/docker.sock"
         });
     }
     async createContainer(params) {
-        const { name, tty, image, projectId, restart, ulimits, extraHosts, networkMode, links = [], env = {}, volumes = [], ports = [], cmd = [] } = params;
+        const { name, user, entrypoint, tty, image, projectId, restart, ulimits, extraHosts, networkMode, links = [], env = {}, volumes = [], ports = [], cmd = [] } = params;
         const network = this.docker.getNetwork("workspace");
         try {
             await network.inspect();
@@ -29,6 +41,7 @@ class DockerService {
         await this.pullImage(image);
         return this.docker.createContainer({
             name,
+            User: user,
             Image: image,
             Hostname: name,
             Labels: {
@@ -39,6 +52,7 @@ class DockerService {
             AttachStderr: true,
             OpenStdin: true,
             StdinOnce: false,
+            Entrypoint: entrypoint,
             Tty: tty,
             Cmd: cmd,
             Env: Object.keys(env).map((key) => {
@@ -164,6 +178,31 @@ class DockerService {
         }
         await image.remove();
     }
+    async imageLs(options) {
+        const { tag, reference, labels } = options || {};
+        const filters = {};
+        if (reference) {
+            filters.reference = [
+                ...filters.reference || [],
+                reference
+            ];
+        }
+        if (tag) {
+            filters.reference = [
+                ...filters.reference || [],
+                tag
+            ];
+        }
+        if (labels) {
+            filters.label = [];
+            for (const i in labels) {
+                filters.label.push(`${i}=${labels[i]}`);
+            }
+        }
+        return this.docker.listImages({
+            filters: JSON.stringify(filters)
+        });
+    }
     async pullImage(tag) {
         const exists = await this.imageExists(tag);
         if (exists) {
@@ -172,6 +211,43 @@ class DockerService {
         const stream = await this.docker.pull(tag);
         await (0, utils_1.followProgress)(stream);
     }
+    async attach(name) {
+        const container = await this.getContainer(name);
+        const stream = await container.attach({
+            logs: true,
+            stream: true,
+            hijack: true,
+            stdin: true,
+            stdout: true,
+            stderr: true
+        });
+        process.stdin.resume();
+        process.stdin.setEncoding("utf8");
+        process.stdin.setRawMode(true);
+        process.stdin.pipe(stream);
+        process.stdin.on("data", (data) => {
+            if (data.toString() === "\u0003") {
+                process.stdin.setRawMode(false);
+            }
+        });
+        stream.setEncoding("utf8");
+        stream.pipe(process.stdout);
+        const [width, height] = process.stdout.getWindowSize();
+        await container.resize({
+            w: width,
+            h: height
+        });
+        stream.on("end", async () => {
+            process.exit();
+        });
+        process.stdout.on("resize", () => {
+            const [width, height] = process.stdout.getWindowSize();
+            container.resize({
+                w: width,
+                h: height
+            });
+        });
+    }
     async attachStream(stream) {
         process.stdin.resume();
         process.stdin.setEncoding("utf8");
@@ -196,5 +272,47 @@ class DockerService {
             stream.on("error", reject);
         });
     }
-}
+    async exec(name, args, tty = false) {
+        const container = await this.getContainer(name);
+        if (!container) {
+            return;
+        }
+        const exec = await container.exec({
+            AttachStdin: true,
+            AttachStdout: true,
+            AttachStderr: tty,
+            Tty: tty,
+            Cmd: args || []
+        });
+        const stream = await exec.start({
+            hijack: true,
+            stdin: tty,
+            Tty: tty
+        });
+        if (tty) {
+            stream.setEncoding("utf-8");
+            process.stdin.resume();
+            if (process.stdin.setRawMode) {
+                process.stdin.setRawMode(true);
+            }
+            process.stdin.setEncoding("utf-8");
+            process.stdin.pipe(stream);
+            stream.pipe(process.stdout);
+            stream.on("error", (err) => {
+                makes_1.Logger.error(err.message);
+            });
+            stream.on("end", async () => {
+                process.stdin.setRawMode(false);
+            });
+            stream.on("end", async () => {
+                process.exit();
+            });
+        }
+        return stream;
+    }
+};
 exports.DockerService = DockerService;
+exports.DockerService = DockerService = __decorate([
+    (0, core_1.Injectable)("DOCKER_SERVICE"),
+    __metadata("design:paramtypes", [LogService_1.LogService])
+], DockerService);

package/lib/services/LogService.d.ts

@@ -1,12 +1,10 @@
-import { DI } from "../makes";
 import { AppConfigService } from "./AppConfigService";
-declare class LogService {
-    protected appConfigService: AppConfigService;
-    constructor(di: DI);
+export declare class LogService {
+    protected readonly appConfigService: AppConfigService;
+    constructor(appConfigService: AppConfigService);
     log(...data: any[]): void;
     info(...data: any[]): void;
     warn(...data: any[]): void;
     error(...data: any[]): void;
     protected _log(type: string, ...data: any[]): void;
 }
-export { LogService };

package/lib/services/LogService.js

@@ -1,15 +1,26 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogService = void 0;
+const core_1 = require("@wocker/core");
 const format_1 = __importDefault(require("date-fns/format"));
 const makes_1 = require("../makes");
 const AppConfigService_1 = require("./AppConfigService");
-class LogService {
-    constructor(di) {
-        this.appConfigService = di.resolveService(AppConfigService_1.AppConfigService);
+let LogService = class LogService {
+    constructor(appConfigService) {
+        this.appConfigService = appConfigService;
+        makes_1.Logger.install(this);
     }
     log(...data) {
         this._log("log", ...data);
@@ -34,5 +45,9 @@ class LogService {
         }
         makes_1.FS.appendFileSync(logPath, `[${time}] ${type}: ${logData}\n`);
     }
-}
+};
 exports.LogService = LogService;
+exports.LogService = LogService = __decorate([
+    (0, core_1.Injectable)("LOG_SERVICE"),
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService])
+], LogService);

package/lib/services/PluginService.d.ts

@@ -1,11 +1,13 @@
 import { Cli } from "@wocker/core";
-import { DI, Controller } from "../makes";
-declare class PluginService {
-    protected di: DI;
-    protected cli: Cli;
-    constructor(di: DI);
-    use(Constructor: {
-        new (...params: any[]): Controller;
-    }): void;
+import { AppConfigService } from "./AppConfigService";
+import { LogService } from "./LogService";
+export declare class PluginService {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly logService: LogService;
+    protected readonly cli: Cli;
+    constructor(appConfigService: AppConfigService, logService: LogService, cli: Cli);
+    checkPlugin(pluginName: string): Promise<boolean>;
+    import(): Promise<void>;
+    update(): Promise<void>;
+    protected getCurrentVersion(name: string): Promise<string | null>;
 }
-export { PluginService };

package/lib/services/PluginService.js

@@ -1,15 +1,107 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginService = void 0;
 const core_1 = require("@wocker/core");
-class PluginService {
-    constructor(di) {
-        this.di = di;
-        this.cli = di.resolveService(core_1.Cli);
+const AppConfigService_1 = require("./AppConfigService");
+const LogService_1 = require("./LogService");
+const makes_1 = require("../makes");
+const utils_1 = require("../utils");
+let PluginService = class PluginService {
+    constructor(appConfigService, logService, cli) {
+        this.appConfigService = appConfigService;
+        this.logService = logService;
+        this.cli = cli;
+    }
+    async checkPlugin(pluginName) {
+        try {
+            const { default: Plugin } = await Promise.resolve(`${pluginName}`).then(s => __importStar(require(s)));
+            const name = Reflect.getMetadata(core_1.MODULE_METADATA.NAME, Plugin);
+            if (!name) {
+                console.log("No name");
+            }
+            return !!name;
+        }
+        catch (err) {
+            this.logService.error(err.message);
+        }
+        return false;
+    }
+    async import() {
+    }
+    async update() {
+        const config = await this.appConfigService.getConfig();
+        if (!config.plugins) {
+            return;
+        }
+        for (const name of new Set(config.plugins).values()) {
+            console.info(`Checking ${name}...`);
+            try {
+                const current = await this.getCurrentVersion(name);
+                const res = await makes_1.Http.get("https://registry.npmjs.org")
+                    .send(name);
+                if (res.status !== 200) {
+                    continue;
+                }
+                const { "dist-tags": { latest } } = res.data;
+                this.logService.info(name, current, latest);
+                if (!current || current < latest) {
+                    console.log(`Updating ${name}...`);
+                    await (0, utils_1.spawn)("npm", ["i", "-g", name]);
+                }
+            }
+            catch (err) {
+                this.logService.error(err.message);
+            }
+        }
+        console.info("Done");
     }
-    use(Constructor) {
-        const controller = new Constructor(this.di);
-        controller.install(this.cli);
+    async getCurrentVersion(name) {
+        try {
+            const { dependencies: { [name]: { version } } } = JSON.parse(await (0, utils_1.exec)(`npm ls --json -g ${name}`));
+            return version;
+        }
+        catch (err) {
+            this.logService.error(`Failed to get current version of ${name}`);
+        }
+        return null;
     }
-}
+};
 exports.PluginService = PluginService;
+exports.PluginService = PluginService = __decorate([
+    (0, core_1.Injectable)(),
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+        LogService_1.LogService,
+        core_1.Cli])
+], PluginService);