@wocker/ws 1.0.20 → 1.0.22

package/lib/controllers/PresetController.js

@@ -21,13 +21,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -46,20 +56,22 @@ const Path = __importStar(require("path"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const env_1 = require("../env");
 const utils_3 = require("../utils");
+const repositories_1 = require("../repositories");
 const services_1 = require("../services");
 let PresetController = class PresetController {
-    constructor(appConfigService, appEventsService, projectService, presetService, dockerService) {
+    constructor(appConfigService, appEventsService, projectService, presetService, presetRepository, dockerService) {
         this.appConfigService = appConfigService;
         this.appEventsService = appEventsService;
         this.projectService = projectService;
         this.presetService = presetService;
+        this.presetRepository = presetRepository;
         this.dockerService = dockerService;
         this.appEventsService.on("project:init", (project) => this.onInit(project));
         this.appEventsService.on("project:beforeStart", (project) => this.onBeforeStart(project));
         this.appEventsService.on("project:rebuild", (project) => this.onRebuild(project));
     }
     async presets() {
-        const presets = await this.presetService.search();
+        const presets = this.presetRepository.search();
         return presets.map((preset) => {
             return preset.name;
         });
@@ -68,12 +80,12 @@ let PresetController = class PresetController {
         if (project.type !== core_1.PROJECT_TYPE_PRESET) {
             return;
         }
-        const presets = await this.presetService.search();
+        const presets = this.presetRepository.search();
         if (presets.length === 0) {
             throw new Error("No presets");
         }
         project.preset = await (0, utils_1.promptSelect)({
-            message: "Choose preset:",
+            message: "Choose preset",
             options: presets.map((preset) => {
                 return {
                     label: preset.name,
@@ -83,7 +95,7 @@ let PresetController = class PresetController {
             default: project.preset
         });
         project.presetMode = await (0, utils_1.promptSelect)({
-            message: "Preset mode:",
+            message: "Preset mode",
             options: [
                 {
                     label: "For project only",
@@ -96,15 +108,15 @@ let PresetController = class PresetController {
             ],
             default: project.presetMode
         });
-        const preset = await this.presetService.get(project.preset);
+        const preset = this.presetService.get(project.preset);
         if (!preset) {
             throw new Error("Preset not found");
         }
         if (preset.buildArgsOptions) {
-            project.buildArgs = await (0, utils_1.promptConfig)(preset.buildArgsOptions, project.buildArgs);
+            project.buildArgs = await this.presetService.prompt(preset.buildArgsOptions, project.buildArgs);
         }
         if (preset.envOptions) {
-            project.env = await (0, utils_1.promptConfig)(preset.envOptions, project.env);
+            project.env = await this.presetService.prompt(preset.envOptions, project.env);
         }
         if (preset.volumeOptions) {
             for (let volume of preset.volumeOptions) {
@@ -112,15 +124,15 @@ let PresetController = class PresetController {
                     ...project.buildArgs || {},
                     ...project.env || {}
                 });
-                const { source, destination, options } = (0, utils_3.volumeParse)(volume);
+                const { source, destination, options } = (0, utils_2.volumeParse)(volume);
                 let projectVolume = project.getVolumeByDestination(destination);
-                const newSource = await (0, utils_1.promptText)({
-                    message: "Volume:",
+                const newSource = await (0, utils_1.promptInput)({
+                    message: "Volume",
                     required: true,
                     suffix: `:${destination}`,
-                    default: projectVolume ? (0, utils_3.volumeParse)(projectVolume).source : source
+                    default: projectVolume ? (0, utils_2.volumeParse)(projectVolume).source : source
                 });
-                projectVolume = (0, utils_3.volumeFormat)({
+                projectVolume = (0, utils_2.volumeFormat)({
                     source: newSource,
                     destination,
                     options
@@ -136,7 +148,7 @@ let PresetController = class PresetController {
         if (project.type !== core_1.PROJECT_TYPE_PRESET) {
             return;
         }
-        const preset = await this.presetService.get(project.preset);
+        const preset = this.presetService.get(project.preset);
         if (!preset) {
             throw new Error(`Preset ${project.preset} not found`);
         }
@@ -151,7 +163,7 @@ let PresetController = class PresetController {
         if (project.type !== core_1.PROJECT_TYPE_PRESET) {
             return;
         }
-        const preset = await this.presetService.get(project.preset);
+        const preset = this.presetService.get(project.preset);
         if (preset.dockerfile) {
             project.imageName = this.presetService.getImageNameForProject(project, preset);
             if (!await this.dockerService.imageExists(project.imageName)) {
@@ -170,27 +182,32 @@ let PresetController = class PresetController {
     async init() {
         await this.presetService.init();
     }
-    async deinit() {
+    async destroy() {
         await this.presetService.deinit();
     }
-    async add(name) {
-        await this.presetService.addPreset(name);
+    async add(name, version) {
+        await this.presetService.addPreset(name, version);
     }
     async list() {
-        const presets = await this.presetService.search();
+        const presets = this.presetRepository.search();
         const table = new cli_table3_1.default({
             head: [
                 "Name",
-                "Source"
+                "Source",
+                "Path"
             ]
         });
         for (const preset of presets) {
-            table.push([preset.name, preset.source]);
+            table.push([
+                preset.name,
+                preset.source,
+                preset.source === core_1.PRESET_SOURCE_EXTERNAL ? preset.path : ""
+            ]);
         }
         return table.toString();
     }
     async delete(name, confirm) {
-        const preset = await this.presetService.get(name);
+        const preset = this.presetService.get(name);
         if (typeof confirm === "undefined" || confirm === null) {
             confirm = await (0, utils_2.promptConfirm)({
                 message: `Delete preset ${name}?`,
@@ -201,14 +218,14 @@ let PresetController = class PresetController {
             return;
         }
         console.info("Deleting...");
-        await preset.delete();
+        preset.delete();
     }
     async eject(name) {
         if (name) {
             this.projectService.cdProject(name);
         }
         const project = this.projectService.get();
-        const preset = await this.presetService.get(project.preset);
+        const preset = this.presetService.get(project.preset);
         if (!preset) {
             throw new Error("Preset not found");
         }
@@ -219,10 +236,10 @@ let PresetController = class PresetController {
         if (!confirm) {
             return;
         }
-        const copier = new core_1.FSManager(this.appConfigService.presetPath(preset.name), this.appConfigService.pwd());
+        const copier = new core_1.FileSystemManager(this.appConfigService.presetPath(preset.name), this.appConfigService.pwd());
         if (preset.dockerfile) {
             if (!copier.destination.exists(preset.dockerfile)) {
-                await copier.copy(preset.dockerfile);
+                copier.copy(preset.dockerfile);
             }
             project.type = "dockerfile";
             project.dockerfile = preset.dockerfile;
@@ -246,17 +263,17 @@ let PresetController = class PresetController {
                     recursive: true
                 });
             }
-            await copier.copy(path);
+            copier.copy(path);
         }
         delete project.preset;
         delete project.imageName;
-        await project.save();
+        project.save();
     }
     async build(presetName, rebuild) {
-        const preset = await this.presetService.get(presetName);
+        const preset = this.presetService.get(presetName);
         let buildArgs = {};
         if (preset.buildArgsOptions) {
-            buildArgs = await (0, utils_1.promptGroup)(preset.buildArgsOptions);
+            buildArgs = await this.presetService.prompt(preset.buildArgsOptions);
         }
         const imageName = this.presetService.getImageName(preset, buildArgs);
         if (rebuild) {
@@ -276,25 +293,30 @@ let PresetController = class PresetController {
 exports.PresetController = PresetController;
 __decorate([
     (0, core_1.Command)("preset:init"),
+    (0, core_1.Description)("Creates preset config for current dir"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], PresetController.prototype, "init", null);
 __decorate([
-    (0, core_1.Command)("preset:deinit"),
+    (0, core_1.Command)("preset:destroy"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
-], PresetController.prototype, "deinit", null);
+], PresetController.prototype, "destroy", null);
 __decorate([
-    (0, core_1.Command)("preset:add <preset>"),
+    (0, core_1.Command)("preset:install <preset>"),
+    (0, core_1.Command)("preset:install <preset>@<version>"),
+    (0, core_1.Description)("Adding preset from github repository"),
     __param(0, (0, core_1.Param)("preset")),
+    __param(1, (0, core_1.Param)("version")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
+    __metadata("design:paramtypes", [String, String]),
     __metadata("design:returntype", Promise)
 ], PresetController.prototype, "add", null);
 __decorate([
     (0, core_1.Command)("preset:ls"),
+    (0, core_1.Description)("List of all available presets"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
@@ -302,42 +324,38 @@ __decorate([
 __decorate([
     (0, core_1.Command)("preset:delete <preset>"),
     __param(0, (0, core_1.Param)("preset")),
-    __param(1, (0, core_1.Option)("yes", {
-        alias: "y",
-        description: "Confirm deletion"
-    })),
+    __param(1, (0, core_1.Option)("yes", "y")),
+    __param(1, (0, core_1.Description)("Confirm deletion")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Boolean]),
     __metadata("design:returntype", Promise)
 ], PresetController.prototype, "delete", null);
 __decorate([
     (0, core_1.Command)("preset:eject"),
-    __param(0, (0, core_1.Option)("name", {
-        type: "string",
-        alias: "n",
-        description: "Project name"
-    })),
+    (0, core_1.Description)("Eject preset files into the project"),
+    __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", Promise)
 ], PresetController.prototype, "eject", null);
 __decorate([
     (0, core_1.Command)("preset:build <preset>"),
+    (0, core_1.Description)("Build docker image form a preset"),
     __param(0, (0, core_1.Param)("preset")),
-    __param(1, (0, core_1.Option)("rebuild", {
-        type: "boolean",
-        alias: "r",
-        description: "Rebuild image"
-    })),
+    __param(1, (0, core_1.Option)("rebuild", "r")),
+    __param(1, (0, core_1.Description)("Rebuild image")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Boolean]),
     __metadata("design:returntype", Promise)
 ], PresetController.prototype, "build", null);
 exports.PresetController = PresetController = __decorate([
     (0, core_1.Controller)(),
+    (0, core_1.Description)("Preset commands"),
     __metadata("design:paramtypes", [services_1.AppConfigService,
         services_1.AppEventsService,
         services_1.ProjectService,
         services_1.PresetService,
+        repositories_1.PresetRepository,
         services_1.DockerService])
 ], PresetController);

package/lib/controllers/ProjectController.d.ts

@@ -1,14 +1,16 @@
 import { ProjectType } from "@wocker/core";
-import { AppConfigService, AppEventsService, ProjectService, DockerService } from "../services";
+import { AppConfigService, AppEventsService, ProjectService, LogService, DockerService } from "../services";
 export declare class ProjectController {
     protected readonly appConfigService: AppConfigService;
     protected readonly appEventsService: AppEventsService;
     protected readonly projectService: ProjectService;
+    protected readonly logService: LogService;
     protected readonly dockerService: DockerService;
-    constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService);
+    constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, logService: LogService, dockerService: DockerService);
     protected getProjectNames(): Promise<string[]>;
     getScriptNames(): Promise<string[]>;
     init(name: string, type: ProjectType): Promise<void>;
+    destroy(name?: string): Promise<void>;
     projectList(all: boolean): Promise<string>;
     start(name?: string, detach?: boolean, attach?: boolean, rebuild?: boolean, restart?: boolean): Promise<void>;
     stop(name: string): Promise<void>;
@@ -38,5 +40,5 @@ export declare class ProjectController {
     attach(name?: string): Promise<void>;
     exec(command?: string[], name?: string): Promise<void>;
     run(script: string, args?: string[], name?: string): Promise<void>;
-    logs(name?: string, global?: boolean, detach?: boolean, follow?: boolean): Promise<void>;
+    logs(name?: string, global?: boolean, detach?: boolean, follow?: boolean, clear?: boolean): Promise<void>;
 }

package/lib/controllers/ProjectController.js

@@ -21,13 +21,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -42,16 +52,17 @@ exports.ProjectController = 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 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");
 let ProjectController = class ProjectController {
-    constructor(appConfigService, appEventsService, projectService, dockerService) {
+    constructor(appConfigService, appEventsService, projectService, logService, dockerService) {
         this.appConfigService = appConfigService;
         this.appEventsService = appEventsService;
         this.projectService = projectService;
+        this.logService = logService;
         this.dockerService = dockerService;
     }
     async getProjectNames() {
@@ -84,11 +95,23 @@ let ProjectController = class ProjectController {
             project.name = name;
         }
         if (!name || !project.name) {
-            project.name = await (0, utils_1.promptText)({
-                type: "string",
-                required: true,
-                message: "Project name:",
-                default: project.name || Path.basename(project.path)
+            project.name = await (0, utils_1.promptInput)({
+                required: "Project name is required",
+                message: "Project name",
+                type: "text",
+                default: project.name || Path.basename(project.path),
+                validate: (name) => {
+                    if (typeof name !== "string") {
+                        return true;
+                    }
+                    const otherProject = this.projectService.searchOne({
+                        name
+                    });
+                    if (otherProject && otherProject.path !== project.path) {
+                        return `Project "${name}" already exists`;
+                    }
+                    return true;
+                }
             });
             project.addDomain(project.containerName);
         }
@@ -97,11 +120,11 @@ let ProjectController = class ProjectController {
         }
         const mapTypes = this.appConfigService.getProjectTypes();
         if (!type || !project.type || !mapTypes[project.type]) {
-            project.type = (await (0, utils_1.promptSelect)({
-                message: "Project type:",
+            project.type = await (0, utils_1.promptSelect)({
+                message: "Project type",
                 options: mapTypes,
                 default: project.type
-            }));
+            });
         }
         switch (project.type) {
             case core_1.PROJECT_TYPE_DOCKERFILE: {
@@ -116,7 +139,7 @@ let ProjectController = class ProjectController {
                     throw new Error("Dockerfiles not found");
                 }
                 project.dockerfile = await (0, utils_1.promptSelect)({
-                    message: "Dockerfile:",
+                    message: "Dockerfile",
                     options: dockerfiles.map((dockerfile) => {
                         return {
                             value: dockerfile
@@ -127,8 +150,8 @@ let ProjectController = class ProjectController {
                 break;
             }
             case core_1.PROJECT_TYPE_IMAGE: {
-                project.imageName = await (0, utils_1.promptText)({
-                    message: "Image name:",
+                project.imageName = await (0, utils_1.promptInput)({
+                    message: "Image name",
                     required: true,
                     default: project.imageName
                 });
@@ -142,6 +165,9 @@ let ProjectController = class ProjectController {
         await this.appEventsService.emit("project:init", project);
         await project.save();
     }
+    async destroy(name) {
+        const project = this.projectService.get(name);
+    }
     async projectList(all) {
         const table = new cli_table3_1.default({
             head: ["Name", "Type", "Status"],
@@ -168,7 +194,7 @@ let ProjectController = class ProjectController {
             await this.dockerService.attach(project.containerName);
         }
         if (detach) {
-            console.info(chalk_1.default.yellow("Warning: Detach option is deprecated"));
+            console.info(yoctocolors_cjs_1.default.yellow("Warning: Detach option is deprecated"));
         }
     }
     async stop(name) {
@@ -184,7 +210,7 @@ let ProjectController = class ProjectController {
         }
         const project = this.projectService.get();
         const table = new cli_table3_1.default({
-            head: [chalk_1.default.yellow("Domain")]
+            head: [yoctocolors_cjs_1.default.yellow("Domain")]
         });
         for (const domain of project.domains) {
             table.push([domain]);
@@ -319,7 +345,7 @@ let ProjectController = class ProjectController {
         for (const variable of variables) {
             const [key, value] = variable.split("=");
             if (!value) {
-                console.info(chalk_1.default.yellow(`No value for "${key}"`));
+                console.info(yoctocolors_cjs_1.default.yellow(`No value for "${key}"`));
                 continue;
             }
             config.setEnv(key.trim(), value.trim());
@@ -540,23 +566,26 @@ let ProjectController = class ProjectController {
         });
         await this.dockerService.attachStream(stream);
     }
-    async logs(name, global, detach, follow) {
+    async logs(name, global, detach, follow, clear) {
         if (global) {
+            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) {
                         case "debug":
-                            return chalk_1.default.grey(substring);
+                            return yoctocolors_cjs_1.default.gray(substring);
                         case "log":
-                            return chalk_1.default.white(substring);
+                            return yoctocolors_cjs_1.default.white(substring);
                         case "info":
-                            return chalk_1.default.green(substring);
+                            return yoctocolors_cjs_1.default.green(substring);
                         case "warn":
                         case "warning":
-                            return chalk_1.default.yellow(substring);
+                            return yoctocolors_cjs_1.default.yellow(substring);
                         case "error":
-                            return chalk_1.default.red(substring);
+                            return yoctocolors_cjs_1.default.red(substring);
                         default:
                             return substring;
                     }
@@ -594,22 +623,7 @@ let ProjectController = class ProjectController {
         if (name) {
             this.projectService.cdProject(name);
         }
-        const project = this.projectService.get();
-        const container = await this.dockerService.getContainer(project.containerName);
-        if (!container) {
-            throw new Error("Project not started");
-        }
-        if (!detach) {
-            await this.dockerService.logs(container);
-        }
-        else {
-            let data = await container.logs({
-                stdout: true,
-                stderr: true,
-                follow: false
-            });
-            process.stdout.write(data);
-        }
+        await this.projectService.logs(detach);
     }
 };
 exports.ProjectController = ProjectController;
@@ -642,6 +656,14 @@ __decorate([
     __metadata("design:paramtypes", [String, String]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "init", null);
+__decorate([
+    (0, core_1.Command)("destroy [name]"),
+    (0, core_1.Description)("Permanently destroy a project"),
+    __param(0, (0, core_1.Param)("name")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "destroy", null);
 __decorate([
     (0, core_1.Command)("ps"),
     (0, core_1.Description)("Projects list"),
@@ -1051,14 +1073,17 @@ __decorate([
         type: "boolean",
         alias: "f"
     })),
+    __param(4, (0, core_1.Option)("clear", { alias: "c" })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Boolean, Boolean, Boolean]),
+    __metadata("design:paramtypes", [String, Boolean, Boolean, Boolean, Boolean]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "logs", null);
 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])
 ], ProjectController);

package/lib/controllers/ProxyController.d.ts

@@ -10,7 +10,7 @@ export declare class ProxyController {
     onProjectStart(project: Project): Promise<void>;
     onProjectStop(project: Project): Promise<void>;
     getProjectNames(): string[];
-    init(httpPort?: number, httpsPort?: number): Promise<void>;
+    init(httpPort?: number, httpsPort?: number, sshPort?: number, sshPassword?: string): Promise<void>;
     start(restart?: boolean, rebuild?: boolean): Promise<void>;
     stop(): Promise<void>;
     logs(): Promise<void>;