@wocker/ws 1.0.23 → 1.0.25

package/lib/AppModule.js

@@ -10,36 +10,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppModule = void 0;
 const core_1 = require("@wocker/core");
 const controllers_1 = require("./controllers");
-const repositories_1 = require("./repositories");
-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(AppConfigService_1.AppConfigService);
-        const logService = container.getModule(AppModule_1).get(LogService_1.LogService);
-        const pluginService = container.getModule(AppModule_1).get(PluginService_1.PluginService);
+        const appModule = container.getModule(AppModule_1), fs = appModule.get(core_1.AppFileSystemService), appConfigService = appModule.get(core_1.AppConfigService), logService = appModule.get(core_1.LogService), pluginService = appModule.get(PluginService_1.PluginService);
         const imports = [];
-        for (const pluginData of appConfigService.config.plugins || []) {
+        for (const pluginData of appConfigService.plugins || []) {
             try {
                 const plugin = await pluginService.import(pluginData.name);
                 Reflect.defineMetadata(core_1.MODULE_METADATA.PROVIDERS, [
                     ...Reflect.getMetadata(core_1.MODULE_METADATA.PROVIDERS, plugin.type) || [],
                     {
                         provide: core_1.PLUGIN_DIR_KEY,
-                        useValue: appConfigService.dataPath("plugins", plugin.name)
+                        useValue: fs.path("plugins", plugin.name)
                     }
                 ], plugin.type);
                 imports.push(plugin.type);
             }
             catch (err) {
                 logService.error(err.message);
-                appConfigService.config.removePlugin(pluginData.name);
+                appConfigService.removePlugin(pluginData.name);
                 appConfigService.save();
                 throw err;
             }
@@ -54,6 +46,9 @@ exports.AppModule = AppModule = AppModule_1 = __decorate([
     (0, core_1.Global)(),
     (0, core_1.Module)({
         imports: [
+            modules_1.CoreModule,
+            modules_1.ProjectModule,
+            modules_1.PresetModule,
             modules_1.DockerModule,
             modules_1.KeystoreModule,
             modules_1.ProxyModule
@@ -61,31 +56,25 @@ exports.AppModule = AppModule = AppModule_1 = __decorate([
         controllers: [
             controllers_1.CompletionController,
             controllers_1.ProjectController,
-            controllers_1.PresetController,
             controllers_1.PluginController,
             controllers_1.ExperimentalController,
             controllers_1.DebugController
         ],
         providers: [
-            AppConfigService_1.AppConfigService,
-            AppEventsService_1.AppEventsService,
-            LogService_1.LogService,
             NpmService_1.NpmService,
-            ProjectService_1.ProjectService,
-            PluginService_1.PluginService,
-            PresetService_1.PresetService,
-            repositories_1.PresetRepository
+            PluginService_1.PluginService
         ],
         exports: [
-            AppConfigService_1.AppConfigService,
-            AppEventsService_1.AppEventsService,
-            LogService_1.LogService,
             modules_1.DockerService,
             modules_1.CertService,
             modules_1.ContainerService,
-            ProjectService_1.ProjectService,
+            modules_1.ImageService,
             modules_1.ProxyService,
-            modules_1.KeystoreService
+            modules_1.KeystoreService,
+            modules_1.PresetRepository,
+            modules_1.PresetService,
+            modules_1.ProjectService,
+            core_1.ProcessService
         ]
     })
 ], AppModule);

package/lib/controllers/DebugController.d.ts

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

package/lib/controllers/DebugController.js

@@ -14,18 +14,16 @@ 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 AppConfigService_1 = require("../services/AppConfigService");
-const LogService_1 = require("../services/LogService");
 let DebugController = class DebugController {
     constructor(appConfigService, logService) {
         this.appConfigService = appConfigService;
         this.logService = logService;
     }
     async debug() {
-        return this.appConfigService.config.debug ? "on" : "off";
+        return this.appConfigService.debug ? "on" : "off";
     }
     async setDebug(status) {
-        this.appConfigService.config.debug = status === "on";
+        this.appConfigService.debug = status === "on";
         this.appConfigService.save();
     }
     async setLog(level) {
@@ -91,6 +89,6 @@ __decorate([
 ], DebugController.prototype, "getLevels", null);
 exports.DebugController = DebugController = __decorate([
     (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
-        LogService_1.LogService])
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.LogService])
 ], DebugController);

package/lib/controllers/ExperimentalController.d.ts

@@ -1,4 +1,4 @@
-import { AppConfigService } from "../services/AppConfigService";
+import { AppConfigService } from "@wocker/core";
 export declare class ExperimentalController {
     protected readonly appService: AppConfigService;
     constructor(appService: AppConfigService);

package/lib/controllers/ExperimentalController.js

@@ -14,7 +14,6 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 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;
@@ -73,5 +72,5 @@ __decorate([
 exports.ExperimentalController = ExperimentalController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Manage experimental features"),
-    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService])
+    __metadata("design:paramtypes", [core_1.AppConfigService])
 ], ExperimentalController);

package/lib/controllers/PluginController.d.ts

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

package/lib/controllers/PluginController.js

@@ -14,7 +14,6 @@ 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 AppConfigService_1 = require("../services/AppConfigService");
 const PluginService_1 = require("../services/PluginService");
 let PluginController = class PluginController {
     constructor(appConfigService, pluginService) {
@@ -82,6 +81,6 @@ __decorate([
 exports.PluginController = PluginController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Plugin commands"),
-    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppConfigService,
         PluginService_1.PluginService])
 ], PluginController);

package/lib/controllers/ProjectController.d.ts

@@ -1,23 +1,20 @@
-import { ProjectType } from "@wocker/core";
-import { AppConfigService } from "../services/AppConfigService";
-import { AppEventsService } from "../services/AppEventsService";
-import { ProjectService } from "../services/ProjectService";
-import { LogService } from "../services/LogService";
-import { DockerService } from "../modules";
+import { ProjectType, AppConfigService, EventService, LogService, ProcessService } from "@wocker/core";
+import { DockerService } from "../modules/docker";
+import { ProjectService, ProjectRepository } from "../modules/project";
 export declare class ProjectController {
     protected readonly appConfigService: AppConfigService;
-    protected readonly appEventsService: AppEventsService;
+    protected readonly processService: ProcessService;
+    protected readonly eventService: EventService;
     protected readonly projectService: ProjectService;
+    protected readonly projectRepository: ProjectRepository;
     protected readonly logService: LogService;
     protected readonly dockerService: DockerService;
-    constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, logService: LogService, dockerService: DockerService);
+    constructor(appConfigService: AppConfigService, processService: ProcessService, eventService: EventService, projectService: ProjectService, projectRepository: ProjectRepository, logService: LogService, dockerService: DockerService);
     protected getProjectNames(): Promise<string[]>;
     getScriptNames(): Promise<string[]>;
     init(name: string, type: ProjectType): Promise<void>;
     destroy(name?: string): Promise<void>;
     projectList(all: boolean): Promise<string>;
-    start(name?: string, detach?: boolean, attach?: boolean, rebuild?: boolean, restart?: boolean): Promise<void>;
-    stop(name: string): Promise<void>;
     domains(name?: string): Promise<string>;
     addDomain(addDomains: string[], name: string): Promise<void>;
     setDomains(domains: string[], name: string): Promise<void>;
@@ -42,7 +39,6 @@ export declare class ProjectController {
     addExtraHost(extraHost: string, extraDomain: string, name?: string): Promise<void>;
     removeExtraHost(extraHost: string, name?: string): Promise<void>;
     attach(name?: string): Promise<void>;
-    exec(command?: string[], name?: string): Promise<void>;
     run(script: string, args?: string[], name?: string): Promise<void>;
     logs(name?: string, global?: boolean, detach?: boolean, follow?: boolean, clear?: boolean): Promise<void>;
 }