@wocker/ws 1.0.7 → 1.0.9

package/lib/plugins/NgrokPlugin.js

@@ -1,17 +1,26 @@
 "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.NgrokPlugin = void 0;
+const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const makes_1 = require("../makes");
 const services_1 = require("../services");
-class NgrokPlugin extends makes_1.Plugin {
-    constructor(di) {
-        super("ngrok");
-        this.appEventsService = di.resolveService(services_1.AppEventsService);
-        this.projectService = di.resolveService(services_1.ProjectService);
+let NgrokPlugin = class NgrokPlugin {
+    constructor(appEventsService, projectService, dockerService) {
+        this.appEventsService = appEventsService;
+        this.projectService = projectService;
+        this.dockerService = dockerService;
     }
     install(cli) {
-        super.install(cli);
         this.appEventsService.on("project:start", (project) => this.onProjectStart(project));
         this.appEventsService.on("project:stop", (project) => this.onProjectStop(project));
         cli.command("ngrok:init")
@@ -98,12 +107,12 @@ class NgrokPlugin extends makes_1.Plugin {
         await project.save();
     }
     async getForwarding(project) {
-        const container = await makes_1.Docker.getContainer(`ngrok-${project.name}`);
+        const container = await this.dockerService.getContainer(`ngrok-${project.name}`);
         if (!container) {
             throw new Error(`Ngrok for "${project.name}" not started`);
         }
         const { NetworkSettings: { Networks: { workspace } } } = await container.inspect();
-        const stream = await makes_1.Docker.exec("proxy.workspace", [
+        const stream = await this.dockerService.exec("proxy.workspace", [
             "curl", `http://${workspace.IPAddress}:4040/api/tunnels/command_line`
         ], false);
         const res = await new Promise((resolve, reject) => {
@@ -121,7 +130,7 @@ class NgrokPlugin extends makes_1.Plugin {
         if (!project || project.getEnv("NGROK_ENABLE", "false") !== "true") {
             return;
         }
-        const container1 = await makes_1.Docker.getContainer(`ngrok-${project.name}`);
+        const container1 = await this.dockerService.getContainer(`ngrok-${project.name}`);
         if (container1) {
             const { State: { Running } } = await container1.inspect();
             if (Running) {
@@ -131,13 +140,13 @@ class NgrokPlugin extends makes_1.Plugin {
                 return;
             }
             else {
-                await makes_1.Docker.removeContainer(`ngrok-${project.name}`);
+                await this.dockerService.removeContainer(`ngrok-${project.name}`);
             }
         }
         console.log("Ngrok starting...");
         makes_1.Logger.info(`Ngrok start: ${project.name}`);
-        await makes_1.Docker.pullImage("ngrok/ngrok:latest");
-        const container = await makes_1.Docker.createContainer({
+        await this.dockerService.pullImage("ngrok/ngrok:latest");
+        const container = await this.dockerService.createContainer({
             name: `ngrok-${project.name}`,
             image: "ngrok/ngrok:latest",
             tty: true,
@@ -182,7 +191,7 @@ class NgrokPlugin extends makes_1.Plugin {
             return;
         }
         console.log("Ngrok stopping...");
-        await makes_1.Docker.removeContainer(`ngrok-${project.name}`);
+        await this.dockerService.removeContainer(`ngrok-${project.name}`);
     }
     async start(options) {
         const { name, detach } = options;
@@ -192,7 +201,7 @@ class NgrokPlugin extends makes_1.Plugin {
         const project = await this.projectService.get();
         await this.onProjectStart(project);
         if (!detach) {
-            await makes_1.Docker.attach(`ngrok-${project.name}`);
+            await this.dockerService.attach(`ngrok-${project.name}`);
         }
     }
     async stop(options) {
@@ -214,7 +223,7 @@ class NgrokPlugin extends makes_1.Plugin {
             await this.projectService.cdProject(name);
         }
         const project = await this.projectService.get();
-        const container = await makes_1.Docker.getContainer(`ngrok-${project.name}`);
+        const container = await this.dockerService.getContainer(`ngrok-${project.name}`);
         if (!container) {
             throw new Error("Ngrok not started");
         }
@@ -225,7 +234,7 @@ class NgrokPlugin extends makes_1.Plugin {
             await this.projectService.cdProject(name);
         }
         const project = await this.projectService.get();
-        await makes_1.Docker.attach(`ngrok-${project.name}`);
+        await this.dockerService.attach(`ngrok-${project.name}`);
     }
     async forwarding(options) {
         const { name } = options;
@@ -235,5 +244,11 @@ class NgrokPlugin extends makes_1.Plugin {
         const project = await this.projectService.get();
         return this.getForwarding(project);
     }
-}
+};
 exports.NgrokPlugin = NgrokPlugin;
+exports.NgrokPlugin = NgrokPlugin = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [services_1.AppEventsService,
+        services_1.ProjectService,
+        core_1.DockerService])
+], NgrokPlugin);

package/lib/plugins/PageKitePlugin.d.ts

@@ -1,6 +1,6 @@
+import { Project } from "@wocker/core";
 import { Cli } from "@kearisp/cli";
-import { DI, Plugin, Project } from "../makes";
-import { AppConfigService, AppEventsService, ProjectService } from "../services";
+import { AppConfigService, AppEventsService, ProjectService, DockerService } from "../services";
 type InitOptions = {};
 type StartOptions = {
     name?: string;
@@ -14,11 +14,13 @@ type StopOptions = {
 type BuildOptions = {
     rebuild?: boolean;
 };
-declare class PageKitePlugin extends Plugin {
-    protected appConfigService: AppConfigService;
-    protected appEventsService: AppEventsService;
-    protected projectService: ProjectService;
-    constructor(di: DI);
+export declare class PageKitePlugin {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly appEventsService: AppEventsService;
+    protected readonly projectService: ProjectService;
+    protected readonly dockerService: DockerService;
+    constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService);
+    pluginPath(...parts: string[]): string;
     install(cli: Cli): void;
     onProjectStart(project: Project): Promise<void>;
     onProjectStop(project: Project): Promise<void>;
@@ -27,4 +29,4 @@ declare class PageKitePlugin extends Plugin {
     stop(options: StopOptions): Promise<void>;
     build(options?: BuildOptions): Promise<void>;
 }
-export { PageKitePlugin };
+export {};

package/lib/plugins/PageKitePlugin.js

@@ -1,19 +1,29 @@
 "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.PageKitePlugin = void 0;
+const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
-const makes_1 = require("../makes");
-const utils_2 = require("../utils");
 const services_1 = require("../services");
-class PageKitePlugin extends makes_1.Plugin {
-    constructor(di) {
-        super("pagekite");
-        this.appConfigService = di.resolveService(services_1.AppConfigService);
-        this.appEventsService = di.resolveService(services_1.AppEventsService);
-        this.projectService = di.resolveService(services_1.ProjectService);
+let PageKitePlugin = class PageKitePlugin {
+    constructor(appConfigService, appEventsService, projectService, dockerService) {
+        this.appConfigService = appConfigService;
+        this.appEventsService = appEventsService;
+        this.projectService = projectService;
+        this.dockerService = dockerService;
+    }
+    pluginPath(...parts) {
+        return this.appConfigService.pluginsPath("pagekite", ...parts);
     }
     install(cli) {
-        super.install(cli);
         this.appEventsService.on("project:start", (project) => this.onProjectStart(project));
         this.appEventsService.on("project:stop", (project) => this.onProjectStop(project));
         cli.command("pagekite:init")
@@ -51,7 +61,7 @@ class PageKitePlugin extends makes_1.Plugin {
         }
         console.info("Pagekite starting...");
         await this.build();
-        let container = await makes_1.Docker.getContainer(`pagekite-${project.name}`);
+        let container = await this.dockerService.getContainer(`pagekite-${project.name}`);
         if (container) {
             const { State: { Running } } = await container.inspect();
             if (Running) {
@@ -59,11 +69,11 @@ class PageKitePlugin extends makes_1.Plugin {
                 return;
             }
             else {
-                await makes_1.Docker.removeContainer(`pagekite-${project.name}`);
+                await this.dockerService.removeContainer(`pagekite-${project.name}`);
             }
         }
         const subdomain = project.getEnv("PAGEKITE_SUBDOMAIN");
-        container = await makes_1.Docker.createContainer({
+        container = await this.dockerService.createContainer({
             name: `pagekite-${project.name}`,
             image: "ws-pagekite",
             tty: true,
@@ -93,14 +103,14 @@ class PageKitePlugin extends makes_1.Plugin {
                 stream.end();
             }
         });
-        await makes_1.Docker.attachStream(stream);
+        await this.dockerService.attachStream(stream);
     }
     async onProjectStop(project) {
         if (!project || project.getEnv("PAGEKITE_ENABLE", "false") !== "true") {
             return;
         }
         console.info("Pagekite stopping...");
-        await makes_1.Docker.removeContainer(`pagekite-${project.name}`);
+        await this.dockerService.removeContainer(`pagekite-${project.name}`);
     }
     async init(options) {
         const project = await this.projectService.get();
@@ -130,7 +140,7 @@ class PageKitePlugin extends makes_1.Plugin {
         }
         const project = await this.projectService.get();
         if (restart) {
-            await makes_1.Docker.removeContainer(`pagekite-${project.name}`);
+            await this.dockerService.removeContainer(`pagekite-${project.name}`);
         }
         await this.onProjectStart(project);
     }
@@ -144,18 +154,24 @@ class PageKitePlugin extends makes_1.Plugin {
     }
     async build(options = {}) {
         const { rebuild } = options;
-        const exists = await makes_1.Docker.imageExists("ws-pagekite");
+        const exists = await this.dockerService.imageExists("ws-pagekite");
         if (rebuild) {
-            await makes_1.Docker.removeContainer("ws-pagekite");
+            await this.dockerService.removeContainer("ws-pagekite");
         }
         if (!exists || rebuild) {
-            const stream = await makes_1.Docker.imageBuild2({
+            await this.dockerService.buildImage({
                 tag: "ws-pagekite",
                 context: this.pluginPath(),
                 src: "./Dockerfile"
             });
-            await (0, utils_2.followProgress)(stream);
         }
     }
-}
+};
 exports.PageKitePlugin = PageKitePlugin;
+exports.PageKitePlugin = PageKitePlugin = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [services_1.AppConfigService,
+        services_1.AppEventsService,
+        services_1.ProjectService,
+        services_1.DockerService])
+], PageKitePlugin);

package/lib/plugins/ProxmoxPlugin.d.ts

@@ -1,9 +1,12 @@
-import { Cli } from "@kearisp/cli";
-import { Plugin } from "../makes";
-export declare class ProxmoxPlugin extends Plugin {
+import { FSManager } from "@wocker/core";
+import { AppConfigService, DockerService } from "../services";
+export declare class ProxmoxPlugin {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly dockerService: DockerService;
     protected configDir: string;
-    constructor();
-    install(cli: Cli): void;
+    protected fs: FSManager;
+    constructor(appConfigService: AppConfigService, dockerService: DockerService);
+    pluginPath(...parts: string[]): string;
     up(): Promise<void>;
     down(): Promise<void>;
 }

package/lib/plugins/ProxmoxPlugin.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,21 +28,26 @@ 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);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProxmoxPlugin = void 0;
+const core_1 = require("@wocker/core");
 const Path = __importStar(require("path"));
-const makes_1 = require("../makes");
+const services_1 = require("../services");
 const utils_1 = require("../utils");
-class ProxmoxPlugin extends makes_1.Plugin {
-    constructor() {
-        super("proxmox");
-        this.configDir = Path.join(__dirname, "../../services/proxmox");
+let ProxmoxPlugin = class ProxmoxPlugin {
+    constructor(appConfigService, dockerService) {
+        this.appConfigService = appConfigService;
+        this.dockerService = dockerService;
+        this.configDir = this.appConfigService.dataPath("plugins/proxmox");
     }
-    install(cli) {
-        super.install(cli);
+    pluginPath(...parts) {
+        return Path.join(this.appConfigService.pluginsPath("proxmox"), ...parts);
     }
     async up() {
-        const container = await makes_1.Docker.getContainer("proxmox.workspace");
+        const container = await this.dockerService.getContainer("proxmox.workspace");
         if (container) {
             await this.down();
         }
@@ -63,5 +74,10 @@ class ProxmoxPlugin extends makes_1.Plugin {
         await (0, utils_1.exec)("docker image rm ws-proxmox").catch(() => {
         });
     }
-}
+};
 exports.ProxmoxPlugin = ProxmoxPlugin;
+exports.ProxmoxPlugin = ProxmoxPlugin = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [services_1.AppConfigService,
+        services_1.DockerService])
+], ProxmoxPlugin);

package/lib/plugins/RedisPlugin.d.ts

@@ -1,18 +1,16 @@
 import { FSManager } from "@wocker/core";
 import { Cli } from "@kearisp/cli";
-import { DI, Plugin } from "../makes";
 import { AppConfigService, DockerService } from "../services";
-declare class RedisPlugin extends Plugin {
+export declare class RedisPlugin {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly dockerService: DockerService;
     protected container: string;
     protected commander: string;
-    protected appConfigService: AppConfigService;
-    protected dockerService: DockerService;
     protected fs: FSManager;
-    constructor(di: DI);
+    constructor(appConfigService: AppConfigService, dockerService: DockerService);
     install(cli: Cli): void;
     up(): Promise<void>;
     protected startCommander(): Promise<void>;
     down(): Promise<void>;
     protected stopCommander(): Promise<void>;
 }
-export { RedisPlugin };

package/lib/plugins/RedisPlugin.js

@@ -1,20 +1,26 @@
 "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.RedisPlugin = void 0;
 const core_1 = require("@wocker/core");
-const makes_1 = require("../makes");
 const services_1 = require("../services");
-class RedisPlugin extends makes_1.Plugin {
-    constructor(di) {
-        super("redis");
+let RedisPlugin = class RedisPlugin {
+    constructor(appConfigService, dockerService) {
+        this.appConfigService = appConfigService;
+        this.dockerService = dockerService;
         this.container = "redis.workspace";
         this.commander = "redis-commander.workspace";
-        this.appConfigService = di.resolveService(services_1.AppConfigService);
-        this.dockerService = di.resolveService(services_1.DockerService);
         this.fs = new core_1.FSManager(this.appConfigService.pluginsPath("redis"), this.appConfigService.dataPath("plugins/redis"));
     }
     install(cli) {
-        super.install(cli);
         cli.command("redis:start")
             .action(() => this.up());
         cli.command("redis:stop")
@@ -76,5 +82,10 @@ class RedisPlugin extends makes_1.Plugin {
         console.info("RedisCommander stopping...");
         await this.dockerService.removeContainer(this.commander);
     }
-}
+};
 exports.RedisPlugin = RedisPlugin;
+exports.RedisPlugin = RedisPlugin = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [services_1.AppConfigService,
+        services_1.DockerService])
+], RedisPlugin);

package/lib/plugins/index.d.ts

@@ -4,7 +4,5 @@ export * from "./MaildevPlugin";
 export * from "./MongodbPlugin";
 export * from "./NgrokPlugin";
 export * from "./PageKitePlugin";
-export * from "./PostgresPlugin";
-export * from "./PostgresPlugin";
 export * from "./ProxmoxPlugin";
 export * from "./RedisPlugin";

package/lib/plugins/index.js

@@ -20,7 +20,5 @@ __exportStar(require("./MaildevPlugin"), exports);
 __exportStar(require("./MongodbPlugin"), exports);
 __exportStar(require("./NgrokPlugin"), exports);
 __exportStar(require("./PageKitePlugin"), exports);
-__exportStar(require("./PostgresPlugin"), exports);
-__exportStar(require("./PostgresPlugin"), exports);
 __exportStar(require("./ProxmoxPlugin"), exports);
 __exportStar(require("./RedisPlugin"), exports);

package/lib/services/AppConfigService.d.ts

@@ -1,28 +1,18 @@
-import { Config, EnvConfig } from "../types";
+import { Config, AppConfigService as CoreAppConfigService } from "@wocker/core";
 type TypeMap = {
     [type: string]: string;
 };
-declare class AppConfigService {
+export declare class AppConfigService extends CoreAppConfigService {
     protected pwd: string;
     protected mapTypes: TypeMap;
     constructor();
-    dataPath(...args: string[]): string;
-    pluginsPath(...args: string[]): string;
+    dataPath(...parts: string[]): string;
+    pluginsPath(...parts: string[]): string;
+    presetPath(...parts: string[]): string;
     getPWD(): string;
     setPWD(pwd: string): void;
-    getAppConfig(): Promise<Config>;
-    private saveAppConfig;
-    getMeta(name: string, defaultValue?: string): Promise<string>;
-    setMeta(name: string, value?: string | number): Promise<void>;
-    getAllEnvVariables(): Promise<EnvConfig>;
-    getEnvVariable(name: string, defaultValue?: string): Promise<string>;
-    setEnv(env: any): Promise<void>;
-    setEnvVariable(name: string, value: string | number): Promise<void>;
-    unsetEnv(...keys: string[]): Promise<void>;
     getProjectTypes(): TypeMap;
     registerProjectType(name: string, title?: string): void;
-    setProjectConfig(id: string, path: string): Promise<void>;
-    activatePlugin(name: string): Promise<void>;
-    deactivatePlugin(name: string): Promise<void>;
+    protected loadConfig(): Promise<Config>;
 }
-export { AppConfigService };
+export {};