@wocker/ws 1.0.6 → 1.0.8

package/bin/ws.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const chalk = require("chalk");
-const {app} = require("../lib/index.js");
+const {app} = require("../lib/main.js");
 
 
 app.run(process.argv).then((res) => {

package/lib/App.d.ts

@@ -1,16 +1,11 @@
-import { Controller } from "@wocker/core";
 import { Cli } from "@kearisp/cli";
-import { DI } from "./makes";
 import { AppConfigService } from "./services";
 export declare class App {
-    protected di: DI;
     protected cli: Cli;
     protected appConfigService: AppConfigService;
     constructor();
     install(): void;
-    use(Constructor: {
-        new (...params: any[]): Controller;
-    }): void;
+    use(Constructor: any): void;
     setDebug(status: string): Promise<string>;
     run(): Promise<string>;
 }

package/lib/App.js

@@ -24,36 +24,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.App = void 0;
-const cli_1 = require("@kearisp/cli");
 const Path = __importStar(require("path"));
 const env_1 = require("./env");
 const utils_1 = require("./utils");
 const makes_1 = require("./makes");
-const services_1 = require("./services");
-const controllers_1 = require("./controllers");
 class App {
-    constructor() {
-        this.di = new makes_1.DI();
-        this.appConfigService = new services_1.AppConfigService();
-        this.di.registerService(services_1.AppConfigService, this.appConfigService);
-        this.di.registerService(services_1.AppEventsService, new services_1.AppEventsService());
-        this.di.registerService(services_1.DockerService, new services_1.DockerService(this.di));
-        this.di.registerService(services_1.PresetService, new services_1.PresetService(this.di));
-        this.di.registerService(services_1.PluginService, new services_1.PluginService(this.di));
-        this.di.registerService(services_1.ProjectService, new services_1.ProjectService(this.di));
-        this.di.registerService(services_1.LogService, new services_1.LogService(this.di));
-        this.di.registerService(cli_1.Cli, this.cli);
-        this.cli = new cli_1.Cli(makes_1.Logger);
-        makes_1.Preset.install(this.di);
-        makes_1.Project.install(this.di);
-        makes_1.Logger.install(this.di);
-        this.install();
-        this.use(controllers_1.ImageController);
-        this.use(controllers_1.PluginController);
-        this.use(controllers_1.PresetController);
-        this.use(controllers_1.ProjectController);
-        this.use(controllers_1.ProxyController);
-    }
+    constructor() { }
     install() {
         this.cli.command("completion script")
             .help(false)
@@ -68,8 +44,6 @@ class App {
             .action(async (options, status) => this.setDebug(status));
     }
     use(Constructor) {
-        const controller = new Constructor(this.di);
-        controller.install(this.cli);
     }
     async setDebug(status) {
         makes_1.Logger.info(`Set debug ${status}`);

package/lib/AppModule.d.ts

@@ -0,0 +1,6 @@
+import { Container } from "@wocker/core";
+export declare class AppModule {
+    load(container: Container): Promise<{
+        imports: any[];
+    }>;
+}

package/lib/AppModule.js

@@ -0,0 +1,97 @@
+"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 AppModule_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppModule = void 0;
+const core_1 = require("@wocker/core");
+const controllers_1 = require("./controllers");
+const services_1 = require("./services");
+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 config = await appConfigService.getAppConfig();
+        const { plugins } = config;
+        const imports = [];
+        for (const plugin of plugins) {
+            try {
+                const { default: Plugin } = await Promise.resolve(`${plugin}`).then(s => __importStar(require(s)));
+                if (!Plugin) {
+                    continue;
+                }
+                const name = Reflect.getMetadata(core_1.MODULE_METADATA.NAME, Plugin);
+                Reflect.defineMetadata(core_1.MODULE_METADATA.PROVIDERS, [
+                    ...Reflect.getMetadata(core_1.MODULE_METADATA.PROVIDERS, Plugin) || [],
+                    {
+                        provide: core_1.PLUGIN_DIR_KEY,
+                        useValue: name ? appConfigService.dataPath("plugins", name) : undefined
+                    }
+                ], Plugin);
+                imports.push(Plugin);
+            }
+            catch (err) {
+                logService.error(err.message);
+                throw err;
+            }
+        }
+        return {
+            imports
+        };
+    }
+};
+exports.AppModule = AppModule;
+exports.AppModule = AppModule = AppModule_1 = __decorate([
+    (0, core_1.Module)({
+        controllers: [
+            controllers_1.CompletionController,
+            controllers_1.ImageController,
+            controllers_1.PluginController,
+            controllers_1.PresetController,
+            controllers_1.ProjectController,
+            controllers_1.ProxyController
+        ],
+        providers: [
+            services_1.AppConfigService,
+            services_1.AppEventsService,
+            services_1.DockerService,
+            services_1.LogService,
+            services_1.PluginService,
+            services_1.PresetService,
+            services_1.ProjectService
+        ],
+        exports: [
+            services_1.AppConfigService,
+            services_1.AppEventsService,
+            services_1.DockerService,
+            services_1.LogService
+        ]
+    })
+], AppModule);

package/lib/controllers/CompletionController.d.ts

@@ -0,0 +1,6 @@
+import { Cli } from "@wocker/core";
+export declare class CompletionController {
+    protected readonly cli: Cli;
+    constructor(cli: Cli);
+    completion(): string;
+}

package/lib/controllers/CompletionController.js

@@ -0,0 +1,32 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CompletionController = void 0;
+const core_1 = require("@wocker/core");
+let CompletionController = class CompletionController {
+    constructor(cli) {
+        this.cli = cli;
+    }
+    completion() {
+        return this.cli.completionScript() + "\n";
+    }
+};
+exports.CompletionController = CompletionController;
+__decorate([
+    (0, core_1.Command)("completion script"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], CompletionController.prototype, "completion", null);
+exports.CompletionController = CompletionController = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [core_1.Cli])
+], CompletionController);

package/lib/controllers/ImageController.d.ts

@@ -1,10 +1,7 @@
-import { Cli } from "@kearisp/cli";
-import { DI, Controller } from "../makes";
-import { AppConfigService } from "../services";
-declare class ImageController extends Controller {
-    protected appConfigService: AppConfigService;
-    constructor(di: DI);
-    install(cli: Cli): void;
+import { AppConfigService, DockerService } from "../services";
+export declare class ImageController {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly dockerService: DockerService;
+    constructor(appConfigService: AppConfigService, dockerService: DockerService);
     list(): Promise<string>;
 }
-export { ImageController };

package/lib/controllers/ImageController.js

@@ -1,24 +1,28 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImageController = void 0;
+const core_1 = require("@wocker/core");
 const cli_table3_1 = __importDefault(require("cli-table3"));
-const makes_1 = require("../makes");
 const services_1 = require("../services");
-class ImageController extends makes_1.Controller {
-    constructor(di) {
-        super();
-        this.appConfigService = di.resolveService(services_1.AppConfigService);
-    }
-    install(cli) {
-        super.install(cli);
-        cli.command("images")
-            .action(() => this.list());
+let ImageController = class ImageController {
+    constructor(appConfigService, dockerService) {
+        this.appConfigService = appConfigService;
+        this.dockerService = dockerService;
     }
     async list() {
-        const images = await makes_1.Docker.imageLs({});
+        const images = await this.dockerService.imageLs({});
         const table = new cli_table3_1.default({
             head: ["Name"]
         });
@@ -27,5 +31,16 @@ class ImageController extends makes_1.Controller {
         }
         return table.toString() + "\n";
     }
-}
+};
 exports.ImageController = ImageController;
+__decorate([
+    (0, core_1.Command)("images"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], ImageController.prototype, "list", null);
+exports.ImageController = ImageController = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [services_1.AppConfigService,
+        services_1.DockerService])
+], ImageController);

package/lib/controllers/PluginController.d.ts

@@ -1,14 +1,10 @@
-import { Cli } from "@kearisp/cli";
-import { DI, Controller } from "../makes";
-import { AppConfigService, PluginService } from "../services";
-type AddOptions = {};
-type RemoveOptions = {};
-declare class PluginController extends Controller {
-    protected appConfigService: AppConfigService;
-    protected pluginService: PluginService;
-    constructor(di: DI);
-    install(cli: Cli): void;
-    add(options: AddOptions, addName: string): Promise<void>;
-    remove(options: RemoveOptions, removeName: string): Promise<void>;
+import { AppConfigService, PluginService, LogService } from "../services";
+export declare class PluginController {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly pluginService: PluginService;
+    protected readonly logService: LogService;
+    constructor(appConfigService: AppConfigService, pluginService: PluginService, logService: LogService);
+    list(): Promise<string>;
+    add(addName: string): Promise<void>;
+    remove(removeName: string): Promise<void>;
 }
-export { PluginController };

package/lib/controllers/PluginController.js

@@ -15,6 +15,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 = {};
@@ -22,41 +28,49 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginController = void 0;
+const core_1 = require("@wocker/core");
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const makes_1 = require("../makes");
+const cli_table3_1 = __importDefault(require("cli-table3"));
 const services_1 = require("../services");
 const utils_1 = require("../utils");
-class PluginController extends makes_1.Controller {
-    constructor(di) {
-        super();
-        this.appConfigService = di.resolveService(services_1.AppConfigService);
-        this.pluginService = di.resolveService(services_1.PluginService);
+const console = __importStar(require("console"));
+let PluginController = class PluginController {
+    constructor(appConfigService, pluginService, logService) {
+        this.appConfigService = appConfigService;
+        this.pluginService = pluginService;
+        this.logService = logService;
     }
-    install(cli) {
-        super.install(cli);
-        cli.command("plugin:add <name>")
-            .action((options, name) => this.add(options, name));
-        cli.command("plugin:remove <name>")
-            .action((options, name) => this.remove(options, name));
+    async list() {
+        const { plugins } = await this.appConfigService.getAppConfig();
+        const table = new cli_table3_1.default({
+            head: ["Name"],
+            colWidths: [30]
+        });
+        for (const name of plugins) {
+            table.push([name]);
+        }
+        return table.toString() + "\n";
     }
-    async add(options, addName) {
+    async add(addName) {
         const [, prefix = "@wocker/", name, suffix = "-plugin"] = /^(@wocker\/)?(\w+)(-plugin)?$/.exec(addName) || [];
         const fullName = `${prefix}${name}${suffix}`;
         try {
             const { default: Plugin } = await Promise.resolve(`${fullName}`).then(s => __importStar(require(s)));
-            this.pluginService.use(Plugin);
             await this.appConfigService.activatePlugin(fullName);
             console.info(`Plugin ${fullName} activated`);
             return;
         }
         catch (err) {
-            makes_1.Logger.error(err.message);
+            this.logService.error(err.message);
         }
         try {
             const res = await axios_1.default.get(`https://registry.npmjs.org/${encodeURIComponent(fullName)}`, {
@@ -71,14 +85,38 @@ class PluginController extends makes_1.Controller {
             await this.appConfigService.activatePlugin(fullName);
         }
         catch (err) {
-            makes_1.Logger.error(err.message);
+            this.logService.error(err.message);
         }
     }
-    async remove(options, removeName) {
+    async remove(removeName) {
         const [, prefix = "@wocker/", name, suffix = "-plugin"] = /^(@wocker\/)?(\w+)(-plugin)?$/.exec(removeName) || [];
         const fullName = `${prefix}${name}${suffix}`;
         await this.appConfigService.deactivatePlugin(fullName);
         console.info(`Plugin ${fullName} deactivated`);
     }
-}
+};
 exports.PluginController = PluginController;
+__decorate([
+    (0, core_1.Command)("plugins"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], PluginController.prototype, "list", null);
+__decorate([
+    (0, core_1.Command)("plugin:add <name>"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], PluginController.prototype, "add", null);
+__decorate([
+    (0, core_1.Command)("plugin:remove <name>"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], PluginController.prototype, "remove", null);
+exports.PluginController = PluginController = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [services_1.AppConfigService,
+        services_1.PluginService,
+        services_1.LogService])
+], PluginController);

package/lib/controllers/PresetController.d.ts

@@ -1,21 +1,15 @@
-import { Cli } from "@wocker/core";
-import { DI, Controller, Project } from "../makes";
+import { Project } from "@wocker/core";
 import { AppConfigService, AppEventsService, ProjectService, PresetService, DockerService } from "../services";
-type BuildParams = {
-    rebuild?: boolean;
-};
-declare class PresetController extends Controller {
-    protected appConfigService: AppConfigService;
-    protected appEventsService: AppEventsService;
-    protected projectService: ProjectService;
-    protected presetService: PresetService;
-    protected dockerService: DockerService;
-    constructor(di: DI);
-    install(cli: Cli): void;
+export declare class PresetController {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly appEventsService: AppEventsService;
+    protected readonly projectService: ProjectService;
+    protected readonly presetService: PresetService;
+    protected readonly dockerService: DockerService;
+    constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, presetService: PresetService, dockerService: DockerService);
     presets(): Promise<string[]>;
     protected onInit(project: Project): Promise<void>;
     protected onRebuild(project: Project): Promise<void>;
     protected onBeforeStart(project: Project): Promise<void>;
-    build(options: BuildParams, presetName: string): Promise<void>;
+    build(rebuild: boolean, presetName: string): Promise<void>;
 }
-export { PresetController };

package/lib/controllers/PresetController.js

@@ -15,6 +15,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 = {};
@@ -22,37 +28,31 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PresetController = void 0;
+const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const Path = __importStar(require("path"));
 const env_1 = require("../env");
 const utils_2 = require("../utils");
-const makes_1 = require("../makes");
 const services_1 = require("../services");
-class PresetController extends makes_1.Controller {
-    constructor(di) {
-        super();
-        this.appConfigService = di.resolveService(services_1.AppConfigService);
-        this.appEventsService = di.resolveService(services_1.AppEventsService);
-        this.projectService = di.resolveService(services_1.ProjectService);
-        this.presetService = di.resolveService(services_1.PresetService);
-        this.dockerService = di.resolveService(services_1.DockerService);
-    }
-    install(cli) {
-        super.install(cli);
+let PresetController = class PresetController {
+    constructor(appConfigService, appEventsService, projectService, presetService, dockerService) {
+        this.appConfigService = appConfigService;
+        this.appEventsService = appEventsService;
+        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));
-        cli.command("preset:build <preset>")
-            .completion("preset", () => this.presets())
-            .option("rebuild", {
-            type: "boolean",
-            alias: "r",
-            description: "Rebuild image"
-        })
-            .action((options, preset) => this.build(options, preset));
     }
     async presets() {
         const presets = await this.presetService.search();
@@ -148,7 +148,7 @@ class PresetController extends makes_1.Controller {
             }
         }
     }
-    async build(options, presetName) {
+    async build(rebuild, presetName) {
         const preset = await this.presetService.get(presetName);
         let buildArgs = {};
         if (preset.buildArgsOptions) {
@@ -165,5 +165,24 @@ class PresetController extends makes_1.Controller {
             src: preset.dockerfile
         });
     }
-}
+};
 exports.PresetController = PresetController;
+__decorate([
+    (0, core_1.Command)("preset:build <preset>"),
+    __param(0, (0, core_1.Option)("rebuild", {
+        type: "boolean",
+        alias: "r",
+        description: "Rebuild image"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Boolean, String]),
+    __metadata("design:returntype", Promise)
+], PresetController.prototype, "build", null);
+exports.PresetController = PresetController = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [services_1.AppConfigService,
+        services_1.AppEventsService,
+        services_1.ProjectService,
+        services_1.PresetService,
+        services_1.DockerService])
+], PresetController);