@wocker/ws 1.0.15 → 1.0.17

package/lib/AppModule.js

@@ -38,10 +38,9 @@ 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 = await appConfigService.getConfig();
+        const config = appConfigService.getConfig();
         const imports = [];
-        for (const plugin of config.plugins) {
+        for (const plugin of config.plugins || []) {
             try {
                 const { default: Plugin } = await Promise.resolve(`${plugin}`).then(s => __importStar(require(s)));
                 if (!Plugin) {
@@ -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/DebugController.d.ts

@@ -4,5 +4,8 @@ export declare class DebugController {
     protected readonly logService: LogService;
     constructor(appConfigService: AppConfigService, logService: LogService);
     debug(status: string): Promise<void>;
+    setLog(level: string): Promise<void>;
+    testLog(level: string, args: string[]): Promise<void>;
     debugCompletion(): Promise<string[]>;
+    getLevels(): string[];
 }

package/lib/controllers/DebugController.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); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DebugController = void 0;
 const core_1 = require("@wocker/core");
@@ -18,27 +21,66 @@ let DebugController = class DebugController {
         this.logService = logService;
     }
     async debug(status) {
-        const config = await this.appConfigService.getConfig();
+        const config = this.appConfigService.getConfig();
         config.debug = status === "on";
         await config.save();
     }
+    async setLog(level) {
+        const validLevels = this.getLevels();
+        if (!validLevels.includes(level)) {
+            throw new Error(`Invalid log level: ${level}. Valid options are ${validLevels.join(', ')}`);
+        }
+        const config = this.appConfigService.getConfig();
+        config.logLevel = level;
+        await config.save();
+    }
+    async testLog(level, args) {
+        this.logService._log(level, ...args);
+    }
     async debugCompletion() {
         return ["on", "off"];
     }
+    getLevels() {
+        return ["debug", "info", "warn", "error"];
+    }
 };
 exports.DebugController = DebugController;
 __decorate([
+    (0, core_1.Command)("debug:<status>"),
     (0, core_1.Command)("debug <status>"),
+    __param(0, (0, core_1.Param)("status")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], DebugController.prototype, "debug", null);
+__decorate([
+    (0, core_1.Description)("Set the log level (options: debug, log, info, warn, error)"),
+    (0, core_1.Command)("loglevel <level>"),
+    __param(0, (0, core_1.Param)("level")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], DebugController.prototype, "setLog", null);
+__decorate([
+    (0, core_1.Command)("log:<level> [...args]"),
+    __param(0, (0, core_1.Param)("level")),
+    __param(1, (0, core_1.Param)("args")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Array]),
+    __metadata("design:returntype", Promise)
+], DebugController.prototype, "testLog", null);
 __decorate([
     (0, core_1.Completion)("status"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], DebugController.prototype, "debugCompletion", null);
+__decorate([
+    (0, core_1.Completion)("level"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Array)
+], DebugController.prototype, "getLevels", null);
 exports.DebugController = DebugController = __decorate([
     (0, core_1.Controller)(),
     __metadata("design:paramtypes", [services_1.AppConfigService,

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

@@ -11,6 +11,8 @@ export declare class PresetController {
     protected onInit(project: Project): Promise<void>;
     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

@@ -50,7 +50,6 @@ let PresetController = class PresetController {
         this.projectService = projectService;
         this.presetService = presetService;
         this.dockerService = dockerService;
-        this.appConfigService.registerProjectType("preset", "Preset");
         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));
@@ -62,7 +61,7 @@ let PresetController = class PresetController {
         });
     }
     async onInit(project) {
-        if (project.type !== "preset") {
+        if (project.type !== core_1.PROJECT_TYPE_PRESET) {
             return;
         }
         const presets = await this.presetService.search();
@@ -79,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");
@@ -95,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
                 });
@@ -111,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) {
@@ -122,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}`);
@@ -135,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,
@@ -149,6 +162,12 @@ let PresetController = class PresetController {
             }
         }
     }
+    async init() {
+        await this.presetService.init();
+    }
+    async deinit() {
+        await this.presetService.deinit();
+    }
     async add(name) {
         await this.presetService.addPreset(name);
     }
@@ -182,7 +201,7 @@ let PresetController = class PresetController {
         if (!confirm) {
             return;
         }
-        const copier = new core_1.FSManager(this.appConfigService.presetPath(preset.name), this.appConfigService.getPWD());
+        const copier = new core_1.FSManager(this.appConfigService.presetPath(preset.name), this.appConfigService.pwd());
         if (preset.dockerfile) {
             if (!copier.destination.exists(preset.dockerfile)) {
                 await copier.copy(preset.dockerfile);
@@ -222,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: {
@@ -234,6 +256,18 @@ let PresetController = class PresetController {
     }
 };
 exports.PresetController = PresetController;
+__decorate([
+    (0, core_1.Command)("preset:init"),
+    __metadata("design:type", Function),
+    __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

@@ -1,3 +1,4 @@
+import { ProjectType } from "@wocker/core";
 import { AppConfigService, AppEventsService, ProjectService, DockerService, LogService } from "../services";
 export declare class ProjectController {
     protected readonly appConfigService: AppConfigService;
@@ -8,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: string, 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>;
@@ -32,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>;