@wocker/ws 1.0.1 → 1.0.3

package/lib/services/ProjectService.js

@@ -1,91 +1,154 @@
 "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.ProjectService = void 0;
-var Path = _interopRequireWildcard(require("path"));
-var _makes = require("../makes");
-var _models = require("../models");
-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 Path = __importStar(require("path"));
+const makes_1 = require("../makes");
+const services_1 = require("../services");
 class ProjectService {
-  constructor(appConfigService, appEventsService) {
-    this.appConfigService = appConfigService;
-    this.appEventsService = appEventsService;
-  }
-  async cdProject(name) {
-    const project = await _models.Project.searchOne({
-      name
-    });
-    if (!project) {
-      throw new Error("Project not found");
+    constructor(di) {
+        this.appConfigService = di.resolveService(services_1.AppConfigService);
+        this.appEventsService = di.resolveService(services_1.AppEventsService);
+        this.dockerService = di.resolveService(services_1.DockerService);
     }
-    this.appConfigService.setPWD(project.path);
-  }
-  async get() {
-    const project = await _models.Project.searchOne({
-      src: this.appConfigService.getPWD()
-    });
-    if (!project) {
-      throw new Error("Project not found");
+    async cdProject(name) {
+        const project = await makes_1.Project.searchOne({
+            name
+        });
+        if (!project) {
+            throw new Error("Project not found");
+        }
+        this.appConfigService.setPWD(project.path);
     }
-    return project;
-  }
-  async start() {
-    const project = await this.get();
-    if (project.type === "dockerfile") {
-      project.imageName = `project-${project.name}:develop`;
-      const images = await _makes.Docker.imageLs({
-        tag: project.imageName
-      });
-      if (images.length === 0) {
-        await _makes.Docker.imageBuild2({
-          tag: project.imageName,
-          context: this.appConfigService.getPWD(),
-          src: project.dockerfile
+    async get() {
+        const project = await makes_1.Project.searchOne({
+            path: this.appConfigService.getPWD()
         });
-      }
+        if (!project) {
+            throw new Error("Project not found");
+        }
+        return project;
     }
-    await this.appEventsService.emit("project:beforeStart", project);
-    const containerName = `${project.name}.workspace`;
-    let container = await _makes.Docker.getContainer(containerName);
-    if (!container) {
-      container = await _makes.Docker.createContainer({
-        name: containerName,
-        image: project.imageName,
-        env: {
-          ...(await this.appConfigService.getAllEnvVariables()),
-          ...(project.env || {})
-        },
-        volumes: (project.volumes || []).map(volume => {
-          const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
-          const [, source, destination, options] = regVolume.exec(volume);
-          return `${Path.join(this.appConfigService.getPWD(), source)}:${destination}` + (options ? `:${options}` : "");
-        })
-      });
-    } else {
-      process.stdout.write("Container already exists\n");
+    async getContainer() {
+        const project = await this.get();
+        return this.dockerService.getContainer(project.containerName);
     }
-    if (container) {
-      const {
-        State: {
-          Status
+    async start() {
+        const project = await this.get();
+        if (project.type === "dockerfile") {
+            project.imageName = `project-${project.name}:develop`;
+            const images = await makes_1.Docker.imageLs({
+                tag: project.imageName
+            });
+            if (images.length === 0) {
+                await makes_1.Docker.imageBuild2({
+                    tag: project.imageName,
+                    context: this.appConfigService.getPWD(),
+                    src: project.dockerfile
+                });
+            }
+        }
+        await this.appEventsService.emit("project:beforeStart", project);
+        let container = await this.dockerService.getContainer(project.containerName);
+        if (!container) {
+            container = await makes_1.Docker.createContainer({
+                name: project.containerName,
+                image: project.imageName,
+                env: {
+                    ...await this.appConfigService.getAllEnvVariables(),
+                    ...project.env || {}
+                },
+                volumes: (project.volumes || []).map((volume) => {
+                    const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
+                    const [, source, destination, options] = regVolume.exec(volume);
+                    return `${Path.join(this.appConfigService.getPWD(), source)}:${destination}` + (options ? `:${options}` : "");
+                }),
+                ports: project.ports || []
+            });
+        }
+        else {
+            process.stdout.write("Container already exists\n");
+        }
+        if (container) {
+            const { State: { Status } } = await container.inspect();
+            if (Status === "created" || Status === "exited") {
+                await container.start();
+                await this.appEventsService.emit("project:start", project);
+            }
         }
-      } = await container.inspect();
-      if (Status === "created" || Status === "exited") {
-        await container.start();
-        await this.appEventsService.emit("project:start", project);
-      }
     }
-  }
-  async stop() {
-    const project = await this.get();
-    const container = await _makes.Docker.getContainer(`${project.name}.workspace`);
-    if (container) {
-      await this.appEventsService.emit("project:stop", project);
-      await _makes.Docker.removeContainer(`${project.name}.workspace`);
+    async stop() {
+        const project = await this.get();
+        const container = await makes_1.Docker.getContainer(project.containerName);
+        if (container) {
+            await this.appEventsService.emit("project:stop", project);
+            await makes_1.Docker.removeContainer(`${project.name}.workspace`);
+        }
+    }
+    async save(project) {
+        if (!project.name) {
+            throw new Error("Project should has a name");
+        }
+        if (!project.path) {
+            throw new Error("Project should has a path");
+        }
+        if (!project.id) {
+            project.id = project.name;
+        }
+        const projectDirPath = this.appConfigService.dataPath("projects", project.id);
+        const configPath = this.appConfigService.dataPath("projects", project.id, "config.json");
+        if (!makes_1.FS.existsSync(projectDirPath)) {
+            await makes_1.FS.mkdir(projectDirPath, {
+                recursive: true
+            });
+        }
+        await this.appConfigService.setProjectConfig(project.id, project.path);
+        await makes_1.FS.writeJSON(configPath, project);
+    }
+    async search(params = {}) {
+        const { id, name, path } = params;
+        const { projects: configs } = await this.appConfigService.getAppConfig();
+        const projects = [];
+        for (const config of configs) {
+            if (id && config.id !== id) {
+                continue;
+            }
+            if (path && config.src !== path) {
+                continue;
+            }
+            const projectData = await makes_1.FS.readJSON(this.appConfigService.dataPath("projects", config.id, "config.json"));
+            if (name && projectData.name !== name) {
+                continue;
+            }
+            const project = makes_1.Project.fromObject({
+                id: config.id,
+                ...projectData
+            });
+            projects.push(project);
+        }
+        return projects;
     }
-  }
 }
-exports.ProjectService = ProjectService;
+exports.ProjectService = ProjectService;

package/lib/services/index.d.ts

@@ -1,3 +1,7 @@
 export * from "./AppConfigService";
 export * from "./AppEventsService";
+export * from "./DockerService";
+export * from "./LogService";
+export * from "./PluginService";
+export * from "./PresetService";
 export * from "./ProjectService";

package/lib/services/index.js

@@ -1,38 +1,23 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _AppConfigService = require("./AppConfigService");
-Object.keys(_AppConfigService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _AppConfigService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _AppConfigService[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]; } };
     }
-  });
-});
-var _AppEventsService = require("./AppEventsService");
-Object.keys(_AppEventsService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _AppEventsService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _AppEventsService[key];
-    }
-  });
-});
-var _ProjectService = require("./ProjectService");
-Object.keys(_ProjectService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _ProjectService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _ProjectService[key];
-    }
-  });
-});
+    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("./AppConfigService"), exports);
+__exportStar(require("./AppEventsService"), exports);
+__exportStar(require("./DockerService"), exports);
+__exportStar(require("./LogService"), exports);
+__exportStar(require("./PluginService"), exports);
+__exportStar(require("./PresetService"), exports);
+__exportStar(require("./ProjectService"), exports);

package/lib/types/Config.d.ts

@@ -1,8 +1,9 @@
+import { EnvConfig } from "./EnvConfig";
 export type Config = {
     debug?: boolean;
-    env: {
-        [key: string]: string;
-    };
+    meta: EnvConfig;
+    env: EnvConfig;
+    plugins: string[];
     projects: {
         id: string;
         name?: string;

package/lib/types/Config.js

@@ -1,5 +1,2 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/EnvConfig.js

@@ -1,5 +1,2 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/index.js

@@ -1,27 +1,18 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _Config = require("./Config");
-Object.keys(_Config).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _Config[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _Config[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]; } };
     }
-  });
-});
-var _EnvConfig = require("./EnvConfig");
-Object.keys(_EnvConfig).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _EnvConfig[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _EnvConfig[key];
-    }
-  });
-});
+    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("./Config"), exports);
+__exportStar(require("./EnvConfig"), exports);

package/lib/utils/buildOptions.js

@@ -1,12 +1,9 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildOptions = void 0;
 const buildOptions = (name, options) => {
-  return Object.keys(options).map(key => {
-    return `--${name} ${key}=${options[key]}`;
-  }).join(" ");
+    return Object.keys(options).map((key) => {
+        return `--${name} ${key}=${options[key]}`;
+    }).join(" ");
 };
-exports.buildOptions = buildOptions;
+exports.buildOptions = buildOptions;

package/lib/utils/demuxOutput.js

@@ -1,25 +1,19 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.demuxOutput = void 0;
-const demuxOutput = buffer => {
-  let nextDataLength = null,
-    output = Buffer.from([]);
-  while (buffer.length > 0) {
-    // Logger.info(buffer.length, buffer.toString("utf8"));
-
-    const header = bufferSlice(8);
-    nextDataLength = header.readUInt32BE(4);
-    const content = bufferSlice(nextDataLength);
-    output = Buffer.concat([output, content]);
-  }
-  function bufferSlice(end) {
-    const out = buffer.slice(0, end);
-    buffer = Buffer.from(buffer.slice(end, buffer.length));
-    return out;
-  }
-  return output;
+const demuxOutput = (buffer) => {
+    let nextDataLength = null, output = Buffer.from([]);
+    while (buffer.length > 0) {
+        const header = bufferSlice(8);
+        nextDataLength = header.readUInt32BE(4);
+        const content = bufferSlice(nextDataLength);
+        output = Buffer.concat([output, content]);
+    }
+    function bufferSlice(end) {
+        const out = buffer.slice(0, end);
+        buffer = Buffer.from(buffer.slice(end, buffer.length));
+        return out;
+    }
+    return output;
 };
-exports.demuxOutput = demuxOutput;
+exports.demuxOutput = demuxOutput;

package/lib/utils/escapeRegExp.js

@@ -1,10 +1,7 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.escapeRegExp = void 0;
-const escapeRegExp = string => {
-  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+const escapeRegExp = (string) => {
+    return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 };
-exports.escapeRegExp = escapeRegExp;
+exports.escapeRegExp = escapeRegExp;

package/lib/utils/exec.d.ts

@@ -1,2 +1,2 @@
-declare const exec: (command: any) => Promise<unknown>;
+declare const exec: (command: string) => Promise<unknown>;
 export { exec };

package/lib/utils/exec.js

@@ -1,44 +1,42 @@
 "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.exec = void 0;
-var _child_process = require("child_process");
-var _chalk = _interopRequireDefault(require("chalk"));
-var _Logger = require("../makes/Logger");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const exec = async command => {
-  _Logger.Logger.info(` > ${command.trim().replace(/\s+/g, " ")}`);
-  return new Promise((resolve, reject) => {
-    const worker = (0, _child_process.exec)(command, {
-      maxBuffer: Infinity
-    }, (err, stdout, stderr) => {
-      if (err) {
-        return reject(err);
-      }
-      return resolve({
-        stdout,
-        stderr
-      });
-    });
-    if (worker.stdout) {
-      worker.stdout.on("data", data => {
-        process.stdout.write(data);
-      });
-    }
-    if (worker.stderr) {
-      worker.stderr.on("data", data => {
-        // process.stdout.write(chalk.red(data));
-        process.stderr.write(data);
-      });
-    }
-    worker.on("close", code => {
-      _Logger.Logger.info("close", _chalk.default.red(code));
-    });
-    worker.on("exit", code => {
-      _Logger.Logger.info("exit", _chalk.default.red(code));
+const core_1 = require("@wocker/core");
+const child_process_1 = require("child_process");
+const chalk_1 = __importDefault(require("chalk"));
+const exec = async (command) => {
+    core_1.Logger.info(` > ${command.trim().replace(/\s+/g, " ")}`);
+    return new Promise((resolve, reject) => {
+        const worker = (0, child_process_1.exec)(command, {
+            maxBuffer: Infinity
+        }, (err, stdout, stderr) => {
+            if (err) {
+                return reject(err);
+            }
+            return resolve({
+                stdout,
+                stderr
+            });
+        });
+        if (worker.stdout) {
+            worker.stdout.on("data", (data) => {
+                process.stdout.write(data);
+            });
+        }
+        if (worker.stderr) {
+            worker.stderr.on("data", (data) => {
+                process.stderr.write(data);
+            });
+        }
+        worker.on("close", (code) => {
+            core_1.Logger.info("close", chalk_1.default.red(code));
+        });
+        worker.on("exit", (code) => {
+            core_1.Logger.info("exit", chalk_1.default.red(code));
+        });
     });
-  });
 };
-exports.exec = exec;
+exports.exec = exec;

package/lib/utils/fetch.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.fetch = void 0;
-var https = _interopRequireWildcard(require("https"));
-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 https = __importStar(require("https"));
 const fetch = async (url, options) => {
-  const {
-    method = "GET"
-  } = options || {};
-  const target = new URL(url);
-  const params = {
-    method,
-    protocol: target.protocol,
-    hostname: target.hostname,
-    port: target.port,
-    path: target.pathname
-  };
-  return new Promise((resolve, reject) => {
-    const req = https.request(params, res => {
-      let body = "";
-      res.on("data", data => {
-        body += data;
-      });
-      res.on("end", () => {
-        resolve(body);
-      });
+    const { method = "GET" } = options || {};
+    const target = new URL(url);
+    const params = {
+        method,
+        protocol: target.protocol,
+        hostname: target.hostname,
+        port: target.port,
+        path: target.pathname
+    };
+    return new Promise((resolve, reject) => {
+        const req = https.request(params, (res) => {
+            let body = "";
+            res.on("data", (data) => {
+                body += data;
+            });
+            res.on("end", () => {
+                resolve(body);
+            });
+        });
+        req.on("error", reject);
+        req.end();
     });
-    req.on("error", reject);
-    req.end();
-  });
 };
 exports.fetch = fetch;
-class Response {}