@wocker/ws 1.0.22 → 1.0.24

package/lib/{services → modules/proxy/services}/ProxyService.js

@@ -46,13 +46,13 @@ exports.ProxyService = void 0;
 const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const Path = __importStar(require("path"));
-const env_1 = require("../env");
-const AppConfigService_1 = require("./AppConfigService");
-const DockerService_1 = require("./DockerService");
+const env_1 = require("../../../env");
+const docker_1 = require("../../docker");
 let ProxyService = class ProxyService extends core_1.ProxyService {
-    constructor(appConfigService, dockerService) {
+    constructor(appConfigService, fs, dockerService) {
         super();
         this.appConfigService = appConfigService;
+        this.fs = fs;
         this.dockerService = dockerService;
         this.containerName = "proxy.workspace";
         this.imageName = "wocker-proxy:1.0.1";
@@ -67,7 +67,7 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
             default: parseInt(project.getEnv("VIRTUAL_PORT", "80"))
         });
         project.setEnv("VIRTUAL_PORT", appPort.toString());
-        await project.save();
+        project.save();
     }
     async start(restart, rebuild) {
         if (restart || rebuild) {
@@ -77,22 +77,28 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
         if (!container) {
             console.info("Proxy starting...");
             await this.build(rebuild);
-            if (!this.appConfigService.fs.exists("certs/ca")) {
-                this.appConfigService.fs.mkdir("certs/ca", {
+            const fs = this.fs;
+            if (!this.fs.exists("certs/ca")) {
+                this.fs.mkdir("certs/ca", {
                     recursive: true,
                     mode: 0o700
                 });
             }
-            if (!this.appConfigService.fs.exists("certs/projects")) {
-                this.appConfigService.fs.mkdir("certs/projects", {
+            if (!this.fs.exists("certs/projects")) {
+                this.fs.mkdir("certs/projects", {
                     recursive: true,
                     mode: 0o700
                 });
             }
-            const config = this.appConfigService.config;
-            const httpPort = config.getMeta("PROXY_HTTP_PORT", "80");
-            const httpsPort = config.getMeta("PROXY_HTTPS_PORT", "443");
-            const sshPort = config.getMeta("PROXY_SSH_PORT", "22");
+            if (!fs.exists("nginx/vhost.d")) {
+                fs.mkdir("nginx/vhost.d", {
+                    recursive: true,
+                    mode: 0o700
+                });
+            }
+            const httpPort = this.appConfigService.getMeta("PROXY_HTTP_PORT", "80");
+            const httpsPort = this.appConfigService.getMeta("PROXY_HTTPS_PORT", "443");
+            const sshPort = this.appConfigService.getMeta("PROXY_SSH_PORT", "22");
             container = await this.dockerService.createContainer({
                 name: this.containerName,
                 image: this.imageName,
@@ -104,14 +110,15 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
                 ports: [
                     `${httpPort}:80`,
                     `${httpsPort}:443`,
-                    ...config.getMeta("PROXY_SSH_PASSWORD") ? [
+                    ...this.appConfigService.getMeta("PROXY_SSH_PASSWORD") ? [
                         `${sshPort}:22`
                     ] : []
                 ],
                 volumes: [
                     "/var/run/docker.sock:/tmp/docker.sock:ro",
-                    `${this.appConfigService.fs.path("certs/projects")}:/etc/nginx/certs`,
-                    `${this.appConfigService.fs.path("certs/ca")}:/etc/nginx/ca-certs`
+                    `${fs.path("certs/projects")}:/etc/nginx/certs`,
+                    `${fs.path("certs/ca")}:/etc/nginx/ca-certs`,
+                    `${fs.path("nginx/vhost.d")}:/etc/nginx/vhost.d`
                 ],
                 network: "workspace"
             });
@@ -137,13 +144,12 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
         for (const oldImage of this.oldImages) {
             await this.dockerService.imageRm(oldImage);
         }
-        const config = this.appConfigService.config;
         await this.dockerService.buildImage({
             tag: this.imageName,
             context: Path.join(env_1.PLUGINS_DIR, "proxy"),
             src: "./Dockerfile",
             buildArgs: {
-                SSH_PASSWORD: config.getMeta("PROXY_SSH_PASSWORD")
+                SSH_PASSWORD: this.appConfigService.getMeta("PROXY_SSH_PASSWORD")
             }
         });
     }
@@ -154,6 +160,7 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
 exports.ProxyService = ProxyService;
 exports.ProxyService = ProxyService = __decorate([
     (0, core_1.Injectable)("PROXY_SERVICE"),
-    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
-        DockerService_1.DockerService])
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.AppFileSystemService,
+        docker_1.DockerService])
 ], ProxyService);

package/lib/services/PluginService.d.ts

@@ -1,6 +1,4 @@
-import { Cli } from "@wocker/core";
-import { AppConfigService } from "./AppConfigService";
-import { LogService } from "./LogService";
+import { Cli, AppConfigService, LogService } from "@wocker/core";
 import { NpmService } from "./NpmService";
 import { Plugin } from "../makes";
 export declare class PluginService {

package/lib/services/PluginService.js

@@ -49,8 +49,6 @@ exports.PluginService = void 0;
 const core_1 = require("@wocker/core");
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
-const AppConfigService_1 = require("./AppConfigService");
-const LogService_1 = require("./LogService");
 const NpmService_1 = require("./NpmService");
 const makes_1 = require("../makes");
 const utils_1 = require("../utils");
@@ -62,15 +60,14 @@ let PluginService = class PluginService {
         this.cli = cli;
     }
     getPluginsTable() {
-        const config = this.appConfigService.config;
         const table = new cli_table3_1.default({
             head: ["Name", "Env"],
             colWidths: [30]
         });
-        if (config.plugins.length === 0) {
+        if (this.appConfigService.plugins.length === 0) {
             return yoctocolors_cjs_1.default.gray("No plugins installed");
         }
-        for (const plugin of config.plugins) {
+        for (const plugin of this.appConfigService.plugins) {
             table.push([plugin.name, plugin.env]);
         }
         return table.toString();
@@ -90,11 +87,10 @@ let PluginService = class PluginService {
     async install(pluginName, beta) {
         const [, prefix = "@wocker/", name, suffix = "-plugin"] = /^(@wocker\/)?(\w+)(-plugin)?$/.exec(pluginName) || [];
         const fullName = `${prefix}${name}${suffix}`;
-        const config = this.appConfigService.config;
         try {
             if (await this.checkPlugin(fullName)) {
-                config.addPlugin(fullName);
-                await config.save();
+                this.appConfigService.addPlugin(fullName);
+                this.appConfigService.save();
                 console.info(`Plugin ${fullName} activated`);
                 return;
             }
@@ -102,8 +98,8 @@ let PluginService = class PluginService {
             const env = packageInfo["dist-tags"].beta && beta ? "beta" : "latest";
             await this.npmService.install(fullName, env);
             if (await this.checkPlugin(fullName)) {
-                config.addPlugin(fullName, env);
-                await config.save();
+                this.appConfigService.addPlugin(fullName, env);
+                this.appConfigService.save();
                 console.info(`Plugin ${fullName}@${env} activated`);
                 return;
             }
@@ -115,9 +111,8 @@ let PluginService = class PluginService {
     async uninstall(pluginName) {
         const [, prefix = "@wocker/", name, suffix = "-plugin"] = /^(@wocker\/)?(\w+)(-plugin)?$/.exec(pluginName) || [];
         const fullName = `${prefix}${name}${suffix}`;
-        const config = this.appConfigService.config;
-        config.removePlugin(fullName);
-        await config.save();
+        this.appConfigService.removePlugin(fullName);
+        this.appConfigService.save();
         console.info(`Plugin ${fullName} deactivated`);
     }
     async import(name) {
@@ -125,11 +120,10 @@ let PluginService = class PluginService {
         return new makes_1.Plugin(type);
     }
     async update() {
-        const config = this.appConfigService.config;
-        if (!config.plugins) {
+        if (this.appConfigService.plugins.length === 0) {
             return;
         }
-        for (const plugin of config.plugins) {
+        for (const plugin of this.appConfigService.plugins) {
             console.info(`Checking ${plugin.name}...`);
             try {
                 const current = await this.getCurrentVersion(plugin.name);
@@ -165,8 +159,8 @@ let PluginService = class PluginService {
 exports.PluginService = PluginService;
 exports.PluginService = PluginService = __decorate([
     (0, core_1.Injectable)(),
-    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppConfigService,
         NpmService_1.NpmService,
-        LogService_1.LogService,
+        core_1.LogService,
         core_1.Cli])
 ], PluginService);

package/lib/utils/followProgress2.d.ts

@@ -0,0 +1 @@
+export declare const followProgress2: (stream: NodeJS.ReadableStream) => Promise<void>;

package/lib/utils/followProgress2.js

@@ -0,0 +1,63 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.followProgress2 = void 0;
+const protobufjs_1 = __importDefault(require("protobufjs"));
+const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
+const env_1 = require("../env");
+const followProgress2 = async (stream) => {
+    const root = await protobufjs_1.default.load([
+        `${env_1.ROOT_DIR}/proto/solver/pb/ops.proto`,
+        `${env_1.ROOT_DIR}/proto/buildkit.proto`
+    ]);
+    const StatusResponse = root.lookupType("moby.buildkit.v1.StatusResponse");
+    return new Promise((resolve, reject) => {
+        let isEnded = false;
+        let success = 0, error = 0;
+        const handleEnd = () => {
+            if (!isEnded) {
+                isEnded = true;
+                console.log(`success: ${success} errors: ${error}`);
+                resolve();
+                return;
+            }
+        };
+        stream.on("data", (data) => {
+            const content = data.toString().replace(/}\s*\{/g, '},{'), items = JSON.parse(`[${content}]`);
+            for (const item of items) {
+                switch (item.id) {
+                    case "moby.buildkit.trace": {
+                        if (!item.aux) {
+                            break;
+                        }
+                        let buffer = Buffer.from(item.aux, "base64");
+                        try {
+                            const decoded = StatusResponse.decode(buffer);
+                            const obj = StatusResponse.toObject(decoded, {
+                                enums: String,
+                                longs: String,
+                                bytes: String,
+                                defaults: true,
+                            });
+                            console.dir(obj, { depth: null });
+                            success++;
+                        }
+                        catch (err) {
+                            error++;
+                            console.error(yoctocolors_cjs_1.default.red(`Error: ${err.message}`));
+                        }
+                        break;
+                    }
+                    default:
+                        break;
+                }
+            }
+        });
+        stream.on("end", handleEnd);
+        stream.on("close", handleEnd);
+        stream.on("error", reject);
+    });
+};
+exports.followProgress2 = followProgress2;

package/lib/utils/index.d.ts

@@ -1,7 +1,6 @@
 export * from "./escapeRegExp";
 export * from "./exec";
-export * from "./followProgress";
-export * from "./format-size-units";
+export * from "./followProgress2";
 export * from "./get-cursor-position";
 export * from "./injectVariables";
 export * from "./parse-table";

package/lib/utils/index.js

@@ -16,8 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./escapeRegExp"), exports);
 __exportStar(require("./exec"), exports);
-__exportStar(require("./followProgress"), exports);
-__exportStar(require("./format-size-units"), exports);
+__exportStar(require("./followProgress2"), exports);
 __exportStar(require("./get-cursor-position"), exports);
 __exportStar(require("./injectVariables"), exports);
 __exportStar(require("./parse-table"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.22",
+    "version": "1.0.24",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -33,20 +33,19 @@
         "make-coverage-badge": "make-coverage-badge"
     },
     "dependencies": {
-        "@wocker/core": "1.0.22",
-        "@wocker/utils": "^2.0.0",
+        "@wocker/core": "1.0.24",
+        "@wocker/utils": "^2.0.3",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
         "child_process": "^1.0.2",
         "cli-table3": "^0.6.2",
-        "date-fns": "^2.29.3",
         "dockerode": "^4.0.2",
         "fs": "^0.0.1-security",
         "keytar": "^7.9.0",
         "md5": "^2.3.0",
         "os": "^0.1.2",
         "path": "^0.12.7",
-        "readable-stream": "^4.1.0",
+        "protobufjs": "^7.5.1",
         "unzipper": "^0.12.3",
         "yoctocolors-cjs": "^2.1.2"
     },
@@ -56,14 +55,14 @@
         "@types/md5": "^2.3.2",
         "@types/mute-stream": "^0.0.4",
         "@types/node": "^22.14.1",
-        "@types/readable-stream": "^2.3.15",
         "@types/unzipper": "^0.10.10",
-        "@wocker/testing": "^1.0.0",
+        "@wocker/testing": "1.0.2",
         "jest": "^29.7.0",
         "make-coverage-badge": "^1.2.0",
         "memfs": "^4.17.0",
         "ts-jest": "^29.3.2",
         "ts-node": "^10.9.2",
-        "typescript": "^5.6.3"
+        "typescript": "^5.6.3",
+        "unionfs": "^4.5.4"
     }
 }

package/proto/buildkit.proto

@@ -0,0 +1,55 @@
+syntax = "proto3";
+
+import "google/protobuf/timestamp.proto";
+
+package moby.buildkit.v1;
+
+message StatusResponse {
+    repeated Vertex vertexes = 1;
+    repeated VertexStatus statuses = 2;
+    repeated VertexLog logs = 3;
+    repeated VertexWarning warnings = 4;
+}
+
+message Vertex {
+    string digest = 1;
+    repeated string inputs = 2;
+    string name = 3;
+    bool cached = 4;
+
+    google.protobuf.Timestamp started = 5;
+    google.protobuf.Timestamp completed = 6;
+    string error = 7; // typed errors?
+    ProgressGroup progressGroup = 8;
+}
+
+message VertexStatus {
+    string ID = 1;
+    string vertex = 2;
+    string name = 3;
+    int64 current = 4;
+    int64 total = 5;
+}
+
+message ProgressGroup {
+    string id = 1;
+    string name = 2;
+    bool weak = 3;
+}
+
+message VertexLog {
+    string vertex = 1;
+    google.protobuf.Timestamp timestamp = 2;
+    int64 stream = 3;
+    bytes msg = 4;
+}
+
+message VertexWarning {
+    string vertex = 1;
+    int64 level = 2;
+    bytes short = 3;
+    repeated bytes detail = 4;
+    string url = 5;
+    pb.SourceInfo info = 6;
+    repeated pb.Range ranges = 7;
+}