@wocker/ws 1.0.22 → 1.0.24

package/lib/modules/docker/services/ModemService.js

@@ -0,0 +1,138 @@
+"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.ModemService = void 0;
+const core_1 = require("@wocker/core");
+const formatSizeUnits_1 = require("../utils/formatSizeUnits");
+const ProtoService_1 = require("./ProtoService");
+let ModemService = class ModemService extends core_1.ModemService {
+    constructor(protoService) {
+        super();
+        this.protoService = protoService;
+        this.record = true;
+    }
+    get modem() {
+        if (!this._modem) {
+            const Modem = require("docker-modem");
+            this._modem = new Modem({
+                socketPath: "/var/run/docker.sock"
+            });
+        }
+        return this._modem;
+    }
+    get docker() {
+        if (!this._docker) {
+            const Docker = require("dockerode");
+            this._docker = new Docker({
+                modem: this.modem
+            });
+        }
+        return this._docker;
+    }
+    async attachStream(stream) {
+        if (process.stdin.isTTY) {
+            process.stdin.setRawMode(true);
+        }
+        process.stdin.resume();
+        process.stdin.setEncoding("utf8");
+        process.stdin.pipe(stream);
+        stream.setEncoding("utf8");
+        stream.pipe(process.stdout);
+        try {
+            await new Promise((resolve, reject) => {
+                stream.on("end", resolve);
+                stream.on("error", reject);
+            });
+        }
+        finally {
+            process.stdin.pause();
+            if (process.stdin.isTTY) {
+                process.stdin.setRawMode(false);
+            }
+            process.stdin.unpipe(stream);
+            stream.unpipe(process.stdout);
+        }
+        return stream;
+    }
+    async followProgress(stream) {
+        let isEnded = false, line = 0;
+        const mapLines = {};
+        return new Promise((resolve, reject) => {
+            const handleEnd = () => {
+                if (!isEnded) {
+                    resolve();
+                }
+                isEnded = true;
+            };
+            stream.on("data", (chunk) => {
+                const text = chunk.toString().replace(/}\s*\{/g, "},{"), items = JSON.parse(`[${text}]`);
+                for (const item of items) {
+                    if (item.id === "moby.buildkit.trace") {
+                    }
+                    if (item.stream) {
+                        process.stdout.write(`${item.stream}`);
+                        line += item.stream.split("\n").length - 1;
+                    }
+                    else if (item.id) {
+                        const { id, status, processDetail: { current, total, } = {} } = item;
+                        if (typeof mapLines[id] === "undefined") {
+                            mapLines[id] = line;
+                        }
+                        const targetLine = typeof mapLines[id] !== "undefined"
+                            ? mapLines[id]
+                            : line;
+                        const dy = line - targetLine;
+                        if (dy > 0) {
+                            process.stdout.write("\x1b[s");
+                            process.stdout.write(`\x1b[${dy}A`);
+                        }
+                        process.stdout.write("\x1b[2K");
+                        let str = `${id}: ${status}\n`;
+                        if (status === "Downloading") {
+                            const width = process.stdout.columns;
+                            const sizeWidth = 19, totalWidth = width - id.length - status.length - sizeWidth - 7, currentWidth = Math.floor(totalWidth * (current / total)), formatSize = `${(0, formatSizeUnits_1.formatSizeUnits)(current)}/${(0, formatSizeUnits_1.formatSizeUnits)(total)}`;
+                            str = `${id}: ${status} [${"█".repeat(currentWidth)}${"░".repeat(totalWidth - currentWidth)}] ${formatSize}\n`;
+                        }
+                        process.stdout.write(str);
+                        if (dy > 0) {
+                            process.stdout.write("\x1b[u");
+                        }
+                        else {
+                            line++;
+                        }
+                    }
+                    else if (typeof item.aux === "object") {
+                        const str = `auxID: ${item.aux.ID}`;
+                        process.stdout.write(`${str}\n`);
+                        line += Math.ceil(str.length / process.stdout.columns);
+                    }
+                    else if (item.status) {
+                        process.stdout.write(`${item.status}\n`);
+                        line += Math.ceil(item.status.length / process.stdout.columns);
+                    }
+                    else {
+                        console.info("Unexpected data", item);
+                    }
+                }
+            });
+            stream.on("end", handleEnd);
+            stream.on("close", handleEnd);
+            stream.on("error", (err) => {
+                reject(err);
+            });
+        });
+    }
+};
+exports.ModemService = ModemService;
+exports.ModemService = ModemService = __decorate([
+    (0, core_1.Injectable)("MODEM_SERVICE"),
+    __metadata("design:paramtypes", [ProtoService_1.ProtoService])
+], ModemService);

package/lib/modules/docker/services/ProtoService.d.ts

@@ -0,0 +1,6 @@
+import { Type, Root } from "protobufjs";
+export declare class ProtoService {
+    protected _root?: Root;
+    get root(): Root;
+    lookupType(path: string): Type;
+}

package/lib/modules/docker/services/ProtoService.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProtoService = void 0;
+const protobufjs_1 = require("protobufjs");
+const env_1 = require("../../../env");
+class ProtoService {
+    get root() {
+        if (!this._root) {
+            this._root = (0, protobufjs_1.loadSync)([
+                `${env_1.ROOT_DIR}/proto/solver/pb/ops.proto`,
+                `${env_1.ROOT_DIR}/proto/buildkit.proto`
+            ]);
+        }
+        return this._root;
+    }
+    lookupType(path) {
+        return this.root.lookupType(path);
+    }
+}
+exports.ProtoService = ProtoService;

package/lib/modules/index.d.ts

@@ -0,0 +1,6 @@
+export * from "./app";
+export * from "./docker";
+export * from "./keystore";
+export * from "./preset";
+export * from "./project";
+export * from "./proxy";

package/lib/{keystore → modules}/index.js

@@ -14,4 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./KeystoreService"), exports);
+__exportStar(require("./app"), exports);
+__exportStar(require("./docker"), exports);
+__exportStar(require("./keystore"), exports);
+__exportStar(require("./preset"), exports);
+__exportStar(require("./project"), exports);
+__exportStar(require("./proxy"), exports);

package/lib/{controllers → modules/keystore/controllers}/KeystoreController.d.ts

@@ -1,5 +1,5 @@
-import { AppConfigService } from "../services";
-import { KeystoreService } from "../keystore";
+import { AppConfigService } from "@wocker/core";
+import { KeystoreService } from "../services/KeystoreService";
 export declare class KeystoreController {
     protected readonly appConfigService: AppConfigService;
     protected readonly keystoreService: KeystoreService;

package/lib/{controllers → modules/keystore/controllers}/KeystoreController.js

@@ -15,8 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeystoreController = void 0;
 const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
-const services_1 = require("../services");
-const keystore_1 = require("../keystore");
+const KeystoreService_1 = require("../services/KeystoreService");
 let KeystoreController = class KeystoreController {
     constructor(appConfigService, keystoreService) {
         this.appConfigService = appConfigService;
@@ -34,7 +33,7 @@ let KeystoreController = class KeystoreController {
             return;
         }
         this.appConfigService.config.keystore = provider;
-        this.appConfigService.config.save();
+        this.appConfigService.save();
     }
     async add(name, provider) {
         const value = await (0, utils_1.promptInput)({
@@ -101,6 +100,6 @@ __decorate([
 exports.KeystoreController = KeystoreController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Keystore commands"),
-    __metadata("design:paramtypes", [services_1.AppConfigService,
-        keystore_1.KeystoreService])
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        KeystoreService_1.KeystoreService])
 ], KeystoreController);

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

@@ -0,0 +1,4 @@
+import { KeystoreService } from "./services/KeystoreService";
+export declare class KeystoreModule {
+}
+export { KeystoreService };

package/lib/modules/keystore/index.js

@@ -0,0 +1,29 @@
+"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.KeystoreService = exports.KeystoreModule = void 0;
+const core_1 = require("@wocker/core");
+const KeystoreController_1 = require("./controllers/KeystoreController");
+const KeystoreService_1 = require("./services/KeystoreService");
+Object.defineProperty(exports, "KeystoreService", { enumerable: true, get: function () { return KeystoreService_1.KeystoreService; } });
+let KeystoreModule = class KeystoreModule {
+};
+exports.KeystoreModule = KeystoreModule;
+exports.KeystoreModule = KeystoreModule = __decorate([
+    (0, core_1.Module)({
+        controllers: [
+            KeystoreController_1.KeystoreController
+        ],
+        providers: [
+            KeystoreService_1.KeystoreService
+        ],
+        exports: [
+            KeystoreService_1.KeystoreService
+        ]
+    })
+], KeystoreModule);

package/lib/{keystore → modules/keystore}/providers/FileKeystoreProvider.d.ts

@@ -1,12 +1,11 @@
-import { KeystoreProvider } from "@wocker/core";
-import { AppConfigService } from "../../services/AppConfigService";
+import { AppFileSystemService, KeystoreProvider } from "@wocker/core";
 import { FileKeystore } from "../types/FileKeystore";
 export declare class FileKeystoreProvider extends KeystoreProvider {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly fs: AppFileSystemService;
     protected password?: string;
     protected encryptionKey?: Buffer;
     protected _keystore?: FileKeystore;
-    constructor(appConfigService: AppConfigService);
+    constructor(fs: AppFileSystemService);
     protected get keystore(): FileKeystore;
     protected get passwordHash(): string | undefined;
     protected getEncryptionKey(): Promise<Buffer>;

package/lib/{keystore → modules/keystore}/providers/FileKeystoreProvider.js

@@ -12,17 +12,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileKeystoreProvider = void 0;
 const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
-const AppConfigService_1 = require("../../services/AppConfigService");
 const FileKeystore_1 = require("../types/FileKeystore");
 const utils_2 = require("../utils");
 let FileKeystoreProvider = class FileKeystoreProvider extends core_1.KeystoreProvider {
-    constructor(appConfigService) {
+    constructor(fs) {
         super();
-        this.appConfigService = appConfigService;
+        this.fs = fs;
     }
     get keystore() {
         if (!this._keystore) {
-            const fs = this.appConfigService.fs;
+            const fs = this.fs;
             let data = {
                 secrets: {}
             };
@@ -93,5 +92,5 @@ let FileKeystoreProvider = class FileKeystoreProvider extends core_1.KeystorePro
 exports.FileKeystoreProvider = FileKeystoreProvider;
 exports.FileKeystoreProvider = FileKeystoreProvider = __decorate([
     (0, core_1.Injectable)(),
-    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService])
+    __metadata("design:paramtypes", [core_1.AppFileSystemService])
 ], FileKeystoreProvider);

package/lib/{keystore → modules/keystore}/providers/KeytarKeystoreProvider.js

@@ -41,7 +41,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeytarKeystoreProvider = void 0;
 const core_1 = require("@wocker/core");
-const env_1 = require("../../env");
+const env_1 = require("../../../env");
 let KeytarKeystoreProvider = class KeytarKeystoreProvider extends core_1.KeystoreProvider {
     async get(key, defaultValue) {
         const keytar = await this.getKeytar();

package/lib/{keystore → modules/keystore/services}/KeystoreService.d.ts

@@ -1,9 +1,10 @@
-import { KeystoreService as CoreKeystoreService, KeystoreProvider } from "@wocker/core";
-import { AppConfigService } from "../services/AppConfigService";
+import { AppService, AppConfigService, AppFileSystemService, KeystoreService as CoreKeystoreService, KeystoreProvider } from "@wocker/core";
 export declare class KeystoreService extends CoreKeystoreService {
+    protected readonly appService: AppService;
     protected readonly appConfigService: AppConfigService;
+    protected readonly fs: AppFileSystemService;
     protected providers: Map<string, KeystoreProvider>;
-    constructor(appConfigService: AppConfigService);
+    constructor(appService: AppService, appConfigService: AppConfigService, fs: AppFileSystemService);
     hasProvider(name: string): boolean;
     provider(name?: string): KeystoreProvider;
     get(keys: string | string[], byDefault?: string): Promise<string | undefined>;

package/lib/{keystore → modules/keystore/services}/KeystoreService.js

@@ -11,13 +11,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeystoreService = void 0;
 const core_1 = require("@wocker/core");
-const AppConfigService_1 = require("../services/AppConfigService");
-const KeytarKeystoreProvider_1 = require("./providers/KeytarKeystoreProvider");
-const FileKeystoreProvider_1 = require("./providers/FileKeystoreProvider");
+const KeytarKeystoreProvider_1 = require("../providers/KeytarKeystoreProvider");
+const FileKeystoreProvider_1 = require("../providers/FileKeystoreProvider");
 let KeystoreService = class KeystoreService extends core_1.KeystoreService {
-    constructor(appConfigService) {
+    constructor(appService, appConfigService, fs) {
         super();
+        this.appService = appService;
         this.appConfigService = appConfigService;
+        this.fs = fs;
         this.providers = new Map();
     }
     hasProvider(name) {
@@ -32,7 +33,7 @@ let KeystoreService = class KeystoreService extends core_1.KeystoreService {
         }
         switch (name) {
             case "file":
-                return new FileKeystoreProvider_1.FileKeystoreProvider(this.appConfigService);
+                return new FileKeystoreProvider_1.FileKeystoreProvider(this.fs);
             case "keytar":
                 return new KeytarKeystoreProvider_1.KeytarKeystoreProvider();
             default:
@@ -66,5 +67,7 @@ let KeystoreService = class KeystoreService extends core_1.KeystoreService {
 exports.KeystoreService = KeystoreService;
 exports.KeystoreService = KeystoreService = __decorate([
     (0, core_1.Injectable)("KEYSTORE_SERVICE"),
-    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService])
+    __metadata("design:paramtypes", [core_1.AppService,
+        core_1.AppConfigService,
+        core_1.AppFileSystemService])
 ], KeystoreService);

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

@@ -0,0 +1,18 @@
+import { AppConfigService } from "@wocker/core";
+import { DockerService } from "../../docker";
+import { PresetRepository } from "../repositories/PresetRepository";
+import { PresetService } from "../services/PresetService";
+export declare class PresetController {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly dockerService: DockerService;
+    protected readonly presetRepository: PresetRepository;
+    protected readonly presetService: PresetService;
+    constructor(appConfigService: AppConfigService, dockerService: DockerService, presetRepository: PresetRepository, presetService: PresetService);
+    init(): Promise<void>;
+    list(): Promise<string>;
+    add(name: string, version?: string): Promise<void>;
+    destroy(): Promise<void>;
+    delete(name: string, confirm?: boolean): Promise<void>;
+    build(presetName: string, rebuild?: boolean): Promise<void>;
+    presets(): Promise<string[]>;
+}

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

@@ -0,0 +1,157 @@
+"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); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PresetController = void 0;
+const core_1 = require("@wocker/core");
+const cli_table3_1 = __importDefault(require("cli-table3"));
+const utils_1 = require("@wocker/utils");
+const docker_1 = require("../../docker");
+const PresetRepository_1 = require("../repositories/PresetRepository");
+const PresetService_1 = require("../services/PresetService");
+let PresetController = class PresetController {
+    constructor(appConfigService, dockerService, presetRepository, presetService) {
+        this.appConfigService = appConfigService;
+        this.dockerService = dockerService;
+        this.presetRepository = presetRepository;
+        this.presetService = presetService;
+    }
+    async init() {
+        await this.presetService.init();
+    }
+    async list() {
+        const presets = this.presetRepository.search();
+        const table = new cli_table3_1.default({
+            head: [
+                "Name",
+                "Source",
+                "Path"
+            ]
+        });
+        for (const preset of presets) {
+            table.push([
+                preset.name,
+                preset.source,
+                preset.source === core_1.PRESET_SOURCE_EXTERNAL ? preset.path : ""
+            ]);
+        }
+        return table.toString();
+    }
+    async add(name, version) {
+        await this.presetService.addPreset(name, version);
+    }
+    async destroy() {
+        await this.presetService.deinit();
+    }
+    async delete(name, confirm) {
+        const preset = this.presetService.get(name);
+        if (typeof confirm === "undefined" || confirm === null) {
+            confirm = await (0, utils_1.promptConfirm)({
+                message: `Delete preset ${name}?`,
+                default: false
+            });
+        }
+        if (!confirm) {
+            return;
+        }
+        console.info("Deleting...");
+        preset.delete();
+    }
+    async build(presetName, rebuild) {
+        const preset = this.presetService.get(presetName);
+        let buildArgs = {};
+        if (preset.buildArgsOptions) {
+            buildArgs = await this.presetService.prompt(preset.buildArgsOptions);
+        }
+        const imageName = this.presetService.getImageName(preset, buildArgs);
+        if (rebuild) {
+            await this.dockerService.imageRm(imageName);
+        }
+        await this.dockerService.buildImage({
+            tag: imageName,
+            labels: {
+                presetName: preset.name
+            },
+            buildArgs: buildArgs,
+            context: preset.path,
+            src: preset.dockerfile
+        });
+    }
+    async presets() {
+        const presets = this.presetRepository.search();
+        return presets.map((preset) => {
+            return preset.name;
+        });
+    }
+};
+exports.PresetController = PresetController;
+__decorate([
+    (0, core_1.Command)("preset:init"),
+    (0, core_1.Description)("Creates preset config for current dir"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], PresetController.prototype, "init", null);
+__decorate([
+    (0, core_1.Command)("preset:ls"),
+    (0, core_1.Description)("List of all available presets"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], PresetController.prototype, "list", null);
+__decorate([
+    (0, core_1.Command)("preset:install <preset>"),
+    (0, core_1.Command)("preset:install <preset>@<version>"),
+    (0, core_1.Description)("Adding preset from github repository"),
+    __param(0, (0, core_1.Param)("preset")),
+    __param(1, (0, core_1.Param)("version")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String]),
+    __metadata("design:returntype", Promise)
+], PresetController.prototype, "add", null);
+__decorate([
+    (0, core_1.Command)("preset:destroy"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], PresetController.prototype, "destroy", null);
+__decorate([
+    (0, core_1.Command)("preset:delete <preset>"),
+    __param(0, (0, core_1.Param)("preset")),
+    __param(1, (0, core_1.Option)("yes", "y")),
+    __param(1, (0, core_1.Description)("Confirm deletion")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Boolean]),
+    __metadata("design:returntype", Promise)
+], PresetController.prototype, "delete", null);
+__decorate([
+    (0, core_1.Command)("preset:build <preset>"),
+    (0, core_1.Description)("Build docker image form a preset"),
+    __param(0, (0, core_1.Param)("preset")),
+    __param(1, (0, core_1.Option)("rebuild", "r")),
+    __param(1, (0, core_1.Description)("Rebuild image")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Boolean]),
+    __metadata("design:returntype", Promise)
+], PresetController.prototype, "build", null);
+exports.PresetController = PresetController = __decorate([
+    (0, core_1.Controller)(),
+    (0, core_1.Description)("Preset commands"),
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        docker_1.DockerService,
+        PresetRepository_1.PresetRepository,
+        PresetService_1.PresetService])
+], PresetController);

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

@@ -0,0 +1,14 @@
+import { EventService, Project } from "@wocker/core";
+import { DockerService } from "../../docker";
+import { PresetRepository } from "../repositories/PresetRepository";
+import { PresetService } from "../services/PresetService";
+export declare class PresetListener {
+    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);
+    onInit(project: Project): Promise<void>;
+    protected onRebuild(project: Project): Promise<void>;
+    protected onBeforeStart(project: Project): Promise<void>;
+}