@wocker/ws 1.0.13 → 1.0.15

package/lib/controllers/ProxyController.js

@@ -18,23 +18,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProxyController = void 0;
 const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
-const cli_table3_1 = __importDefault(require("cli-table3"));
 const chalk_1 = __importDefault(require("chalk"));
-const makes_1 = require("../makes");
 const services_1 = require("../services");
 let ProxyController = class ProxyController {
-    constructor(appConfigService, appEventsService, projectService, dockerService) {
+    constructor(appConfigService, appEventsService, projectService, proxyService) {
         this.appConfigService = appConfigService;
         this.appEventsService = appEventsService;
         this.projectService = projectService;
-        this.dockerService = dockerService;
+        this.proxyService = proxyService;
         this.containerName = "proxy.workspace";
-        this.appEventsService.on("project:beforeStart", (project) => this.onProjectStart(project));
+        this.appEventsService.on("project:init", (project) => this.proxyService.init(project));
+        this.appEventsService.on("project:start", (project) => this.onProjectStart(project));
         this.appEventsService.on("project:stop", (project) => this.onProjectStop(project));
     }
     async onProjectStart(project) {
-        if (!project.hasEnv("VIRTUAL_HOST")) {
-            project.setEnv("VIRTUAL_HOST", project.containerName);
+        if (project.domains.length === 0) {
+            return;
+        }
+        console.info(chalk_1.default.green("Don't forget to add these lines into hosts file:"));
+        for (const domain of project.domains) {
+            console.info(chalk_1.default.gray(`127.0.0.1 ${domain}`));
         }
         await this.start();
     }
@@ -44,173 +47,37 @@ let ProxyController = class ProxyController {
         const projects = await this.projectService.search();
         return projects.map((project) => project.name);
     }
-    async getDomains(name, selected) {
-        if (name) {
-            await this.projectService.cdProject(name);
-        }
-        const project = await this.projectService.get();
-        return (project.getEnv("VIRTUAL_HOST") || "").split(",").filter((domain) => {
-            return !selected.includes(domain);
-        });
-    }
     async init(httpPort, httpsPort) {
         const config = await this.appConfigService.getConfig();
-        if (typeof httpPort === "undefined" || isNaN(httpPort)) {
+        if (httpPort === null || typeof httpPort === "undefined" || isNaN(httpPort)) {
             httpPort = await (0, utils_1.promptText)({
                 required: true,
                 message: "Http port:",
-                type: "int",
+                type: "number",
                 default: config.getMeta("PROXY_HTTP_PORT", "80")
             });
         }
         config.setMeta("PROXY_HTTP_PORT", httpPort.toString());
-        if (typeof httpsPort === "undefined" || isNaN(httpsPort)) {
+        if (httpsPort === null || typeof httpsPort === "undefined" || isNaN(httpsPort)) {
             httpsPort = await (0, utils_1.promptText)({
                 required: true,
                 message: "Https port:",
-                type: "int",
+                type: "number",
                 default: config.getMeta("PROXY_HTTPS_PORT", "443")
             });
         }
         config.setMeta("PROXY_HTTPS_PORT", httpsPort.toString());
         await config.save();
     }
-    async start() {
-        console.info("Proxy starting...");
-        const config = await this.appConfigService.getConfig();
-        await this.dockerService.pullImage("nginxproxy/nginx-proxy");
-        const httpPort = config.getMeta("PROXY_HTTP_PORT", "80");
-        const httpsPort = config.getMeta("PROXY_HTTPS_PORT", "443");
-        let container = await this.dockerService.getContainer(this.containerName);
-        if (!container) {
-            const certsDir = this.appConfigService.dataPath("certs");
-            if (!makes_1.FS.existsSync(certsDir)) {
-                makes_1.FS.mkdirSync(certsDir, {
-                    recursive: true
-                });
-            }
-            container = await this.dockerService.createContainer({
-                name: this.containerName,
-                image: "nginxproxy/nginx-proxy",
-                restart: "always",
-                env: {
-                    DEFAULT_HOST: "index.workspace"
-                },
-                ports: [
-                    `${httpPort}:80`,
-                    `${httpsPort}:443`
-                ],
-                volumes: [
-                    "/var/run/docker.sock:/tmp/docker.sock:ro",
-                    `${certsDir}:/etc/nginx/certs`
-                ]
-            });
-        }
-        const { State: { Status } } = await container.inspect();
-        if (["created", "exited"].includes(Status)) {
-            console.info("Starting...", Status);
-            await container.start();
-        }
+    async start(restart) {
+        await this.proxyService.start(restart);
     }
     async stop() {
         console.info("Proxy stopping...");
-        await this.dockerService.removeContainer(this.containerName);
-    }
-    async restart() {
-        await this.stop();
-        await this.start();
-    }
-    async domainList(name) {
-        if (name) {
-            await this.projectService.cdProject(name);
-        }
-        const project = await this.projectService.get();
-        const table = new cli_table3_1.default({
-            head: [chalk_1.default.yellow("Domain")]
-        });
-        const domains = project.getEnv("VIRTUAL_HOST", "").split(",");
-        for (const domain of domains) {
-            table.push([domain]);
-        }
-        return table.toString() + "\n";
-    }
-    async setDomains(name, domains) {
-        if (name) {
-            await this.projectService.cdProject(name);
-        }
-        const project = await this.projectService.get();
-        project.setEnv("VIRTUAL_HOST", domains.join(","));
-        await project.save();
-        const container = await this.dockerService.getContainer(`${project.name}.workspace`);
-        if (container) {
-            await this.projectService.stop(project);
-            await this.projectService.start(project);
-        }
-    }
-    async addDomain(name, addDomains) {
-        if (name) {
-            await this.projectService.cdProject(name);
-        }
-        const project = await this.projectService.get();
-        let domains = project.getEnv("VIRTUAL_HOST", "").split(",").filter((domain) => {
-            return !!domain;
-        });
-        domains = [
-            ...domains,
-            ...addDomains.filter((domain) => {
-                return !domains.find((existDomain) => {
-                    return existDomain === domain;
-                });
-            })
-        ];
-        project.setEnv("VIRTUAL_HOST", domains.join(","));
-        await project.save();
-        const container = await this.dockerService.getContainer(`${project.name}.workspace`);
-        if (container) {
-            await this.projectService.stop(project);
-            await this.projectService.start(project);
-        }
-    }
-    async removeDomain(name, removeDomains) {
-        if (name) {
-            await this.projectService.cdProject(name);
-        }
-        const project = await this.projectService.get();
-        let domains = project.getEnv("VIRTUAL_HOST", "").split(",").filter((domain) => {
-            return !!domain;
-        });
-        domains = domains.filter((domain) => {
-            return !removeDomains.includes(domain);
-        });
-        project.setEnv("VIRTUAL_HOST", domains.join(","));
-        await project.save();
-    }
-    async clearDomains(name) {
-        if (name) {
-            await this.projectService.cdProject(name);
-        }
-        const project = await this.projectService.get();
-        project.unsetEnv("VIRTUAL_HOST");
-        await project.save();
-        const container = await this.dockerService.getContainer(`${project.name}.workspace`);
-        if (container) {
-            await this.projectService.stop(project);
-            await this.projectService.start(project);
-        }
+        await this.proxyService.stop();
     }
     async logs() {
-        const container = await this.dockerService.getContainer(this.containerName);
-        if (!container) {
-            return;
-        }
-        const stream = await container.logs({
-            follow: true,
-            stdout: true,
-            stderr: true
-        });
-        stream.on("data", (data) => {
-            process.stdout.write((0, utils_1.demuxOutput)(data));
-        });
+        await this.proxyService.logs();
     }
 };
 exports.ProxyController = ProxyController;
@@ -220,12 +87,6 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], ProxyController.prototype, "getProjectNames", null);
-__decorate([
-    (0, core_1.Command)("domains"),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Array]),
-    __metadata("design:returntype", Promise)
-], ProxyController.prototype, "getDomains", null);
 __decorate([
     (0, core_1.Command)("proxy:init"),
     __param(0, (0, core_1.Option)("http-port", {
@@ -242,8 +103,13 @@ __decorate([
 ], ProxyController.prototype, "init", null);
 __decorate([
     (0, core_1.Command)("proxy:start"),
+    __param(0, (0, core_1.Option)("restart", {
+        type: "boolean",
+        alias: "r",
+        description: "Restart"
+    })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
+    __metadata("design:paramtypes", [Boolean]),
     __metadata("design:returntype", Promise)
 ], ProxyController.prototype, "start", null);
 __decorate([
@@ -252,67 +118,6 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], ProxyController.prototype, "stop", null);
-__decorate([
-    (0, core_1.Command)("proxy:restart"),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], ProxyController.prototype, "restart", null);
-__decorate([
-    (0, core_1.Command)("domains"),
-    __param(0, (0, core_1.Option)("name", {
-        type: "string",
-        alias: "n",
-        description: "Project name"
-    })),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", Promise)
-], ProxyController.prototype, "domainList", null);
-__decorate([
-    (0, core_1.Command)("domain:set [...domains]"),
-    __param(0, (0, core_1.Option)("name", {
-        type: "string",
-        alias: "n",
-        description: "Project name"
-    })),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Array]),
-    __metadata("design:returntype", Promise)
-], ProxyController.prototype, "setDomains", null);
-__decorate([
-    (0, core_1.Command)("domain:add [...domains]"),
-    __param(0, (0, core_1.Option)("name", {
-        type: "string",
-        alias: "n",
-        description: "Project name"
-    })),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Array]),
-    __metadata("design:returntype", Promise)
-], ProxyController.prototype, "addDomain", null);
-__decorate([
-    (0, core_1.Command)("domain:remove [...domains]"),
-    __param(0, (0, core_1.Option)("name", {
-        type: "string",
-        alias: "n",
-        description: "Project name"
-    })),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Array]),
-    __metadata("design:returntype", Promise)
-], ProxyController.prototype, "removeDomain", null);
-__decorate([
-    (0, core_1.Command)("domain:clear"),
-    __param(0, (0, core_1.Option)("name", {
-        type: "string",
-        alias: "n",
-        description: "Project name"
-    })),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", Promise)
-], ProxyController.prototype, "clearDomains", null);
 __decorate([
     (0, core_1.Command)("proxy:logs"),
     __metadata("design:type", Function),
@@ -324,5 +129,5 @@ exports.ProxyController = ProxyController = __decorate([
     __metadata("design:paramtypes", [services_1.AppConfigService,
         services_1.AppEventsService,
         services_1.ProjectService,
-        services_1.DockerService])
+        services_1.ProxyService])
 ], ProxyController);

package/lib/env.d.ts

@@ -5,3 +5,4 @@ export declare const SERVICES_DIR: string;
 export declare const PLUGINS_DIR: string;
 export declare const DATA_DIR: string;
 export declare const MAP_PATH: string;
+export declare const VIRTUAL_HOST_KEY = "VIRTUAL_HOST";

package/lib/env.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAP_PATH = exports.DATA_DIR = exports.PLUGINS_DIR = exports.SERVICES_DIR = exports.PRESETS_DIR = exports.ROOT_DIR = exports.NODE_ENV = void 0;
+exports.VIRTUAL_HOST_KEY = exports.MAP_PATH = exports.DATA_DIR = exports.PLUGINS_DIR = exports.SERVICES_DIR = exports.PRESETS_DIR = exports.ROOT_DIR = exports.NODE_ENV = void 0;
 const OS = __importStar(require("os"));
 const Path = __importStar(require("path"));
 exports.NODE_ENV = process.env.NODE_ENV;
@@ -33,3 +33,4 @@ exports.SERVICES_DIR = Path.join(exports.ROOT_DIR, "services");
 exports.PLUGINS_DIR = Path.join(exports.ROOT_DIR, "plugins");
 exports.DATA_DIR = process.env.WS_DIR || Path.join(OS.homedir(), ".workspace");
 exports.MAP_PATH = Path.join(exports.DATA_DIR, "data.json");
+exports.VIRTUAL_HOST_KEY = "VIRTUAL_HOST";

package/lib/plugins/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./ElasticSearchPlugin";
 export * from "./MongodbPlugin";
-export * from "./PageKitePlugin";
 export * from "./ProxmoxPlugin";

package/lib/plugins/index.js

@@ -16,5 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ElasticSearchPlugin"), exports);
 __exportStar(require("./MongodbPlugin"), exports);
-__exportStar(require("./PageKitePlugin"), exports);
 __exportStar(require("./ProxmoxPlugin"), exports);

package/lib/services/DockerService.d.ts

@@ -13,7 +13,7 @@ export declare class DockerService {
     imageRm(tag: string): Promise<void>;
     imageLs(options?: Params.ImageList): Promise<Docker.ImageInfo[]>;
     pullImage(tag: string): Promise<void>;
-    attach(name: string): Promise<void>;
+    attach(containerOrName: string | Container): Promise<NodeJS.ReadWriteStream>;
     logs(name: string): Promise<void>;
     attachStream(stream: NodeJS.ReadWriteStream): Promise<void>;
     exec(name: string, args?: string[], tty?: boolean): Promise<import("stream").Duplex>;

package/lib/services/DockerService.js

@@ -94,7 +94,7 @@ let DockerService = class DockerService {
                         ];
                     }
                     return res;
-                }, {}),
+                }, {})
             },
             NetworkingConfig: {
                 EndpointsConfig: networkMode === "host" ? {} : {
@@ -173,8 +173,9 @@ let DockerService = class DockerService {
         }
     }
     async imageRm(tag) {
-        const image = await this.docker.getImage(tag);
-        if (!image) {
+        const image = this.docker.getImage(tag);
+        const exists = await this.imageExists(tag);
+        if (!exists) {
             return;
         }
         await image.remove();
@@ -212,10 +213,16 @@ let DockerService = class DockerService {
         const stream = await this.docker.pull(tag);
         await (0, utils_2.followProgress)(stream);
     }
-    async attach(name) {
-        const container = await this.getContainer(name);
-        if (!container) {
-            return;
+    async attach(containerOrName) {
+        let container;
+        if (typeof containerOrName === "string") {
+            container = await this.getContainer(containerOrName);
+        }
+        else {
+            if (!containerOrName) {
+                return;
+            }
+            container = containerOrName;
         }
         const stream = await container.attach({
             logs: true,
@@ -236,23 +243,21 @@ let DockerService = class DockerService {
             }
         });
         stream.on("data", (data) => {
-            process.stdout.write((0, utils_1.demuxOutput)(data));
+            process.stdout.write(data);
         });
         stream.on("end", async () => {
             process.exit();
         });
-        process.stdout.on("resize", () => {
+        const handleResize = () => {
             const [width, height] = process.stdout.getWindowSize();
             container.resize({
                 w: width,
                 h: height
             });
-        });
-        const [width, height] = process.stdout.getWindowSize();
-        await container.resize({
-            w: width,
-            h: height
-        });
+        };
+        process.stdout.on("resize", handleResize);
+        handleResize();
+        return stream;
     }
     async logs(name) {
         const container = await this.getContainer(name);

package/lib/services/PluginService.js

@@ -47,7 +47,7 @@ let PluginService = class PluginService {
     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);
+            const name = Reflect.getMetadata(core_1.PLUGIN_NAME_METADATA, Plugin);
             if (!name) {
                 console.log("No name");
             }

package/lib/services/PresetService.d.ts

@@ -1,12 +1,16 @@
-import { EnvConfig, Preset } from "@wocker/core";
+import { EnvConfig, Preset, Config, PresetProperties, AppConfigService } from "@wocker/core";
 type SearchOptions = Partial<{
     name: string;
+    source: string;
 }>;
 export declare class PresetService {
-    constructor();
+    protected readonly appConfigService: AppConfigService;
+    constructor(appConfigService: AppConfigService);
+    protected toObject(config: PresetProperties): Preset;
+    protected getList(): Promise<Config["presets"]>;
     getImageName(preset: Preset, buildArgs?: EnvConfig): string;
-    save(preset: Preset): Promise<void>;
     get(name: string): Promise<Preset>;
+    addPreset(name: string): Promise<void>;
     search(options?: SearchOptions): Promise<Preset[]>;
     searchOne(options?: SearchOptions): Promise<Preset | null>;
 }