@wocker/ws 1.0.7 → 1.0.8

package/lib/controllers/ProxyController.d.ts

@@ -1,34 +1,24 @@
-import { Controller, Cli } from "@wocker/core";
-import { DI, Project } from "../makes";
+import { Project } from "@wocker/core";
 import { AppConfigService, AppEventsService, ProjectService, DockerService } from "../services";
-type InitOptions = {
-    "http-port"?: number;
-    "https-port"?: number;
-};
-type DomainsOptions = {
-    name?: string;
-};
-declare class ProxyController extends Controller {
+export declare class ProxyController {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly appEventsService: AppEventsService;
+    protected readonly projectService: ProjectService;
+    protected readonly dockerService: DockerService;
     protected containerName: string;
-    protected appConfigService: AppConfigService;
-    protected appEventsService: AppEventsService;
-    protected projectService: ProjectService;
-    protected dockerService: DockerService;
-    constructor(di: DI);
-    install(cli: Cli): void;
-    getProjectNames(): Promise<string[]>;
-    getDomains(name: string | undefined, selected: string[]): Promise<string[]>;
+    constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService);
     onProjectStart(project: Project): Promise<void>;
     onProjectStop(project: Project): Promise<void>;
-    init(options: InitOptions): Promise<void>;
+    getProjectNames(): Promise<string[]>;
+    getDomains(name: string | undefined, selected: string[]): Promise<string[]>;
+    init(httpPort: number, httpsPort: number): Promise<void>;
     start(): Promise<void>;
     stop(): Promise<void>;
     restart(): Promise<void>;
-    domainList(options: DomainsOptions): Promise<string>;
-    setDomains(options: DomainsOptions, domains: string[]): Promise<void>;
-    addDomain(options: DomainsOptions, addDomains: string[]): Promise<void>;
-    removeDomain(options: DomainsOptions, removeDomains: string[]): Promise<void>;
-    clearDomains(options: DomainsOptions): Promise<void>;
+    domainList(name: string): Promise<string>;
+    setDomains(name: string, domains: string[]): Promise<void>;
+    addDomain(name: string, addDomains: string[]): Promise<void>;
+    removeDomain(name: string, removeDomains: string[]): Promise<void>;
+    clearDomains(name: string): Promise<void>;
     logs(): Promise<void>;
 }
-export { ProxyController };

package/lib/controllers/ProxyController.js

@@ -1,4 +1,16 @@
 "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); }
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -9,82 +21,27 @@ const utils_1 = require("@wocker/utils");
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const chalk_1 = __importDefault(require("chalk"));
 const makes_1 = require("../makes");
-const utils_2 = require("../utils");
 const services_1 = require("../services");
-class ProxyController extends core_1.Controller {
-    constructor(di) {
-        super();
+let ProxyController = class ProxyController {
+    constructor(appConfigService, appEventsService, projectService, dockerService) {
+        this.appConfigService = appConfigService;
+        this.appEventsService = appEventsService;
+        this.projectService = projectService;
+        this.dockerService = dockerService;
         this.containerName = "proxy.workspace";
-        this.appConfigService = di.resolveService(services_1.AppConfigService);
-        this.appEventsService = di.resolveService(services_1.AppEventsService);
-        this.projectService = di.resolveService(services_1.ProjectService);
-        this.dockerService = di.resolveService(services_1.DockerService);
-    }
-    install(cli) {
-        super.install(cli);
         this.appEventsService.on("project:beforeStart", (project) => this.onProjectStart(project));
         this.appEventsService.on("project:stop", (project) => this.onProjectStop(project));
-        cli.command("proxy:init")
-            .option("http-port", {
-            type: "number",
-            description: "Http port"
-        })
-            .option("https-port", {
-            type: "number",
-            description: "Https port"
-        })
-            .action((options) => this.init(options));
-        cli.command("proxy:start")
-            .action(() => this.start());
-        cli.command("proxy:stop")
-            .action(() => this.stop());
-        cli.command("proxy:restart")
-            .action(() => this.restart());
-        cli.command("domains")
-            .option("name", {
-            type: "string",
-            alias: "n",
-            description: "Project name"
-        })
-            .action((options) => this.domainList(options));
-        cli.command("domain:set [...domains]")
-            .option("name", {
-            type: "string",
-            alias: "n",
-            description: "Project name"
-        })
-            .completion("name", () => this.getProjectNames())
-            .action((options, domains) => this.setDomains(options, domains));
-        cli.command("domain:add [...domains]")
-            .option("name", {
-            type: "string",
-            alias: "n",
-            description: "Project name"
-        })
-            .completion("name", () => this.getProjectNames())
-            .action((options, domains) => this.addDomain(options, domains));
-        cli.command("domain:remove [...domains]")
-            .option("name", {
-            type: "string",
-            alias: "n",
-            description: "Project name"
-        })
-            .completion("name", () => this.getProjectNames())
-            .completion("domains", (options, domains) => this.getDomains(options.name, domains))
-            .action((options, domains) => this.removeDomain(options, domains));
-        cli.command("domain:clear")
-            .option("name", {
-            type: "string",
-            alias: "n",
-            description: "Project name"
-        })
-            .completion("name", () => this.getProjectNames())
-            .action((options) => this.clearDomains(options));
-        cli.command("proxy:logs")
-            .action(() => this.logs());
+    }
+    async onProjectStart(project) {
+        if (!project.hasEnv("VIRTUAL_HOST")) {
+            project.setEnv("VIRTUAL_HOST", project.containerName);
+        }
+        await this.start();
+    }
+    async onProjectStop(project) {
     }
     async getProjectNames() {
-        const projects = await makes_1.Project.search();
+        const projects = await this.projectService.search();
         return projects.map((project) => project.name);
     }
     async getDomains(name, selected) {
@@ -96,16 +53,7 @@ class ProxyController extends core_1.Controller {
             return !selected.includes(domain);
         });
     }
-    async onProjectStart(project) {
-        if (!project.hasEnv("VIRTUAL_HOST")) {
-            project.setEnv("VIRTUAL_HOST", `${project.name}.workspace`);
-        }
-        await this.start();
-    }
-    async onProjectStop(project) {
-    }
-    async init(options) {
-        let { "http-port": httpPort, "https-port": httpsPort } = options;
+    async init(httpPort, httpsPort) {
         if (typeof httpPort === "undefined" || isNaN(httpPort)) {
             httpPort = await (0, utils_1.promptText)({
                 required: true,
@@ -155,9 +103,6 @@ class ProxyController extends core_1.Controller {
                 ]
             });
         }
-        else {
-            console.info("Container already exists");
-        }
         const { State: { Status } } = await container.inspect();
         if (["created", "exited"].includes(Status)) {
             console.info("Starting...", Status);
@@ -172,8 +117,7 @@ class ProxyController extends core_1.Controller {
         await this.stop();
         await this.start();
     }
-    async domainList(options) {
-        const { name } = options;
+    async domainList(name) {
         if (name) {
             await this.projectService.cdProject(name);
         }
@@ -187,22 +131,20 @@ class ProxyController extends core_1.Controller {
         }
         return table.toString() + "\n";
     }
-    async setDomains(options, domains) {
-        const { name } = options;
+    async setDomains(name, domains) {
         if (name) {
             await this.projectService.cdProject(name);
         }
         const project = await this.projectService.get();
         project.setEnv("VIRTUAL_HOST", domains.join(","));
-        project.save();
+        await project.save();
         const container = await this.dockerService.getContainer(`${project.name}.workspace`);
         if (container) {
             await this.projectService.stop();
             await this.projectService.start();
         }
     }
-    async addDomain(options, addDomains) {
-        const { name } = options;
+    async addDomain(name, addDomains) {
         if (name) {
             await this.projectService.cdProject(name);
         }
@@ -226,8 +168,7 @@ class ProxyController extends core_1.Controller {
             await this.projectService.start();
         }
     }
-    async removeDomain(options, removeDomains) {
-        const { name } = options;
+    async removeDomain(name, removeDomains) {
         if (name) {
             await this.projectService.cdProject(name);
         }
@@ -241,8 +182,7 @@ class ProxyController extends core_1.Controller {
         project.setEnv("VIRTUAL_HOST", domains.join(","));
         await project.save();
     }
-    async clearDomains(options) {
-        const { name } = options;
+    async clearDomains(name) {
         if (name) {
             await this.projectService.cdProject(name);
         }
@@ -266,8 +206,114 @@ class ProxyController extends core_1.Controller {
             stderr: true
         });
         stream.on("data", (data) => {
-            process.stdout.write((0, utils_2.demuxOutput)(data));
+            process.stdout.write((0, utils_1.demuxOutput)(data));
         });
     }
-}
+};
 exports.ProxyController = ProxyController;
+__decorate([
+    (0, core_1.Completion)("name"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "getProjectNames", null);
+__decorate([
+    (0, core_1.Command)("proxy:init"),
+    __param(0, (0, core_1.Option)("http-port", {
+        type: "number",
+        description: "Http port"
+    })),
+    __param(1, (0, core_1.Option)("https-port", {
+        type: "number",
+        description: "Https port"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, Number]),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "init", null);
+__decorate([
+    (0, core_1.Command)("proxy:start"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "start", null);
+__decorate([
+    (0, core_1.Command)("proxy:stop"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "stop", null);
+__decorate([
+    (0, core_1.Command)("proxy:restart"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "restart", null);
+__decorate([
+    (0, core_1.Command)("domains"),
+    __param(0, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "Project name"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "domainList", null);
+__decorate([
+    (0, core_1.Command)("domain:set [...domains]"),
+    __param(0, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "Project name"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Array]),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "setDomains", null);
+__decorate([
+    (0, core_1.Command)("domain:add [...domains]"),
+    __param(0, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "Project name"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Array]),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "addDomain", null);
+__decorate([
+    (0, core_1.Command)("domain:remove [...domains]"),
+    __param(0, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "Project name"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Array]),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "removeDomain", null);
+__decorate([
+    (0, core_1.Command)("domain:clear"),
+    __param(0, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "Project name"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "clearDomains", null);
+__decorate([
+    (0, core_1.Command)("proxy:logs"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "logs", null);
+exports.ProxyController = ProxyController = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [services_1.AppConfigService,
+        services_1.AppEventsService,
+        services_1.ProjectService,
+        services_1.DockerService])
+], ProxyController);

package/lib/controllers/index.d.ts

@@ -1,3 +1,4 @@
+export * from "./CompletionController";
 export * from "./ImageController";
 export * from "./PluginController";
 export * from "./PresetController";

package/lib/controllers/index.js

@@ -14,6 +14,7 @@ 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("./CompletionController"), exports);
 __exportStar(require("./ImageController"), exports);
 __exportStar(require("./PluginController"), exports);
 __exportStar(require("./PresetController"), exports);

package/lib/index.d.ts

@@ -1,6 +1,5 @@
 import { App } from "./App";
 declare const app: App;
 export { app };
-export * from "./decorators";
 export * from "./makes";
 export * from "./services";

package/lib/index.js

@@ -16,18 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.app = void 0;
 const App_1 = require("./App");
-const plugins_1 = require("./plugins");
 const app = new App_1.App();
 exports.app = app;
-app.use(plugins_1.ElasticSearchPlugin);
-app.use(plugins_1.LocaltunnelPlugin);
-app.use(plugins_1.MaildevPlugin);
-app.use(plugins_1.MongodbPlugin);
-app.use(plugins_1.NgrokPlugin);
-app.use(plugins_1.PageKitePlugin);
-app.use(plugins_1.PostgresPlugin);
-app.use(plugins_1.ProxmoxPlugin);
-app.use(plugins_1.RedisPlugin);
-__exportStar(require("./decorators"), exports);
 __exportStar(require("./makes"), exports);
 __exportStar(require("./services"), exports);

package/lib/main.d.ts

@@ -0,0 +1,3 @@
+export declare const app: {
+    run(args: string[]): Promise<any>;
+};

package/lib/main.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.app = void 0;
+const core_1 = require("@wocker/core");
+const AppModule_1 = require("./AppModule");
+exports.app = {
+    async run(args) {
+        const factory = await core_1.Factory.create(AppModule_1.AppModule);
+        return factory.run(args);
+    }
+};

package/lib/makes/Logger.d.ts

@@ -1,6 +1,6 @@
-import { DI } from "./DI";
+import { LogService } from "../services";
 declare class Logger {
-    static install(di: DI): void;
+    static install(ls: LogService): void;
     static log(...data: any[]): void;
     static info(...data: any[]): void;
     static warn(...data: any[]): void;

package/lib/makes/Logger.js

@@ -1,23 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = void 0;
-const LogService_1 = require("../services/LogService");
-let _di;
+let logService;
 class Logger {
-    static install(di) {
-        _di = di;
+    static install(ls) {
+        logService = ls;
     }
     static log(...data) {
-        _di.resolveService(LogService_1.LogService).log(...data);
+        if (!logService) {
+            throw new Error("Dependency is missing");
+        }
+        logService.log(...data);
     }
     static info(...data) {
-        _di.resolveService(LogService_1.LogService).info(...data);
+        if (!logService) {
+            throw new Error("Dependency is missing");
+        }
+        logService.info(...data);
     }
     static warn(...data) {
-        _di.resolveService(LogService_1.LogService).warn(...data);
+        if (!logService) {
+            throw new Error("Dependency is missing");
+        }
+        logService.warn(...data);
     }
     static error(...data) {
-        _di.resolveService(LogService_1.LogService).error(...data);
+        if (!logService) {
+            throw new Error("Dependency is missing");
+        }
+        logService.error(...data);
     }
 }
 exports.Logger = Logger;

package/lib/makes/Preset.d.ts

@@ -1,6 +1,5 @@
-import { EnvConfig } from "../types";
-import { DI } from "../makes";
-import { PresetServiceSearchOptions as SearchOptions } from "../services/PresetService";
+import { EnvConfig } from "@wocker/core";
+import { PresetService, PresetServiceSearchOptions as SearchOptions } from "../services/PresetService";
 type TextOption = {
     type: "string" | "number" | "int";
     message?: string;
@@ -39,7 +38,7 @@ declare class Preset {
     constructor(data: any);
     save(): Promise<void>;
     getImageName(buildArgs?: EnvConfig): string;
-    static install(di: DI): void;
+    static install(ps: PresetService): void;
     static search(options: SearchOptions): Promise<Preset[]>;
     static searchOne(options: SearchOptions): Promise<Preset>;
 }

package/lib/makes/Preset.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Preset = void 0;
-const PresetService_1 = require("../services/PresetService");
-let _di;
+let presetService;
 class Preset {
     constructor(data) {
         this.id = data.id;
@@ -15,19 +14,31 @@ class Preset {
         this.volumeOptions = data.volumeOptions;
     }
     async save() {
-        return _di.resolveService(PresetService_1.PresetService).save(this);
+        if (!presetService) {
+            throw new Error("Dependency is missing");
+        }
+        return presetService.save(this);
     }
     getImageName(buildArgs) {
-        return _di.resolveService(PresetService_1.PresetService).getImageName(this, buildArgs);
+        if (!presetService) {
+            throw new Error("Dependency is missing");
+        }
+        return presetService.getImageName(this, buildArgs);
     }
-    static install(di) {
-        _di = di;
+    static install(ps) {
+        presetService = ps;
     }
     static search(options) {
-        return _di.resolveService(PresetService_1.PresetService).search(options);
+        if (!presetService) {
+            throw new Error("Dependency is missing");
+        }
+        return presetService.search(options);
     }
     static searchOne(options) {
-        return _di.resolveService(PresetService_1.PresetService).searchOne(options);
+        if (!presetService) {
+            throw new Error("Dependency is missing");
+        }
+        return presetService.searchOne(options);
     }
 }
 exports.Preset = Preset;

package/lib/makes/index.d.ts

@@ -1,9 +1,3 @@
-export * from "./Controller";
-export * from "./DI";
-export * from "./Docker";
 export * from "./FS";
 export * from "./Logger";
-export * from "./Plugin";
 export * from "./Preset";
-export * from "./Project";
-export * from "./Repository";

package/lib/makes/index.js

@@ -14,12 +14,6 @@ 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("./Controller"), exports);
-__exportStar(require("./DI"), exports);
-__exportStar(require("./Docker"), exports);
 __exportStar(require("./FS"), exports);
 __exportStar(require("./Logger"), exports);
-__exportStar(require("./Plugin"), exports);
 __exportStar(require("./Preset"), exports);
-__exportStar(require("./Project"), exports);
-__exportStar(require("./Repository"), exports);

package/lib/plugins/ElasticSearchPlugin.d.ts

@@ -1,18 +1,17 @@
 import { FSManager } from "@wocker/core";
 import { Cli } from "@kearisp/cli";
-import { Plugin, DI } from "../makes";
 import { AppConfigService, DockerService } from "../services";
 type StartOptions = {
     restart?: boolean;
 };
-declare class ElasticSearchPlugin extends Plugin {
+export declare class ElasticSearchPlugin {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly dockerService: DockerService;
     protected containerName: string;
-    protected appConfigService: AppConfigService;
-    protected dockerService: DockerService;
     protected fs: FSManager;
-    constructor(di: DI);
+    constructor(appConfigService: AppConfigService, dockerService: DockerService);
     install(cli: Cli): void;
     start(options: StartOptions): Promise<void>;
     stop(): Promise<void>;
 }
-export { ElasticSearchPlugin };
+export {};

package/lib/plugins/ElasticSearchPlugin.js

@@ -1,19 +1,25 @@
 "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.ElasticSearchPlugin = void 0;
 const core_1 = require("@wocker/core");
-const makes_1 = require("../makes");
 const services_1 = require("../services");
-class ElasticSearchPlugin extends makes_1.Plugin {
-    constructor(di) {
-        super("elastic-search");
+let ElasticSearchPlugin = class ElasticSearchPlugin {
+    constructor(appConfigService, dockerService) {
+        this.appConfigService = appConfigService;
+        this.dockerService = dockerService;
         this.containerName = "elastic-search.workspace";
-        this.appConfigService = di.resolveService(services_1.AppConfigService);
-        this.dockerService = di.resolveService(services_1.DockerService);
         this.fs = new core_1.FSManager(this.appConfigService.pluginsPath("elastic-search"), this.appConfigService.dataPath("plugins/elastic-search"));
     }
     install(cli) {
-        super.install(cli);
         cli.command("elastica:start")
             .option("restart", {
             type: "boolean",
@@ -68,5 +74,10 @@ class ElasticSearchPlugin extends makes_1.Plugin {
     async stop() {
         await this.dockerService.removeContainer(this.containerName);
     }
-}
+};
 exports.ElasticSearchPlugin = ElasticSearchPlugin;
+exports.ElasticSearchPlugin = ElasticSearchPlugin = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [services_1.AppConfigService,
+        services_1.DockerService])
+], ElasticSearchPlugin);