@wocker/ws 1.0.15 → 1.0.17

package/lib/services/NpmService.js

@@ -0,0 +1,33 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NpmService = void 0;
+const core_1 = require("@wocker/core");
+const makes_1 = require("../makes");
+const utils_1 = require("../utils");
+let NpmService = class NpmService {
+    async getPackageInfo(name) {
+        const res = await makes_1.Http.get("https://registry.npmjs.org")
+            .send(name);
+        if (res.status === 404) {
+            throw new Error("Package not found");
+        }
+        if (res.status !== 200) {
+            throw new Error("Network error");
+        }
+        return res.data;
+    }
+    async install(name, version) {
+        console.info(`npm install -g ${version ? `${name}@${version}` : name}`);
+        await (0, utils_1.exec)(`npm install -g ${version ? `${name}@${version}` : name}`);
+    }
+};
+exports.NpmService = NpmService;
+exports.NpmService = NpmService = __decorate([
+    (0, core_1.Injectable)()
+], NpmService);

package/lib/services/PluginService.js

@@ -49,7 +49,7 @@ let PluginService = class PluginService {
             const { default: Plugin } = await Promise.resolve(`${pluginName}`).then(s => __importStar(require(s)));
             const name = Reflect.getMetadata(core_1.PLUGIN_NAME_METADATA, Plugin);
             if (!name) {
-                console.log("No name");
+                console.error("No name");
             }
             return !!name;
         }

package/lib/services/PresetService.d.ts

@@ -1,14 +1,21 @@
-import { EnvConfig, Preset, Config, PresetProperties, AppConfigService } from "@wocker/core";
+import { EnvConfig, Project, Preset, AppConfig, PresetProperties } from "@wocker/core";
+import { AppConfigService } from "./AppConfigService";
+import { LogService } from "./LogService";
 type SearchOptions = Partial<{
     name: string;
     source: string;
+    path: string;
 }>;
 export declare class PresetService {
     protected readonly appConfigService: AppConfigService;
-    constructor(appConfigService: AppConfigService);
+    protected readonly logService: LogService;
+    constructor(appConfigService: AppConfigService, logService: LogService);
     protected toObject(config: PresetProperties): Preset;
-    protected getList(): Promise<Config["presets"]>;
-    getImageName(preset: Preset, buildArgs?: EnvConfig): string;
+    protected getList(): Promise<AppConfig["presets"]>;
+    getImageNameForProject(project: Project, preset: Preset): string;
+    getImageName(preset: Preset, buildArgs: EnvConfig): string;
+    init(): Promise<void>;
+    deinit(): Promise<void>;
     get(name: string): Promise<Preset>;
     addPreset(name: string): Promise<void>;
     search(options?: SearchOptions): Promise<Preset[]>;

package/lib/services/PresetService.js

@@ -37,15 +37,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PresetService = void 0;
 const core_1 = require("@wocker/core");
+const utils_1 = require("@wocker/utils");
 const md5_1 = __importDefault(require("md5"));
 const axios_1 = __importDefault(require("axios"));
 const unzipper_1 = require("unzipper");
 const Path = __importStar(require("path"));
+const AppConfigService_1 = require("./AppConfigService");
+const LogService_1 = require("./LogService");
 const env_1 = require("../env");
 const makes_1 = require("../makes");
 let PresetService = class PresetService {
-    constructor(appConfigService) {
+    constructor(appConfigService, logService) {
         this.appConfigService = appConfigService;
+        this.logService = logService;
     }
     toObject(config) {
         const _this = this;
@@ -55,24 +59,32 @@ let PresetService = class PresetService {
             }
             async save() {
                 const { source, path, ...rest } = this.toJSON();
-                const config = await _this.appConfigService.getConfig();
+                const config = _this.appConfigService.getConfig();
                 let presetData = config.presets.find((presetData) => {
                     return presetData.name === this.name;
                 });
-                if (!makes_1.FS.existsSync(_this.appConfigService.dataPath("presets", this.name))) {
-                    makes_1.FS.mkdirSync(_this.appConfigService.dataPath("presets", this.name), {
-                        recursive: true
-                    });
+                switch (this.source) {
+                    case core_1.PRESET_SOURCE_EXTERNAL:
+                        const fs = new core_1.FileSystem(this.path);
+                        await fs.writeJSON("config.json", rest);
+                        break;
+                    case core_1.PRESET_SOURCE_GITHUB: {
+                        const fs = new core_1.FileSystem(_this.appConfigService.dataPath("presets", this.name));
+                        if (!fs.exists()) {
+                            fs.mkdir("");
+                        }
+                        await fs.writeJSON("config.json", rest);
+                        break;
+                    }
                 }
-                await makes_1.FS.writeJSON(_this.appConfigService.dataPath("presets", this.name, "config.json"), rest);
                 if (!presetData) {
-                    config.registerPreset(this.name, source);
+                    config.registerPreset(this.name, source, path);
                     await config.save();
                 }
             }
             async delete() {
                 if (this.source === core_1.PRESET_SOURCE_GITHUB) {
-                    const config = await _this.appConfigService.getConfig();
+                    const config = _this.appConfigService.getConfig();
                     await makes_1.FS.rm(_this.appConfigService.dataPath("presets", this.name), {
                         recursive: true
                     });
@@ -84,7 +96,7 @@ let PresetService = class PresetService {
     }
     async getList() {
         const dirs = await makes_1.FS.readdir(env_1.PRESETS_DIR);
-        const { presets } = await this.appConfigService.getConfig();
+        const { presets } = this.appConfigService.getConfig();
         return [
             ...dirs.map((name) => {
                 return {
@@ -93,10 +105,23 @@ let PresetService = class PresetService {
                     path: Path.join(env_1.PRESETS_DIR, name)
                 };
             }),
-            ...presets
+            ...presets.map((item) => {
+                if (item.source === core_1.PRESET_SOURCE_GITHUB) {
+                    item.path = this.appConfigService.dataPath("presets", item.name);
+                }
+                return item;
+            })
         ];
     }
-    getImageName(preset, buildArgs = {}) {
+    getImageNameForProject(project, preset) {
+        switch (project.presetMode) {
+            case "project":
+                return `project-${project.name}:develop`;
+            default:
+                return this.getImageName(preset, project.buildArgs || {});
+        }
+    }
+    getImageName(preset, buildArgs) {
         const rawValues = [];
         const hashValues = [];
         Object.keys(preset.buildArgsOptions || {}).forEach((key) => {
@@ -117,6 +142,117 @@ let PresetService = class PresetService {
         }).join("-");
         return `ws-preset-${preset.name}:${version}`;
     }
+    async init() {
+        let preset = await this.searchOne({
+            path: this.appConfigService.pwd()
+        });
+        const fs = new core_1.FileSystem(this.appConfigService.pwd());
+        if (!preset) {
+            if (!fs.exists("config.json")) {
+                preset = this.toObject({
+                    name: "",
+                    version: "",
+                    source: "external",
+                    path: this.appConfigService.pwd()
+                });
+            }
+            else {
+                preset = this.toObject(fs.readJSON("config.json"));
+                preset.source = "external";
+                preset.path = this.appConfigService.pwd();
+            }
+        }
+        if (!preset.name) {
+            const list = await this.getList();
+            preset.name = await (0, utils_1.promptText)({
+                message: "Preset name:",
+                required: true,
+                validate: async (value) => {
+                    if (!/^[a-z][a-z0-9-_]+$/.test(value || "")) {
+                        return "Invalid name";
+                    }
+                    const presetData = list.find((presetData) => {
+                        return presetData.name === value;
+                    });
+                    if (presetData) {
+                        return "Preset name is already taken";
+                    }
+                    return true;
+                },
+                default: preset.name
+            });
+        }
+        if (!preset.version) {
+            preset.version = await (0, utils_1.promptText)({
+                message: "Preset version:",
+                validate: (version) => {
+                    if (!/^[0-9]+\.[0.9]+\.[0-9]+$/.test(version)) {
+                        return "Invalid version";
+                    }
+                    return true;
+                },
+                default: preset.version
+            });
+        }
+        if (!preset.type) {
+            preset.type = await (0, utils_1.promptSelect)({
+                message: "Preset type:",
+                options: ["dockerfile", "image"]
+            });
+        }
+        switch (preset.type) {
+            case "dockerfile":
+                if (!preset.dockerfile) {
+                    const files = await fs.readdirFiles();
+                    const dockerfiles = files.filter((fileName) => {
+                        if (new RegExp("^(.*)\\.dockerfile$").test(fileName)) {
+                            return true;
+                        }
+                        return new RegExp("^Dockerfile(\\..*)?").test(fileName);
+                    });
+                    if (dockerfiles.length === 0) {
+                        throw new Error("No dockerfiles found");
+                    }
+                    preset.dockerfile = await (0, utils_1.promptSelect)({
+                        message: "Preset dockerfile:",
+                        options: dockerfiles
+                    });
+                }
+                break;
+            case "image":
+                if (preset.image) {
+                    preset.image = await (0, utils_1.promptText)({
+                        message: "Preset image:",
+                        required: true,
+                        validate(value) {
+                            if (!/^[a-z0-9]+(?:[._-][a-z0-9]+)*(?::[a-z0-9]+(?:[._-][a-z0-9]+)*)?$/.test(value)) {
+                                return "Invalid image name";
+                            }
+                            return true;
+                        }
+                    });
+                }
+                break;
+        }
+        console.info(JSON.stringify(preset.toJSON(), null, 4));
+        const confirm = await (0, utils_1.promptConfirm)({
+            message: "Correct?"
+        });
+        if (confirm) {
+            await preset.save();
+        }
+    }
+    async deinit() {
+        const preset = await this.searchOne({
+            path: this.appConfigService.pwd()
+        });
+        if (!preset) {
+            return;
+        }
+        const config = this.appConfigService.getConfig();
+        config.unregisterPreset(preset.name);
+        await config.save();
+    }
     async get(name) {
         const list = await this.getList();
         const item = list.find((item) => {
@@ -125,12 +261,6 @@ let PresetService = class PresetService {
         if (!item) {
             throw new Error(`Preset ${name} not found`);
         }
-        if (item.source === core_1.PRESET_SOURCE_GITHUB) {
-            item.path = this.appConfigService.dataPath("presets", item.name);
-        }
-        else if (item.source === core_1.PRESET_SOURCE_INTERNAL) {
-            item.path = Path.join(env_1.PRESETS_DIR, item.name);
-        }
         const config = await makes_1.FS.readJSON(item.path, "config.json");
         return this.toObject({
             ...item,
@@ -180,7 +310,7 @@ let PresetService = class PresetService {
         console.log(preset.version);
     }
     async search(options = {}) {
-        const { name, source } = options;
+        const { name, source, path } = options;
         const presets = [];
         const presetConfigs = await this.getList();
         for (const presetConfig of presetConfigs) {
@@ -190,11 +320,11 @@ let PresetService = class PresetService {
             if (source && source !== presetConfig.source) {
                 continue;
             }
+            if (path && path !== presetConfig.path) {
+                continue;
+            }
             try {
                 const fullConfig = await makes_1.FS.readJSON(presetConfig.path, "config.json");
-                if (!fullConfig.name) {
-                    console.log(presetConfig.name);
-                }
                 const preset = this.toObject({
                     ...presetConfig,
                     ...fullConfig
@@ -202,6 +332,7 @@ let PresetService = class PresetService {
                 presets.push(preset);
             }
             catch (err) {
+                this.logService.error("PresetService.search(", options, ") ->", err.message);
             }
         }
         return presets;
@@ -214,5 +345,6 @@ let PresetService = class PresetService {
 exports.PresetService = PresetService;
 exports.PresetService = PresetService = __decorate([
     (0, core_1.Injectable)(),
-    __metadata("design:paramtypes", [core_1.AppConfigService])
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+        LogService_1.LogService])
 ], PresetService);

package/lib/services/ProjectService.d.ts

@@ -1,7 +1,6 @@
 import { Project, ProjectProperties } from "@wocker/core";
 import { DockerService, AppConfigService, AppEventsService } from "../services";
 type SearchParams = Partial<{
-    id: string;
     name: string;
     path: string;
 }>;

package/lib/services/ProjectService.js

@@ -1,40 +1,16 @@
 "use strict";
-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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-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;
-};
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectService = void 0;
 const core_1 = require("@wocker/core");
-const Path = __importStar(require("path"));
 const makes_1 = require("../makes");
 const services_1 = require("../services");
 let ProjectService = class ProjectService {
@@ -56,7 +32,7 @@ let ProjectService = class ProjectService {
     }
     async get() {
         const project = await this.searchOne({
-            path: this.appConfigService.getPWD()
+            path: this.appConfigService.pwd()
         });
         if (!project) {
             throw new Error("Project not found");
@@ -64,8 +40,13 @@ let ProjectService = class ProjectService {
         return project;
     }
     async getById(id) {
+        const config = this.appConfigService.getConfig();
+        const projectData = config.getProject(id);
         const data = await makes_1.FS.readJSON(this.appConfigService.dataPath("projects", id, "config.json"));
-        return this.fromObject(data);
+        return this.fromObject({
+            ...data,
+            path: projectData.path || projectData.src
+        });
     }
     async cdProject(name) {
         const project = await this.searchOne({
@@ -96,7 +77,7 @@ let ProjectService = class ProjectService {
                     await this.dockerService.buildImage({
                         tag: project.imageName,
                         buildArgs: project.buildArgs,
-                        context: this.appConfigService.getPWD(),
+                        context: this.appConfigService.pwd(),
                         src: project.dockerfile
                     });
                 }
@@ -105,7 +86,7 @@ let ProjectService = class ProjectService {
                 await this.appEventsService.emit("project:rebuild", project);
             }
             await this.appEventsService.emit("project:beforeStart", project);
-            const config = await this.appConfigService.getConfig();
+            const config = this.appConfigService.getConfig();
             container = await this.dockerService.createContainer({
                 name: project.containerName,
                 image: project.imageName,
@@ -113,12 +94,18 @@ let ProjectService = class ProjectService {
                     ...config.env || {},
                     ...project.env || {}
                 },
+                ports: project.ports || [],
                 volumes: (project.volumes || []).map((volume) => {
                     const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
                     const [, source, destination, options] = regVolume.exec(volume);
-                    return `${Path.join(this.appConfigService.getPWD(), source)}:${destination}` + (options ? `:${options}` : "");
+                    if (source.startsWith("/")) {
+                        return volume;
+                    }
+                    return `${this.appConfigService.pwd(source)}:${destination}` + (options ? `:${options}` : "");
                 }),
-                ports: project.ports || []
+                extraHosts: Object.keys(project.extraHosts || {}).map((host) => {
+                    return `${project.extraHosts[host]}:${host}`;
+                })
             });
         }
         const { State: { Status } } = await container.inspect();
@@ -145,27 +132,25 @@ let ProjectService = class ProjectService {
         if (!project.id) {
             project.id = project.name;
         }
-        const projectDirPath = this.appConfigService.dataPath("projects", project.id);
         const config = await this.appConfigService.getConfig();
-        const configPath = this.appConfigService.dataPath("projects", project.id, "config.json");
-        if (!makes_1.FS.existsSync(projectDirPath)) {
-            await makes_1.FS.mkdir(projectDirPath, {
-                recursive: true
-            });
+        const fs = new core_1.FileSystem(this.appConfigService.dataPath("projects", project.id));
+        if (!fs.exists()) {
+            fs.mkdir("", { recursive: true });
         }
-        config.setProject(project.id, project.path);
-        await makes_1.FS.writeJSON(configPath, project);
+        const { path, ...rest } = project.toJSON();
+        config.addProject(project.id, project.name, path);
+        await fs.writeJSON("config.json", rest);
         await config.save();
     }
     async search(params = {}) {
-        const { id, name, path } = params;
+        const { name, path } = params;
         const config = await this.appConfigService.getConfig();
         const projects = [];
         for (const projectConfig of config.projects) {
-            if (id && projectConfig.id !== id) {
+            if (name && projectConfig.name !== name) {
                 continue;
             }
-            if (path && projectConfig.src !== path) {
+            if (path && (projectConfig.path || projectConfig.src) !== path) {
                 continue;
             }
             const project = await this.getById(projectConfig.id);

package/lib/services/ProxyService.js

@@ -46,7 +46,7 @@ let ProxyService = class ProxyService {
                     mode: 0o700
                 });
             }
-            const config = await this.appConfigService.getConfig();
+            const config = this.appConfigService.getConfig();
             const httpPort = config.getMeta("PROXY_HTTP_PORT", "80");
             const httpsPort = config.getMeta("PROXY_HTTPS_PORT", "443");
             container = await this.dockerService.createContainer({
@@ -65,11 +65,11 @@ let ProxyService = class ProxyService {
                     `${certsDir}:/etc/nginx/certs`
                 ]
             });
-            const { State: { Status } } = await container.inspect();
-            if (["created", "exited"].includes(Status)) {
-                await container.start();
-                console.info("Started");
-            }
+        }
+        const { State: { Status } } = await container.inspect();
+        if (["created", "exited"].includes(Status)) {
+            await container.start();
+            console.info("Proxy started");
         }
     }
     async stop() {

package/lib/services/index.d.ts

@@ -2,6 +2,7 @@ export * from "./AppConfigService";
 export * from "./AppEventsService";
 export * from "./DockerService";
 export * from "./LogService";
+export * from "./NpmService";
 export * from "./PluginService";
 export * from "./PresetService";
 export * from "./ProjectService";

package/lib/services/index.js

@@ -18,6 +18,7 @@ __exportStar(require("./AppConfigService"), exports);
 __exportStar(require("./AppEventsService"), exports);
 __exportStar(require("./DockerService"), exports);
 __exportStar(require("./LogService"), exports);
+__exportStar(require("./NpmService"), exports);
 __exportStar(require("./PluginService"), exports);
 __exportStar(require("./PresetService"), exports);
 __exportStar(require("./ProjectService"), exports);

package/lib/types/PackageInfo.d.ts

@@ -0,0 +1,20 @@
+export type PackageInfo = {
+    name: string;
+    "dist-tags": {
+        [tag: string]: string;
+    };
+    versions: {
+        [version: string]: {
+            name: string;
+            version: string;
+        };
+    };
+    time: {
+        created: string;
+        modified: string;
+    } & {
+        [version: string]: string;
+    };
+    readme: string;
+    readmeFilename: string;
+};

package/lib/types/PackageInfo.js

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

package/lib/types/index.d.ts

@@ -0,0 +1 @@
+export * from "./PackageInfo";

package/lib/types/index.js

@@ -0,0 +1,17 @@
+"use strict";
+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("./PackageInfo"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.15",
+    "version": "1.0.17",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -25,8 +25,8 @@
         "lint": "eslint \"**/*.{js,jsx,ts,tsx}\""
     },
     "dependencies": {
-        "@wocker/core": "^1.0.14",
-        "@wocker/utils": "^1.0.5",
+        "@wocker/core": "1.0.17",
+        "@wocker/utils": "^1.0.7",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
         "chalk": "^2.4.2",