@wocker/ws 1.0.1 → 1.0.3

package/lib/plugins/LocaltunnelPlugin.js

@@ -1,273 +1,274 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocaltunnelPlugin = void 0;
-var _axios = _interopRequireDefault(require("axios"));
-var _makes = require("../makes");
-var _utils = require("../utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-class LocaltunnelPlugin extends _makes.Plugin {
-  constructor(appConfigService, appEventsService, projectService) {
-    super("localtunnel");
-    this.appConfigService = appConfigService;
-    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("localtunnel:init").option("name", {
-      alias: "n",
-      type: "string",
-      description: "Project name"
-    }).action(options => this.init(options));
-    cli.command("localtunnel:start").option("name", {
-      alias: "n",
-      type: "string",
-      description: "Project name"
-    }).option("detach", {
-      type: "boolean",
-      alias: "d",
-      description: "Detach"
-    }).action(options => this.start(options));
-    cli.command("localtunnel:restart").option("name", {
-      alias: "n",
-      type: "string",
-      description: "Project name"
-    }).option("detach", {
-      type: "boolean",
-      alias: "d",
-      description: "Detach"
-    }).action(options => this.restart(options));
-    cli.command("localtunnel:stop").option("name", {
-      alias: "n",
-      type: "string",
-      description: "Project name"
-    }).action(options => this.stop(options));
-    cli.command("localtunnel:build").action(() => this.build());
-    cli.command("localtunnel:rebuild").action(() => this.rebuild());
-    cli.command("localtunnel:logs").option("name", {
-      alias: "n",
-      type: "string",
-      description: "Project name"
-    }).option("detach", {
-      type: "boolean",
-      alias: "d",
-      description: "Detach"
-    }).action(options => this.logs(options));
-  }
-  async getIp() {
-    const res = await _axios.default.get("https://ipv4.icanhazip.com");
-    return res.data.replace("\n", "");
-  }
-  async onProjectStart(project) {
-    if (!project || project.getEnv("LOCALTUNNEL_ENABLE", "false") !== "true") {
-      return;
+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 container = await _makes.Docker.getContainer(`localtunnel-${project.name}`);
-    if (container) {
-      const {
-        State: {
-          Running
-        }
-      } = await container.inspect();
-      if (Running) {
-        console.info("Localtunnel is already running");
-        return;
-      } else {
-        await _makes.Docker.removeContainer(`localtunnel-${project.name}`);
-      }
+    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")
+            .option("name", {
+            alias: "n",
+            type: "string",
+            description: "Project name"
+        })
+            .action((options) => this.init(options));
+        cli.command("localtunnel:start")
+            .option("name", {
+            alias: "n",
+            type: "string",
+            description: "Project name"
+        })
+            .option("detach", {
+            type: "boolean",
+            alias: "d",
+            description: "Detach"
+        })
+            .action((options) => this.start(options));
+        cli.command("localtunnel:restart")
+            .option("name", {
+            alias: "n",
+            type: "string",
+            description: "Project name"
+        })
+            .option("detach", {
+            type: "boolean",
+            alias: "d",
+            description: "Detach"
+        })
+            .action((options) => this.restart(options));
+        cli.command("localtunnel:stop")
+            .option("name", {
+            alias: "n",
+            type: "string",
+            description: "Project name"
+        })
+            .action((options) => this.stop(options));
+        cli.command("localtunnel:build")
+            .action(() => this.build());
+        cli.command("localtunnel:rebuild")
+            .action(() => this.rebuild());
+        cli.command("localtunnel:logs")
+            .option("name", {
+            alias: "n",
+            type: "string",
+            description: "Project name"
+        })
+            .option("detach", {
+            type: "boolean",
+            alias: "d",
+            description: "Detach"
+        })
+            .action((options) => this.logs(options));
+    }
+    async getIp() {
+        const res = await axios_1.default.get("https://ipv4.icanhazip.com");
+        return res.data.replace("\n", "");
     }
-    console.info("Localtunnel starting...");
-    _makes.Logger.info(`Localtunnel start: ${project.name}`);
-    await this.build();
-    const subdomain = project.getEnv("LOCALTUNNEL_SUBDOMAIN", project.name);
-    container = await _makes.Docker.createContainer({
-      name: `localtunnel-${project.name}`,
-      image: "ws-localtunnel",
-      // tty: true,
-      restart: "always",
-      networkMode: "host",
-      cmd: ["lt", `--port=80`,
-      // `--local-host=${project.name}.workspace`,
-      `--subdomain=${subdomain}`, "--print-requests"]
-    });
-    const stream = await container.attach({
-      logs: true,
-      stream: true,
-      hijack: true,
-      stdin: true,
-      stdout: true,
-      stderr: true
-    });
-    stream.setEncoding("utf8");
-    await container.start();
-    const link = await new Promise((resolve, reject) => {
-      let res = "";
-      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(".loca.lt")) {
-            res = link;
-            stream.end();
-          }
+    async onProjectStart(project) {
+        if (!project || project.getEnv("LOCALTUNNEL_ENABLE", "false") !== "true") {
+            return;
+        }
+        let container = await this.dockerService.getContainer(`localtunnel-${project.name}`);
+        if (container) {
+            const { State: { Running } } = await container.inspect();
+            if (Running) {
+                console.info("Localtunnel is already running");
+                return;
+            }
+            else {
+                await this.dockerService.removeContainer(`localtunnel-${project.name}`);
+            }
         }
-      });
-      stream.on("end", () => resolve(res));
-      stream.on("error", reject);
-    });
-    _makes.Logger.info(`${project.name} localtunnel forwarding: ${link}`);
-    const ip = await this.getIp();
-    console.info(`IP: ${ip}`);
-    console.info(`Forwarding: ${link}`);
-    if (project.getEnv("LOCALTUNNEL_AUTO_CONFIRM", "false") === "true") {
-      console.info("Skipping IP confirmation...");
-      const res = await _axios.default.get(link, {
-        headers: {
-          "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36"
-        },
-        validateStatus: () => true
-      });
-      const [path] = /\/continue\/[\w.]+/.exec(res.data) || [];
-      if (path) {
-        const sendData = new URLSearchParams({
-          endpoint: ip
+        console.info("Localtunnel starting...");
+        makes_1.Logger.info(`Localtunnel start: ${project.name}`);
+        await this.build();
+        const subdomain = project.getEnv("LOCALTUNNEL_SUBDOMAIN", project.name);
+        container = await this.dockerService.createContainer({
+            name: `localtunnel-${project.name}`,
+            image: "ws-localtunnel",
+            restart: "always",
+            networkMode: "host",
+            cmd: [
+                "lt",
+                `--port=80`,
+                `--subdomain=${subdomain}`,
+                "--print-requests"
+            ]
         });
-        const res = await _axios.default.post(`${link}${path}`, sendData.toString(), {
-          headers: {
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36",
-            "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"
-          }
+        const stream = await container.attach({
+            logs: true,
+            stream: true,
+            hijack: true,
+            stdin: true,
+            stdout: true,
+            stderr: true
         });
-        if (res.status === 200) {
-          console.info("IP confirmed");
+        stream.setEncoding("utf8");
+        await container.start();
+        const link = await new Promise((resolve, reject) => {
+            let res = "";
+            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(".loca.lt")) {
+                        res = link;
+                        stream.end();
+                    }
+                }
+            });
+            stream.on("end", () => resolve(res));
+            stream.on("error", reject);
+        });
+        makes_1.Logger.info(`${project.name} localtunnel forwarding: ${link}`);
+        const ip = await this.getIp();
+        console.info(`IP: ${ip}`);
+        console.info(`Forwarding: ${link}`);
+        if (project.getEnv("LOCALTUNNEL_AUTO_CONFIRM", "false") === "true") {
+            console.info("Skipping IP confirmation...");
+            const res = await axios_1.default.get(link, {
+                headers: {
+                    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36"
+                },
+                validateStatus: () => true
+            });
+            const [path] = /\/continue\/[\w.]+/.exec(res.data) || [];
+            if (path) {
+                const sendData = new URLSearchParams({
+                    endpoint: ip
+                });
+                const res = await axios_1.default.post(`${link}${path}`, sendData.toString(), {
+                    headers: {
+                        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36",
+                        "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"
+                    }
+                });
+                if (res.status === 200) {
+                    console.info("IP confirmed");
+                }
+            }
         }
-      }
-    }
-  }
-  async onProjectStop(project) {
-    if (!project || project.getEnv("LOCALTUNNEL_ENABLE", "false") !== "true") {
-      return;
-    }
-    console.info("Localtunnel stopping...");
-    await _makes.Docker.removeContainer(`localtunnel-${project.name}`);
-  }
-  async build() {
-    const exists = await _makes.Docker.imageExists("ws-localtunnel");
-    if (!exists) {
-      await _makes.Docker.imageBuild({
-        tag: "ws-localtunnel",
-        context: this.pluginPath(),
-        src: "./Dockerfile"
-      });
     }
-  }
-  async rebuild() {
-    try {
-      await _makes.Docker.imageRm("ws-localtunnel");
-    } catch (err) {
-      console.info(err.message);
+    async onProjectStop(project) {
+        if (!project || project.getEnv("LOCALTUNNEL_ENABLE", "false") !== "true") {
+            return;
+        }
+        console.info("Localtunnel stopping...");
+        await this.dockerService.removeContainer(`localtunnel-${project.name}`);
     }
-    await this.build();
-  }
-  async init(options) {
-    const {
-      name
-    } = options;
-    if (name) {
-      await this.projectService.cdProject(name);
+    async build() {
+        const exists = await this.dockerService.imageExists("ws-localtunnel");
+        if (!exists) {
+            await this.dockerService.buildImage({
+                tag: "ws-localtunnel",
+                context: this.pluginPath(),
+                src: "./Dockerfile"
+            });
+        }
     }
-    const project = await this.projectService.get();
-    const enabled = await (0, _utils.promptConfirm)({
-      message: "Enable localtunnel?",
-      default: project.getEnv("LOCALTUNNEL_ENABLE", "false") === "true"
-    });
-    if (enabled) {
-      const subdomain = await (0, _utils.promptText)({
-        message: "Subdomain",
-        prefix: "https://",
-        suffix: ".loca.lt",
-        default: project.getEnv("LOCALTUNNEL_SUBDOMAIN")
-      });
-      if (!subdomain) {
-        throw new Error("Subdomain can't be empty");
-      }
-      const autoConfirmIP = await (0, _utils.promptConfirm)({
-        message: "Do you want to skip the IP confirmation form automatically?",
-        default: project.getEnv("LOCALTUNNEL_AUTO_CONFIRM", "true") === "true"
-      });
-      project.setEnv("LOCALTUNNEL_ENABLE", "true");
-      project.setEnv("LOCALTUNNEL_SUBDOMAIN", subdomain);
-      project.setEnv("LOCALTUNNEL_AUTO_CONFIRM", autoConfirmIP ? "true" : "false");
-    } else {
-      project.setEnv("LOCALTUNNEL_ENABLE", "false");
+    async rebuild() {
+        try {
+            await this.dockerService.imageRm("ws-localtunnel");
+        }
+        catch (err) {
+            console.info(err.message);
+        }
+        await this.build();
     }
-    await project.save();
-  }
-  async start(options) {
-    const {
-      name,
-      detach
-    } = options;
-    if (name) {
-      await this.projectService.cdProject(name);
+    async init(options) {
+        const { name } = options;
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        const enabled = await (0, utils_1.promptConfirm)({
+            message: "Enable localtunnel?",
+            default: project.getEnv("LOCALTUNNEL_ENABLE", "false") === "true"
+        });
+        if (enabled) {
+            const subdomain = await (0, utils_1.promptText)({
+                message: "Subdomain",
+                prefix: "https://",
+                suffix: ".loca.lt",
+                default: project.getEnv("LOCALTUNNEL_SUBDOMAIN")
+            });
+            if (!subdomain) {
+                throw new Error("Subdomain can't be empty");
+            }
+            const autoConfirmIP = await (0, utils_1.promptConfirm)({
+                message: "Do you want to skip the IP confirmation form automatically?",
+                default: project.getEnv("LOCALTUNNEL_AUTO_CONFIRM", "true") === "true"
+            });
+            project.setEnv("LOCALTUNNEL_ENABLE", "true");
+            project.setEnv("LOCALTUNNEL_SUBDOMAIN", subdomain);
+            project.setEnv("LOCALTUNNEL_AUTO_CONFIRM", autoConfirmIP ? "true" : "false");
+        }
+        else {
+            project.setEnv("LOCALTUNNEL_ENABLE", "false");
+        }
+        await project.save();
     }
-    const project = await this.projectService.get();
-    if (project.getEnv("LOCALTUNNEL_ENABLE", "false") !== "true") {
-      throw new Error(`Localtunnel is not initialized. Run "ws localtunnel:init${name ? ` -n=${name}` : ""}" first.`);
+    async start(options) {
+        const { name, detach } = options;
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        if (project.getEnv("LOCALTUNNEL_ENABLE", "false") !== "true") {
+            throw new Error(`Localtunnel is not initialized. Run "ws localtunnel:init${name ? ` -n=${name}` : ""}" first.`);
+        }
+        await this.onProjectStart(project);
+        if (!detach) {
+            await this.logs({ name });
+        }
     }
-    await this.onProjectStart(project);
-    if (!detach) {
-      await this.logs({
-        name
-      });
+    async stop(options) {
+        const { name } = options;
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        await this.onProjectStop(project);
     }
-  }
-  async stop(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();
-    await this.onProjectStop(project);
-  }
-  async restart(options) {
-    const {
-      name
-    } = options;
-    await this.stop({
-      name
-    });
-    await this.start(options);
-  }
-  async logs(options) {
-    const {
-      name
-      // detach
-    } = options;
-    if (name) {
-      await this.projectService.cdProject(name);
+    async logs(options) {
+        const { name, } = options;
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        const container = await this.dockerService.getContainer(`localtunnel-${project.name}`);
+        const stream = await container.logs({
+            follow: true,
+            stderr: true,
+            stdout: true,
+            tail: 5
+        });
+        stream.on("data", (data) => {
+            process.stdout.write(data);
+        });
+        stream.on("error", (data) => {
+            process.stderr.write(data);
+        });
     }
-    const project = await this.projectService.get();
-    const container = await _makes.Docker.getContainer(`localtunnel-${project.name}`);
-    const stream = await container.logs({
-      follow: true,
-      stderr: true,
-      stdout: true,
-      tail: 5
-    });
-    stream.on("data", data => {
-      process.stdout.write(data);
-    });
-    stream.on("error", data => {
-      process.stderr.write(data);
-    });
-  }
 }
-exports.LocaltunnelPlugin = LocaltunnelPlugin;
+exports.LocaltunnelPlugin = LocaltunnelPlugin;

package/lib/plugins/MaildevPlugin.d.ts

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

package/lib/plugins/MaildevPlugin.js

@@ -1,45 +1,49 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.MaildevPlugin = void 0;
-var _makes = require("../makes");
-class MaildevPlugin extends _makes.Plugin {
-  containerName = "maildev.workspace";
-  constructor() {
-    super("maildev");
-  }
-  install(cli) {
-    super.install(cli);
-    cli.command("maildev:start").action(() => this.start());
-    cli.command("maildev:stop").action(() => this.stop());
-  }
-  async start() {
-    console.log("Maildev starting...");
-    const imageName = "ws-maildev";
-    if (!(await _makes.Docker.imageExists(imageName))) {
-      await _makes.Docker.imageBuild({
-        tag: "ws-maildev",
-        buildArgs: {},
-        labels: {},
-        context: this.pluginPath(),
-        src: "./Dockerfile"
-      });
+const makes_1 = require("../makes");
+const services_1 = require("../services");
+class MaildevPlugin extends makes_1.Plugin {
+    constructor(di) {
+        super("maildev");
+        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")
+            .action(() => this.stop());
+    }
+    async start() {
+        console.log("Maildev starting...");
+        const imageName = "ws-maildev";
+        if (!await this.dockerService.imageExists(imageName)) {
+            await this.dockerService.buildImage({
+                tag: "ws-maildev",
+                buildArgs: {},
+                labels: {},
+                context: this.pluginPath(),
+                src: "./Dockerfile"
+            });
+        }
+        let container = await this.dockerService.createContainer({
+            name: this.containerName,
+            restart: "always",
+            env: {
+                VIRTUAL_HOST: "maildev.workspace"
+            },
+            ports: [
+                "25:25"
+            ],
+            image: imageName
+        });
+        await container.start();
+    }
+    async stop() {
+        console.log("Maildev stopping...");
+        await this.dockerService.removeContainer(this.containerName);
     }
-    await _makes.Docker.containerRun({
-      name: this.containerName,
-      restart: "always",
-      env: {
-        VIRTUAL_HOST: "maildev.workspace"
-      },
-      ports: ["25:25"],
-      image: imageName
-    });
-  }
-  async stop() {
-    console.log("Maildev stopping...");
-    await _makes.Docker.removeContainer(this.containerName);
-  }
 }
-exports.MaildevPlugin = MaildevPlugin;
+exports.MaildevPlugin = MaildevPlugin;

package/lib/plugins/MongodbPlugin.d.ts

@@ -1,9 +1,11 @@
 import { Cli } from "@kearisp/cli";
-import { Plugin } from "src/makes";
+import { DI, Plugin } from "../makes";
+import { DockerService } from "../services";
 declare class MongodbPlugin extends Plugin {
-    container: string;
-    adminContainer: string;
-    constructor();
+    protected container: string;
+    protected adminContainer: string;
+    protected dockerService: DockerService;
+    constructor(di: DI);
     install(cli: Cli): void;
     getDatabases(): Promise<string[]>;
     getDatabasesDumps(): Promise<string[]>;