@wocker/ws 1.0.25 → 1.0.27

package/lib/modules/project/controllers/SecretsController.d.ts

@@ -0,0 +1,8 @@
+import { ProjectService } from "../services/ProjectService";
+export declare class SecretsController {
+    protected readonly projectService: ProjectService;
+    constructor(projectService: ProjectService);
+    create(secret?: string, name?: string): Promise<void>;
+    inspect(secret?: string, name?: string): Promise<string | undefined>;
+    rm(secret?: string, name?: string): Promise<void>;
+}

package/lib/modules/project/controllers/SecretsController.js

@@ -0,0 +1,72 @@
+"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;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SecretsController = void 0;
+const core_1 = require("@wocker/core");
+const utils_1 = require("@wocker/utils");
+const ProjectService_1 = require("../services/ProjectService");
+let SecretsController = class SecretsController {
+    constructor(projectService) {
+        this.projectService = projectService;
+    }
+    async create(secret, name) {
+        const project = this.projectService.get(name);
+        const value = await (0, utils_1.promptInput)({
+            message: "Secret value",
+            type: "password"
+        });
+        await project.setSecret(secret, value);
+    }
+    async inspect(secret, name) {
+        const project = this.projectService.get(name);
+        return project.getSecret(secret);
+    }
+    async rm(secret, name) {
+        const project = this.projectService.get(name);
+        await project.unsetSecret(secret);
+    }
+};
+exports.SecretsController = SecretsController;
+__decorate([
+    (0, core_1.Command)("secret:create [secret]"),
+    (0, core_1.Description)("Adds project secret value to keystore"),
+    __param(0, (0, core_1.Param)("secret")),
+    __param(1, (0, core_1.Option)("name", "n")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String]),
+    __metadata("design:returntype", Promise)
+], SecretsController.prototype, "create", null);
+__decorate([
+    (0, core_1.Command)("secret:inspect [secret]"),
+    (0, core_1.Description)("Inspect secret value"),
+    __param(0, (0, core_1.Param)("secret")),
+    __param(1, (0, core_1.Option)("name", "n")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String]),
+    __metadata("design:returntype", Promise)
+], SecretsController.prototype, "inspect", null);
+__decorate([
+    (0, core_1.Command)("secret:rm [secret]"),
+    (0, core_1.Description)("Delete secret value"),
+    __param(0, (0, core_1.Param)("secret")),
+    __param(1, (0, core_1.Option)("name", "n")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String]),
+    __metadata("design:returntype", Promise)
+], SecretsController.prototype, "rm", null);
+exports.SecretsController = SecretsController = __decorate([
+    (0, core_1.Controller)(),
+    (0, core_1.Description)("Project secret commands"),
+    __metadata("design:paramtypes", [ProjectService_1.ProjectService])
+], SecretsController);

package/lib/modules/project/index.js

@@ -5,13 +5,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectService = exports.ProjectRepository = exports.ProjectModule = void 0;
 const core_1 = require("@wocker/core");
+const docker_module_1 = __importDefault(require("@wocker/docker-module"));
 const keystore_1 = require("../keystore");
-const docker_1 = require("../docker");
 const preset_1 = require("../preset");
 const ProjectController_1 = require("./controllers/ProjectController");
+const SecretsController_1 = require("./controllers/SecretsController");
 const ProjectRepository_1 = require("./repositories/ProjectRepository");
 Object.defineProperty(exports, "ProjectRepository", { enumerable: true, get: function () { return ProjectRepository_1.ProjectRepository; } });
 const ProjectService_1 = require("./services/ProjectService");
@@ -22,11 +26,14 @@ exports.ProjectModule = ProjectModule;
 exports.ProjectModule = ProjectModule = __decorate([
     (0, core_1.Module)({
         imports: [
-            preset_1.PresetModule,
+            docker_module_1.default,
             keystore_1.KeystoreModule,
-            docker_1.DockerModule
+            preset_1.PresetModule
+        ],
+        controllers: [
+            ProjectController_1.ProjectController,
+            SecretsController_1.SecretsController
         ],
-        controllers: [ProjectController_1.ProjectController],
         providers: [
             ProjectRepository_1.ProjectRepository,
             ProjectService_1.ProjectService

package/lib/modules/project/repositories/ProjectRepository.d.ts

@@ -1,12 +1,9 @@
-import { AppConfigService, AppFileSystemService, Project, ProjectProperties, ProjectServiceSearchParams as SearchParams } from "@wocker/core";
-import { KeystoreService } from "../../keystore";
-export declare class ProjectRepository {
+import { AppConfigService, AppFileSystemService, Project, ProjectRepository as CoreProjectRepository, ProjectRepositorySearchParams as SearchParams } from "@wocker/core";
+export declare class ProjectRepository extends CoreProjectRepository {
     protected readonly appConfigService: AppConfigService;
     protected readonly fs: AppFileSystemService;
-    protected readonly keystoreService: KeystoreService;
-    constructor(appConfigService: AppConfigService, fs: AppFileSystemService, keystoreService: KeystoreService);
+    constructor(appConfigService: AppConfigService, fs: AppFileSystemService);
     getByName(name: string): Project;
-    fromObject(data: Partial<ProjectProperties>): Project;
     save(project: Project): void;
     search(params?: SearchParams): Project[];
     searchOne(params?: SearchParams): Project | null;

package/lib/modules/project/repositories/ProjectRepository.js

@@ -11,37 +11,19 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectRepository = void 0;
 const core_1 = require("@wocker/core");
-const keystore_1 = require("../../keystore");
-let ProjectRepository = class ProjectRepository {
-    constructor(appConfigService, fs, keystoreService) {
+let ProjectRepository = class ProjectRepository extends core_1.ProjectRepository {
+    constructor(appConfigService, fs) {
+        super();
         this.appConfigService = appConfigService;
         this.fs = fs;
-        this.keystoreService = keystoreService;
     }
     getByName(name) {
         const ref = this.appConfigService.config.getProject(name), config = this.fs.readJSON(`projects/${name}/config.json`);
-        return this.fromObject({
+        return new core_1.Project({
             ...config,
             path: ref.path
         });
     }
-    fromObject(data) {
-        const _this = this;
-        return new class extends core_1.Project {
-            constructor(data) {
-                super(data);
-            }
-            async getSecret(key, defaultValue) {
-                return _this.keystoreService.get(`p:${this.name}:${key}`, defaultValue);
-            }
-            async setSecret(key, value) {
-                return _this.keystoreService.set(`p:${this.name}:${key}`, value);
-            }
-            save() {
-                _this.save(this);
-            }
-        }(data);
-    }
     save(project) {
         if (!project.name) {
             throw new Error("Project should has a name");
@@ -52,14 +34,14 @@ let ProjectRepository = class ProjectRepository {
         if (!project.id) {
             project.id = project.name;
         }
-        if (!this.fs.exists(`projects/${project.id}`)) {
-            this.fs.mkdir(`projects/${project.id}`, {
+        if (!this.fs.exists(`projects/${project.name}`)) {
+            this.fs.mkdir(`projects/${project.name}`, {
                 recursive: true
             });
         }
         const { path, ...rest } = project.toObject();
-        this.appConfigService.addProject(project.id, project.name, path);
-        this.fs.writeJSON(`projects/${project.id}/config.json`, rest);
+        this.appConfigService.addProject(project.name, path);
+        this.fs.writeJSON(`projects/${project.name}/config.json`, rest);
         this.appConfigService.save();
     }
     search(params = {}) {
@@ -85,6 +67,5 @@ exports.ProjectRepository = ProjectRepository;
 exports.ProjectRepository = ProjectRepository = __decorate([
     (0, core_1.Injectable)(),
     __metadata("design:paramtypes", [core_1.AppConfigService,
-        core_1.AppFileSystemService,
-        keystore_1.KeystoreService])
+        core_1.AppFileSystemService])
 ], ProjectRepository);

package/lib/modules/project/services/ProjectService.d.ts

@@ -1,6 +1,6 @@
-import { Project, AppConfigService, EventService, ProcessService, ProjectService as CoreProjectService, ProjectServiceSearchParams as SearchParams, LogService } from "@wocker/core";
-import { DockerService, ComposeService } from "../../docker";
-import { PresetService, PresetRepository } from "../../preset";
+import { AppConfigService, EventService, LogService, ProcessService, Project, ProjectService as CoreProjectService, ProjectRepositorySearchParams as SearchParams } from "@wocker/core";
+import { ComposeService, DockerService } from "@wocker/docker-module";
+import { PresetRepository, PresetService } from "../../preset";
 import { ProjectRepository } from "../repositories/ProjectRepository";
 export declare class ProjectService extends CoreProjectService {
     protected readonly appConfigService: AppConfigService;
@@ -20,6 +20,8 @@ export declare class ProjectService extends CoreProjectService {
     start(project: Project, restart?: boolean, rebuild?: boolean, attach?: boolean): Promise<void>;
     stop(project: Project): Promise<void>;
     build(project: Project, rebuild?: boolean): Promise<void>;
+    attach(project: Project): Promise<void>;
+    run(project: Project, script: string, service?: string, args?: string[]): Promise<void>;
     exec(project: Project, command: string[]): Promise<void>;
     logs(project: Project, detach?: boolean): Promise<void>;
 }

package/lib/modules/project/services/ProjectService.js

@@ -11,9 +11,15 @@ 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 docker_1 = require("../../docker");
+const docker_module_1 = require("@wocker/docker-module");
+const cli_1 = require("@kearisp/cli");
 const preset_1 = require("../../preset");
 const ProjectRepository_1 = require("../repositories/ProjectRepository");
+class PublicCli extends cli_1.Cli {
+    parseCommand(command, index) {
+        return super.parseCommand(command, index);
+    }
+}
 let ProjectService = class ProjectService extends core_1.ProjectService {
     constructor(appConfigService, processService, eventService, dockerService, composeService, projectRepository, presetService, presetRepository, logService) {
         super();
@@ -66,6 +72,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                     container = await this.dockerService.createContainer({
                         name: project.containerName,
                         image: project.imageName,
+                        cmd: project.cmd,
                         env: {
                             ...this.appConfigService.config.env || {},
                             ...project.env || {}
@@ -175,7 +182,9 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                                 "org.wocker.preset": preset.name
                             },
                             buildArgs: project.buildArgs,
-                            context: preset.path,
+                            context: project.presetMode === "project"
+                                ? [preset.path, project.path]
+                                : preset.path,
                             dockerfile: preset.dockerfile
                         });
                     }
@@ -192,6 +201,52 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
         }
         await this.eventService.emit("project:build", project, rebuild);
     }
+    async attach(project) {
+        switch (project.type) {
+            case core_1.PROJECT_TYPE_IMAGE:
+            case core_1.PROJECT_TYPE_DOCKERFILE:
+            case core_1.PROJECT_TYPE_PRESET: {
+                await this.dockerService.attach(project.containerName);
+                break;
+            }
+        }
+    }
+    async run(project, script, service, args = []) {
+        if (!project.scripts || !project.scripts[script]) {
+            throw new Error(`Script ${script} not found`);
+        }
+        switch (project.type) {
+            case core_1.PROJECT_TYPE_IMAGE:
+            case core_1.PROJECT_TYPE_DOCKERFILE:
+            case core_1.PROJECT_TYPE_PRESET: {
+                const container = await this.dockerService.getContainer(project.containerName);
+                if (!container) {
+                    throw new Error("The project is not started");
+                }
+                const cli = new PublicCli();
+                const cmd = cli.parseCommand(`command ${project.scripts[script]}`, 0);
+                this.logService.debug(cmd);
+                const exec = await container.exec({
+                    AttachStdin: true,
+                    AttachStdout: true,
+                    AttachStderr: true,
+                    Tty: process.stdin.isTTY,
+                    Cmd: [...cmd, ...args || []]
+                });
+                const stream = await exec.start({
+                    hijack: true,
+                    stdin: true,
+                    Tty: process.stdin.isTTY
+                });
+                await this.dockerService.attachStream(stream);
+                break;
+            }
+            case core_1.PROJECT_TYPE_COMPOSE: {
+                console.log(service, script, args);
+                break;
+            }
+        }
+    }
     async exec(project, command) {
         switch (project.type) {
             case core_1.PROJECT_TYPE_IMAGE:
@@ -244,8 +299,8 @@ exports.ProjectService = ProjectService = __decorate([
     __metadata("design:paramtypes", [core_1.AppConfigService,
         core_1.ProcessService,
         core_1.EventService,
-        docker_1.DockerService,
-        docker_1.ComposeService,
+        docker_module_1.DockerService,
+        docker_module_1.ComposeService,
         ProjectRepository_1.ProjectRepository,
         preset_1.PresetService,
         preset_1.PresetRepository,

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

@@ -6,10 +6,9 @@ export declare class ProxyController {
     protected readonly eventService: EventService;
     protected readonly projectService: ProjectService;
     protected readonly proxyService: ProxyService;
-    protected containerName: string;
     constructor(appConfigService: AppConfigService, eventService: EventService, projectService: ProjectService, proxyService: ProxyService);
     onProjectStart(project: Project): Promise<void>;
-    onProjectStop(project: Project): Promise<void>;
+    onProjectStop(_project: Project): Promise<void>;
     getProjectNames(): string[];
     init(httpPort?: number, httpsPort?: number, sshPort?: number, sshPassword?: string): Promise<void>;
     start(restart?: boolean, rebuild?: boolean): Promise<void>;

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

@@ -27,7 +27,6 @@ let ProxyController = class ProxyController {
         this.eventService = eventService;
         this.projectService = projectService;
         this.proxyService = proxyService;
-        this.containerName = "proxy.workspace";
         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));
@@ -42,7 +41,7 @@ let ProxyController = class ProxyController {
         }
         await this.start();
     }
-    async onProjectStop(project) {
+    async onProjectStop(_project) {
     }
     getProjectNames() {
         const projects = this.projectService.search();

package/lib/modules/proxy/index.js

@@ -5,10 +5,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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 docker_module_1 = __importDefault(require("@wocker/docker-module"));
 const project_1 = require("../project");
 const CertController_1 = require("./controllers/CertController");
 const ProxyController_1 = require("./controllers/ProxyController");
@@ -22,7 +25,7 @@ exports.ProxyModule = ProxyModule;
 exports.ProxyModule = ProxyModule = __decorate([
     (0, core_1.Module)({
         imports: [
-            docker_1.DockerModule,
+            docker_module_1.default,
             project_1.ProjectModule
         ],
         controllers: [

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

@@ -1,5 +1,5 @@
 import { Project, AppFileSystemService } from "@wocker/core";
-import { DockerService } from "../../docker";
+import { DockerService } from "@wocker/docker-module";
 import { ProxyService } from "./ProxyService";
 type CertMap = {
     [name: string]: string[];

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

@@ -47,9 +47,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CertService = void 0;
 const core_1 = require("@wocker/core");
+const docker_module_1 = require("@wocker/docker-module");
 const Path = __importStar(require("path"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
-const docker_1 = require("../../docker");
 const ProxyService_1 = require("./ProxyService");
 let CertService = class CertService {
     constructor(fs, proxyService, dockerService) {
@@ -72,7 +72,7 @@ let CertService = class CertService {
             throw new Error("Cert name missing");
         }
         await this.proxyService.start();
-        const container = await this.dockerService.getContainer("proxy.workspace");
+        const container = await this.dockerService.getContainer("wocker-proxy");
         if (!container) {
             throw new Error("Proxy not started");
         }
@@ -146,5 +146,5 @@ exports.CertService = CertService = __decorate([
     (0, core_1.Injectable)(),
     __metadata("design:paramtypes", [core_1.AppFileSystemService,
         ProxyService_1.ProxyService,
-        docker_1.DockerService])
+        docker_module_1.DockerService])
 ], CertService);

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

@@ -1,10 +1,11 @@
 import { Project, AppConfigService, AppFileSystemService, ProxyService as CoreProxyService } from "@wocker/core";
-import { DockerService } from "../../docker";
+import { DockerService } from "@wocker/docker-module";
 export declare class ProxyService extends CoreProxyService {
     protected readonly appConfigService: AppConfigService;
     protected readonly fs: AppFileSystemService;
     protected readonly dockerService: DockerService;
     protected containerName: string;
+    protected oldContainerNames: string[];
     protected imageName: string;
     protected oldImages: string[];
     constructor(appConfigService: AppConfigService, fs: AppFileSystemService, dockerService: DockerService);

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

@@ -44,17 +44,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProxyService = void 0;
 const core_1 = require("@wocker/core");
+const docker_module_1 = require("@wocker/docker-module");
 const utils_1 = require("@wocker/utils");
 const Path = __importStar(require("path"));
 const env_1 = require("../../../env");
-const docker_1 = require("../../docker");
 let ProxyService = class ProxyService extends core_1.ProxyService {
     constructor(appConfigService, fs, dockerService) {
         super();
         this.appConfigService = appConfigService;
         this.fs = fs;
         this.dockerService = dockerService;
-        this.containerName = "proxy.workspace";
+        this.containerName = "wocker-proxy";
+        this.oldContainerNames = ["proxy.workspace"];
         this.imageName = "wocker-proxy:1.0.1";
         this.oldImages = [
             "wocker-proxy:1.0.0"
@@ -75,6 +76,9 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
         }
         let container = await this.dockerService.getContainer(this.containerName);
         if (!container) {
+            for (const containerName of this.oldContainerNames) {
+                await this.dockerService.removeContainer(containerName);
+            }
             console.info("Proxy starting...");
             await this.build(rebuild);
             const fs = this.fs;
@@ -163,5 +167,5 @@ exports.ProxyService = ProxyService = __decorate([
     (0, core_1.Injectable)("PROXY_SERVICE"),
     __metadata("design:paramtypes", [core_1.AppConfigService,
         core_1.AppFileSystemService,
-        docker_1.DockerService])
+        docker_module_1.DockerService])
 ], ProxyService);

package/lib/utils/exec.js

@@ -8,10 +8,13 @@ const exec = async (command, options) => {
         maxBuffer: Infinity
     });
     return new Promise((resolve, reject) => {
-        let data = "";
+        let data = "", errData = "";
         worker.stdout.on("data", (chunk) => {
             data += chunk.toString();
         });
+        worker.stderr.on("data", (chunk) => {
+            errData += chunk.toString();
+        });
         worker.on("exit", (code) => {
             if (code !== 0) {
                 reject(new Error(`Process exited with code ${code}`));

package/lib/utils/get-cursor-position.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCursorPosition = void 0;
-const code = '\x1b[6n';
+const code = "\x1b[6n";
 const getCursorPosition = async () => {
     process.stdin.resume();
     process.stdin.setRawMode(true);

package/package.json

@@ -1,6 +1,7 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.25",
+    "type": "commonjs",
+    "version": "1.0.27",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -13,7 +14,7 @@
         "devops"
     ],
     "bin": {
-        "ws": "./bin/ws.js"
+        "ws": "lib/main.js"
     },
     "homepage": "https://kearisp.github.io/wocker",
     "repository": {
@@ -27,43 +28,43 @@
         "prepublishOnly": "npm run build",
         "start": "npm run watch",
         "build": "tsc --project tsconfig.build.json",
-        "watch": "tsc -w --project tsconfig.build.json",
+        "postbuild": "chmod +x ./lib/main.js",
+        "watch": "npm run build && tsc -w --project tsconfig.build.json",
         "test": "jest --colors",
         "test-watch": "jest --colors --watchAll",
         "make-coverage-badge": "make-coverage-badge"
     },
     "dependencies": {
-        "@wocker/core": "1.0.25",
-        "@wocker/utils": "^2.0.3",
+        "@wocker/core": "1.0.27",
+        "@wocker/docker-module": "^0.0.1",
+        "@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",
-        "fs": "^0.0.1-security",
         "keytar": "^7.9.0",
         "md5": "^2.3.0",
-        "os": "^0.1.2",
-        "path": "^0.12.7",
         "protobufjs": "^7.5.1",
         "unzipper": "^0.12.3",
         "yoctocolors-cjs": "^2.1.2"
     },
     "devDependencies": {
         "@types/dockerode": "^3.3.23",
-        "@types/jest": "^29.5.14",
+        "@types/jest": "^30.0.0",
         "@types/md5": "^2.3.2",
         "@types/mute-stream": "^0.0.4",
-        "@types/node": "^24.0.13",
+        "@types/node": "^24.5.2",
         "@types/unzipper": "^0.10.10",
-        "@wocker/testing": "1.0.2",
-        "jest": "^29.7.0",
+        "@wocker/docker-mock-module": "^0.0.1",
+        "@wocker/testing": "^1.0.4",
+        "jest": "^30.1.3",
         "make-coverage-badge": "^1.2.0",
-        "memfs": "^4.17.0",
-        "ts-jest": "^29.3.2",
+        "memfs": "^4.49.0",
+        "ts-jest": "^29.4.4",
         "ts-node": "^10.9.2",
-        "typescript": "^5.6.3",
+        "typescript": "^5.9.3",
         "unionfs": "^4.5.4"
     }
 }

package/plugins/dns/Dockerfile

@@ -0,0 +1,35 @@
+FROM docker.io/nginxproxy/docker-gen:0.15.0 AS docker-gen
+
+FROM docker.io/nginxproxy/forego:0.18.3 AS forego
+
+FROM alpine:edge
+
+RUN set -eu && \
+    apk --no-cache add \
+    tini \
+    bash \
+    dnsmasq-dnssec && \
+    mkdir -p /etc/default/ && \
+    echo -e "ENABLED=1\nIGNORE_RESOLVCONF=yes" > /etc/default/dnsmasq && \
+#    rm -f /etc/dnsmasq.conf && \
+    rm -rf /tmp/* /var/cache/apk/*
+
+#COPY ./dnsmasq.conf.tmpl /app/dnsmasq.conf.tmpl
+#COPY ./Procfile /app/Procfile
+
+#RUN wget https://github.com/jwilder/docker-gen/releases/download/0.3.3/docker-gen-linux-amd64-0.3.3.tar.gz && \
+#    tar xvzf docker-gen-linux-amd64-0.3.3.tar.gz && \
+#    rm docker-gen-linux-amd64-0.3.3.tar.gz && \
+#    mv docker-gen /usr/local/bin/
+
+# Install Forego + docker-gen
+COPY --from=forego /usr/local/bin/forego /usr/local/bin/forego
+COPY --from=docker-gen /usr/local/bin/docker-gen /usr/local/bin/docker-gen
+
+COPY app /app/
+RUN chmod 755 /app/dnsmasq.sh
+
+WORKDIR /app/
+
+#ENTRYPOINT ["/sbin/tini", "--", "honcho", "-f", "/app/Procfile", "start"]
+CMD ["forego", "start", "-r"]

package/plugins/dns/app/Procfile

@@ -0,0 +1,2 @@
+dockergen: docker-gen -watch -notify "pkill -HUP dnsmasq" dnsmasq.conf.tmpl /etc/dnsmasq.conf
+# dnsmasq: /app/dnsmasq.sh

package/plugins/dns/app/dnsmasq.conf.tmpl

@@ -0,0 +1,11 @@
+{{- $globals := dict }}
+{{- $_ := set $globals "containers" $ }}
+
+{{- range $hostname, $containers := groupByMulti $globals.containers "Env.VIRTUAL_HOST" "," }}
+{{ $hostname }}
+
+{{- range $container := $containers }}
+{{ printf "%#v" $container.Networks }}
+{{- end }}
+{{- end }}
+

package/plugins/dns/app/dnsmasq.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+conf="/etc/dnsmasq.conf"
+
+# Check if config file is not a directory
+if [ -d "$conf" ]; then
+    echo "The bind $conf maps to a file that does not exist!"
+    exit 1
+fi
+
+if [ ! -f "$conf" ]; then
+  conf="/etc/dnsmasq.custom"
+  template="/etc/dnsmasq.default"
+
+  if [ ! -f "$template" ]; then
+    echo "Your /etc directory does not contain a valid dnsmasq.conf file!"
+    exit 1
+  fi
+
+  rm -f "$conf"
+  cp "$template"  "$conf"
+
+  [ -n "$DNS1" ] && sed -i -e "s/1.0.0.1/$DNS1/g" "$conf"
+  [ -n "$DNS2" ] && sed -i -e "s/1.1.1.1/$DNS2/g" "$conf"
+fi
+
+exec dnsmasq "--conf-file=$conf" --no-daemon --no-resolv