Merge pull request #63 from node-red/support-async-modules

Add support for async node modules
node-red · Apr 28, 2023 · 0d7e4c3 · 0d7e4c3
2 parents 51e35e5 + cdb9c50
commit 0d7e4c3
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -256,12 +256,16 @@ class NodeTestHelper extends EventEmitter {
                     Object.defineProperty(red, prop, propDescriptor);
                 });
         }
+        const initPromises = []
 
         let preloadedCoreModules = new Set();
         testFlow.forEach(n => {
             if (this._nodeModules.hasOwnProperty(n.type)) {
                 // Go find the 'real' core node module and load it...
-                this._nodeModules[n.type](red);
+                const result = this._nodeModules[n.type](red);
+                if (result?.then) {
+                    initPromises.push(result)
+                }
                 preloadedCoreModules.add(this._nodeModules[n.type]);
             }
         })
@@ -271,12 +275,17 @@ class NodeTestHelper extends EventEmitter {
         }
         testNode.forEach(fn => {
             if (!preloadedCoreModules.has(fn)) {
-                fn(red);
+                const result = fn(red);
+                if (result?.then) {
+                    initPromises.push(result)
+                }
             }
         });
 
-        return redNodes.loadFlows()
-            .then(redNodes.startFlows).then(() => {
+        return Promise.all(initPromises)
+            .then(redNodes.loadFlows)
+            .then(redNodes.startFlows)
+            .then(() => {
                 should.deepEqual(testFlow, redNodes.getFlows().flows);
                 if(cb) cb();
             });