@wocker/ws 1.0.30 → 1.0.31-beta.0

package/lib/makes/MySQL.d.ts

@@ -1,15 +1,16 @@
-type Options = string | {
-    ssl?: boolean;
-    host?: string;
-    port?: number;
-    user?: string;
-    password?: string;
-    database?: string;
-};
 export declare class MySQL {
     protected connection: any;
-    protected options: Options;
-    constructor(options: Options);
+    protected options: MySQL.ConstructorOptions;
+    constructor(options: MySQL.ConstructorOptions);
     query(sql: string): Promise<void>;
 }
-export {};
+export declare namespace MySQL {
+    type ConstructorOptions = string | {
+        ssl?: boolean;
+        host?: string;
+        port?: number;
+        user?: string;
+        password?: string;
+        database?: string;
+    };
+}

package/lib/modules/keystore/providers/KeytarKeystoreProvider.d.ts

@@ -2,8 +2,8 @@ import { KeystoreProvider } from "@wocker/core";
 import { Keytar } from "../types/Keytar";
 export declare class KeytarKeystoreProvider extends KeystoreProvider {
     protected _keytar?: any;
+    protected getKeytar(): Promise<Keytar>;
     get(key: string, defaultValue?: string): Promise<string | undefined>;
     set(key: string, value: string): Promise<void>;
     delete(key: string): Promise<void>;
-    protected getKeytar(): Promise<Keytar>;
 }

package/lib/modules/keystore/providers/KeytarKeystoreProvider.js

@@ -43,6 +43,12 @@ exports.KeytarKeystoreProvider = void 0;
 const core_1 = require("@wocker/core");
 const env_1 = require("../../../env");
 let KeytarKeystoreProvider = class KeytarKeystoreProvider extends core_1.KeystoreProvider {
+    async getKeytar() {
+        if (!this._keytar) {
+            this._keytar = await Promise.resolve().then(() => __importStar(require("keytar")));
+        }
+        return this._keytar;
+    }
     async get(key, defaultValue) {
         const keytar = await this.getKeytar();
         const value = await keytar.getPassword(env_1.KEYTAR_SERVICE, key);
@@ -61,12 +67,6 @@ let KeytarKeystoreProvider = class KeytarKeystoreProvider extends core_1.Keystor
         const keytar = await this.getKeytar();
         await keytar.deletePassword(env_1.KEYTAR_SERVICE, key);
     }
-    async getKeytar() {
-        if (!this._keytar) {
-            this._keytar = await Promise.resolve().then(() => __importStar(require("keytar")));
-        }
-        return this._keytar;
-    }
 };
 exports.KeytarKeystoreProvider = KeytarKeystoreProvider;
 exports.KeytarKeystoreProvider = KeytarKeystoreProvider = __decorate([

package/lib/modules/proxy/controllers/ProxyController.d.ts

@@ -1,12 +1,12 @@
-import { Project, AppConfigService, EventService } from "@wocker/core";
+import { Project, AppConfigService } from "@wocker/core";
 import { ProjectService } from "../../project";
 import { ProxyService } from "../services/ProxyService";
 export declare class ProxyController {
     protected readonly appConfigService: AppConfigService;
-    protected readonly eventService: EventService;
     protected readonly projectService: ProjectService;
     protected readonly proxyService: ProxyService;
-    constructor(appConfigService: AppConfigService, eventService: EventService, projectService: ProjectService, proxyService: ProxyService);
+    constructor(appConfigService: AppConfigService, projectService: ProjectService, proxyService: ProxyService);
+    onProjectInit(project: Project): Promise<void>;
     onProjectStart(project: Project): Promise<void>;
     onProjectStop(_project: Project): Promise<void>;
     getProjectNames(): string[];

package/lib/modules/proxy/controllers/ProxyController.js

@@ -22,14 +22,13 @@ const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
 const project_1 = require("../../project");
 const ProxyService_1 = require("../services/ProxyService");
 let ProxyController = class ProxyController {
-    constructor(appConfigService, eventService, projectService, proxyService) {
+    constructor(appConfigService, projectService, proxyService) {
         this.appConfigService = appConfigService;
-        this.eventService = eventService;
         this.projectService = projectService;
         this.proxyService = proxyService;
-        this.eventService.on("project:init", (project) => this.proxyService.init(project));
-        this.eventService.on("project:start", (project) => this.onProjectStart(project));
-        this.eventService.on("project:stop", (project) => this.onProjectStop(project));
+    }
+    async onProjectInit(project) {
+        return this.proxyService.init(project);
     }
     async onProjectStart(project) {
         if (project.domains.length === 0) {
@@ -110,6 +109,24 @@ let ProxyController = class ProxyController {
     }
 };
 exports.ProxyController = ProxyController;
+__decorate([
+    (0, core_1.Event)("project:inti"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.Project]),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "onProjectInit", null);
+__decorate([
+    (0, core_1.Event)("project:start"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.Project]),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "onProjectStart", null);
+__decorate([
+    (0, core_1.Event)("project:stop"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.Project]),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "onProjectStop", null);
 __decorate([
     (0, core_1.Completion)("name"),
     __metadata("design:type", Function),
@@ -174,7 +191,6 @@ exports.ProxyController = ProxyController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Proxy commands"),
     __metadata("design:paramtypes", [core_1.AppConfigService,
-        core_1.EventService,
         project_1.ProjectService,
         ProxyService_1.ProxyService])
 ], ProxyController);

package/lib/modules/proxy/services/CertService.js

@@ -91,6 +91,7 @@ let CertService = class CertService {
             user: "1000",
             cmd: ["wocker-create-cert", certName]
         });
+        await this.proxyService.start(true);
     }
     getCertsMap() {
         const files = this.fs.readdir("certs/projects");

package/lib/modules/proxy/services/ProxyService.js

@@ -149,8 +149,8 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
             await this.dockerService.imageRm(oldImage);
         }
         await this.dockerService.buildImage({
-            version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
             tag: this.imageName,
+            version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
             buildArgs: {
                 SSH_PASSWORD: this.appConfigService.getMeta("PROXY_SSH_PASSWORD")
             },

package/lib/utils/escapeRegExp.d.ts

@@ -1,2 +1 @@
-declare const escapeRegExp: (string: string) => string;
-export { escapeRegExp };
+export declare const escapeRegExp: (string: string) => string;

package/lib/utils/exec.d.ts

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

package/lib/utils/injectVariables.d.ts

@@ -1,5 +1,5 @@
 type Data = {
     [key: string]: string;
 };
-export declare const injectVariables: (str: string, data: Data) => string;
+export declare const injectVariables: (pattern: string, data: Data) => string;
 export {};

package/lib/utils/injectVariables.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectVariables = void 0;
-const injectVariables = (str, data) => {
-    let res = str;
-    Object.keys(data).forEach((key) => {
-        const variableName = `\\$\\{${key}\\}`;
-        const variableValue = data[key];
-        const regex = new RegExp(variableName, "g");
-        res = res.replace(regex, variableValue);
-    });
-    return res;
+const injectVariables = (pattern, data) => {
+    return Object.entries(data).reduce((res, [key, value]) => {
+        const regex = new RegExp(`\\$\\{${key}\\}`, "g");
+        return res.replace(regex, value);
+    }, pattern);
 };
 exports.injectVariables = injectVariables;

package/lib/utils/parse-table.d.ts

@@ -1,2 +1 @@
-declare const parseTable: (string: any, pos: any) => any;
-export { parseTable };
+export declare const parseTable: (string: any, pos: any) => any;

package/lib/utils/spawn.d.ts

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

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@wocker/ws",
     "type": "commonjs",
-    "version": "1.0.30",
+    "version": "1.0.31-beta.0",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -35,8 +35,8 @@
         "make-coverage-badge": "make-coverage-badge"
     },
     "dependencies": {
-        "@wocker/core": "1.0.30",
-        "@wocker/docker-module": "^0.0.4",
+        "@wocker/core": "1.0.31",
+        "@wocker/docker-module": "^0.0.6",
         "@wocker/utils": "^2.0.6",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
@@ -57,7 +57,7 @@
         "@types/mute-stream": "^0.0.4",
         "@types/node": "^24.5.2",
         "@types/unzipper": "^0.10.10",
-        "@wocker/docker-mock-module": "^0.0.2",
+        "@wocker/docker-mock-module": "^0.0.3",
         "@wocker/testing": "^1.0.4",
         "jest": "^30.1.3",
         "make-coverage-badge": "^1.2.0",