@wocker/ws 1.0.15 → 1.0.17

package/lib/controllers/ProjectController.js

@@ -45,7 +45,6 @@ const cli_table3_1 = __importDefault(require("cli-table3"));
 const chalk_1 = __importDefault(require("chalk"));
 const Path = __importStar(require("path"));
 const async_mutex_1 = require("async-mutex");
-const env_1 = require("../env");
 const makes_1 = require("../makes");
 const services_1 = require("../services");
 let ProjectController = class ProjectController {
@@ -71,15 +70,17 @@ let ProjectController = class ProjectController {
             return [];
         }
     }
-    async init(name, type, preset) {
+    async init(name, type) {
         let project = await this.projectService.searchOne({
-            path: this.appConfigService.getPWD()
+            path: this.appConfigService.pwd()
         });
+        const fs = new core_1.FileSystem(this.appConfigService.pwd());
         if (!project) {
             project = this.projectService.fromObject({
-                path: this.appConfigService.getPWD()
+                path: this.appConfigService.pwd()
             });
         }
+        project.path = this.appConfigService.pwd();
         if (name) {
             project.name = name;
         }
@@ -97,44 +98,49 @@ let ProjectController = class ProjectController {
         }
         const mapTypes = this.appConfigService.getProjectTypes();
         if (!type || !project.type || !mapTypes[project.type]) {
-            project.type = await (0, utils_1.promptSelect)({
+            project.type = (await (0, utils_1.promptSelect)({
                 message: "Project type:",
                 options: mapTypes,
                 default: project.type
-            });
+            }));
         }
         switch (project.type) {
             case core_1.PROJECT_TYPE_DOCKERFILE: {
-                const files = await makes_1.FS.readdirFiles(this.appConfigService.getPWD());
+                const files = await fs.readdirFiles();
                 const dockerfiles = files.filter((fileName) => {
                     if (new RegExp("^(.*)\\.dockerfile$").test(fileName)) {
                         return true;
                     }
                     return new RegExp("^Dockerfile(\\..*)?").test(fileName);
                 });
+                if (dockerfiles.length === 0) {
+                    throw new Error("Dockerfiles not found");
+                }
                 project.dockerfile = await (0, utils_1.promptSelect)({
+                    message: "Dockerfile:",
                     options: dockerfiles.map((dockerfile) => {
                         return {
                             value: dockerfile
                         };
                     }),
-                    message: "Dockerfile",
                     default: project.dockerfile
                 });
                 break;
             }
             case core_1.PROJECT_TYPE_IMAGE: {
                 project.imageName = await (0, utils_1.promptText)({
-                    message: "Image Name",
+                    message: "Image name:",
+                    required: true,
                     default: project.imageName
                 });
                 break;
             }
-            default:
+            case core_1.PROJECT_TYPE_PRESET:
                 break;
+            default:
+                throw new Error("Invalid project type");
         }
         await this.appEventsService.emit("project:init", project);
-        project.path = this.appConfigService.getPWD();
         await project.save();
     }
     async projectList(all) {
@@ -144,7 +150,7 @@ let ProjectController = class ProjectController {
         });
         const projects = await this.projectService.search({});
         for (const project of projects) {
-            const container = await this.dockerService.getContainer(`${project.name}.workspace`);
+            const container = await this.dockerService.getContainer(project.containerName);
             if (!container) {
                 if (all) {
                     table.push([project.name, project.type, "-"]);
@@ -283,7 +289,7 @@ let ProjectController = class ProjectController {
             env = project.env || {};
         }
         else {
-            const config = await this.appConfigService.getConfig();
+            const config = this.appConfigService.getConfig();
             env = config.env || {};
         }
         const table = new cli_table3_1.default({
@@ -299,7 +305,7 @@ let ProjectController = class ProjectController {
             await this.projectService.cdProject(name);
         }
         let config = global
-            ? await this.appConfigService.getConfig()
+            ? this.appConfigService.getConfig()
             : await this.projectService.get();
         const table = new cli_table3_1.default({
             head: ["KEY", "VALUE"]
@@ -318,7 +324,7 @@ let ProjectController = class ProjectController {
             await this.projectService.cdProject(name);
         }
         const config = global
-            ? await this.appConfigService.getConfig()
+            ? this.appConfigService.getConfig()
             : await this.projectService.get();
         for (const variable of variables) {
             const [key, value] = variable.split("=");
@@ -384,7 +390,6 @@ let ProjectController = class ProjectController {
         const table = new cli_table3_1.default({
             head: ["KEY", "VALUE"]
         });
-        this.logService.info("...");
         for (const key of args) {
             if (project.buildArgs && typeof project.buildArgs[key] !== "undefined") {
                 const value = project.buildArgs[key] || "";
@@ -399,8 +404,12 @@ let ProjectController = class ProjectController {
         }
         const project = await this.projectService.get();
         const buildArgs = args.reduce((env, config) => {
-            const [key, value] = config.split("=");
-            env[key.trim()] = value.trim();
+            let [, key = "", value = ""] = config.split(/^([^=]+)=(.*)$/);
+            key = key.trim();
+            value = value.trim();
+            if (key) {
+                env[key] = value;
+            }
             return env;
         }, {});
         for (const key in buildArgs) {
@@ -417,8 +426,10 @@ let ProjectController = class ProjectController {
         }
         const project = await this.projectService.get();
         const buildArgs = args.reduce((env, config) => {
-            const [key, value] = config.split("=");
-            env[key.trim()] = value.trim();
+            let [, key = "", value = ""] = config.split(/^([^=]+)(?:=(.*))?$/);
+            key = key.trim();
+            value = value.trim();
+            env[key] = value;
             return env;
         }, {});
         for (const key in buildArgs) {
@@ -465,9 +476,43 @@ let ProjectController = class ProjectController {
             await project.save();
         }
     }
+    async extraHostList(name) {
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        if (!project.extraHosts) {
+            return "No extra hosts found";
+        }
+        const table = new cli_table3_1.default({
+            head: ["Host", "Domain"]
+        });
+        for (const host in project.extraHosts) {
+            table.push([
+                host, project.extraHosts[host]
+            ]);
+        }
+        return table.toString();
+    }
+    async addExtraHost(extraHost, extraDomain, name) {
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        project.addExtraHost(extraHost, extraDomain);
+        await project.save();
+    }
+    async removeExtraHost(extraHost, name) {
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        project.removeExtraHost(extraHost);
+        await project.save();
+    }
     async logs(name, global, detach, follow) {
         if (global) {
-            const logFilepath = Path.join(env_1.DATA_DIR, "ws.log");
+            const logFilepath = this.appConfigService.dataPath("ws.log");
             const prepareLog = (str) => {
                 return str.replace(/^\[.*]\s([^:]+):\s.*$/gm, (substring, type) => {
                     switch (type) {
@@ -520,7 +565,10 @@ let ProjectController = class ProjectController {
             await this.projectService.cdProject(name);
         }
         const project = await this.projectService.get();
-        const container = await this.dockerService.getContainer(`${project.name}.workspace`);
+        const container = await this.dockerService.getContainer(project.containerName);
+        if (!container) {
+            throw new Error("Project not started");
+        }
         if (!detach) {
             const stream = await container.logs({
                 stdout: true,
@@ -529,19 +577,31 @@ let ProjectController = class ProjectController {
             });
             stream.on("data", (data) => {
                 try {
-                    data = (0, utils_1.demuxOutput)(data);
+                    if (data instanceof Buffer) {
+                        data = (0, utils_1.demuxOutput)(data);
+                    }
+                }
+                catch (err) {
+                    this.logService.error(err.message, err);
                 }
-                catch (err) { }
                 process.stdout.write(data);
             });
         }
         else {
-            const buffer = await container.logs({
+            let data = await container.logs({
                 stdout: true,
                 stderr: true,
                 follow: false
             });
-            process.stdout.write((0, utils_1.demuxOutput)(buffer));
+            try {
+                if (data instanceof Buffer) {
+                    data = (0, utils_1.demuxOutput)(data);
+                }
+            }
+            catch (err) {
+                this.logService.error(err.message, err);
+            }
+            process.stdout.write(data);
         }
     }
     async exec(name, command) {
@@ -559,7 +619,7 @@ let ProjectController = class ProjectController {
         if (!project.scripts || !project.scripts[script]) {
             throw new Error(`Script ${script} not found`);
         }
-        const container = await this.dockerService.getContainer(`${project.name}.workspace`);
+        const container = await this.dockerService.getContainer(project.containerName);
         if (!container) {
             throw new Error("The project is not started");
         }
@@ -600,6 +660,7 @@ __decorate([
 ], ProjectController.prototype, "getScriptNames", null);
 __decorate([
     (0, core_1.Command)("init"),
+    (0, core_1.Description)("Project initialisation"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
@@ -610,17 +671,13 @@ __decorate([
         alias: "t",
         description: "Project type"
     })),
-    __param(2, (0, core_1.Option)("preset", {
-        type: "string",
-        alias: "p",
-        description: "Preset"
-    })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, String, String]),
+    __metadata("design:paramtypes", [String, String]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "init", null);
 __decorate([
     (0, core_1.Command)("ps"),
+    (0, core_1.Description)("Projects list"),
     __param(0, (0, core_1.Option)("all", {
         type: "boolean",
         alias: "a",
@@ -665,6 +722,7 @@ __decorate([
 ], 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",
@@ -676,6 +734,7 @@ __decorate([
 ], ProjectController.prototype, "stop", null);
 __decorate([
     (0, core_1.Command)("domains"),
+    (0, core_1.Description)("Project domain list"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
@@ -687,6 +746,7 @@ __decorate([
 ], ProjectController.prototype, "domains", null);
 __decorate([
     (0, core_1.Command)("domain:add [...domains]"),
+    (0, core_1.Description)("Adding project domain"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
@@ -698,6 +758,7 @@ __decorate([
 ], ProjectController.prototype, "addDomain", null);
 __decorate([
     (0, core_1.Command)("domain:set [...domains]"),
+    (0, core_1.Description)("Setting project domains"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
@@ -709,6 +770,7 @@ __decorate([
 ], ProjectController.prototype, "setDomains", null);
 __decorate([
     (0, core_1.Command)("domain:remove [...domains]"),
+    (0, core_1.Description)("Removing project domain"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
@@ -720,6 +782,7 @@ __decorate([
 ], ProjectController.prototype, "removeDomain", null);
 __decorate([
     (0, core_1.Command)("domain:clear"),
+    (0, core_1.Description)("Clearing project domain"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
@@ -916,6 +979,45 @@ __decorate([
     __metadata("design:paramtypes", [String, Array]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "volumeUnmount", null);
+__decorate([
+    (0, core_1.Command)("extra-hosts"),
+    (0, core_1.Description)("List of extra hosts"),
+    __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, "extraHostList", null);
+__decorate([
+    (0, core_1.Command)("extra-host:add <extraHost>:<extraDomain>"),
+    (0, core_1.Description)("Adding extra host"),
+    __param(0, (0, core_1.Param)("extraHost")),
+    __param(1, (0, core_1.Param)("extraDomain")),
+    __param(2, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "The name of the project"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String, String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "addExtraHost", null);
+__decorate([
+    (0, core_1.Command)("extra-host:remove <extraHost>"),
+    (0, core_1.Description)("Removing extra host"),
+    __param(0, (0, core_1.Param)("extraHost")),
+    __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, String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "removeExtraHost", null);
 __decorate([
     (0, core_1.Command)("logs"),
     __param(0, (0, core_1.Option)("name", {
@@ -929,7 +1031,8 @@ __decorate([
     })),
     __param(2, (0, core_1.Option)("detach", {
         type: "boolean",
-        alias: "d"
+        alias: "d",
+        description: "Detach"
     })),
     __param(3, (0, core_1.Option)("follow", {
         type: "boolean",
@@ -965,6 +1068,7 @@ __decorate([
 ], ProjectController.prototype, "run", null);
 __decorate([
     (0, core_1.Command)("attach"),
+    (0, core_1.Description)("Attach local standard input, output, and error streams to a running container"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",

package/lib/env.d.ts

@@ -4,5 +4,4 @@ export declare const PRESETS_DIR: string;
 export declare const SERVICES_DIR: string;
 export declare const PLUGINS_DIR: string;
 export declare const DATA_DIR: string;
-export declare const MAP_PATH: string;
 export declare const VIRTUAL_HOST_KEY = "VIRTUAL_HOST";

package/lib/env.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VIRTUAL_HOST_KEY = exports.MAP_PATH = exports.DATA_DIR = exports.PLUGINS_DIR = exports.SERVICES_DIR = exports.PRESETS_DIR = exports.ROOT_DIR = exports.NODE_ENV = void 0;
+exports.VIRTUAL_HOST_KEY = exports.DATA_DIR = exports.PLUGINS_DIR = exports.SERVICES_DIR = exports.PRESETS_DIR = exports.ROOT_DIR = exports.NODE_ENV = void 0;
 const OS = __importStar(require("os"));
 const Path = __importStar(require("path"));
 exports.NODE_ENV = process.env.NODE_ENV;
@@ -32,5 +32,4 @@ exports.PRESETS_DIR = Path.join(exports.ROOT_DIR, "presets");
 exports.SERVICES_DIR = Path.join(exports.ROOT_DIR, "services");
 exports.PLUGINS_DIR = Path.join(exports.ROOT_DIR, "plugins");
 exports.DATA_DIR = process.env.WS_DIR || Path.join(OS.homedir(), ".workspace");
-exports.MAP_PATH = Path.join(exports.DATA_DIR, "data.json");
 exports.VIRTUAL_HOST_KEY = "VIRTUAL_HOST";

package/lib/main.js

@@ -22,9 +22,9 @@ exports.app = {
         }
         catch (err) {
             console.error(chalk_1.default.red(err.message));
-            const { debug } = await config.getConfig();
+            const { debug } = config.getConfig();
             if (debug) {
-                logger.error(err.stack || err.message);
+                logger.error(err.stack || err.toString());
             }
         }
     }

package/lib/services/AppConfigService.d.ts

@@ -1,18 +1,17 @@
-import { Config, AppConfigService as CoreAppConfigService } from "@wocker/core";
+import { AppConfig, AppConfigService as CoreAppConfigService } from "@wocker/core";
 type TypeMap = {
     [type: string]: string;
 };
 export declare class AppConfigService extends CoreAppConfigService {
-    protected pwd: string;
-    protected mapTypes: TypeMap;
+    protected _pwd: string;
+    protected readonly mapTypes: TypeMap;
     constructor();
+    setPWD(pwd: string): void;
+    pwd(...parts: string[]): string;
     dataPath(...parts: string[]): string;
     pluginsPath(...parts: string[]): string;
     presetPath(...parts: string[]): string;
-    getPWD(): string;
-    setPWD(pwd: string): void;
     getProjectTypes(): TypeMap;
-    registerProjectType(name: string, title?: string): void;
-    protected loadConfig(): Promise<Config>;
+    protected loadConfig(): AppConfig;
 }
 export {};

package/lib/services/AppConfigService.js

@@ -36,15 +36,21 @@ exports.AppConfigService = void 0;
 const core_1 = require("@wocker/core");
 const Path = __importStar(require("path"));
 const env_1 = require("../env");
-const makes_1 = require("../makes");
 let AppConfigService = class AppConfigService extends core_1.AppConfigService {
     constructor() {
         super();
         this.mapTypes = {
-            image: "Image",
-            dockerfile: "Dockerfile"
+            [core_1.PROJECT_TYPE_IMAGE]: "Image",
+            [core_1.PROJECT_TYPE_DOCKERFILE]: "Dockerfile",
+            [core_1.PROJECT_TYPE_PRESET]: "Preset"
         };
-        this.pwd = (process.cwd() || process.env.PWD);
+        this._pwd = (process.cwd() || process.env.PWD);
+    }
+    setPWD(pwd) {
+        this._pwd = pwd;
+    }
+    pwd(...parts) {
+        return Path.join(this._pwd, ...parts);
     }
     dataPath(...parts) {
         return Path.join(env_1.DATA_DIR, ...parts);
@@ -55,37 +61,57 @@ let AppConfigService = class AppConfigService extends core_1.AppConfigService {
     presetPath(...parts) {
         return Path.join(env_1.PRESETS_DIR, ...parts);
     }
-    getPWD() {
-        return this.pwd;
-    }
-    setPWD(pwd) {
-        this.pwd = pwd;
-    }
     getProjectTypes() {
         return this.mapTypes;
     }
-    registerProjectType(name, title) {
-        this.mapTypes[name] = title || name;
-    }
-    async loadConfig() {
-        const data = makes_1.FS.existsSync(env_1.MAP_PATH)
-            ? await makes_1.FS.readJSON(env_1.MAP_PATH)
-            : {};
-        return new class extends core_1.Config {
+    loadConfig() {
+        const fs = new core_1.FileSystem(env_1.DATA_DIR);
+        let data = {};
+        if (fs.exists("wocker.config.js")) {
+            try {
+                const { config } = require(fs.path("wocker.config.js"));
+                data = config;
+            }
+            catch (err) {
+                if (fs.exists("wocker.config.json")) {
+                    let json = fs.readJSON("wocker.config.json");
+                    if (typeof json === "string") {
+                        json = JSON.parse(json);
+                    }
+                    data = json;
+                }
+            }
+        }
+        else if (fs.exists("wocker.config.json")) {
+            data = fs.readJSON("wocker.config.json");
+        }
+        else if (fs.exists("wocker.json")) {
+            let json = fs.readJSON("wocker.json");
+            if (typeof json === "string") {
+                json = JSON.parse(json);
+            }
+            data = json;
+        }
+        else if (fs.exists("data.json")) {
+            data = fs.readJSON("data.json");
+        }
+        return new class extends core_1.AppConfig {
             constructor(data) {
                 super(data);
             }
-            addPlugin(plugin) {
-                if (!this.plugins) {
-                    this.plugins = [];
+            async save() {
+                if (!fs.exists()) {
+                    fs.mkdir("");
                 }
-                if (this.plugins.includes(plugin)) {
-                    return;
+                const json = JSON.stringify(this.toJson(), null, 4);
+                await fs.writeFile("wocker.config.js", `// Wocker config\nexports.config = ${json};`);
+                await fs.writeFile("wocker.config.json", json);
+                if (fs.exists("data.json")) {
+                    await fs.rm("data.json");
+                }
+                if (fs.exists("wocker.json")) {
+                    await fs.rm("wocker.json");
                 }
-                this.plugins.push(plugin);
-            }
-            async save() {
-                await makes_1.FS.writeJSON(env_1.MAP_PATH, this.toJson());
             }
         }(data);
     }

package/lib/services/DockerService.js

@@ -214,15 +214,11 @@ let DockerService = class DockerService {
         await (0, utils_2.followProgress)(stream);
     }
     async attach(containerOrName) {
-        let container;
-        if (typeof containerOrName === "string") {
-            container = await this.getContainer(containerOrName);
-        }
-        else {
-            if (!containerOrName) {
-                return;
-            }
-            container = containerOrName;
+        let container = typeof containerOrName === "string"
+            ? await this.getContainer(containerOrName)
+            : containerOrName;
+        if (!container) {
+            return;
         }
         const stream = await container.attach({
             logs: true,
@@ -239,10 +235,21 @@ let DockerService = class DockerService {
         process.stdin.pipe(stream);
         process.stdin.on("data", (data) => {
             if (data.toString() === "\u0003") {
-                process.stdin.setRawMode(false);
+                stream.end();
+                setTimeout(() => {
+                    process.exit();
+                }, 5000);
             }
         });
         stream.on("data", (data) => {
+            if (data instanceof Buffer) {
+                try {
+                    data = (0, utils_1.demuxOutput)(data);
+                }
+                catch (err) {
+                    this.logService.error(err.toString(), err.stack);
+                }
+            }
             process.stdout.write(data);
         });
         stream.on("end", async () => {

package/lib/services/LogService.d.ts

@@ -1,7 +1,9 @@
+import { LogService as CoreLogService } from "@wocker/core";
 import { AppConfigService } from "./AppConfigService";
-export declare class LogService {
+export declare class LogService extends CoreLogService {
     protected readonly appConfigService: AppConfigService;
     constructor(appConfigService: AppConfigService);
+    debug(...data: any[]): void;
     log(...data: any[]): void;
     info(...data: any[]): void;
     warn(...data: any[]): void;

package/lib/services/LogService.js

@@ -17,11 +17,15 @@ const core_1 = require("@wocker/core");
 const format_1 = __importDefault(require("date-fns/format"));
 const makes_1 = require("../makes");
 const AppConfigService_1 = require("./AppConfigService");
-let LogService = class LogService {
+let LogService = class LogService extends core_1.LogService {
     constructor(appConfigService) {
+        super();
         this.appConfigService = appConfigService;
         makes_1.Logger.install(this);
     }
+    debug(...data) {
+        this._log("debug", ...data);
+    }
     log(...data) {
         this._log("log", ...data);
     }
@@ -35,6 +39,10 @@ let LogService = class LogService {
         this._log("error", ...data);
     }
     _log(type, ...data) {
+        const config = this.appConfigService.getConfig();
+        if (type === "debug" && !config.debug) {
+            return;
+        }
         const time = (0, format_1.default)(new Date(), "yyyy-MM-dd hh:mm:ss");
         const logPath = this.appConfigService.dataPath("ws.log");
         const logData = data.map((item) => {

package/lib/services/NpmService.d.ts

@@ -0,0 +1,5 @@
+import { PackageInfo } from "../types";
+export declare class NpmService {
+    getPackageInfo(name: string): Promise<PackageInfo>;
+    install(name: string, version?: string): Promise<void>;
+}