@wocker/ws 1.0.32-beta.1 → 1.1.0-beta.0

package/lib/modules/preset/services/PresetService.d.ts

@@ -1,11 +1,12 @@
-import { Project, Preset, PresetVariableConfig, EnvConfig, AppConfigService, AppFileSystemService } from "@wocker/core";
+import { Project, Preset, PresetVariableConfig, EnvConfig, AppService, ProcessService, AppFileSystemService } from "@wocker/core";
 import { PresetRepository } from "../repositories/PresetRepository";
 export declare class PresetService {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
+    protected readonly processService: ProcessService;
     protected readonly fs: AppFileSystemService;
     protected readonly presetRepository: PresetRepository;
     protected range: string;
-    constructor(appConfigService: AppConfigService, fs: AppFileSystemService, presetRepository: PresetRepository);
+    constructor(appService: AppService, processService: ProcessService, fs: AppFileSystemService, presetRepository: PresetRepository);
     prompt(configMap: {
         [name: string]: PresetVariableConfig;
     }, values?: EnvConfig): Promise<EnvConfig>;

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

@@ -17,11 +17,11 @@ const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const md5_1 = __importDefault(require("md5"));
 const PresetRepository_1 = require("../repositories/PresetRepository");
-const makes_1 = require("../../../makes");
 const GithubClient_1 = require("../../../makes/GithubClient");
 let PresetService = class PresetService {
-    constructor(appConfigService, fs, presetRepository) {
-        this.appConfigService = appConfigService;
+    constructor(appService, processService, fs, presetRepository) {
+        this.appService = appService;
+        this.processService = processService;
         this.fs = fs;
         this.presetRepository = presetRepository;
         this.range = "1.x.x";
@@ -129,23 +129,23 @@ let PresetService = class PresetService {
     get(name) {
         const preset = name
             ? this.presetRepository.searchOne({ name })
-            : this.presetRepository.searchOne({ path: this.appConfigService.pwd() });
+            : this.presetRepository.searchOne({ path: this.processService.pwd() });
         if (!preset) {
             throw new Error(name ? `Preset "${name}" not found` : "Preset not found");
         }
         return preset;
     }
     async init() {
-        const fs = this.fs.cd(this.appConfigService.pwd());
+        const fs = this.fs.cd(this.processService.pwd());
         let preset = this.presetRepository.searchOne({
-            path: this.appConfigService.pwd()
+            path: this.processService.pwd()
         });
         if (preset) {
             return;
         }
         if (fs.exists("config.json")) {
             const config = fs.readJSON("config.json");
-            this.appConfigService.registerPreset(config.name, core_1.PRESET_SOURCE_EXTERNAL, fs.path());
+            this.appService.registerPreset(config.name, core_1.PRESET_SOURCE_EXTERNAL, fs.path());
             return;
         }
         let config = {};
@@ -214,17 +214,16 @@ let PresetService = class PresetService {
             return;
         }
         fs.writeJSON("config.json", config);
-        this.appConfigService.registerPreset(config.name, core_1.PRESET_SOURCE_EXTERNAL, fs.path());
+        this.appService.registerPreset(config.name, core_1.PRESET_SOURCE_EXTERNAL, fs.path());
     }
     async deinit() {
         const preset = this.presetRepository.searchOne({
-            path: this.appConfigService.pwd()
+            path: this.processService.pwd()
         });
         if (!preset) {
             return;
         }
-        this.appConfigService.config.unregisterPreset(preset.name);
-        this.appConfigService.save();
+        this.appService.unregisterPreset(preset.name);
     }
     async install(repository, version) {
         if (!/^[\w-]+\/[\w-]+$/.test(repository)) {
@@ -233,11 +232,11 @@ let PresetService = class PresetService {
         const [owner, name] = repository.split("/");
         let satisfyingTag;
         let satisfyingBranch;
-        const github = new GithubClient_1.GithubClient(owner, name), wRule = makes_1.VersionRule.parse(this.range), rule = makes_1.VersionRule.parse(["latest", "beta"].includes(version) ? "x" : version ?? this.range);
+        const github = new GithubClient_1.GithubClient(owner, name), wRule = core_1.VersionRule.parse(this.range), rule = core_1.VersionRule.parse(["latest", "beta"].includes(version) ? "x" : version ?? this.range);
         if (version !== "beta") {
             satisfyingTag = (await github.getTags())
                 .filter((tag) => {
-                if (!makes_1.Version.valid(tag.name)) {
+                if (!core_1.Version.valid(tag.name)) {
                     return false;
                 }
                 return wRule.match(tag.name) || rule.match(tag.name);
@@ -246,13 +245,13 @@ let PresetService = class PresetService {
                 if (!tag) {
                     return nextTag;
                 }
-                return makes_1.Version.parse(tag.name).compare(nextTag.name) < 0 ? nextTag : tag;
+                return core_1.Version.parse(tag.name).compare(nextTag.name) < 0 ? nextTag : tag;
             }, null);
         }
         if (!satisfyingTag) {
             satisfyingBranch = (await github.getBranches())
                 .filter((branch) => {
-                if (!makes_1.Version.valid(branch.name)) {
+                if (!core_1.Version.valid(branch.name)) {
                     return false;
                 }
                 return wRule.match(branch.name) || rule.match(branch.name);
@@ -261,7 +260,7 @@ let PresetService = class PresetService {
                 if (!branch) {
                     return nextBranch;
                 }
-                return makes_1.Version.parse(branch.name).compare(nextBranch.name) < 0 ? nextBranch : branch;
+                return core_1.Version.parse(branch.name).compare(nextBranch.name) < 0 ? nextBranch : branch;
             }, null);
         }
         if (!satisfyingTag && !satisfyingBranch) {
@@ -273,7 +272,7 @@ let PresetService = class PresetService {
             let preset = this.presetRepository.searchOne({
                 name: config.name
             });
-            if (preset && satisfyingTag && preset.source === core_1.PRESET_SOURCE_GITHUB && makes_1.Version.parse(ref).compare(preset.version) === 0) {
+            if (preset && satisfyingTag && preset.source === core_1.PRESET_SOURCE_GITHUB && core_1.Version.parse(ref).compare(preset.version) === 0) {
                 console.info("Preset already installed");
                 return;
             }
@@ -289,7 +288,7 @@ let PresetService = class PresetService {
                 });
             }
             this.fs.mv(`presets/.tmp/${config.name}`, `presets/${config.name}`);
-            this.appConfigService.registerPreset(config.name, core_1.PRESET_SOURCE_GITHUB);
+            this.appService.registerPreset(config.name, core_1.PRESET_SOURCE_GITHUB);
             console.info("Preset installed successfully");
         }
         finally {
@@ -304,7 +303,8 @@ let PresetService = class PresetService {
 exports.PresetService = PresetService;
 exports.PresetService = PresetService = __decorate([
     (0, core_1.Injectable)(),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
+        core_1.ProcessService,
         core_1.AppFileSystemService,
         PresetRepository_1.PresetRepository])
 ], PresetService);

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

@@ -1,9 +1,9 @@
-import { AppConfigService, AppFileSystemService, ProcessService, ProjectType, EventService, LogService } from "@wocker/core";
+import { AppService, AppFileSystemService, ProcessService, EventService, ProjectType, LogService } from "@wocker/core";
 import { DockerService } from "@wocker/docker-module";
 import { PresetService } from "../../preset";
 import { ProjectService } from "../services/ProjectService";
 export declare class ProjectController {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly fs: AppFileSystemService;
     protected readonly processService: ProcessService;
     protected readonly projectService: ProjectService;
@@ -11,7 +11,7 @@ export declare class ProjectController {
     protected readonly eventService: EventService;
     protected readonly dockerService: DockerService;
     protected readonly logService: LogService;
-    constructor(appConfigService: AppConfigService, fs: AppFileSystemService, processService: ProcessService, projectService: ProjectService, presetService: PresetService, eventService: EventService, dockerService: DockerService, logService: LogService);
+    constructor(appService: AppService, fs: AppFileSystemService, processService: ProcessService, projectService: ProjectService, presetService: PresetService, eventService: EventService, dockerService: DockerService, logService: LogService);
     protected getProjectNames(): Promise<string[]>;
     getScriptNames(): Promise<string[]>;
     init(name: string, type: ProjectType): Promise<void>;

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

@@ -26,8 +26,8 @@ const async_mutex_1 = require("async-mutex");
 const preset_1 = require("../../preset");
 const ProjectService_1 = require("../services/ProjectService");
 let ProjectController = class ProjectController {
-    constructor(appConfigService, fs, processService, projectService, presetService, eventService, dockerService, logService) {
-        this.appConfigService = appConfigService;
+    constructor(appService, fs, processService, projectService, presetService, eventService, dockerService, logService) {
+        this.appService = appService;
         this.fs = fs;
         this.processService = processService;
         this.projectService = projectService;
@@ -57,11 +57,7 @@ let ProjectController = class ProjectController {
             path: fs.path()
         });
         if (!project) {
-            project = new core_1.Project({
-                type: core_1.PROJECT_TYPE_IMAGE,
-                name: fs.basename(),
-                path: fs.path()
-            });
+            project = new core_1.Project(fs.basename(), fs.path());
         }
         project.path = fs.path();
         if (name) {
@@ -91,7 +87,7 @@ let ProjectController = class ProjectController {
         if (type) {
             project.type = type;
         }
-        const mapTypes = this.appConfigService.getProjectTypes();
+        const mapTypes = this.appService.getProjectTypes();
         if (!type || !project.type || !mapTypes[project.type]) {
             project.type = await (0, utils_1.promptSelect)({
                 message: "Project type",
@@ -101,7 +97,7 @@ let ProjectController = class ProjectController {
             });
         }
         switch (project.type) {
-            case core_1.PROJECT_TYPE_DOCKERFILE: {
+            case core_1.ProjectType.DOCKERFILE: {
                 const files = fs.readdir();
                 const dockerfiles = files.filter((fileName) => {
                     if (new RegExp("^(.*)\\.dockerfile$").test(fileName)) {
@@ -124,7 +120,7 @@ let ProjectController = class ProjectController {
                 });
                 break;
             }
-            case core_1.PROJECT_TYPE_IMAGE: {
+            case core_1.ProjectType.IMAGE: {
                 project.imageName = await (0, utils_1.promptInput)({
                     message: "Image name",
                     required: true,
@@ -132,7 +128,7 @@ let ProjectController = class ProjectController {
                 });
                 break;
             }
-            case core_1.PROJECT_TYPE_COMPOSE: {
+            case core_1.ProjectType.COMPOSE: {
                 const composeFiles = fs.readdir().filter((file) => {
                     return /docker-compose\./.test(file);
                 });
@@ -147,7 +143,7 @@ let ProjectController = class ProjectController {
                 });
                 break;
             }
-            case core_1.PROJECT_TYPE_PRESET:
+            case core_1.ProjectType.PRESET:
                 break;
             default:
                 throw new Error("Invalid project type");
@@ -158,8 +154,7 @@ let ProjectController = class ProjectController {
     async destroy(name) {
         const project = this.projectService.get(name);
         await this.projectService.stop(project);
-        this.appConfigService.removeProject(project.name);
-        this.appConfigService.save();
+        this.appService.removeProject(project.name);
         this.fs.rm(`projects/${project.name}`, {
             recursive: true
         });
@@ -329,7 +324,7 @@ let ProjectController = class ProjectController {
     async clearPorts(name) {
         const project = this.projectService.get(name);
         if (project.ports) {
-            delete project.ports;
+            project.ports = [];
             project.save();
         }
     }
@@ -338,10 +333,10 @@ let ProjectController = class ProjectController {
             head: ["KEY", "VALUE"]
         });
         if (global) {
-            for (const i in this.appConfigService.config.env) {
+            for (const i in this.appService.config.env) {
                 table.push([
                     i,
-                    this.appConfigService.config.env[i]
+                    this.appService.config.env[i]
                 ]);
             }
         }
@@ -377,7 +372,7 @@ let ProjectController = class ProjectController {
     }
     async configGet(keys, name, global) {
         let config = global
-            ? this.appConfigService.config
+            ? this.appService.config
             : this.projectService.get(name);
         const table = new cli_table3_1.default({
             head: ["KEY", "VALUE"]
@@ -399,9 +394,8 @@ let ProjectController = class ProjectController {
                     console.info(yoctocolors_cjs_1.default.yellow(`No value for "${key}"`));
                     continue;
                 }
-                this.appConfigService.setEnv(key.trim(), value.trim());
+                this.appService.setEnv(key.trim(), value.trim());
             }
-            this.appConfigService.save();
             return;
         }
         const project = this.projectService.get(name);
@@ -423,9 +417,8 @@ let ProjectController = class ProjectController {
         }, {});
         if (global) {
             for (const i in env) {
-                this.appConfigService.unsetEnv(i);
+                this.appService.unsetEnv(i);
             }
-            this.appConfigService.save();
             return;
         }
         const project = this.projectService.get(name);
@@ -502,7 +495,7 @@ let ProjectController = class ProjectController {
             if (!copier.destination.exists(preset.dockerfile)) {
                 copier.copy(preset.dockerfile);
             }
-            project.type = "dockerfile";
+            project.type = core_1.ProjectType.DOCKERFILE;
             project.dockerfile = preset.dockerfile;
         }
         const files = copier.source.readdir("", {
@@ -977,7 +970,7 @@ __decorate([
 exports.ProjectController = ProjectController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Project commands"),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         core_1.AppFileSystemService,
         core_1.ProcessService,
         ProjectService_1.ProjectService,

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

@@ -1,12 +1,5 @@
-import { AppConfigService, AppFileSystemService, Project, ProjectRepository as CoreProjectRepository } from "@wocker/core";
+import { ProjectRepository as CoreProjectRepository } from "@wocker/core";
 export declare class ProjectRepository extends CoreProjectRepository {
-    protected readonly appConfigService: AppConfigService;
-    protected readonly fs: AppFileSystemService;
-    constructor(appConfigService: AppConfigService, fs: AppFileSystemService);
-    getByName(name: string): Project;
-    save(project: Project): void;
-    search(params?: ProjectRepository.SearchParams): Project[];
-    searchOne(params?: ProjectRepository.SearchParams): Project | null;
 }
 export declare namespace ProjectRepository {
     type SearchParams = CoreProjectRepository.SearchParams;

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

@@ -5,67 +5,12 @@ 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 __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");
 let ProjectRepository = class ProjectRepository extends core_1.ProjectRepository {
-    constructor(appConfigService, fs) {
-        super();
-        this.appConfigService = appConfigService;
-        this.fs = fs;
-    }
-    getByName(name) {
-        const ref = this.appConfigService.config.getProject(name), config = this.fs.readJSON(`projects/${name}/config.json`);
-        return new core_1.Project({
-            ...config,
-            path: ref.path
-        });
-    }
-    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.name}`)) {
-            this.fs.mkdir(`projects/${project.name}`, {
-                recursive: true
-            });
-        }
-        const { path, ...rest } = project.toObject();
-        this.appConfigService.addProject(project.name, path);
-        this.fs.writeJSON(`projects/${project.name}/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])
+    (0, core_1.Injectable)()
 ], ProjectRepository);

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

@@ -1,9 +1,9 @@
-import { AppConfigService, EventService, LogService, ProcessService, Project, ProjectService as CoreProjectService } from "@wocker/core";
+import { AppService, EventService, LogService, ProcessService, Project, ProjectService as CoreProjectService } from "@wocker/core";
 import { ComposeService, DockerService } from "@wocker/docker-module";
 import { PresetRepository, PresetService } from "../../preset";
 import { ProjectRepository } from "../repositories/ProjectRepository";
 export declare class ProjectService extends CoreProjectService {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly processService: ProcessService;
     protected readonly eventService: EventService;
     protected readonly dockerService: DockerService;
@@ -12,7 +12,7 @@ export declare class ProjectService extends CoreProjectService {
     protected readonly presetService: PresetService;
     protected readonly presetRepository: PresetRepository;
     protected readonly logService: LogService;
-    constructor(appConfigService: AppConfigService, processService: ProcessService, eventService: EventService, dockerService: DockerService, composeService: ComposeService, projectRepository: ProjectRepository, presetService: PresetService, presetRepository: PresetRepository, logService: LogService);
+    constructor(appService: AppService, processService: ProcessService, eventService: EventService, dockerService: DockerService, composeService: ComposeService, projectRepository: ProjectRepository, presetService: PresetService, presetRepository: PresetRepository, logService: LogService);
     get(name?: string): Project;
     search(params?: ProjectRepository.SearchParams): Project[];
     searchOne(params?: ProjectRepository.SearchParams): Project | null;

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

@@ -21,9 +21,9 @@ class PublicCli extends cli_1.Cli {
     }
 }
 let ProjectService = class ProjectService extends core_1.ProjectService {
-    constructor(appConfigService, processService, eventService, dockerService, composeService, projectRepository, presetService, presetRepository, logService) {
+    constructor(appService, processService, eventService, dockerService, composeService, projectRepository, presetService, presetRepository, logService) {
         super();
-        this.appConfigService = appConfigService;
+        this.appService = appService;
         this.processService = processService;
         this.eventService = eventService;
         this.dockerService = dockerService;
@@ -63,9 +63,9 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
         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: {
+            case core_1.ProjectType.IMAGE:
+            case core_1.ProjectType.DOCKERFILE:
+            case core_1.ProjectType.PRESET: {
                 let container = await this.dockerService.getContainer(project.containerName);
                 const fs = new core_1.FileSystem(project.path);
                 if (!container) {
@@ -74,7 +74,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                         image: project.imageName,
                         cmd: project.cmd,
                         env: {
-                            ...this.appConfigService.config.env || {},
+                            ...this.appService.config.env || {},
                             ...project.env || {}
                         },
                         ports: project.ports || [],
@@ -97,7 +97,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                 }
                 break;
             }
-            case core_1.PROJECT_TYPE_COMPOSE: {
+            case core_1.ProjectType.COMPOSE: {
                 await this.composeService.up({
                     context: project.path,
                     composefile: project.composefile
@@ -109,12 +109,12 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
         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:
+                case core_1.ProjectType.IMAGE:
+                case core_1.ProjectType.DOCKERFILE:
+                case core_1.ProjectType.PRESET:
                     await this.dockerService.attach(project.containerName);
                     break;
-                case core_1.PROJECT_TYPE_COMPOSE:
+                case core_1.ProjectType.COMPOSE:
                     break;
             }
         }
@@ -122,12 +122,12 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
     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:
+            case core_1.ProjectType.IMAGE:
+            case core_1.ProjectType.DOCKERFILE:
+            case core_1.ProjectType.PRESET:
                 await this.dockerService.removeContainer(project.containerName);
                 break;
-            case core_1.PROJECT_TYPE_COMPOSE: {
+            case core_1.ProjectType.COMPOSE: {
                 await this.composeService.down({
                     context: project.path,
                     composefile: project.composefile
@@ -139,10 +139,10 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
     }
     async build(project, rebuild) {
         switch (project.type) {
-            case core_1.PROJECT_TYPE_IMAGE:
+            case core_1.ProjectType.IMAGE:
                 await this.dockerService.pullImage(project.imageName);
                 break;
-            case core_1.PROJECT_TYPE_DOCKERFILE: {
+            case core_1.ProjectType.DOCKERFILE: {
                 project.imageName = `project-${project.name}:develop`;
                 project.save();
                 if (rebuild) {
@@ -150,7 +150,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                 }
                 if (!await this.dockerService.imageExists(project.imageName)) {
                     await this.dockerService.buildImage({
-                        version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
+                        version: this.appService.isExperimentalEnabled("buildKit") ? "2" : "1",
                         tag: project.imageName,
                         buildArgs: project.buildArgs,
                         context: project.path,
@@ -159,7 +159,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                 }
                 break;
             }
-            case core_1.PROJECT_TYPE_PRESET: {
+            case core_1.ProjectType.PRESET: {
                 const preset = this.presetRepository.searchOne({
                     name: project.preset
                 });
@@ -176,7 +176,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                     }
                     if (!await this.dockerService.imageExists(project.imageName)) {
                         await this.dockerService.buildImage({
-                            version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
+                            version: this.appService.isExperimentalEnabled("buildKit") ? "2" : "1",
                             tag: project.imageName,
                             labels: {
                                 "org.wocker.preset": preset.name
@@ -191,7 +191,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                 }
                 break;
             }
-            case core_1.PROJECT_TYPE_COMPOSE: {
+            case core_1.ProjectType.COMPOSE: {
                 await this.composeService.build({
                     context: project.path,
                     composefile: project.composefile
@@ -203,9 +203,9 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
     }
     async attach(project) {
         switch (project.type) {
-            case core_1.PROJECT_TYPE_IMAGE:
-            case core_1.PROJECT_TYPE_DOCKERFILE:
-            case core_1.PROJECT_TYPE_PRESET: {
+            case core_1.ProjectType.IMAGE:
+            case core_1.ProjectType.DOCKERFILE:
+            case core_1.ProjectType.PRESET: {
                 await this.dockerService.attach(project.containerName);
                 break;
             }
@@ -216,9 +216,9 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
             throw new Error(`Script ${script} not found`);
         }
         switch (project.type) {
-            case core_1.PROJECT_TYPE_IMAGE:
-            case core_1.PROJECT_TYPE_DOCKERFILE:
-            case core_1.PROJECT_TYPE_PRESET: {
+            case core_1.ProjectType.IMAGE:
+            case core_1.ProjectType.DOCKERFILE:
+            case core_1.ProjectType.PRESET: {
                 const container = await this.dockerService.getContainer(project.containerName);
                 if (!container) {
                     throw new Error("The project is not started");
@@ -241,7 +241,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                 await this.dockerService.attachStream(stream);
                 break;
             }
-            case core_1.PROJECT_TYPE_COMPOSE: {
+            case core_1.ProjectType.COMPOSE: {
                 console.log(service, script, args);
                 break;
             }
@@ -249,12 +249,12 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
     }
     async exec(project, command) {
         switch (project.type) {
-            case core_1.PROJECT_TYPE_IMAGE:
-            case core_1.PROJECT_TYPE_DOCKERFILE:
-            case core_1.PROJECT_TYPE_PRESET:
+            case core_1.ProjectType.IMAGE:
+            case core_1.ProjectType.DOCKERFILE:
+            case core_1.ProjectType.PRESET:
                 await this.dockerService.exec(project.containerName, command, true);
                 break;
-            case core_1.PROJECT_TYPE_COMPOSE: {
+            case core_1.ProjectType.COMPOSE: {
                 const [service, ...args] = command;
                 await this.composeService.exec({
                     service,
@@ -268,9 +268,9 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
     }
     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: {
+            case core_1.ProjectType.IMAGE:
+            case core_1.ProjectType.DOCKERFILE:
+            case core_1.ProjectType.PRESET: {
                 const container = await this.dockerService.getContainer(project.containerName);
                 if (!container) {
                     throw new Error("Project not started");
@@ -288,7 +288,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                 }
                 break;
             }
-            case core_1.PROJECT_TYPE_COMPOSE:
+            case core_1.ProjectType.COMPOSE:
                 break;
         }
     }
@@ -296,7 +296,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
 exports.ProjectService = ProjectService;
 exports.ProjectService = ProjectService = __decorate([
     (0, core_1.Injectable)("PROJECT_SERVICE"),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         core_1.ProcessService,
         core_1.EventService,
         docker_module_1.DockerService,

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

@@ -8,8 +8,9 @@ export declare class HttpAuthController {
     protected readonly proxyService: ProxyService;
     constructor(projectService: ProjectService, httpAuthService: HttpAuthService, proxyService: ProxyService);
     onAddDomain(project: Project, ...domains: string[]): Promise<void>;
-    enable(domain?: string): Promise<void>;
-    disable(domain?: string): Promise<void>;
+    users(): Promise<void>;
+    enable(domain?: string, noRestart?: boolean): Promise<void>;
+    disable(domain?: string, noRestart?: boolean): Promise<void>;
     add(user?: string, password?: string, global?: boolean, algorithm?: HttpAuthService.Algorithm): Promise<void>;
     remove(user?: string): Promise<void>;
     clear(): Promise<void>;