@wocker/ws 1.0.22 → 1.0.23

package/lib/modules/keystore/index.js

@@ -0,0 +1,29 @@
+"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.KeystoreService = exports.KeystoreModule = void 0;
+const core_1 = require("@wocker/core");
+const KeystoreController_1 = require("./controllers/KeystoreController");
+const KeystoreService_1 = require("./services/KeystoreService");
+Object.defineProperty(exports, "KeystoreService", { enumerable: true, get: function () { return KeystoreService_1.KeystoreService; } });
+let KeystoreModule = class KeystoreModule {
+};
+exports.KeystoreModule = KeystoreModule;
+exports.KeystoreModule = KeystoreModule = __decorate([
+    (0, core_1.Module)({
+        controllers: [
+            KeystoreController_1.KeystoreController
+        ],
+        providers: [
+            KeystoreService_1.KeystoreService
+        ],
+        exports: [
+            KeystoreService_1.KeystoreService
+        ]
+    })
+], KeystoreModule);

package/lib/{keystore → modules/keystore}/providers/FileKeystoreProvider.d.ts

@@ -1,5 +1,5 @@
 import { KeystoreProvider } from "@wocker/core";
-import { AppConfigService } from "../../services/AppConfigService";
+import { AppConfigService } from "../../../services/AppConfigService";
 import { FileKeystore } from "../types/FileKeystore";
 export declare class FileKeystoreProvider extends KeystoreProvider {
     protected readonly appConfigService: AppConfigService;

package/lib/{keystore → modules/keystore}/providers/FileKeystoreProvider.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileKeystoreProvider = void 0;
 const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
-const AppConfigService_1 = require("../../services/AppConfigService");
+const AppConfigService_1 = require("../../../services/AppConfigService");
 const FileKeystore_1 = require("../types/FileKeystore");
 const utils_2 = require("../utils");
 let FileKeystoreProvider = class FileKeystoreProvider extends core_1.KeystoreProvider {

package/lib/{keystore → modules/keystore}/providers/KeytarKeystoreProvider.js

@@ -41,7 +41,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeytarKeystoreProvider = void 0;
 const core_1 = require("@wocker/core");
-const env_1 = require("../../env");
+const env_1 = require("../../../env");
 let KeytarKeystoreProvider = class KeytarKeystoreProvider extends core_1.KeystoreProvider {
     async get(key, defaultValue) {
         const keytar = await this.getKeytar();

package/lib/{keystore → modules/keystore/services}/KeystoreService.d.ts

@@ -1,5 +1,5 @@
 import { KeystoreService as CoreKeystoreService, KeystoreProvider } from "@wocker/core";
-import { AppConfigService } from "../services/AppConfigService";
+import { AppConfigService } from "../../../services/AppConfigService";
 export declare class KeystoreService extends CoreKeystoreService {
     protected readonly appConfigService: AppConfigService;
     protected providers: Map<string, KeystoreProvider>;

package/lib/{keystore → modules/keystore/services}/KeystoreService.js

@@ -11,9 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeystoreService = void 0;
 const core_1 = require("@wocker/core");
-const AppConfigService_1 = require("../services/AppConfigService");
-const KeytarKeystoreProvider_1 = require("./providers/KeytarKeystoreProvider");
-const FileKeystoreProvider_1 = require("./providers/FileKeystoreProvider");
+const AppConfigService_1 = require("../../../services/AppConfigService");
+const KeytarKeystoreProvider_1 = require("./../providers/KeytarKeystoreProvider");
+const FileKeystoreProvider_1 = require("./../providers/FileKeystoreProvider");
 let KeystoreService = class KeystoreService extends core_1.KeystoreService {
     constructor(appConfigService) {
         super();

package/lib/{controllers → modules/proxy/controllers}/CertController.d.ts

@@ -1,4 +1,5 @@
-import { ProjectService, CertService } from "../services";
+import { CertService } from "../services/CertService";
+import { ProjectService } from "../../../services/ProjectService";
 export declare class CertController {
     protected readonly projectService: ProjectService;
     protected readonly certService: CertService;

package/lib/{controllers → modules/proxy/controllers}/CertController.js

@@ -14,7 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CertController = void 0;
 const core_1 = require("@wocker/core");
-const services_1 = require("../services");
+const CertService_1 = require("../services/CertService");
+const ProjectService_1 = require("../../../services/ProjectService");
 let CertController = class CertController {
     constructor(projectService, certService) {
         this.projectService = projectService;
@@ -108,6 +109,6 @@ __decorate([
 ], CertController.prototype, "existsOtherNames", null);
 exports.CertController = CertController = __decorate([
     (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [services_1.ProjectService,
-        services_1.CertService])
+    __metadata("design:paramtypes", [ProjectService_1.ProjectService,
+        CertService_1.CertService])
 ], CertController);

package/lib/{controllers → modules/proxy/controllers}/ProxyController.d.ts

@@ -1,5 +1,8 @@
 import { Project } from "@wocker/core";
-import { AppConfigService, AppEventsService, ProjectService, ProxyService } from "../services";
+import { AppConfigService } from "../../../services/AppConfigService";
+import { AppEventsService } from "../../../services/AppEventsService";
+import { ProjectService } from "../../../services/ProjectService";
+import { ProxyService } from "../services/ProxyService";
 export declare class ProxyController {
     protected readonly appConfigService: AppConfigService;
     protected readonly appEventsService: AppEventsService;

package/lib/{controllers → modules/proxy/controllers}/ProxyController.js

@@ -19,7 +19,10 @@ exports.ProxyController = void 0;
 const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
-const services_1 = require("../services");
+const AppConfigService_1 = require("../../../services/AppConfigService");
+const AppEventsService_1 = require("../../../services/AppEventsService");
+const ProjectService_1 = require("../../../services/ProjectService");
+const ProxyService_1 = require("../services/ProxyService");
 let ProxyController = class ProxyController {
     constructor(appConfigService, appEventsService, projectService, proxyService) {
         this.appConfigService = appConfigService;
@@ -96,7 +99,7 @@ let ProxyController = class ProxyController {
             config.unsetMeta("PROXY_SSH_PASSWORD");
             config.unsetMeta("PROXY_SSH_PORT");
         }
-        await config.save();
+        this.appConfigService.save();
     }
     async start(restart, rebuild) {
         await this.proxyService.start(restart, rebuild);
@@ -173,8 +176,8 @@ __decorate([
 exports.ProxyController = ProxyController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Proxy commands"),
-    __metadata("design:paramtypes", [services_1.AppConfigService,
-        services_1.AppEventsService,
-        services_1.ProjectService,
-        services_1.ProxyService])
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+        AppEventsService_1.AppEventsService,
+        ProjectService_1.ProjectService,
+        ProxyService_1.ProxyService])
 ], ProxyController);

package/lib/modules/proxy/index.d.ts

@@ -0,0 +1,5 @@
+import { CertService } from "./services/CertService";
+import { ProxyService } from "./services/ProxyService";
+export declare class ProxyModule {
+}
+export { ProxyService, CertService };

package/lib/modules/proxy/index.js

@@ -0,0 +1,39 @@
+"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.CertService = exports.ProxyService = exports.ProxyModule = void 0;
+const core_1 = require("@wocker/core");
+const docker_1 = require("../docker");
+const CertController_1 = require("./controllers/CertController");
+const ProxyController_1 = require("./controllers/ProxyController");
+const CertService_1 = require("./services/CertService");
+Object.defineProperty(exports, "CertService", { enumerable: true, get: function () { return CertService_1.CertService; } });
+const ProxyService_1 = require("./services/ProxyService");
+Object.defineProperty(exports, "ProxyService", { enumerable: true, get: function () { return ProxyService_1.ProxyService; } });
+let ProxyModule = class ProxyModule {
+};
+exports.ProxyModule = ProxyModule;
+exports.ProxyModule = ProxyModule = __decorate([
+    (0, core_1.Module)({
+        imports: [
+            docker_1.DockerModule
+        ],
+        controllers: [
+            CertController_1.CertController,
+            ProxyController_1.ProxyController
+        ],
+        providers: [
+            ProxyService_1.ProxyService,
+            CertService_1.CertService
+        ],
+        exports: [
+            ProxyService_1.ProxyService,
+            CertService_1.CertService
+        ]
+    })
+], ProxyModule);

package/lib/{services → modules/proxy/services}/CertService.d.ts

@@ -1,6 +1,6 @@
 import { Project } from "@wocker/core";
-import { AppConfigService } from "./AppConfigService";
-import { DockerService } from "./DockerService";
+import { DockerService } from "../../docker";
+import { AppConfigService } from "../../../services/AppConfigService";
 import { ProxyService } from "./ProxyService";
 type CertMap = {
     [name: string]: string[];
@@ -12,7 +12,7 @@ export declare class CertService {
     constructor(appConfigService: AppConfigService, proxyService: ProxyService, dockerService: DockerService);
     list(): Promise<string>;
     generate(certName: string, dns: string[]): Promise<void>;
-    getCertsMap(): Promise<CertMap>;
+    getCertsMap(): CertMap;
     use(project: Project, name: string): Promise<void>;
     remove(project: Project): Promise<void>;
     delete(name: string): Promise<void>;

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

@@ -49,8 +49,8 @@ exports.CertService = void 0;
 const core_1 = require("@wocker/core");
 const Path = __importStar(require("path"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
-const AppConfigService_1 = require("./AppConfigService");
-const DockerService_1 = require("./DockerService");
+const docker_1 = require("../../docker");
+const AppConfigService_1 = require("../../../services/AppConfigService");
 const ProxyService_1 = require("./ProxyService");
 let CertService = class CertService {
     constructor(appConfigService, proxyService, dockerService) {
@@ -62,7 +62,7 @@ let CertService = class CertService {
         const table = new cli_table3_1.default({
             head: ["Name"]
         });
-        const certMap = await this.getCertsMap();
+        const certMap = this.getCertsMap();
         for (const name in certMap) {
             table.push([name]);
         }
@@ -93,7 +93,7 @@ let CertService = class CertService {
             cmd: ["wocker-create-cert", certName]
         });
     }
-    async getCertsMap() {
+    getCertsMap() {
         const files = this.appConfigService.fs.readdir("certs/projects");
         return files.reduce((res, file) => {
             const ext = Path.extname(file);
@@ -106,7 +106,7 @@ let CertService = class CertService {
         }, {});
     }
     async use(project, name) {
-        const certs = await this.getCertsMap();
+        const certs = this.getCertsMap();
         if (!name) {
             name = project.domains.find((domain) => domain in certs);
         }
@@ -121,17 +121,17 @@ let CertService = class CertService {
             throw new Error(`${name}.key file missing`);
         }
         project.setEnv("CERT_NAME", name);
-        await project.save();
+        project.save();
     }
     async remove(project) {
         if (!project.hasEnv("CERT_NAME")) {
             return;
         }
         project.unsetEnv("CERT_NAME");
-        await project.save();
+        project.save();
     }
     async delete(name) {
-        const certs = await this.getCertsMap();
+        const certs = this.getCertsMap();
         if (!(name in certs)) {
             console.warn(`Cert ${name} not found`);
             return;
@@ -147,5 +147,5 @@ exports.CertService = CertService = __decorate([
     (0, core_1.Injectable)(),
     __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
         ProxyService_1.ProxyService,
-        DockerService_1.DockerService])
+        docker_1.DockerService])
 ], CertService);

package/lib/{services → modules/proxy/services}/ProxyService.d.ts

@@ -1,6 +1,6 @@
 import { Project, ProxyService as CoreProxyService } from "@wocker/core";
-import { AppConfigService } from "./AppConfigService";
-import { DockerService } from "./DockerService";
+import { AppConfigService } from "../../../services/AppConfigService";
+import { DockerService } from "../../docker";
 export declare class ProxyService extends CoreProxyService {
     protected readonly appConfigService: AppConfigService;
     protected readonly dockerService: DockerService;

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

@@ -46,9 +46,9 @@ 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 AppConfigService_1 = require("../../../services/AppConfigService");
+const docker_1 = require("../../docker");
 let ProxyService = class ProxyService extends core_1.ProxyService {
     constructor(appConfigService, dockerService) {
         super();
@@ -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,6 +77,7 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
         if (!container) {
             console.info("Proxy starting...");
             await this.build(rebuild);
+            const fs = this.appConfigService.fs;
             if (!this.appConfigService.fs.exists("certs/ca")) {
                 this.appConfigService.fs.mkdir("certs/ca", {
                     recursive: true,
@@ -89,6 +90,12 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
                     mode: 0o700
                 });
             }
+            if (!fs.exists("nginx/vhost.d")) {
+                fs.mkdir("nginx/vhost.d", {
+                    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");
@@ -110,8 +117,9 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
                 ],
                 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"
             });
@@ -155,5 +163,5 @@ exports.ProxyService = ProxyService;
 exports.ProxyService = ProxyService = __decorate([
     (0, core_1.Injectable)("PROXY_SERVICE"),
     __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
-        DockerService_1.DockerService])
+        docker_1.DockerService])
 ], ProxyService);

package/lib/services/AppConfigService.d.ts

@@ -10,26 +10,15 @@ export declare class AppConfigService extends CoreAppConfigService {
     constructor();
     get version(): string;
     get config(): AppConfig;
-    get projects(): {
-        id: string;
-        name?: string;
-        path?: string;
-        src?: string;
-    }[];
+    get projects(): import("@wocker/core/lib/types/ProjectRef").ProjectRef[];
     get fs(): FileSystem;
     pwd(...parts: string[]): string;
     setPWD(pwd: string): void;
     dataPath(...parts: string[]): string;
-    pluginsPath(...parts: string[]): string;
     presetPath(...parts: string[]): string;
     getProjectTypes(): TypeMap;
     addProject(id: string, name: string, path: string): void;
-    removeProject(id: string): {
-        id: string;
-        name?: string;
-        path?: string;
-        src?: string;
-    };
+    removeProject(name: string): void;
     save(): void;
 }
 export {};

package/lib/services/AppConfigService.js

@@ -96,26 +96,7 @@ let AppConfigService = class AppConfigService extends core_1.AppConfigService {
                     recursive: true
                 });
             }
-            this._config = new class extends core_1.AppConfig {
-                constructor(data) {
-                    super(data);
-                }
-                async save() {
-                    if (!fs.exists()) {
-                        fs.mkdir("", {
-                            recursive: true
-                        });
-                    }
-                    fs.writeFile("wocker.config.js", this.toJsString());
-                    fs.writeFile("wocker.config.json", this.toString());
-                    if (fs.exists("data.json")) {
-                        fs.rm("data.json");
-                    }
-                    if (fs.exists("wocker.json")) {
-                        fs.rm("wocker.json");
-                    }
-                }
-            }(data);
+            this._config = new core_1.AppConfig(data);
         }
         return this._config;
     }
@@ -137,9 +118,6 @@ let AppConfigService = class AppConfigService extends core_1.AppConfigService {
     dataPath(...parts) {
         return Path.join(env_1.DATA_DIR, ...parts);
     }
-    pluginsPath(...parts) {
-        return Path.join(env_1.PLUGINS_DIR, ...parts);
-    }
     presetPath(...parts) {
         return Path.join(env_1.PRESETS_DIR, ...parts);
     }
@@ -149,11 +127,24 @@ let AppConfigService = class AppConfigService extends core_1.AppConfigService {
     addProject(id, name, path) {
         this.config.addProject(id, name, path);
     }
-    removeProject(id) {
-        return this.config.getProject(id);
+    removeProject(name) {
+        return this.config.removeProject(name);
     }
     save() {
-        this.config.save();
+        const fs = this.fs;
+        if (!fs.exists()) {
+            fs.mkdir("", {
+                recursive: true
+            });
+        }
+        fs.writeFile("wocker.config.js", this.config.toJsString());
+        fs.writeFile("wocker.config.json", this.config.toString());
+        if (fs.exists("data.json")) {
+            fs.rm("data.json");
+        }
+        if (fs.exists("wocker.json")) {
+            fs.rm("wocker.json");
+        }
     }
 };
 exports.AppConfigService = AppConfigService;

package/lib/services/PluginService.js

@@ -90,11 +90,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.config.addPlugin(fullName);
+                this.appConfigService.save();
                 console.info(`Plugin ${fullName} activated`);
                 return;
             }
@@ -102,8 +101,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.config.addPlugin(fullName, env);
+                this.appConfigService.save();
                 console.info(`Plugin ${fullName}@${env} activated`);
                 return;
             }
@@ -115,9 +114,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.config.removePlugin(fullName);
+        this.appConfigService.save();
         console.info(`Plugin ${fullName} deactivated`);
     }
     async import(name) {

package/lib/services/PresetService.js

@@ -205,9 +205,8 @@ let PresetService = class PresetService {
         if (!preset) {
             return;
         }
-        const config = this.appConfigService.getConfig();
-        config.unregisterPreset(preset.name);
-        config.save();
+        this.appConfigService.config.unregisterPreset(preset.name);
+        this.appConfigService.save();
     }
     get(name) {
         const preset = name

package/lib/services/ProjectService.d.ts

@@ -1,13 +1,13 @@
 import { Project, ProjectProperties } from "@wocker/core";
-import { KeystoreService } from "../keystore";
+import { DockerService } from "../modules/docker";
+import { KeystoreService } from "../modules/keystore";
 import { AppConfigService } from "./AppConfigService";
 import { AppEventsService } from "./AppEventsService";
-import { DockerService } from "./DockerService";
 type SearchParams = Partial<{
     name: string;
     path: string;
 }>;
-declare class ProjectService {
+export declare class ProjectService {
     protected readonly appConfigService: AppConfigService;
     protected readonly appEventsService: AppEventsService;
     protected readonly keystoreService: KeystoreService;
@@ -24,4 +24,4 @@ declare class ProjectService {
     searchOne(params?: Partial<SearchParams>): Project | null;
     logs(detach?: boolean): Promise<void>;
 }
-export { ProjectService };
+export {};

package/lib/services/ProjectService.js

@@ -11,10 +11,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectService = void 0;
 const core_1 = require("@wocker/core");
-const keystore_1 = require("../keystore");
+const docker_1 = require("../modules/docker");
+const keystore_1 = require("../modules/keystore");
 const AppConfigService_1 = require("./AppConfigService");
 const AppEventsService_1 = require("./AppEventsService");
-const DockerService_1 = require("./DockerService");
 let ProjectService = class ProjectService {
     constructor(appConfigService, appEventsService, keystoreService, dockerService) {
         this.appConfigService = appConfigService;
@@ -54,12 +54,11 @@ let ProjectService = class ProjectService {
         return project;
     }
     getById(id) {
-        const config = this.appConfigService.getConfig();
-        const projectData = config.getProject(id);
+        const projectData = this.appConfigService.config.getProject(id);
         const data = this.appConfigService.fs.readJSON("projects", id, "config.json");
         return this.fromObject({
             ...data,
-            path: projectData.path || projectData.src
+            path: projectData.path
         });
     }
     cdProject(name) {
@@ -159,14 +158,14 @@ let ProjectService = class ProjectService {
     search(params = {}) {
         const { name, path } = params;
         const projects = [];
-        for (const projectConfig of this.appConfigService.projects || []) {
-            if (name && projectConfig.name !== name) {
+        for (const projectRef of this.appConfigService.projects || []) {
+            if (name && projectRef.name !== name) {
                 continue;
             }
-            if (path && (projectConfig.path || projectConfig.src) !== path) {
+            if (path && projectRef.path !== path) {
                 continue;
             }
-            const project = this.getById(projectConfig.id);
+            const project = this.getById(projectRef.name);
             if (name && project.name !== name) {
                 continue;
             }
@@ -203,5 +202,5 @@ exports.ProjectService = ProjectService = __decorate([
     __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
         AppEventsService_1.AppEventsService,
         keystore_1.KeystoreService,
-        DockerService_1.DockerService])
+        docker_1.DockerService])
 ], ProjectService);

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;