@wocker/ws 1.0.22 → 1.0.24

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

@@ -0,0 +1,90 @@
+"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);
+};
+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) {
+        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({
+            ...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");
+        }
+        if (!project.path) {
+            throw new Error("Project should has a path");
+        }
+        if (!project.id) {
+            project.id = project.name;
+        }
+        if (!this.fs.exists(`projects/${project.id}`)) {
+            this.fs.mkdir(`projects/${project.id}`, {
+                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.save();
+    }
+    search(params = {}) {
+        const { name, path } = params, projects = [];
+        for (const ref of this.appConfigService.projects) {
+            if (name && ref.name !== name) {
+                continue;
+            }
+            if (path && ref.path !== path) {
+                continue;
+            }
+            const project = this.getByName(ref.name);
+            projects.push(project);
+        }
+        return projects;
+    }
+    searchOne(params = {}) {
+        const [project] = this.search(params);
+        return project || null;
+    }
+};
+exports.ProjectRepository = ProjectRepository;
+exports.ProjectRepository = ProjectRepository = __decorate([
+    (0, core_1.Injectable)(),
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.AppFileSystemService,
+        keystore_1.KeystoreService])
+], ProjectRepository);

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

@@ -0,0 +1,21 @@
+import { Project, AppConfigService, EventService, ProjectService as CoreProjectService, ProjectServiceSearchParams as SearchParams } from "@wocker/core";
+import { ProjectRepository } from "../repositories/ProjectRepository";
+import { DockerService } from "../../docker";
+import { PresetService, PresetRepository } from "../../preset";
+export declare class ProjectService extends CoreProjectService {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly eventService: EventService;
+    protected readonly dockerService: DockerService;
+    protected readonly projectRepository: ProjectRepository;
+    protected readonly presetService: PresetService;
+    protected readonly presetRepository: PresetRepository;
+    constructor(appConfigService: AppConfigService, eventService: EventService, dockerService: DockerService, projectRepository: ProjectRepository, presetService: PresetService, presetRepository: PresetRepository);
+    get(name?: string): Project;
+    search(params?: SearchParams): Project[];
+    searchOne(params?: SearchParams): Project | null;
+    save(project: Project): void;
+    start(project: Project, restart?: boolean, rebuild?: boolean, attach?: boolean): Promise<void>;
+    stop(project: Project): Promise<void>;
+    build(project: Project, rebuild?: boolean): Promise<void>;
+    logs(project: Project, detach?: boolean): Promise<void>;
+}

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

@@ -0,0 +1,211 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProjectService = void 0;
+const core_1 = require("@wocker/core");
+const ProjectRepository_1 = require("../repositories/ProjectRepository");
+const docker_1 = require("../../docker");
+const preset_1 = require("../../preset");
+let ProjectService = class ProjectService extends core_1.ProjectService {
+    constructor(appConfigService, eventService, dockerService, projectRepository, presetService, presetRepository) {
+        super();
+        this.appConfigService = appConfigService;
+        this.eventService = eventService;
+        this.dockerService = dockerService;
+        this.projectRepository = projectRepository;
+        this.presetService = presetService;
+        this.presetRepository = presetRepository;
+    }
+    get(name) {
+        const project = name
+            ? this.projectRepository.searchOne({ name })
+            : this.projectRepository.searchOne({
+                path: this.appConfigService.pwd()
+            });
+        if (!project) {
+            throw new Error("Project not found");
+        }
+        if (name) {
+            this.appConfigService.setPWD(project.path);
+        }
+        return project;
+    }
+    search(params = {}) {
+        return this.projectRepository.search(params);
+    }
+    searchOne(params = {}) {
+        return this.projectRepository.searchOne(params);
+    }
+    save(project) {
+        this.projectRepository.save(project);
+    }
+    async start(project, restart, rebuild, attach) {
+        if (restart || rebuild) {
+            await this.stop(project);
+        }
+        await this.build(project, rebuild);
+        await this.eventService.emit("project:beforeStart", project);
+        switch (project.type) {
+            case core_1.PROJECT_TYPE_IMAGE:
+            case core_1.PROJECT_TYPE_DOCKERFILE:
+            case core_1.PROJECT_TYPE_PRESET: {
+                let container = await this.dockerService.getContainer(project.containerName);
+                const fs = new core_1.FileSystem(project.path);
+                if (!container) {
+                    container = await this.dockerService.createContainer({
+                        name: project.containerName,
+                        image: project.imageName,
+                        env: {
+                            ...this.appConfigService.config.env || {},
+                            ...project.env || {}
+                        },
+                        ports: project.ports || [],
+                        volumes: (project.volumes || []).map((volume) => {
+                            const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
+                            const [, source, destination, options] = regVolume.exec(volume);
+                            if (source.startsWith("/")) {
+                                return volume;
+                            }
+                            return `${fs.path(source)}:${destination}` + (options ? `:${options}` : "");
+                        }),
+                        extraHosts: Object.keys(project.extraHosts || {}).map((host) => {
+                            return `${project.extraHosts[host]}:${host}`;
+                        })
+                    });
+                }
+                const { State: { Status } } = await container.inspect();
+                if (Status === "created" || Status === "exited") {
+                    await container.start();
+                }
+                break;
+            }
+            case core_1.PROJECT_TYPE_COMPOSE: {
+                break;
+            }
+        }
+        await this.eventService.emit("project:start", project);
+        await this.eventService.emit("project:afterStart", project);
+        if (attach) {
+            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 stop(project) {
+        await this.eventService.emit("project:beforeStop", 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.removeContainer(project.containerName);
+                break;
+            case core_1.PROJECT_TYPE_COMPOSE:
+                break;
+        }
+        await this.eventService.emit("project:stop", project);
+    }
+    async build(project, rebuild) {
+        switch (project.type) {
+            case core_1.PROJECT_TYPE_IMAGE:
+                await this.dockerService.pullImage(project.imageName);
+                break;
+            case core_1.PROJECT_TYPE_DOCKERFILE: {
+                project.imageName = `project-${project.name}:develop`;
+                project.save();
+                if (rebuild) {
+                    await this.dockerService.imageRm(project.imageName);
+                }
+                if (!await this.dockerService.imageExists(project.imageName)) {
+                    await this.dockerService.buildImage({
+                        tag: project.imageName,
+                        buildArgs: project.buildArgs,
+                        context: project.path,
+                        src: project.dockerfile
+                    });
+                }
+                break;
+            }
+            case core_1.PROJECT_TYPE_PRESET: {
+                const preset = this.presetRepository.searchOne({
+                    name: project.preset
+                });
+                if (preset.image) {
+                    await this.dockerService.pullImage(preset.image);
+                    project.imageName = preset.image;
+                    project.save();
+                }
+                if (preset.dockerfile) {
+                    project.imageName = this.presetService.getImageNameForProject(project, preset);
+                    project.save();
+                    if (rebuild) {
+                        await this.dockerService.imageRm(project.imageName);
+                    }
+                    if (!await this.dockerService.imageExists(project.imageName)) {
+                        await this.dockerService.buildImage({
+                            tag: project.imageName,
+                            labels: {
+                                "org.wocker.preset": preset.name
+                            },
+                            buildArgs: project.buildArgs,
+                            context: preset.path,
+                            src: preset.dockerfile
+                        });
+                    }
+                }
+                break;
+            }
+            case core_1.PROJECT_TYPE_COMPOSE: {
+                break;
+            }
+        }
+        await this.eventService.emit("project:build", project, rebuild);
+    }
+    async logs(project, detach) {
+        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("Project not started");
+                }
+                if (!detach) {
+                    await this.dockerService.logs(container);
+                }
+                else {
+                    const data = await container.logs({
+                        stdout: true,
+                        stderr: true,
+                        follow: false
+                    });
+                    process.stdout.write(data);
+                }
+                break;
+            }
+            case core_1.PROJECT_TYPE_COMPOSE:
+                break;
+        }
+    }
+};
+exports.ProjectService = ProjectService;
+exports.ProjectService = ProjectService = __decorate([
+    (0, core_1.Injectable)("PROJECT_SERVICE"),
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.EventService,
+        docker_1.DockerService,
+        ProjectRepository_1.ProjectRepository,
+        preset_1.PresetService,
+        preset_1.PresetRepository])
+], ProjectService);

package/lib/{controllers → modules/proxy/controllers}/CertController.d.ts

@@ -1,4 +1,5 @@
-import { ProjectService, CertService } from "../services";
+import { CertService } from "../services/CertService";
+import { ProjectService } from "../../project";
 export declare class CertController {
     protected readonly projectService: ProjectService;
     protected readonly certService: CertService;

package/lib/{controllers → modules/proxy/controllers}/CertController.js

@@ -14,7 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CertController = void 0;
 const core_1 = require("@wocker/core");
-const services_1 = require("../services");
+const CertService_1 = require("../services/CertService");
+const project_1 = require("../../project");
 let CertController = class CertController {
     constructor(projectService, certService) {
         this.projectService = projectService;
@@ -108,6 +109,6 @@ __decorate([
 ], CertController.prototype, "existsOtherNames", null);
 exports.CertController = CertController = __decorate([
     (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [services_1.ProjectService,
-        services_1.CertService])
+    __metadata("design:paramtypes", [project_1.ProjectService,
+        CertService_1.CertService])
 ], CertController);

package/lib/{controllers → modules/proxy/controllers}/ProxyController.d.ts

@@ -1,12 +1,13 @@
-import { Project } from "@wocker/core";
-import { AppConfigService, AppEventsService, ProjectService, ProxyService } from "../services";
+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/{controllers → modules/proxy/controllers}/ProxyController.js

@@ -19,17 +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 services_1 = require("../services");
+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) {
@@ -96,7 +97,7 @@ let ProxyController = class ProxyController {
             config.unsetMeta("PROXY_SSH_PASSWORD");
             config.unsetMeta("PROXY_SSH_PORT");
         }
-        await config.save();
+        this.appConfigService.save();
     }
     async start(restart, rebuild) {
         await this.proxyService.start(restart, rebuild);
@@ -173,8 +174,8 @@ __decorate([
 exports.ProxyController = ProxyController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Proxy commands"),
-    __metadata("design:paramtypes", [services_1.AppConfigService,
-        services_1.AppEventsService,
-        services_1.ProjectService,
-        services_1.ProxyService])
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.EventService,
+        project_1.ProjectService,
+        ProxyService_1.ProxyService])
 ], ProxyController);

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

@@ -0,0 +1,5 @@
+import { CertService } from "./services/CertService";
+import { ProxyService } from "./services/ProxyService";
+export declare class ProxyModule {
+}
+export { ProxyService, CertService };

package/lib/modules/proxy/index.js

@@ -0,0 +1,41 @@
+"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;
+};
+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");
+Object.defineProperty(exports, "CertService", { enumerable: true, get: function () { return CertService_1.CertService; } });
+const ProxyService_1 = require("./services/ProxyService");
+Object.defineProperty(exports, "ProxyService", { enumerable: true, get: function () { return ProxyService_1.ProxyService; } });
+let ProxyModule = class ProxyModule {
+};
+exports.ProxyModule = ProxyModule;
+exports.ProxyModule = ProxyModule = __decorate([
+    (0, core_1.Module)({
+        imports: [
+            docker_1.DockerModule,
+            project_1.ProjectModule
+        ],
+        controllers: [
+            CertController_1.CertController,
+            ProxyController_1.ProxyController
+        ],
+        providers: [
+            ProxyService_1.ProxyService,
+            CertService_1.CertService
+        ],
+        exports: [
+            ProxyService_1.ProxyService,
+            CertService_1.CertService
+        ]
+    })
+], ProxyModule);

package/lib/{services → modules/proxy/services}/CertService.d.ts

@@ -1,18 +1,17 @@
-import { Project } from "@wocker/core";
-import { AppConfigService } from "./AppConfigService";
-import { DockerService } from "./DockerService";
+import { Project, AppFileSystemService } from "@wocker/core";
+import { DockerService } from "../../docker";
 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(): Promise<CertMap>;
+    getCertsMap(): CertMap;
     use(project: Project, name: string): Promise<void>;
     remove(project: Project): Promise<void>;
     delete(name: string): Promise<void>;

package/lib/{services → modules/proxy/services}/CertService.js

@@ -49,12 +49,11 @@ exports.CertService = void 0;
 const core_1 = require("@wocker/core");
 const Path = __importStar(require("path"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
-const AppConfigService_1 = require("./AppConfigService");
-const DockerService_1 = require("./DockerService");
+const docker_1 = require("../../docker");
 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;
     }
@@ -62,7 +61,7 @@ let CertService = class CertService {
         const table = new cli_table3_1.default({
             head: ["Name"]
         });
-        const certMap = await this.getCertsMap();
+        const certMap = this.getCertsMap();
         for (const name in certMap) {
             table.push([name]);
         }
@@ -93,8 +92,8 @@ let CertService = class CertService {
             cmd: ["wocker-create-cert", certName]
         });
     }
-    async getCertsMap() {
-        const files = this.appConfigService.fs.readdir("certs/projects");
+    getCertsMap() {
+        const files = this.fs.readdir("certs/projects");
         return files.reduce((res, file) => {
             const ext = Path.extname(file);
             const name = Path.basename(file, ext);
@@ -106,7 +105,7 @@ let CertService = class CertService {
         }, {});
     }
     async use(project, name) {
-        const certs = await this.getCertsMap();
+        const certs = this.getCertsMap();
         if (!name) {
             name = project.domains.find((domain) => domain in certs);
         }
@@ -121,23 +120,23 @@ let CertService = class CertService {
             throw new Error(`${name}.key file missing`);
         }
         project.setEnv("CERT_NAME", name);
-        await project.save();
+        project.save();
     }
     async remove(project) {
         if (!project.hasEnv("CERT_NAME")) {
             return;
         }
         project.unsetEnv("CERT_NAME");
-        await project.save();
+        project.save();
     }
     async delete(name) {
-        const certs = await this.getCertsMap();
+        const certs = this.getCertsMap();
         if (!(name in certs)) {
             console.warn(`Cert ${name} not found`);
             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,
-        DockerService_1.DockerService])
+        docker_1.DockerService])
 ], CertService);

package/lib/{services → modules/proxy/services}/ProxyService.d.ts

@@ -1,13 +1,13 @@
-import { Project, ProxyService as CoreProxyService } from "@wocker/core";
-import { AppConfigService } from "./AppConfigService";
-import { DockerService } from "./DockerService";
+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>;