@wocker/ws 1.0.24 → 1.0.25

package/lib/modules/preset/controllers/PresetController.js

@@ -81,13 +81,14 @@ let PresetController = class PresetController {
             await this.dockerService.imageRm(imageName);
         }
         await this.dockerService.buildImage({
+            version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
             tag: imageName,
             labels: {
                 presetName: preset.name
             },
             buildArgs: buildArgs,
             context: preset.path,
-            src: preset.dockerfile
+            dockerfile: preset.dockerfile
         });
     }
     async presets() {

package/lib/modules/preset/controllers/PresetListener.d.ts

@@ -1,13 +1,14 @@
-import { EventService, Project } from "@wocker/core";
+import { EventService, Project, AppConfigService } from "@wocker/core";
 import { DockerService } from "../../docker";
 import { PresetRepository } from "../repositories/PresetRepository";
 import { PresetService } from "../services/PresetService";
 export declare class PresetListener {
+    protected readonly appConfigService: AppConfigService;
     protected readonly eventService: EventService;
     protected readonly dockerService: DockerService;
     protected readonly presetRepository: PresetRepository;
     protected readonly presetService: PresetService;
-    constructor(eventService: EventService, dockerService: DockerService, presetRepository: PresetRepository, presetService: PresetService);
+    constructor(appConfigService: AppConfigService, eventService: EventService, dockerService: DockerService, presetRepository: PresetRepository, presetService: PresetService);
     onInit(project: Project): Promise<void>;
     protected onRebuild(project: Project): Promise<void>;
     protected onBeforeStart(project: Project): Promise<void>;

package/lib/modules/preset/controllers/PresetListener.js

@@ -17,7 +17,8 @@ const PresetRepository_1 = require("../repositories/PresetRepository");
 const PresetService_1 = require("../services/PresetService");
 const utils_2 = require("../../../utils");
 let PresetListener = class PresetListener {
-    constructor(eventService, dockerService, presetRepository, presetService) {
+    constructor(appConfigService, eventService, dockerService, presetRepository, presetService) {
+        this.appConfigService = appConfigService;
         this.eventService = eventService;
         this.dockerService = dockerService;
         this.presetRepository = presetRepository;
@@ -118,13 +119,14 @@ let PresetListener = class PresetListener {
             project.imageName = this.presetService.getImageNameForProject(project, preset);
             if (!await this.dockerService.imageExists(project.imageName)) {
                 await this.dockerService.buildImage({
+                    version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
                     tag: project.imageName,
                     labels: {
                         presetName: preset.name
                     },
                     buildArgs: project.buildArgs,
                     context: preset.path,
-                    src: preset.dockerfile
+                    dockerfile: preset.dockerfile
                 });
             }
         }
@@ -133,7 +135,8 @@ let PresetListener = class PresetListener {
 exports.PresetListener = PresetListener;
 exports.PresetListener = PresetListener = __decorate([
     (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [core_1.EventService,
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.EventService,
         docker_1.DockerService,
         PresetRepository_1.PresetRepository,
         PresetService_1.PresetService])

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

@@ -40,18 +40,27 @@ let PresetService = class PresetService {
                     break;
                 }
                 case "select": {
+                    const options = (0, utils_1.normalizeOptions)(config.options);
+                    const defaultValue = config.multiple ? options.reduce((defaultValue, option) => {
+                        if (values[option.value] === "true") {
+                            return [
+                                ...defaultValue,
+                                option.value
+                            ];
+                        }
+                        return defaultValue;
+                    }, []) : values[name];
                     const result = await (0, utils_1.promptSelect)({
                         required: config.required,
                         multiple: config.multiple,
                         message: config.message,
                         options: config.options,
-                        default: values[name]
+                        default: defaultValue
                     });
                     if (!config.multiple) {
                         values[name] = result;
                     }
                     else {
-                        const options = (0, utils_1.normalizeOptions)(config.options);
                         for (const option of options) {
                             if (result.includes(option.value)) {
                                 values[option.value] = "true";

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

@@ -10,4 +10,5 @@ export declare class ProjectController {
     start(name?: string, restart?: boolean, build?: boolean, attach?: boolean): Promise<void>;
     stop(name?: string): Promise<void>;
     eject(name?: string): Promise<void>;
+    exec(command?: string[], name?: string): Promise<void>;
 }

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

@@ -82,6 +82,10 @@ let ProjectController = class ProjectController {
         delete project.imageName;
         project.save();
     }
+    async exec(command, name) {
+        const project = this.projectService.get(name);
+        await this.projectService.exec(project, command);
+    }
 };
 exports.ProjectController = ProjectController;
 __decorate([
@@ -117,6 +121,18 @@ __decorate([
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "eject", null);
+__decorate([
+    (0, core_1.Command)("exec [...command]"),
+    __param(0, (0, core_1.Param)("command")),
+    __param(1, (0, core_1.Option)("name", {
+        type: "string",
+        alias: "n",
+        description: "The name of the project"
+    })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Array, String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "exec", null);
 exports.ProjectController = ProjectController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Project commands"),

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

@@ -1,15 +1,18 @@
-import { Project, AppConfigService, EventService, ProjectService as CoreProjectService, ProjectServiceSearchParams as SearchParams } from "@wocker/core";
-import { ProjectRepository } from "../repositories/ProjectRepository";
-import { DockerService } from "../../docker";
+import { Project, AppConfigService, EventService, ProcessService, ProjectService as CoreProjectService, ProjectServiceSearchParams as SearchParams, LogService } from "@wocker/core";
+import { DockerService, ComposeService } from "../../docker";
 import { PresetService, PresetRepository } from "../../preset";
+import { ProjectRepository } from "../repositories/ProjectRepository";
 export declare class ProjectService extends CoreProjectService {
     protected readonly appConfigService: AppConfigService;
+    protected readonly processService: ProcessService;
     protected readonly eventService: EventService;
     protected readonly dockerService: DockerService;
+    protected readonly composeService: ComposeService;
     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);
+    protected readonly logService: LogService;
+    constructor(appConfigService: AppConfigService, processService: ProcessService, eventService: EventService, dockerService: DockerService, composeService: ComposeService, projectRepository: ProjectRepository, presetService: PresetService, presetRepository: PresetRepository, logService: LogService);
     get(name?: string): Project;
     search(params?: SearchParams): Project[];
     searchOne(params?: SearchParams): Project | null;
@@ -17,5 +20,6 @@ export declare class ProjectService extends CoreProjectService {
     start(project: Project, restart?: boolean, rebuild?: boolean, attach?: boolean): Promise<void>;
     stop(project: Project): Promise<void>;
     build(project: Project, rebuild?: boolean): Promise<void>;
+    exec(project: Project, command: string[]): Promise<void>;
     logs(project: Project, detach?: boolean): Promise<void>;
 }

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

@@ -11,30 +11,33 @@ var __metadata = (this && this.__metadata) || function (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");
+const ProjectRepository_1 = require("../repositories/ProjectRepository");
 let ProjectService = class ProjectService extends core_1.ProjectService {
-    constructor(appConfigService, eventService, dockerService, projectRepository, presetService, presetRepository) {
+    constructor(appConfigService, processService, eventService, dockerService, composeService, projectRepository, presetService, presetRepository, logService) {
         super();
         this.appConfigService = appConfigService;
+        this.processService = processService;
         this.eventService = eventService;
         this.dockerService = dockerService;
+        this.composeService = composeService;
         this.projectRepository = projectRepository;
         this.presetService = presetService;
         this.presetRepository = presetRepository;
+        this.logService = logService;
     }
     get(name) {
         const project = name
             ? this.projectRepository.searchOne({ name })
             : this.projectRepository.searchOne({
-                path: this.appConfigService.pwd()
+                path: this.processService.pwd()
             });
         if (!project) {
             throw new Error("Project not found");
         }
         if (name) {
-            this.appConfigService.setPWD(project.path);
+            this.processService.chdir(project.path);
         }
         return project;
     }
@@ -88,6 +91,10 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                 break;
             }
             case core_1.PROJECT_TYPE_COMPOSE: {
+                await this.composeService.up({
+                    context: project.path,
+                    composefile: project.composefile
+                });
                 break;
             }
         }
@@ -100,6 +107,8 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                 case core_1.PROJECT_TYPE_PRESET:
                     await this.dockerService.attach(project.containerName);
                     break;
+                case core_1.PROJECT_TYPE_COMPOSE:
+                    break;
             }
         }
     }
@@ -111,8 +120,13 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
             case core_1.PROJECT_TYPE_PRESET:
                 await this.dockerService.removeContainer(project.containerName);
                 break;
-            case core_1.PROJECT_TYPE_COMPOSE:
+            case core_1.PROJECT_TYPE_COMPOSE: {
+                await this.composeService.down({
+                    context: project.path,
+                    composefile: project.composefile
+                });
                 break;
+            }
         }
         await this.eventService.emit("project:stop", project);
     }
@@ -129,10 +143,11 @@ 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",
                         tag: project.imageName,
                         buildArgs: project.buildArgs,
                         context: project.path,
-                        src: project.dockerfile
+                        dockerfile: project.dockerfile
                     });
                 }
                 break;
@@ -154,24 +169,48 @@ 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",
                             tag: project.imageName,
                             labels: {
                                 "org.wocker.preset": preset.name
                             },
                             buildArgs: project.buildArgs,
                             context: preset.path,
-                            src: preset.dockerfile
+                            dockerfile: preset.dockerfile
                         });
                     }
                 }
                 break;
             }
             case core_1.PROJECT_TYPE_COMPOSE: {
+                await this.composeService.build({
+                    context: project.path,
+                    composefile: project.composefile
+                });
                 break;
             }
         }
         await this.eventService.emit("project:build", project, rebuild);
     }
+    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:
+                await this.dockerService.exec(project.containerName, command, true);
+                break;
+            case core_1.PROJECT_TYPE_COMPOSE: {
+                const [service, ...args] = command;
+                await this.composeService.exec({
+                    service,
+                    args,
+                    context: project.path,
+                    composefile: project.composefile
+                });
+                break;
+            }
+        }
+    }
     async logs(project, detach) {
         switch (project.type) {
             case core_1.PROJECT_TYPE_IMAGE:
@@ -203,9 +242,12 @@ exports.ProjectService = ProjectService;
 exports.ProjectService = ProjectService = __decorate([
     (0, core_1.Injectable)("PROJECT_SERVICE"),
     __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.ProcessService,
         core_1.EventService,
         docker_1.DockerService,
+        docker_1.ComposeService,
         ProjectRepository_1.ProjectRepository,
         preset_1.PresetService,
-        preset_1.PresetRepository])
+        preset_1.PresetRepository,
+        core_1.LogService])
 ], ProjectService);

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

@@ -145,12 +145,13 @@ let ProxyService = class ProxyService extends core_1.ProxyService {
             await this.dockerService.imageRm(oldImage);
         }
         await this.dockerService.buildImage({
+            version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
             tag: this.imageName,
-            context: Path.join(env_1.PLUGINS_DIR, "proxy"),
-            src: "./Dockerfile",
             buildArgs: {
                 SSH_PASSWORD: this.appConfigService.getMeta("PROXY_SSH_PASSWORD")
-            }
+            },
+            context: Path.join(env_1.PLUGINS_DIR, "proxy"),
+            dockerfile: "./Dockerfile"
         });
     }
     async logs() {

package/lib/utils/index.d.ts

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

package/lib/utils/index.js

@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./escapeRegExp"), exports);
 __exportStar(require("./exec"), exports);
-__exportStar(require("./followProgress2"), exports);
 __exportStar(require("./get-cursor-position"), exports);
 __exportStar(require("./injectVariables"), exports);
 __exportStar(require("./parse-table"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.24",
+    "version": "1.0.25",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -33,12 +33,13 @@
         "make-coverage-badge": "make-coverage-badge"
     },
     "dependencies": {
-        "@wocker/core": "1.0.24",
+        "@wocker/core": "1.0.25",
         "@wocker/utils": "^2.0.3",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
         "child_process": "^1.0.2",
         "cli-table3": "^0.6.2",
+        "docker-compose": "^1.2.0",
         "dockerode": "^4.0.2",
         "fs": "^0.0.1-security",
         "keytar": "^7.9.0",
@@ -54,7 +55,7 @@
         "@types/jest": "^29.5.14",
         "@types/md5": "^2.3.2",
         "@types/mute-stream": "^0.0.4",
-        "@types/node": "^22.14.1",
+        "@types/node": "^24.0.13",
         "@types/unzipper": "^0.10.10",
         "@wocker/testing": "1.0.2",
         "jest": "^29.7.0",

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

@@ -1,2 +0,0 @@
-export declare class AppModule {
-}

package/lib/utils/followProgress2.d.ts

@@ -1 +0,0 @@
-export declare const followProgress2: (stream: NodeJS.ReadableStream) => Promise<void>;

package/lib/utils/followProgress2.js

@@ -1,63 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.followProgress2 = void 0;
-const protobufjs_1 = __importDefault(require("protobufjs"));
-const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
-const env_1 = require("../env");
-const followProgress2 = async (stream) => {
-    const root = await protobufjs_1.default.load([
-        `${env_1.ROOT_DIR}/proto/solver/pb/ops.proto`,
-        `${env_1.ROOT_DIR}/proto/buildkit.proto`
-    ]);
-    const StatusResponse = root.lookupType("moby.buildkit.v1.StatusResponse");
-    return new Promise((resolve, reject) => {
-        let isEnded = false;
-        let success = 0, error = 0;
-        const handleEnd = () => {
-            if (!isEnded) {
-                isEnded = true;
-                console.log(`success: ${success} errors: ${error}`);
-                resolve();
-                return;
-            }
-        };
-        stream.on("data", (data) => {
-            const content = data.toString().replace(/}\s*\{/g, '},{'), items = JSON.parse(`[${content}]`);
-            for (const item of items) {
-                switch (item.id) {
-                    case "moby.buildkit.trace": {
-                        if (!item.aux) {
-                            break;
-                        }
-                        let buffer = Buffer.from(item.aux, "base64");
-                        try {
-                            const decoded = StatusResponse.decode(buffer);
-                            const obj = StatusResponse.toObject(decoded, {
-                                enums: String,
-                                longs: String,
-                                bytes: String,
-                                defaults: true,
-                            });
-                            console.dir(obj, { depth: null });
-                            success++;
-                        }
-                        catch (err) {
-                            error++;
-                            console.error(yoctocolors_cjs_1.default.red(`Error: ${err.message}`));
-                        }
-                        break;
-                    }
-                    default:
-                        break;
-                }
-            }
-        });
-        stream.on("end", handleEnd);
-        stream.on("close", handleEnd);
-        stream.on("error", reject);
-    });
-};
-exports.followProgress2 = followProgress2;

package/plugins/proxmox/Dockerfile

@@ -1,35 +0,0 @@
-FROM debian:stable
-
-RUN apt-get update \
-  && apt-get install -y wget
-
-RUN apt-get update && apt-get install -y gnupg
-
-RUN echo "deb http://download.proxmox.com/debian/pve bullseye pve-no-subscription" | tee /etc/apt/sources.list.d/pve-install-repo.list
-
-#RUN wget http://download.proxmox.com/debian/proxmox-release-bullseye.gpg
-RUN wget http://download.proxmox.com/debian/proxmox-ve-release-6.x.gpg
-RUN apt-key add proxmox-ve-release-6.x.gpg
-
-RUN echo "deb http://download.proxmox.com/debian/pve buster pve-no-subscription" > /etc/apt/sources.list.d/pve-no-subscription.list
-
-RUN apt update
-RUN apt install proxmox-ve postfix open-iscsi
-
-# RUN apt remove os-prober
-
-#RUN mv proxmox-release-bullseye.gpg /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
-
-#RUN chmod +r /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
-
-#RUN apt update
-
-#RUN apt full-upgrade -y
-
-#RUN apt update
-
-#RUN echo "deb http://download.proxmox.com/debian/ceph-pacific bullseye main" | tee /etc/apt/sources.list.d/ceph.list
-
-# RUN apt-get install -y proxmox-ve postfix open-iscsi
-
-#RUN apt update

package/plugins/proxy/Dockerfile

@@ -1,25 +0,0 @@
-FROM nginxproxy/nginx-proxy:1.6.4-alpine
-
-ARG SSH_PASSWORD=''
-
-COPY ./bin/wocker-create-ca /usr/local/bin/wocker-create-ca
-COPY ./bin/wocker-create-cert /usr/local/bin/wocker-create-cert
-COPY ./bin/wocker-create-domains /usr/local/bin/wocker-create-domains
-
-RUN chmod +x /usr/local/bin/wocker-create-ca && \
-    chmod +x /usr/local/bin/wocker-create-cert && \
-    chmod +x /usr/local/bin/wocker-create-domains
-
-RUN if [ -n "$SSH_PASSWORD" ]; then \
-        apk update && apk add --no-cache openssh; \
-        mkdir -p /var/run/sshd; \
-        echo "root:$SSH_PASSWORD" | chpasswd; \
-        sed -i 's/AllowTcpForwarding no/AllowTcpForwarding yes/' /etc/ssh/sshd_config; \
-        sed -i 's/GatewayPorts no/GatewayPorts yes/' /etc/ssh/sshd_config; \
-        sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config; \
-        sed -i 's/#UsePAM yes/UsePAM no/' /etc/ssh/sshd_config; \
-        ssh-keygen -A; \
-        echo "sshd: /usr/sbin/sshd -D" >> /app/Procfile; \
-    fi
-
-EXPOSE 22

package/plugins/proxy/Procfile

@@ -1,2 +0,0 @@
-nginx: nginx -g "daemon off;"
-docker-gen: docker-gen -watch -config /app/docker-gen.conf

package/plugins/proxy/bin/wocker-create-ca

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-CA_DIR=/etc/nginx/ca-certs
-
-if [ ! -f $CA_DIR/Wocker-CA.key ]; then
-    mkdir -p $CA_DIR
-
-    openssl req -x509 -nodes -new -sha256 \
-        -days 1024 \
-        -newkey rsa:2048 \
-        -keyout $CA_DIR/Wocker-CA.key \
-        -out $CA_DIR/Wocker-CA.pem \
-        -subj "/C=UA/ST=Kyiv/O=Wocker/CN=Wocker-CA"
-
-    openssl x509 \
-        -outform pem \
-        -in $CA_DIR/Wocker-CA.pem \
-        -out $CA_DIR/Wocker-CA.crt
-fi

package/plugins/proxy/bin/wocker-create-cert

@@ -1,38 +0,0 @@
-#!/bin/bash
-
-if [ -z "$1" ]; then
-    echo "Usage: $0 <name>"
-    exit 1
-fi
-
-NAME=$1
-CA_DIR=/etc/nginx/ca-certs
-CERT_DIR=/etc/nginx/certs
-DAYS_VALID=365
-COUNTRY="UA"
-STATE="Kyiv"
-CITY="Kyiv"
-ORGANIZATION="Wocker"
-ORG_UNIT="Wocker"
-COMMON_NAME=$NAME
-
-mkdir -p $CERT_DIR
-
-openssl req \
-    -new \
-    -nodes \
-    -newkey rsa:2048 \
-    -keyout $CERT_DIR/$NAME.key \
-    -out $CERT_DIR/$NAME.csr \
-    -subj "/C=$COUNTRY/ST=$STATE/L=$CITY/O=$ORGANIZATION/OU=$ORG_UNIT/CN=$COMMON_NAME"
-
-openssl x509 \
-    -req \
-    -sha256 \
-    -days 1024 \
-    -in $CERT_DIR/$NAME.csr \
-    -CA $CA_DIR/Wocker-CA.pem \
-    -CAkey $CA_DIR/Wocker-CA.key \
-    -CAcreateserial \
-    -extfile $CERT_DIR/$NAME.ext \
-    -out $CERT_DIR/$NAME.crt

package/plugins/proxy/bin/wocker-create-domains

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-NAME=$1
-CERT_DIR=/etc/nginx/certs
-
-shift
-
-CONTENT="authorityKeyIdentifier=keyid,issuer
-basicConstraints=CA:FALSE
-keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
-subjectAltName = @alt_names
-[alt_names]"
-
-index=1
-for arg in "$@"; do
-    CONTENT="$CONTENT
-DNS.$index = $arg"
-    ((index++))
-done
-
-echo "$CONTENT" > $CERT_DIR/$NAME.ext