@wocker/ws 1.0.22 → 1.0.23

package/lib/AppModule.js

@@ -11,13 +11,19 @@ exports.AppModule = void 0;
 const core_1 = require("@wocker/core");
 const controllers_1 = require("./controllers");
 const repositories_1 = require("./repositories");
-const services_1 = require("./services");
-const keystore_1 = require("./keystore");
+const AppConfigService_1 = require("./services/AppConfigService");
+const AppEventsService_1 = require("./services/AppEventsService");
+const PluginService_1 = require("./services/PluginService");
+const PresetService_1 = require("./services/PresetService");
+const ProjectService_1 = require("./services/ProjectService");
+const NpmService_1 = require("./services/NpmService");
+const LogService_1 = require("./services/LogService");
+const modules_1 = require("./modules");
 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 appConfigService = container.getModule(AppModule_1).get(AppConfigService_1.AppConfigService);
+        const logService = container.getModule(AppModule_1).get(LogService_1.LogService);
+        const pluginService = container.getModule(AppModule_1).get(PluginService_1.PluginService);
         const imports = [];
         for (const pluginData of appConfigService.config.plugins || []) {
             try {
@@ -47,38 +53,39 @@ exports.AppModule = AppModule;
 exports.AppModule = AppModule = AppModule_1 = __decorate([
     (0, core_1.Global)(),
     (0, core_1.Module)({
+        imports: [
+            modules_1.DockerModule,
+            modules_1.KeystoreModule,
+            modules_1.ProxyModule
+        ],
         controllers: [
             controllers_1.CompletionController,
-            controllers_1.DebugController,
-            controllers_1.KeystoreController,
-            controllers_1.PluginController,
-            controllers_1.PresetController,
             controllers_1.ProjectController,
-            controllers_1.ProxyController,
-            controllers_1.CertController
+            controllers_1.PresetController,
+            controllers_1.PluginController,
+            controllers_1.ExperimentalController,
+            controllers_1.DebugController
         ],
         providers: [
-            services_1.AppConfigService,
-            services_1.AppEventsService,
-            services_1.DockerService,
-            services_1.LogService,
-            services_1.NpmService,
-            services_1.PluginService,
-            services_1.PresetService,
-            services_1.ProjectService,
-            services_1.ProxyService,
-            services_1.CertService,
-            keystore_1.KeystoreService,
+            AppConfigService_1.AppConfigService,
+            AppEventsService_1.AppEventsService,
+            LogService_1.LogService,
+            NpmService_1.NpmService,
+            ProjectService_1.ProjectService,
+            PluginService_1.PluginService,
+            PresetService_1.PresetService,
             repositories_1.PresetRepository
         ],
         exports: [
-            services_1.AppConfigService,
-            services_1.AppEventsService,
-            services_1.DockerService,
-            services_1.LogService,
-            services_1.ProjectService,
-            services_1.ProxyService,
-            keystore_1.KeystoreService
+            AppConfigService_1.AppConfigService,
+            AppEventsService_1.AppEventsService,
+            LogService_1.LogService,
+            modules_1.DockerService,
+            modules_1.CertService,
+            modules_1.ContainerService,
+            ProjectService_1.ProjectService,
+            modules_1.ProxyService,
+            modules_1.KeystoreService
         ]
     })
 ], AppModule);

package/lib/controllers/DebugController.d.ts

@@ -1,4 +1,5 @@
-import { AppConfigService, LogService } from "../services";
+import { AppConfigService } from "../services/AppConfigService";
+import { LogService } from "../services/LogService";
 export declare class DebugController {
     protected readonly appConfigService: AppConfigService;
     protected readonly logService: LogService;

package/lib/controllers/DebugController.js

@@ -14,7 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DebugController = void 0;
 const core_1 = require("@wocker/core");
-const services_1 = require("../services");
+const AppConfigService_1 = require("../services/AppConfigService");
+const LogService_1 = require("../services/LogService");
 let DebugController = class DebugController {
     constructor(appConfigService, logService) {
         this.appConfigService = appConfigService;
@@ -25,16 +26,15 @@ let DebugController = class DebugController {
     }
     async setDebug(status) {
         this.appConfigService.config.debug = status === "on";
-        await this.appConfigService.config.save();
+        this.appConfigService.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();
+        this.appConfigService.config.logLevel = level;
+        this.appConfigService.save();
     }
     async testLog(level, args) {
         this.logService._log(level, ...args);
@@ -91,6 +91,6 @@ __decorate([
 ], DebugController.prototype, "getLevels", null);
 exports.DebugController = DebugController = __decorate([
     (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [services_1.AppConfigService,
-        services_1.LogService])
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+        LogService_1.LogService])
 ], DebugController);

package/lib/controllers/ExperimentalController.d.ts

@@ -0,0 +1,8 @@
+import { AppConfigService } from "../services/AppConfigService";
+export declare class ExperimentalController {
+    protected readonly appService: AppConfigService;
+    constructor(appService: AppConfigService);
+    enable(feature?: string): void;
+    disable(feature?: string): void;
+    getFeatures(): string[];
+}

package/lib/controllers/ExperimentalController.js

@@ -0,0 +1,77 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExperimentalController = void 0;
+const core_1 = require("@wocker/core");
+const AppConfigService_1 = require("../services/AppConfigService");
+let ExperimentalController = class ExperimentalController {
+    constructor(appService) {
+        this.appService = appService;
+    }
+    enable(feature) {
+        if (!feature) {
+            throw new core_1.UsageException("Feature name is required. Usage: wocker experimental:enable <feature-name>\n");
+        }
+        if (!this.appService.experimentalFeatures.includes(feature)) {
+            const availableFeatures = this.appService.experimentalFeatures.join(", ");
+            throw new core_1.UsageException(`Unknown experimental feature: "${feature}"\nAvailable features: ${availableFeatures}`);
+        }
+        this.appService.setMeta(`experimental.${feature}`, "enabled");
+        this.appService.save();
+    }
+    disable(feature) {
+        if (!feature) {
+            throw new core_1.UsageException("Feature name is required. Usage: wocker experimental:disable <feature-name>\n");
+        }
+        if (!this.appService.experimentalFeatures.includes(feature)) {
+            const availableFeatures = this.appService.experimentalFeatures.join(", ");
+            throw new core_1.UsageException(`Unknown experimental feature: "${feature}"\nAvailable features: ${availableFeatures}`);
+        }
+        this.appService.unsetMeta(`experimental.${feature}`);
+        this.appService.save();
+    }
+    getFeatures() {
+        return this.appService.experimentalFeatures;
+    }
+};
+exports.ExperimentalController = ExperimentalController;
+__decorate([
+    (0, core_1.Command)("experimental:enable [feature]"),
+    (0, core_1.Description)("Enable experimental features"),
+    __param(0, (0, core_1.Param)("feature")),
+    __param(0, (0, core_1.Description)("Name of the feature to enable")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", void 0)
+], ExperimentalController.prototype, "enable", null);
+__decorate([
+    (0, core_1.Command)("experimental:disable [feature]"),
+    (0, core_1.Description)("Disable experimental features"),
+    __param(0, (0, core_1.Param)("feature")),
+    __param(0, (0, core_1.Description)("Name of the feature to disable")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", void 0)
+], ExperimentalController.prototype, "disable", null);
+__decorate([
+    (0, core_1.Completion)("feature"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Array)
+], ExperimentalController.prototype, "getFeatures", null);
+exports.ExperimentalController = ExperimentalController = __decorate([
+    (0, core_1.Controller)(),
+    (0, core_1.Description)("Manage experimental features"),
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService])
+], ExperimentalController);

package/lib/controllers/PluginController.d.ts

@@ -1,4 +1,5 @@
-import { AppConfigService, PluginService } from "../services";
+import { AppConfigService } from "../services/AppConfigService";
+import { PluginService } from "../services/PluginService";
 export declare class PluginController {
     protected readonly appConfigService: AppConfigService;
     protected readonly pluginService: PluginService;

package/lib/controllers/PluginController.js

@@ -14,7 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginController = void 0;
 const core_1 = require("@wocker/core");
-const services_1 = require("../services");
+const AppConfigService_1 = require("../services/AppConfigService");
+const PluginService_1 = require("../services/PluginService");
 let PluginController = class PluginController {
     constructor(appConfigService, pluginService) {
         this.appConfigService = appConfigService;
@@ -81,6 +82,6 @@ __decorate([
 exports.PluginController = PluginController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Plugin commands"),
-    __metadata("design:paramtypes", [services_1.AppConfigService,
-        services_1.PluginService])
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+        PluginService_1.PluginService])
 ], PluginController);

package/lib/controllers/PresetController.d.ts

@@ -1,6 +1,10 @@
 import { Project } from "@wocker/core";
 import { PresetRepository } from "../repositories";
-import { AppConfigService, AppEventsService, ProjectService, PresetService, DockerService } from "../services";
+import { AppConfigService } from "../services/AppConfigService";
+import { AppEventsService } from "../services/AppEventsService";
+import { ProjectService } from "../services/ProjectService";
+import { PresetService } from "../services/PresetService";
+import { DockerService } from "../modules";
 export declare class PresetController {
     protected readonly appConfigService: AppConfigService;
     protected readonly appEventsService: AppEventsService;

package/lib/controllers/PresetController.js

@@ -54,10 +54,13 @@ const utils_1 = require("@wocker/utils");
 const utils_2 = require("@wocker/utils");
 const Path = __importStar(require("path"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
-const env_1 = require("../env");
 const utils_3 = require("../utils");
 const repositories_1 = require("../repositories");
-const services_1 = require("../services");
+const AppConfigService_1 = require("../services/AppConfigService");
+const AppEventsService_1 = require("../services/AppEventsService");
+const ProjectService_1 = require("../services/ProjectService");
+const PresetService_1 = require("../services/PresetService");
+const modules_1 = require("../modules");
 let PresetController = class PresetController {
     constructor(appConfigService, appEventsService, projectService, presetService, presetRepository, dockerService) {
         this.appConfigService = appConfigService;
@@ -285,7 +288,7 @@ let PresetController = class PresetController {
                 presetName: preset.name
             },
             buildArgs: buildArgs,
-            context: Path.join(env_1.PRESETS_DIR, preset.name),
+            context: preset.path,
             src: preset.dockerfile
         });
     }
@@ -352,10 +355,10 @@ __decorate([
 exports.PresetController = PresetController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Preset commands"),
-    __metadata("design:paramtypes", [services_1.AppConfigService,
-        services_1.AppEventsService,
-        services_1.ProjectService,
-        services_1.PresetService,
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+        AppEventsService_1.AppEventsService,
+        ProjectService_1.ProjectService,
+        PresetService_1.PresetService,
         repositories_1.PresetRepository,
-        services_1.DockerService])
+        modules_1.DockerService])
 ], PresetController);

package/lib/controllers/ProjectController.d.ts

@@ -1,5 +1,9 @@
 import { ProjectType } from "@wocker/core";
-import { AppConfigService, AppEventsService, ProjectService, LogService, DockerService } from "../services";
+import { AppConfigService } from "../services/AppConfigService";
+import { AppEventsService } from "../services/AppEventsService";
+import { ProjectService } from "../services/ProjectService";
+import { LogService } from "../services/LogService";
+import { DockerService } from "../modules";
 export declare class ProjectController {
     protected readonly appConfigService: AppConfigService;
     protected readonly appEventsService: AppEventsService;
@@ -29,7 +33,7 @@ export declare class ProjectController {
     configUnset(configs: string[], name?: string, global?: boolean): Promise<void>;
     buildArgsList(name?: string): Promise<string>;
     buildArgsGet(args: string[], name?: string): Promise<string>;
-    buildArgsSet(name: string, args: string[]): Promise<void>;
+    buildArgsSet(args: string[], name: string): Promise<void>;
     buildArgsUnset(args: string[], name: string): Promise<void>;
     volumeList(name?: string): Promise<string>;
     volumeMount(volumes: string[], name: string): Promise<void>;