@wocker/ws 1.0.20 → 1.0.22

package/lib/services/ProxyService.js

@@ -21,13 +21,23 @@ 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 __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -37,23 +47,26 @@ const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const Path = __importStar(require("path"));
 const env_1 = require("../env");
-const makes_1 = require("../makes");
 const AppConfigService_1 = require("./AppConfigService");
 const DockerService_1 = require("./DockerService");
-let ProxyService = class ProxyService {
+let ProxyService = class ProxyService extends core_1.ProxyService {
     constructor(appConfigService, dockerService) {
+        super();
         this.appConfigService = appConfigService;
         this.dockerService = dockerService;
         this.containerName = "proxy.workspace";
-        this.imageName = "wocker-proxy:1.0.0";
+        this.imageName = "wocker-proxy:1.0.1";
+        this.oldImages = [
+            "wocker-proxy:1.0.0"
+        ];
     }
     async init(project) {
-        const appPort = await (0, utils_1.promptText)({
-            message: "App port:",
+        const appPort = await (0, utils_1.promptInput)({
+            message: "App port",
             type: "number",
-            default: project.getEnv("VIRTUAL_PORT", "80")
+            default: parseInt(project.getEnv("VIRTUAL_PORT", "80"))
         });
-        project.setEnv("VIRTUAL_PORT", appPort);
+        project.setEnv("VIRTUAL_PORT", appPort.toString());
         await project.save();
     }
     async start(restart, rebuild) {
@@ -64,7 +77,6 @@ let ProxyService = class ProxyService {
         if (!container) {
             console.info("Proxy starting...");
             await this.build(rebuild);
-            const certsDir = this.appConfigService.dataPath("certs");
             if (!this.appConfigService.fs.exists("certs/ca")) {
                 this.appConfigService.fs.mkdir("certs/ca", {
                     recursive: true,
@@ -77,15 +89,10 @@ let ProxyService = class ProxyService {
                     mode: 0o700
                 });
             }
-            if (!makes_1.FS.existsSync(certsDir)) {
-                makes_1.FS.mkdirSync(certsDir, {
-                    recursive: true,
-                    mode: 0o700
-                });
-            }
-            const config = this.appConfigService.getConfig();
+            const config = this.appConfigService.config;
             const httpPort = config.getMeta("PROXY_HTTP_PORT", "80");
             const httpsPort = config.getMeta("PROXY_HTTPS_PORT", "443");
+            const sshPort = config.getMeta("PROXY_SSH_PORT", "22");
             container = await this.dockerService.createContainer({
                 name: this.containerName,
                 image: this.imageName,
@@ -96,13 +103,17 @@ let ProxyService = class ProxyService {
                 },
                 ports: [
                     `${httpPort}:80`,
-                    `${httpsPort}:443`
+                    `${httpsPort}:443`,
+                    ...config.getMeta("PROXY_SSH_PASSWORD") ? [
+                        `${sshPort}:22`
+                    ] : []
                 ],
                 volumes: [
                     "/var/run/docker.sock:/tmp/docker.sock:ro",
                     `${this.appConfigService.fs.path("certs/projects")}:/etc/nginx/certs`,
                     `${this.appConfigService.fs.path("certs/ca")}:/etc/nginx/ca-certs`
-                ]
+                ],
+                network: "workspace"
             });
         }
         const { State: { Status } } = await container.inspect();
@@ -123,10 +134,17 @@ let ProxyService = class ProxyService {
         if (exists) {
             return;
         }
+        for (const oldImage of this.oldImages) {
+            await this.dockerService.imageRm(oldImage);
+        }
+        const config = this.appConfigService.config;
         await this.dockerService.buildImage({
             tag: this.imageName,
             context: Path.join(env_1.PLUGINS_DIR, "proxy"),
-            src: "./Dockerfile"
+            src: "./Dockerfile",
+            buildArgs: {
+                SSH_PASSWORD: config.getMeta("PROXY_SSH_PASSWORD")
+            }
         });
     }
     async logs() {

package/lib/utils/index.d.ts

@@ -6,5 +6,3 @@ export * from "./get-cursor-position";
 export * from "./injectVariables";
 export * from "./parse-table";
 export * from "./spawn";
-export * from "./volumeFormat";
-export * from "./volumeParse";

package/lib/utils/index.js

@@ -22,5 +22,3 @@ __exportStar(require("./get-cursor-position"), exports);
 __exportStar(require("./injectVariables"), exports);
 __exportStar(require("./parse-table"), exports);
 __exportStar(require("./spawn"), exports);
-__exportStar(require("./volumeFormat"), exports);
-__exportStar(require("./volumeParse"), exports);

package/package.json

@@ -1,11 +1,17 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.20",
+    "version": "1.0.22",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
-    "main": "lib/index.js",
-    "types": "lib/index.d.ts",
+    "main": "./lib/index.js",
+    "types": "./lib/index.d.ts",
+    "keywords": [
+        "wocker",
+        "workspace",
+        "docker",
+        "devops"
+    ],
     "bin": {
         "ws": "./bin/ws.js"
     },
@@ -18,37 +24,46 @@
         "url": "https://github.com/kearisp/wocker-ws/issues"
     },
     "scripts": {
-        "prepare": "npm run build",
+        "prepublishOnly": "npm run build",
         "start": "npm run watch",
-        "build": "tsc",
-        "watch": "tsc -w"
+        "build": "tsc --project tsconfig.build.json",
+        "watch": "tsc -w --project tsconfig.build.json",
+        "test": "jest --colors",
+        "test-watch": "jest --colors --watchAll",
+        "make-coverage-badge": "make-coverage-badge"
     },
     "dependencies": {
-        "@wocker/core": "1.0.20",
-        "@wocker/utils": "^1.0.7",
+        "@wocker/core": "1.0.22",
+        "@wocker/utils": "^2.0.0",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
-        "chalk": "^2.4.2",
         "child_process": "^1.0.2",
         "cli-table3": "^0.6.2",
         "date-fns": "^2.29.3",
         "dockerode": "^4.0.2",
         "fs": "^0.0.1-security",
+        "keytar": "^7.9.0",
         "md5": "^2.3.0",
         "os": "^0.1.2",
         "path": "^0.12.7",
         "readable-stream": "^4.1.0",
-        "unzipper": "^0.12.3"
+        "unzipper": "^0.12.3",
+        "yoctocolors-cjs": "^2.1.2"
     },
     "devDependencies": {
-        "@types/dockerode": "3.3.23",
-        "@types/jest": "^29.5.12",
-        "@types/lodash": "^4.14.161",
+        "@types/dockerode": "^3.3.23",
+        "@types/jest": "^29.5.14",
         "@types/md5": "^2.3.2",
-        "@types/mute-stream": "^0.0.1",
-        "@types/node": "^20.11.16",
+        "@types/mute-stream": "^0.0.4",
+        "@types/node": "^22.14.1",
         "@types/readable-stream": "^2.3.15",
         "@types/unzipper": "^0.10.10",
+        "@wocker/testing": "^1.0.0",
+        "jest": "^29.7.0",
+        "make-coverage-badge": "^1.2.0",
+        "memfs": "^4.17.0",
+        "ts-jest": "^29.3.2",
+        "ts-node": "^10.9.2",
         "typescript": "^5.6.3"
     }
 }

package/plugins/proxy/Dockerfile

@@ -1,4 +1,6 @@
-FROM nginxproxy/nginx-proxy:latest
+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
@@ -7,3 +9,17 @@ 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

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

package/lib/controllers/ImageController.d.ts

@@ -1,7 +0,0 @@
-import { AppConfigService, DockerService } from "../services";
-export declare class ImageController {
-    protected readonly appConfigService: AppConfigService;
-    protected readonly dockerService: DockerService;
-    constructor(appConfigService: AppConfigService, dockerService: DockerService);
-    list(): Promise<string>;
-}

package/lib/controllers/ImageController.js

@@ -1,46 +0,0 @@
-"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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageController = void 0;
-const core_1 = require("@wocker/core");
-const cli_table3_1 = __importDefault(require("cli-table3"));
-const services_1 = require("../services");
-let ImageController = class ImageController {
-    constructor(appConfigService, dockerService) {
-        this.appConfigService = appConfigService;
-        this.dockerService = dockerService;
-    }
-    async list() {
-        const images = await this.dockerService.imageLs({});
-        const table = new cli_table3_1.default({
-            head: ["Name"]
-        });
-        for (const image of images) {
-            table.push([image.Id]);
-        }
-        return table.toString();
-    }
-};
-exports.ImageController = ImageController;
-__decorate([
-    (0, core_1.Command)("images"),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], ImageController.prototype, "list", null);
-exports.ImageController = ImageController = __decorate([
-    (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [services_1.AppConfigService,
-        services_1.DockerService])
-], ImageController);

package/lib/makes/Model.d.ts

@@ -1,5 +0,0 @@
-export declare class Model {
-    attributes: {};
-    constructor(attributes?: any);
-    save(): Promise<void>;
-}

package/lib/makes/Model.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Model = void 0;
-class Model {
-    constructor(attributes = {}) {
-        this.attributes = {};
-        this.attributes = attributes;
-    }
-    async save() {
-    }
-}
-exports.Model = Model;

package/lib/plugins/ElasticSearchPlugin.d.ts

@@ -1,15 +0,0 @@
-import { FSManager } from "@wocker/core";
-import { AppConfigService, DockerService } from "../services";
-type StartOptions = {
-    restart?: boolean;
-};
-export declare class ElasticSearchPlugin {
-    protected readonly appConfigService: AppConfigService;
-    protected readonly dockerService: DockerService;
-    protected containerName: string;
-    protected fs: FSManager;
-    constructor(appConfigService: AppConfigService, dockerService: DockerService);
-    start(options: StartOptions): Promise<void>;
-    stop(): Promise<void>;
-}
-export {};

package/lib/plugins/ElasticSearchPlugin.js

@@ -1,72 +0,0 @@
-"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.ElasticSearchPlugin = void 0;
-const core_1 = require("@wocker/core");
-const services_1 = require("../services");
-let ElasticSearchPlugin = class ElasticSearchPlugin {
-    constructor(appConfigService, dockerService) {
-        this.appConfigService = appConfigService;
-        this.dockerService = dockerService;
-        this.containerName = "elastic-search.workspace";
-        this.fs = new core_1.FSManager(this.appConfigService.pluginsPath("elastic-search"), this.appConfigService.dataPath("plugins/elastic-search"));
-    }
-    async start(options) {
-        const { restart } = options;
-        await this.dockerService.pullImage("docker.elastic.co/elasticsearch/elasticsearch:7.5.2");
-        let container = await this.dockerService.getContainer(this.containerName);
-        if (restart && container) {
-            await this.dockerService.removeContainer(this.containerName);
-            container = null;
-        }
-        if (!container) {
-            await this.fs.mkdir("data", {
-                recursive: true
-            });
-            container = await this.dockerService.createContainer({
-                name: this.containerName,
-                image: "docker.elastic.co/elasticsearch/elasticsearch:7.5.2",
-                ulimits: {
-                    memlock: {
-                        hard: -1,
-                        soft: -1
-                    }
-                },
-                env: {
-                    "node.name": "elasticsearch",
-                    "cluster.name": "elasticsearch",
-                    "cluster.initial_master_nodes": "elasticsearch",
-                    "bootstrap.memory_lock": "false",
-                    ES_JAVA_OPTS: "-Xms512m -Xmx512m"
-                },
-                volumes: [
-                    `${this.fs.path("data")}:/usr/share/elasticsearch/data`
-                ],
-                ports: [
-                    "9200:9200"
-                ]
-            });
-        }
-        const { State: { Status } } = await container.inspect();
-        if (Status === "created" || Status === "exited") {
-            await container.start();
-        }
-    }
-    async stop() {
-        await this.dockerService.removeContainer(this.containerName);
-    }
-};
-exports.ElasticSearchPlugin = ElasticSearchPlugin;
-exports.ElasticSearchPlugin = ElasticSearchPlugin = __decorate([
-    (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [services_1.AppConfigService,
-        services_1.DockerService])
-], ElasticSearchPlugin);

package/lib/plugins/ProxmoxPlugin.d.ts

@@ -1,12 +0,0 @@
-import { FSManager } from "@wocker/core";
-import { AppConfigService, DockerService } from "../services";
-export declare class ProxmoxPlugin {
-    protected readonly appConfigService: AppConfigService;
-    protected readonly dockerService: DockerService;
-    protected configDir: string;
-    protected fs: FSManager;
-    constructor(appConfigService: AppConfigService, dockerService: DockerService);
-    pluginPath(...parts: string[]): string;
-    up(): Promise<void>;
-    down(): Promise<void>;
-}

package/lib/plugins/ProxmoxPlugin.js

@@ -1,83 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-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 __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-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.ProxmoxPlugin = void 0;
-const core_1 = require("@wocker/core");
-const Path = __importStar(require("path"));
-const services_1 = require("../services");
-const utils_1 = require("../utils");
-let ProxmoxPlugin = class ProxmoxPlugin {
-    constructor(appConfigService, dockerService) {
-        this.appConfigService = appConfigService;
-        this.dockerService = dockerService;
-        this.configDir = this.appConfigService.dataPath("plugins/proxmox");
-    }
-    pluginPath(...parts) {
-        return Path.join(this.appConfigService.pluginsPath("proxmox"), ...parts);
-    }
-    async up() {
-        const container = await this.dockerService.getContainer("proxmox.workspace");
-        if (container) {
-            await this.down();
-        }
-        await (0, utils_1.exec)(`
-            docker build \
-                --tag "ws-proxmox" \
-                --file "${this.pluginPath("./Dockerfile")}" \
-                ${this.pluginPath()}
-        `);
-        await (0, utils_1.exec)(`
-            docker run -d \
-                --name proxmox.workspace \
-                --network workspace \
-                -e VIRTUAL_HOST=proxmox.workspace \
-                -p 8006:8006 \
-                ws-proxmox
-        `);
-    }
-    async down() {
-        await (0, utils_1.exec)("docker stop proxmox.workspace").catch(() => {
-        });
-        await (0, utils_1.exec)("docker rm proxmox.workspace").catch(() => {
-        });
-        await (0, utils_1.exec)("docker image rm ws-proxmox").catch(() => {
-        });
-    }
-};
-exports.ProxmoxPlugin = ProxmoxPlugin;
-exports.ProxmoxPlugin = ProxmoxPlugin = __decorate([
-    (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [services_1.AppConfigService,
-        services_1.DockerService])
-], ProxmoxPlugin);

package/lib/utils/volumeFormat.d.ts

@@ -1,6 +0,0 @@
-export type Volume = {
-    source: string;
-    destination: string;
-    options?: string;
-};
-export declare const volumeFormat: (volume: Volume) => string;

package/lib/utils/volumeFormat.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.volumeFormat = void 0;
-const volumeFormat = (volume) => {
-    const { source, destination, options } = volume;
-    return `${source}:${destination}` + (options ? `:${options}` : "");
-};
-exports.volumeFormat = volumeFormat;

package/lib/utils/volumeParse.d.ts

@@ -1,2 +0,0 @@
-import { Volume } from "./volumeFormat";
-export declare const volumeParse: (volume: string) => Volume;

package/lib/utils/volumeParse.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.volumeParse = void 0;
-const volumeParse = (volume) => {
-    const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
-    const [, source, destination, options] = regVolume.exec(volume);
-    return {
-        source,
-        destination,
-        options
-    };
-};
-exports.volumeParse = volumeParse;

package/plugins/proxy/config.json

@@ -1,3 +0,0 @@
-{
-    "dockerfile": "./Dockerfile"
-}

package/presets/bun/Dockerfile

@@ -1,11 +0,0 @@
-FROM ubuntu:latest
-
-RUN apt-get update && \
-    apt-get -y install wget curl unzip
-
-RUN curl -fsSL https://bun.sh/install | bash
-
-ENV BUN_INSTALL="/root/.bun"
-ENV PATH="$BUN_INSTALL/bin:$PATH"
-
-# TODO

package/presets/bun/config.json

@@ -1,4 +0,0 @@
-{
-    "name": "bun",
-    "dockerfile": "./Dockerfile"
-}