@wocker/ws 1.0.1 → 1.0.2

package/lib/controllers/index.js

@@ -14,6 +14,28 @@ Object.keys(_ImageController).forEach(function (key) {
     }
   });
 });
+var _PluginController = require("./PluginController");
+Object.keys(_PluginController).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _PluginController[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _PluginController[key];
+    }
+  });
+});
+var _PresetController = require("./PresetController");
+Object.keys(_PresetController).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _PresetController[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _PresetController[key];
+    }
+  });
+});
 var _ProjectController = require("./ProjectController");
 Object.keys(_ProjectController).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -24,4 +46,15 @@ Object.keys(_ProjectController).forEach(function (key) {
       return _ProjectController[key];
     }
   });
+});
+var _ProxyController = require("./ProxyController");
+Object.keys(_ProxyController).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _ProxyController[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _ProxyController[key];
+    }
+  });
 });

package/lib/env.js

@@ -6,19 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.SERVICES_DIR = exports.ROOT_DIR = exports.PRESETS_DIR = exports.PLUGINS_DIR = exports.NODE_ENV = exports.MAP_PATH = exports.DATA_DIR = void 0;
 var OS = _interopRequireWildcard(require("os"));
 var Path = _interopRequireWildcard(require("path"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const NODE_ENV = process.env.NODE_ENV;
-exports.NODE_ENV = NODE_ENV;
-const ROOT_DIR = Path.join(__dirname, "..");
-exports.ROOT_DIR = ROOT_DIR;
-const PRESETS_DIR = Path.join(ROOT_DIR, "presets");
-exports.PRESETS_DIR = PRESETS_DIR;
-const SERVICES_DIR = Path.join(ROOT_DIR, "services");
-exports.SERVICES_DIR = SERVICES_DIR;
-const PLUGINS_DIR = Path.join(ROOT_DIR, "plugins");
-exports.PLUGINS_DIR = PLUGINS_DIR;
-const DATA_DIR = process.env.WS_DIR || Path.join(OS.homedir(), ".workspace");
-exports.DATA_DIR = DATA_DIR;
-const MAP_PATH = Path.join(DATA_DIR, "data.json");
-exports.MAP_PATH = MAP_PATH;
+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; }
+const NODE_ENV = exports.NODE_ENV = process.env.NODE_ENV;
+const ROOT_DIR = exports.ROOT_DIR = Path.join(__dirname, "..");
+const PRESETS_DIR = exports.PRESETS_DIR = Path.join(ROOT_DIR, "presets");
+const SERVICES_DIR = exports.SERVICES_DIR = Path.join(ROOT_DIR, "services");
+const PLUGINS_DIR = exports.PLUGINS_DIR = Path.join(ROOT_DIR, "plugins");
+const DATA_DIR = exports.DATA_DIR = process.env.WS_DIR || Path.join(OS.homedir(), ".workspace");
+const MAP_PATH = exports.MAP_PATH = Path.join(DATA_DIR, "data.json");

package/lib/index.js

@@ -4,28 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.app = void 0;
-var _controllers = require("./controllers");
-var _plugins = require("./plugins");
-var _services = require("./services");
 var _App = require("./App");
-const appConfigService = new _services.AppConfigService();
-const appEventsService = new _services.AppEventsService();
-const projectService = new _services.ProjectService(appConfigService, appEventsService);
-const app = new _App.App(appConfigService);
-exports.app = app;
-app.useController(new _controllers.ImageController());
-app.useController(new _controllers.ProjectController(appConfigService, appEventsService, projectService));
-app.usePlugin(new _plugins.LocaltunnelPlugin(appConfigService, appEventsService, projectService));
-app.usePlugin(new _plugins.MaildevPlugin());
-app.usePlugin(new _plugins.MariadbPlugin());
-app.usePlugin(new _plugins.MongodbPlugin());
-app.usePlugin(new _plugins.NgrokPlugin(appEventsService, projectService));
-app.usePlugin(new _plugins.PageKitePlugin(appConfigService, appEventsService, projectService));
-app.usePlugin(new _plugins.PostgresPlugin());
-app.usePlugin(new _plugins.PresetPlugin(appConfigService, appEventsService));
-app.usePlugin(new _plugins.ProxmoxPlugin());
-app.usePlugin(new _plugins.ProxyPlugin(appConfigService, appEventsService, projectService));
-app.usePlugin(new _plugins.ProjectPlugin());
-app.usePlugin(new _plugins.RedisPlugin());
-app.usePlugin(new _plugins.ServeoPlugin(appConfigService, appEventsService, projectService));
-app.usePlugin(new _plugins.TestPlugin());
+var _plugins = require("./plugins");
+const app = exports.app = new _App.App();
+app.use(_plugins.ElasticSearchPlugin);
+app.use(_plugins.LocaltunnelPlugin);
+app.use(_plugins.MaildevPlugin);
+app.use(_plugins.MongodbPlugin);
+app.use(_plugins.NgrokPlugin);
+app.use(_plugins.PageKitePlugin);
+app.use(_plugins.PostgresPlugin);
+app.use(_plugins.ProxmoxPlugin);
+app.use(_plugins.RedisPlugin);

package/lib/makes/Docker.js

@@ -123,32 +123,7 @@ class Docker {
       return docker.getContainer(container.Id);
     }
     return null;
-    // let res = await utils.exec(
-    //     "docker container ls" +
-    //     "   --filter=name=\"" + name + "\""
-    // );
-
-    // let containers = utils.parseTable(res.stdout, {
-    //     0: "containerId",
-    //     1: "image",
-    //     2: "command",
-    //     3: "created",
-    //     4: "status",
-    //     5: "ports",
-    //     6: "names"
-    // });
-
-    // await new Promise((resolve) => {
-    //     docker.listContainers({
-    //         "all": true
-    //     }, (err, containers) => {
-    //         console.log(containers);
-    //
-    //         resolve();
-    //     });
-    // });
   }
-
   static async removeContainer(name) {
     const container = await Docker.getContainer(name);
     if (!container) {
@@ -344,6 +319,17 @@ class Docker {
       ports = [],
       cmd = []
     } = options;
+    const network = docker.getNetwork("workspace");
+    try {
+      await network.inspect();
+    } catch (err) {
+      if (err.statusCode === 404) {
+        await docker.createNetwork({
+          Name: "workspace"
+        });
+      }
+    }
+    await this.pullImage(image);
     return await docker.createContainer({
       name,
       Image: image,

package/lib/makes/FS.d.ts

@@ -24,7 +24,7 @@ declare class FS {
     static writeFile(filePath: PathOrFileDescriptor, data: string | NodeJS.ArrayBufferView, options?: WriteFileOptions): Promise<void>;
     static writeFileSync(path: PathLike, data: any, options?: WriteFileOptions): void;
     static createWriteStream(path: PathLike): fs.WriteStream;
-    static readJSON(filePath: PathLike | number): Promise<any>;
+    static readJSON(...paths: string[]): Promise<any>;
     static writeJSON(filePath: PathLike | number, data: any): Promise<void>;
     static unlink(filePath: PathLike): Promise<void>;
     static watch(filename: PathLike, options?: any): fs.FSWatcher;

package/lib/makes/FS.js

@@ -7,8 +7,8 @@ exports.FS = void 0;
 var fs = _interopRequireWildcard(require("fs"));
 var Path = _interopRequireWildcard(require("path"));
 var _readableStream = require("readable-stream");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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 FS {
   static async access(path) {
     return new Promise((resolve, reject) => {
@@ -185,15 +185,18 @@ class FS {
   static createWriteStream(path) {
     return fs.createWriteStream(path);
   }
-  static async readJSON(filePath) {
-    return FS.readFile(filePath).then(res => {
-      try {
-        const str = res.toString();
-        return JSON.parse(str);
-      } catch (ignore) {
-        return {};
-      }
+  static async readJSON(...paths) {
+    const res = await new Promise((resolve, reject) => {
+      const filePath = Path.join(...paths);
+      fs.readFile(filePath, (err, data) => {
+        if (err) {
+          reject(err);
+          return;
+        }
+        resolve(data);
+      });
     });
+    return JSON.parse(res.toString());
   }
   static async writeJSON(filePath, data) {
     const json = JSON.stringify(data, null, 4);

package/lib/makes/Logger.d.ts

@@ -1,7 +1 @@
-export declare class Logger {
-    static log(...data: any[]): void;
-    static info(...data: any[]): void;
-    static warning(...data: any[]): void;
-    static error(...data: any[]): void;
-    static _log(type: string, ...data: any[]): void;
-}
+export { Logger } from "@wocker/core";

package/lib/makes/Logger.js

@@ -3,37 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Logger = void 0;
-var Path = _interopRequireWildcard(require("path"));
-var _format = _interopRequireDefault(require("date-fns/format"));
-var _env = require("../env");
-var _FS = require("./FS");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-class Logger {
-  static log(...data) {
-    Logger._log("log", ...data);
+Object.defineProperty(exports, "Logger", {
+  enumerable: true,
+  get: function () {
+    return _core.Logger;
   }
-  static info(...data) {
-    Logger._log("info", ...data);
-  }
-  static warning(...data) {
-    Logger._log("warning", ...data);
-  }
-  static error(...data) {
-    Logger._log("error", ...data);
-  }
-  static _log(type, ...data) {
-    const time = (0, _format.default)(new Date(), "yyyy-MM-dd hh:mm:ss");
-    const logPath = Path.join(_env.DATA_DIR, "ws.log");
-    const logData = data.map(item => {
-      return typeof item !== "string" ? JSON.stringify(item) : item;
-    }).join(" ");
-    if (!_FS.FS.existsSync(logPath)) {
-      _FS.FS.writeFileSync(logPath, "");
-    }
-    _FS.FS.appendFileSync(logPath, `[${time}] ${type}: ${logData}\n`);
-  }
-}
-exports.Logger = Logger;
+});
+var _core = require("@wocker/core");

package/lib/makes/Plugin.js

@@ -8,8 +8,8 @@ var Path = _interopRequireWildcard(require("path"));
 var _env = require("../env");
 var _Controller = require("./Controller");
 var _FS = require("./FS");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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 Plugin extends _Controller.Controller {
   constructor(name) {
     super();

package/lib/plugins/ElasticSearchPlugin.d.ts

@@ -0,0 +1,16 @@
+import { DI, AppConfigService, DockerService, Plugin, FSManager } from "@wocker/core";
+import { Cli } from "@kearisp/cli";
+type StartOptions = {
+    restart?: boolean;
+};
+declare class ElasticSearchPlugin extends Plugin {
+    protected containerName: string;
+    protected appConfigService: AppConfigService;
+    protected dockerService: DockerService;
+    protected fs: FSManager;
+    constructor(di: DI);
+    install(cli: Cli): void;
+    start(options: StartOptions): Promise<void>;
+    stop(): Promise<void>;
+}
+export { ElasticSearchPlugin };

package/lib/plugins/ElasticSearchPlugin.js

@@ -0,0 +1,72 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ElasticSearchPlugin = void 0;
+var _core = require("@wocker/core");
+class ElasticSearchPlugin extends _core.Plugin {
+  containerName = "elastic-search.workspace";
+  constructor(di) {
+    super();
+    this.appConfigService = di.resolveService(_core.AppConfigService);
+    this.dockerService = di.resolveService(_core.DockerService);
+    this.fs = new _core.FSManager(this.appConfigService.pluginsPath("elastic-search"), this.appConfigService.dataPath("plugins/elastic-search"));
+  }
+  install(cli) {
+    super.install(cli);
+    cli.command("elastica:start").option("restart", {
+      type: "boolean",
+      alias: "r",
+      description: "Restart service"
+    }).action(options => this.start(options));
+    cli.command("elastica:stop").action(() => this.stop());
+  }
+  async start(options) {
+    const {
+      restart
+    } = options;
+    await this.dockerService.pullImage("docker.elastic.co/elasticsearch/elasticsearch:7.5.2");
+    let container = await this.dockerService.getContainer(this.containerName);
+    if (restart && container) {
+      await this.dockerService.removeContainer(this.containerName);
+      container = null;
+    }
+    if (!container) {
+      await this.fs.mkdir("data", {
+        recursive: true
+      });
+      container = await this.dockerService.createContainer({
+        name: this.containerName,
+        image: "docker.elastic.co/elasticsearch/elasticsearch:7.5.2",
+        ulimits: {
+          memlock: {
+            hard: -1,
+            soft: -1
+          }
+        },
+        env: {
+          "node.name": "elasticsearch",
+          "cluster.name": "elasticsearch",
+          "cluster.initial_master_nodes": "elasticsearch",
+          "bootstrap.memory_lock": "false",
+          ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+        },
+        volumes: [`${this.fs.path("data")}:/usr/share/elasticsearch/data`],
+        ports: ["9200:9200"]
+      });
+    }
+    const {
+      State: {
+        Status
+      }
+    } = await container.inspect();
+    if (Status === "created" || Status === "exited") {
+      await container.start();
+    }
+  }
+  async stop() {
+    await this.dockerService.removeContainer(this.containerName);
+  }
+}
+exports.ElasticSearchPlugin = ElasticSearchPlugin;

package/lib/plugins/LocaltunnelPlugin.d.ts

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

package/lib/plugins/LocaltunnelPlugin.js

@@ -4,16 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LocaltunnelPlugin = void 0;
+var _core = require("@wocker/core");
+var _utils = require("@wocker/utils");
 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) {
+  constructor(di) {
     super("localtunnel");
-    this.appConfigService = appConfigService;
-    this.appEventsService = appEventsService;
-    this.projectService = projectService;
+    this.appConfigService = di.resolveService(_core.AppConfigService);
+    this.appEventsService = di.resolveService(_core.AppEventsService);
+    this.projectService = di.resolveService(_core.ProjectService);
+    this.dockerService = di.resolveService(_core.DockerService);
   }
   install(cli) {
     super.install(cli);
@@ -67,7 +69,7 @@ class LocaltunnelPlugin extends _makes.Plugin {
     if (!project || project.getEnv("LOCALTUNNEL_ENABLE", "false") !== "true") {
       return;
     }
-    let container = await _makes.Docker.getContainer(`localtunnel-${project.name}`);
+    let container = await this.dockerService.getContainer(`localtunnel-${project.name}`);
     if (container) {
       const {
         State: {
@@ -78,14 +80,14 @@ class LocaltunnelPlugin extends _makes.Plugin {
         console.info("Localtunnel is already running");
         return;
       } else {
-        await _makes.Docker.removeContainer(`localtunnel-${project.name}`);
+        await this.dockerService.removeContainer(`localtunnel-${project.name}`);
       }
     }
     console.info("Localtunnel starting...");
-    _makes.Logger.info(`Localtunnel start: ${project.name}`);
+    _core.Logger.info(`Localtunnel start: ${project.name}`);
     await this.build();
     const subdomain = project.getEnv("LOCALTUNNEL_SUBDOMAIN", project.name);
-    container = await _makes.Docker.createContainer({
+    container = await this.dockerService.createContainer({
       name: `localtunnel-${project.name}`,
       image: "ws-localtunnel",
       // tty: true,
@@ -120,7 +122,7 @@ class LocaltunnelPlugin extends _makes.Plugin {
       stream.on("end", () => resolve(res));
       stream.on("error", reject);
     });
-    _makes.Logger.info(`${project.name} localtunnel forwarding: ${link}`);
+    _core.Logger.info(`${project.name} localtunnel forwarding: ${link}`);
     const ip = await this.getIp();
     console.info(`IP: ${ip}`);
     console.info(`Forwarding: ${link}`);
@@ -154,12 +156,12 @@ class LocaltunnelPlugin extends _makes.Plugin {
       return;
     }
     console.info("Localtunnel stopping...");
-    await _makes.Docker.removeContainer(`localtunnel-${project.name}`);
+    await this.dockerService.removeContainer(`localtunnel-${project.name}`);
   }
   async build() {
-    const exists = await _makes.Docker.imageExists("ws-localtunnel");
+    const exists = await this.dockerService.imageExists("ws-localtunnel");
     if (!exists) {
-      await _makes.Docker.imageBuild({
+      await this.dockerService.buildImage({
         tag: "ws-localtunnel",
         context: this.pluginPath(),
         src: "./Dockerfile"
@@ -168,7 +170,7 @@ class LocaltunnelPlugin extends _makes.Plugin {
   }
   async rebuild() {
     try {
-      await _makes.Docker.imageRm("ws-localtunnel");
+      await this.dockerService.imageRm("ws-localtunnel");
     } catch (err) {
       console.info(err.message);
     }
@@ -255,7 +257,7 @@ class LocaltunnelPlugin extends _makes.Plugin {
       await this.projectService.cdProject(name);
     }
     const project = await this.projectService.get();
-    const container = await _makes.Docker.getContainer(`localtunnel-${project.name}`);
+    const container = await this.dockerService.getContainer(`localtunnel-${project.name}`);
     const stream = await container.logs({
       follow: true,
       stderr: true,

package/lib/plugins/MaildevPlugin.d.ts

@@ -1,8 +1,10 @@
+import { DI, DockerService } from "@wocker/core";
 import { Cli } from "@kearisp/cli";
 import { Plugin } from "src/makes";
 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

@@ -4,11 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MaildevPlugin = void 0;
+var _core = require("@wocker/core");
 var _makes = require("../makes");
 class MaildevPlugin extends _makes.Plugin {
   containerName = "maildev.workspace";
-  constructor() {
+  constructor(di) {
     super("maildev");
+    this.dockerService = di.resolveService(_core.DockerService);
   }
   install(cli) {
     super.install(cli);
@@ -18,8 +20,8 @@ class MaildevPlugin extends _makes.Plugin {
   async start() {
     console.log("Maildev starting...");
     const imageName = "ws-maildev";
-    if (!(await _makes.Docker.imageExists(imageName))) {
-      await _makes.Docker.imageBuild({
+    if (!(await this.dockerService.imageExists(imageName))) {
+      await this.dockerService.buildImage({
         tag: "ws-maildev",
         buildArgs: {},
         labels: {},
@@ -27,7 +29,7 @@ class MaildevPlugin extends _makes.Plugin {
         src: "./Dockerfile"
       });
     }
-    await _makes.Docker.containerRun({
+    let container = await this.dockerService.createContainer({
       name: this.containerName,
       restart: "always",
       env: {
@@ -36,10 +38,11 @@ class MaildevPlugin extends _makes.Plugin {
       ports: ["25:25"],
       image: imageName
     });
+    await container.start();
   }
   async stop() {
     console.log("Maildev stopping...");
-    await _makes.Docker.removeContainer(this.containerName);
+    await this.dockerService.removeContainer(this.containerName);
   }
 }
 exports.MaildevPlugin = MaildevPlugin;

package/lib/plugins/MongodbPlugin.d.ts

@@ -1,9 +1,11 @@
+import { DI, DockerService } from "@wocker/core";
 import { Cli } from "@kearisp/cli";
 import { Plugin } from "src/makes";
 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[]>;