@yumerijs/loader 3.1.2 → 3.1.3

package/dist/index.d.ts

@@ -63,6 +63,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

@@ -153,6 +153,8 @@ export class PluginLoader {
             this.logger.info('No enabled plugins found in configuration.');
             return;
         }
+        // Resolve and install every configured plugin before any plugin module is loaded.
+        await this.installMissingPluginModules(allEntries.filter(entry => entry.enabled));
         // 第一阶段：将 optional 与 depend 一样处理，尽量让可选服务先完成加载并注入。
         while (await this._loadPendingPlugins(true)) {
             // Continue scanning until no plugin can satisfy all required and optional dependencies.
@@ -414,7 +416,36 @@ export class PluginLoader {
             readline.close();
         }
     }
+    isPluginModuleResolvable(moduleName) {
+        try {
+            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));
+        for (const moduleName of missingModules) {
+            const shouldInstall = await this.confirmPluginInstall(moduleName);
+            if (!shouldInstall)
+                continue;
+            try {
+                await this.installMissingPlugin(moduleName);
+            }
+            catch (error) {
+                this.logger.error(`Failed to install missing plugin "${moduleName}":`, error);
+            }
+        }
+    }
     async installMissingPlugin(moduleName) {
+        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 = {
@@ -427,21 +458,21 @@ export class PluginLoader {
         const command = process.platform === 'win32' ? `${packageManager}.cmd` : packageManager;
         this.logger.info(`Installing missing plugin "${moduleName}" 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.3",
   "description": "Module loader for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",