@wocker/ws 1.0.32 → 1.1.0

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

@@ -14,16 +14,15 @@ const core_1 = require("@wocker/core");
 const docker_module_1 = require("@wocker/docker-module");
 const cli_1 = require("@kearisp/cli");
 const preset_1 = require("../../preset");
-const ProjectRepository_1 = require("../repositories/ProjectRepository");
 class PublicCli extends cli_1.Cli {
     parseCommand(command, index) {
         return super.parseCommand(command, index);
     }
 }
 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 +62,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 +73,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 +96,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 +108,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 +121,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 +138,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 +149,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 +158,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 +175,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 +190,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 +202,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 +215,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 +240,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 +248,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 +267,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 +287,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                 }
                 break;
             }
-            case core_1.PROJECT_TYPE_COMPOSE:
+            case core_1.ProjectType.COMPOSE:
                 break;
         }
     }
@@ -296,12 +295,12 @@ 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,
         docker_module_1.ComposeService,
-        ProjectRepository_1.ProjectRepository,
+        core_1.ProjectRepository,
         preset_1.PresetService,
         preset_1.PresetRepository,
         core_1.LogService])

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

@@ -1,4 +1,3 @@
-import { Project } from "@wocker/core";
 import { ProjectService } from "../../project";
 import { HttpAuthService } from "../services/HttpAuthService";
 import { ProxyService } from "../services/ProxyService";
@@ -7,9 +6,9 @@ export declare class HttpAuthController {
     protected readonly httpAuthService: HttpAuthService;
     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>;

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

@@ -14,7 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpAuthController = void 0;
 const core_1 = require("@wocker/core");
-const utils_1 = require("@wocker/utils");
+const prompts_1 = require("@wocker/prompts");
 const project_1 = require("../../project");
 const HttpAuthService_1 = require("../services/HttpAuthService");
 const ProxyService_1 = require("../services/ProxyService");
@@ -24,27 +24,31 @@ let HttpAuthController = class HttpAuthController {
         this.httpAuthService = httpAuthService;
         this.proxyService = proxyService;
     }
-    async onAddDomain(project, ...domains) {
-        console.log("New domains:", domains);
+    async users() {
+        await this.httpAuthService.usersForProject(this.projectService.get());
     }
-    async enable(domain) {
+    async enable(domain, noRestart) {
         await this.httpAuthService.enableForProject(this.projectService.get(), domain);
-        await this.proxyService.start(true);
+        if (!noRestart) {
+            await this.proxyService.start(true);
+        }
     }
-    async disable(domain) {
+    async disable(domain, noRestart) {
         await this.httpAuthService.disableForProject(this.projectService.get(), domain);
-        await this.proxyService.start(true);
+        if (!noRestart) {
+            await this.proxyService.start(true);
+        }
     }
     async add(user, password, global, algorithm) {
         if (!user) {
-            user = await (0, utils_1.promptInput)({
+            user = await (0, prompts_1.promptInput)({
                 required: true,
                 message: "User",
                 type: "text"
             });
         }
         if (!password) {
-            password = await (0, utils_1.promptInput)({
+            password = await (0, prompts_1.promptInput)({
                 required: true,
                 message: "Password",
                 type: "password"
@@ -56,34 +60,40 @@ let HttpAuthController = class HttpAuthController {
         else {
             await this.httpAuthService.addForProject(this.projectService.get(), user, password, algorithm);
         }
-        await this.proxyService.start(true);
     }
     async remove(user) {
         await this.httpAuthService.removeForProject(this.projectService.get(), user);
     }
     async clear() {
+        await this.httpAuthService.clearForProject(this.projectService.get());
     }
 };
 exports.HttpAuthController = HttpAuthController;
 __decorate([
-    (0, core_1.Event)("project:add-domain"),
+    (0, core_1.Command)("http-auth"),
+    (0, core_1.Description)(""),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [core_1.Project, String]),
+    __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
-], HttpAuthController.prototype, "onAddDomain", null);
+], HttpAuthController.prototype, "users", null);
 __decorate([
     (0, core_1.Command)("http-auth:enable"),
     __param(0, (0, core_1.Option)("domain", "d")),
     __param(0, (0, core_1.Description)("Domain to apply authentication to.")),
+    __param(1, (0, core_1.Option)("no-restart")),
+    __param(1, (0, core_1.Description)("")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
+    __metadata("design:paramtypes", [String, Boolean]),
     __metadata("design:returntype", Promise)
 ], HttpAuthController.prototype, "enable", null);
 __decorate([
     (0, core_1.Command)("http-auth:disable"),
     __param(0, (0, core_1.Option)("domain", "d")),
+    __param(0, (0, core_1.Description)("")),
+    __param(1, (0, core_1.Option)("no-restart")),
+    __param(1, (0, core_1.Description)("")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
+    __metadata("design:paramtypes", [String, Boolean]),
     __metadata("design:returntype", Promise)
 ], HttpAuthController.prototype, "disable", null);
 __decorate([
@@ -104,7 +114,8 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], HttpAuthController.prototype, "add", null);
 __decorate([
-    (0, core_1.Command)("http-auth:remove [user]"),
+    (0, core_1.Command)("http-auth:remove-user [user]"),
+    (0, core_1.Description)(""),
     __param(0, (0, core_1.Param)("user")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
@@ -112,6 +123,7 @@ __decorate([
 ], HttpAuthController.prototype, "remove", null);
 __decorate([
     (0, core_1.Command)("http-auth:clear"),
+    (0, core_1.Description)("Remove all users for the project."),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)

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

@@ -1,11 +1,11 @@
-import { Project, AppConfigService } from "@wocker/core";
+import { Project, AppService } from "@wocker/core";
 import { ProjectService } from "../../project";
 import { ProxyService } from "../services/ProxyService";
 export declare class ProxyController {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly projectService: ProjectService;
     protected readonly proxyService: ProxyService;
-    constructor(appConfigService: AppConfigService, projectService: ProjectService, proxyService: ProxyService);
+    constructor(appService: AppService, projectService: ProjectService, proxyService: ProxyService);
     onProjectInit(project: Project): Promise<void>;
     onProjectStart(project: Project): Promise<void>;
     onProjectStop(_project: Project): Promise<void>;

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

@@ -17,13 +17,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProxyController = void 0;
 const core_1 = require("@wocker/core");
-const utils_1 = require("@wocker/utils");
+const prompts_1 = require("@wocker/prompts");
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
 const project_1 = require("../../project");
 const ProxyService_1 = require("../services/ProxyService");
 let ProxyController = class ProxyController {
-    constructor(appConfigService, projectService, proxyService) {
-        this.appConfigService = appConfigService;
+    constructor(appService, projectService, proxyService) {
+        this.appService = appService;
         this.projectService = projectService;
         this.proxyService = proxyService;
     }
@@ -47,9 +47,9 @@ let ProxyController = class ProxyController {
         return projects.map((project) => project.name);
     }
     async init(httpPort, httpsPort, sshPort, sshPassword) {
-        const config = this.appConfigService.config;
+        const config = this.appService.config;
         if (httpPort === null || typeof httpPort === "undefined" || isNaN(httpPort)) {
-            httpPort = await (0, utils_1.promptInput)({
+            httpPort = await (0, prompts_1.promptInput)({
                 required: true,
                 message: "Http port",
                 type: "number",
@@ -58,7 +58,7 @@ let ProxyController = class ProxyController {
         }
         config.setMeta("PROXY_HTTP_PORT", httpPort.toString());
         if (httpsPort === null || typeof httpsPort === "undefined" || isNaN(httpsPort)) {
-            httpsPort = await (0, utils_1.promptInput)({
+            httpsPort = await (0, prompts_1.promptInput)({
                 required: true,
                 message: "Https port",
                 type: "number",
@@ -67,14 +67,14 @@ let ProxyController = class ProxyController {
         }
         config.setMeta("PROXY_HTTPS_PORT", httpsPort.toString());
         let enableSsh = !sshPassword && !sshPort
-            ? await (0, utils_1.promptConfirm)({
+            ? await (0, prompts_1.promptConfirm)({
                 message: "Enable ssh proxy?",
                 default: false
             })
             : true;
         if (enableSsh) {
             if (!sshPassword) {
-                sshPassword = await (0, utils_1.promptInput)({
+                sshPassword = await (0, prompts_1.promptInput)({
                     message: "SSH Password",
                     type: "password",
                     required: true,
@@ -82,7 +82,7 @@ let ProxyController = class ProxyController {
                 });
             }
             if (!sshPort) {
-                sshPort = await (0, utils_1.promptInput)({
+                sshPort = await (0, prompts_1.promptInput)({
                     message: "SSH port",
                     type: "number",
                     default: parseInt(config.getMeta("PROXY_SSH_PORT", "22"))
@@ -95,7 +95,7 @@ let ProxyController = class ProxyController {
             config.unsetMeta("PROXY_SSH_PASSWORD");
             config.unsetMeta("PROXY_SSH_PORT");
         }
-        this.appConfigService.save();
+        this.appService.save();
     }
     async start(restart, rebuild) {
         await this.proxyService.start(restart, rebuild);
@@ -190,7 +190,7 @@ __decorate([
 exports.ProxyController = ProxyController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Proxy commands"),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         project_1.ProjectService,
         ProxyService_1.ProxyService])
 ], ProxyController);

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

@@ -7,11 +7,14 @@ export declare class HttpAuthService {
     protected readonly dockerService: DockerService;
     protected readonly proxyService: ProxyService;
     constructor(processService: ProcessService, fs: AppFileSystemService, dockerService: DockerService, proxyService: ProxyService);
+    users(path: string): Promise<void>;
     add(path: string, user: string, password: string, algorithm?: HttpAuthService.Algorithm): Promise<void>;
     addForProject(project: Project, user: string, password: string, algorithm?: HttpAuthService.Algorithm): Promise<void>;
     addForGlobal(user: string, password: string, algorithm?: HttpAuthService.Algorithm): Promise<void>;
     removeUser(path: string, user: string): Promise<void>;
+    usersForProject(project: Project): Promise<void>;
     removeForProject(project: Project, user: string): Promise<void>;
+    clearForProject(project: Project): Promise<void>;
     enableForProject(project: Project, domain?: string): Promise<void>;
     disableForProject(project: Project, domain?: string): Promise<void>;
 }

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

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpAuthService = void 0;
 const core_1 = require("@wocker/core");
 const docker_module_1 = require("@wocker/docker-module");
-const utils_1 = require("@wocker/utils");
 const ProxyService_1 = require("./ProxyService");
 let HttpAuthService = class HttpAuthService {
     constructor(processService, fs, dockerService, proxyService) {
@@ -21,6 +20,13 @@ let HttpAuthService = class HttpAuthService {
         this.dockerService = dockerService;
         this.proxyService = proxyService;
     }
+    async users(path) {
+        await this.dockerService.exec("wocker-proxy", {
+            tty: true,
+            user: "nginx",
+            cmd: ["cut", "-d:", "-f1", `/etc/${path}`]
+        });
+    }
     async add(path, user, password, algorithm = "md5") {
         const alMap = {
             md5: "-m",
@@ -37,16 +43,10 @@ let HttpAuthService = class HttpAuthService {
                 mode: 0o640
             });
         }
-        const stream = await this.dockerService.exec("wocker-proxy", {
+        await this.dockerService.exec("wocker-proxy", {
             user: "nginx",
-            cmd: ["htpasswd", "-b", alMap[algorithm], `/etc/${path}`, user, password]
-        });
-        await new Promise((resolve, reject) => {
-            stream.on("data", (chunk) => {
-                this.processService.stdout.write((0, utils_1.demuxOutput)(chunk));
-            });
-            stream.on("end", resolve);
-            stream.on("error", reject);
+            cmd: ["htpasswd", "-b", alMap[algorithm], `/etc/${path}`, user, password],
+            tty: true
         });
     }
     async addForProject(project, user, password, algorithm = "md5") {
@@ -61,6 +61,17 @@ let HttpAuthService = class HttpAuthService {
         return this.add(`nginx/htpasswd/_global`, user, password, algorithm);
     }
     async removeUser(path, user) {
+        await this.dockerService.exec("wocker-proxy", {
+            cmd: ["htpasswd", "-D", `/etc/${path}`, user],
+            user: "nginx",
+            tty: true
+        });
+    }
+    async usersForProject(project) {
+        if (!this.fs.exists("nginx/htpasswd/projects")) {
+            return;
+        }
+        await this.users(`nginx/htpasswd/projects/${project.name}`);
     }
     async removeForProject(project, user) {
         if (!this.fs.exists("nginx/htpasswd/projects")) {
@@ -68,6 +79,14 @@ let HttpAuthService = class HttpAuthService {
         }
         await this.removeUser(`nginx/htpasswd/projects/${project.name}`, user);
     }
+    async clearForProject(project) {
+        const filePath = `nginx/htpasswd/projects/${project.name}`;
+        if (this.fs.exists(filePath)) {
+            this.fs.writeFile(filePath, "", {
+                mode: 0o640
+            });
+        }
+    }
     async enableForProject(project, domain) {
         if (!this.fs.exists(`nginx/htpasswd/projects/${project.name}`)) {
             throw new Error(`No htpasswd for ${project.name}`);

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

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

@@ -45,13 +45,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProxyService = void 0;
 const core_1 = require("@wocker/core");
 const docker_module_1 = require("@wocker/docker-module");
-const utils_1 = require("@wocker/utils");
+const prompts_1 = require("@wocker/prompts");
 const Path = __importStar(require("path"));
 const env_1 = require("../../../env");
 let ProxyService = class ProxyService extends core_1.ProxyService {
-    constructor(appConfigService, processService, fs, dockerService) {
+    constructor(appService, processService, fs, dockerService) {
         super();
-        this.appConfigService = appConfigService;
+        this.appService = appService;
         this.processService = processService;
         this.fs = fs;
         this.dockerService = dockerService;
@@ -64,7 +64,7 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
         ];
     }
     async init(project) {
-        const appPort = await (0, utils_1.promptInput)({
+        const appPort = await (0, prompts_1.promptInput)({
             message: "App port",
             type: "number",
             default: parseInt(project.getEnv("VIRTUAL_PORT", "80"))
@@ -110,7 +110,7 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
             else {
                 this.fs.chmod("nginx/htpasswd", 0o764);
             }
-            const httpPort = this.appConfigService.getMeta("PROXY_HTTP_PORT", "80"), httpsPort = this.appConfigService.getMeta("PROXY_HTTPS_PORT", "443"), sshPort = this.appConfigService.getMeta("PROXY_SSH_PORT", "22");
+            const httpPort = this.appService.getMeta("PROXY_HTTP_PORT", "80"), httpsPort = this.appService.getMeta("PROXY_HTTPS_PORT", "443"), sshPort = this.appService.getMeta("PROXY_SSH_PORT", "22");
             container = await this.dockerService.createContainer({
                 name: this.containerName,
                 image: this.imageName,
@@ -124,7 +124,7 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
                 ports: [
                     `${httpPort}:80`,
                     `${httpsPort}:443`,
-                    ...this.appConfigService.getMeta("PROXY_SSH_PASSWORD") ? [
+                    ...this.appService.getMeta("PROXY_SSH_PASSWORD") ? [
                         `${sshPort}:22`
                     ] : []
                 ],
@@ -161,9 +161,9 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
         }
         await this.dockerService.buildImage({
             tag: this.imageName,
-            version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
+            version: this.appService.isExperimentalEnabled("buildKit") ? "2" : "1",
             buildArgs: {
-                SSH_PASSWORD: this.appConfigService.getMeta("PROXY_SSH_PASSWORD")
+                SSH_PASSWORD: this.appService.getMeta("PROXY_SSH_PASSWORD")
             },
             context: Path.join(env_1.PLUGINS_DIR, "proxy"),
             dockerfile: "./Dockerfile"
@@ -176,7 +176,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", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         core_1.ProcessService,
         core_1.AppFileSystemService,
         docker_module_1.DockerService])

package/lib/utils/index.d.ts

@@ -1,6 +1,5 @@
 export * from "./escapeRegExp";
 export * from "./exec";
 export * from "./get-cursor-position";
-export * from "./injectVariables";
 export * from "./parse-table";
 export * from "./spawn";

package/lib/utils/index.js

@@ -17,6 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./escapeRegExp"), exports);
 __exportStar(require("./exec"), exports);
 __exportStar(require("./get-cursor-position"), exports);
-__exportStar(require("./injectVariables"), exports);
 __exportStar(require("./parse-table"), exports);
 __exportStar(require("./spawn"), exports);