@wocker/ws 1.0.23 → 1.0.24

package/lib/controllers/ProjectController.js

@@ -55,22 +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 AppConfigService_1 = require("../services/AppConfigService");
-const AppEventsService_1 = require("../services/AppEventsService");
-const ProjectService_1 = require("../services/ProjectService");
-const LogService_1 = require("../services/LogService");
-const modules_1 = require("../modules");
-const process = __importStar(require("node:process"));
+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;
         });
@@ -85,12 +83,12 @@ let ProjectController = class ProjectController {
         }
     }
     async init(name, type) {
-        const fs = new core_1.FileSystem(this.appConfigService.pwd());
-        let project = this.projectService.searchOne({
+        const fs = new core_1.FileSystem(this.processService.pwd());
+        let project = this.projectRepository.searchOne({
             path: fs.path()
         });
         if (!project) {
-            project = this.projectService.fromObject({
+            project = this.projectRepository.fromObject({
                 path: fs.path()
             });
         }
@@ -108,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) {
@@ -163,12 +161,27 @@ 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 this.eventService.emit("project:init", project);
         project.save();
     }
     async destroy(name) {
@@ -185,7 +198,7 @@ let ProjectController = class ProjectController {
             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) {
@@ -199,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 (detach) {
-            console.info(yoctocolors_cjs_1.default.yellow("Warning: Detach option is deprecated"));
-        }
-        if (attach) {
-            await this.dockerService.attach(project.containerName);
-        }
-    }
-    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")]
         });
@@ -230,20 +223,14 @@ 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);
         }
         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);
@@ -251,28 +238,19 @@ let ProjectController = class ProjectController {
         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);
         }
         project.save();
     }
     async clearDomain(name) {
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         project.clearDomains();
         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"]
         });
@@ -282,38 +260,26 @@ 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));
         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));
         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;
             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 {
@@ -329,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.config
-            : this.projectService.get();
+            : this.projectService.get(name);
         const table = new cli_table3_1.default({
             head: ["KEY", "VALUE"]
         });
@@ -359,10 +322,7 @@ let ProjectController = class ProjectController {
             }
             return;
         }
-        if (name) {
-            this.projectService.cdProject(name);
-        }
-        const project = this.projectService.get();
+        const project = this.projectService.get(name);
         for (const variable of variables) {
             const [key, value] = variable.split("=");
             if (!value) {
@@ -372,10 +332,6 @@ let ProjectController = class ProjectController {
             project.setEnv(key, value);
         }
         project.save();
-        const container = await this.dockerService.getContainer(project.containerName);
-        if (container) {
-            await this.projectService.start(project, true);
-        }
     }
     async configUnset(configs, name, global) {
         const env = configs.reduce((env, config) => {
@@ -386,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);
         }
         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);
-            }
-        }
     }
     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"]
         });
@@ -417,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"]
         });
@@ -433,10 +373,7 @@ let ProjectController = class ProjectController {
         return table.toString();
     }
     async buildArgsSet(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();
@@ -455,10 +392,7 @@ let ProjectController = class ProjectController {
         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();
@@ -477,10 +411,7 @@ let ProjectController = class ProjectController {
         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"]
         });
@@ -491,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);
             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);
             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";
         }
@@ -529,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);
         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);
         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`);
         }
@@ -640,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;
@@ -696,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"),
@@ -1094,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)
@@ -1102,9 +962,11 @@ __decorate([
 exports.ProjectController = ProjectController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Project commands"),
-    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
-        AppEventsService_1.AppEventsService,
-        ProjectService_1.ProjectService,
-        LogService_1.LogService,
-        modules_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

@@ -2,5 +2,4 @@ export * from "./CompletionController";
 export * from "./DebugController";
 export * from "./ExperimentalController";
 export * from "./PluginController";
-export * from "./PresetController";
 export * from "./ProjectController";

package/lib/controllers/index.js

@@ -18,5 +18,4 @@ __exportStar(require("./CompletionController"), exports);
 __exportStar(require("./DebugController"), exports);
 __exportStar(require("./ExperimentalController"), exports);
 __exportStar(require("./PluginController"), exports);
-__exportStar(require("./PresetController"), exports);
 __exportStar(require("./ProjectController"), exports);

package/lib/env.d.ts

@@ -1,8 +1,8 @@
-export declare const WOCKER_VERSION = "1.0.23";
+export declare const WOCKER_VERSION = "1.0.24";
 export declare const NODE_ENV: string;
 export declare const ROOT_DIR: string;
 export declare const PRESETS_DIR: string;
 export declare const PLUGINS_DIR: string;
-export declare const DATA_DIR: string;
+export declare const WOCKER_DATA_DIR: string;
 export declare const VIRTUAL_HOST_KEY = "VIRTUAL_HOST";
 export declare const KEYTAR_SERVICE: string;

package/lib/env.js

@@ -33,14 +33,14 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KEYTAR_SERVICE = exports.VIRTUAL_HOST_KEY = exports.DATA_DIR = exports.PLUGINS_DIR = exports.PRESETS_DIR = exports.ROOT_DIR = exports.NODE_ENV = exports.WOCKER_VERSION = void 0;
+exports.KEYTAR_SERVICE = exports.VIRTUAL_HOST_KEY = exports.WOCKER_DATA_DIR = exports.PLUGINS_DIR = exports.PRESETS_DIR = exports.ROOT_DIR = exports.NODE_ENV = exports.WOCKER_VERSION = void 0;
 const OS = __importStar(require("os"));
 const Path = __importStar(require("path"));
-exports.WOCKER_VERSION = "1.0.23";
+exports.WOCKER_VERSION = "1.0.24";
 exports.NODE_ENV = process.env.NODE_ENV;
 exports.ROOT_DIR = Path.join(__dirname, "..");
 exports.PRESETS_DIR = Path.join(exports.ROOT_DIR, "presets");
 exports.PLUGINS_DIR = Path.join(exports.ROOT_DIR, "plugins");
-exports.DATA_DIR = process.env.WS_DIR || Path.join(OS.homedir(), ".workspace");
+exports.WOCKER_DATA_DIR = process.env.WS_DIR || Path.join(OS.homedir(), ".workspace");
 exports.VIRTUAL_HOST_KEY = "VIRTUAL_HOST";
 exports.KEYTAR_SERVICE = process.env.WOCKER_KEYTAR_SERVICE || "wocker";

package/lib/main.js

@@ -6,16 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.app = void 0;
 const core_1 = require("@wocker/core");
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
-const AppModule_1 = require("./AppModule");
-const AppConfigService_1 = require("./services/AppConfigService");
-const LogService_1 = require("./services/LogService");
+const RootModule_1 = require("./RootModule");
 exports.app = {
     async run(args) {
-        const app = await core_1.Factory.create(AppModule_1.AppModule);
-        const configService = app.get(AppConfigService_1.AppConfigService);
-        const logger = app.get(LogService_1.LogService);
+        const context = await core_1.Factory.create(RootModule_1.RootModule), appConfigService = context.get(core_1.AppConfigService), logService = context.get(core_1.LogService);
         try {
-            const res = await app.run(args);
+            const res = await context.run(args);
             if (res) {
                 process.stdout.write(res);
                 process.stdout.write("\n");
@@ -32,8 +28,8 @@ exports.app = {
             if (err instanceof core_1.CommandNotFoundError) {
                 return;
             }
-            if (configService.config.debug) {
-                logger.error(err.stack || err.toString());
+            if (appConfigService.debug) {
+                logService.error(err.stack || err.toString());
             }
         }
     }

package/lib/makes/index.d.ts

@@ -1,3 +1,2 @@
 export * from "./Http";
-export * from "./Logger";
 export * from "./Plugin";

package/lib/makes/index.js

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Http"), exports);
-__exportStar(require("./Logger"), exports);
 __exportStar(require("./Plugin"), exports);

package/lib/modules/app/index.js

@@ -8,9 +8,25 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppModule = void 0;
 const core_1 = require("@wocker/core");
+const env_1 = require("../../env");
 let AppModule = class AppModule {
 };
 exports.AppModule = AppModule;
 exports.AppModule = AppModule = __decorate([
-    (0, core_1.Module)({})
+    (0, core_1.Module)({
+        providers: [
+            {
+                provide: core_1.WOCKER_VERSION_KEY,
+                useValue: env_1.WOCKER_VERSION
+            },
+            {
+                provide: core_1.WOCKER_DATA_DIR_KEY,
+                useValue: env_1.WOCKER_DATA_DIR
+            }
+        ],
+        exports: [
+            core_1.WOCKER_VERSION_KEY,
+            core_1.WOCKER_DATA_DIR_KEY
+        ]
+    })
 ], AppModule);

package/lib/modules/docker/index.d.ts

@@ -1,8 +1,8 @@
 import { ContainerService } from "./services/ContainerService";
-import { ImageService } from "./services/ImageService";
 import { DockerService } from "./services/DockerService";
+import { ImageService } from "./services/ImageService";
 import { ModemService } from "./services/ModemService";
 import { ProtoService } from "./services/ProtoService";
 export declare class DockerModule {
 }
-export { ContainerService, ImageService, DockerService, ModemService, ProtoService };
+export { ContainerService, DockerService, ImageService, ModemService, ProtoService };

package/lib/modules/docker/index.js

@@ -6,14 +6,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProtoService = exports.ModemService = exports.DockerService = exports.ImageService = exports.ContainerService = exports.DockerModule = void 0;
+exports.ProtoService = exports.ModemService = exports.ImageService = exports.DockerService = exports.ContainerService = exports.DockerModule = void 0;
 const core_1 = require("@wocker/core");
 const ContainerService_1 = require("./services/ContainerService");
 Object.defineProperty(exports, "ContainerService", { enumerable: true, get: function () { return ContainerService_1.ContainerService; } });
-const ImageService_1 = require("./services/ImageService");
-Object.defineProperty(exports, "ImageService", { enumerable: true, get: function () { return ImageService_1.ImageService; } });
 const DockerService_1 = require("./services/DockerService");
 Object.defineProperty(exports, "DockerService", { enumerable: true, get: function () { return DockerService_1.DockerService; } });
+const ImageService_1 = require("./services/ImageService");
+Object.defineProperty(exports, "ImageService", { enumerable: true, get: function () { return ImageService_1.ImageService; } });
 const ModemService_1 = require("./services/ModemService");
 Object.defineProperty(exports, "ModemService", { enumerable: true, get: function () { return ModemService_1.ModemService; } });
 const ProtoService_1 = require("./services/ProtoService");
@@ -25,15 +25,15 @@ exports.DockerModule = DockerModule = __decorate([
     (0, core_1.Module)({
         providers: [
             ContainerService_1.ContainerService,
-            ImageService_1.ImageService,
             DockerService_1.DockerService,
+            ImageService_1.ImageService,
             ModemService_1.ModemService,
             ProtoService_1.ProtoService
         ],
         exports: [
             ContainerService_1.ContainerService,
-            ImageService_1.ImageService,
             DockerService_1.DockerService,
+            ImageService_1.ImageService,
             ModemService_1.ModemService,
             ProtoService_1.ProtoService
         ]