@wocker/ws 1.0.23 → 1.0.24

package/lib/{services → modules/preset/services}/PresetService.d.ts

@@ -1,25 +1,17 @@
-import { EnvConfig, Project, Preset, PresetVariableConfig } from "@wocker/core";
-import { AppConfigService } from "./AppConfigService";
-import { LogService } from "./LogService";
+import { Project, Preset, PresetVariableConfig, EnvConfig, AppConfigService, AppFileSystemService } from "@wocker/core";
 import { PresetRepository } from "../repositories/PresetRepository";
-type SearchOptions = Partial<{
-    name: string;
-    source: string;
-    path: string;
-}>;
 export declare class PresetService {
     protected readonly appConfigService: AppConfigService;
+    protected readonly fs: AppFileSystemService;
     protected readonly presetRepository: PresetRepository;
-    protected readonly logService: LogService;
-    constructor(appConfigService: AppConfigService, presetRepository: PresetRepository, logService: LogService);
+    constructor(appConfigService: AppConfigService, fs: AppFileSystemService, presetRepository: PresetRepository);
     prompt(configMap: {
         [name: string]: PresetVariableConfig;
     }, values?: EnvConfig): Promise<EnvConfig>;
     getImageNameForProject(project: Project, preset: Preset): string;
     getImageName(preset: Preset, buildArgs: EnvConfig): string;
+    get(name?: string): Preset;
     init(): Promise<void>;
     deinit(): Promise<void>;
-    get(name?: string): Preset;
     addPreset(name: string, repository?: string, version?: string): Promise<void>;
 }
-export { SearchOptions as PresetServiceSearchOptions };

package/lib/{services → modules/preset/services}/PresetService.js

@@ -16,15 +16,13 @@ exports.PresetService = void 0;
 const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const md5_1 = __importDefault(require("md5"));
-const AppConfigService_1 = require("./AppConfigService");
-const LogService_1 = require("./LogService");
 const PresetRepository_1 = require("../repositories/PresetRepository");
-const GithubClient_1 = require("../makes/GithubClient");
+const GithubClient_1 = require("../../../makes/GithubClient");
 let PresetService = class PresetService {
-    constructor(appConfigService, presetRepository, logService) {
+    constructor(appConfigService, fs, presetRepository) {
         this.appConfigService = appConfigService;
+        this.fs = fs;
         this.presetRepository = presetRepository;
-        this.logService = logService;
     }
     async prompt(configMap, values = {}) {
         for (const name in configMap) {
@@ -36,7 +34,7 @@ let PresetService = class PresetService {
                         required: config.required,
                         default: typeof values[name] !== "undefined" && values[name] === "true"
                             ? true
-                            : undefined,
+                            : config.default
                     });
                     values[name] = value.toString();
                     break;
@@ -117,6 +115,15 @@ let PresetService = class PresetService {
         }).join("-");
         return `ws-preset-${preset.name}:${version}`;
     }
+    get(name) {
+        const preset = name
+            ? this.presetRepository.searchOne({ name })
+            : this.presetRepository.searchOne({ path: this.appConfigService.pwd() });
+        if (!preset) {
+            throw new Error(name ? `Preset "${name}" not found` : "Preset not found");
+        }
+        return preset;
+    }
     async init() {
         const fs = new core_1.FileSystem(this.appConfigService.pwd());
         let preset = this.presetRepository.searchOne({
@@ -208,30 +215,19 @@ let PresetService = class PresetService {
         this.appConfigService.config.unregisterPreset(preset.name);
         this.appConfigService.save();
     }
-    get(name) {
-        const preset = name
-            ? this.presetRepository.searchOne({ name })
-            : this.presetRepository.searchOne({ path: this.appConfigService.pwd() });
-        if (!preset) {
-            throw new Error(name ? `Preset "${name}" not found` : "Preset not found");
-        }
-        return preset;
-    }
     async addPreset(name, repository, version) {
+        if (!repository) {
+            repository = `kearisp/wocker-${name}-preset`;
+        }
         let preset = this.presetRepository.searchOne({
             name
         });
         if (!preset) {
             console.info("Loading...");
-            if (!repository) {
-                repository = `kearisp/wocker-${name}-preset`;
-            }
             const [owner, repo] = repository.split("/");
             const github = new GithubClient_1.GithubClient(owner, repo);
             const info = await github.getInfo();
-            const config = await github.getFile(info.default_branch, "config.json");
-            console.log(config);
-            await github.download(info.default_branch, this.appConfigService.fs.path(`presets/${name}`));
+            await github.download(info.default_branch, this.fs.path(`presets/${name}`));
             this.appConfigService.registerPreset(name, core_1.PRESET_SOURCE_GITHUB);
         }
     }
@@ -239,7 +235,7 @@ let PresetService = class PresetService {
 exports.PresetService = PresetService;
 exports.PresetService = PresetService = __decorate([
     (0, core_1.Injectable)(),
-    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
-        PresetRepository_1.PresetRepository,
-        LogService_1.LogService])
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.AppFileSystemService,
+        PresetRepository_1.PresetRepository])
 ], PresetService);

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

@@ -0,0 +1,13 @@
+import { AppConfigService, ProcessService } from "@wocker/core";
+import { PresetService } from "../../preset";
+import { ProjectService } from "../services/ProjectService";
+export declare class ProjectController {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly processService: ProcessService;
+    protected readonly projectService: ProjectService;
+    protected readonly presetService: PresetService;
+    constructor(appConfigService: AppConfigService, processService: ProcessService, projectService: ProjectService, presetService: PresetService);
+    start(name?: string, restart?: boolean, build?: boolean, attach?: boolean): Promise<void>;
+    stop(name?: string): Promise<void>;
+    eject(name?: string): Promise<void>;
+}

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

@@ -0,0 +1,127 @@
+"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); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProjectController = void 0;
+const core_1 = require("@wocker/core");
+const utils_1 = require("@wocker/utils");
+const path_1 = __importDefault(require("path"));
+const preset_1 = require("../../preset");
+const ProjectService_1 = require("../services/ProjectService");
+let ProjectController = class ProjectController {
+    constructor(appConfigService, processService, projectService, presetService) {
+        this.appConfigService = appConfigService;
+        this.processService = processService;
+        this.projectService = projectService;
+        this.presetService = presetService;
+    }
+    async start(name, restart, build, attach) {
+        const project = this.projectService.get(name);
+        await this.projectService.start(project, restart, build, attach);
+    }
+    async stop(name) {
+        const project = this.projectService.get(name);
+        await this.projectService.stop(project);
+    }
+    async eject(name) {
+        const project = this.projectService.get(name);
+        const preset = this.presetService.get(project.preset);
+        if (!preset) {
+            throw new Error("Preset not found");
+        }
+        const confirm = await (0, utils_1.promptConfirm)({
+            message: "Confirm eject",
+            default: false
+        });
+        if (!confirm) {
+            return;
+        }
+        const copier = new core_1.FileSystemManager(preset.path, this.processService.pwd());
+        if (preset.dockerfile) {
+            if (!copier.destination.exists(preset.dockerfile)) {
+                copier.copy(preset.dockerfile);
+            }
+            project.type = "dockerfile";
+            project.dockerfile = preset.dockerfile;
+        }
+        const files = copier.source.readdir("", {
+            recursive: true
+        });
+        for (const path of files) {
+            const stat = copier.source.stat(path), dir = path_1.default.dirname(path);
+            if (stat.isFile() && path === "config.json") {
+                continue;
+            }
+            if (stat.isFile() && path === preset.dockerfile) {
+                continue;
+            }
+            if (copier.destination.exists(path)) {
+                continue;
+            }
+            if (!copier.destination.exists(dir)) {
+                copier.destination.mkdir(dir, {
+                    recursive: true
+                });
+            }
+            copier.copy(path);
+        }
+        delete project.preset;
+        delete project.imageName;
+        project.save();
+    }
+};
+exports.ProjectController = ProjectController;
+__decorate([
+    (0, core_1.Command)("start"),
+    (0, core_1.Description)("Starting project"),
+    __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)("restart", "r")),
+    __param(1, (0, core_1.Description)("Restarting project")),
+    __param(2, (0, core_1.Option)("build", "b")),
+    __param(2, (0, core_1.Description)("Build")),
+    __param(3, (0, core_1.Option)("attach", "a")),
+    __param(3, (0, core_1.Description)("Attach")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Boolean, Boolean, Boolean]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "start", null);
+__decorate([
+    (0, core_1.Command)("stop"),
+    (0, core_1.Description)("Stopping project"),
+    __param(0, (0, core_1.Option)("name", "n")),
+    __param(0, (0, core_1.Description)("The name of the project")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "stop", null);
+__decorate([
+    (0, core_1.Command)("preset:eject"),
+    (0, core_1.Description)("Eject preset files into the project"),
+    __param(0, (0, core_1.Option)("name", "n")),
+    __param(0, (0, core_1.Description)("The name of the project")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "eject", null);
+exports.ProjectController = ProjectController = __decorate([
+    (0, core_1.Controller)(),
+    (0, core_1.Description)("Project commands"),
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.ProcessService,
+        ProjectService_1.ProjectService,
+        preset_1.PresetService])
+], ProjectController);

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

@@ -0,0 +1,5 @@
+import { ProjectRepository } from "./repositories/ProjectRepository";
+import { ProjectService } from "./services/ProjectService";
+export declare class ProjectModule {
+}
+export { ProjectRepository, ProjectService };

package/lib/modules/project/index.js

@@ -0,0 +1,39 @@
+"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.ProjectService = exports.ProjectRepository = exports.ProjectModule = void 0;
+const core_1 = require("@wocker/core");
+const keystore_1 = require("../keystore");
+const docker_1 = require("../docker");
+const preset_1 = require("../preset");
+const ProjectController_1 = require("./controllers/ProjectController");
+const ProjectRepository_1 = require("./repositories/ProjectRepository");
+Object.defineProperty(exports, "ProjectRepository", { enumerable: true, get: function () { return ProjectRepository_1.ProjectRepository; } });
+const ProjectService_1 = require("./services/ProjectService");
+Object.defineProperty(exports, "ProjectService", { enumerable: true, get: function () { return ProjectService_1.ProjectService; } });
+let ProjectModule = class ProjectModule {
+};
+exports.ProjectModule = ProjectModule;
+exports.ProjectModule = ProjectModule = __decorate([
+    (0, core_1.Module)({
+        imports: [
+            preset_1.PresetModule,
+            keystore_1.KeystoreModule,
+            docker_1.DockerModule
+        ],
+        controllers: [ProjectController_1.ProjectController],
+        providers: [
+            ProjectRepository_1.ProjectRepository,
+            ProjectService_1.ProjectService
+        ],
+        exports: [
+            ProjectRepository_1.ProjectRepository,
+            ProjectService_1.ProjectService
+        ]
+    })
+], ProjectModule);

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

@@ -0,0 +1,13 @@
+import { AppConfigService, AppFileSystemService, Project, ProjectProperties, ProjectServiceSearchParams as SearchParams } from "@wocker/core";
+import { KeystoreService } from "../../keystore";
+export declare class ProjectRepository {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly fs: AppFileSystemService;
+    protected readonly keystoreService: KeystoreService;
+    constructor(appConfigService: AppConfigService, fs: AppFileSystemService, keystoreService: KeystoreService);
+    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

@@ -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/modules/proxy/controllers/CertController.d.ts

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

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

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