@wocker/ws 1.0.21 → 1.0.23

package/lib/repositories/PresetRepository.d.ts

@@ -0,0 +1,23 @@
+import { AppConfig, Preset, PresetSource } from "@wocker/core";
+import { AppConfigService } from "../services/AppConfigService";
+import { LogService } from "../services/LogService";
+type PresetData = {
+    name: string;
+    source: PresetSource;
+    path?: string;
+};
+type SearchOptions = Partial<{
+    name: string;
+    source: string;
+    path: string;
+}>;
+export declare class PresetRepository {
+    protected readonly appConfig: AppConfigService;
+    protected readonly logService: LogService;
+    constructor(appConfig: AppConfigService, logService: LogService);
+    protected load(data: PresetData): Preset;
+    protected configs(): AppConfig["presets"];
+    search(options?: SearchOptions): Preset[];
+    searchOne(options?: SearchOptions): Preset | null;
+}
+export {};

package/lib/repositories/PresetRepository.js

@@ -0,0 +1,115 @@
+"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.PresetRepository = void 0;
+const core_1 = require("@wocker/core");
+const AppConfigService_1 = require("../services/AppConfigService");
+const LogService_1 = require("../services/LogService");
+const env_1 = require("../env");
+let PresetRepository = class PresetRepository {
+    constructor(appConfig, logService) {
+        this.appConfig = appConfig;
+        this.logService = logService;
+    }
+    load(data) {
+        const _this = this, fs = new core_1.FileSystem(data.path);
+        const config = {
+            ...fs.readJSON("config.json"),
+            name: data.name,
+            source: data.source,
+            path: data.path
+        };
+        return new class extends core_1.Preset {
+            constructor(data) {
+                super(data);
+            }
+            save() {
+                switch (this.source) {
+                    case core_1.PRESET_SOURCE_EXTERNAL:
+                        fs.writeJSON("config.json", this.toObject());
+                        break;
+                }
+                _this.appConfig.registerPreset(this.name, this.source, data.path);
+            }
+            delete() {
+                switch (this.source) {
+                    case core_1.PRESET_SOURCE_GITHUB:
+                        if (fs.exists()) {
+                            fs.rm("", {
+                                recursive: true
+                            });
+                        }
+                        break;
+                }
+                _this.appConfig.unregisterPreset(this.name);
+            }
+        }(config);
+    }
+    configs() {
+        const fs = new core_1.FileSystem(env_1.PRESETS_DIR), dirs = fs.exists("") ? fs.readdir("") : [];
+        const { presets = [] } = this.appConfig.config;
+        return [
+            ...dirs.map((name) => {
+                return {
+                    name,
+                    source: core_1.PRESET_SOURCE_INTERNAL,
+                    path: fs.path(name)
+                };
+            }),
+            ...presets.map((item) => {
+                if (item.source === core_1.PRESET_SOURCE_GITHUB) {
+                    return {
+                        ...item,
+                        path: this.appConfig.fs.path("presets", item.name)
+                    };
+                }
+                return item;
+            })
+        ];
+    }
+    search(options = {}) {
+        const { name, source, path } = options;
+        const presets = [], configs = this.configs();
+        for (const config of configs) {
+            if (name && name !== config.name) {
+                continue;
+            }
+            if (source && source !== config.source) {
+                continue;
+            }
+            if (path && path !== config.path) {
+                continue;
+            }
+            try {
+                const preset = this.load(config);
+                presets.push(preset);
+            }
+            catch (err) {
+                this.logService.error(err.message, {
+                    name: config.name,
+                    source: config.source,
+                    path: config.path
+                });
+            }
+        }
+        return presets;
+    }
+    searchOne(options = {}) {
+        const [preset] = this.search(options);
+        return preset || null;
+    }
+};
+exports.PresetRepository = PresetRepository;
+exports.PresetRepository = PresetRepository = __decorate([
+    (0, core_1.Injectable)(),
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+        LogService_1.LogService])
+], PresetRepository);

package/lib/repositories/index.d.ts

@@ -0,0 +1 @@
+export * from "./PresetRepository";

package/lib/repositories/index.js

@@ -0,0 +1,17 @@
+"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 __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("./PresetRepository"), exports);

package/lib/services/AppConfigService.d.ts

@@ -5,16 +5,20 @@ type TypeMap = {
 export declare class AppConfigService extends CoreAppConfigService {
     protected _pwd: string;
     protected _fs?: FileSystem;
+    protected _config?: AppConfig;
     protected readonly mapTypes: TypeMap;
     constructor();
     get version(): string;
+    get config(): AppConfig;
+    get projects(): import("@wocker/core/lib/types/ProjectRef").ProjectRef[];
     get fs(): FileSystem;
     pwd(...parts: string[]): string;
     setPWD(pwd: string): void;
     dataPath(...parts: string[]): string;
-    pluginsPath(...parts: string[]): string;
     presetPath(...parts: string[]): string;
     getProjectTypes(): TypeMap;
-    protected loadConfig(): AppConfig;
+    addProject(id: string, name: string, path: string): void;
+    removeProject(name: string): void;
+    save(): void;
 }
 export {};

package/lib/services/AppConfigService.js

@@ -59,6 +59,50 @@ let AppConfigService = class AppConfigService extends core_1.AppConfigService {
     get version() {
         return env_1.WOCKER_VERSION;
     }
+    get config() {
+        if (!this._config) {
+            const fs = this.fs;
+            let data = {};
+            if (fs.exists("wocker.config.js")) {
+                try {
+                    const { config } = require(fs.path("wocker.config.js"));
+                    data = config;
+                }
+                catch (err) {
+                    if (fs.exists("wocker.config.json")) {
+                        let json = fs.readJSON("wocker.config.json");
+                        if (typeof json === "string") {
+                            json = JSON.parse(json);
+                        }
+                        data = json;
+                    }
+                }
+            }
+            else if (fs.exists("wocker.config.json")) {
+                data = fs.readJSON("wocker.config.json");
+            }
+            else if (fs.exists("wocker.json")) {
+                let json = fs.readJSON("wocker.json");
+                if (typeof json === "string") {
+                    json = JSON.parse(json);
+                }
+                data = json;
+            }
+            else if (fs.exists("data.json")) {
+                data = fs.readJSON("data.json");
+            }
+            else if (!fs.exists()) {
+                fs.mkdir("", {
+                    recursive: true
+                });
+            }
+            this._config = new core_1.AppConfig(data);
+        }
+        return this._config;
+    }
+    get projects() {
+        return this.config.projects;
+    }
     get fs() {
         if (!this._fs) {
             this._fs = new core_1.FileSystem(env_1.DATA_DIR);
@@ -74,70 +118,33 @@ let AppConfigService = class AppConfigService extends core_1.AppConfigService {
     dataPath(...parts) {
         return Path.join(env_1.DATA_DIR, ...parts);
     }
-    pluginsPath(...parts) {
-        return Path.join(env_1.PLUGINS_DIR, ...parts);
-    }
     presetPath(...parts) {
         return Path.join(env_1.PRESETS_DIR, ...parts);
     }
     getProjectTypes() {
         return this.mapTypes;
     }
-    loadConfig() {
+    addProject(id, name, path) {
+        this.config.addProject(id, name, path);
+    }
+    removeProject(name) {
+        return this.config.removeProject(name);
+    }
+    save() {
         const fs = this.fs;
-        let data = {};
-        if (fs.exists("wocker.config.js")) {
-            try {
-                const { config } = require(fs.path("wocker.config.js"));
-                data = config;
-            }
-            catch (err) {
-                if (fs.exists("wocker.config.json")) {
-                    let json = fs.readJSON("wocker.config.json");
-                    if (typeof json === "string") {
-                        json = JSON.parse(json);
-                    }
-                    data = json;
-                }
-            }
-        }
-        else if (fs.exists("wocker.config.json")) {
-            data = fs.readJSON("wocker.config.json");
-        }
-        else if (fs.exists("wocker.json")) {
-            let json = fs.readJSON("wocker.json");
-            if (typeof json === "string") {
-                json = JSON.parse(json);
-            }
-            data = json;
-        }
-        else if (fs.exists("data.json")) {
-            data = fs.readJSON("data.json");
-        }
-        else if (!fs.exists()) {
+        if (!fs.exists()) {
             fs.mkdir("", {
                 recursive: true
             });
         }
-        return new class extends core_1.AppConfig {
-            constructor(data) {
-                super(data);
-            }
-            async save() {
-                if (!fs.exists()) {
-                    fs.mkdir("");
-                }
-                const json = JSON.stringify(this.toJson(), null, 4);
-                await fs.writeFile("wocker.config.js", `// Wocker config\nexports.config = ${json};`);
-                await fs.writeFile("wocker.config.json", json);
-                if (fs.exists("data.json")) {
-                    await fs.rm("data.json");
-                }
-                if (fs.exists("wocker.json")) {
-                    await fs.rm("wocker.json");
-                }
-            }
-        }(data);
+        fs.writeFile("wocker.config.js", this.config.toJsString());
+        fs.writeFile("wocker.config.json", this.config.toString());
+        if (fs.exists("data.json")) {
+            fs.rm("data.json");
+        }
+        if (fs.exists("wocker.json")) {
+            fs.rm("wocker.json");
+        }
     }
 };
 exports.AppConfigService = AppConfigService;

package/lib/services/AppEventsService.d.ts

@@ -1,9 +1,9 @@
 import { AppEventsService as CoreAppEventsService, AppEventHandle } from "@wocker/core";
 export declare class AppEventsService extends CoreAppEventsService {
-    protected handles: ({
-        [event: string]: AppEventHandle[];
-    });
-    on(event: string, handle: AppEventHandle): () => void;
+    protected handles: {
+        [event: string]: Set<AppEventHandle>;
+    };
+    on(event: string, handle: AppEventHandle): (() => void);
     off(event: string, handle: AppEventHandle): void;
     emit(event: string, ...args: any[]): Promise<void>;
 }

package/lib/services/AppEventsService.js

@@ -14,22 +14,26 @@ let AppEventsService = class AppEventsService extends core_1.AppEventsService {
         this.handles = {};
     }
     on(event, handle) {
-        this.handles[event] = [
-            ...this.handles[event] || [],
-            handle
-        ];
+        if (!this.handles[event]) {
+            this.handles[event] = new Set();
+        }
+        this.handles[event].add(handle);
         return () => {
-            this.handles[event] = this.handles[event].filter((filterHandle) => {
-                return filterHandle !== handle;
-            });
+            this.off(event, handle);
         };
     }
     off(event, handle) {
+        if (!this.handles[event]) {
+            return;
+        }
+        this.handles[event].delete(handle);
     }
     async emit(event, ...args) {
-        const handles = this.handles[event] || [];
-        for (const i in handles) {
-            await handles[i](...args);
+        if (!this.handles[event]) {
+            return;
+        }
+        for (const handle of this.handles[event].values()) {
+            await handle(...args);
         }
     }
 };

package/lib/services/LogService.d.ts

@@ -1,8 +1,10 @@
-import { LogService as CoreLogService } from "@wocker/core";
+import { FileSystem, LogService as CoreLogService } from "@wocker/core";
 import { AppConfigService } from "./AppConfigService";
 export declare class LogService extends CoreLogService {
     protected readonly appConfigService: AppConfigService;
     constructor(appConfigService: AppConfigService);
+    protected get fs(): FileSystem;
+    protected get logName(): string;
     debug(...data: any[]): void;
     log(...data: any[]): void;
     info(...data: any[]): void;

package/lib/services/LogService.js

@@ -23,6 +23,12 @@ let LogService = class LogService extends core_1.LogService {
         this.appConfigService = appConfigService;
         makes_1.Logger.install(this);
     }
+    get fs() {
+        return this.appConfigService.fs;
+    }
+    get logName() {
+        return "ws.log";
+    }
     debug(...data) {
         this._log("debug", ...data);
     }
@@ -39,23 +45,19 @@ let LogService = class LogService extends core_1.LogService {
         this._log("error", ...data);
     }
     clear() {
-        const logPath = this.appConfigService.dataPath("ws.log");
-        makes_1.FS.writeFileSync(logPath, "");
+        this.fs.writeFile(this.logName, "");
     }
     _log(type, ...data) {
-        const config = this.appConfigService.getConfig();
-        if (type === "debug" && !config.debug) {
+        if (type === "debug" && !this.appConfigService.config.debug) {
             return;
         }
-        const time = (0, format_1.default)(new Date(), "yyyy-MM-dd hh:mm:ss");
-        const logPath = this.appConfigService.dataPath("ws.log");
-        const logData = data.map((item) => {
+        const time = (0, format_1.default)(new Date(), "yyyy-MM-dd HH:mm:ss"), logData = data.map((item) => {
             return typeof item !== "string" ? JSON.stringify(item) : item;
         }).join(" ");
-        if (!makes_1.FS.existsSync(logPath)) {
-            makes_1.FS.writeFileSync(logPath, "");
+        if (!this.fs.exists(this.logName)) {
+            this.fs.writeFile(this.logName, "");
         }
-        makes_1.FS.appendFileSync(logPath, `[${time}] ${type}: ${logData}\n`);
+        this.fs.appendFile(this.logName, `[${time}] ${type}: ${logData}\n`);
     }
 };
 exports.LogService = LogService;

package/lib/services/PluginService.d.ts

@@ -1,13 +1,19 @@
 import { Cli } from "@wocker/core";
 import { AppConfigService } from "./AppConfigService";
 import { LogService } from "./LogService";
+import { NpmService } from "./NpmService";
+import { Plugin } from "../makes";
 export declare class PluginService {
     protected readonly appConfigService: AppConfigService;
+    protected readonly npmService: NpmService;
     protected readonly logService: LogService;
     protected readonly cli: Cli;
-    constructor(appConfigService: AppConfigService, logService: LogService, cli: Cli);
+    constructor(appConfigService: AppConfigService, npmService: NpmService, logService: LogService, cli: Cli);
+    getPluginsTable(): string;
     checkPlugin(pluginName: string): Promise<boolean>;
-    import(): Promise<void>;
+    install(pluginName: string, beta?: boolean): Promise<void>;
+    uninstall(pluginName: string): Promise<void>;
+    import(name: string): Promise<Plugin>;
     update(): Promise<void>;
     protected getCurrentVersion(name: string): Promise<string | null>;
 }

package/lib/services/PluginService.js

@@ -41,54 +41,106 @@ var __importStar = (this && this.__importStar) || (function () {
 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.PluginService = void 0;
 const core_1 = require("@wocker/core");
+const cli_table3_1 = __importDefault(require("cli-table3"));
+const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
 const AppConfigService_1 = require("./AppConfigService");
 const LogService_1 = require("./LogService");
+const NpmService_1 = require("./NpmService");
 const makes_1 = require("../makes");
 const utils_1 = require("../utils");
 let PluginService = class PluginService {
-    constructor(appConfigService, logService, cli) {
+    constructor(appConfigService, npmService, logService, cli) {
         this.appConfigService = appConfigService;
+        this.npmService = npmService;
         this.logService = logService;
         this.cli = cli;
     }
+    getPluginsTable() {
+        const config = this.appConfigService.config;
+        const table = new cli_table3_1.default({
+            head: ["Name", "Env"],
+            colWidths: [30]
+        });
+        if (config.plugins.length === 0) {
+            return yoctocolors_cjs_1.default.gray("No plugins installed");
+        }
+        for (const plugin of config.plugins) {
+            table.push([plugin.name, plugin.env]);
+        }
+        return table.toString();
+    }
     async checkPlugin(pluginName) {
         try {
-            const { default: Plugin } = await Promise.resolve(`${pluginName}`).then(s => __importStar(require(s)));
-            const name = Reflect.getMetadata(core_1.PLUGIN_NAME_METADATA, Plugin);
-            if (!name) {
-                console.error("No name");
+            await this.import(pluginName);
+            return true;
+        }
+        catch (err) {
+            this.logService.error(err.message, {
+                pluginName
+            });
+        }
+        return false;
+    }
+    async install(pluginName, beta) {
+        const [, prefix = "@wocker/", name, suffix = "-plugin"] = /^(@wocker\/)?(\w+)(-plugin)?$/.exec(pluginName) || [];
+        const fullName = `${prefix}${name}${suffix}`;
+        try {
+            if (await this.checkPlugin(fullName)) {
+                this.appConfigService.config.addPlugin(fullName);
+                this.appConfigService.save();
+                console.info(`Plugin ${fullName} activated`);
+                return;
+            }
+            const packageInfo = await this.npmService.getPackageInfo(fullName);
+            const env = packageInfo["dist-tags"].beta && beta ? "beta" : "latest";
+            await this.npmService.install(fullName, env);
+            if (await this.checkPlugin(fullName)) {
+                this.appConfigService.config.addPlugin(fullName, env);
+                this.appConfigService.save();
+                console.info(`Plugin ${fullName}@${env} activated`);
+                return;
             }
-            return !!name;
         }
         catch (err) {
             this.logService.error(err.message);
         }
-        return false;
     }
-    async import() {
+    async uninstall(pluginName) {
+        const [, prefix = "@wocker/", name, suffix = "-plugin"] = /^(@wocker\/)?(\w+)(-plugin)?$/.exec(pluginName) || [];
+        const fullName = `${prefix}${name}${suffix}`;
+        this.appConfigService.config.removePlugin(fullName);
+        this.appConfigService.save();
+        console.info(`Plugin ${fullName} deactivated`);
+    }
+    async import(name) {
+        const { default: type } = await Promise.resolve(`${name}`).then(s => __importStar(require(s)));
+        return new makes_1.Plugin(type);
     }
     async update() {
-        const config = this.appConfigService.getConfig();
+        const config = this.appConfigService.config;
         if (!config.plugins) {
             return;
         }
-        for (const name of new Set(config.plugins).values()) {
-            console.info(`Checking ${name}...`);
+        for (const plugin of config.plugins) {
+            console.info(`Checking ${plugin.name}...`);
             try {
-                const current = await this.getCurrentVersion(name);
+                const current = await this.getCurrentVersion(plugin.name);
                 const res = await makes_1.Http.get("https://registry.npmjs.org")
-                    .send(name);
+                    .send(plugin.name);
                 if (res.status !== 200) {
                     continue;
                 }
                 const { "dist-tags": { latest } } = res.data;
-                this.logService.info(name, current, latest);
+                this.logService.info(plugin.name, current, latest);
                 if (!current || current < latest) {
-                    console.log(`Updating ${name}...`);
-                    await (0, utils_1.spawn)("npm", ["i", "-g", name]);
+                    console.log(`Updating ${plugin.name}...`);
+                    await (0, utils_1.spawn)("npm", ["i", "-g", plugin.name]);
                 }
             }
             catch (err) {
@@ -112,6 +164,7 @@ exports.PluginService = PluginService;
 exports.PluginService = PluginService = __decorate([
     (0, core_1.Injectable)(),
     __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+        NpmService_1.NpmService,
         LogService_1.LogService,
         core_1.Cli])
 ], PluginService);

package/lib/services/PresetService.d.ts

@@ -1,6 +1,7 @@
-import { EnvConfig, Project, Preset, AppConfig, PresetProperties } from "@wocker/core";
+import { EnvConfig, Project, Preset, PresetVariableConfig } from "@wocker/core";
 import { AppConfigService } from "./AppConfigService";
 import { LogService } from "./LogService";
+import { PresetRepository } from "../repositories/PresetRepository";
 type SearchOptions = Partial<{
     name: string;
     source: string;
@@ -8,17 +9,17 @@ type SearchOptions = Partial<{
 }>;
 export declare class PresetService {
     protected readonly appConfigService: AppConfigService;
+    protected readonly presetRepository: PresetRepository;
     protected readonly logService: LogService;
-    constructor(appConfigService: AppConfigService, logService: LogService);
-    protected toObject(config: PresetProperties): Preset;
-    protected getList(): Promise<AppConfig["presets"]>;
+    constructor(appConfigService: AppConfigService, presetRepository: PresetRepository, logService: LogService);
+    prompt(configMap: {
+        [name: string]: PresetVariableConfig;
+    }, values?: EnvConfig): Promise<EnvConfig>;
     getImageNameForProject(project: Project, preset: Preset): string;
     getImageName(preset: Preset, buildArgs: EnvConfig): string;
     init(): Promise<void>;
     deinit(): Promise<void>;
-    get(name: string): Promise<Preset>;
-    addPreset(name: string, version?: string): Promise<void>;
-    search(options?: SearchOptions): Promise<Preset[]>;
-    searchOne(options?: SearchOptions): Promise<Preset | null>;
+    get(name?: string): Preset;
+    addPreset(name: string, repository?: string, version?: string): Promise<void>;
 }
 export { SearchOptions as PresetServiceSearchOptions };