@wocker/ws 1.0.22 → 1.0.24

package/lib/controllers/ProjectController.js

@@ -55,18 +55,20 @@ const cli_table3_1 = __importDefault(require("cli-table3"));
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
 const Path = __importStar(require("path"));
 const async_mutex_1 = require("async-mutex");
-const makes_1 = require("../makes");
-const services_1 = require("../services");
+const docker_1 = require("../modules/docker");
+const project_1 = require("../modules/project");
 let ProjectController = class ProjectController {
-    constructor(appConfigService, appEventsService, projectService, logService, dockerService) {
+    constructor(appConfigService, processService, eventService, projectService, projectRepository, logService, dockerService) {
         this.appConfigService = appConfigService;
-        this.appEventsService = appEventsService;
+        this.processService = processService;
+        this.eventService = eventService;
         this.projectService = projectService;
+        this.projectRepository = projectRepository;
         this.logService = logService;
         this.dockerService = dockerService;
     }
     async getProjectNames() {
-        const projects = this.projectService.search();
+        const projects = this.projectRepository.search();
         return projects.map((project) => {
             return project.name;
         });
@@ -81,16 +83,16 @@ let ProjectController = class ProjectController {
         }
     }
     async init(name, type) {
-        let project = this.projectService.searchOne({
-            path: this.appConfigService.pwd()
+        const fs = new core_1.FileSystem(this.processService.pwd());
+        let project = this.projectRepository.searchOne({
+            path: fs.path()
         });
-        const fs = new core_1.FileSystem(this.appConfigService.pwd());
         if (!project) {
-            project = this.projectService.fromObject({
-                path: this.appConfigService.pwd()
+            project = this.projectRepository.fromObject({
+                path: fs.path()
             });
         }
-        project.path = this.appConfigService.pwd();
+        project.path = fs.path();
         if (name) {
             project.name = name;
         }
@@ -104,7 +106,7 @@ let ProjectController = class ProjectController {
                     if (typeof name !== "string") {
                         return true;
                     }
-                    const otherProject = this.projectService.searchOne({
+                    const otherProject = this.projectRepository.searchOne({
                         name
                     });
                     if (otherProject && otherProject.path !== project.path) {
@@ -122,13 +124,14 @@ let ProjectController = class ProjectController {
         if (!type || !project.type || !mapTypes[project.type]) {
             project.type = await (0, utils_1.promptSelect)({
                 message: "Project type",
+                required: true,
                 options: mapTypes,
                 default: project.type
             });
         }
         switch (project.type) {
             case core_1.PROJECT_TYPE_DOCKERFILE: {
-                const files = await fs.readdirFiles();
+                const files = fs.readdir();
                 const dockerfiles = files.filter((fileName) => {
                     if (new RegExp("^(.*)\\.dockerfile$").test(fileName)) {
                         return true;
@@ -140,6 +143,7 @@ let ProjectController = class ProjectController {
                 }
                 project.dockerfile = await (0, utils_1.promptSelect)({
                     message: "Dockerfile",
+                    required: true,
                     options: dockerfiles.map((dockerfile) => {
                         return {
                             value: dockerfile
@@ -157,23 +161,44 @@ let ProjectController = class ProjectController {
                 });
                 break;
             }
+            case core_1.PROJECT_TYPE_COMPOSE: {
+                const composeFiles = fs.readdir().filter((file) => {
+                    return /docker-compose\./.test(file);
+                });
+                if (composeFiles.length === 0) {
+                    throw new Error("docker-compose files not found");
+                }
+                project.composefile = await (0, utils_1.promptSelect)({
+                    message: "Docker compose",
+                    required: true,
+                    options: composeFiles,
+                    default: project.composefile
+                });
+                break;
+            }
             case core_1.PROJECT_TYPE_PRESET:
                 break;
             default:
                 throw new Error("Invalid project type");
         }
-        await this.appEventsService.emit("project:init", project);
-        await project.save();
+        await this.eventService.emit("project:init", project);
+        project.save();
     }
     async destroy(name) {
         const project = this.projectService.get(name);
+        await this.projectService.stop(project);
+        this.appConfigService.removeProject(project.id);
+        this.appConfigService.save();
+        this.appConfigService.fs.rm(`projects/${project.id}`, {
+            recursive: true
+        });
     }
     async projectList(all) {
         const table = new cli_table3_1.default({
             head: ["Name", "Type", "Status"],
             colAligns: ["left", "center", "center"]
         });
-        const projects = this.projectService.search({});
+        const projects = this.projectRepository.search();
         for (const project of projects) {
             const container = await this.dockerService.getContainer(project.containerName);
             if (!container) {
@@ -187,28 +212,8 @@ let ProjectController = class ProjectController {
         }
         return table.toString();
     }
-    async start(name, detach, attach, rebuild, restart) {
-        const project = this.projectService.get(name);
-        await this.projectService.start(project, restart, rebuild);
-        if (attach) {
-            await this.dockerService.attach(project.containerName);
-        }
-        if (detach) {
-            console.info(yoctocolors_cjs_1.default.yellow("Warning: Detach option is deprecated"));
-        }
-    }
-    async stop(name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
-        await this.projectService.stop(project);
-    }
     async domains(name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         const table = new cli_table3_1.default({
             head: [yoctocolors_cjs_1.default.yellow("Domain")]
         });
@@ -218,49 +223,34 @@ let ProjectController = class ProjectController {
         return table.toString();
     }
     async addDomain(addDomains, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         for (const domain of addDomains) {
             project.addDomain(domain);
         }
-        await project.save();
+        project.save();
     }
     async setDomains(domains, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         project.clearDomains();
         for (const domain of domains) {
             project.addDomain(domain);
         }
-        await project.save();
+        project.save();
     }
     async removeDomain(removeDomains, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         for (const domain of removeDomains) {
             project.removeDomain(domain);
         }
-        await project.save();
+        project.save();
     }
     async clearDomain(name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         project.clearDomains();
-        await project.save();
+        project.save();
     }
     async ports(name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         const table = new cli_table3_1.default({
             head: ["Ports"]
         });
@@ -270,42 +260,30 @@ let ProjectController = class ProjectController {
         return table.toString();
     }
     async addPort(hostPort, containerPort, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         project.linkPort(parseInt(hostPort), parseInt(containerPort));
-        await project.save();
+        project.save();
     }
     async removePort(hostPort, containerPort, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         project.unlinkPort(parseInt(hostPort), parseInt(containerPort));
-        await project.save();
+        project.save();
     }
     async clearPorts(name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         if (project.ports) {
             delete project.ports;
-            await project.save();
+            project.save();
         }
     }
     async configList(name, global) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
         let env;
         if (!global) {
-            const project = this.projectService.get();
+            const project = this.projectService.get(name);
             env = project.env || {};
         }
         else {
-            const config = this.appConfigService.getConfig();
+            const config = this.appConfigService.config;
             env = config.env || {};
         }
         const table = new cli_table3_1.default({
@@ -317,12 +295,9 @@ let ProjectController = class ProjectController {
         return table.toString();
     }
     async configGet(keys, name, global) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
         let config = global
-            ? this.appConfigService.getConfig()
-            : this.projectService.get();
+            ? this.appConfigService.config
+            : this.projectService.get(name);
         const table = new cli_table3_1.default({
             head: ["KEY", "VALUE"]
         });
@@ -336,28 +311,27 @@ let ProjectController = class ProjectController {
         return table.toString();
     }
     async configSet(variables, name, global) {
-        if (!global && name) {
-            this.projectService.cdProject(name);
+        if (global) {
+            for (const variable of variables) {
+                const [key, value] = variable.split("=");
+                if (!value) {
+                    console.info(yoctocolors_cjs_1.default.yellow(`No value for "${key}"`));
+                    continue;
+                }
+                this.appConfigService.config.setEnv(key.trim(), value.trim());
+            }
+            return;
         }
-        const config = global
-            ? this.appConfigService.getConfig()
-            : this.projectService.get();
+        const project = this.projectService.get(name);
         for (const variable of variables) {
             const [key, value] = variable.split("=");
             if (!value) {
                 console.info(yoctocolors_cjs_1.default.yellow(`No value for "${key}"`));
                 continue;
             }
-            config.setEnv(key.trim(), value.trim());
-        }
-        await config.save();
-        if (!global) {
-            const project = this.projectService.get();
-            const container = await this.dockerService.getContainer(project.containerName);
-            if (container) {
-                await this.projectService.start(project, true);
-            }
+            project.setEnv(key, value);
         }
+        project.save();
     }
     async configUnset(configs, name, global) {
         const env = configs.reduce((env, config) => {
@@ -368,27 +342,14 @@ let ProjectController = class ProjectController {
         if (global) {
             return;
         }
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         for (const i in env) {
             project.unsetEnv(i);
         }
-        await project.save();
-        if (!global) {
-            const project = this.projectService.get();
-            const container = await this.dockerService.getContainer(project.containerName);
-            if (container) {
-                await this.projectService.start(project, true);
-            }
-        }
+        project.save();
     }
     async buildArgsList(name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         const table = new cli_table3_1.default({
             head: ["KEY", "VALUE"]
         });
@@ -399,10 +360,7 @@ let ProjectController = class ProjectController {
         return table.toString();
     }
     async buildArgsGet(args, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         const table = new cli_table3_1.default({
             head: ["KEY", "VALUE"]
         });
@@ -414,11 +372,8 @@ let ProjectController = class ProjectController {
         }
         return table.toString();
     }
-    async buildArgsSet(name, args) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+    async buildArgsSet(args, name) {
+        const project = this.projectService.get(name);
         const buildArgs = args.reduce((env, config) => {
             let [, key = "", value = ""] = config.split(/^([^=]+)=(.*)$/);
             key = key.trim();
@@ -434,13 +389,10 @@ let ProjectController = class ProjectController {
             }
             project.buildArgs[key] = buildArgs[key];
         }
-        await project.save();
+        project.save();
     }
     async buildArgsUnset(args, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         const buildArgs = args.reduce((env, config) => {
             let [, key = "", value = ""] = config.split(/^([^=]+)(?:=(.*))?$/);
             key = key.trim();
@@ -456,13 +408,10 @@ let ProjectController = class ProjectController {
                 delete project.buildArgs[key];
             }
         }
-        await project.save();
+        project.save();
     }
     async volumeList(name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         const table = new cli_table3_1.default({
             head: ["Volume"]
         });
@@ -473,30 +422,21 @@ let ProjectController = class ProjectController {
         return table.toString();
     }
     async volumeMount(volumes, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         if (Array.isArray(volumes) && volumes.length > 0) {
             project.volumeMount(...volumes);
-            await project.save();
+            project.save();
         }
     }
     async volumeUnmount(volumes, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         if (Array.isArray(volumes) && volumes.length > 0) {
             project.volumeUnmount(...volumes);
-            await project.save();
+            project.save();
         }
     }
     async extraHostList(name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         if (!project.extraHosts) {
             return "No extra hosts found";
         }
@@ -511,40 +451,25 @@ let ProjectController = class ProjectController {
         return table.toString();
     }
     async addExtraHost(extraHost, extraDomain, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         project.addExtraHost(extraHost, extraDomain);
-        await project.save();
+        project.save();
     }
     async removeExtraHost(extraHost, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         project.removeExtraHost(extraHost);
-        await project.save();
+        project.save();
     }
     async attach(name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         await this.dockerService.attach(project.containerName);
     }
     async exec(command, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         await this.dockerService.exec(project.containerName, command, true);
     }
     async run(script, args, name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         if (!project.scripts || !project.scripts[script]) {
             throw new Error(`Script ${script} not found`);
         }
@@ -571,7 +496,6 @@ let ProjectController = class ProjectController {
             if (clear) {
                 this.logService.clear();
             }
-            const logFilepath = this.appConfigService.dataPath("ws.log");
             const prepareLog = (str) => {
                 return str.replace(/^\[.*]\s([^:]+):\s.*$/gm, (substring, type) => {
                     switch (type) {
@@ -591,26 +515,29 @@ let ProjectController = class ProjectController {
                     }
                 });
             };
-            const stream = makes_1.FS.createReadLinesStream(logFilepath, follow ? -10 : undefined);
-            stream.on("data", (data) => {
-                process.stdout.write(prepareLog(data.toString()));
+            const file = this.appConfigService.fs.open("ws.log", "r");
+            const stream = file.createReadlineStream({
+                start: -10
+            });
+            stream.on("data", (line) => {
+                process.stdout.write(prepareLog(line));
                 process.stdout.write("\n");
             });
             if (follow) {
-                const stats = await makes_1.FS.stat(logFilepath);
-                const watcher = makes_1.FS.watch(logFilepath);
+                const stats = file.stat();
+                const watcher = this.appConfigService.fs.watch("ws.log");
                 const mutex = new async_mutex_1.Mutex();
-                let position = BigInt(stats.size);
+                let position = stats.size;
                 watcher.on("change", async () => {
                     await mutex.acquire();
                     try {
-                        const stats = await makes_1.FS.stat(logFilepath);
-                        if (BigInt(stats.size) < position) {
+                        const stats = file.stat();
+                        if (stats.size < position) {
                             console.info("file truncated");
-                            position = 0n;
+                            position = 0;
                         }
-                        const buffer = await makes_1.FS.readBytes(logFilepath, position);
-                        position += BigInt(buffer.length);
+                        const buffer = file.readBytes(position);
+                        position += buffer.length;
                         process.stdout.write(prepareLog(buffer.toString("utf-8")));
                     }
                     finally {
@@ -620,10 +547,8 @@ let ProjectController = class ProjectController {
             }
             return;
         }
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        await this.projectService.logs(detach);
+        const project = this.projectService.get(name);
+        await this.projectService.logs(project, detach);
     }
 };
 exports.ProjectController = ProjectController;
@@ -676,51 +601,6 @@ __decorate([
     __metadata("design:paramtypes", [Boolean]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "projectList", null);
-__decorate([
-    (0, core_1.Command)("start"),
-    (0, core_1.Description)("Starting project"),
-    __param(0, (0, core_1.Option)("name", {
-        type: "string",
-        alias: "n",
-        description: "The name of the project",
-        help: true
-    })),
-    __param(1, (0, core_1.Option)("detach", {
-        type: "boolean",
-        description: "Detach",
-        alias: "d"
-    })),
-    __param(2, (0, core_1.Option)("attach", {
-        type: "boolean",
-        description: "Attach",
-        alias: "a"
-    })),
-    __param(3, (0, core_1.Option)("build", {
-        type: "boolean",
-        description: "Build",
-        alias: "b"
-    })),
-    __param(4, (0, core_1.Option)("restart", {
-        type: "boolean",
-        alias: "r",
-        description: "Restart"
-    })),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Boolean, Boolean, Boolean, Boolean]),
-    __metadata("design:returntype", Promise)
-], ProjectController.prototype, "start", null);
-__decorate([
-    (0, core_1.Command)("stop"),
-    (0, core_1.Description)("Stopping project"),
-    __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, "stop", null);
 __decorate([
     (0, core_1.Command)("domains"),
     (0, core_1.Description)("Project domain list"),
@@ -921,13 +801,14 @@ __decorate([
 ], ProjectController.prototype, "buildArgsGet", null);
 __decorate([
     (0, core_1.Command)("build-args:set [...buildArgs]"),
-    __param(0, (0, core_1.Option)("name", {
+    __param(0, (0, core_1.Param)("buildArgs")),
+    __param(1, (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:paramtypes", [Array, String]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "buildArgsSet", null);
 __decorate([
@@ -1073,7 +954,7 @@ __decorate([
         type: "boolean",
         alias: "f"
     })),
-    __param(4, (0, core_1.Option)("clear", { alias: "c" })),
+    __param(4, (0, core_1.Option)("clear", "c")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Boolean, Boolean, Boolean, Boolean]),
     __metadata("design:returntype", Promise)
@@ -1081,9 +962,11 @@ __decorate([
 exports.ProjectController = ProjectController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Project commands"),
-    __metadata("design:paramtypes", [services_1.AppConfigService,
-        services_1.AppEventsService,
-        services_1.ProjectService,
-        services_1.LogService,
-        services_1.DockerService])
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.ProcessService,
+        core_1.EventService,
+        project_1.ProjectService,
+        project_1.ProjectRepository,
+        core_1.LogService,
+        docker_1.DockerService])
 ], ProjectController);

package/lib/controllers/index.d.ts

@@ -1,8 +1,5 @@
-export * from "./CertController";
 export * from "./CompletionController";
 export * from "./DebugController";
-export * from "./KeystoreController";
+export * from "./ExperimentalController";
 export * from "./PluginController";
-export * from "./PresetController";
 export * from "./ProjectController";
-export * from "./ProxyController";

package/lib/controllers/index.js

@@ -14,11 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./CertController"), exports);
 __exportStar(require("./CompletionController"), exports);
 __exportStar(require("./DebugController"), exports);
-__exportStar(require("./KeystoreController"), exports);
+__exportStar(require("./ExperimentalController"), exports);
 __exportStar(require("./PluginController"), exports);
-__exportStar(require("./PresetController"), exports);
 __exportStar(require("./ProjectController"), exports);
-__exportStar(require("./ProxyController"), exports);