@wocker/ws 1.0.24 → 1.0.26

package/lib/modules/package-manager/index.d.ts

@@ -0,0 +1,5 @@
+import { PackageManager } from "./service/PackageManager";
+import { RegistryService } from "./service/RegistryService";
+export declare class PackageManagerModule {
+}
+export { PackageManager, RegistryService };

package/lib/modules/package-manager/index.js

@@ -0,0 +1,33 @@
+"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.RegistryService = exports.PackageManager = exports.PackageManagerModule = void 0;
+const core_1 = require("@wocker/core");
+const core_2 = require("../core");
+const PackageManager_1 = require("./service/PackageManager");
+Object.defineProperty(exports, "PackageManager", { enumerable: true, get: function () { return PackageManager_1.PackageManager; } });
+const RegistryService_1 = require("./service/RegistryService");
+Object.defineProperty(exports, "RegistryService", { enumerable: true, get: function () { return RegistryService_1.RegistryService; } });
+let PackageManagerModule = class PackageManagerModule {
+};
+exports.PackageManagerModule = PackageManagerModule;
+exports.PackageManagerModule = PackageManagerModule = __decorate([
+    (0, core_1.Module)({
+        imports: [
+            core_2.CoreModule
+        ],
+        providers: [
+            PackageManager_1.PackageManager,
+            RegistryService_1.RegistryService
+        ],
+        exports: [
+            PackageManager_1.PackageManager,
+            RegistryService_1.RegistryService
+        ]
+    })
+], PackageManagerModule);

package/lib/modules/package-manager/providers/NpmProvider.d.ts

@@ -0,0 +1,7 @@
+import { PackageManagerProvider } from "../types/PackageManagerProvider";
+import { Package } from "../types/Package";
+export declare class NpmProvider extends PackageManagerProvider {
+    getPackages(): Promise<Package[]>;
+    install(name: string, version?: string): Promise<void>;
+    uninstall(name: string): Promise<void>;
+}

package/lib/modules/package-manager/providers/NpmProvider.js

@@ -0,0 +1,39 @@
+"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.NpmProvider = void 0;
+const core_1 = require("@wocker/core");
+const PackageManagerProvider_1 = require("../types/PackageManagerProvider");
+const utils_1 = require("../../../utils");
+let NpmProvider = class NpmProvider extends PackageManagerProvider_1.PackageManagerProvider {
+    async getPackages() {
+        const res = await (0, utils_1.exec)("npm ls -g --json");
+        const packages = [], { dependencies } = JSON.parse(res);
+        for (const name in dependencies) {
+            packages.push({
+                name: name,
+                version: dependencies[name].version
+            });
+        }
+        return packages;
+    }
+    async install(name, version) {
+        const command = `npm install -g ${version ? `${name}@${version}` : name}`;
+        console.info(`> ${command}`);
+        await (0, utils_1.exec)(command);
+    }
+    async uninstall(name) {
+        const command = `npm uninstall -g ${name}`;
+        console.info(`> ${command}`);
+        await (0, utils_1.exec)(command);
+    }
+};
+exports.NpmProvider = NpmProvider;
+exports.NpmProvider = NpmProvider = __decorate([
+    (0, core_1.Injectable)()
+], NpmProvider);

package/lib/modules/package-manager/providers/PnpmProvider.d.ts

@@ -0,0 +1,7 @@
+import { PackageManagerProvider } from "../types/PackageManagerProvider";
+import { Package } from "../types/Package";
+export declare class PnpmProvider extends PackageManagerProvider {
+    getPackages(): Promise<Package[]>;
+    install(name: string, version?: string): Promise<void>;
+    uninstall(name: string): Promise<void>;
+}

package/lib/modules/package-manager/providers/PnpmProvider.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PnpmProvider = void 0;
+const PackageManagerProvider_1 = require("../types/PackageManagerProvider");
+const utils_1 = require("../../../utils");
+class PnpmProvider extends PackageManagerProvider_1.PackageManagerProvider {
+    async getPackages() {
+        const res = await (0, utils_1.exec)("pnpm ls -g --json"), data = JSON.parse(res), dependencies = Array.isArray(data) ? data[0]?.dependencies : data.dependencies, packages = [];
+        if (dependencies) {
+            for (const name in dependencies) {
+                packages.push({
+                    name,
+                    version: dependencies[name].version
+                });
+            }
+        }
+        return packages;
+    }
+    async install(name, version) {
+        const command = `pnpm add -g ${version ? `${name}@${version}` : name}`;
+        console.info(`> ${command}`);
+        await (0, utils_1.exec)(command);
+    }
+    async uninstall(name) {
+        const command = `pnpm remove -g ${name}`;
+        console.info(`> ${command}`);
+        await (0, utils_1.exec)(command);
+    }
+}
+exports.PnpmProvider = PnpmProvider;

package/lib/modules/package-manager/providers/YarnProvider.d.ts

@@ -0,0 +1,7 @@
+import { PackageManagerProvider } from "../types/PackageManagerProvider";
+import { Package } from "../types/Package";
+export declare class YarnProvider extends PackageManagerProvider {
+    getPackages(): Promise<Package[]>;
+    install(name: string, version?: string): Promise<void>;
+    uninstall(name: string): Promise<void>;
+}

package/lib/modules/package-manager/providers/YarnProvider.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.YarnProvider = void 0;
+const PackageManagerProvider_1 = require("../types/PackageManagerProvider");
+const utils_1 = require("../../../utils");
+class YarnProvider extends PackageManagerProvider_1.PackageManagerProvider {
+    async getPackages() {
+        const res = await (0, utils_1.exec)("yarn --cwd `yarn global dir` list --json --depth=0"), three = JSON.parse(res), packages = [];
+        for (const item of three.data.trees) {
+            const [, name, version] = /^(.*)@(.*)$/.exec(item.name);
+            packages.push({
+                name,
+                version
+            });
+        }
+        return packages;
+    }
+    async install(name, version) {
+        const command = `yarn global add ${version ? `${name}@${version}` : name}`;
+        console.info(`> ${command}`);
+        await (0, utils_1.exec)(command);
+    }
+    async uninstall(name) {
+        const command = `yarn global remove ${name}`;
+        console.info(`> ${command}`);
+        await (0, utils_1.exec)(command);
+    }
+}
+exports.YarnProvider = YarnProvider;

package/lib/modules/package-manager/service/PackageManager.d.ts

@@ -0,0 +1,10 @@
+import { AppConfigService } from "@wocker/core";
+import { PackageManagerProvider } from "../types/PackageManagerProvider";
+export declare class PackageManager {
+    protected readonly appConfigService: AppConfigService;
+    constructor(appConfigService: AppConfigService);
+    getManager(): Promise<PackageManagerProvider>;
+    getPackages(global?: boolean): Promise<import("../types/Package").Package[]>;
+    install(name: string, version?: string): Promise<void>;
+    uninstall(name: string): Promise<void>;
+}

package/lib/modules/package-manager/service/PackageManager.js

@@ -0,0 +1,70 @@
+"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.PackageManager = void 0;
+const core_1 = require("@wocker/core");
+const utils_1 = require("@wocker/utils");
+const NpmProvider_1 = require("../providers/NpmProvider");
+const PnpmProvider_1 = require("../providers/PnpmProvider");
+const YarnProvider_1 = require("../providers/YarnProvider");
+let PackageManager = class PackageManager {
+    constructor(appConfigService) {
+        this.appConfigService = appConfigService;
+    }
+    async getManager() {
+        if (!this.appConfigService.config.pm) {
+            this.appConfigService.config.pm = await (0, utils_1.promptSelect)({
+                label: "Package manager:",
+                options: [
+                    {
+                        label: "NPM",
+                        value: "npm"
+                    },
+                    {
+                        label: "PNPM",
+                        value: "pnpm"
+                    },
+                    {
+                        label: "YARN",
+                        value: "yarn"
+                    }
+                ],
+                required: true
+            });
+            this.appConfigService.save();
+        }
+        switch (this.appConfigService.config.pm) {
+            case "npm":
+                return new NpmProvider_1.NpmProvider();
+            case "pnpm":
+                return new PnpmProvider_1.PnpmProvider();
+            case "yarn":
+                return new YarnProvider_1.YarnProvider();
+        }
+    }
+    async getPackages(global) {
+        const pm = await this.getManager();
+        return pm.getPackages(global);
+    }
+    async install(name, version) {
+        const pm = await this.getManager();
+        await pm.install(name, version);
+    }
+    async uninstall(name) {
+        const pm = await this.getManager();
+        await pm.uninstall(name);
+    }
+};
+exports.PackageManager = PackageManager;
+exports.PackageManager = PackageManager = __decorate([
+    (0, core_1.Injectable)("PACKAGE_MANAGER_SERVICE"),
+    __metadata("design:paramtypes", [core_1.AppConfigService])
+], PackageManager);

package/lib/modules/package-manager/service/RegistryService.d.ts

@@ -0,0 +1,4 @@
+import { PackageInfo } from "../types/PackageInfo";
+export declare class RegistryService {
+    getPackageInfo(name: string): Promise<PackageInfo>;
+}

package/lib/{services/NpmService.js → modules/package-manager/service/RegistryService.js}

@@ -6,11 +6,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NpmService = void 0;
+exports.RegistryService = void 0;
 const core_1 = require("@wocker/core");
-const makes_1 = require("../makes");
-const utils_1 = require("../utils");
-let NpmService = class NpmService {
+const makes_1 = require("../../../makes");
+let RegistryService = class RegistryService {
     async getPackageInfo(name) {
         const res = await makes_1.Http.get("https://registry.npmjs.org")
             .send(name);
@@ -22,12 +21,8 @@ let NpmService = class NpmService {
         }
         return res.data;
     }
-    async install(name, version) {
-        console.info(`npm install -g ${version ? `${name}@${version}` : name}`);
-        await (0, utils_1.exec)(`npm install -g ${version ? `${name}@${version}` : name}`);
-    }
 };
-exports.NpmService = NpmService;
-exports.NpmService = NpmService = __decorate([
+exports.RegistryService = RegistryService;
+exports.RegistryService = RegistryService = __decorate([
     (0, core_1.Injectable)()
-], NpmService);
+], RegistryService);

package/lib/modules/package-manager/types/Package.d.ts

@@ -0,0 +1,4 @@
+export type Package = {
+    name: string;
+    version: string;
+};

package/lib/modules/package-manager/types/Package.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/modules/package-manager/types/PackageInfo.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/modules/package-manager/types/PackageManagerProvider.d.ts

@@ -0,0 +1,6 @@
+import { Package } from "./Package";
+export declare abstract class PackageManagerProvider {
+    abstract getPackages(global?: boolean): Promise<Package[]>;
+    abstract install(name: string, version?: string): Promise<void>;
+    abstract uninstall(name: string): Promise<void>;
+}

package/lib/modules/package-manager/types/PackageManagerProvider.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PackageManagerProvider = void 0;
+class PackageManagerProvider {
+}
+exports.PackageManagerProvider = PackageManagerProvider;

package/lib/{controllers → modules/plugin/controllers}/PluginController.d.ts

@@ -5,8 +5,8 @@ export declare class PluginController {
     protected readonly pluginService: PluginService;
     constructor(appConfigService: AppConfigService, pluginService: PluginService);
     list(): Promise<string>;
-    add(addName: string, beta?: boolean): Promise<void>;
-    remove(removeName: string): Promise<void>;
+    add(names: string[]): Promise<void>;
+    remove(names: string[]): Promise<void>;
     update(): Promise<void>;
     getInstalledPlugins(): string[];
 }

package/lib/{controllers → modules/plugin/controllers}/PluginController.js

@@ -23,17 +23,22 @@ let PluginController = class PluginController {
     async list() {
         return this.pluginService.getPluginsTable();
     }
-    async add(addName, beta) {
-        await this.pluginService.install(addName, beta);
+    async add(names) {
+        for (const fullName of names) {
+            const [, name, version] = /^(@?[^@/\s]+(?:\/[^@/\s]+)?)(?:@([^@\s]+))?$/.exec(fullName) || [];
+            await this.pluginService.install(name, version);
+        }
     }
-    async remove(removeName) {
-        await this.pluginService.uninstall(removeName);
+    async remove(names) {
+        for (const name of names) {
+            await this.pluginService.uninstall(name);
+        }
     }
     async update() {
         await this.pluginService.update();
     }
     getInstalledPlugins() {
-        return this.appConfigService.config.plugins.map(p => p.name);
+        return this.appConfigService.plugins.map(pluginRef => pluginRef.name);
     }
 };
 exports.PluginController = PluginController;
@@ -45,35 +50,31 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], PluginController.prototype, "list", null);
 __decorate([
-    (0, core_1.Command)("plugin:add <name>"),
-    (0, core_1.Command)("plugin:install <name>"),
+    (0, core_1.Command)("plugin:install <...names>"),
     (0, core_1.Description)("Install a plugin by specifying its name"),
-    __param(0, (0, core_1.Param)("name")),
-    __param(1, (0, core_1.Option)("beta", {
-        type: "boolean",
-        alias: "d",
-        description: "Use the beta version of the plugin (if a beta version exists). Defaults to the latest stable version."
-    })),
+    __param(0, (0, core_1.Param)("names")),
+    __param(0, (0, core_1.Description)("Names of plugins to install")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Boolean]),
+    __metadata("design:paramtypes", [Array]),
     __metadata("design:returntype", Promise)
 ], PluginController.prototype, "add", null);
 __decorate([
-    (0, core_1.Command)("plugin:remove <name>"),
-    __param(0, (0, core_1.Param)("name")),
+    (0, core_1.Command)("plugin:remove <...names>"),
+    (0, core_1.Description)("Remove a plugin"),
+    __param(0, (0, core_1.Param)("names")),
+    __param(0, (0, core_1.Description)("Names of plugins to remove")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
+    __metadata("design:paramtypes", [Array]),
     __metadata("design:returntype", Promise)
 ], PluginController.prototype, "remove", null);
 __decorate([
-    (0, core_1.Command)("plugin:update [name]"),
+    (0, core_1.Command)("plugin:update"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], PluginController.prototype, "update", null);
 __decorate([
-    (0, core_1.Completion)("name", "plugin:update [name]"),
-    (0, core_1.Completion)("name", "plugin:remove <name>"),
+    (0, core_1.Completion)("names", "plugin:remove <...names>"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Array)

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

@@ -0,0 +1,4 @@
+import { DynamicModule } from "@wocker/core";
+export declare class PluginModule {
+    static register(): DynamicModule;
+}

package/lib/modules/plugin/index.js

@@ -0,0 +1,67 @@
+"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 PluginModule_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PluginModule = void 0;
+const core_1 = require("@wocker/core");
+const core_2 = require("../core");
+const package_manager_1 = require("../package-manager");
+const PluginController_1 = require("./controllers/PluginController");
+const PluginService_1 = require("./services/PluginService");
+let PluginModule = PluginModule_1 = class PluginModule {
+    static register() {
+        return {
+            module: PluginModule_1,
+            inject: [
+                core_1.AppConfigService,
+                core_1.AppFileSystemService,
+                core_1.LogService,
+                PluginService_1.PluginService
+            ],
+            useFactory: async (appConfigService, fs, logService, pluginService) => {
+                const imports = [];
+                for (const pluginData of appConfigService.plugins) {
+                    try {
+                        const plugin = await pluginService.import(pluginData.name);
+                        imports.push({
+                            module: plugin.type,
+                            providers: [
+                                {
+                                    provide: core_1.PLUGIN_DIR_KEY,
+                                    useValue: fs.path("plugins", plugin.name)
+                                }
+                            ]
+                        });
+                    }
+                    catch (err) {
+                        logService.error(err.message, {
+                            pluginName: pluginData.name,
+                            pluginEnv: pluginData.env
+                        });
+                        appConfigService.removePlugin(pluginData.name);
+                        appConfigService.save();
+                    }
+                }
+                return {
+                    imports
+                };
+            }
+        };
+    }
+};
+exports.PluginModule = PluginModule;
+exports.PluginModule = PluginModule = PluginModule_1 = __decorate([
+    (0, core_1.Module)({
+        imports: [
+            core_2.CoreModule,
+            package_manager_1.PackageManagerModule
+        ],
+        controllers: [PluginController_1.PluginController],
+        providers: [PluginService_1.PluginService]
+    })
+], PluginModule);

package/lib/{services → modules/plugin/services}/PluginService.d.ts

@@ -1,15 +1,17 @@
 import { Cli, AppConfigService, LogService } from "@wocker/core";
-import { NpmService } from "./NpmService";
-import { Plugin } from "../makes";
+import { PackageManager, RegistryService } from "../../package-manager";
+import { Plugin } from "../../../makes";
 export declare class PluginService {
     protected readonly appConfigService: AppConfigService;
-    protected readonly npmService: NpmService;
+    protected readonly pm: PackageManager;
+    protected readonly registryService: RegistryService;
     protected readonly logService: LogService;
     protected readonly cli: Cli;
-    constructor(appConfigService: AppConfigService, npmService: NpmService, logService: LogService, cli: Cli);
+    protected rule: string;
+    constructor(appConfigService: AppConfigService, pm: PackageManager, registryService: RegistryService, logService: LogService, cli: Cli);
     getPluginsTable(): string;
     checkPlugin(pluginName: string): Promise<boolean>;
-    install(pluginName: string, beta?: boolean): Promise<void>;
+    install(pluginName: string, version?: string): Promise<void>;
     uninstall(pluginName: string): Promise<void>;
     import(name: string): Promise<Plugin>;
     update(): Promise<void>;

package/lib/{services → modules/plugin/services}/PluginService.js

@@ -49,15 +49,16 @@ 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 NpmService_1 = require("./NpmService");
-const makes_1 = require("../makes");
-const utils_1 = require("../utils");
+const package_manager_1 = require("../../package-manager");
+const makes_1 = require("../../../makes");
 let PluginService = class PluginService {
-    constructor(appConfigService, npmService, logService, cli) {
+    constructor(appConfigService, pm, registryService, logService, cli) {
         this.appConfigService = appConfigService;
-        this.npmService = npmService;
+        this.pm = pm;
+        this.registryService = registryService;
         this.logService = logService;
         this.cli = cli;
+        this.rule = "1.x.x";
     }
     getPluginsTable() {
         const table = new cli_table3_1.default({
@@ -84,33 +85,36 @@ let PluginService = class PluginService {
         }
         return false;
     }
-    async install(pluginName, beta) {
+    async install(pluginName, version = "latest") {
         const [, prefix = "@wocker/", name, suffix = "-plugin"] = /^(@wocker\/)?(\w+)(-plugin)?$/.exec(pluginName) || [];
         const fullName = `${prefix}${name}${suffix}`;
-        try {
-            if (await this.checkPlugin(fullName)) {
-                this.appConfigService.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.addPlugin(fullName, env);
-                this.appConfigService.save();
-                console.info(`Plugin ${fullName}@${env} activated`);
-                return;
-            }
+        const currentVersion = await this.getCurrentVersion(fullName), wRule = makes_1.VersionRule.parse(this.rule), rule = makes_1.VersionRule.parse(version === "latest" ? "x" : version || this.rule);
+        const packageInfo = await this.registryService.getPackageInfo(fullName);
+        const versions = Object.keys(packageInfo.versions)
+            .filter((version) => {
+            return wRule.match(version, true) && rule.match(version, true);
+        })
+            .sort((a, b) => {
+            return makes_1.Version.parse(b).compare(a);
+        });
+        const bestSatisfyingVersion = versions.find((version) => rule.match(version)) ??
+            versions.find((version) => rule.match(version, true));
+        if (!bestSatisfyingVersion) {
+            throw new Error(`No matching version found for ${fullName}@${version}.`);
         }
-        catch (err) {
-            this.logService.error(err.message);
+        if ((!currentVersion || currentVersion !== bestSatisfyingVersion) || !await this.checkPlugin(fullName)) {
+            await this.pm.install(fullName, bestSatisfyingVersion);
         }
+        this.appConfigService.addPlugin(fullName, version);
+        this.appConfigService.save();
+        console.info(`Plugin ${fullName} activated`);
     }
     async uninstall(pluginName) {
         const [, prefix = "@wocker/", name, suffix = "-plugin"] = /^(@wocker\/)?(\w+)(-plugin)?$/.exec(pluginName) || [];
         const fullName = `${prefix}${name}${suffix}`;
+        if (await this.checkPlugin(fullName)) {
+            await this.pm.uninstall(fullName);
+        }
         this.appConfigService.removePlugin(fullName);
         this.appConfigService.save();
         console.info(`Plugin ${fullName} deactivated`);
@@ -121,25 +125,16 @@ let PluginService = class PluginService {
     }
     async update() {
         if (this.appConfigService.plugins.length === 0) {
+            console.info("No plugins installed");
             return;
         }
         for (const plugin of this.appConfigService.plugins) {
             console.info(`Checking ${plugin.name}...`);
             try {
-                const current = await this.getCurrentVersion(plugin.name);
-                const res = await makes_1.Http.get("https://registry.npmjs.org")
-                    .send(plugin.name);
-                if (res.status !== 200) {
-                    continue;
-                }
-                const { "dist-tags": { latest } } = res.data;
-                this.logService.info(plugin.name, current, latest);
-                if (!current || current < latest) {
-                    console.log(`Updating ${plugin.name}...`);
-                    await (0, utils_1.spawn)("npm", ["i", "-g", plugin.name]);
-                }
+                await this.install(plugin.name, plugin.env);
             }
             catch (err) {
+                console.info(err.message);
                 this.logService.error(err.message);
             }
         }
@@ -147,11 +142,13 @@ let PluginService = class PluginService {
     }
     async getCurrentVersion(name) {
         try {
-            const { dependencies: { [name]: { version } } } = JSON.parse(await (0, utils_1.exec)(`npm ls --json -g ${name}`));
-            return version;
+            const packages = await this.pm.getPackages(), package1 = packages.find((p) => p.name === name);
+            if (package1) {
+                return package1.version;
+            }
         }
         catch (err) {
-            this.logService.error(`Failed to get current version of ${name}`);
+            this.logService.error(`Failed to get current version of "${name}"`);
         }
         return null;
     }
@@ -160,7 +157,8 @@ exports.PluginService = PluginService;
 exports.PluginService = PluginService = __decorate([
     (0, core_1.Injectable)(),
     __metadata("design:paramtypes", [core_1.AppConfigService,
-        NpmService_1.NpmService,
+        package_manager_1.PackageManager,
+        package_manager_1.RegistryService,
         core_1.LogService,
         core_1.Cli])
 ], PluginService);

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

@@ -10,7 +10,7 @@ export declare class PresetController {
     constructor(appConfigService: AppConfigService, dockerService: DockerService, presetRepository: PresetRepository, presetService: PresetService);
     init(): Promise<void>;
     list(): Promise<string>;
-    add(name: string, version?: string): Promise<void>;
+    install(repository: string, version?: string): Promise<void>;
     destroy(): Promise<void>;
     delete(name: string, confirm?: boolean): Promise<void>;
     build(presetName: string, rebuild?: boolean): Promise<void>;