@wocker/ws 1.0.23 → 1.0.24

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

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

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

@@ -19,20 +19,18 @@ exports.ProxyController = void 0;
 const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
-const AppConfigService_1 = require("../../../services/AppConfigService");
-const AppEventsService_1 = require("../../../services/AppEventsService");
-const ProjectService_1 = require("../../../services/ProjectService");
+const project_1 = require("../../project");
 const ProxyService_1 = require("../services/ProxyService");
 let ProxyController = class ProxyController {
-    constructor(appConfigService, appEventsService, projectService, proxyService) {
+    constructor(appConfigService, eventService, projectService, proxyService) {
         this.appConfigService = appConfigService;
-        this.appEventsService = appEventsService;
+        this.eventService = eventService;
         this.projectService = projectService;
         this.proxyService = proxyService;
         this.containerName = "proxy.workspace";
-        this.appEventsService.on("project:init", (project) => this.proxyService.init(project));
-        this.appEventsService.on("project:start", (project) => this.onProjectStart(project));
-        this.appEventsService.on("project:stop", (project) => this.onProjectStop(project));
+        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 onProjectStart(project) {
         if (project.domains.length === 0) {
@@ -176,8 +174,8 @@ __decorate([
 exports.ProxyController = ProxyController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Proxy commands"),
-    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
-        AppEventsService_1.AppEventsService,
-        ProjectService_1.ProjectService,
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.EventService,
+        project_1.ProjectService,
         ProxyService_1.ProxyService])
 ], ProxyController);

package/lib/modules/proxy/index.js

@@ -9,6 +9,7 @@ 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 project_1 = require("../project");
 const CertController_1 = require("./controllers/CertController");
 const ProxyController_1 = require("./controllers/ProxyController");
 const CertService_1 = require("./services/CertService");
@@ -21,7 +22,8 @@ exports.ProxyModule = ProxyModule;
 exports.ProxyModule = ProxyModule = __decorate([
     (0, core_1.Module)({
         imports: [
-            docker_1.DockerModule
+            docker_1.DockerModule,
+            project_1.ProjectModule
         ],
         controllers: [
             CertController_1.CertController,

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

@@ -1,15 +1,14 @@
-import { Project } from "@wocker/core";
+import { Project, AppFileSystemService } from "@wocker/core";
 import { DockerService } from "../../docker";
-import { AppConfigService } from "../../../services/AppConfigService";
 import { ProxyService } from "./ProxyService";
 type CertMap = {
     [name: string]: string[];
 };
 export declare class CertService {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly fs: AppFileSystemService;
     protected readonly proxyService: ProxyService;
     protected readonly dockerService: DockerService;
-    constructor(appConfigService: AppConfigService, proxyService: ProxyService, dockerService: DockerService);
+    constructor(fs: AppFileSystemService, proxyService: ProxyService, dockerService: DockerService);
     list(): Promise<string>;
     generate(certName: string, dns: string[]): Promise<void>;
     getCertsMap(): CertMap;

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

@@ -50,11 +50,10 @@ const core_1 = require("@wocker/core");
 const Path = __importStar(require("path"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const docker_1 = require("../../docker");
-const AppConfigService_1 = require("../../../services/AppConfigService");
 const ProxyService_1 = require("./ProxyService");
 let CertService = class CertService {
-    constructor(appConfigService, proxyService, dockerService) {
-        this.appConfigService = appConfigService;
+    constructor(fs, proxyService, dockerService) {
+        this.fs = fs;
         this.proxyService = proxyService;
         this.dockerService = dockerService;
     }
@@ -94,7 +93,7 @@ let CertService = class CertService {
         });
     }
     getCertsMap() {
-        const files = this.appConfigService.fs.readdir("certs/projects");
+        const files = this.fs.readdir("certs/projects");
         return files.reduce((res, file) => {
             const ext = Path.extname(file);
             const name = Path.basename(file, ext);
@@ -137,7 +136,7 @@ let CertService = class CertService {
             return;
         }
         for (const ext of certs[name]) {
-            this.appConfigService.fs.rm(`certs/projects/${name}${ext}`);
+            this.fs.rm(`certs/projects/${name}${ext}`);
         }
         console.info(`Cert ${name} deleted`);
     }
@@ -145,7 +144,7 @@ let CertService = class CertService {
 exports.CertService = CertService;
 exports.CertService = CertService = __decorate([
     (0, core_1.Injectable)(),
-    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppFileSystemService,
         ProxyService_1.ProxyService,
         docker_1.DockerService])
 ], CertService);

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

@@ -1,13 +1,13 @@
-import { Project, ProxyService as CoreProxyService } from "@wocker/core";
-import { AppConfigService } from "../../../services/AppConfigService";
+import { Project, AppConfigService, AppFileSystemService, ProxyService as CoreProxyService } from "@wocker/core";
 import { DockerService } from "../../docker";
 export declare class ProxyService extends CoreProxyService {
     protected readonly appConfigService: AppConfigService;
+    protected readonly fs: AppFileSystemService;
     protected readonly dockerService: DockerService;
     protected containerName: string;
     protected imageName: string;
     protected oldImages: string[];
-    constructor(appConfigService: AppConfigService, dockerService: DockerService);
+    constructor(appConfigService: AppConfigService, 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

@@ -47,12 +47,12 @@ const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const Path = __importStar(require("path"));
 const env_1 = require("../../../env");
-const AppConfigService_1 = require("../../../services/AppConfigService");
 const docker_1 = require("../../docker");
 let ProxyService = class ProxyService extends core_1.ProxyService {
-    constructor(appConfigService, dockerService) {
+    constructor(appConfigService, fs, dockerService) {
         super();
         this.appConfigService = appConfigService;
+        this.fs = fs;
         this.dockerService = dockerService;
         this.containerName = "proxy.workspace";
         this.imageName = "wocker-proxy:1.0.1";
@@ -77,15 +77,15 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
         if (!container) {
             console.info("Proxy starting...");
             await this.build(rebuild);
-            const fs = this.appConfigService.fs;
-            if (!this.appConfigService.fs.exists("certs/ca")) {
-                this.appConfigService.fs.mkdir("certs/ca", {
+            const fs = this.fs;
+            if (!this.fs.exists("certs/ca")) {
+                this.fs.mkdir("certs/ca", {
                     recursive: true,
                     mode: 0o700
                 });
             }
-            if (!this.appConfigService.fs.exists("certs/projects")) {
-                this.appConfigService.fs.mkdir("certs/projects", {
+            if (!this.fs.exists("certs/projects")) {
+                this.fs.mkdir("certs/projects", {
                     recursive: true,
                     mode: 0o700
                 });
@@ -96,10 +96,9 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
                     mode: 0o700
                 });
             }
-            const config = this.appConfigService.config;
-            const httpPort = config.getMeta("PROXY_HTTP_PORT", "80");
-            const httpsPort = config.getMeta("PROXY_HTTPS_PORT", "443");
-            const sshPort = config.getMeta("PROXY_SSH_PORT", "22");
+            const httpPort = this.appConfigService.getMeta("PROXY_HTTP_PORT", "80");
+            const httpsPort = this.appConfigService.getMeta("PROXY_HTTPS_PORT", "443");
+            const sshPort = this.appConfigService.getMeta("PROXY_SSH_PORT", "22");
             container = await this.dockerService.createContainer({
                 name: this.containerName,
                 image: this.imageName,
@@ -111,7 +110,7 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
                 ports: [
                     `${httpPort}:80`,
                     `${httpsPort}:443`,
-                    ...config.getMeta("PROXY_SSH_PASSWORD") ? [
+                    ...this.appConfigService.getMeta("PROXY_SSH_PASSWORD") ? [
                         `${sshPort}:22`
                     ] : []
                 ],
@@ -145,13 +144,12 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
         for (const oldImage of this.oldImages) {
             await this.dockerService.imageRm(oldImage);
         }
-        const config = this.appConfigService.config;
         await this.dockerService.buildImage({
             tag: this.imageName,
             context: Path.join(env_1.PLUGINS_DIR, "proxy"),
             src: "./Dockerfile",
             buildArgs: {
-                SSH_PASSWORD: config.getMeta("PROXY_SSH_PASSWORD")
+                SSH_PASSWORD: this.appConfigService.getMeta("PROXY_SSH_PASSWORD")
             }
         });
     }
@@ -162,6 +160,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", [AppConfigService_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.AppFileSystemService,
         docker_1.DockerService])
 ], ProxyService);

package/lib/services/PluginService.d.ts

@@ -1,6 +1,4 @@
-import { Cli } from "@wocker/core";
-import { AppConfigService } from "./AppConfigService";
-import { LogService } from "./LogService";
+import { Cli, AppConfigService, LogService } from "@wocker/core";
 import { NpmService } from "./NpmService";
 import { Plugin } from "../makes";
 export declare class PluginService {

package/lib/services/PluginService.js

@@ -49,8 +49,6 @@ exports.PluginService = void 0;
 const core_1 = require("@wocker/core");
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
-const AppConfigService_1 = require("./AppConfigService");
-const LogService_1 = require("./LogService");
 const NpmService_1 = require("./NpmService");
 const makes_1 = require("../makes");
 const utils_1 = require("../utils");
@@ -62,15 +60,14 @@ let PluginService = class PluginService {
         this.cli = cli;
     }
     getPluginsTable() {
-        const config = this.appConfigService.config;
         const table = new cli_table3_1.default({
             head: ["Name", "Env"],
             colWidths: [30]
         });
-        if (config.plugins.length === 0) {
+        if (this.appConfigService.plugins.length === 0) {
             return yoctocolors_cjs_1.default.gray("No plugins installed");
         }
-        for (const plugin of config.plugins) {
+        for (const plugin of this.appConfigService.plugins) {
             table.push([plugin.name, plugin.env]);
         }
         return table.toString();
@@ -92,7 +89,7 @@ let PluginService = class PluginService {
         const fullName = `${prefix}${name}${suffix}`;
         try {
             if (await this.checkPlugin(fullName)) {
-                this.appConfigService.config.addPlugin(fullName);
+                this.appConfigService.addPlugin(fullName);
                 this.appConfigService.save();
                 console.info(`Plugin ${fullName} activated`);
                 return;
@@ -101,7 +98,7 @@ let PluginService = class PluginService {
             const env = packageInfo["dist-tags"].beta && beta ? "beta" : "latest";
             await this.npmService.install(fullName, env);
             if (await this.checkPlugin(fullName)) {
-                this.appConfigService.config.addPlugin(fullName, env);
+                this.appConfigService.addPlugin(fullName, env);
                 this.appConfigService.save();
                 console.info(`Plugin ${fullName}@${env} activated`);
                 return;
@@ -114,7 +111,7 @@ let PluginService = class PluginService {
     async uninstall(pluginName) {
         const [, prefix = "@wocker/", name, suffix = "-plugin"] = /^(@wocker\/)?(\w+)(-plugin)?$/.exec(pluginName) || [];
         const fullName = `${prefix}${name}${suffix}`;
-        this.appConfigService.config.removePlugin(fullName);
+        this.appConfigService.removePlugin(fullName);
         this.appConfigService.save();
         console.info(`Plugin ${fullName} deactivated`);
     }
@@ -123,11 +120,10 @@ let PluginService = class PluginService {
         return new makes_1.Plugin(type);
     }
     async update() {
-        const config = this.appConfigService.config;
-        if (!config.plugins) {
+        if (this.appConfigService.plugins.length === 0) {
             return;
         }
-        for (const plugin of config.plugins) {
+        for (const plugin of this.appConfigService.plugins) {
             console.info(`Checking ${plugin.name}...`);
             try {
                 const current = await this.getCurrentVersion(plugin.name);
@@ -163,8 +159,8 @@ let PluginService = class PluginService {
 exports.PluginService = PluginService;
 exports.PluginService = PluginService = __decorate([
     (0, core_1.Injectable)(),
-    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppConfigService,
         NpmService_1.NpmService,
-        LogService_1.LogService,
+        core_1.LogService,
         core_1.Cli])
 ], PluginService);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.23",
+    "version": "1.0.24",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -33,13 +33,12 @@
         "make-coverage-badge": "make-coverage-badge"
     },
     "dependencies": {
-        "@wocker/core": "1.0.23",
+        "@wocker/core": "1.0.24",
         "@wocker/utils": "^2.0.3",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
         "child_process": "^1.0.2",
         "cli-table3": "^0.6.2",
-        "date-fns": "^2.29.3",
         "dockerode": "^4.0.2",
         "fs": "^0.0.1-security",
         "keytar": "^7.9.0",
@@ -57,12 +56,13 @@
         "@types/mute-stream": "^0.0.4",
         "@types/node": "^22.14.1",
         "@types/unzipper": "^0.10.10",
-        "@wocker/testing": "1.0.1",
+        "@wocker/testing": "1.0.2",
         "jest": "^29.7.0",
         "make-coverage-badge": "^1.2.0",
         "memfs": "^4.17.0",
         "ts-jest": "^29.3.2",
         "ts-node": "^10.9.2",
-        "typescript": "^5.6.3"
+        "typescript": "^5.6.3",
+        "unionfs": "^4.5.4"
     }
 }

package/lib/controllers/PresetController.d.ts

@@ -1,27 +0,0 @@
-import { Project } from "@wocker/core";
-import { PresetRepository } from "../repositories";
-import { AppConfigService } from "../services/AppConfigService";
-import { AppEventsService } from "../services/AppEventsService";
-import { ProjectService } from "../services/ProjectService";
-import { PresetService } from "../services/PresetService";
-import { DockerService } from "../modules";
-export declare class PresetController {
-    protected readonly appConfigService: AppConfigService;
-    protected readonly appEventsService: AppEventsService;
-    protected readonly projectService: ProjectService;
-    protected readonly presetService: PresetService;
-    protected readonly presetRepository: PresetRepository;
-    protected readonly dockerService: DockerService;
-    constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, presetService: PresetService, presetRepository: PresetRepository, dockerService: DockerService);
-    presets(): Promise<string[]>;
-    protected onInit(project: Project): Promise<void>;
-    protected onRebuild(project: Project): Promise<void>;
-    protected onBeforeStart(project: Project): Promise<void>;
-    init(): Promise<void>;
-    destroy(): Promise<void>;
-    add(name: string, version?: string): Promise<void>;
-    list(): Promise<string>;
-    delete(name: string, confirm?: boolean): Promise<void>;
-    eject(name?: string): Promise<void>;
-    build(presetName: string, rebuild?: boolean): Promise<void>;
-}