@wocker/ws 1.0.32-beta.1 → 1.1.0-beta.0

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

@@ -27,13 +27,20 @@ let HttpAuthController = class HttpAuthController {
     async onAddDomain(project, ...domains) {
         console.log("New domains:", domains);
     }
-    async enable(domain) {
+    async users() {
+        await this.httpAuthService.usersForProject(this.projectService.get());
+    }
+    async enable(domain, noRestart) {
         await this.httpAuthService.enableForProject(this.projectService.get(), domain);
-        await this.proxyService.start(true);
+        if (!noRestart) {
+            await this.proxyService.start(true);
+        }
     }
-    async disable(domain) {
+    async disable(domain, noRestart) {
         await this.httpAuthService.disableForProject(this.projectService.get(), domain);
-        await this.proxyService.start(true);
+        if (!noRestart) {
+            await this.proxyService.start(true);
+        }
     }
     async add(user, password, global, algorithm) {
         if (!user) {
@@ -56,12 +63,12 @@ let HttpAuthController = class HttpAuthController {
         else {
             await this.httpAuthService.addForProject(this.projectService.get(), user, password, algorithm);
         }
-        await this.proxyService.start(true);
     }
     async remove(user) {
         await this.httpAuthService.removeForProject(this.projectService.get(), user);
     }
     async clear() {
+        await this.httpAuthService.clearForProject(this.projectService.get());
     }
 };
 exports.HttpAuthController = HttpAuthController;
@@ -71,19 +78,31 @@ __decorate([
     __metadata("design:paramtypes", [core_1.Project, String]),
     __metadata("design:returntype", Promise)
 ], HttpAuthController.prototype, "onAddDomain", null);
+__decorate([
+    (0, core_1.Command)("http-auth"),
+    (0, core_1.Description)(""),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], HttpAuthController.prototype, "users", null);
 __decorate([
     (0, core_1.Command)("http-auth:enable"),
     __param(0, (0, core_1.Option)("domain", "d")),
     __param(0, (0, core_1.Description)("Domain to apply authentication to.")),
+    __param(1, (0, core_1.Option)("no-restart")),
+    __param(1, (0, core_1.Description)("")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
+    __metadata("design:paramtypes", [String, Boolean]),
     __metadata("design:returntype", Promise)
 ], HttpAuthController.prototype, "enable", null);
 __decorate([
     (0, core_1.Command)("http-auth:disable"),
     __param(0, (0, core_1.Option)("domain", "d")),
+    __param(0, (0, core_1.Description)("")),
+    __param(1, (0, core_1.Option)("no-restart")),
+    __param(1, (0, core_1.Description)("")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
+    __metadata("design:paramtypes", [String, Boolean]),
     __metadata("design:returntype", Promise)
 ], HttpAuthController.prototype, "disable", null);
 __decorate([
@@ -104,7 +123,8 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], HttpAuthController.prototype, "add", null);
 __decorate([
-    (0, core_1.Command)("http-auth:remove [user]"),
+    (0, core_1.Command)("http-auth:remove-user [user]"),
+    (0, core_1.Description)(""),
     __param(0, (0, core_1.Param)("user")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
@@ -112,6 +132,7 @@ __decorate([
 ], HttpAuthController.prototype, "remove", null);
 __decorate([
     (0, core_1.Command)("http-auth:clear"),
+    (0, core_1.Description)("Remove all users for the project."),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)

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

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

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

@@ -22,8 +22,8 @@ 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, projectService, proxyService) {
-        this.appConfigService = appConfigService;
+    constructor(appService, projectService, proxyService) {
+        this.appService = appService;
         this.projectService = projectService;
         this.proxyService = proxyService;
     }
@@ -47,7 +47,7 @@ let ProxyController = class ProxyController {
         return projects.map((project) => project.name);
     }
     async init(httpPort, httpsPort, sshPort, sshPassword) {
-        const config = this.appConfigService.config;
+        const config = this.appService.config;
         if (httpPort === null || typeof httpPort === "undefined" || isNaN(httpPort)) {
             httpPort = await (0, utils_1.promptInput)({
                 required: true,
@@ -95,7 +95,7 @@ let ProxyController = class ProxyController {
             config.unsetMeta("PROXY_SSH_PASSWORD");
             config.unsetMeta("PROXY_SSH_PORT");
         }
-        this.appConfigService.save();
+        this.appService.save();
     }
     async start(restart, rebuild) {
         await this.proxyService.start(restart, rebuild);
@@ -190,7 +190,7 @@ __decorate([
 exports.ProxyController = ProxyController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Proxy commands"),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         project_1.ProjectService,
         ProxyService_1.ProxyService])
 ], ProxyController);

package/lib/modules/proxy/services/HttpAuthService.d.ts

@@ -7,11 +7,14 @@ export declare class HttpAuthService {
     protected readonly dockerService: DockerService;
     protected readonly proxyService: ProxyService;
     constructor(processService: ProcessService, fs: AppFileSystemService, dockerService: DockerService, proxyService: ProxyService);
+    users(path: string): Promise<void>;
     add(path: string, user: string, password: string, algorithm?: HttpAuthService.Algorithm): Promise<void>;
     addForProject(project: Project, user: string, password: string, algorithm?: HttpAuthService.Algorithm): Promise<void>;
     addForGlobal(user: string, password: string, algorithm?: HttpAuthService.Algorithm): Promise<void>;
     removeUser(path: string, user: string): Promise<void>;
+    usersForProject(project: Project): Promise<void>;
     removeForProject(project: Project, user: string): Promise<void>;
+    clearForProject(project: Project): Promise<void>;
     enableForProject(project: Project, domain?: string): Promise<void>;
     disableForProject(project: Project, domain?: string): Promise<void>;
 }

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

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpAuthService = void 0;
 const core_1 = require("@wocker/core");
 const docker_module_1 = require("@wocker/docker-module");
-const utils_1 = require("@wocker/utils");
 const ProxyService_1 = require("./ProxyService");
 let HttpAuthService = class HttpAuthService {
     constructor(processService, fs, dockerService, proxyService) {
@@ -21,6 +20,13 @@ let HttpAuthService = class HttpAuthService {
         this.dockerService = dockerService;
         this.proxyService = proxyService;
     }
+    async users(path) {
+        await this.dockerService.exec("wocker-proxy", {
+            tty: true,
+            user: "nginx",
+            cmd: ["cut", "-d:", "-f1", `/etc/${path}`]
+        });
+    }
     async add(path, user, password, algorithm = "md5") {
         const alMap = {
             md5: "-m",
@@ -37,16 +43,10 @@ let HttpAuthService = class HttpAuthService {
                 mode: 0o640
             });
         }
-        const stream = await this.dockerService.exec("wocker-proxy", {
+        await this.dockerService.exec("wocker-proxy", {
             user: "nginx",
-            cmd: ["htpasswd", "-b", alMap[algorithm], `/etc/${path}`, user, password]
-        });
-        await new Promise((resolve, reject) => {
-            stream.on("data", (chunk) => {
-                this.processService.stdout.write((0, utils_1.demuxOutput)(chunk));
-            });
-            stream.on("end", resolve);
-            stream.on("error", reject);
+            cmd: ["htpasswd", "-b", alMap[algorithm], `/etc/${path}`, user, password],
+            tty: true
         });
     }
     async addForProject(project, user, password, algorithm = "md5") {
@@ -61,6 +61,17 @@ let HttpAuthService = class HttpAuthService {
         return this.add(`nginx/htpasswd/_global`, user, password, algorithm);
     }
     async removeUser(path, user) {
+        await this.dockerService.exec("wocker-proxy", {
+            cmd: ["htpasswd", "-D", `/etc/${path}`, user],
+            user: "nginx",
+            tty: true
+        });
+    }
+    async usersForProject(project) {
+        if (!this.fs.exists("nginx/htpasswd/projects")) {
+            return;
+        }
+        await this.users(`nginx/htpasswd/projects/${project.name}`);
     }
     async removeForProject(project, user) {
         if (!this.fs.exists("nginx/htpasswd/projects")) {
@@ -68,6 +79,14 @@ let HttpAuthService = class HttpAuthService {
         }
         await this.removeUser(`nginx/htpasswd/projects/${project.name}`, user);
     }
+    async clearForProject(project) {
+        const filePath = `nginx/htpasswd/projects/${project.name}`;
+        if (this.fs.exists(filePath)) {
+            this.fs.writeFile(filePath, "", {
+                mode: 0o640
+            });
+        }
+    }
     async enableForProject(project, domain) {
         if (!this.fs.exists(`nginx/htpasswd/projects/${project.name}`)) {
             throw new Error(`No htpasswd for ${project.name}`);

package/lib/modules/proxy/services/ProxyService.d.ts

@@ -1,7 +1,7 @@
-import { Project, AppConfigService, AppFileSystemService, ProcessService, ProxyService as CoreProxyService } from "@wocker/core";
+import { Project, AppService, AppFileSystemService, ProcessService, ProxyService as CoreProxyService } from "@wocker/core";
 import { DockerService } from "@wocker/docker-module";
 export declare class ProxyService extends CoreProxyService {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly processService: ProcessService;
     protected readonly fs: AppFileSystemService;
     protected readonly dockerService: DockerService;
@@ -9,7 +9,7 @@ export declare class ProxyService extends CoreProxyService {
     protected oldContainerNames: string[];
     protected imageName: string;
     protected oldImages: string[];
-    constructor(appConfigService: AppConfigService, processService: ProcessService, fs: AppFileSystemService, dockerService: DockerService);
+    constructor(appService: AppService, processService: ProcessService, fs: AppFileSystemService, dockerService: DockerService);
     init(project: Project): Promise<void>;
     start(restart?: boolean, rebuild?: boolean): Promise<void>;
     stop(): Promise<void>;

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

@@ -49,9 +49,9 @@ const utils_1 = require("@wocker/utils");
 const Path = __importStar(require("path"));
 const env_1 = require("../../../env");
 let ProxyService = class ProxyService extends core_1.ProxyService {
-    constructor(appConfigService, processService, fs, dockerService) {
+    constructor(appService, processService, fs, dockerService) {
         super();
-        this.appConfigService = appConfigService;
+        this.appService = appService;
         this.processService = processService;
         this.fs = fs;
         this.dockerService = dockerService;
@@ -110,7 +110,7 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
             else {
                 this.fs.chmod("nginx/htpasswd", 0o764);
             }
-            const httpPort = this.appConfigService.getMeta("PROXY_HTTP_PORT", "80"), httpsPort = this.appConfigService.getMeta("PROXY_HTTPS_PORT", "443"), sshPort = this.appConfigService.getMeta("PROXY_SSH_PORT", "22");
+            const httpPort = this.appService.getMeta("PROXY_HTTP_PORT", "80"), httpsPort = this.appService.getMeta("PROXY_HTTPS_PORT", "443"), sshPort = this.appService.getMeta("PROXY_SSH_PORT", "22");
             container = await this.dockerService.createContainer({
                 name: this.containerName,
                 image: this.imageName,
@@ -124,7 +124,7 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
                 ports: [
                     `${httpPort}:80`,
                     `${httpsPort}:443`,
-                    ...this.appConfigService.getMeta("PROXY_SSH_PASSWORD") ? [
+                    ...this.appService.getMeta("PROXY_SSH_PASSWORD") ? [
                         `${sshPort}:22`
                     ] : []
                 ],
@@ -161,9 +161,9 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
         }
         await this.dockerService.buildImage({
             tag: this.imageName,
-            version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
+            version: this.appService.isExperimentalEnabled("buildKit") ? "2" : "1",
             buildArgs: {
-                SSH_PASSWORD: this.appConfigService.getMeta("PROXY_SSH_PASSWORD")
+                SSH_PASSWORD: this.appService.getMeta("PROXY_SSH_PASSWORD")
             },
             context: Path.join(env_1.PLUGINS_DIR, "proxy"),
             dockerfile: "./Dockerfile"
@@ -176,7 +176,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", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         core_1.ProcessService,
         core_1.AppFileSystemService,
         docker_module_1.DockerService])

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@wocker/ws",
     "type": "commonjs",
-    "version": "1.0.32-beta.1",
+    "version": "1.1.0-beta.0",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -35,14 +35,13 @@
         "make-coverage-badge": "make-coverage-badge"
     },
     "dependencies": {
-        "@wocker/core": "1.0.32",
-        "@wocker/docker-module": "^0.0.6",
+        "@wocker/core": "^1.1.0-beta.2",
+        "@wocker/docker-module": "^1.0.0",
         "@wocker/utils": "^2.0.6",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
         "child_process": "^1.0.2",
         "cli-table3": "^0.6.2",
-        "docker-compose": "^1.2.0",
         "dockerode": "^4.0.2",
         "keytar": "^7.9.0",
         "md5": "^2.3.0",
@@ -57,7 +56,7 @@
         "@types/mute-stream": "^0.0.4",
         "@types/node": "^24.5.2",
         "@types/unzipper": "^0.10.10",
-        "@wocker/docker-mock-module": "^0.0.3",
+        "@wocker/docker-mock-module": "^1.0.0",
         "@wocker/testing": "^1.0.4",
         "jest": "^30.1.3",
         "make-coverage-badge": "^1.2.0",
@@ -66,5 +65,16 @@
         "ts-node": "^10.9.2",
         "typescript": "^5.9.3",
         "unionfs": "^4.5.4"
+    },
+    "overrides": {
+        "@wocker/testing": {
+            "@wocker/core": "^1.1.0-beta.2"
+        },
+        "@wocker/docker-module": {
+            "@wocker/core": "^1.1.0-beta.2"
+        },
+        "@wocker/docker-mock-module": {
+            "@wocker/core": "^1.1.0-beta.2"
+        }
     }
 }

package/lib/makes/Version.d.ts

@@ -1,22 +0,0 @@
-type VersionData = {
-    major: number;
-    minor: number;
-    patch: number;
-    tag?: string;
-    build?: number;
-};
-export declare class Version {
-    static readonly REGEXP: RegExp;
-    protected static cache: Map<string, Version>;
-    readonly major: number;
-    readonly minor: number;
-    readonly patch: number;
-    readonly tag?: string;
-    readonly build?: number;
-    constructor(data: VersionData);
-    parts(): number[];
-    compare(version: string | Version): number;
-    static valid(version: string): boolean;
-    static parse(version: string): Version;
-}
-export {};

package/lib/makes/Version.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Version = void 0;
-class Version {
-    constructor(data) {
-        Object.assign(this, data);
-    }
-    parts() {
-        return [
-            this.major,
-            this.minor,
-            this.patch,
-            this.build ?? 0
-        ];
-    }
-    compare(version) {
-        if (typeof version === "string") {
-            version = Version.parse(version);
-        }
-        const a = this.parts(), b = version.parts();
-        for (let i = 0; i < Math.max(a.length, b.length); i++) {
-            if (i === 3) {
-                if (this.tag && !version.tag)
-                    return -1;
-                else if (!this.tag && version.tag)
-                    return 1;
-                else if (this.tag !== version.tag)
-                    return this.tag < version.tag ? -1 : 1;
-            }
-            const diff = (a[i] ?? 0) - (b[i] ?? 0);
-            if (diff !== 0) {
-                return diff > 0 ? 1 : -1;
-            }
-        }
-        return 0;
-    }
-    static valid(version) {
-        return Version.REGEXP.test(version);
-    }
-    static parse(version) {
-        if (!Version.cache.has(version)) {
-            if (!Version.REGEXP.test(version)) {
-                throw new RangeError("Invalid version format");
-            }
-            const [, major, minor, patch, tag, build] = Version.REGEXP.exec(version) || [];
-            Version.cache.set(version, new Version({
-                major: parseInt(major),
-                minor: parseInt(minor),
-                patch: parseInt(patch),
-                tag,
-                build: build ? parseInt(build) : undefined
-            }));
-        }
-        return Version.cache.get(version);
-    }
-}
-exports.Version = Version;
-Version.REGEXP = /^v?(\d+)\.(\d+)\.(\d+)(?:-([a-zA-Z]+(?:-[a-zA-Z0-9]+)*)(?:\.(\d+))?)?/;
-Version.cache = new Map();

package/lib/makes/VersionRange.d.ts

@@ -1,6 +0,0 @@
-import { VersionRule } from "./VersionRule";
-export declare class VersionRange {
-    protected rules: VersionRule[][];
-    constructor(rules: VersionRule[][]);
-    static parse(range: string): VersionRange;
-}

package/lib/makes/VersionRange.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VersionRange = void 0;
-const VersionRule_1 = require("./VersionRule");
-class VersionRange {
-    constructor(rules) {
-        this.rules = rules;
-    }
-    static parse(range) {
-        const rules = range.split("||").map((range) => {
-            return range.split(" ").map((rule) => {
-                return VersionRule_1.VersionRule.parse(rule);
-            });
-        });
-        return new VersionRange(rules);
-    }
-}
-exports.VersionRange = VersionRange;

package/lib/makes/VersionRule.d.ts

@@ -1,24 +0,0 @@
-import { Version } from "./Version";
-type VersionRuleData = {
-    prefix?: string;
-    major?: number;
-    minor?: number;
-    patch?: number;
-    tag?: string;
-    build?: number;
-};
-export declare class VersionRule {
-    static readonly REGEXP: RegExp;
-    protected static map: Map<string, VersionRule>;
-    readonly prefix?: string;
-    readonly major?: number;
-    readonly minor?: number;
-    readonly patch?: number;
-    readonly tag?: string;
-    readonly build?: number;
-    constructor(data: VersionRuleData);
-    get version(): Version;
-    match(version: string | Version, withTag?: boolean): boolean;
-    static parse(rule: string): VersionRule;
-}
-export {};

package/lib/makes/VersionRule.js

@@ -1,68 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VersionRule = void 0;
-const Version_1 = require("./Version");
-class VersionRule {
-    constructor(data) {
-        Object.assign(this, data);
-    }
-    get version() {
-        return new Version_1.Version({
-            major: this.major ?? 0,
-            minor: this.minor ?? 0,
-            patch: this.patch ?? 0,
-            tag: this.tag,
-            build: this.build
-        });
-    }
-    match(version, withTag) {
-        if (typeof version === "string") {
-            version = Version_1.Version.parse(version);
-        }
-        if ((!withTag || this.tag) && this.tag !== version.tag) {
-            return false;
-        }
-        const cmp = version.compare(this.version);
-        switch (this.prefix) {
-            case ">":
-                return cmp > 0;
-            case ">=":
-                return cmp >= 0;
-            case "<":
-                return cmp < 0;
-            case "<=":
-                return cmp <= 0;
-            case "^":
-                return (this.major === version.major &&
-                    cmp >= 0);
-            case "~":
-                return (this.major === version.major &&
-                    this.minor === version.minor &&
-                    cmp >= 0);
-            default:
-                return ((this.major === undefined || this.major === version.major) &&
-                    (this.minor === undefined || this.minor === version.minor) &&
-                    (this.patch === undefined || this.patch === version.patch));
-        }
-    }
-    static parse(rule) {
-        if (!VersionRule.map.has(rule)) {
-            if (!VersionRule.REGEXP.test(rule)) {
-                throw new Error("Invalid version rule");
-            }
-            const [, prefix, major, minor, patch, tag, build, onlyTag] = VersionRule.REGEXP.exec(rule) || [];
-            VersionRule.map.set(rule, new VersionRule({
-                prefix,
-                major: major && major !== "x" && major !== "*" ? parseInt(major) : undefined,
-                minor: minor && minor !== "x" ? parseInt(minor) : undefined,
-                patch: patch && patch !== "x" ? parseInt(patch) : undefined,
-                tag: tag || onlyTag,
-                build: build && build !== "x" ? parseInt(build) : undefined
-            }));
-        }
-        return VersionRule.map.get(rule);
-    }
-}
-exports.VersionRule = VersionRule;
-VersionRule.REGEXP = /^(?:(\^|~|<=|>=|<|>)?(x|\d+)(?:\.(\*|x|\d+))?(?:\.(x|\d+))?(?:-([a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*)(?:\.(\d+))?)?|([a-zA-Z0-9]+(?:-[a-zAZ0-9]+)*))$/;
-VersionRule.map = new Map();