@wocker/ws 1.0.14 → 1.0.16

package/lib/services/PresetService.js

@@ -1,10 +1,33 @@
 "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);
 };
@@ -14,11 +37,82 @@ 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() { }
+    constructor(appConfigService, logService) {
+        this.appConfigService = appConfigService;
+        this.logService = logService;
+    }
+    toObject(config) {
+        const _this = this;
+        return new class extends core_1.Preset {
+            constructor(data) {
+                super(data);
+            }
+            async save() {
+                const { source, path, ...rest } = this.toJSON();
+                const config = _this.appConfigService.getConfig();
+                let presetData = config.presets.find((presetData) => {
+                    return presetData.name === this.name;
+                });
+                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;
+                    }
+                }
+                if (!presetData) {
+                    config.registerPreset(this.name, source, path);
+                    await config.save();
+                }
+            }
+            async delete() {
+                if (this.source === core_1.PRESET_SOURCE_GITHUB) {
+                    const config = _this.appConfigService.getConfig();
+                    await makes_1.FS.rm(_this.appConfigService.dataPath("presets", this.name), {
+                        recursive: true
+                    });
+                    config.unregisterPreset(this.name);
+                    await config.save();
+                }
+            }
+        }(config);
+    }
+    async getList() {
+        const dirs = await makes_1.FS.readdir(env_1.PRESETS_DIR);
+        const { presets } = this.appConfigService.getConfig();
+        return [
+            ...dirs.map((name) => {
+                return {
+                    name,
+                    source: core_1.PRESET_SOURCE_INTERNAL,
+                    path: Path.join(env_1.PRESETS_DIR, name)
+                };
+            }),
+            ...presets.map((item) => {
+                if (item.source === core_1.PRESET_SOURCE_GITHUB) {
+                    item.path = this.appConfigService.dataPath("presets", item.name);
+                }
+                return item;
+            })
+        ];
+    }
     getImageName(preset, buildArgs = {}) {
         const rawValues = [];
         const hashValues = [];
@@ -34,38 +128,179 @@ let PresetService = class PresetService {
         });
         const version = [
             ...rawValues,
-            (0, md5_1.default)(hashValues.join(",")).substr(0, 6)
+            (0, md5_1.default)(hashValues.join(",")).substring(0, 6)
         ].filter((value) => {
             return !!value;
         }).join("-");
         return `ws-preset-${preset.name}:${version}`;
     }
-    async save(preset) {
-    }
-    async get(name) {
-        const config = await makes_1.FS.readJSON(env_1.PRESETS_DIR, name, "config.json");
-        const _this = this;
-        return new class extends core_1.Preset {
-            constructor(data) {
-                super(data);
+    async init() {
+        let preset = await this.searchOne({
+            path: this.appConfigService.pwd()
+        });
+        if (preset) {
+            throw new Error("Preset is already registered");
+        }
+        const fs = new core_1.FileSystem(this.appConfigService.pwd());
+        if (!fs.exists("config.json")) {
+            preset = this.toObject({
+                name: fs.basename(),
+                version: "1.0.0",
+                source: "external",
+                path: this.appConfigService.pwd()
+            });
+            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
+            });
+            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
+            });
+            preset.type = await (0, utils_1.promptSelect)({
+                message: "Preset type:",
+                options: ["dockerfile", "image"]
+            });
+            switch (preset.type) {
+                case "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":
+                    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;
             }
-            async save() {
+            console.info(JSON.stringify(preset.toJSON(), null, 4));
+            const confirm = await (0, utils_1.promptConfirm)({
+                message: "Correct?"
+            });
+            if (confirm) {
+                await preset.save();
             }
-        }({
-            name,
+        }
+    }
+    async get(name) {
+        const list = await this.getList();
+        const item = list.find((item) => {
+            return item.name === name;
+        });
+        if (!item) {
+            throw new Error(`Preset ${name} not found`);
+        }
+        const config = await makes_1.FS.readJSON(item.path, "config.json");
+        return this.toObject({
+            ...item,
             ...config
         });
     }
+    async addPreset(name) {
+        let preset = await this.searchOne({
+            name
+        });
+        if (!preset) {
+            console.info("Loading...");
+            const res = await makes_1.Http.get("https://raw.githubusercontent.com")
+                .withHeader("User-Agent", "Wocker")
+                .send(`/kearisp/wocker-${name}-preset/master/config.json`);
+            preset = this.toObject(res.data);
+            preset.source = core_1.PRESET_SOURCE_GITHUB;
+            preset.path = this.appConfigService.dataPath("presets", preset.name);
+            const zipRes = await axios_1.default.create({
+                baseURL: "https://github.com",
+                headers: {
+                    "User-Agent": "Wocker"
+                }
+            }).get(`/kearisp/wocker-${preset.name}-preset/archive/refs/heads/master.zip`, {
+                responseType: "stream"
+            });
+            makes_1.FS.mkdirSync(preset.path, {
+                recursive: true
+            });
+            zipRes.data.pipe((0, unzipper_1.Parse)()).on("entry", (entry) => {
+                const path = entry.path.replace(/^[^\/]+\//, "");
+                if (path === "config.json") {
+                    return;
+                }
+                const fullPath = this.appConfigService.dataPath("presets", preset.name, path);
+                if (entry.type === "File") {
+                    entry.pipe(makes_1.FS.createWriteStream(fullPath));
+                }
+                else if (entry.type === "Directory") {
+                    makes_1.FS.mkdirSync(fullPath, {
+                        recursive: true
+                    });
+                }
+            });
+            await preset.save();
+        }
+        console.log(preset.version);
+    }
     async search(options = {}) {
-        const { name } = options;
+        const { name, source, path } = options;
         const presets = [];
-        const dirs = await makes_1.FS.readdir(env_1.PRESETS_DIR);
-        for (const dir of dirs) {
-            if (name && name !== dir) {
+        const presetConfigs = await this.getList();
+        for (const presetConfig of presetConfigs) {
+            if (name && name !== presetConfig.name) {
+                continue;
+            }
+            if (source && source !== presetConfig.source) {
                 continue;
             }
-            const preset = await this.get(dir);
-            presets.push(preset);
+            if (path && path !== presetConfig.path) {
+                continue;
+            }
+            try {
+                const fullConfig = await makes_1.FS.readJSON(presetConfig.path, "config.json");
+                const preset = this.toObject({
+                    ...presetConfig,
+                    ...fullConfig
+                });
+                presets.push(preset);
+            }
+            catch (err) {
+                this.logService.error("PresetService.search(", options, ") ->", err.message);
+            }
         }
         return presets;
     }
@@ -77,5 +312,6 @@ let PresetService = class PresetService {
 exports.PresetService = PresetService;
 exports.PresetService = PresetService = __decorate([
     (0, core_1.Injectable)(),
-    __metadata("design:paramtypes", [])
+    __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;
 }>;
@@ -11,10 +10,10 @@ declare class ProjectService {
     protected readonly dockerService: DockerService;
     constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, dockerService: DockerService);
     fromObject(data: Partial<ProjectProperties>): Project;
+    get(): Promise<Project>;
     getById(id: string): Promise<Project>;
     cdProject(name: string): Promise<void>;
-    get(): Promise<Project>;
-    start(project: Project, rebuild?: boolean, restart?: boolean): Promise<void>;
+    start(project: Project, restart?: boolean, rebuild?: boolean): Promise<void>;
     stop(project: Project): Promise<void>;
     save(project: Project): Promise<void>;
     search(params?: Partial<SearchParams>): Promise<Project[]>;

package/lib/services/ProjectService.js

@@ -54,29 +54,34 @@ let ProjectService = class ProjectService {
             }
         }(data);
     }
-    async getById(id) {
-        const data = await makes_1.FS.readJSON(this.appConfigService.dataPath("projects", id, "config.json"));
-        return this.fromObject(data);
-    }
-    async cdProject(name) {
+    async get() {
         const project = await this.searchOne({
-            name
+            path: this.appConfigService.pwd()
         });
         if (!project) {
             throw new Error("Project not found");
         }
-        this.appConfigService.setPWD(project.path);
+        return project;
     }
-    async get() {
+    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,
+            path: projectData.path || projectData.src
+        });
+    }
+    async cdProject(name) {
         const project = await this.searchOne({
-            path: this.appConfigService.getPWD()
+            name
         });
         if (!project) {
             throw new Error("Project not found");
         }
-        return project;
+        this.appConfigService.setPWD(project.path);
     }
-    async start(project, rebuild, restart) {
+    async start(project, restart, rebuild) {
         let container = await this.dockerService.getContainer(project.containerName);
         if (container && (restart || rebuild)) {
             container = null;
@@ -84,8 +89,7 @@ let ProjectService = class ProjectService {
             await this.dockerService.removeContainer(project.containerName);
         }
         if (!container) {
-            await this.appEventsService.emit("project:beforeStart", project);
-            if (project.type === "dockerfile") {
+            if (project.type === core_1.PROJECT_TYPE_DOCKERFILE) {
                 project.imageName = `project-${project.name}:develop`;
                 if (rebuild) {
                     await this.dockerService.imageRm(project.imageName);
@@ -97,7 +101,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,6 +109,7 @@ let ProjectService = class ProjectService {
             if (rebuild) {
                 await this.appEventsService.emit("project:rebuild", project);
             }
+            await this.appEventsService.emit("project:beforeStart", project);
             const config = await this.appConfigService.getConfig();
             container = await this.dockerService.createContainer({
                 name: project.containerName,
@@ -116,7 +121,10 @@ let ProjectService = class ProjectService {
                 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 `${Path.join(this.appConfigService.pwd(), source)}:${destination}` + (options ? `:${options}` : "");
                 }),
                 ports: project.ports || []
             });
@@ -145,27 +153,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

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProxyService = void 0;
 const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
-const FS_1 = require("../makes/FS");
+const makes_1 = require("../makes");
 const AppConfigService_1 = require("./AppConfigService");
 const DockerService_1 = require("./DockerService");
 let ProxyService = class ProxyService {
@@ -23,35 +23,25 @@ let ProxyService = class ProxyService {
         this.imageName = "nginxproxy/nginx-proxy";
     }
     async init(project) {
-        const enable = await (0, utils_1.promptConfirm)({
-            message: "Enable local proxy?",
-            default: project.getMeta("WITH_PROXY", "false") === "true"
+        const appPort = await (0, utils_1.promptText)({
+            message: "App port:",
+            type: "number",
+            default: project.getEnv("VIRTUAL_PORT", "80")
         });
-        if (enable) {
-            const appPort = await (0, utils_1.promptText)({
-                message: "App port:",
-                type: "number",
-                default: project.getEnv("VIRTUAL_PORT", "80")
-            });
-            project.setEnv("VIRTUAL_PORT", appPort);
-            project.setMeta("WITH_PROXY", "true");
-        }
-        else {
-            project.setMeta("WITH_PROXY", "false");
-        }
+        project.setEnv("VIRTUAL_PORT", appPort);
         await project.save();
     }
     async start(restart) {
-        console.info("Proxy starting...");
         if (restart) {
             await this.stop();
         }
         let container = await this.dockerService.getContainer(this.containerName);
         if (!container) {
+            console.info("Proxy starting...");
             await this.dockerService.pullImage(this.imageName);
             const certsDir = this.appConfigService.dataPath("certs");
-            if (!FS_1.FS.existsSync(certsDir)) {
-                FS_1.FS.mkdirSync(certsDir, {
+            if (!makes_1.FS.existsSync(certsDir)) {
+                makes_1.FS.mkdirSync(certsDir, {
                     recursive: true,
                     mode: 0o700
                 });
@@ -77,8 +67,8 @@ let ProxyService = class ProxyService {
             });
             const { State: { Status } } = await container.inspect();
             if (["created", "exited"].includes(Status)) {
-                console.info("Starting...");
                 await container.start();
+                console.info("Started");
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.14",
+    "version": "1.0.16",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -25,7 +25,7 @@
         "lint": "eslint \"**/*.{js,jsx,ts,tsx}\""
     },
     "dependencies": {
-        "@wocker/core": "^1.0.12",
+        "@wocker/core": "1.0.16",
         "@wocker/utils": "^1.0.5",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
@@ -38,7 +38,8 @@
         "md5": "^2.3.0",
         "os": "^0.1.2",
         "path": "^0.12.7",
-        "readable-stream": "^4.1.0"
+        "readable-stream": "^4.1.0",
+        "unzipper": "^0.12.3"
     },
     "devDependencies": {
         "@types/dockerode": "3.3.23",
@@ -48,6 +49,7 @@
         "@types/mute-stream": "^0.0.1",
         "@types/node": "^20.11.16",
         "@types/readable-stream": "^2.3.15",
+        "@types/unzipper": "^0.10.10",
         "@typescript-eslint/eslint-plugin": "^6.5.0",
         "@typescript-eslint/parser": "^6.5.0",
         "eslint": "^8.48.0",

package/presets/bun/config.json

@@ -1,3 +1,4 @@
 {
+    "name": "bun",
     "dockerfile": "./Dockerfile"
 }

package/presets/go/config.json

@@ -1,4 +1,5 @@
 {
+    "name": "go",
     "dockerfile": "./Dockerfile",
     "DocumentRoot": "/usr/app",
     "volumes": [

package/presets/php-fpm/config.json

@@ -1,4 +1,5 @@
 {
+    "name": "php-fpm",
     "dockerfile": "./Dockerfile",
     "buildArgsOptions": {
         "PHP_VERSION": {

package/presets/shopify/config.json

@@ -1,4 +1,6 @@
 {
+    "name": "shopify",
+    "version": "1.0.0",
     "dockerfile": "./Dockerfile",
     "buildArgsOptions": {
         "PHP_VERSION": {

package/lib/plugins/PageKitePlugin.d.ts

@@ -1,30 +0,0 @@
-import { Project } from "@wocker/core";
-import { AppConfigService, AppEventsService, ProjectService, DockerService } from "../services";
-type InitOptions = {};
-type StartOptions = {
-    name?: string;
-    detach?: boolean;
-    restart?: boolean;
-    rebuild?: boolean;
-};
-type StopOptions = {
-    name?: string;
-};
-type BuildOptions = {
-    rebuild?: boolean;
-};
-export declare class PageKitePlugin {
-    protected readonly appConfigService: AppConfigService;
-    protected readonly appEventsService: AppEventsService;
-    protected readonly projectService: ProjectService;
-    protected readonly dockerService: DockerService;
-    constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService);
-    pluginPath(...parts: string[]): string;
-    onProjectStart(project: Project): Promise<void>;
-    onProjectStop(project: Project): Promise<void>;
-    init(options: InitOptions): Promise<void>;
-    start(options: StartOptions): Promise<void>;
-    stop(options: StopOptions): Promise<void>;
-    build(options?: BuildOptions): Promise<void>;
-}
-export {};