@wocker/ws 1.0.21 → 1.0.22

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.21",
+    "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",
@@ -24,36 +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.21",
-        "@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": "^4.1.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/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/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/elastic-search/controllers/ElasticSearchController.d.ts

@@ -1,10 +0,0 @@
-import { FileSystemManager, DockerService, AppConfigService } from "@wocker/core";
-export declare class ElasticSearchController {
-    protected readonly appConfigService: AppConfigService;
-    protected readonly dockerService: DockerService;
-    protected containerName: string;
-    protected fs: FileSystemManager;
-    constructor(appConfigService: AppConfigService, dockerService: DockerService);
-    start(restart?: boolean): Promise<void>;
-    stop(): Promise<void>;
-}

package/lib/plugins/elastic-search/controllers/ElasticSearchController.js

@@ -1,91 +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 __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ElasticSearchController = void 0;
-const core_1 = require("@wocker/core");
-let ElasticSearchController = class ElasticSearchController {
-    constructor(appConfigService, dockerService) {
-        this.appConfigService = appConfigService;
-        this.dockerService = dockerService;
-        this.containerName = "elastic-search.workspace";
-        this.fs = new core_1.FileSystemManager(this.appConfigService.pluginsPath("elastic-search"), this.appConfigService.dataPath("plugins/elastic-search"));
-    }
-    async start(restart) {
-        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) {
-            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.destination.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.ElasticSearchController = ElasticSearchController;
-__decorate([
-    (0, core_1.Command)("elastica:start"),
-    (0, core_1.Description)("Start Elastic Search"),
-    __param(0, (0, core_1.Option)("restart", {
-        alias: "r",
-        description: "Restarting elastic search"
-    })),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Boolean]),
-    __metadata("design:returntype", Promise)
-], ElasticSearchController.prototype, "start", null);
-__decorate([
-    (0, core_1.Command)("elastica:stop"),
-    (0, core_1.Description)("Stop Elastic Search"),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], ElasticSearchController.prototype, "stop", null);
-exports.ElasticSearchController = ElasticSearchController = __decorate([
-    (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
-        core_1.DockerService])
-], ElasticSearchController);

package/lib/plugins/elastic-search/index.d.ts

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

package/lib/plugins/elastic-search/index.js

@@ -1,22 +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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ElasticSearchPlugin = void 0;
-const core_1 = require("@wocker/core");
-const ElasticSearchController_1 = require("./controllers/ElasticSearchController");
-let ElasticSearchPlugin = class ElasticSearchPlugin {
-};
-exports.ElasticSearchPlugin = ElasticSearchPlugin;
-exports.ElasticSearchPlugin = ElasticSearchPlugin = __decorate([
-    (0, core_1.Plugin)({
-        name: "elastic-search",
-        controllers: [
-            ElasticSearchController_1.ElasticSearchController
-        ]
-    })
-], ElasticSearchPlugin);

package/lib/plugins/proxmox/controllers/ProxmoxController.d.ts

@@ -1,14 +0,0 @@
-import { FileSystemManager, AppConfigService, DockerService } from "@wocker/core";
-export declare class ProxmoxController {
-    protected readonly appConfigService: AppConfigService;
-    protected readonly dockerService: DockerService;
-    protected configDir: string;
-    protected containerName: string;
-    protected imageName: string;
-    protected fs: FileSystemManager;
-    constructor(appConfigService: AppConfigService, dockerService: DockerService);
-    pluginPath(...parts: string[]): string;
-    start(restart?: boolean, rebuild?: boolean): Promise<void>;
-    stop(): Promise<void>;
-    protected build(rebuild?: boolean): Promise<void>;
-}

package/lib/plugins/proxmox/controllers/ProxmoxController.js

@@ -1,127 +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 () {
-    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);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProxmoxController = void 0;
-const core_1 = require("@wocker/core");
-const Path = __importStar(require("path"));
-let ProxmoxController = class ProxmoxController {
-    constructor(appConfigService, dockerService) {
-        this.appConfigService = appConfigService;
-        this.dockerService = dockerService;
-        this.containerName = "proxmox.workspace";
-        this.imageName = "wocker-proxmox:1.0.0";
-        this.configDir = this.appConfigService.dataPath("plugins/proxmox");
-    }
-    pluginPath(...parts) {
-        return Path.join(this.appConfigService.pluginsPath("proxmox"), ...parts);
-    }
-    async start(restart, rebuild) {
-        if (restart || rebuild) {
-            await this.dockerService.removeContainer(this.containerName);
-        }
-        let container = await this.dockerService.getContainer(this.containerName);
-        if (!container) {
-            await this.build(rebuild);
-            container = await this.dockerService.createContainer({
-                name: this.containerName,
-                image: this.imageName,
-                env: {
-                    VIRTUAL_HOST: this.containerName,
-                    VIRTUAL_PORT: "8006"
-                }
-            });
-        }
-        const { State: { Running } } = await container.inspect();
-        if (!Running) {
-            await container.start();
-        }
-    }
-    async stop() {
-        await this.dockerService.removeContainer(this.containerName);
-    }
-    async build(rebuild) {
-        if (rebuild) {
-            await this.dockerService.imageRm(this.imageName);
-        }
-        else {
-            if (await this.dockerService.imageExists(this.imageName)) {
-                return;
-            }
-        }
-        await this.dockerService.buildImage({
-            tag: this.imageName,
-            context: this.pluginPath(),
-            src: "./Dockerfile"
-        });
-    }
-};
-exports.ProxmoxController = ProxmoxController;
-__decorate([
-    (0, core_1.Command)("proxmox:start"),
-    (0, core_1.Description)("Starting proxmox"),
-    __param(0, (0, core_1.Option)("restart", {
-        alias: "r"
-    })),
-    __param(1, (0, core_1.Option)("rebuild", {
-        alias: "b"
-    })),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Boolean, Boolean]),
-    __metadata("design:returntype", Promise)
-], ProxmoxController.prototype, "start", null);
-__decorate([
-    (0, core_1.Command)("proxmox:stop"),
-    (0, core_1.Description)("Stopping proxmox"),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], ProxmoxController.prototype, "stop", null);
-exports.ProxmoxController = ProxmoxController = __decorate([
-    (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
-        core_1.DockerService])
-], ProxmoxController);

package/lib/plugins/proxmox/index.d.ts

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

package/lib/plugins/proxmox/index.js

@@ -1,23 +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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProxmoxPlugin = void 0;
-const core_1 = require("@wocker/core");
-const ProxmoxController_1 = require("./controllers/ProxmoxController");
-let ProxmoxPlugin = class ProxmoxPlugin {
-};
-exports.ProxmoxPlugin = ProxmoxPlugin;
-exports.ProxmoxPlugin = ProxmoxPlugin = __decorate([
-    (0, core_1.Plugin)({
-        name: "proxmox",
-        controllers: [
-            ProxmoxController_1.ProxmoxController
-        ],
-        providers: []
-    })
-], 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/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"
-}