@wocker/ws 1.0.13 → 1.0.14

package/lib/AppModule.js

@@ -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/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,10 +161,7 @@ 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, rebuild, restart);
         if (detach) {
             console.info(chalk_1.default.yellow("Warning: Detach option is deprecated"));
         }
@@ -185,38 +183,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 +529,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 +550,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 +604,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 +637,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 +669,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, "setDomains", null);
+__decorate([
+    (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, "run", null);
+], ProjectController.prototype, "removeDomain", null);
 __decorate([
-    (0, core_1.Command)("attach"),
+    (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 +797,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,7 +813,8 @@ __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",
@@ -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>;
+    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>;
 }

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,15 +47,6 @@ 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)) {
@@ -75,142 +69,15 @@ let ProxyController = class ProxyController {
         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/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/ProjectService.d.ts

@@ -1,4 +1,4 @@
-import { Project, PickProperties } from "@wocker/core";
+import { Project, ProjectProperties } from "@wocker/core";
 import { DockerService, AppConfigService, AppEventsService } from "../services";
 type SearchParams = Partial<{
     id: string;
@@ -10,13 +10,11 @@ declare class ProjectService {
     protected readonly appEventsService: AppEventsService;
     protected readonly dockerService: DockerService;
     constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, dockerService: DockerService);
-    fromObject(data: Partial<PickProperties<Project>>): Project;
+    fromObject(data: Partial<ProjectProperties>): Project;
     getById(id: string): Promise<Project>;
     cdProject(name: string): Promise<void>;
     get(): Promise<Project>;
-    getContainer(): Promise<import("dockerode").Container>;
-    rebuild(project: Project): Promise<void>;
-    start(project: Project, restart?: boolean): Promise<void>;
+    start(project: Project, rebuild?: boolean, restart?: boolean): Promise<void>;
     stop(project: Project): Promise<void>;
     save(project: Project): Promise<void>;
     search(params?: Partial<SearchParams>): Promise<Project[]>;

package/lib/services/ProjectService.js

@@ -44,13 +44,13 @@ let ProjectService = class ProjectService {
         this.dockerService = dockerService;
     }
     fromObject(data) {
-        const projectService = this;
+        const _this = this;
         return new class extends core_1.Project {
             constructor(data) {
                 super(data);
             }
             async save() {
-                await projectService.save(this);
+                await _this.save(this);
             }
         }(data);
     }
@@ -76,46 +76,35 @@ let ProjectService = class ProjectService {
         }
         return project;
     }
-    async getContainer() {
-        const project = await this.get();
-        return this.dockerService.getContainer(project.containerName);
-    }
-    async rebuild(project) {
-        await this.stop(project);
-        if (project.type === "dockerfile") {
-            project.imageName = `project-${project.name}:develop`;
-            const images = await this.dockerService.imageLs({
-                tag: project.imageName
-            });
-            if (images.length > 0) {
-                await this.dockerService.imageRm(project.imageName);
-            }
-        }
-        await this.appEventsService.emit("project:rebuild", project);
-    }
-    async start(project, restart) {
-        if (project.type === "dockerfile") {
-            project.imageName = `project-${project.name}:develop`;
-            const images = await this.dockerService.imageLs({
-                tag: project.imageName
-            });
-            if (images.length === 0) {
-                await this.dockerService.buildImage({
-                    tag: project.imageName,
-                    buildArgs: project.buildArgs,
-                    context: this.appConfigService.getPWD(),
-                    src: project.dockerfile
-                });
-            }
-        }
-        await this.appEventsService.emit("project:beforeStart", project);
+    async start(project, rebuild, restart) {
         let container = await this.dockerService.getContainer(project.containerName);
-        if (container && restart) {
+        if (container && (restart || rebuild)) {
             container = null;
             await this.appEventsService.emit("project:stop", project);
             await this.dockerService.removeContainer(project.containerName);
         }
         if (!container) {
+            await this.appEventsService.emit("project:beforeStart", project);
+            if (project.type === "dockerfile") {
+                project.imageName = `project-${project.name}:develop`;
+                if (rebuild) {
+                    await this.dockerService.imageRm(project.imageName);
+                }
+                const images = await this.dockerService.imageLs({
+                    tag: project.imageName
+                });
+                if (images.length === 0) {
+                    await this.dockerService.buildImage({
+                        tag: project.imageName,
+                        buildArgs: project.buildArgs,
+                        context: this.appConfigService.getPWD(),
+                        src: project.dockerfile
+                    });
+                }
+            }
+            if (rebuild) {
+                await this.appEventsService.emit("project:rebuild", project);
+            }
             const config = await this.appConfigService.getConfig();
             container = await this.dockerService.createContainer({
                 name: project.containerName,

package/lib/services/ProxyService.d.ts

@@ -0,0 +1,14 @@
+import { Project } from "@wocker/core";
+import { AppConfigService } from "./AppConfigService";
+import { DockerService } from "./DockerService";
+export declare class ProxyService {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly dockerService: DockerService;
+    protected containerName: string;
+    protected imageName: string;
+    constructor(appConfigService: AppConfigService, dockerService: DockerService);
+    init(project: Project): Promise<void>;
+    start(restart?: boolean): Promise<void>;
+    stop(): Promise<void>;
+    logs(): Promise<void>;
+}

package/lib/services/ProxyService.js

@@ -0,0 +1,97 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProxyService = void 0;
+const core_1 = require("@wocker/core");
+const utils_1 = require("@wocker/utils");
+const FS_1 = require("../makes/FS");
+const AppConfigService_1 = require("./AppConfigService");
+const DockerService_1 = require("./DockerService");
+let ProxyService = class ProxyService {
+    constructor(appConfigService, dockerService) {
+        this.appConfigService = appConfigService;
+        this.dockerService = dockerService;
+        this.containerName = "proxy.workspace";
+        this.imageName = "nginxproxy/nginx-proxy";
+    }
+    async init(project) {
+        const enable = await (0, utils_1.promptConfirm)({
+            message: "Enable local proxy?",
+            default: project.getMeta("WITH_PROXY", "false") === "true"
+        });
+        if (enable) {
+            const appPort = await (0, utils_1.promptText)({
+                message: "App port:",
+                type: "number",
+                default: project.getEnv("VIRTUAL_PORT", "80")
+            });
+            project.setEnv("VIRTUAL_PORT", appPort);
+            project.setMeta("WITH_PROXY", "true");
+        }
+        else {
+            project.setMeta("WITH_PROXY", "false");
+        }
+        await project.save();
+    }
+    async start(restart) {
+        console.info("Proxy starting...");
+        if (restart) {
+            await this.stop();
+        }
+        let container = await this.dockerService.getContainer(this.containerName);
+        if (!container) {
+            await this.dockerService.pullImage(this.imageName);
+            const certsDir = this.appConfigService.dataPath("certs");
+            if (!FS_1.FS.existsSync(certsDir)) {
+                FS_1.FS.mkdirSync(certsDir, {
+                    recursive: true,
+                    mode: 0o700
+                });
+            }
+            const config = await this.appConfigService.getConfig();
+            const httpPort = config.getMeta("PROXY_HTTP_PORT", "80");
+            const httpsPort = config.getMeta("PROXY_HTTPS_PORT", "443");
+            container = await this.dockerService.createContainer({
+                name: this.containerName,
+                image: this.imageName,
+                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...");
+                await container.start();
+            }
+        }
+    }
+    async stop() {
+        await this.dockerService.removeContainer(this.containerName);
+    }
+    async logs() {
+        await this.dockerService.logs(this.containerName);
+    }
+};
+exports.ProxyService = ProxyService;
+exports.ProxyService = ProxyService = __decorate([
+    (0, core_1.Injectable)("PROXY_SERVICE"),
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+        DockerService_1.DockerService])
+], ProxyService);

package/lib/services/index.d.ts

@@ -5,3 +5,4 @@ export * from "./LogService";
 export * from "./PluginService";
 export * from "./PresetService";
 export * from "./ProjectService";
+export * from "./ProxyService";

package/lib/services/index.js

@@ -21,3 +21,4 @@ __exportStar(require("./LogService"), exports);
 __exportStar(require("./PluginService"), exports);
 __exportStar(require("./PresetService"), exports);
 __exportStar(require("./ProjectService"), exports);
+__exportStar(require("./ProxyService"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.13",
+    "version": "1.0.14",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -25,7 +25,7 @@
         "lint": "eslint \"**/*.{js,jsx,ts,tsx}\""
     },
     "dependencies": {
-        "@wocker/core": "^1.0.11",
+        "@wocker/core": "^1.0.12",
         "@wocker/utils": "^1.0.5",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",

package/presets/php-apache/Dockerfile

@@ -5,7 +5,7 @@ FROM php:${PHP_VERSION}-apache
 ARG UID=1000
 ARG USER=www-data
 
-RUN usermod -u $UID www-data && \
+RUN usermod -u $UID -s /bin/bash $USER && \
     mkdir -p /home/$USER && \
     touch /home/$USER/.bashrc && \
     chown -R $USER:$USER /home/$USER