@wocker/ws 1.0.31 → 1.1.0

package/lib/modules/project/controllers/MetadataController.js

@@ -0,0 +1,89 @@
+"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);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MetadataController = void 0;
+const core_1 = require("@wocker/core");
+const cli_table3_1 = __importDefault(require("cli-table3"));
+const ProjectService_1 = require("../services/ProjectService");
+let MetadataController = class MetadataController {
+    constructor(projectService) {
+        this.projectService = projectService;
+    }
+    list(projectName) {
+        const project = this.projectService.get(projectName);
+        const table = new cli_table3_1.default();
+        for (const key in project.metadata) {
+            table.push([key, project.metadata[key]]);
+        }
+        return table.toString();
+    }
+    set(meta, projectName) {
+        const project = this.projectService.get(projectName);
+        for (const field of meta) {
+            let [, key = "", value = ""] = field.split(/^([^=]+)=(.*)$/);
+            key = key.trim();
+            value = value.trim();
+            if (!key) {
+                continue;
+            }
+            project.setMeta(key, value);
+        }
+        project.save();
+    }
+    unset(meta, projectName) {
+        const project = this.projectService.get(projectName);
+        for (const field of meta) {
+            let [, key = ""] = field.split(/^([^=]+)(?:=(.*))?$/);
+            key = key.trim();
+            project.unsetMeta(key);
+        }
+        project.save();
+    }
+};
+exports.MetadataController = MetadataController;
+__decorate([
+    (0, core_1.Command)("meta"),
+    (0, core_1.Description)("List of metafields"),
+    __param(0, (0, core_1.Option)("name", "n")),
+    __param(0, (0, core_1.Description)("The name of the project")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", void 0)
+], MetadataController.prototype, "list", null);
+__decorate([
+    (0, core_1.Command)("meta:set [...meta]"),
+    __param(0, (0, core_1.Param)("meta")),
+    __param(1, (0, core_1.Option)("name", "n")),
+    __param(1, (0, core_1.Description)("The name of the project")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Array, String]),
+    __metadata("design:returntype", void 0)
+], MetadataController.prototype, "set", null);
+__decorate([
+    (0, core_1.Command)("meta:unset [...meta]"),
+    __param(0, (0, core_1.Param)("meta")),
+    __param(1, (0, core_1.Option)("name", "n")),
+    __param(1, (0, core_1.Description)("The name of the project")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Array, String]),
+    __metadata("design:returntype", void 0)
+], MetadataController.prototype, "unset", null);
+exports.MetadataController = MetadataController = __decorate([
+    (0, core_1.Controller)(),
+    (0, core_1.Description)("Metadata commands"),
+    __metadata("design:paramtypes", [ProjectService_1.ProjectService])
+], MetadataController);

package/lib/modules/project/controllers/ProjectController.d.ts

@@ -1,9 +1,9 @@
-import { AppConfigService, AppFileSystemService, ProcessService, ProjectType, EventService, LogService } from "@wocker/core";
+import { AppService, AppFileSystemService, ProcessService, EventService, ProjectType, LogService } from "@wocker/core";
 import { DockerService } from "@wocker/docker-module";
 import { PresetService } from "../../preset";
 import { ProjectService } from "../services/ProjectService";
 export declare class ProjectController {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly fs: AppFileSystemService;
     protected readonly processService: ProcessService;
     protected readonly projectService: ProjectService;
@@ -11,11 +11,11 @@ export declare class ProjectController {
     protected readonly eventService: EventService;
     protected readonly dockerService: DockerService;
     protected readonly logService: LogService;
-    constructor(appConfigService: AppConfigService, fs: AppFileSystemService, processService: ProcessService, projectService: ProjectService, presetService: PresetService, eventService: EventService, dockerService: DockerService, logService: LogService);
+    constructor(appService: AppService, fs: AppFileSystemService, processService: ProcessService, projectService: ProjectService, presetService: PresetService, eventService: EventService, dockerService: DockerService, logService: LogService);
     protected getProjectNames(): Promise<string[]>;
     getScriptNames(): Promise<string[]>;
     init(name: string, type: ProjectType): Promise<void>;
-    destroy(name?: string): Promise<void>;
+    destroy(name?: string, yes?: boolean): Promise<void>;
     start(name?: string, restart?: boolean, build?: boolean, attach?: boolean): Promise<void>;
     stop(name?: string): Promise<void>;
     projectList(all: boolean): Promise<string>;
@@ -34,8 +34,8 @@ export declare class ProjectController {
     clearPorts(name?: string): Promise<void>;
     configList(name?: string, global?: boolean, service?: string): Promise<string>;
     configGet(keys: string[], name: string, global: boolean): Promise<string>;
-    configSet(variables: string[], global: boolean, name: string, service?: string): Promise<void>;
-    configUnset(configs: string[], global?: boolean, name?: string, service?: string): Promise<void>;
+    configSet(variables: string[], global: boolean, local: boolean, name: string, service?: string): Promise<void>;
+    configUnset(configs: string[], global?: boolean, local?: boolean, name?: string, service?: string): Promise<void>;
     volumeList(name?: string): Promise<string>;
     volumeMount(volumes: string[], name: string): Promise<void>;
     volumeUnmount(volumes: string[], name: string): Promise<void>;

package/lib/modules/project/controllers/ProjectController.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectController = void 0;
 const core_1 = require("@wocker/core");
 const docker_module_1 = require("@wocker/docker-module");
-const utils_1 = require("@wocker/utils");
+const prompts_1 = require("@wocker/prompts");
 const path_1 = __importDefault(require("path"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
@@ -26,8 +26,8 @@ const async_mutex_1 = require("async-mutex");
 const preset_1 = require("../../preset");
 const ProjectService_1 = require("../services/ProjectService");
 let ProjectController = class ProjectController {
-    constructor(appConfigService, fs, processService, projectService, presetService, eventService, dockerService, logService) {
-        this.appConfigService = appConfigService;
+    constructor(appService, fs, processService, projectService, presetService, eventService, dockerService, logService) {
+        this.appService = appService;
         this.fs = fs;
         this.processService = processService;
         this.projectService = projectService;
@@ -57,18 +57,14 @@ let ProjectController = class ProjectController {
             path: fs.path()
         });
         if (!project) {
-            project = new core_1.Project({
-                type: core_1.PROJECT_TYPE_IMAGE,
-                name: fs.basename(),
-                path: fs.path()
-            });
+            project = new core_1.Project(fs.basename(), fs.path());
         }
         project.path = fs.path();
         if (name) {
             project.name = name;
         }
         if (!name || !project.name) {
-            project.name = await (0, utils_1.promptInput)({
+            project.name = await (0, prompts_1.promptInput)({
                 required: "Project name is required",
                 message: "Project name",
                 type: "text",
@@ -91,9 +87,9 @@ let ProjectController = class ProjectController {
         if (type) {
             project.type = type;
         }
-        const mapTypes = this.appConfigService.getProjectTypes();
+        const mapTypes = this.appService.getProjectTypes();
         if (!type || !project.type || !mapTypes[project.type]) {
-            project.type = await (0, utils_1.promptSelect)({
+            project.type = await (0, prompts_1.promptSelect)({
                 message: "Project type",
                 required: true,
                 options: mapTypes,
@@ -101,7 +97,7 @@ let ProjectController = class ProjectController {
             });
         }
         switch (project.type) {
-            case core_1.PROJECT_TYPE_DOCKERFILE: {
+            case core_1.ProjectType.DOCKERFILE: {
                 const files = fs.readdir();
                 const dockerfiles = files.filter((fileName) => {
                     if (new RegExp("^(.*)\\.dockerfile$").test(fileName)) {
@@ -112,7 +108,7 @@ let ProjectController = class ProjectController {
                 if (dockerfiles.length === 0) {
                     throw new Error("Dockerfiles not found");
                 }
-                project.dockerfile = await (0, utils_1.promptSelect)({
+                project.dockerfile = await (0, prompts_1.promptSelect)({
                     message: "Dockerfile",
                     required: true,
                     options: dockerfiles.map((dockerfile) => {
@@ -124,22 +120,22 @@ let ProjectController = class ProjectController {
                 });
                 break;
             }
-            case core_1.PROJECT_TYPE_IMAGE: {
-                project.imageName = await (0, utils_1.promptInput)({
+            case core_1.ProjectType.IMAGE: {
+                project.image = await (0, prompts_1.promptInput)({
                     message: "Image name",
                     required: true,
-                    default: project.imageName
+                    default: project.image
                 });
                 break;
             }
-            case core_1.PROJECT_TYPE_COMPOSE: {
+            case core_1.ProjectType.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)({
+                project.composefile = await (0, prompts_1.promptSelect)({
                     message: "Docker compose",
                     required: true,
                     options: composeFiles,
@@ -147,7 +143,7 @@ let ProjectController = class ProjectController {
                 });
                 break;
             }
-            case core_1.PROJECT_TYPE_PRESET:
+            case core_1.ProjectType.PRESET:
                 break;
             default:
                 throw new Error("Invalid project type");
@@ -155,11 +151,19 @@ let ProjectController = class ProjectController {
         await this.eventService.emit("project:init", project);
         project.save();
     }
-    async destroy(name) {
+    async destroy(name, yes) {
         const project = this.projectService.get(name);
+        if (!yes) {
+            const confirm = await (0, prompts_1.promptConfirm)({
+                message: `Are you sure you want to ${yoctocolors_cjs_1.default.red(`delete "${yoctocolors_cjs_1.default.bold(project.name)}"`)}? This action cannot be undone.`,
+                default: false
+            });
+            if (!confirm) {
+                throw new Error("Aborted");
+            }
+        }
         await this.projectService.stop(project);
-        this.appConfigService.removeProject(project.name);
-        this.appConfigService.save();
+        this.appService.removeProject(project.name);
         this.fs.rm(`projects/${project.name}`, {
             recursive: true
         });
@@ -284,6 +288,7 @@ let ProjectController = class ProjectController {
             project.addDomain(domain);
         }
         project.save();
+        await this.eventService.emit("project:add-domain", project, addDomains);
     }
     async setDomains(domains, name) {
         const project = this.projectService.get(name);
@@ -328,7 +333,7 @@ let ProjectController = class ProjectController {
     async clearPorts(name) {
         const project = this.projectService.get(name);
         if (project.ports) {
-            delete project.ports;
+            project.ports = [];
             project.save();
         }
     }
@@ -337,10 +342,10 @@ let ProjectController = class ProjectController {
             head: ["KEY", "VALUE"]
         });
         if (global) {
-            for (const i in this.appConfigService.config.env) {
+            for (const i in this.appService.config.env) {
                 table.push([
                     i,
-                    this.appConfigService.config.env[i]
+                    this.appService.config.env[i]
                 ]);
             }
         }
@@ -376,7 +381,7 @@ let ProjectController = class ProjectController {
     }
     async configGet(keys, name, global) {
         let config = global
-            ? this.appConfigService.config
+            ? this.appService.config
             : this.projectService.get(name);
         const table = new cli_table3_1.default({
             head: ["KEY", "VALUE"]
@@ -390,7 +395,7 @@ let ProjectController = class ProjectController {
         }
         return table.toString();
     }
-    async configSet(variables, global, name, service) {
+    async configSet(variables, global, local, name, service) {
         if (global) {
             for (const variable of variables) {
                 const [key, value] = variable.split("=");
@@ -398,23 +403,26 @@ let ProjectController = class ProjectController {
                     console.info(yoctocolors_cjs_1.default.yellow(`No value for "${key}"`));
                     continue;
                 }
-                this.appConfigService.setEnv(key.trim(), value.trim());
+                this.appService.setEnv(key.trim(), value.trim());
             }
-            this.appConfigService.save();
             return;
         }
         const project = this.projectService.get(name);
         for (const variable of variables) {
-            const [key, value] = variable.split("=");
+            const [, key, value] = /^([^=]+)=(.*)$/.exec(variable) || [];
+            if (!key) {
+                continue;
+            }
             if (!value) {
                 console.info(yoctocolors_cjs_1.default.yellow(`No value for "${key}"`));
                 continue;
             }
-            project.setEnv(key, value, service);
+            const config = !local ? project.configs.app : project.configs.project;
+            config.setEnv(key, value, service);
         }
         project.save();
     }
-    async configUnset(configs, global, name, service) {
+    async configUnset(configs, global, local, name, service) {
         const env = configs.reduce((env, config) => {
             const [key] = config.split("=");
             env[key.trim()] = null;
@@ -422,14 +430,16 @@ let ProjectController = class ProjectController {
         }, {});
         if (global) {
             for (const i in env) {
-                this.appConfigService.unsetEnv(i);
+                this.appService.unsetEnv(i);
             }
-            this.appConfigService.save();
             return;
         }
         const project = this.projectService.get(name);
         for (const i in env) {
-            project.unsetEnv(i, service);
+            const config = !local
+                ? project.configs.app
+                : project.configs.project;
+            config.unsetEnv(i, service);
         }
         project.save();
     }
@@ -489,7 +499,7 @@ let ProjectController = class ProjectController {
         if (!preset) {
             throw new Error("Preset not found");
         }
-        const confirm = await (0, utils_1.promptConfirm)({
+        const confirm = await (0, prompts_1.promptConfirm)({
             message: "Confirm eject",
             default: false
         });
@@ -501,7 +511,7 @@ let ProjectController = class ProjectController {
             if (!copier.destination.exists(preset.dockerfile)) {
                 copier.copy(preset.dockerfile);
             }
-            project.type = "dockerfile";
+            project.type = core_1.ProjectType.DOCKERFILE;
             project.dockerfile = preset.dockerfile;
         }
         const files = copier.source.readdir("", {
@@ -630,8 +640,10 @@ __decorate([
     (0, core_1.Description)("Permanently destroy a project"),
     __param(0, (0, core_1.Option)("name", "n")),
     __param(0, (0, core_1.Description)("The name of the project")),
+    __param(1, (0, core_1.Option)("yes", "y")),
+    __param(1, (0, core_1.Description)("Skip confirmation prompt")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
+    __metadata("design:paramtypes", [String, Boolean]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "destroy", null);
 __decorate([
@@ -835,12 +847,13 @@ __decorate([
     (0, core_1.Description)("Setting env variables"),
     __param(0, (0, core_1.Param)("configs")),
     __param(1, (0, core_1.Option)("global", "g")),
-    __param(2, (0, core_1.Option)("name", "n")),
-    __param(2, (0, core_1.Description)("The name of the project")),
-    __param(3, (0, core_1.Option)("service", "s")),
-    __param(3, (0, core_1.Description)("The name of the service")),
+    __param(2, (0, core_1.Option)("local", "l")),
+    __param(3, (0, core_1.Option)("name", "n")),
+    __param(3, (0, core_1.Description)("The name of the project")),
+    __param(4, (0, core_1.Option)("service", "s")),
+    __param(4, (0, core_1.Description)("The name of the service")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Array, Boolean, String, String]),
+    __metadata("design:paramtypes", [Array, Boolean, Boolean, String, String]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "configSet", null);
 __decorate([
@@ -848,12 +861,13 @@ __decorate([
     (0, core_1.Description)("Unset environment variable"),
     __param(0, (0, core_1.Param)("configs")),
     __param(1, (0, core_1.Option)("global", "g")),
-    __param(2, (0, core_1.Option)("name", "n")),
-    __param(2, (0, core_1.Description)("The name of the project")),
-    __param(3, (0, core_1.Option)("service", "s")),
-    __param(3, (0, core_1.Description)("The name of the service")),
+    __param(2, (0, core_1.Option)("local", "l")),
+    __param(3, (0, core_1.Option)("name", "n")),
+    __param(3, (0, core_1.Description)("The name of the project")),
+    __param(4, (0, core_1.Option)("service", "s")),
+    __param(4, (0, core_1.Description)("The name of the service")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Array, Boolean, String, String]),
+    __metadata("design:paramtypes", [Array, Boolean, Boolean, String, String]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "configUnset", null);
 __decorate([
@@ -976,7 +990,7 @@ __decorate([
 exports.ProjectController = ProjectController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Project commands"),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         core_1.AppFileSystemService,
         core_1.ProcessService,
         ProjectService_1.ProjectService,

package/lib/modules/project/controllers/SecretsController.js

@@ -14,7 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecretsController = void 0;
 const core_1 = require("@wocker/core");
-const utils_1 = require("@wocker/utils");
+const prompts_1 = require("@wocker/prompts");
 const ProjectService_1 = require("../services/ProjectService");
 let SecretsController = class SecretsController {
     constructor(projectService) {
@@ -22,7 +22,7 @@ let SecretsController = class SecretsController {
     }
     async create(secret, name, global) {
         const project = this.projectService.get(name);
-        const value = await (0, utils_1.promptInput)({
+        const value = await (0, prompts_1.promptInput)({
             message: "Secret value",
             type: "password"
         });

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

@@ -1,5 +1,4 @@
-import { ProjectRepository } from "./repositories/ProjectRepository";
 import { ProjectService } from "./services/ProjectService";
 export declare class ProjectModule {
 }
-export { ProjectRepository, ProjectService };
+export { ProjectService };

package/lib/modules/project/index.js

@@ -9,15 +9,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProjectService = exports.ProjectRepository = exports.ProjectModule = void 0;
+exports.ProjectService = exports.ProjectModule = void 0;
 const core_1 = require("@wocker/core");
 const docker_module_1 = __importDefault(require("@wocker/docker-module"));
 const keystore_1 = require("../keystore");
 const preset_1 = require("../preset");
 const ProjectController_1 = require("./controllers/ProjectController");
+const MetadataController_1 = require("./controllers/MetadataController");
 const SecretsController_1 = require("./controllers/SecretsController");
-const ProjectRepository_1 = require("./repositories/ProjectRepository");
-Object.defineProperty(exports, "ProjectRepository", { enumerable: true, get: function () { return ProjectRepository_1.ProjectRepository; } });
 const ProjectService_1 = require("./services/ProjectService");
 Object.defineProperty(exports, "ProjectService", { enumerable: true, get: function () { return ProjectService_1.ProjectService; } });
 let ProjectModule = class ProjectModule {
@@ -32,14 +31,13 @@ exports.ProjectModule = ProjectModule = __decorate([
         ],
         controllers: [
             ProjectController_1.ProjectController,
-            SecretsController_1.SecretsController
+            SecretsController_1.SecretsController,
+            MetadataController_1.MetadataController
         ],
         providers: [
-            ProjectRepository_1.ProjectRepository,
             ProjectService_1.ProjectService
         ],
         exports: [
-            ProjectRepository_1.ProjectRepository,
             ProjectService_1.ProjectService
         ]
     })

package/lib/modules/project/services/ProjectService.d.ts

@@ -1,9 +1,8 @@
-import { AppConfigService, EventService, LogService, ProcessService, Project, ProjectService as CoreProjectService, ProjectRepositorySearchParams as SearchParams } from "@wocker/core";
+import { AppService, EventService, LogService, ProcessService, Project, ProjectRepository, ProjectService as CoreProjectService } from "@wocker/core";
 import { ComposeService, DockerService } from "@wocker/docker-module";
 import { PresetRepository, PresetService } from "../../preset";
-import { ProjectRepository } from "../repositories/ProjectRepository";
 export declare class ProjectService extends CoreProjectService {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly processService: ProcessService;
     protected readonly eventService: EventService;
     protected readonly dockerService: DockerService;
@@ -12,10 +11,10 @@ export declare class ProjectService extends CoreProjectService {
     protected readonly presetService: PresetService;
     protected readonly presetRepository: PresetRepository;
     protected readonly logService: LogService;
-    constructor(appConfigService: AppConfigService, processService: ProcessService, eventService: EventService, dockerService: DockerService, composeService: ComposeService, projectRepository: ProjectRepository, presetService: PresetService, presetRepository: PresetRepository, logService: LogService);
+    constructor(appService: AppService, processService: ProcessService, eventService: EventService, dockerService: DockerService, composeService: ComposeService, projectRepository: ProjectRepository, presetService: PresetService, presetRepository: PresetRepository, logService: LogService);
     get(name?: string): Project;
-    search(params?: SearchParams): Project[];
-    searchOne(params?: SearchParams): Project | null;
+    search(params?: ProjectRepository.SearchParams): Project[];
+    searchOne(params?: ProjectRepository.SearchParams): Project | null;
     save(project: Project): void;
     start(project: Project, restart?: boolean, rebuild?: boolean, attach?: boolean): Promise<void>;
     stop(project: Project): Promise<void>;