@wocker/ws 1.0.16 → 1.0.17

package/lib/AppModule.js

@@ -38,7 +38,6 @@ let AppModule = AppModule_1 = class AppModule {
     async load(container) {
         const appConfigService = container.getModule(AppModule_1).get(services_1.AppConfigService);
         const logService = container.getModule(AppModule_1).get(services_1.LogService);
-        const pluginService = container.getModule(AppModule_1).get(services_1.PluginService);
         const config = appConfigService.getConfig();
         const imports = [];
         for (const plugin of config.plugins || []) {
@@ -71,6 +70,7 @@ let AppModule = AppModule_1 = class AppModule {
 };
 exports.AppModule = AppModule;
 exports.AppModule = AppModule = AppModule_1 = __decorate([
+    (0, core_1.Global)(),
     (0, core_1.Module)({
         controllers: [
             controllers_1.CompletionController,
@@ -86,6 +86,7 @@ exports.AppModule = AppModule = AppModule_1 = __decorate([
             services_1.AppEventsService,
             services_1.DockerService,
             services_1.LogService,
+            services_1.NpmService,
             services_1.PluginService,
             services_1.PresetService,
             services_1.ProjectService,
@@ -95,7 +96,9 @@ exports.AppModule = AppModule = AppModule_1 = __decorate([
             services_1.AppConfigService,
             services_1.AppEventsService,
             services_1.DockerService,
-            services_1.LogService
+            services_1.LogService,
+            services_1.ProjectService,
+            services_1.ProxyService
         ]
     })
 ], AppModule);

package/lib/controllers/PluginController.d.ts

@@ -1,12 +1,13 @@
-import { AppConfigService, PluginService, LogService } from "../services";
+import { AppConfigService, PluginService, LogService, NpmService } from "../services";
 export declare class PluginController {
     protected readonly appConfigService: AppConfigService;
     protected readonly pluginService: PluginService;
+    protected readonly npmService: NpmService;
     protected readonly logService: LogService;
-    constructor(appConfigService: AppConfigService, pluginService: PluginService, logService: LogService);
+    constructor(appConfigService: AppConfigService, pluginService: PluginService, npmService: NpmService, logService: LogService);
     list(): Promise<string>;
-    add(addName: string): Promise<void>;
+    add(addName: string, dev?: boolean): Promise<void>;
     remove(removeName: string): Promise<void>;
     update(): Promise<void>;
-    getInstalledPlugins(): Promise<string[]>;
+    getInstalledPlugins(): string[];
 }

package/lib/controllers/PluginController.js

@@ -8,6 +8,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 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 };
 };
@@ -17,30 +20,31 @@ const core_1 = require("@wocker/core");
 const chalk_1 = __importDefault(require("chalk"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const services_1 = require("../services");
-const utils_1 = require("../utils");
-const Http_1 = require("../makes/Http");
 let PluginController = class PluginController {
-    constructor(appConfigService, pluginService, logService) {
+    constructor(appConfigService, pluginService, npmService, logService) {
         this.appConfigService = appConfigService;
         this.pluginService = pluginService;
+        this.npmService = npmService;
         this.logService = logService;
     }
     async list() {
-        const config = await this.appConfigService.getConfig();
+        const config = this.appConfigService.getConfig();
         const table = new cli_table3_1.default({
             head: ["Name"],
             colWidths: [30]
         });
+        if (!config.plugins) {
+            return chalk_1.default.gray("No plugins installed");
+        }
         for (const name of config.plugins) {
             table.push([name]);
         }
         return table.toString() + "\n";
     }
-    async add(addName) {
+    async add(addName, dev) {
         const [, prefix = "@wocker/", name, suffix = "-plugin"] = /^(@wocker\/)?(\w+)(-plugin)?$/.exec(addName) || [];
         const fullName = `${prefix}${name}${suffix}`;
-        this.logService.info(`Installing plugin... ${fullName}`);
-        const config = await this.appConfigService.getConfig();
+        const config = this.appConfigService.getConfig();
         try {
             if (await this.pluginService.checkPlugin(fullName)) {
                 config.addPlugin(fullName);
@@ -48,14 +52,8 @@ let PluginController = class PluginController {
                 console.info(`Plugin ${fullName} activated`);
                 return;
             }
-            const res = await Http_1.Http.get("https://registry.npmjs.org")
-                .send(fullName);
-            if (res.status !== 200) {
-                console.error(chalk_1.default.red(`Plugin ${fullName} not found`));
-                return;
-            }
-            console.info(`Installing ${fullName}`);
-            await (0, utils_1.exec)(`npm install -g ${fullName}`);
+            const packageInfo = await this.npmService.getPackageInfo(fullName);
+            await this.npmService.install(fullName, packageInfo["dist-tags"].dev && dev ? "dev" : "latest");
             if (await this.pluginService.checkPlugin(fullName)) {
                 config.addPlugin(fullName);
                 await config.save();
@@ -70,7 +68,7 @@ let PluginController = class PluginController {
     async remove(removeName) {
         const [, prefix = "@wocker/", name, suffix = "-plugin"] = /^(@wocker\/)?(\w+)(-plugin)?$/.exec(removeName) || [];
         const fullName = `${prefix}${name}${suffix}`;
-        const config = await this.appConfigService.getConfig();
+        const config = this.appConfigService.getConfig();
         config.removePlugin(fullName);
         await config.save();
         console.info(`Plugin ${fullName} deactivated`);
@@ -78,22 +76,31 @@ let PluginController = class PluginController {
     async update() {
         await this.pluginService.update();
     }
-    async getInstalledPlugins() {
-        const config = await this.appConfigService.getConfig();
+    getInstalledPlugins() {
+        const config = this.appConfigService.getConfig();
         return config.plugins || [];
     }
 };
 exports.PluginController = PluginController;
 __decorate([
     (0, core_1.Command)("plugins"),
+    (0, core_1.Description)("Plugins list"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], PluginController.prototype, "list", null);
 __decorate([
     (0, core_1.Command)("plugin:add <name>"),
+    (0, core_1.Command)("plugin:install <name>"),
+    (0, core_1.Description)("Install a plugin"),
+    __param(0, (0, core_1.Param)("name")),
+    __param(1, (0, core_1.Option)("dev", {
+        type: "boolean",
+        alias: "d",
+        description: "Use dev version of plugin"
+    })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
+    __metadata("design:paramtypes", [String, Boolean]),
     __metadata("design:returntype", Promise)
 ], PluginController.prototype, "add", null);
 __decorate([
@@ -113,11 +120,12 @@ __decorate([
     (0, core_1.Completion)("name", "plugin:remove <name>"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
+    __metadata("design:returntype", Array)
 ], PluginController.prototype, "getInstalledPlugins", null);
 exports.PluginController = PluginController = __decorate([
     (0, core_1.Controller)(),
     __metadata("design:paramtypes", [services_1.AppConfigService,
         services_1.PluginService,
+        services_1.NpmService,
         services_1.LogService])
 ], PluginController);

package/lib/controllers/PresetController.d.ts

@@ -12,6 +12,7 @@ export declare class PresetController {
     protected onRebuild(project: Project): Promise<void>;
     protected onBeforeStart(project: Project): Promise<void>;
     init(): Promise<void>;
+    deinit(): Promise<void>;
     add(name: string): Promise<void>;
     delete(name: string, confirm?: boolean): Promise<void>;
     eject(name?: string): Promise<void>;

package/lib/controllers/PresetController.js

@@ -78,6 +78,19 @@ let PresetController = class PresetController {
             }),
             default: project.preset
         });
+        project.presetMode = await (0, utils_1.promptSelect)({
+            message: "Preset mode:",
+            options: [
+                {
+                    label: "For project only",
+                    value: "project"
+                },
+                {
+                    label: "Global usage",
+                    value: "global"
+                }
+            ]
+        });
         const preset = await this.presetService.get(project.preset);
         if (!preset) {
             throw new Error("Preset not found");
@@ -94,15 +107,16 @@ let PresetController = class PresetController {
                     ...project.buildArgs || {},
                     ...project.env || {}
                 });
-                const { destination, options } = (0, utils_3.volumeParse)(volume);
+                const { source, destination, options } = (0, utils_3.volumeParse)(volume);
                 let projectVolume = project.getVolumeByDestination(destination);
-                const source = await (0, utils_1.promptText)({
-                    message: "Volume",
+                const newSource = await (0, utils_1.promptText)({
+                    message: "Volume:",
+                    required: true,
                     suffix: `:${destination}`,
-                    default: projectVolume ? (0, utils_3.volumeParse)(projectVolume).source : "./"
+                    default: projectVolume ? (0, utils_3.volumeParse)(projectVolume).source : source
                 });
                 projectVolume = (0, utils_3.volumeFormat)({
-                    source,
+                    source: newSource,
                     destination,
                     options
                 });
@@ -110,7 +124,7 @@ let PresetController = class PresetController {
             }
         }
         if (preset.dockerfile) {
-            project.imageName = this.presetService.getImageName(preset, project.buildArgs);
+            project.imageName = this.presetService.getImageNameForProject(project, preset);
         }
     }
     async onRebuild(project) {
@@ -121,7 +135,7 @@ let PresetController = class PresetController {
         if (!preset) {
             throw new Error(`Preset ${project.preset} not found`);
         }
-        const imageName = this.presetService.getImageName(preset, project.buildArgs || {});
+        const imageName = this.presetService.getImageNameForProject(project, preset);
         const exists = await this.dockerService.imageExists(imageName);
         if (exists) {
             console.info(`Removing image: ${imageName}`);
@@ -134,7 +148,7 @@ let PresetController = class PresetController {
         }
         const preset = await this.presetService.get(project.preset);
         if (preset.dockerfile) {
-            project.imageName = this.presetService.getImageName(preset, project.buildArgs);
+            project.imageName = this.presetService.getImageNameForProject(project, preset);
             if (!await this.dockerService.imageExists(project.imageName)) {
                 await this.dockerService.buildImage({
                     tag: project.imageName,
@@ -151,6 +165,9 @@ let PresetController = class PresetController {
     async init() {
         await this.presetService.init();
     }
+    async deinit() {
+        await this.presetService.deinit();
+    }
     async add(name) {
         await this.presetService.addPreset(name);
     }
@@ -224,6 +241,9 @@ let PresetController = class PresetController {
             buildArgs = await (0, utils_1.promptGroup)(preset.buildArgsOptions);
         }
         const imageName = this.presetService.getImageName(preset, buildArgs);
+        if (rebuild) {
+            await this.dockerService.imageRm(imageName);
+        }
         await this.dockerService.buildImage({
             tag: imageName,
             labels: {
@@ -242,6 +262,12 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], PresetController.prototype, "init", null);
+__decorate([
+    (0, core_1.Command)("preset:deinit"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], PresetController.prototype, "deinit", null);
 __decorate([
     (0, core_1.Command)("preset:add <preset>"),
     __param(0, (0, core_1.Param)("preset")),

package/lib/controllers/ProjectController.d.ts

@@ -9,7 +9,7 @@ export declare class ProjectController {
     constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService, logService: LogService);
     protected getProjectNames(): Promise<string[]>;
     getScriptNames(): Promise<string[]>;
-    init(name: string, type: ProjectType, preset: string): Promise<void>;
+    init(name: string, type: ProjectType): 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>;
@@ -33,6 +33,9 @@ export declare class ProjectController {
     volumeList(name?: string): Promise<string>;
     volumeMount(name: string, volumes: string[]): Promise<void>;
     volumeUnmount(name: string, volumes: string[]): Promise<void>;
+    extraHostList(name?: string): Promise<string>;
+    addExtraHost(extraHost: string, extraDomain: string, name?: string): Promise<void>;
+    removeExtraHost(extraHost: string, name?: string): Promise<void>;
     logs(name?: string, global?: boolean, detach?: boolean, follow?: boolean): Promise<void>;
     exec(name?: string, command?: string[]): Promise<void>;
     run(name: string, script: string, args?: string[]): Promise<void>;

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,7 +70,7 @@ let ProjectController = class ProjectController {
             return [];
         }
     }
-    async init(name, type, preset) {
+    async init(name, type) {
         let project = await this.projectService.searchOne({
             path: this.appConfigService.pwd()
         });
@@ -114,6 +113,9 @@ let ProjectController = class ProjectController {
                     }
                     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) => {
@@ -148,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, "-"]);
@@ -287,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({
@@ -303,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"]
@@ -322,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("=");
@@ -388,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] || "";
@@ -403,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) {
@@ -421,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) {
@@ -469,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) {
@@ -524,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,
@@ -533,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) {
@@ -563,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");
         }
@@ -604,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",
@@ -614,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",
@@ -669,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",
@@ -680,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",
@@ -691,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",
@@ -702,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",
@@ -713,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",
@@ -724,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",
@@ -920,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", {
@@ -933,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",
@@ -969,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/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

@@ -4,10 +4,9 @@ type TypeMap = {
 };
 export declare class AppConfigService extends CoreAppConfigService {
     protected _pwd: string;
-    protected mapTypes: TypeMap;
+    protected readonly mapTypes: TypeMap;
     constructor();
     setPWD(pwd: string): void;
-    getPWD(...parts: string[]): string;
     pwd(...parts: string[]): string;
     dataPath(...parts: string[]): string;
     pluginsPath(...parts: string[]): string;

package/lib/services/AppConfigService.js

@@ -49,9 +49,6 @@ let AppConfigService = class AppConfigService extends core_1.AppConfigService {
     setPWD(pwd) {
         this._pwd = pwd;
     }
-    getPWD(...parts) {
-        return this.pwd(...parts);
-    }
     pwd(...parts) {
         return Path.join(this._pwd, ...parts);
     }
@@ -76,13 +73,24 @@ let AppConfigService = class AppConfigService extends core_1.AppConfigService {
                 data = config;
             }
             catch (err) {
-                if (fs.exists("wocker.json")) {
-                    data = fs.readJSON("wocker.json");
+                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")) {
-            data = fs.readJSON("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");
@@ -97,10 +105,13 @@ let AppConfigService = class AppConfigService extends core_1.AppConfigService {
                 }
                 const json = JSON.stringify(this.toJson(), null, 4);
                 await fs.writeFile("wocker.config.js", `// Wocker config\nexports.config = ${json};`);
-                await fs.writeJSON("wocker.json", 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");
+                }
             }
         }(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/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>;
+}

package/lib/services/NpmService.js

@@ -0,0 +1,33 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NpmService = void 0;
+const core_1 = require("@wocker/core");
+const makes_1 = require("../makes");
+const utils_1 = require("../utils");
+let NpmService = class NpmService {
+    async getPackageInfo(name) {
+        const res = await makes_1.Http.get("https://registry.npmjs.org")
+            .send(name);
+        if (res.status === 404) {
+            throw new Error("Package not found");
+        }
+        if (res.status !== 200) {
+            throw new Error("Network error");
+        }
+        return res.data;
+    }
+    async install(name, version) {
+        console.info(`npm install -g ${version ? `${name}@${version}` : name}`);
+        await (0, utils_1.exec)(`npm install -g ${version ? `${name}@${version}` : name}`);
+    }
+};
+exports.NpmService = NpmService;
+exports.NpmService = NpmService = __decorate([
+    (0, core_1.Injectable)()
+], NpmService);

package/lib/services/PluginService.js

@@ -49,7 +49,7 @@ let PluginService = class PluginService {
             const { default: Plugin } = await Promise.resolve(`${pluginName}`).then(s => __importStar(require(s)));
             const name = Reflect.getMetadata(core_1.PLUGIN_NAME_METADATA, Plugin);
             if (!name) {
-                console.log("No name");
+                console.error("No name");
             }
             return !!name;
         }

package/lib/services/PresetService.d.ts

@@ -1,4 +1,4 @@
-import { EnvConfig, Preset, AppConfig, PresetProperties } from "@wocker/core";
+import { EnvConfig, Project, Preset, AppConfig, PresetProperties } from "@wocker/core";
 import { AppConfigService } from "./AppConfigService";
 import { LogService } from "./LogService";
 type SearchOptions = Partial<{
@@ -12,8 +12,10 @@ export declare class PresetService {
     constructor(appConfigService: AppConfigService, logService: LogService);
     protected toObject(config: PresetProperties): Preset;
     protected getList(): Promise<AppConfig["presets"]>;
-    getImageName(preset: Preset, buildArgs?: EnvConfig): string;
+    getImageNameForProject(project: Project, preset: Preset): string;
+    getImageName(preset: Preset, buildArgs: EnvConfig): string;
     init(): Promise<void>;
+    deinit(): Promise<void>;
     get(name: string): Promise<Preset>;
     addPreset(name: string): Promise<void>;
     search(options?: SearchOptions): Promise<Preset[]>;

package/lib/services/PresetService.js

@@ -113,7 +113,15 @@ let PresetService = class PresetService {
             })
         ];
     }
-    getImageName(preset, buildArgs = {}) {
+    getImageNameForProject(project, preset) {
+        switch (project.presetMode) {
+            case "project":
+                return `project-${project.name}:develop`;
+            default:
+                return this.getImageName(preset, project.buildArgs || {});
+        }
+    }
+    getImageName(preset, buildArgs) {
         const rawValues = [];
         const hashValues = [];
         Object.keys(preset.buildArgsOptions || {}).forEach((key) => {
@@ -138,17 +146,23 @@ let PresetService = class PresetService {
         let preset = await this.searchOne({
             path: this.appConfigService.pwd()
         });
-        if (preset) {
-            throw new Error("Preset is already registered");
-        }
         const fs = new core_1.FileSystem(this.appConfigService.pwd());
-        if (!fs.exists("config.json")) {
-            preset = this.toObject({
-                name: fs.basename(),
-                version: "1.0.0",
-                source: "external",
-                path: this.appConfigService.pwd()
-            });
+        if (!preset) {
+            if (!fs.exists("config.json")) {
+                preset = this.toObject({
+                    name: "",
+                    version: "",
+                    source: "external",
+                    path: this.appConfigService.pwd()
+                });
+            }
+            else {
+                preset = this.toObject(fs.readJSON("config.json"));
+                preset.source = "external";
+                preset.path = this.appConfigService.pwd();
+            }
+        }
+        if (!preset.name) {
             const list = await this.getList();
             preset.name = await (0, utils_1.promptText)({
                 message: "Preset name:",
@@ -167,6 +181,8 @@ let PresetService = class PresetService {
                 },
                 default: preset.name
             });
+        }
+        if (!preset.version) {
             preset.version = await (0, utils_1.promptText)({
                 message: "Preset version:",
                 validate: (version) => {
@@ -177,12 +193,16 @@ let PresetService = class PresetService {
                 },
                 default: preset.version
             });
+        }
+        if (!preset.type) {
             preset.type = await (0, utils_1.promptSelect)({
                 message: "Preset type:",
                 options: ["dockerfile", "image"]
             });
-            switch (preset.type) {
-                case "dockerfile":
+        }
+        switch (preset.type) {
+            case "dockerfile":
+                if (!preset.dockerfile) {
                     const files = await fs.readdirFiles();
                     const dockerfiles = files.filter((fileName) => {
                         if (new RegExp("^(.*)\\.dockerfile$").test(fileName)) {
@@ -197,8 +217,10 @@ let PresetService = class PresetService {
                         message: "Preset dockerfile:",
                         options: dockerfiles
                     });
-                    break;
-                case "image":
+                }
+                break;
+            case "image":
+                if (preset.image) {
                     preset.image = await (0, utils_1.promptText)({
                         message: "Preset image:",
                         required: true,
@@ -209,16 +231,27 @@ let PresetService = class PresetService {
                             return true;
                         }
                     });
-                    break;
-            }
-            console.info(JSON.stringify(preset.toJSON(), null, 4));
-            const confirm = await (0, utils_1.promptConfirm)({
-                message: "Correct?"
-            });
-            if (confirm) {
-                await preset.save();
-            }
+                }
+                break;
+        }
+        console.info(JSON.stringify(preset.toJSON(), null, 4));
+        const confirm = await (0, utils_1.promptConfirm)({
+            message: "Correct?"
+        });
+        if (confirm) {
+            await preset.save();
+        }
+    }
+    async deinit() {
+        const preset = await this.searchOne({
+            path: this.appConfigService.pwd()
+        });
+        if (!preset) {
+            return;
         }
+        const config = this.appConfigService.getConfig();
+        config.unregisterPreset(preset.name);
+        await config.save();
     }
     async get(name) {
         const list = await this.getList();

package/lib/services/ProjectService.js

@@ -1,40 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 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 __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 __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectService = void 0;
 const core_1 = require("@wocker/core");
-const Path = __importStar(require("path"));
 const makes_1 = require("../makes");
 const services_1 = require("../services");
 let ProjectService = class ProjectService {
@@ -110,7 +86,7 @@ let ProjectService = class ProjectService {
                 await this.appEventsService.emit("project:rebuild", project);
             }
             await this.appEventsService.emit("project:beforeStart", project);
-            const config = await this.appConfigService.getConfig();
+            const config = this.appConfigService.getConfig();
             container = await this.dockerService.createContainer({
                 name: project.containerName,
                 image: project.imageName,
@@ -118,15 +94,18 @@ let ProjectService = class ProjectService {
                     ...config.env || {},
                     ...project.env || {}
                 },
+                ports: project.ports || [],
                 volumes: (project.volumes || []).map((volume) => {
                     const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
                     const [, source, destination, options] = regVolume.exec(volume);
                     if (source.startsWith("/")) {
                         return volume;
                     }
-                    return `${Path.join(this.appConfigService.pwd(), source)}:${destination}` + (options ? `:${options}` : "");
+                    return `${this.appConfigService.pwd(source)}:${destination}` + (options ? `:${options}` : "");
                 }),
-                ports: project.ports || []
+                extraHosts: Object.keys(project.extraHosts || {}).map((host) => {
+                    return `${project.extraHosts[host]}:${host}`;
+                })
             });
         }
         const { State: { Status } } = await container.inspect();

package/lib/services/ProxyService.js

@@ -46,7 +46,7 @@ let ProxyService = class ProxyService {
                     mode: 0o700
                 });
             }
-            const config = await this.appConfigService.getConfig();
+            const config = this.appConfigService.getConfig();
             const httpPort = config.getMeta("PROXY_HTTP_PORT", "80");
             const httpsPort = config.getMeta("PROXY_HTTPS_PORT", "443");
             container = await this.dockerService.createContainer({
@@ -65,11 +65,11 @@ let ProxyService = class ProxyService {
                     `${certsDir}:/etc/nginx/certs`
                 ]
             });
-            const { State: { Status } } = await container.inspect();
-            if (["created", "exited"].includes(Status)) {
-                await container.start();
-                console.info("Started");
-            }
+        }
+        const { State: { Status } } = await container.inspect();
+        if (["created", "exited"].includes(Status)) {
+            await container.start();
+            console.info("Proxy started");
         }
     }
     async stop() {

package/lib/services/index.d.ts

@@ -2,6 +2,7 @@ export * from "./AppConfigService";
 export * from "./AppEventsService";
 export * from "./DockerService";
 export * from "./LogService";
+export * from "./NpmService";
 export * from "./PluginService";
 export * from "./PresetService";
 export * from "./ProjectService";

package/lib/services/index.js

@@ -18,6 +18,7 @@ __exportStar(require("./AppConfigService"), exports);
 __exportStar(require("./AppEventsService"), exports);
 __exportStar(require("./DockerService"), exports);
 __exportStar(require("./LogService"), exports);
+__exportStar(require("./NpmService"), exports);
 __exportStar(require("./PluginService"), exports);
 __exportStar(require("./PresetService"), exports);
 __exportStar(require("./ProjectService"), exports);

package/lib/types/PackageInfo.d.ts

@@ -0,0 +1,20 @@
+export type PackageInfo = {
+    name: string;
+    "dist-tags": {
+        [tag: string]: string;
+    };
+    versions: {
+        [version: string]: {
+            name: string;
+            version: string;
+        };
+    };
+    time: {
+        created: string;
+        modified: string;
+    } & {
+        [version: string]: string;
+    };
+    readme: string;
+    readmeFilename: string;
+};

package/lib/types/PackageInfo.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/index.d.ts

@@ -0,0 +1 @@
+export * from "./PackageInfo";

package/lib/types/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./PackageInfo"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.16",
+    "version": "1.0.17",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -25,8 +25,8 @@
         "lint": "eslint \"**/*.{js,jsx,ts,tsx}\""
     },
     "dependencies": {
-        "@wocker/core": "1.0.16",
-        "@wocker/utils": "^1.0.5",
+        "@wocker/core": "1.0.17",
+        "@wocker/utils": "^1.0.7",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
         "chalk": "^2.4.2",