@wocker/ws 1.0.2 → 1.0.3

package/lib/plugins/PageKitePlugin.js

@@ -1,160 +1,161 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.PageKitePlugin = void 0;
-var _core = require("@wocker/core");
-var _utils = require("@wocker/utils");
-var _makes = require("../makes");
-var _utils2 = require("../utils");
-class PageKitePlugin extends _makes.Plugin {
-  constructor(di) {
-    super("pagekite");
-    this.appConfigService = di.resolveService(_core.AppConfigService);
-    this.appEventsService = di.resolveService(_core.AppEventsService);
-    this.projectService = di.resolveService(_core.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("pagekite:init").action(options => this.init(options));
-    cli.command("pagekite:start").option("name", {
-      type: "string",
-      alias: "n",
-      description: "Project name"
-    }).option("restart", {
-      type: "boolean",
-      alias: "r",
-      description: "Restart"
-    }).action(options => this.start(options));
-    cli.command("pagekite:stop").option("name", {
-      type: "string",
-      alias: "n",
-      description: "Project name"
-    }).action(options => this.stop(options));
-    cli.command("pagekite:build").option("rebuild", {
-      type: "boolean",
-      alias: "r",
-      description: "Rebuild"
-    }).action(options => this.build(options));
-  }
-  async onProjectStart(project) {
-    if (!project || project.getEnv("PAGEKITE_ENABLE", "false") !== "true") {
-      return;
+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);
     }
-    console.info("Pagekite starting...");
-    await this.build();
-    let container = await _makes.Docker.getContainer(`pagekite-${project.name}`);
-    if (container) {
-      const {
-        State: {
-          Running
-        }
-      } = await container.inspect();
-      if (Running) {
-        console.info("Pagekite is already running");
-        return;
-      } else {
-        await _makes.Docker.removeContainer(`pagekite-${project.name}`);
-      }
-    }
-    const subdomain = project.getEnv("PAGEKITE_SUBDOMAIN");
-    container = await _makes.Docker.createContainer({
-      name: `pagekite-${project.name}`,
-      image: "ws-pagekite",
-      tty: true,
-      restart: "always",
-      cmd: ["python", "pagekite.py", `${project.name}.workspace:80`, `${subdomain}.pagekite.me`]
-    });
-    await container.start();
-    await container.resize({
-      w: process.stdout.columns,
-      h: process.stdout.rows
-    });
-    const stream = await container.attach({
-      stream: true,
-      stdin: true,
-      stdout: true,
-      stderr: true,
-      hijack: true,
-      logs: true
-    });
-    stream.on("data", data => {
-      if (/Kites are flying and all is well\./.test(data.toString())) {
-        stream.end();
-      }
-    });
-    await _makes.Docker.attachStream(stream);
-  }
-  async onProjectStop(project) {
-    if (!project || project.getEnv("PAGEKITE_ENABLE", "false") !== "true") {
-      return;
+    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")
+            .action((options) => this.init(options));
+        cli.command("pagekite:start")
+            .option("name", {
+            type: "string",
+            alias: "n",
+            description: "Project name"
+        })
+            .option("restart", {
+            type: "boolean",
+            alias: "r",
+            description: "Restart"
+        })
+            .action((options) => this.start(options));
+        cli.command("pagekite:stop")
+            .option("name", {
+            type: "string",
+            alias: "n",
+            description: "Project name"
+        })
+            .action((options) => this.stop(options));
+        cli.command("pagekite:build")
+            .option("rebuild", {
+            type: "boolean",
+            alias: "r",
+            description: "Rebuild"
+        })
+            .action((options) => this.build(options));
     }
-    console.info("Pagekite stopping...");
-    await _makes.Docker.removeContainer(`pagekite-${project.name}`);
-  }
-  async init(options) {
-    const project = await this.projectService.get();
-    const enabled = await (0, _utils.promptConfirm)({
-      message: "Enable pagekite",
-      default: project.getEnv("PAGEKITE_ENABLE", "true") === "true"
-    });
-    if (enabled) {
-      project.setEnv("PAGEKITE_ENABLE", "true");
-      const subdomain = await (0, _utils.promptText)({
-        message: "Subdomain",
-        prefix: "https://",
-        suffix: ".pagekite.me",
-        default: project.getEnv("PAGEKITE_SUBDOMAIN", project.name)
-      });
-      project.setEnv("PAGEKITE_SUBDOMAIN", subdomain);
-    } else {
-      project.setEnv("PAGEKITE_ENABLE", "false");
+    async onProjectStart(project) {
+        if (!project || project.getEnv("PAGEKITE_ENABLE", "false") !== "true") {
+            return;
+        }
+        console.info("Pagekite starting...");
+        await this.build();
+        let container = await makes_1.Docker.getContainer(`pagekite-${project.name}`);
+        if (container) {
+            const { State: { Running } } = await container.inspect();
+            if (Running) {
+                console.info("Pagekite is already running");
+                return;
+            }
+            else {
+                await makes_1.Docker.removeContainer(`pagekite-${project.name}`);
+            }
+        }
+        const subdomain = project.getEnv("PAGEKITE_SUBDOMAIN");
+        container = await makes_1.Docker.createContainer({
+            name: `pagekite-${project.name}`,
+            image: "ws-pagekite",
+            tty: true,
+            restart: "always",
+            cmd: [
+                "python",
+                "pagekite.py",
+                `${project.name}.workspace:80`,
+                `${subdomain}.pagekite.me`
+            ]
+        });
+        await container.start();
+        await container.resize({
+            w: process.stdout.columns,
+            h: process.stdout.rows
+        });
+        const stream = await container.attach({
+            stream: true,
+            stdin: true,
+            stdout: true,
+            stderr: true,
+            hijack: true,
+            logs: true
+        });
+        stream.on("data", (data) => {
+            if (/Kites are flying and all is well\./.test(data.toString())) {
+                stream.end();
+            }
+        });
+        await makes_1.Docker.attachStream(stream);
     }
-    await project.save();
-  }
-  async start(options) {
-    const {
-      name,
-      restart
-    } = options;
-    if (name) {
-      await this.projectService.cdProject(name);
+    async onProjectStop(project) {
+        if (!project || project.getEnv("PAGEKITE_ENABLE", "false") !== "true") {
+            return;
+        }
+        console.info("Pagekite stopping...");
+        await makes_1.Docker.removeContainer(`pagekite-${project.name}`);
     }
-    const project = await this.projectService.get();
-    if (restart) {
-      await _makes.Docker.removeContainer(`pagekite-${project.name}`);
+    async init(options) {
+        const project = await this.projectService.get();
+        const enabled = await (0, utils_1.promptConfirm)({
+            message: "Enable pagekite",
+            default: project.getEnv("PAGEKITE_ENABLE", "true") === "true"
+        });
+        if (enabled) {
+            project.setEnv("PAGEKITE_ENABLE", "true");
+            const subdomain = await (0, utils_1.promptText)({
+                message: "Subdomain",
+                prefix: "https://",
+                suffix: ".pagekite.me",
+                default: project.getEnv("PAGEKITE_SUBDOMAIN", project.name)
+            });
+            project.setEnv("PAGEKITE_SUBDOMAIN", subdomain);
+        }
+        else {
+            project.setEnv("PAGEKITE_ENABLE", "false");
+        }
+        await project.save();
     }
-    await this.onProjectStart(project);
-  }
-  async stop(options) {
-    const {
-      name
-    } = options;
-    if (name) {
-      await this.projectService.cdProject(name);
+    async start(options) {
+        const { name, restart } = options;
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        if (restart) {
+            await makes_1.Docker.removeContainer(`pagekite-${project.name}`);
+        }
+        await this.onProjectStart(project);
     }
-    const project = await this.projectService.get();
-    await this.onProjectStop(project);
-  }
-  async build(options = {}) {
-    const {
-      rebuild
-    } = options;
-    const exists = await _makes.Docker.imageExists("ws-pagekite");
-    if (rebuild) {
-      await _makes.Docker.removeContainer("ws-pagekite");
+    async stop(options) {
+        const { name } = options;
+        if (name) {
+            await this.projectService.cdProject(name);
+        }
+        const project = await this.projectService.get();
+        await this.onProjectStop(project);
     }
-    if (!exists || rebuild) {
-      const stream = await _makes.Docker.imageBuild2({
-        tag: "ws-pagekite",
-        context: this.pluginPath(),
-        src: "./Dockerfile"
-      });
-      await (0, _utils2.followProgress)(stream);
+    async build(options = {}) {
+        const { rebuild } = options;
+        const exists = await makes_1.Docker.imageExists("ws-pagekite");
+        if (rebuild) {
+            await makes_1.Docker.removeContainer("ws-pagekite");
+        }
+        if (!exists || rebuild) {
+            const stream = await makes_1.Docker.imageBuild2({
+                tag: "ws-pagekite",
+                context: this.pluginPath(),
+                src: "./Dockerfile"
+            });
+            await (0, utils_2.followProgress)(stream);
+        }
     }
-  }
 }
-exports.PageKitePlugin = PageKitePlugin;
+exports.PageKitePlugin = PageKitePlugin;

package/lib/plugins/PostgresPlugin.d.ts

@@ -1,5 +1,5 @@
 import { Cli } from "@kearisp/cli";
-import { Plugin } from "src/makes";
+import { Plugin } from "../makes";
 declare class PostgresPlugin extends Plugin {
     protected container: string;
     protected adminContainer: string;

package/lib/plugins/PostgresPlugin.js

@@ -1,95 +1,121 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgresPlugin = void 0;
-var _core = require("@wocker/core");
-var Path = _interopRequireWildcard(require("path"));
-var _env = require("../env");
-var _makes = require("../makes");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-class PostgresPlugin extends _makes.Plugin {
-  container = "postgres.workspace";
-  adminContainer = "dbadmin-postgres.workspace";
-  constructor() {
-    super("postgres");
-    this.dataDir = Path.join(_env.DATA_DIR, "db/postgres");
-  }
-  install(cli) {
-    super.install(cli);
-    cli.command("postgres:start").action(() => this.start());
-    cli.command("postgres:stop").action(() => this.stop());
-    cli.command("postgres:restart").action(() => this.restart());
-  }
-  async start() {
-    await this.startDB();
-    await this.startAdmin();
-  }
-  async startDB() {
-    console.log("Postgres starting...");
-    await _makes.Docker.pullImage("postgres:latest");
-    const container = await _makes.Docker.createContainer({
-      name: this.container,
-      restart: "always",
-      image: "postgres:latest",
-      volumes: [`${this.dataPath()}:/var/lib/postgresql/data`],
-      ports: ["5432:5432"],
-      env: {
-        POSTGRES_USER: "root",
-        POSTGRES_PASSWORD: "toor"
-      }
-    });
-    await container.start();
-  }
-  async startAdmin() {
-    console.log("Postgres Admin starting...");
-    await _makes.Docker.pullImage("dpage/pgadmin4:latest");
-    const container = await _makes.Docker.createContainer({
-      name: this.adminContainer,
-      restart: "always",
-      links: [`${this.container}:postgres`],
-      env: {
-        PGADMIN_DEFAULT_EMAIL: "postgres@workspace.com.ua",
-        PGADMIN_DEFAULT_PASSWORD: "toor",
-        VIRTUAL_HOST: this.adminContainer
-      },
-      image: "dpage/pgadmin4:latest"
-    });
-    await container.start();
-  }
-  async stop() {
-    await this.stopDB();
-    await this.stopAdmin();
-  }
-  async stopDB() {
-    console.log("Postgres stopping...");
-    const container = await _makes.Docker.getContainer(this.container);
-    if (container) {
-      try {
-        await container.stop();
-        await container.remove();
-      } catch (err) {
-        _core.Logger.error(err.message);
-      }
+const Path = __importStar(require("path"));
+const env_1 = require("../env");
+const makes_1 = require("../makes");
+class PostgresPlugin extends makes_1.Plugin {
+    constructor() {
+        super("postgres");
+        this.container = "postgres.workspace";
+        this.adminContainer = "dbadmin-postgres.workspace";
+        this.dataDir = Path.join(env_1.DATA_DIR, "db/postgres");
+    }
+    install(cli) {
+        super.install(cli);
+        cli.command("postgres:start")
+            .action(() => this.start());
+        cli.command("postgres:stop")
+            .action(() => this.stop());
+        cli.command("postgres:restart")
+            .action(() => this.restart());
+    }
+    async start() {
+        await this.startDB();
+        await this.startAdmin();
+    }
+    async startDB() {
+        console.log("Postgres starting...");
+        await makes_1.Docker.pullImage("postgres:latest");
+        const container = await makes_1.Docker.createContainer({
+            name: this.container,
+            restart: "always",
+            image: "postgres:latest",
+            volumes: [
+                `${this.dataPath()}:/var/lib/postgresql/data`
+            ],
+            ports: ["5432:5432"],
+            env: {
+                POSTGRES_USER: "root",
+                POSTGRES_PASSWORD: "toor"
+            }
+        });
+        await container.start();
+    }
+    async startAdmin() {
+        console.log("Postgres Admin starting...");
+        await makes_1.Docker.pullImage("dpage/pgadmin4:latest");
+        const container = await makes_1.Docker.createContainer({
+            name: this.adminContainer,
+            restart: "always",
+            links: [
+                `${this.container}:postgres`
+            ],
+            env: {
+                PGADMIN_DEFAULT_EMAIL: "postgres@workspace.com.ua",
+                PGADMIN_DEFAULT_PASSWORD: "toor",
+                VIRTUAL_HOST: this.adminContainer
+            },
+            image: "dpage/pgadmin4:latest"
+        });
+        await container.start();
+    }
+    async stop() {
+        await this.stopDB();
+        await this.stopAdmin();
+    }
+    async stopDB() {
+        console.log("Postgres stopping...");
+        const container = await makes_1.Docker.getContainer(this.container);
+        if (container) {
+            try {
+                await container.stop();
+                await container.remove();
+            }
+            catch (err) {
+                makes_1.Logger.error(err.message);
+            }
+        }
+    }
+    async stopAdmin() {
+        console.log("Stopping postgres admin...");
+        const container = await makes_1.Docker.getContainer(this.adminContainer);
+        if (container) {
+            try {
+                await container.stop();
+                await container.remove();
+            }
+            catch (err) {
+                makes_1.Logger.error(err.message);
+            }
+        }
     }
-  }
-  async stopAdmin() {
-    console.log("Stopping postgres admin...");
-    const container = await _makes.Docker.getContainer(this.adminContainer);
-    if (container) {
-      try {
-        await container.stop();
-        await container.remove();
-      } catch (err) {
-        _core.Logger.error(err.message);
-      }
+    async restart() {
+        await this.stop();
+        await this.start();
     }
-  }
-  async restart() {
-    await this.stop();
-    await this.start();
-  }
 }
-exports.PostgresPlugin = PostgresPlugin;
+exports.PostgresPlugin = PostgresPlugin;

package/lib/plugins/ProxmoxPlugin.d.ts

@@ -1,5 +1,5 @@
 import { Cli } from "@kearisp/cli";
-import { Plugin } from "src/makes";
+import { Plugin } from "../makes";
 export declare class ProxmoxPlugin extends Plugin {
     protected configDir: string;
     constructor();

package/lib/plugins/ProxmoxPlugin.js

@@ -1,37 +1,52 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProxmoxPlugin = void 0;
-var Path = _interopRequireWildcard(require("path"));
-var _makes = require("../makes");
-var _utils = require("../utils");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-class ProxmoxPlugin extends _makes.Plugin {
-  constructor() {
-    super("proxmox");
-    this.configDir = Path.join(__dirname, "../../services/proxmox");
-  }
-  install(cli) {
-    super.install(cli);
-  }
-  async up() {
-    const container = await _makes.Docker.getContainer("proxmox.workspace");
-    if (container) {
-      await this.down();
+const Path = __importStar(require("path"));
+const makes_1 = require("../makes");
+const utils_1 = require("../utils");
+class ProxmoxPlugin extends makes_1.Plugin {
+    constructor() {
+        super("proxmox");
+        this.configDir = Path.join(__dirname, "../../services/proxmox");
+    }
+    install(cli) {
+        super.install(cli);
     }
-    await (0, _utils.exec)(`
+    async up() {
+        const container = await makes_1.Docker.getContainer("proxmox.workspace");
+        if (container) {
+            await this.down();
+        }
+        await (0, utils_1.exec)(`
             docker build \
                 --tag "ws-proxmox" \
                 --file "${this.pluginPath("./Dockerfile")}" \
                 ${this.pluginPath()}
         `);
-
-    // --add-host=""
-
-    await (0, _utils.exec)(`
+        await (0, utils_1.exec)(`
             docker run -d \
                 --name proxmox.workspace \
                 --network workspace \
@@ -39,17 +54,14 @@ class ProxmoxPlugin extends _makes.Plugin {
                 -p 8006:8006 \
                 ws-proxmox
         `);
-  }
-  async down() {
-    await (0, _utils.exec)("docker stop proxmox.workspace").catch(() => {
-      //
-    });
-    await (0, _utils.exec)("docker rm proxmox.workspace").catch(() => {
-      //
-    });
-    await (0, _utils.exec)("docker image rm ws-proxmox").catch(() => {
-      //
-    });
-  }
+    }
+    async down() {
+        await (0, utils_1.exec)("docker stop proxmox.workspace").catch(() => {
+        });
+        await (0, utils_1.exec)("docker rm proxmox.workspace").catch(() => {
+        });
+        await (0, utils_1.exec)("docker image rm ws-proxmox").catch(() => {
+        });
+    }
 }
-exports.ProxmoxPlugin = ProxmoxPlugin;
+exports.ProxmoxPlugin = ProxmoxPlugin;

package/lib/plugins/RedisPlugin.d.ts

@@ -1,5 +1,7 @@
-import { DI, AppConfigService, DockerService, Plugin, FSManager } from "@wocker/core";
+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 {
     protected container: string;
     protected commander: string;