@wocker/ws 1.0.26 → 1.0.28

package/lib/AppModule.js

@@ -1,13 +1,47 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppModule = void 0;
 const core_1 = require("@wocker/core");
+const docker_module_1 = __importStar(require("@wocker/docker-module"));
 const modules_1 = require("./modules");
 let AppModule = class AppModule {
 };
@@ -21,15 +55,15 @@ exports.AppModule = AppModule = __decorate([
             modules_1.PluginModule.register(),
             modules_1.ProjectModule,
             modules_1.PresetModule,
-            modules_1.DockerModule,
+            docker_module_1.default,
             modules_1.KeystoreModule,
             modules_1.ProxyModule
         ],
         exports: [
-            modules_1.DockerService,
+            docker_module_1.DockerService,
             modules_1.CertService,
-            modules_1.ContainerService,
-            modules_1.ImageService,
+            docker_module_1.ContainerService,
+            docker_module_1.ImageService,
             modules_1.ProxyService,
             modules_1.KeystoreService,
             modules_1.PresetRepository,

package/lib/modules/dns/controllers/DnsController.js

@@ -29,6 +29,7 @@ let DnsController = class DnsController {
 exports.DnsController = DnsController;
 __decorate([
     (0, core_1.Command)("dns:start"),
+    (0, core_1.Description)("Starting DNS service"),
     __param(0, (0, core_1.Option)("restart", "r")),
     __param(1, (0, core_1.Option)("rebuild", "b")),
     __metadata("design:type", Function),
@@ -37,11 +38,13 @@ __decorate([
 ], DnsController.prototype, "start", null);
 __decorate([
     (0, core_1.Command)("dns:stop"),
+    (0, core_1.Description)("Stopping DNS service"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], DnsController.prototype, "stop", null);
 exports.DnsController = DnsController = __decorate([
     (0, core_1.Controller)(),
+    (0, core_1.Description)("DNS commands"),
     __metadata("design:paramtypes", [DnsService_1.DnsService])
 ], DnsController);

package/lib/modules/dns/index.js

@@ -5,12 +5,15 @@ 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 };
+};
 var DnsModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DnsModule = void 0;
 const core_1 = require("@wocker/core");
+const docker_module_1 = __importDefault(require("@wocker/docker-module"));
 const core_2 = require("../core");
-const docker_1 = require("../docker");
 const DnsController_1 = require("./controllers/DnsController");
 const DnsService_1 = require("./services/DnsService");
 let DnsModule = DnsModule_1 = class DnsModule {
@@ -23,7 +26,7 @@ let DnsModule = DnsModule_1 = class DnsModule {
                     return {};
                 }
                 return {
-                    imports: [docker_1.DockerModule],
+                    imports: [docker_module_1.default],
                     controllers: [DnsController_1.DnsController],
                     providers: [DnsService_1.DnsService]
                 };

package/lib/modules/dns/services/DnsService.d.ts

@@ -1,4 +1,4 @@
-import { DockerService } from "../../docker";
+import { DockerService } from "@wocker/docker-module";
 export declare class DnsService {
     protected readonly dockerService: DockerService;
     protected imageName: string;

package/lib/modules/dns/services/DnsService.js

@@ -14,8 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DnsService = void 0;
 const core_1 = require("@wocker/core");
+const docker_module_1 = require("@wocker/docker-module");
 const path_1 = __importDefault(require("path"));
-const docker_1 = require("../../docker");
 const env_1 = require("../../../env");
 let DnsService = class DnsService {
     constructor(dockerService) {
@@ -73,5 +73,5 @@ let DnsService = class DnsService {
 exports.DnsService = DnsService;
 exports.DnsService = DnsService = __decorate([
     (0, core_1.Injectable)(),
-    __metadata("design:paramtypes", [docker_1.DockerService])
+    __metadata("design:paramtypes", [docker_module_1.DockerService])
 ], DnsService);

package/lib/modules/index.d.ts

@@ -1,6 +1,5 @@
 export * from "./core";
 export * from "./dns";
-export * from "./docker";
 export * from "./keystore";
 export * from "./package-manager";
 export * from "./plugin";

package/lib/modules/index.js

@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./core"), exports);
 __exportStar(require("./dns"), exports);
-__exportStar(require("./docker"), exports);
 __exportStar(require("./keystore"), exports);
 __exportStar(require("./package-manager"), exports);
 __exportStar(require("./plugin"), exports);

package/lib/modules/preset/controllers/PresetController.d.ts

@@ -1,5 +1,5 @@
 import { AppConfigService } from "@wocker/core";
-import { DockerService } from "../../docker";
+import { DockerService } from "@wocker/docker-module";
 import { PresetRepository } from "../repositories/PresetRepository";
 import { PresetService } from "../services/PresetService";
 export declare class PresetController {

package/lib/modules/preset/controllers/PresetController.js

@@ -17,9 +17,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PresetController = void 0;
 const core_1 = require("@wocker/core");
+const docker_module_1 = require("@wocker/docker-module");
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const utils_1 = require("@wocker/utils");
-const docker_1 = require("../../docker");
 const PresetRepository_1 = require("../repositories/PresetRepository");
 const PresetService_1 = require("../services/PresetService");
 let PresetController = class PresetController {
@@ -158,7 +158,7 @@ exports.PresetController = PresetController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Preset commands"),
     __metadata("design:paramtypes", [core_1.AppConfigService,
-        docker_1.DockerService,
+        docker_module_1.DockerService,
         PresetRepository_1.PresetRepository,
         PresetService_1.PresetService])
 ], PresetController);

package/lib/modules/preset/controllers/PresetListener.d.ts

@@ -1,5 +1,5 @@
 import { EventService, Project, AppConfigService } from "@wocker/core";
-import { DockerService } from "../../docker";
+import { DockerService } from "@wocker/docker-module";
 import { PresetRepository } from "../repositories/PresetRepository";
 import { PresetService } from "../services/PresetService";
 export declare class PresetListener {

package/lib/modules/preset/controllers/PresetListener.js

@@ -11,8 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PresetListener = void 0;
 const core_1 = require("@wocker/core");
+const docker_module_1 = require("@wocker/docker-module");
 const utils_1 = require("@wocker/utils");
-const docker_1 = require("../../docker");
 const PresetRepository_1 = require("../repositories/PresetRepository");
 const PresetService_1 = require("../services/PresetService");
 const utils_2 = require("../../../utils");
@@ -137,7 +137,7 @@ exports.PresetListener = PresetListener = __decorate([
     (0, core_1.Controller)(),
     __metadata("design:paramtypes", [core_1.AppConfigService,
         core_1.EventService,
-        docker_1.DockerService,
+        docker_module_1.DockerService,
         PresetRepository_1.PresetRepository,
         PresetService_1.PresetService])
 ], PresetListener);

package/lib/modules/preset/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.PresetService = exports.PresetRepository = exports.PresetModule = void 0;
 const core_1 = require("@wocker/core");
-const docker_1 = require("../docker");
+const docker_module_1 = __importDefault(require("@wocker/docker-module"));
 const PresetController_1 = require("./controllers/PresetController");
 const PresetListener_1 = require("./controllers/PresetListener");
 const PresetRepository_1 = require("./repositories/PresetRepository");
@@ -21,7 +24,7 @@ exports.PresetModule = PresetModule;
 exports.PresetModule = PresetModule = __decorate([
     (0, core_1.Module)({
         imports: [
-            docker_1.DockerModule
+            docker_module_1.default
         ],
         controllers: [
             PresetController_1.PresetController,

package/lib/modules/preset/repositories/PresetRepository.d.ts

@@ -1,4 +1,4 @@
-import { AppConfig, PresetServiceSearchOptions as SearchOptions, Preset, PresetSource, AppConfigService, LogService } from "@wocker/core";
+import { AppConfig, PresetServiceSearchOptions as SearchOptions, Preset, PresetSource, AppConfigService, LogService, FileSystemDriver } from "@wocker/core";
 type PresetData = {
     name: string;
     source: PresetSource;
@@ -7,7 +7,8 @@ type PresetData = {
 export declare class PresetRepository {
     protected readonly appConfigService: AppConfigService;
     protected readonly logService: LogService;
-    constructor(appConfigService: AppConfigService, logService: LogService);
+    protected readonly driver: FileSystemDriver;
+    constructor(appConfigService: AppConfigService, logService: LogService, driver: FileSystemDriver);
     protected load(data: PresetData): Preset;
     protected configs(): AppConfig["presets"];
     search(options?: SearchOptions): Preset[];

package/lib/modules/preset/repositories/PresetRepository.js

@@ -8,17 +8,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 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.PresetRepository = void 0;
 const core_1 = require("@wocker/core");
 const env_1 = require("../../../env");
 let PresetRepository = class PresetRepository {
-    constructor(appConfigService, logService) {
+    constructor(appConfigService, logService, driver) {
         this.appConfigService = appConfigService;
         this.logService = logService;
+        this.driver = driver;
     }
     load(data) {
-        const _this = this, fs = new core_1.FileSystem(data.path);
+        const _this = this, fs = new core_1.FileSystem(data.path, this.driver);
         const config = {
             ...fs.readJSON("config.json"),
             name: data.name,
@@ -52,7 +56,7 @@ let PresetRepository = class PresetRepository {
         }(config);
     }
     configs() {
-        const fs = new core_1.FileSystem(env_1.PRESETS_DIR), dirs = fs.exists("") ? fs.readdir("") : [];
+        const fs = new core_1.FileSystem(env_1.PRESETS_DIR, this.driver), dirs = fs.exists("") ? fs.readdir("") : [];
         const { presets = [] } = this.appConfigService.config;
         return [
             ...dirs.map((name) => {
@@ -108,6 +112,7 @@ let PresetRepository = class PresetRepository {
 exports.PresetRepository = PresetRepository;
 exports.PresetRepository = PresetRepository = __decorate([
     (0, core_1.Injectable)(),
+    __param(2, (0, core_1.Inject)(core_1.FILE_SYSTEM_DRIVER_KEY)),
     __metadata("design:paramtypes", [core_1.AppConfigService,
-        core_1.LogService])
+        core_1.LogService, Object])
 ], PresetRepository);

package/lib/modules/preset/services/PresetService.js

@@ -136,7 +136,7 @@ let PresetService = class PresetService {
         return preset;
     }
     async init() {
-        const fs = new core_1.FileSystem(this.appConfigService.pwd());
+        const fs = this.fs.cd(this.appConfigService.pwd());
         let preset = this.presetRepository.searchOne({
             path: this.appConfigService.pwd()
         });

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

@@ -1,4 +1,5 @@
-import { AppConfigService, AppFileSystemService, ProcessService, ProjectType, EventService, DockerService, LogService } from "@wocker/core";
+import { AppConfigService, AppFileSystemService, ProcessService, ProjectType, EventService, LogService } from "@wocker/core";
+import { DockerService } from "@wocker/docker-module";
 import { PresetService } from "../../preset";
 import { ProjectService } from "../services/ProjectService";
 export declare class ProjectController {

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

@@ -17,6 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectController = void 0;
 const core_1 = require("@wocker/core");
+const docker_module_1 = require("@wocker/docker-module");
 const utils_1 = require("@wocker/utils");
 const path_1 = __importDefault(require("path"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
@@ -679,6 +680,7 @@ __decorate([
 ], ProjectController.prototype, "buildArgsList", null);
 __decorate([
     (0, core_1.Command)("build-args:get [...buildArgs]"),
+    (0, core_1.Description)("Get build args"),
     __param(0, (0, core_1.Param)("buildArgs")),
     __param(1, (0, core_1.Option)("name", "n")),
     __param(1, (0, core_1.Description)("The name of the project")),
@@ -760,6 +762,7 @@ __decorate([
 ], ProjectController.prototype, "clearDomain", null);
 __decorate([
     (0, core_1.Command)("ports"),
+    (0, core_1.Description)("List of ports"),
     __param(0, (0, core_1.Option)("name", "n")),
     __param(0, (0, core_1.Description)("The name of the project")),
     __param(1, (0, core_1.Option)("service", "s")),
@@ -769,6 +772,7 @@ __decorate([
 ], ProjectController.prototype, "ports", null);
 __decorate([
     (0, core_1.Command)("port:add <host-port>:<container-port>"),
+    (0, core_1.Description)("Add port"),
     __param(0, (0, core_1.Param)("host-port")),
     __param(1, (0, core_1.Param)("container-port")),
     __param(2, (0, core_1.Option)("name", {
@@ -782,6 +786,7 @@ __decorate([
 ], ProjectController.prototype, "addPort", null);
 __decorate([
     (0, core_1.Command)("port:remove <host-port>:<container-port>"),
+    (0, core_1.Description)("Remove port"),
     __param(0, (0, core_1.Param)("host-port")),
     __param(1, (0, core_1.Param)("container-port")),
     __param(2, (0, core_1.Option)("name", {
@@ -795,6 +800,7 @@ __decorate([
 ], ProjectController.prototype, "removePort", null);
 __decorate([
     (0, core_1.Command)("port:clear"),
+    (0, core_1.Description)("Clear ports"),
     __param(0, (0, core_1.Option)("name", "n")),
     __param(0, (0, core_1.Description)("The name of the project")),
     __metadata("design:type", Function),
@@ -803,6 +809,7 @@ __decorate([
 ], ProjectController.prototype, "clearPorts", null);
 __decorate([
     (0, core_1.Command)("config"),
+    (0, core_1.Description)("List of environment variables"),
     __param(0, (0, core_1.Option)("name", "n")),
     __param(0, (0, core_1.Description)("The name of the project")),
     __param(1, (0, core_1.Option)("global", "g")),
@@ -814,6 +821,7 @@ __decorate([
 ], ProjectController.prototype, "configList", null);
 __decorate([
     (0, core_1.Command)("config:get [...key]"),
+    (0, core_1.Description)("Get environment variable"),
     __param(0, (0, core_1.Param)("key")),
     __param(1, (0, core_1.Option)("name", "n")),
     __param(1, (0, core_1.Description)("The name of the project")),
@@ -837,6 +845,7 @@ __decorate([
 ], ProjectController.prototype, "configSet", null);
 __decorate([
     (0, core_1.Command)("config:unset [...configs]"),
+    (0, core_1.Description)("Unset environment variable"),
     __param(0, (0, core_1.Param)("configs")),
     __param(1, (0, core_1.Option)("global", "g")),
     __param(2, (0, core_1.Option)("name", "n")),
@@ -849,6 +858,7 @@ __decorate([
 ], ProjectController.prototype, "configUnset", null);
 __decorate([
     (0, core_1.Command)("volumes"),
+    (0, core_1.Description)("List of volumes"),
     __param(0, (0, core_1.Option)("name", "n")),
     __param(0, (0, core_1.Description)("The name of the project")),
     __metadata("design:type", Function),
@@ -857,6 +867,7 @@ __decorate([
 ], ProjectController.prototype, "volumeList", null);
 __decorate([
     (0, core_1.Command)("volume:mount [...volumes]"),
+    (0, core_1.Description)("Mount volume"),
     __param(0, (0, core_1.Param)("volumes")),
     __param(1, (0, core_1.Option)("name", "n")),
     __param(1, (0, core_1.Description)("The name of the project")),
@@ -866,6 +877,7 @@ __decorate([
 ], ProjectController.prototype, "volumeMount", null);
 __decorate([
     (0, core_1.Command)("volume:unmount [...volumes]"),
+    (0, core_1.Description)("Unmount volume"),
     __param(0, (0, core_1.Param)("volumes")),
     __param(1, (0, core_1.Option)("name", "n")),
     __param(1, (0, core_1.Description)("The name of the project")),
@@ -923,6 +935,7 @@ __decorate([
 ], ProjectController.prototype, "attach", null);
 __decorate([
     (0, core_1.Command)("run <script> [...args]"),
+    (0, core_1.Description)("Run script"),
     __param(0, (0, core_1.Param)("script")),
     __param(1, (0, core_1.Param)("args")),
     __param(2, (0, core_1.Option)("name", "n")),
@@ -935,6 +948,7 @@ __decorate([
 ], ProjectController.prototype, "run", null);
 __decorate([
     (0, core_1.Command)("exec [...command]"),
+    (0, core_1.Description)("Execute command"),
     __param(0, (0, core_1.Param)("command")),
     __param(1, (0, core_1.Option)("name", "n")),
     __param(1, (0, core_1.Description)("The name of the project")),
@@ -968,6 +982,6 @@ exports.ProjectController = ProjectController = __decorate([
         ProjectService_1.ProjectService,
         preset_1.PresetService,
         core_1.EventService,
-        core_1.DockerService,
+        docker_module_1.DockerService,
         core_1.LogService])
 ], ProjectController);

package/lib/modules/project/index.js

@@ -5,11 +5,14 @@ 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");
@@ -23,9 +26,9 @@ 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,

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

@@ -1,5 +1,5 @@
 import { AppConfigService, EventService, LogService, ProcessService, Project, ProjectService as CoreProjectService, ProjectRepositorySearchParams as SearchParams } from "@wocker/core";
-import { ComposeService, DockerService } from "../../docker";
+import { ComposeService, DockerService } from "@wocker/docker-module";
 import { PresetRepository, PresetService } from "../../preset";
 import { ProjectRepository } from "../repositories/ProjectRepository";
 export declare class ProjectService extends CoreProjectService {

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

@@ -11,8 +11,8 @@ 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_module_1 = require("@wocker/docker-module");
 const cli_1 = require("@kearisp/cli");
-const docker_1 = require("../../docker");
 const preset_1 = require("../../preset");
 const ProjectRepository_1 = require("../repositories/ProjectRepository");
 class PublicCli extends cli_1.Cli {
@@ -182,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
                         });
                     }
@@ -297,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/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) {
@@ -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,5 +1,5 @@
 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;

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

@@ -44,10 +44,10 @@ 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();
@@ -167,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/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@wocker/ws",
     "type": "commonjs",
-    "version": "1.0.26",
+    "version": "1.0.28",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -14,7 +14,7 @@
         "devops"
     ],
     "bin": {
-        "ws": "./lib/main.js"
+        "ws": "lib/main.js"
     },
     "homepage": "https://kearisp.github.io/wocker",
     "repository": {
@@ -35,7 +35,8 @@
         "make-coverage-badge": "make-coverage-badge"
     },
     "dependencies": {
-        "@wocker/core": "1.0.26",
+        "@wocker/core": "1.0.28",
+        "@wocker/docker-module": "^0.0.1",
         "@wocker/utils": "^2.0.6",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
@@ -56,7 +57,8 @@
         "@types/mute-stream": "^0.0.4",
         "@types/node": "^24.5.2",
         "@types/unzipper": "^0.10.10",
-        "@wocker/testing": "1.0.3",
+        "@wocker/docker-mock-module": "^0.0.1",
+        "@wocker/testing": "^1.0.4",
         "jest": "^30.1.3",
         "make-coverage-badge": "^1.2.0",
         "memfs": "^4.49.0",

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

@@ -1,9 +0,0 @@
-import { ComposeService } from "./services/ComposeService";
-import { ContainerService } from "./services/ContainerService";
-import { DockerService } from "./services/DockerService";
-import { ImageService } from "./services/ImageService";
-import { ModemService } from "./services/ModemService";
-import { ProtoService } from "./services/ProtoService";
-export declare class DockerModule {
-}
-export { ComposeService, ContainerService, DockerService, ImageService, ModemService, ProtoService };