Fully remove when.js dependency

package.json

@@ -74,7 +74,6 @@
         "semver": "6.3.0",
         "tar": "6.0.5",
         "uglify-js": "3.11.6",
-        "when": "3.7.8",
         "ws": "6.2.1",
         "xml2js": "0.4.23"
     },

packages/node_modules/@node-red/editor-api/lib/editor/library.js

@@ -17,7 +17,6 @@
 var apiUtils = require("../util");
 var fs = require('fs');
 var fspath = require('path');
-var when = require('when');
 
 var runtimeAPI;
 

packages/node_modules/@node-red/editor-api/lib/index.js

@@ -28,7 +28,6 @@ var express = require("express");
 var bodyParser = require("body-parser");
 var util = require('util');
 var passport = require('passport');
-var when = require('when');
 var cors = require('cors');
 
 var auth = require("./auth");
@@ -111,11 +110,9 @@ function init(settings,_server,storage,runtimeAPI) {
  * @return {Promise} resolves when the application is ready to handle requests
  * @memberof @node-red/editor-api
  */
-function start() {
+async function start() {
     if (editor) {
         return editor.start();
-    } else {
-        return when.resolve();
     }
 }
 
@@ -124,11 +121,10 @@ function start() {
  * @return {Promise} resolves when the application is stopped
  * @memberof @node-red/editor-api
  */
-function stop() {
+async function stop() {
     if (editor) {
         editor.stop();
     }
-    return when.resolve();
 }
 module.exports = {
     init: init,

packages/node_modules/@node-red/editor-api/package.json

@@ -32,7 +32,6 @@
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
         "passport": "0.4.1",
-        "when": "3.7.8",
         "ws": "6.2.1"
     },
     "optionalDependencies": {

packages/node_modules/@node-red/registry/lib/loader.js

@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-var when = require("when");
 var fs = require("fs-extra");
 var path = require("path");
 var semver = require("semver");
@@ -92,7 +91,7 @@ function loadNodeFiles(nodeFiles) {
                                     nodeFiles[m].nodes[n] = nodeSet;
                                     nodes.push(nodeSet);
                                 }
-                            })()));
+                            })()).catch(err => {}));
                         } catch(err) {
                             //
                         }
@@ -101,7 +100,7 @@ function loadNodeFiles(nodeFiles) {
             }
         }
     }
-    return when.settle(promises).then(function(results) {
+    return Promise.all(promises).then(function(results) {
         for (var module in nodeFiles) {
             if (nodeFiles.hasOwnProperty(module)) {
                 if (!nodeFiles[module].err) {
@@ -293,13 +292,13 @@ function loadNodeSetList(nodes) {
     var promises = [];
     nodes.forEach(function(node) {
         if (!node.err) {
-            promises.push(loadNodeSet(node));
+            promises.push(loadNodeSet(node).catch(err => {}));
         } else {
             promises.push(node);
         }
     });
 
-    return when.settle(promises).then(function() {
+    return Promise.all(promises).then(function() {
         if (settings.available()) {
             return registry.saveNodeList();
         } else {

packages/node_modules/@node-red/registry/lib/localfilesystem.js

@@ -17,7 +17,6 @@
 var fs = require("fs");
 var path = require("path");
 
-var events;
 var log;
 
 var log = require("@node-red/util").log;
@@ -29,7 +28,6 @@ var iconFileExtensions = [".png", ".gif", ".svg"];
 
 function init(runtime) {
     settings = runtime.settings;
-    events = runtime.events;
 }
 
 function isIncluded(name) {
@@ -75,7 +73,6 @@ function getLocalFile(file) {
 
 /**
  * Synchronously walks the directory looking for node files.
- * Emits 'node-icon-dir' events for an icon dirs found
  * @param dir the directory to search
  * @return an array of fully-qualified paths to .js files
  */
@@ -229,7 +226,6 @@ function getModuleNodeFiles(module) {
     try {
         fs.statSync(examplesDir)
         result.examples = {path:examplesDir};
-        // events.emit("node-examples-dir",{name:pkg.name,path:examplesDir});
     } catch(err) {
     }
     return result;

packages/node_modules/@node-red/registry/package.json

@@ -19,7 +19,6 @@
         "@node-red/util": "1.3.0-beta.1",
         "semver": "6.3.0",
         "tar": "6.0.5",
-        "uglify-js": "3.11.6",
-        "when": "3.7.8"
+        "uglify-js": "3.11.6"
     }
 }

packages/node_modules/@node-red/runtime/lib/index.js

@@ -14,8 +14,6 @@
  * limitations under the License.
  **/
 
-var when = require('when');
-
 var externalAPI = require("./api");
 
 var redNodes = require("./nodes");
@@ -197,25 +195,24 @@ function start() {
         });
 }
 
-var reinstallAttempts;
+var reinstallAttempts = 0;
 var reinstallTimeout;
 function reinstallModules(moduleList) {
     var promises = [];
-    var failedModules = [];
+    var reinstallList = [];
+
     for (var i=0;i<moduleList.length;i++) {
-        if (settings.autoInstallModules && i != "node-red") {
-            promises.push(redNodes.installModule(moduleList[i].id,moduleList[i].version));
+        if (settings.autoInstallModules && moduleList[i].id != "node-red") {
+            (function(mod) {
+                promises.push(redNodes.installModule(mod.id,mod.version).then(m => {
+                    events.emit("runtime-event",{id:"node/added",retain:false,payload:m.nodes});
+                }).catch(err => {
+                    reinstallList.push(mod);
+                }));
+            })(moduleList[i])
         }
     }
-    when.settle(promises).then(function(results) {
-        var reinstallList = [];
-        for (var i=0;i<results.length;i++) {
-            if (results[i].state === 'rejected') {
-                reinstallList.push(moduleList[i]);
-            } else {
-                events.emit("runtime-event",{id:"node/added",retain:false,payload:results[i].value.nodes});
-            }
-        }
+    Promise.all(promises).then(function(results) {
         if (reinstallList.length > 0) {
             reinstallAttempts++;
             // First 5 at 1x timeout, next 5 at 2x, next 5 at 4x, then 8x

packages/node_modules/@node-red/runtime/lib/nodes/credentials.js

@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-var when = require("when");
 var crypto = require('crypto');
 var runtime;
 var settings;
@@ -60,7 +59,7 @@ var api = module.exports = {
     /**
      * Sets the credentials from storage.
      */
-    load: function (credentials) {
+    load: async function (credentials) {
         dirty = false;
         var credentialsEncrypted = credentials.hasOwnProperty("$") && Object.keys(credentials).length === 1;
 
@@ -77,7 +76,7 @@ var api = module.exports = {
         // Case 4: credentialSecret set
         //  - use it
 
-        var setupEncryptionPromise = when.resolve();
+        var setupEncryptionPromise = Promise.resolve();
 
         var projectKey = false;
         var activeProject;
@@ -134,7 +133,7 @@ var api = module.exports = {
                             log.warn(log._("nodes.credentials.error",{message:err.toString()}))
                             var error = new Error("Failed to decrypt credentials");
                             error.code = "credentials_load_failed";
-                            return when.reject(error);
+                            throw error;
                         }
                     }
                     dirty = true;
@@ -163,7 +162,7 @@ var api = module.exports = {
                             log.warn(log._("nodes.credentials.error",{message:err.toString()}))
                             var error = new Error("Failed to decrypt credentials");
                             error.code = "credentials_load_failed";
-                            return when.reject(error);
+                            throw error;
                         }
                     }
                     dirty = true;
@@ -217,9 +216,9 @@ var api = module.exports = {
                         // This is a project with a bad key. Mark it as invalid
                         // TODO: this delves too deep into Project structure
                         activeProject.credentialSecretInvalid = true;
-                        return when.reject(error);
+                        throw error;
                     }
-                    return when.reject(error);
+                    throw error;
                 }
                 // These are encrypted credentials
                 try {
@@ -235,9 +234,9 @@ var api = module.exports = {
                         // This is a project with a bad key. Mark it as invalid
                         // TODO: this delves too deep into Project structure
                         activeProject.credentialSecretInvalid = true;
-                        return when.reject(error);
+                        throw error;
                     }
-                    return when.reject(error);
+                    throw error;
                 }
             } else {
                 credentialCache = credentials;
@@ -257,12 +256,11 @@ var api = module.exports = {
      * @param creds an object of credential key/value pairs
      * @return a promise for backwards compatibility TODO: can this be removed?
      */
-    add: function (id, creds) {
+    add: async function (id, creds) {
         if (!credentialCache.hasOwnProperty(id) || JSON.stringify(creds) !== JSON.stringify(credentialCache[id])) {
             credentialCache[id] = creds;
             dirty = true;
         }
-        return when.resolve();
     },
 
     /**
@@ -293,7 +291,7 @@ var api = module.exports = {
      * @param config a flow config
      * @return a promise for the saving of credentials to storage
      */
-    clean: function (config) {
+    clean: async function (config) {
         var existingIds = {};
         config.forEach(function(n) {
             existingIds[n.id] = true;
@@ -313,7 +311,6 @@ var api = module.exports = {
         if (deletedCredentials) {
             dirty = true;
         }
-        return when.resolve();
     },
 
     /**
@@ -432,7 +429,7 @@ var api = module.exports = {
     getKeyType: function() {
         return encryptionKeyType;
     },
-    export: function() {
+    export: async function() {
         var result = credentialCache;
 
         if (encryptionEnabled) {
@@ -455,7 +452,7 @@ var api = module.exports = {
                 return result;
             })
         } else {
-            return when.resolve(result);
+            return result;
         }
     }
 }

packages/node_modules/@node-red/runtime/lib/nodes/index.js

@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-var when = require("when");
 var path = require("path");
 var fs = require("fs");
 var clone = require("clone");

packages/node_modules/@node-red/runtime/lib/settings.js

@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-var when = require("when");
 var clone = require("clone");
 var assert = require("assert");
 var log = require("@node-red/util").log; // TODO: separate module
@@ -90,10 +89,10 @@ var persistentSettings = {
         globalSettings[prop] = clone(value);
         try {
             assert.deepEqual(current,value);
-            return when.resolve();
         } catch(err) {
             return storage.saveSettings(clone(globalSettings));
         }
+        return Promise.resolve();
     },
     delete: function(prop) {
         if (localSettings.hasOwnProperty(prop)) {
@@ -106,7 +105,7 @@ var persistentSettings = {
             delete globalSettings[prop];
             return storage.saveSettings(clone(globalSettings));
         }
-        return when.resolve();
+        return Promise.resolve();
     },
 
     available: function() {
@@ -180,7 +179,6 @@ var persistentSettings = {
         userSettings[username] = settings;
         try {
             assert.deepEqual(current,settings);
-            return when.resolve();
         } catch(err) {
             globalSettings.users = userSettings;
             return storage.saveSettings(clone(globalSettings));