@wocker/ws 1.0.2 → 1.0.3

package/lib/plugins/RedisPlugin.js

@@ -1,79 +1,80 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisPlugin = void 0;
-var _core = require("@wocker/core");
-class RedisPlugin extends _core.Plugin {
-  container = "redis.workspace";
-  commander = "redis-commander.workspace";
-  constructor(di) {
-    super();
-    this.appConfigService = di.resolveService(_core.AppConfigService);
-    this.dockerService = di.resolveService(_core.DockerService);
-    this.fs = new _core.FSManager(this.appConfigService.pluginsPath("redis"), this.appConfigService.dataPath("plugins/redis"));
-  }
-  install(cli) {
-    super.install(cli);
-    cli.command("redis:start").action(() => this.up());
-    cli.command("redis:stop").action(() => this.down());
-  }
-  async up() {
-    console.log("Redis up...");
-    await this.dockerService.pullImage("redis");
-    let container = await this.dockerService.getContainer(this.container);
-    if (!container) {
-      await this.fs.mkdir("", {
-        recursive: true
-      });
-      container = await this.dockerService.createContainer({
-        name: this.container,
-        image: "redis",
-        restart: "always",
-        env: {
-          VIRTUAL_HOST: this.container
-        },
-        volumes: [`${this.fs.path()}:/data`],
-        ports: ["6379:6379"]
-      });
+const core_1 = require("@wocker/core");
+const makes_1 = require("../makes");
+const services_1 = require("../services");
+class RedisPlugin extends makes_1.Plugin {
+    constructor(di) {
+        super("redis");
+        this.container = "redis.workspace";
+        this.commander = "redis-commander.workspace";
+        this.appConfigService = di.resolveService(services_1.AppConfigService);
+        this.dockerService = di.resolveService(services_1.DockerService);
+        this.fs = new core_1.FSManager(this.appConfigService.pluginsPath("redis"), this.appConfigService.dataPath("plugins/redis"));
     }
-    await container.start();
-    await this.startCommander();
-  }
-  async startCommander() {
-    console.info("RedisCommander starting...");
-    let container = await this.dockerService.getContainer(this.commander);
-    if (!container) {
-      await this.dockerService.pullImage("rediscommander/redis-commander:latest");
-      container = await this.dockerService.createContainer({
-        name: this.commander,
-        image: "rediscommander/redis-commander:latest",
-        restart: "always",
-        env: {
-          VIRTUAL_HOST: this.commander,
-          VIRTUAL_PORT: "8081",
-          REDIS_HOSTS: this.container
+    install(cli) {
+        super.install(cli);
+        cli.command("redis:start")
+            .action(() => this.up());
+        cli.command("redis:stop")
+            .action(() => this.down());
+    }
+    async up() {
+        console.log("Redis up...");
+        await this.dockerService.pullImage("redis");
+        let container = await this.dockerService.getContainer(this.container);
+        if (!container) {
+            await this.fs.mkdir("", {
+                recursive: true
+            });
+            container = await this.dockerService.createContainer({
+                name: this.container,
+                image: "redis",
+                restart: "always",
+                env: {
+                    VIRTUAL_HOST: this.container
+                },
+                volumes: [
+                    `${this.fs.path()}:/data`
+                ],
+                ports: [
+                    "6379:6379"
+                ]
+            });
+        }
+        await container.start();
+        await this.startCommander();
+    }
+    async startCommander() {
+        console.info("RedisCommander starting...");
+        let container = await this.dockerService.getContainer(this.commander);
+        if (!container) {
+            await this.dockerService.pullImage("rediscommander/redis-commander:latest");
+            container = await this.dockerService.createContainer({
+                name: this.commander,
+                image: "rediscommander/redis-commander:latest",
+                restart: "always",
+                env: {
+                    VIRTUAL_HOST: this.commander,
+                    VIRTUAL_PORT: "8081",
+                    REDIS_HOSTS: this.container
+                }
+            });
         }
-      });
+        const { State: { Status } } = await container.inspect();
+        if (Status === "created" || Status === "exited") {
+            await container.start();
+        }
+    }
+    async down() {
+        console.log("Redis down...");
+        await this.dockerService.removeContainer(this.container);
+        await this.stopCommander();
     }
-    const {
-      State: {
-        Status
-      }
-    } = await container.inspect();
-    if (Status === "created" || Status === "exited") {
-      await container.start();
+    async stopCommander() {
+        console.info("RedisCommander stopping...");
+        await this.dockerService.removeContainer(this.commander);
     }
-  }
-  async down() {
-    console.log("Redis down...");
-    await this.dockerService.removeContainer(this.container);
-    await this.stopCommander();
-  }
-  async stopCommander() {
-    console.info("RedisCommander stopping...");
-    await this.dockerService.removeContainer(this.commander);
-  }
 }
-exports.RedisPlugin = RedisPlugin;
+exports.RedisPlugin = RedisPlugin;

package/lib/plugins/index.js

@@ -1,104 +1,26 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _ElasticSearchPlugin = require("./ElasticSearchPlugin");
-Object.keys(_ElasticSearchPlugin).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _ElasticSearchPlugin[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _ElasticSearchPlugin[key];
-    }
-  });
-});
-var _LocaltunnelPlugin = require("./LocaltunnelPlugin");
-Object.keys(_LocaltunnelPlugin).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _LocaltunnelPlugin[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _LocaltunnelPlugin[key];
-    }
-  });
-});
-var _MaildevPlugin = require("./MaildevPlugin");
-Object.keys(_MaildevPlugin).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _MaildevPlugin[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _MaildevPlugin[key];
-    }
-  });
-});
-var _MongodbPlugin = require("./MongodbPlugin");
-Object.keys(_MongodbPlugin).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _MongodbPlugin[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _MongodbPlugin[key];
-    }
-  });
-});
-var _NgrokPlugin = require("./NgrokPlugin");
-Object.keys(_NgrokPlugin).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _NgrokPlugin[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _NgrokPlugin[key];
-    }
-  });
-});
-var _PageKitePlugin = require("./PageKitePlugin");
-Object.keys(_PageKitePlugin).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _PageKitePlugin[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _PageKitePlugin[key];
-    }
-  });
-});
-var _PostgresPlugin = require("./PostgresPlugin");
-Object.keys(_PostgresPlugin).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _PostgresPlugin[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _PostgresPlugin[key];
-    }
-  });
-});
-var _ProxmoxPlugin = require("./ProxmoxPlugin");
-Object.keys(_ProxmoxPlugin).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _ProxmoxPlugin[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _ProxmoxPlugin[key];
-    }
-  });
-});
-var _RedisPlugin = require("./RedisPlugin");
-Object.keys(_RedisPlugin).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _RedisPlugin[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _RedisPlugin[key];
-    }
-  });
-});
+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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./ElasticSearchPlugin"), exports);
+__exportStar(require("./LocaltunnelPlugin"), exports);
+__exportStar(require("./MaildevPlugin"), exports);
+__exportStar(require("./MongodbPlugin"), exports);
+__exportStar(require("./NgrokPlugin"), exports);
+__exportStar(require("./PageKitePlugin"), exports);
+__exportStar(require("./PostgresPlugin"), exports);
+__exportStar(require("./PostgresPlugin"), exports);
+__exportStar(require("./ProxmoxPlugin"), exports);
+__exportStar(require("./RedisPlugin"), exports);

package/lib/services/AppConfigService.d.ts

@@ -1,8 +1,8 @@
-import { AppConfigService as CoreAppConfigService, AppConfig, EnvConfig } from "@wocker/core";
+import { Config, EnvConfig } from "../types";
 type TypeMap = {
     [type: string]: string;
 };
-declare class AppConfigService extends CoreAppConfigService {
+declare class AppConfigService {
     protected pwd: string;
     protected mapTypes: TypeMap;
     constructor();
@@ -10,7 +10,7 @@ declare class AppConfigService extends CoreAppConfigService {
     pluginsPath(...args: string[]): string;
     getPWD(): string;
     setPWD(pwd: string): void;
-    getAppConfig(): Promise<AppConfig>;
+    getAppConfig(): Promise<Config>;
     private saveAppConfig;
     getMeta(name: string, defaultValue?: string): Promise<string>;
     setMeta(name: string, value?: string | number): Promise<void>;

package/lib/services/AppConfigService.js

@@ -1,162 +1,167 @@
 "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.AppConfigService = 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 AppConfigService extends _core.AppConfigService {
-  mapTypes = {
-    image: "Image",
-    dockerfile: "Dockerfile"
-  };
-  constructor() {
-    super();
-    this.pwd = process.cwd() || process.env.PWD;
-  }
-  dataPath(...args) {
-    return Path.join(_env.DATA_DIR, ...args);
-  }
-  pluginsPath(...args) {
-    return Path.join(_env.PLUGINS_DIR, ...args);
-  }
-  getPWD() {
-    return this.pwd;
-  }
-  setPWD(pwd) {
-    this.pwd = pwd;
-  }
-  async getAppConfig() {
-    return _makes.FS.readJSON(_env.MAP_PATH);
-  }
-  async saveAppConfig(config) {
-    await _makes.FS.writeJSON(_env.MAP_PATH, config);
-  }
-  async getMeta(name, defaultValue) {
-    const config = await this.getAppConfig();
-    const value = (config.meta || {})[name];
-    if (!value) {
-      return defaultValue;
-    }
-    return value;
-  }
-  async setMeta(name, value) {
-    const config = await this.getAppConfig();
-    if (!config.meta) {
-      config.meta = {};
-    }
-    config.meta[name] = value ? value.toString() : undefined;
-    await this.saveAppConfig(config);
-  }
-  async getAllEnvVariables() {
-    const {
-      env = {}
-    } = await _makes.FS.readJSON(_env.MAP_PATH);
-    return env;
-  }
-  async getEnvVariable(name, defaultValue) {
-    const {
-      [name]: value = defaultValue
-    } = await this.getAllEnvVariables();
-    if (value === null) {
-      return defaultValue;
-    }
-    return value;
-  }
-  async setEnv(env) {
-    const config = await _makes.FS.readJSON(_env.MAP_PATH);
-    await _makes.FS.writeJSON(_env.MAP_PATH, {
-      ...config,
-      env: {
-        ...(config.env || {}),
-        ...env
-      }
-    });
-  }
-  async setEnvVariable(name, value) {
-    const config = await _makes.FS.readJSON(_env.MAP_PATH);
-    await _makes.FS.writeJSON(_env.MAP_PATH, {
-      ...config,
-      env: {
-        ...(config.env || {}),
-        [name]: value
-      }
-    });
-  }
-  async unsetEnv(...keys) {
-    const config = await _makes.FS.readJSON(_env.MAP_PATH);
-    await _makes.FS.writeJSON(_env.MAP_PATH, {
-      ...config,
-      env: Object.keys(config.env || {}).reduce((res, key) => {
-        if (!keys.includes(key)) {
-          res[key] = config.env[key];
+const Path = __importStar(require("path"));
+const env_1 = require("../env");
+const makes_1 = require("../makes");
+class AppConfigService {
+    constructor() {
+        this.mapTypes = {
+            image: "Image",
+            dockerfile: "Dockerfile"
+        };
+        this.pwd = (process.cwd() || process.env.PWD);
+    }
+    dataPath(...args) {
+        return Path.join(env_1.DATA_DIR, ...args);
+    }
+    pluginsPath(...args) {
+        return Path.join(env_1.PLUGINS_DIR, ...args);
+    }
+    getPWD() {
+        return this.pwd;
+    }
+    setPWD(pwd) {
+        this.pwd = pwd;
+    }
+    async getAppConfig() {
+        return makes_1.FS.readJSON(env_1.MAP_PATH);
+    }
+    async saveAppConfig(config) {
+        await makes_1.FS.writeJSON(env_1.MAP_PATH, config);
+    }
+    async getMeta(name, defaultValue) {
+        const config = await this.getAppConfig();
+        const value = (config.meta || {})[name];
+        if (!value) {
+            return defaultValue;
+        }
+        return value;
+    }
+    async setMeta(name, value) {
+        const config = await this.getAppConfig();
+        if (!config.meta) {
+            config.meta = {};
+        }
+        config.meta[name] = value ? value.toString() : undefined;
+        await this.saveAppConfig(config);
+    }
+    async getAllEnvVariables() {
+        const { env = {} } = await makes_1.FS.readJSON(env_1.MAP_PATH);
+        return env;
+    }
+    async getEnvVariable(name, defaultValue) {
+        const { [name]: value = defaultValue } = await this.getAllEnvVariables();
+        if (value === null) {
+            return defaultValue;
+        }
+        return value;
+    }
+    async setEnv(env) {
+        const config = await makes_1.FS.readJSON(env_1.MAP_PATH);
+        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
+            ...config,
+            env: {
+                ...config.env || {},
+                ...env
+            }
+        });
+    }
+    async setEnvVariable(name, value) {
+        const config = await makes_1.FS.readJSON(env_1.MAP_PATH);
+        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
+            ...config,
+            env: {
+                ...config.env || {},
+                [name]: value
+            }
+        });
+    }
+    async unsetEnv(...keys) {
+        const config = await makes_1.FS.readJSON(env_1.MAP_PATH);
+        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
+            ...config,
+            env: Object.keys(config.env || {}).reduce((res, key) => {
+                if (!keys.includes(key)) {
+                    res[key] = config.env[key];
+                }
+                return res;
+            }, {})
+        });
+    }
+    getProjectTypes() {
+        return this.mapTypes;
+    }
+    registerProjectType(name, title) {
+        this.mapTypes[name] = title || name;
+    }
+    async setProjectConfig(id, path) {
+        const { projects, ...rest } = await this.getAppConfig();
+        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
+            ...rest,
+            projects: [
+                ...(projects || []).filter((project) => {
+                    return project.id !== id;
+                }).filter((project) => {
+                    return project.src !== path;
+                }),
+                {
+                    id: id,
+                    src: path
+                }
+            ]
+        });
+    }
+    async activatePlugin(name) {
+        const { default: Plugin } = await Promise.resolve(`${name}`).then(s => __importStar(require(s)));
+        if (!Plugin) {
+            throw new Error("No plugin");
         }
-        return res;
-      }, {})
-    });
-  }
-  getProjectTypes() {
-    return this.mapTypes;
-  }
-  registerProjectType(name, title) {
-    this.mapTypes[name] = title || name;
-  }
-  async setProjectConfig(id, path) {
-    const {
-      projects,
-      ...rest
-    } = await this.getAppConfig();
-    await _makes.FS.writeJSON(_env.MAP_PATH, {
-      ...rest,
-      projects: [...(projects || []).filter(project => {
-        return project.id !== id;
-      }).filter(project => {
-        return project.src !== path;
-      }), {
-        id: id,
-        src: path
-      }]
-    });
-  }
-  async activatePlugin(name) {
-    const {
-      default: Plugin
-    } = await (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(name);
-
-    // this.use
-    if (!Plugin) {
-      throw new Error("No plugin");
-    }
-    const {
-      plugins = [],
-      ...rest
-    } = await this.getAppConfig();
-    await _makes.FS.writeJSON(_env.MAP_PATH, {
-      plugins: [...plugins.filter(plugin => {
-        return plugin !== name;
-      }), name],
-      ...rest
-    });
-  }
-  async deactivatePlugin(name) {
-    const {
-      plugins = [],
-      ...rest
-    } = await this.getAppConfig();
-    if (!plugins.includes(name)) {
-      return;
-    }
-    await _makes.FS.writeJSON(_env.MAP_PATH, {
-      plugins: plugins.filter(plugin => {
-        return plugin !== name;
-      }),
-      ...rest
-    });
-  }
+        const { plugins = [], ...rest } = await this.getAppConfig();
+        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
+            plugins: [
+                ...plugins.filter((plugin) => {
+                    return plugin !== name;
+                }),
+                name
+            ],
+            ...rest
+        });
+    }
+    async deactivatePlugin(name) {
+        const { plugins = [], ...rest } = await this.getAppConfig();
+        if (!plugins.includes(name)) {
+            return;
+        }
+        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
+            plugins: plugins.filter((plugin) => {
+                return plugin !== name;
+            }),
+            ...rest
+        });
+    }
 }
-exports.AppConfigService = AppConfigService;
+exports.AppConfigService = AppConfigService;