@wocker/ws 1.0.13 → 1.0.15

package/lib/AppModule.js

@@ -47,7 +47,7 @@ let AppModule = AppModule_1 = class AppModule {
                 if (!Plugin) {
                     continue;
                 }
-                const name = Reflect.getMetadata(core_1.MODULE_METADATA.NAME, Plugin);
+                const name = Reflect.getMetadata(core_1.PLUGIN_NAME_METADATA, Plugin);
                 Reflect.defineMetadata(core_1.MODULE_METADATA.PROVIDERS, [
                     ...Reflect.getMetadata(core_1.MODULE_METADATA.PROVIDERS, Plugin) || [],
                     {
@@ -88,7 +88,8 @@ exports.AppModule = AppModule = AppModule_1 = __decorate([
             services_1.LogService,
             services_1.PluginService,
             services_1.PresetService,
-            services_1.ProjectService
+            services_1.ProjectService,
+            services_1.ProxyService
         ],
         exports: [
             services_1.AppConfigService,

package/lib/controllers/PresetController.d.ts

@@ -11,7 +11,8 @@ export declare class PresetController {
     protected onInit(project: Project): Promise<void>;
     protected onRebuild(project: Project): Promise<void>;
     protected onBeforeStart(project: Project): Promise<void>;
-    add(preset: string): Promise<void>;
+    add(name: string): Promise<void>;
+    delete(name: string, confirm?: boolean): Promise<void>;
     eject(name?: string): Promise<void>;
     build(rebuild: boolean, presetName: string): Promise<void>;
 }

package/lib/controllers/PresetController.js

@@ -115,7 +115,7 @@ let PresetController = class PresetController {
         }
     }
     async onRebuild(project) {
-        if (project.type !== "preset") {
+        if (project.type !== core_1.PROJECT_TYPE_PRESET) {
             return;
         }
         const preset = await this.presetService.get(project.preset);
@@ -130,7 +130,7 @@ let PresetController = class PresetController {
         }
     }
     async onBeforeStart(project) {
-        if (project.type !== "preset") {
+        if (project.type !== core_1.PROJECT_TYPE_PRESET) {
             return;
         }
         const preset = await this.presetService.get(project.preset);
@@ -143,13 +143,28 @@ let PresetController = class PresetController {
                         presetName: preset.name
                     },
                     buildArgs: project.buildArgs,
-                    context: Path.join(env_1.PRESETS_DIR, preset.name),
+                    context: preset.path,
                     src: preset.dockerfile
                 });
             }
         }
     }
-    async add(preset) {
+    async add(name) {
+        await this.presetService.addPreset(name);
+    }
+    async delete(name, confirm) {
+        const preset = await this.presetService.get(name);
+        if (typeof confirm === "undefined" || confirm === null) {
+            confirm = await (0, utils_2.promptConfirm)({
+                message: `Delete preset ${name}?`,
+                default: false
+            });
+        }
+        if (!confirm) {
+            return;
+        }
+        console.info("Deleting...");
+        await preset.delete();
     }
     async eject(name) {
         if (name) {
@@ -221,10 +236,22 @@ let PresetController = class PresetController {
 exports.PresetController = PresetController;
 __decorate([
     (0, core_1.Command)("preset:add <preset>"),
+    __param(0, (0, core_1.Param)("preset")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], PresetController.prototype, "add", null);
+__decorate([
+    (0, core_1.Command)("preset:delete <preset>"),
+    __param(0, (0, core_1.Param)("preset")),
+    __param(1, (0, core_1.Option)("yes", {
+        alias: "y",
+        description: "Confirm deletion"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Boolean]),
+    __metadata("design:returntype", Promise)
+], PresetController.prototype, "delete", null);
 __decorate([
     (0, core_1.Command)("preset:eject"),
     __param(0, (0, core_1.Option)("name", {

package/lib/controllers/ProjectController.d.ts

@@ -12,8 +12,15 @@ export declare class ProjectController {
     projectList(all: boolean): Promise<string>;
     start(name?: string, detach?: boolean, attach?: boolean, rebuild?: boolean, restart?: boolean): Promise<void>;
     stop(name: string): Promise<void>;
-    run(name: string, script: string): Promise<void>;
-    attach(name?: string): Promise<void>;
+    domains(name?: string): Promise<string>;
+    addDomain(name: string, addDomains: string[]): Promise<void>;
+    setDomains(name: string, domains: string[]): Promise<void>;
+    removeDomain(name: string, removeDomains: string[]): Promise<void>;
+    clearDomain(name?: string): Promise<void>;
+    ports(name?: string): Promise<string>;
+    addPort(hostPort: string, containerPort: string, name?: string): Promise<void>;
+    removePort(hostPort: string, containerPort: string, name?: string): Promise<void>;
+    clearPorts(name?: string): Promise<void>;
     configList(name?: string, global?: boolean): Promise<string>;
     configGet(name: string, global: boolean, keys: string[]): Promise<string>;
     configSet(name: string, global: boolean, variables: string[]): Promise<void>;
@@ -25,6 +32,8 @@ export declare class ProjectController {
     volumeList(name?: string): Promise<string>;
     volumeMount(name: string, volumes: string[]): Promise<void>;
     volumeUnmount(name: string, volumes: string[]): Promise<void>;
-    logs(name: string, global: boolean, detach: boolean, follow: boolean): Promise<void>;
+    logs(name?: string, global?: boolean, detach?: boolean, follow?: boolean): Promise<void>;
     exec(name?: string, command?: string[]): Promise<void>;
+    run(name: string, script: string, args?: string[]): Promise<void>;
+    attach(name?: string): Promise<void>;
 }

package/lib/controllers/ProjectController.js

@@ -90,6 +90,7 @@ let ProjectController = class ProjectController {
                 message: "Project name:",
                 default: project.name || Path.basename(project.path)
             });
+            project.addDomain(project.containerName);
         }
         if (type) {
             project.type = type;
@@ -160,22 +161,18 @@ let ProjectController = class ProjectController {
             await this.projectService.cdProject(name);
         }
         const project = await this.projectService.get();
-        if (rebuild) {
-            await this.projectService.rebuild(project);
-        }
-        await this.projectService.start(project, restart);
+        await this.projectService.start(project, restart, rebuild);
         if (detach) {
             console.info(chalk_1.default.yellow("Warning: Detach option is deprecated"));
         }
         if (attach) {
             const project = await this.projectService.get();
-            const containerName = project.containerName;
-            const container = await this.dockerService.getContainer(containerName);
+            const container = await this.dockerService.getContainer(project.containerName);
             await container.resize({
                 w: process.stdout.columns,
                 h: process.stdout.rows
             });
-            await this.dockerService.attach(containerName);
+            await this.dockerService.attach(project.containerName);
         }
     }
     async stop(name) {
@@ -185,38 +182,96 @@ let ProjectController = class ProjectController {
         const project = await this.projectService.get();
         await this.projectService.stop(project);
     }
-    async run(name, script) {
+    async domains(name) {
         if (name) {
             await this.projectService.cdProject(name);
         }
         const project = await this.projectService.get();
-        if (!project.scripts || !project.scripts[script]) {
-            throw new Error(`Script ${script} not found`);
+        const table = new cli_table3_1.default({
+            head: [chalk_1.default.yellow("Domain")]
+        });
+        for (const domain of project.domains) {
+            table.push([domain]);
         }
-        const container = await this.dockerService.getContainer(`${project.name}.workspace`);
-        if (!container) {
-            throw new Error("The project is not started");
+        return table.toString();
+    }
+    async addDomain(name, addDomains) {
+        if (name) {
+            await this.projectService.cdProject(name);
         }
-        const exec = await container.exec({
-            Cmd: ["bash", "-i", "-c", project.scripts[script]],
-            AttachStdin: true,
-            AttachStdout: true,
-            AttachStderr: true,
-            Tty: process.stdin.isTTY
-        });
-        const stream = await exec.start({
-            hijack: true,
-            stdin: true,
-            Tty: process.stdin.isTTY
+        const project = await this.projectService.get();
+        for (const domain of addDomains) {
+            project.addDomain(domain);
+        }
+        await project.save();
+    }
+    async setDomains(name, domains) {
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        project.clearDomains();
+        for (const domain of domains) {
+            project.addDomain(domain);
+        }
+        await project.save();
+    }
+    async removeDomain(name, removeDomains) {
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        for (const domain of removeDomains) {
+            project.removeDomain(domain);
+        }
+        await project.save();
+    }
+    async clearDomain(name) {
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        project.clearDomains();
+        await project.save();
+    }
+    async ports(name) {
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        const table = new cli_table3_1.default({
+            head: ["Ports"]
         });
-        await this.dockerService.attachStream(stream);
+        for (const port of project.ports || []) {
+            table.push([port]);
+        }
+        return table.toString();
     }
-    async attach(name) {
+    async addPort(hostPort, containerPort, name) {
         if (name) {
             await this.projectService.cdProject(name);
         }
         const project = await this.projectService.get();
-        await this.dockerService.attach(project.containerName);
+        project.linkPort(parseInt(hostPort), parseInt(containerPort));
+        await project.save();
+    }
+    async removePort(hostPort, containerPort, name) {
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        project.unlinkPort(parseInt(hostPort), parseInt(containerPort));
+        await project.save();
+    }
+    async clearPorts(name) {
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        if (project.ports) {
+            delete project.ports;
+            await project.save();
+        }
     }
     async configList(name, global) {
         if (name) {
@@ -473,7 +528,11 @@ let ProjectController = class ProjectController {
                 follow: true
             });
             stream.on("data", (data) => {
-                process.stdout.write((0, utils_1.demuxOutput)(data));
+                try {
+                    data = (0, utils_1.demuxOutput)(data);
+                }
+                catch (err) { }
+                process.stdout.write(data);
             });
         }
         else {
@@ -490,8 +549,40 @@ let ProjectController = class ProjectController {
             await this.projectService.cdProject(name);
         }
         const project = await this.projectService.get();
-        const containerName = `${project.name}.workspace`;
-        await this.dockerService.exec(containerName, command);
+        await this.dockerService.exec(project.containerName, command);
+    }
+    async run(name, script, args) {
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        if (!project.scripts || !project.scripts[script]) {
+            throw new Error(`Script ${script} not found`);
+        }
+        const container = await this.dockerService.getContainer(`${project.name}.workspace`);
+        if (!container) {
+            throw new Error("The project is not started");
+        }
+        const exec = await container.exec({
+            Cmd: ["bash", "-i", "-c", [project.scripts[script], ...args || []].join(" ")],
+            AttachStdin: true,
+            AttachStdout: true,
+            AttachStderr: true,
+            Tty: process.stdin.isTTY
+        });
+        const stream = await exec.start({
+            hijack: true,
+            stdin: true,
+            Tty: process.stdin.isTTY
+        });
+        await this.dockerService.attachStream(stream);
+    }
+    async attach(name) {
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        await this.dockerService.attach(project.containerName);
     }
 };
 exports.ProjectController = ProjectController;
@@ -512,7 +603,7 @@ __decorate([
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
-        description: "Project name"
+        description: "The name of the project"
     })),
     __param(1, (0, core_1.Option)("type", {
         type: "string",
@@ -545,7 +636,7 @@ __decorate([
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
-        description: "Project name",
+        description: "The name of the project",
         help: true
     })),
     __param(1, (0, core_1.Option)("detach", {
@@ -577,39 +668,121 @@ __decorate([
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
-        description: "Project name"
+        description: "The name of the project"
     })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "stop", null);
 __decorate([
-    (0, core_1.Command)("run <script>"),
+    (0, core_1.Command)("domains"),
+    __param(0, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "The name of the project"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "domains", null);
+__decorate([
+    (0, core_1.Command)("domain:add [...domains]"),
+    __param(0, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "The name of the project"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Array]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "addDomain", 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, String]),
+    __metadata("design:paramtypes", [String, Array]),
     __metadata("design:returntype", Promise)
-], ProjectController.prototype, "run", null);
+], ProjectController.prototype, "setDomains", null);
 __decorate([
-    (0, core_1.Command)("attach"),
+    (0, core_1.Command)("domain:remove [...domains]"),
+    __param(0, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "The name of the project"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Array]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "removeDomain", null);
+__decorate([
+    (0, core_1.Command)("domain:clear"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
-        alias: "n"
+        alias: "n",
+        description: "The name of the project"
     })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
-], ProjectController.prototype, "attach", null);
+], ProjectController.prototype, "clearDomain", null);
+__decorate([
+    (0, core_1.Command)("ports"),
+    __param(0, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "The name of the project"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "ports", null);
+__decorate([
+    (0, core_1.Command)("port:add <host-port>:<container-port>"),
+    __param(0, (0, core_1.Param)("host-port")),
+    __param(1, (0, core_1.Param)("container-port")),
+    __param(2, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "The name of the project"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String, String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "addPort", null);
+__decorate([
+    (0, core_1.Command)("port:remove <host-port>:<container-port>"),
+    __param(0, (0, core_1.Param)("host-port")),
+    __param(1, (0, core_1.Param)("container-port")),
+    __param(2, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "The name of the project"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String, String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "removePort", null);
+__decorate([
+    (0, core_1.Command)("port:clear"),
+    __param(0, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "The name of the project"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "clearPorts", null);
 __decorate([
     (0, core_1.Command)("config"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
-        description: "Project name"
+        description: "The name of the project"
     })),
     __param(1, (0, core_1.Option)("global", {
         type: "boolean",
@@ -623,7 +796,8 @@ __decorate([
     (0, core_1.Command)("config:get [...key]"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
-        alias: "n"
+        alias: "n",
+        description: "The name of the project"
     })),
     __param(1, (0, core_1.Option)("global", {
         type: "boolean",
@@ -638,12 +812,14 @@ __decorate([
     (0, core_1.Command)("config:set [...configs]"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
-        alias: "n"
+        alias: "n",
+        description: "The name of the project"
     })),
     __param(1, (0, core_1.Option)("global", {
         type: "boolean",
         alias: "g"
     })),
+    __param(2, (0, core_1.Param)("configs")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Boolean, Array]),
     __metadata("design:returntype", Promise)
@@ -652,7 +828,8 @@ __decorate([
     (0, core_1.Command)("config:unset [...configs]"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
-        alias: "n"
+        alias: "n",
+        description: "The name of the project"
     })),
     __param(1, (0, core_1.Option)("global", {
         type: "boolean",
@@ -666,7 +843,8 @@ __decorate([
     (0, core_1.Command)("build-args"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
-        alias: "n"
+        alias: "n",
+        description: "The name of the project"
     })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
@@ -677,6 +855,7 @@ __decorate([
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
+        description: "The name of the project"
     })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Array]),
@@ -686,7 +865,8 @@ __decorate([
     (0, core_1.Command)("build-args:set [...buildArgs]"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
-        alias: "n"
+        alias: "n",
+        description: "The name of the project"
     })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Array]),
@@ -696,7 +876,8 @@ __decorate([
     (0, core_1.Command)("build-args:unset [...buildArgs]"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
-        alias: "n"
+        alias: "n",
+        description: "The name of the project"
     })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Array]),
@@ -706,7 +887,8 @@ __decorate([
     (0, core_1.Command)("volumes"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
-        alias: "n"
+        alias: "n",
+        description: "The name of the project"
     })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
@@ -716,7 +898,8 @@ __decorate([
     (0, core_1.Command)("volume:mount [...volumes]"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
-        alias: "n"
+        alias: "n",
+        description: "The name of the project"
     })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Array]),
@@ -726,7 +909,8 @@ __decorate([
     (0, core_1.Command)("volume:unmount [...volumes]"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
-        alias: "n"
+        alias: "n",
+        description: "The name of the project"
     })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Array]),
@@ -737,7 +921,7 @@ __decorate([
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
-        description: "Project name"
+        description: "The name of the project"
     })),
     __param(1, (0, core_1.Option)("global", {
         type: "boolean",
@@ -760,12 +944,36 @@ __decorate([
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
-        description: "Project name"
+        description: "The name of the project"
     })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Array]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "exec", null);
+__decorate([
+    (0, core_1.Command)("run <script> [...args]"),
+    __param(0, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "The name of the project"
+    })),
+    __param(1, (0, core_1.Param)("script")),
+    __param(2, (0, core_1.Param)("args")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String, Array]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "run", null);
+__decorate([
+    (0, core_1.Command)("attach"),
+    __param(0, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "The name of the project"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "attach", null);
 exports.ProjectController = ProjectController = __decorate([
     (0, core_1.Controller)(),
     __metadata("design:paramtypes", [services_1.AppConfigService,

package/lib/controllers/ProxyController.d.ts

@@ -1,24 +1,17 @@
 import { Project } from "@wocker/core";
-import { AppConfigService, AppEventsService, ProjectService, DockerService } from "../services";
+import { AppConfigService, AppEventsService, ProjectService, ProxyService } from "../services";
 export declare class ProxyController {
     protected readonly appConfigService: AppConfigService;
     protected readonly appEventsService: AppEventsService;
     protected readonly projectService: ProjectService;
-    protected readonly dockerService: DockerService;
+    protected readonly proxyService: ProxyService;
     protected containerName: string;
-    constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService);
+    constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, proxyService: ProxyService);
     onProjectStart(project: Project): Promise<void>;
     onProjectStop(project: Project): Promise<void>;
     getProjectNames(): Promise<string[]>;
-    getDomains(name: string | undefined, selected: string[]): Promise<string[]>;
-    init(httpPort: number, httpsPort: number): Promise<void>;
-    start(): Promise<void>;
+    init(httpPort?: number, httpsPort?: number): Promise<void>;
+    start(restart?: boolean): Promise<void>;
     stop(): Promise<void>;
-    restart(): Promise<void>;
-    domainList(name: string): Promise<string>;
-    setDomains(name: string, domains: string[]): Promise<void>;
-    addDomain(name: string, addDomains: string[]): Promise<void>;
-    removeDomain(name: string, removeDomains: string[]): Promise<void>;
-    clearDomains(name: string): Promise<void>;
     logs(): Promise<void>;
 }