@yumerijs/loader 3.1.2 → 3.1.4

package/dist/index.d.ts

@@ -34,6 +34,8 @@ export declare class PluginLoader {
     private configPath;
     private pluginContexts;
     private isDev;
+    /** Install every missing configured plugin without prompting. */
+    autoInstallMissingPlugins: boolean;
     constructor(core?: Core, pluginsDir?: string);
     /**
      * Normalize both the legacy `{ "package-name": { ...config } }` form and
@@ -52,7 +54,7 @@ export declare class PluginLoader {
     getContext(pluginName: string, injections?: Record<string, any>): Context;
     unregall(pluginName: string): void;
     loadConfig(configPath: string): Promise<void>;
-    loadPlugins(): Promise<void>;
+    loadPlugins(): Promise<boolean>;
     loadSinglePlugin(pluginName: string, triggerPendingCheck?: boolean, onlypending?: boolean, requireOptionalDependencies?: boolean): Promise<boolean>;
     private _loadPendingPlugins;
     unloadPlugin(pluginNameToUnload: string, ispending?: boolean): Promise<void>;
@@ -63,6 +65,8 @@ export declare class PluginLoader {
     private isNpxInvocation;
     private detectPackageManager;
     private confirmPluginInstall;
+    private isPluginModuleResolvable;
+    private installMissingPluginModules;
     private installMissingPlugin;
     private importPluginModule;
     loadModule(pluginName: string): Promise<Plugin>;

package/dist/index.js

@@ -3,8 +3,6 @@ import { Core, Logger, Context, fallback, Schema, I18n, resolvePluginModule } fr
 import * as fs from 'fs';
 import { promisify } from 'util';
 import { execFile } from 'child_process';
-import { createInterface } from 'readline/promises';
-import { stdin as input, stdout as output } from 'process';
 import { fileURLToPath } from 'url';
 import * as yaml from 'js-yaml';
 import * as chokidar from 'chokidar';
@@ -21,6 +19,8 @@ export class PluginLoader {
     configPath = '';
     pluginContexts = {};
     isDev = false;
+    /** Install every missing configured plugin without prompting. */
+    autoInstallMissingPlugins = false;
     constructor(core, pluginsDir = 'plugins') {
         this.pluginsDir = pluginsDir;
         this.core = core || new Core(this, undefined, false);
@@ -133,7 +133,7 @@ export class PluginLoader {
     async loadPlugins() {
         if (!this.config || typeof this.config.plugins !== 'object' || this.config.plugins === null) {
             this.logger.info('No plugins configuration found. No plugins to load.');
-            return;
+            return false;
         }
         const allEntries = Object.keys(this.config.plugins)
             .map(key => this.getPluginEntry(key.startsWith('~') ? key.substring(1) : key))
@@ -151,7 +151,13 @@ export class PluginLoader {
         }
         if (enabledPlugins.length === 0) {
             this.logger.info('No enabled plugins found in configuration.');
-            return;
+            return false;
+        }
+        // Resolve and install every configured plugin before any plugin module is loaded.
+        const installedMissingPlugins = await this.installMissingPluginModules(allEntries.filter(entry => entry.enabled));
+        if (installedMissingPlugins) {
+            this.logger.info('Missing plugin packages were installed. A worker restart is required before loading plugins.');
+            return true;
         }
         // 第一阶段：将 optional 与 depend 一样处理，尽量让可选服务先完成加载并注入。
         while (await this._loadPendingPlugins(true)) {
@@ -165,6 +171,7 @@ export class PluginLoader {
         if (pendingPlugins.length > 0) {
             this.logger.warn('Some plugins could not be loaded due to unresolved required dependencies:', pendingPlugins);
         }
+        return false;
     }
     async loadSinglePlugin(pluginName, triggerPendingCheck = true, onlypending = false, requireOptionalDependencies = true) {
         if (!this.pluginStatus[pluginName]) {
@@ -400,48 +407,91 @@ export class PluginLoader {
         return 'npm';
     }
     async confirmPluginInstall(moduleName) {
-        if (!input.isTTY || !output.isTTY) {
+        if (!process.stdin.isTTY || !process.stdout.isTTY) {
             this.logger.warn(`Plugin package "${moduleName}" is not installed and no interactive terminal is available.`);
             return false;
         }
         const scope = this.isNpxInvocation() ? 'globally' : 'in the current project';
-        const readline = createInterface({ input, output });
+        const answer = await this.logger.input(`Plugin package "${moduleName}" is not installed. Install it ${scope}? [y/N] `);
+        return /^(y|yes)$/i.test(answer.trim());
+    }
+    isPluginModuleResolvable(moduleName) {
         try {
-            const answer = await readline.question(`Plugin package "${moduleName}" is not installed. Install it ${scope}? [y/N] `);
-            return /^(y|yes)$/i.test(answer.trim());
+            import.meta.resolve(moduleName);
+            return true;
+        }
+        catch (error) {
+            if (this.isMissingModuleError(error, moduleName))
+                return false;
+            throw error;
+        }
+    }
+    async installMissingPluginModules(entries) {
+        const missingModules = [...new Set(entries.map(entry => entry.moduleName))]
+            .filter(moduleName => !this.isPluginModuleResolvable(moduleName));
+        if (missingModules.length === 0)
+            return false;
+        if (this.autoInstallMissingPlugins) {
+            this.logger.info(`Automatically installing missing plugin packages: ${missingModules.join(', ')}`);
+            try {
+                await this.installMissingPlugin(missingModules);
+                return true;
+            }
+            catch (error) {
+                this.logger.error('Failed to automatically install missing plugin packages:', error);
+                return false;
+            }
         }
-        finally {
-            readline.close();
+        let installedAny = false;
+        for (const moduleName of missingModules) {
+            const shouldInstall = await this.confirmPluginInstall(moduleName);
+            if (!shouldInstall)
+                continue;
+            try {
+                await this.installMissingPlugin(moduleName);
+                installedAny = true;
+            }
+            catch (error) {
+                this.logger.error(`Failed to install missing plugin "${moduleName}":`, error);
+            }
         }
+        return installedAny;
     }
-    async installMissingPlugin(moduleName) {
+    async installMissingPlugin(moduleNames) {
+        const packages = Array.isArray(moduleNames) ? moduleNames : [moduleNames];
+        for (const moduleName of packages) {
+            if (!/^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/i.test(moduleName)) {
+                throw new Error(`Cannot automatically install invalid package name "${moduleName}".`);
+            }
+        }
         const packageManager = this.detectPackageManager();
         const global = this.isNpxInvocation();
         const argsByManager = {
-            npm: global ? ['install', '--global', moduleName] : ['install', moduleName, '--save'],
-            yarn: global ? ['global', 'add', moduleName] : ['add', moduleName],
-            pnpm: global ? ['add', '--global', moduleName] : ['add', moduleName],
-            bun: global ? ['add', '--global', moduleName] : ['add', moduleName],
+            npm: global ? ['install', '--global', ...packages] : ['install', ...packages, '--save'],
+            yarn: global ? ['global', 'add', ...packages] : ['add', ...packages],
+            pnpm: global ? ['add', '--global', ...packages] : ['add', ...packages],
+            bun: global ? ['add', '--global', ...packages] : ['add', ...packages],
         };
         const args = argsByManager[packageManager] || argsByManager.npm;
         const command = process.platform === 'win32' ? `${packageManager}.cmd` : packageManager;
-        this.logger.info(`Installing missing plugin "${moduleName}" with ${command} ${args.join(' ')}` +
+        const packageLabel = packages.map(moduleName => `"${moduleName}"`).join(', ');
+        this.logger.info(`Installing missing plugin package${packages.length === 1 ? '' : 's'} ${packageLabel} with ${command} ${args.join(' ')}` +
             (global ? ' (global)' : ''));
+        // Windows command shims (for example npm.cmd) require cmd.exe; execFile
+        // otherwise fails before the package manager can start with spawn EINVAL.
+        if (process.platform === 'win32') {
+            await execFileAsync(process.env.ComSpec || 'cmd.exe', [
+                '/d',
+                '/s',
+                '/c',
+                `${command} ${args.join(' ')}`,
+            ], { cwd: process.cwd() });
+            return;
+        }
         await execFileAsync(command, args, { cwd: process.cwd() });
     }
     async importPluginModule(moduleName) {
-        try {
-            return await import(moduleName);
-        }
-        catch (error) {
-            if (!this.isMissingModuleError(error, moduleName))
-                throw error;
-            const shouldInstall = await this.confirmPluginInstall(moduleName);
-            if (!shouldInstall)
-                throw error;
-            await this.installMissingPlugin(moduleName);
-            return await import(moduleName);
-        }
+        return await import(moduleName);
     }
     async loadModule(pluginName) {
         const entry = this.getPluginEntry(pluginName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yumerijs/loader",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "description": "Module loader for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.13.10",
-    "@yumerijs/core": "^3.0.5",
+    "@yumerijs/core": "^3.0.7",
     "esbuild-register": "^3.6.0",
     "typescript": "^6.0.3"
   },