#63 fix plugin-manager plugin scan

stefanwerfling · Feb 29, 2024 · 110f79c · 110f79c
1 parent d2fec4f
commit 110f79c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/backend/src/main.ts b/backend/src/main.ts
@@ -94,8 +94,12 @@ import exitHook from 'async-exit-hook';
 
     // load plugins ----------------------------------------------------------------------------------------------------
 
-    const pm = new PluginManager('backend', path.resolve());
-    await pm.start();
+    try {
+        const pm = new PluginManager('backend', path.resolve());
+        await pm.start();
+    } catch (error) {
+        Logger.getLogger().error('The plugin manager could not load the plugins.', error);
+    }
 
     // -----------------------------------------------------------------------------------------------------------------
 

diff --git a/core/src/inc/PluginSystem/PluginManager.ts b/core/src/inc/PluginSystem/PluginManager.ts
@@ -94,10 +94,14 @@ export class PluginManager {
      * @returns {PluginInformation[]}
      */
     public scan(): PluginInformation[] {
-        const nodeModulesPath = path.join(this._appPath, 'node_modules');
+        let nodeModulesPath = path.join(this._appPath, 'node_modules');
 
         if (!fs.existsSync(nodeModulesPath)) {
-            throw new Error(`node_modules directory not found: ${nodeModulesPath}`);
+            nodeModulesPath = path.join(this._appPath, 'node_modules', this._serviceName);
+
+            if (!fs.existsSync(nodeModulesPath)) {
+                throw new Error(`node_modules directory not found: ${nodeModulesPath}`);
+            }
         }
 
         const modules = fs.readdirSync(nodeModulesPath);