@wocker/ws 1.0.1 → 1.0.3

package/lib/plugins/NgrokPlugin.js

@@ -1,248 +1,239 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.NgrokPlugin = void 0;
-var _makes = require("../makes");
-var _utils = require("../utils");
-class NgrokPlugin extends _makes.Plugin {
-  constructor(appEventsService, projectService) {
-    super("ngrok");
-    this.appEventsService = appEventsService;
-    this.projectService = projectService;
-  }
-  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").option("name", {
-      alias: "n",
-      type: "string",
-      description: "Project name"
-    }).action(options => this.init(options));
-    cli.command("ngrok:start").option("name", {
-      type: "string",
-      alias: "n",
-      description: "Project name"
-    }).option("detach", {
-      type: "boolean",
-      alias: "d",
-      description: "Detach"
-    }).action(options => this.start(options));
-    cli.command("ngrok:stop").option("name", {
-      type: "string",
-      alias: "n",
-      description: "Project name"
-    }).action(options => this.stop(options));
-    cli.command("ngrok:restart").option("name", {
-      type: "string",
-      alias: "n",
-      description: "Project name"
-    }).option("detach", {
-      type: "boolean",
-      alias: "d",
-      description: "Detach"
-    }).action(options => this.restart(options));
-    cli.command("ngrok:logs").option("name", {
-      type: "string",
-      alias: "n",
-      description: "Project name"
-    }).action(options => this.logs(options));
-    cli.command("ngrok:attach").option("name", {
-      type: "string",
-      alias: "n",
-      description: "Project name"
-    }).action(options => this.attach(options));
-    cli.command("ngrok:forwarding").option("name", {
-      type: "string",
-      alias: "n",
-      description: "Project name"
-    }).action(options => this.forwarding(options));
-  }
-  async init(options) {
-    const {
-      name
-    } = options;
-    if (name) {
-      await this.projectService.cdProject(name);
+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);
     }
-    const project = await this.projectService.get();
-    const enable = await (0, _utils.promptConfirm)({
-      message: "Enable ngrok?",
-      default: true
-    });
-    if (enable) {
-      const token = await (0, _utils.promptText)({
-        message: "Token",
-        default: project.getEnv("NGROK_AUTHTOKEN")
-      });
-      project.setEnv("NGROK_AUTHTOKEN", token);
-      project.setEnv("NGROK_ENABLE", "true");
-    } else {
-      project.setEnv("NGROK_ENABLE", "false");
+    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")
+            .option("name", {
+            alias: "n",
+            type: "string",
+            description: "Project name"
+        })
+            .action((options) => this.init(options));
+        cli.command("ngrok:start")
+            .option("name", {
+            type: "string",
+            alias: "n",
+            description: "Project name"
+        })
+            .option("detach", {
+            type: "boolean",
+            alias: "d",
+            description: "Detach"
+        })
+            .action((options) => this.start(options));
+        cli.command("ngrok:stop")
+            .option("name", {
+            type: "string",
+            alias: "n",
+            description: "Project name"
+        })
+            .action((options) => this.stop(options));
+        cli.command("ngrok:restart")
+            .option("name", {
+            type: "string",
+            alias: "n",
+            description: "Project name"
+        })
+            .option("detach", {
+            type: "boolean",
+            alias: "d",
+            description: "Detach"
+        })
+            .action((options) => this.restart(options));
+        cli.command("ngrok:logs")
+            .option("name", {
+            type: "string",
+            alias: "n",
+            description: "Project name"
+        })
+            .action((options) => this.logs(options));
+        cli.command("ngrok:attach")
+            .option("name", {
+            type: "string",
+            alias: "n",
+            description: "Project name"
+        })
+            .action((options) => this.attach(options));
+        cli.command("ngrok:forwarding")
+            .option("name", {
+            type: "string",
+            alias: "n",
+            description: "Project name"
+        })
+            .action((options) => this.forwarding(options));
     }
-    await project.save();
-  }
-  async getForwarding(project) {
-    const container = await _makes.Docker.getContainer(`ngrok-${project.name}`);
-    if (!container) {
-      throw new Error(`Ngrok for "${project.name}" not started`);
-    }
-    const {
-      NetworkSettings: {
-        Networks: {
-          workspace
+    async init(options) {
+        const { name } = options;
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        const enable = await (0, utils_1.promptConfirm)({
+            message: "Enable ngrok?",
+            default: true
+        });
+        if (enable) {
+            const token = await (0, utils_1.promptText)({
+                message: "Token",
+                default: project.getEnv("NGROK_AUTHTOKEN")
+            });
+            project.setEnv("NGROK_AUTHTOKEN", token);
+            project.setEnv("NGROK_ENABLE", "true");
+        }
+        else {
+            project.setEnv("NGROK_ENABLE", "false");
         }
-      }
-    } = await container.inspect();
-    const stream = await _makes.Docker.exec("proxy.workspace", ["curl", `http://${workspace.IPAddress}:4040/api/tunnels/command_line`], false);
-    const res = await new Promise((resolve, reject) => {
-      let res = "";
-      stream.on("data", data => {
-        res += (0, _utils.demuxOutput)(data).toString();
-      });
-      stream.on("end", () => resolve(res));
-      stream.on("error", reject);
-    });
-    const tunnel = JSON.parse(res);
-    return tunnel.public_url;
-  }
-  async onProjectStart(project) {
-    if (!project || project.getEnv("NGROK_ENABLE", "false") !== "true") {
-      return;
+        await project.save();
     }
-    const container1 = await _makes.Docker.getContainer(`ngrok-${project.name}`);
-    if (container1) {
-      const {
-        State: {
-          Running
+    async getForwarding(project) {
+        const container = await makes_1.Docker.getContainer(`ngrok-${project.name}`);
+        if (!container) {
+            throw new Error(`Ngrok for "${project.name}" not started`);
         }
-      } = await container1.inspect();
-      if (Running) {
-        console.log("Ngrok is already running");
-        const forwarding = await this.getForwarding(project);
-        console.log(`Forwarding: ${forwarding}`);
-        return;
-      } else {
-        await _makes.Docker.removeContainer(`ngrok-${project.name}`);
-      }
+        const { NetworkSettings: { Networks: { workspace } } } = await container.inspect();
+        const stream = await makes_1.Docker.exec("proxy.workspace", [
+            "curl", `http://${workspace.IPAddress}:4040/api/tunnels/command_line`
+        ], false);
+        const res = await new Promise((resolve, reject) => {
+            let res = "";
+            stream.on("data", (data) => {
+                res += (0, utils_1.demuxOutput)(data).toString();
+            });
+            stream.on("end", () => resolve(res));
+            stream.on("error", reject);
+        });
+        const tunnel = JSON.parse(res);
+        return tunnel.public_url;
     }
-    console.log("Ngrok starting...");
-    _makes.Logger.info(`Ngrok start: ${project.name}`);
-    await _makes.Docker.pullImage("ngrok/ngrok:latest");
-    const container = await _makes.Docker.createContainer({
-      name: `ngrok-${project.name}`,
-      image: "ngrok/ngrok:latest",
-      tty: true,
-      restart: "always",
-      env: {
-        NGROK_AUTHTOKEN: project.getEnv("NGROK_AUTHTOKEN")
-      },
-      cmd: ["http", `${project.name}.workspace:80`]
-    });
-    const stream = await container.attach({
-      logs: true,
-      stream: true,
-      hijack: true,
-      stdin: true,
-      stdout: true,
-      stderr: true
-    });
-    stream.setEncoding("utf8");
-    await container.start();
-    await container.resize({
-      w: 90,
-      h: 40
-    });
-    await new Promise((resolve, reject) => {
-      stream.on("data", data => {
-        const regLink = /(https?):\/\/(\w[\w.-]+[a-z]|\d+\.\d+\.\d+\.\d+)(?::(\d+))?/;
-        if (regLink.test(data.toString())) {
-          const [link] = regLink.exec(data.toString());
-          if (link.includes(".ngrok")) {
-            _makes.Logger.info(`${project.name} forwarding: ${link}`);
-            console.log(`Forwarding: ${link}`);
-            stream.end();
-          }
+    async onProjectStart(project) {
+        if (!project || project.getEnv("NGROK_ENABLE", "false") !== "true") {
+            return;
         }
-      });
-      stream.on("end", resolve);
-      stream.on("error", reject);
-    });
-  }
-  async onProjectStop(project) {
-    if (!project || project.getEnv("NGROK_ENABLE", "false") !== "true") {
-      return;
+        const container1 = await makes_1.Docker.getContainer(`ngrok-${project.name}`);
+        if (container1) {
+            const { State: { Running } } = await container1.inspect();
+            if (Running) {
+                console.log("Ngrok is already running");
+                const forwarding = await this.getForwarding(project);
+                console.log(`Forwarding: ${forwarding}`);
+                return;
+            }
+            else {
+                await makes_1.Docker.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({
+            name: `ngrok-${project.name}`,
+            image: "ngrok/ngrok:latest",
+            tty: true,
+            restart: "always",
+            env: {
+                NGROK_AUTHTOKEN: project.getEnv("NGROK_AUTHTOKEN")
+            },
+            cmd: ["http", `${project.name}.workspace:80`]
+        });
+        const stream = await container.attach({
+            logs: true,
+            stream: true,
+            hijack: true,
+            stdin: true,
+            stdout: true,
+            stderr: true
+        });
+        stream.setEncoding("utf8");
+        await container.start();
+        await container.resize({
+            w: 90,
+            h: 40
+        });
+        await new Promise((resolve, reject) => {
+            stream.on("data", (data) => {
+                const regLink = /(https?):\/\/(\w[\w.-]+[a-z]|\d+\.\d+\.\d+\.\d+)(?::(\d+))?/;
+                if (regLink.test(data.toString())) {
+                    const [link] = regLink.exec(data.toString());
+                    if (link.includes(".ngrok")) {
+                        makes_1.Logger.info(`${project.name} forwarding: ${link}`);
+                        console.log(`Forwarding: ${link}`);
+                        stream.end();
+                    }
+                }
+            });
+            stream.on("end", resolve);
+            stream.on("error", reject);
+        });
     }
-    console.log("Ngrok stopping...");
-    await _makes.Docker.removeContainer(`ngrok-${project.name}`);
-  }
-  async start(options) {
-    const {
-      name,
-      detach
-    } = options;
-    if (name) {
-      await this.projectService.cdProject(name);
+    async onProjectStop(project) {
+        if (!project || project.getEnv("NGROK_ENABLE", "false") !== "true") {
+            return;
+        }
+        console.log("Ngrok stopping...");
+        await makes_1.Docker.removeContainer(`ngrok-${project.name}`);
     }
-    const project = await this.projectService.get();
-    await this.onProjectStart(project);
-    if (!detach) {
-      await _makes.Docker.attach(`ngrok-${project.name}`);
+    async start(options) {
+        const { name, detach } = options;
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        await this.onProjectStart(project);
+        if (!detach) {
+            await makes_1.Docker.attach(`ngrok-${project.name}`);
+        }
     }
-  }
-  async stop(options) {
-    const {
-      name
-    } = options;
-    if (name) {
-      await this.projectService.cdProject(name);
+    async stop(options) {
+        const { name } = options;
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        await this.onProjectStop(project);
     }
-    const project = await this.projectService.get();
-    await this.onProjectStop(project);
-  }
-  async restart(options) {
-    const {
-      name
-    } = options;
-    await this.stop({
-      name
-    });
-    await this.start(options);
-  }
-  async logs(options) {
-    const {
-      name
-    } = options;
-    if (name) {
-      await this.projectService.cdProject(name);
+    async restart(options) {
+        const { name } = options;
+        await this.stop({ name });
+        await this.start(options);
     }
-    const project = await this.projectService.get();
-    const container = await _makes.Docker.getContainer(`ngrok-${project.name}`);
-    if (!container) {
-      throw new Error("Ngrok not started");
+    async logs(options) {
+        const { name } = options;
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        const container = await makes_1.Docker.getContainer(`ngrok-${project.name}`);
+        if (!container) {
+            throw new Error("Ngrok not started");
+        }
     }
-  }
-  async attach(options) {
-    const {
-      name
-    } = options;
-    if (name) {
-      await this.projectService.cdProject(name);
+    async attach(options) {
+        const { name } = options;
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        await makes_1.Docker.attach(`ngrok-${project.name}`);
     }
-    const project = await this.projectService.get();
-    await _makes.Docker.attach(`ngrok-${project.name}`);
-  }
-  async forwarding(options) {
-    const {
-      name
-    } = options;
-    if (name) {
-      await this.projectService.cdProject(name);
+    async forwarding(options) {
+        const { name } = options;
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        return this.getForwarding(project);
     }
-    const project = await this.projectService.get();
-    return this.getForwarding(project);
-  }
 }
-exports.NgrokPlugin = NgrokPlugin;
+exports.NgrokPlugin = NgrokPlugin;

package/lib/plugins/PageKitePlugin.d.ts

@@ -1,7 +1,6 @@
 import { Cli } from "@kearisp/cli";
-import { Plugin } from "src/makes";
-import { Project } from "src/models";
-import { AppConfigService, AppEventsService, ProjectService } from "src/services";
+import { DI, Plugin, Project } from "../makes";
+import { AppConfigService, AppEventsService, ProjectService } from "../services";
 type InitOptions = {};
 type StartOptions = {
     name?: string;
@@ -19,7 +18,7 @@ declare class PageKitePlugin extends Plugin {
     protected appConfigService: AppConfigService;
     protected appEventsService: AppEventsService;
     protected projectService: ProjectService;
-    constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService);
+    constructor(di: DI);
     install(cli: Cli): void;
     onProjectStart(project: Project): Promise<void>;
     onProjectStop(project: Project): Promise<void>;