@wocker/ws 1.0.7 → 1.0.8

package/lib/plugins/LocaltunnelPlugin.d.ts

@@ -1,5 +1,5 @@
+import { Project } from "@wocker/core";
 import { Cli } from "@kearisp/cli";
-import { DI, Plugin, Project } from "../makes";
 import { AppConfigService, AppEventsService, ProjectService, DockerService } from "../services";
 type InitOptions = {
     name?: string;
@@ -15,12 +15,12 @@ type LogsOptions = {
     name?: string;
     detach?: boolean;
 };
-declare class LocaltunnelPlugin extends Plugin {
-    protected appConfigService: AppConfigService;
-    protected appEventsService: AppEventsService;
-    protected projectService: ProjectService;
-    protected dockerService: DockerService;
-    constructor(di: DI);
+export declare class LocaltunnelPlugin {
+    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);
     install(cli: Cli): void;
     getIp(): Promise<string>;
     onProjectStart(project: Project): Promise<void>;
@@ -33,4 +33,4 @@ declare class LocaltunnelPlugin extends Plugin {
     restart(options: StartOptions): Promise<void>;
     logs(options: LogsOptions): Promise<void>;
 }
-export { LocaltunnelPlugin };
+export {};

package/lib/plugins/LocaltunnelPlugin.js

@@ -1,23 +1,31 @@
 "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.LocaltunnelPlugin = void 0;
+const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const axios_1 = __importDefault(require("axios"));
 const makes_1 = require("../makes");
 const services_1 = require("../services");
-class LocaltunnelPlugin extends makes_1.Plugin {
-    constructor(di) {
-        super("localtunnel");
-        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);
+let LocaltunnelPlugin = class LocaltunnelPlugin {
+    constructor(appConfigService, appEventsService, projectService, dockerService) {
+        this.appConfigService = appConfigService;
+        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("localtunnel:init")
@@ -176,7 +184,7 @@ class LocaltunnelPlugin extends makes_1.Plugin {
         if (!exists) {
             await this.dockerService.buildImage({
                 tag: "ws-localtunnel",
-                context: this.pluginPath(),
+                context: this.appConfigService.pluginsPath("plugins/localtunnel"),
                 src: "./Dockerfile"
             });
         }
@@ -270,5 +278,12 @@ class LocaltunnelPlugin extends makes_1.Plugin {
             process.stderr.write(data);
         });
     }
-}
+};
 exports.LocaltunnelPlugin = LocaltunnelPlugin;
+exports.LocaltunnelPlugin = LocaltunnelPlugin = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [services_1.AppConfigService,
+        services_1.AppEventsService,
+        services_1.ProjectService,
+        services_1.DockerService])
+], LocaltunnelPlugin);

package/lib/plugins/MaildevPlugin.d.ts

@@ -1,12 +1,11 @@
 import { Cli } from "@kearisp/cli";
-import { DI, Plugin } from "../makes";
-import { DockerService } from "../services";
-declare class MaildevPlugin extends Plugin {
+import { DockerService, AppConfigService } from "../services";
+export declare class MaildevPlugin {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly dockerService: DockerService;
     protected containerName: string;
-    protected dockerService: DockerService;
-    constructor(di: DI);
+    constructor(appConfigService: AppConfigService, dockerService: DockerService);
     install(cli: Cli): void;
     start(): Promise<void>;
     stop(): Promise<void>;
 }
-export { MaildevPlugin };

package/lib/plugins/MaildevPlugin.js

@@ -1,16 +1,24 @@
 "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.MaildevPlugin = void 0;
-const makes_1 = require("../makes");
+const core_1 = require("@wocker/core");
 const services_1 = require("../services");
-class MaildevPlugin extends makes_1.Plugin {
-    constructor(di) {
-        super("maildev");
+let MaildevPlugin = class MaildevPlugin {
+    constructor(appConfigService, dockerService) {
+        this.appConfigService = appConfigService;
+        this.dockerService = dockerService;
         this.containerName = "maildev.workspace";
-        this.dockerService = di.resolveService(services_1.DockerService);
     }
     install(cli) {
-        super.install(cli);
         cli.command("maildev:start")
             .action(() => this.start());
         cli.command("maildev:stop")
@@ -24,7 +32,7 @@ class MaildevPlugin extends makes_1.Plugin {
                 tag: "ws-maildev",
                 buildArgs: {},
                 labels: {},
-                context: this.pluginPath(),
+                context: this.appConfigService.pluginsPath("plugins/maildev"),
                 src: "./Dockerfile"
             });
         }
@@ -45,5 +53,10 @@ class MaildevPlugin extends makes_1.Plugin {
         console.log("Maildev stopping...");
         await this.dockerService.removeContainer(this.containerName);
     }
-}
+};
 exports.MaildevPlugin = MaildevPlugin;
+exports.MaildevPlugin = MaildevPlugin = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [services_1.AppConfigService,
+        services_1.DockerService])
+], MaildevPlugin);

package/lib/plugins/MongodbPlugin.d.ts

@@ -1,11 +1,12 @@
 import { Cli } from "@kearisp/cli";
-import { DI, Plugin } from "../makes";
 import { DockerService } from "../services";
-declare class MongodbPlugin extends Plugin {
+export declare class MongodbPlugin {
+    protected readonly dockerService: DockerService;
     protected container: string;
     protected adminContainer: string;
-    protected dockerService: DockerService;
-    constructor(di: DI);
+    protected dataDir: string;
+    constructor(dockerService: DockerService);
+    protected dataPath(...parts: string[]): string;
     install(cli: Cli): void;
     getDatabases(): Promise<string[]>;
     getDatabasesDumps(): Promise<string[]>;
@@ -19,4 +20,3 @@ declare class MongodbPlugin extends Plugin {
     deleteBackup(database?: string, filename?: string, yes?: boolean): Promise<void>;
     restore(database?: string, filename?: string): Promise<void>;
 }
-export { MongodbPlugin };

package/lib/plugins/MongodbPlugin.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,24 +28,29 @@ 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.MongodbPlugin = void 0;
+const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const Path = __importStar(require("path"));
 const dateFns = __importStar(require("date-fns"));
 const env_1 = require("../env");
 const makes_1 = require("../makes");
 const services_1 = require("../services");
-class MongodbPlugin extends makes_1.Plugin {
-    constructor(di) {
-        super("mongodb");
+let MongodbPlugin = class MongodbPlugin {
+    constructor(dockerService) {
+        this.dockerService = dockerService;
         this.container = "mongodb.workspace";
         this.adminContainer = "dbadmin-mongodb.workspace";
-        this.dockerService = di.resolveService(services_1.DockerService);
         this.dataDir = Path.join(env_1.DATA_DIR, "db/mongodb");
     }
+    dataPath(...parts) {
+        return Path.join(this.dataDir, ...parts);
+    }
     install(cli) {
-        super.install(cli);
         cli.command("mongodb:start").action(() => {
             return this.start();
         });
@@ -97,7 +108,7 @@ class MongodbPlugin extends makes_1.Plugin {
         });
     }
     async getDatabases() {
-        const stream = await makes_1.Docker.exec(this.container, [
+        const stream = await this.dockerService.exec(this.container, [
             "mongosh",
             "--username", "root",
             "--password", "toor",
@@ -122,7 +133,7 @@ class MongodbPlugin extends makes_1.Plugin {
     }
     async start() {
         console.log("Mongidb starting...");
-        await makes_1.Docker.pullImage("mongo:latest");
+        await this.dockerService.pullImage("mongo:latest");
         const container = await this.dockerService.createContainer({
             name: this.container,
             restart: "always",
@@ -143,7 +154,7 @@ class MongodbPlugin extends makes_1.Plugin {
     }
     async startAdmin() {
         console.log("Mongodb Admin starting...");
-        await makes_1.Docker.pullImage("mongo-express:latest");
+        await this.dockerService.pullImage("mongo-express:latest");
         const container = await this.dockerService.createContainer({
             name: this.adminContainer,
             restart: "always",
@@ -205,7 +216,7 @@ class MongodbPlugin extends makes_1.Plugin {
                 recursive: true
             });
         }
-        const stream = await makes_1.Docker.exec(this.container, [
+        const stream = await this.dockerService.exec(this.container, [
             "mongodump",
             "--authenticationDatabase", "admin",
             "--host", `${this.container}:27017`,
@@ -293,7 +304,7 @@ class MongodbPlugin extends makes_1.Plugin {
         }
         const path = this.dataPath("dump", database, filename);
         const file = makes_1.FS.createReadStream(path);
-        const stream = await makes_1.Docker.exec(this.container, [
+        const stream = await this.dockerService.exec(this.container, [
             "mongorestore",
             "--authenticationDatabase", "admin",
             "--host", `${this.container}:27017`,
@@ -316,5 +327,9 @@ class MongodbPlugin extends makes_1.Plugin {
         });
         console.log(path);
     }
-}
+};
 exports.MongodbPlugin = MongodbPlugin;
+exports.MongodbPlugin = MongodbPlugin = __decorate([
+    (0, core_1.Controller)(),
+    __metadata("design:paramtypes", [services_1.DockerService])
+], MongodbPlugin);

package/lib/plugins/NgrokPlugin.d.ts

@@ -1,5 +1,5 @@
+import { DockerService, Project } from "@wocker/core";
 import { Cli } from "@kearisp/cli";
-import { DI, Plugin, Project } from "../makes";
 import { AppEventsService, ProjectService } from "../services";
 type StartOptions = {
     name?: string;
@@ -17,10 +17,11 @@ type AttachOptions = {
 type ForwardingOptions = {
     name?: string;
 };
-declare class NgrokPlugin extends Plugin {
-    protected appEventsService: AppEventsService;
-    protected projectService: ProjectService;
-    constructor(di: DI);
+export declare class NgrokPlugin {
+    protected readonly appEventsService: AppEventsService;
+    protected readonly projectService: ProjectService;
+    protected readonly dockerService: DockerService;
+    constructor(appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService);
     install(cli: Cli): void;
     init(options: any): Promise<void>;
     getForwarding(project: Project): Promise<string | undefined>;
@@ -33,4 +34,4 @@ declare class NgrokPlugin extends Plugin {
     attach(options: AttachOptions): Promise<void>;
     forwarding(options: ForwardingOptions): Promise<string>;
 }
-export { NgrokPlugin };
+export {};

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>;
 }