@wocker/ws 1.0.8 → 1.0.9

package/lib/services/ProjectService.js

@@ -44,15 +44,15 @@ let ProjectService = class ProjectService {
         this.dockerService = dockerService;
     }
     fromObject(data) {
+        const projectService = this;
         return new class extends core_1.Project {
-            constructor(projectService, data) {
+            constructor(data) {
                 super(data);
-                this.projectService = projectService;
             }
             async save() {
-                await this.projectService.save(this);
+                await projectService.save(this);
             }
-        }(this, data);
+        }(data);
     }
     async getById(id) {
         const data = await makes_1.FS.readJSON(this.appConfigService.dataPath("projects", id, "config.json"));
@@ -90,6 +90,7 @@ let ProjectService = class ProjectService {
             if (images.length === 0) {
                 await this.dockerService.buildImage({
                     tag: project.imageName,
+                    buildArgs: project.buildArgs,
                     context: this.appConfigService.getPWD(),
                     src: project.dockerfile
                 });
@@ -102,11 +103,12 @@ let ProjectService = class ProjectService {
             await this.dockerService.removeContainer(project.containerName);
         }
         if (!container) {
+            const config = await this.appConfigService.getConfig();
             container = await this.dockerService.createContainer({
                 name: project.containerName,
                 image: project.imageName,
                 env: {
-                    ...await this.appConfigService.getAllEnvVariables(),
+                    ...config.env || {},
                     ...project.env || {}
                 },
                 volumes: (project.volumes || []).map((volume) => {
@@ -143,27 +145,29 @@ let ProjectService = class ProjectService {
             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
             });
         }
-        await this.appConfigService.setProjectConfig(project.id, project.path);
+        config.setProject(project.id, project.path);
         await makes_1.FS.writeJSON(configPath, project);
+        await config.save();
     }
     async search(params = {}) {
         const { id, name, path } = params;
-        const { projects: configs } = await this.appConfigService.getAppConfig();
+        const config = await this.appConfigService.getConfig();
         const projects = [];
-        for (const config of configs) {
-            if (id && config.id !== id) {
+        for (const projectConfig of config.projects) {
+            if (id && projectConfig.id !== id) {
                 continue;
             }
-            if (path && config.src !== path) {
+            if (path && projectConfig.src !== path) {
                 continue;
             }
-            const project = await this.getById(config.id);
+            const project = await this.getById(projectConfig.id);
             if (name && project.name !== name) {
                 continue;
             }

package/lib/utils/exec.d.ts

@@ -1,2 +1,5 @@
-declare const exec: (command: string) => Promise<unknown>;
+/// <reference types="node" />
+import { ExecOptions } from "child_process";
+type Options = Omit<ExecOptions, "maxBuffer">;
+declare const exec: (command: string, options?: Options) => Promise<string>;
 export { exec };

package/lib/utils/exec.js

@@ -1,41 +1,26 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exec = void 0;
 const child_process_1 = require("child_process");
-const chalk_1 = __importDefault(require("chalk"));
-const makes_1 = require("../makes");
-const exec = async (command) => {
-    makes_1.Logger.info(` > ${command.trim().replace(/\s+/g, " ")}`);
+const exec = async (command, options) => {
+    const worker = (0, child_process_1.exec)(command, {
+        ...options || {},
+        maxBuffer: Infinity
+    });
     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) => {
-            makes_1.Logger.info("close", chalk_1.default.red(code));
+        let data = "";
+        worker.stdout.on("data", (chunk) => {
+            data += chunk.toString();
         });
         worker.on("exit", (code) => {
-            makes_1.Logger.info("exit", chalk_1.default.red(code));
+            if (code !== 0) {
+                reject(new Error(`Process exited with code ${code}`));
+                return;
+            }
+            resolve(data.replace(/\n$/, ""));
+        });
+        worker.on("error", (err) => {
+            reject(err);
         });
     });
 };

package/lib/utils/followProgress.js

@@ -8,51 +8,6 @@ const followProgress = async (stream) => {
     const lineStream = new LineConvertStream_1.LineConvertStream(stream);
     let line = 0;
     const mapLines = {};
-    lineStream.on("data", (chunk) => {
-        const data = JSON.parse(chunk.toString());
-        const { stream, id, status, progressDetail: { current, total } = {}, aux } = data;
-        if (stream) {
-            process.stdout.write(`${stream}`);
-            line += stream.split("\n").length - 1;
-        }
-        else if (id) {
-            if (typeof mapLines[id] === "undefined") {
-                mapLines[id] = line;
-            }
-            const targetLine = typeof mapLines[id] !== "undefined" ? mapLines[id] : line;
-            const dy = line - targetLine;
-            if (dy > 0) {
-                process.stdout.write("\x1b[s");
-                process.stdout.write(`\x1b[${dy}A`);
-            }
-            process.stdout.write("\x1b[2K");
-            let str = `${id}: ${status}\n`;
-            if (status === "Downloading") {
-                const width = process.stdout.columns;
-                const sizeWidth = 19, totalWidth = width - id.length - status.length - sizeWidth - 7, currentWidth = Math.floor(totalWidth * (current / total)), formatSize = `${(0, format_size_units_1.formatSizeUnits)(current)}/${(0, format_size_units_1.formatSizeUnits)(total)}`;
-                str = `${id}: ${status} [${"█".repeat(currentWidth)}${"░".repeat(totalWidth - currentWidth)}] ${formatSize}\n`;
-            }
-            process.stdout.write(str);
-            if (dy > 0) {
-                process.stdout.write("\x1b[u");
-            }
-            else {
-                line++;
-            }
-        }
-        else if (status) {
-            process.stdout.write(`${status}\n`);
-            line += Math.ceil(status.length / process.stdout.columns);
-        }
-        else if (aux) {
-            const str = `auxID: ${aux.ID}`;
-            process.stdout.write(`${str}\n`);
-            line += Math.ceil(str.length / process.stdout.columns);
-        }
-        else {
-            makes_1.Logger.warn("followProgress: unexpected data", data);
-        }
-    });
     return new Promise((resolve, reject) => {
         let isEnded = false;
         const handleEnd = () => {
@@ -61,6 +16,55 @@ const followProgress = async (stream) => {
             }
             isEnded = true;
         };
+        lineStream.on("data", (chunk) => {
+            const data = JSON.parse(chunk.toString());
+            const { stream, id, status, progressDetail: { current, total } = {}, aux, error, errorDetail } = data;
+            if (stream) {
+                process.stdout.write(`${stream}`);
+                line += stream.split("\n").length - 1;
+            }
+            else if (id) {
+                if (typeof mapLines[id] === "undefined") {
+                    mapLines[id] = line;
+                }
+                const targetLine = typeof mapLines[id] !== "undefined" ? mapLines[id] : line;
+                const dy = line - targetLine;
+                if (dy > 0) {
+                    process.stdout.write("\x1b[s");
+                    process.stdout.write(`\x1b[${dy}A`);
+                }
+                process.stdout.write("\x1b[2K");
+                let str = `${id}: ${status}\n`;
+                if (status === "Downloading") {
+                    const width = process.stdout.columns;
+                    const sizeWidth = 19, totalWidth = width - id.length - status.length - sizeWidth - 7, currentWidth = Math.floor(totalWidth * (current / total)), formatSize = `${(0, format_size_units_1.formatSizeUnits)(current)}/${(0, format_size_units_1.formatSizeUnits)(total)}`;
+                    str = `${id}: ${status} [${"█".repeat(currentWidth)}${"░".repeat(totalWidth - currentWidth)}] ${formatSize}\n`;
+                }
+                process.stdout.write(str);
+                if (dy > 0) {
+                    process.stdout.write("\x1b[u");
+                }
+                else {
+                    line++;
+                }
+            }
+            else if (status) {
+                process.stdout.write(`${status}\n`);
+                line += Math.ceil(status.length / process.stdout.columns);
+            }
+            else if (aux) {
+                const str = `auxID: ${aux.ID}`;
+                process.stdout.write(`${str}\n`);
+                line += Math.ceil(str.length / process.stdout.columns);
+            }
+            else if (error) {
+                reject(new Error(error));
+            }
+            else {
+                makes_1.Logger.warn("followProgress: unexpected data", data);
+                reject(new Error(`(followProgress) unexpected data: ${JSON.stringify(data)}`));
+            }
+        });
         lineStream.on("end", handleEnd);
         lineStream.on("close", handleEnd);
         lineStream.on("error", reject);

package/lib/utils/index.d.ts

@@ -1,16 +1,10 @@
-export * from "./buildOptions";
 export * from "./escapeRegExp";
 export * from "./exec";
-export * from "./fetch";
 export * from "./followProgress";
 export * from "./format-size-units";
-export * from "./get-config";
 export * from "./get-cursor-position";
-export * from "./image-build";
 export * from "./injectVariables";
 export * from "./parse-table";
-export * from "./set-config";
 export * from "./spawn";
-export * from "./tty";
 export * from "./volumeFormat";
 export * from "./volumeParse";

package/lib/utils/index.js

@@ -14,19 +14,13 @@ 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("./buildOptions"), exports);
 __exportStar(require("./escapeRegExp"), exports);
 __exportStar(require("./exec"), exports);
-__exportStar(require("./fetch"), exports);
 __exportStar(require("./followProgress"), exports);
 __exportStar(require("./format-size-units"), exports);
-__exportStar(require("./get-config"), exports);
 __exportStar(require("./get-cursor-position"), exports);
-__exportStar(require("./image-build"), exports);
 __exportStar(require("./injectVariables"), exports);
 __exportStar(require("./parse-table"), exports);
-__exportStar(require("./set-config"), exports);
 __exportStar(require("./spawn"), exports);
-__exportStar(require("./tty"), exports);
 __exportStar(require("./volumeFormat"), exports);
 __exportStar(require("./volumeParse"), exports);

package/lib/utils/spawn.d.ts

@@ -1,2 +1,2 @@
-declare const spawn: (command: any) => Promise<void>;
+declare const spawn: (command: string, args: string[]) => Promise<void>;
 export { spawn };

package/lib/utils/spawn.js

@@ -2,20 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.spawn = void 0;
 const child_process_1 = require("child_process");
-const spawn = async (command) => {
-    return new Promise((resolve) => {
-        let [prog, ...options] = command.split(/\s+/);
-        let worker = (0, child_process_1.spawn)(prog, options);
-        worker.stdout.on("data", (data) => {
-            console.log(`stdout: ${data}`);
-        });
-        worker.stderr.on("data", (data) => {
-            console.error(`stderr: ${data}`);
-        });
-        worker.on("close", (code) => {
-            console.log(`child process exited with code ${code}`);
+const spawn = async (command, args) => {
+    const abortController = new AbortController();
+    const child = (0, child_process_1.spawn)(command, args, {
+        signal: abortController.signal,
+        stdio: "inherit"
+    });
+    await new Promise((resolve, reject) => {
+        let withError = false;
+        child.on("close", (code) => {
+            if (withError) {
+                return;
+            }
+            if (code !== 0) {
+                reject(new Error(`Process exited with code ${code}`));
+                return;
+            }
             resolve(undefined);
         });
+        child.on("error", (err) => {
+            withError = true;
+            reject(err);
+        });
     });
 };
 exports.spawn = spawn;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -26,7 +26,7 @@
     },
     "dependencies": {
         "@kearisp/cli": "^1.0.7",
-        "@wocker/core": "^1.0.8",
+        "@wocker/core": "^1.0.9",
         "@wocker/utils": "^1.0.3",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
@@ -36,7 +36,6 @@
         "date-fns": "^2.29.3",
         "dockerode": "^4.0.2",
         "fs": "^0.0.1-security",
-        "inquirer": "^7.0.0",
         "md5": "^2.3.0",
         "os": "^0.1.2",
         "path": "^0.12.7",
@@ -45,7 +44,6 @@
     },
     "devDependencies": {
         "@types/dockerode": "3.3.23",
-        "@types/inquirer": "^7.0.0",
         "@types/jest": "^29.5.12",
         "@types/lodash": "^4.14.161",
         "@types/md5": "^2.3.2",
@@ -58,6 +56,6 @@
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",
         "eslint-webpack-plugin": "^3.1.0",
-        "typescript": "^5.4.2"
+        "typescript": "^5.4.4"
     }
 }

package/presets/php-apache/Dockerfile

@@ -131,7 +131,7 @@ ARG XDEBUG_ENABLE=false
 RUN if [ "$XDEBUG_ENABLE" = "true" ]; then \
         pecl install xdebug && \
         docker-php-ext-enable xdebug; \
-    fi \
+    fi
 
 # Gettext
 ARG GETTEXT_ENABLE=false

package/presets/php-apache/config.json

@@ -37,7 +37,8 @@
         },
         "COMPOSER_ENABLE": {
             "message": "Install composer?",
-            "type": "boolean"
+            "type": "boolean",
+            "default": false
         },
         "NODE_VERSION": {
             "type": "select",

package/lib/App.d.ts

@@ -1,11 +0,0 @@
-import { Cli } from "@kearisp/cli";
-import { AppConfigService } from "./services";
-export declare class App {
-    protected cli: Cli;
-    protected appConfigService: AppConfigService;
-    constructor();
-    install(): void;
-    use(Constructor: any): void;
-    setDebug(status: string): Promise<string>;
-    run(): Promise<string>;
-}

package/lib/App.js

@@ -1,81 +0,0 @@
-"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 __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.App = void 0;
-const Path = __importStar(require("path"));
-const env_1 = require("./env");
-const utils_1 = require("./utils");
-const makes_1 = require("./makes");
-class App {
-    constructor() { }
-    install() {
-        this.cli.command("completion script")
-            .help(false)
-            .action(() => this.cli.completionScript());
-        this.cli.command("log [...items]")
-            .action((options, items) => {
-            makes_1.Logger.log(...items);
-            return "";
-        });
-        this.cli.command("debug <status>")
-            .completion("status", () => ["on", "off"])
-            .action(async (options, status) => this.setDebug(status));
-    }
-    use(Constructor) {
-    }
-    async setDebug(status) {
-        makes_1.Logger.info(`Set debug ${status}`);
-        await (0, utils_1.setConfig)({
-            debug: status === "on"
-        });
-        return "";
-    }
-    async run() {
-        const mapDir = Path.dirname(env_1.MAP_PATH);
-        if (!makes_1.FS.existsSync(mapDir)) {
-            await makes_1.FS.mkdir(mapDir);
-        }
-        if (!makes_1.FS.existsSync(env_1.MAP_PATH)) {
-            await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-                projects: []
-            });
-        }
-        if (!makes_1.FS.existsSync(`${env_1.DATA_DIR}/projects`)) {
-            await makes_1.FS.mkdir(`${env_1.DATA_DIR}/projects`);
-        }
-        const { plugins = [] } = await this.appConfigService.getAppConfig();
-        for (const plugin of plugins) {
-            try {
-                const { default: Plugin } = await Promise.resolve(`${plugin}`).then(s => __importStar(require(s)));
-                this.use(Plugin);
-            }
-            catch (err) {
-                makes_1.Logger.error(err.message);
-            }
-        }
-        return this.cli.run(process.argv);
-    }
-}
-exports.App = App;

package/lib/index.d.ts

@@ -1,5 +0,0 @@
-import { App } from "./App";
-declare const app: App;
-export { app };
-export * from "./makes";
-export * from "./services";

package/lib/index.js

@@ -1,22 +0,0 @@
-"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 });
-exports.app = void 0;
-const App_1 = require("./App");
-const app = new App_1.App();
-exports.app = app;
-__exportStar(require("./makes"), exports);
-__exportStar(require("./services"), exports);

package/lib/utils/buildOptions.d.ts

@@ -1 +0,0 @@
-export declare const buildOptions: (name: string, options: any) => string;

package/lib/utils/buildOptions.js

@@ -1,9 +0,0 @@
-"use strict";
-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(" ");
-};
-exports.buildOptions = buildOptions;

package/lib/utils/fetch.d.ts

@@ -1,5 +0,0 @@
-type Options = {
-    method?: "GET" | "POST";
-};
-export declare const fetch: (url: string, options?: Options) => Promise<unknown>;
-export {};

package/lib/utils/fetch.js

@@ -1,52 +0,0 @@
-"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 __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;
-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);
-            });
-        });
-        req.on("error", reject);
-        req.end();
-    });
-};
-exports.fetch = fetch;

package/lib/utils/get-config.d.ts

@@ -1,2 +0,0 @@
-import { AppConfig } from "@wocker/core";
-export declare const getConfig: () => Promise<AppConfig>;

package/lib/utils/get-config.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfig = void 0;
-const env_1 = require("../env");
-const FS_1 = require("../makes/FS");
-const getConfig = async () => {
-    return FS_1.FS.readJSON(env_1.MAP_PATH).catch((err) => {
-        if (err.code === "ENOENT") {
-            return Promise.resolve({
-                env: {},
-                projects: []
-            });
-        }
-        throw err;
-    });
-};
-exports.getConfig = getConfig;

package/lib/utils/image-build.d.ts

@@ -1,13 +0,0 @@
-type Options = {
-    tag: string;
-    buildArgs?: {
-        [key: string]: string;
-    };
-    labels?: {
-        [key: string]: string;
-    };
-    context: string;
-    src: string;
-};
-export declare const imageBuild: (options: Options) => Promise<void>;
-export {};