From 29e903e1c8067fc10ddb9a11cf08194bcb3fe779 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 30 Sep 2021 15:28:09 +0100
Subject: [PATCH 1/2] Improve error reporting when installing bad nodes

---
 .../editor-client/locales/en-US/editor.json   |  3 ++-
 .../@node-red/editor-client/src/js/nodes.js   | 13 ++++++---
 .../@node-red/registry/lib/installer.js       | 27 ++++++++++++++-----
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 95c803216..e6f927ca1 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -544,7 +544,8 @@
             "nodeEnabled_plural": "Nodes enabled:",
             "nodeDisabled": "Node disabled:",
             "nodeDisabled_plural": "Nodes disabled:",
-            "nodeUpgraded": "Node module __module__ upgraded to version __version__"
+            "nodeUpgraded": "Node module __module__ upgraded to version __version__",
+            "unknownNodeRegistered": "Unrecognised node type registered: <ul><li>__type__</li></ul>"
         },
         "editor": {
             "title": "Manage palette",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index da3bdb729..3c95239a1 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -142,9 +142,12 @@ RED.nodes = (function() {
                 RED.events.emit("registry:node-set-disabled",ns);
             },
             registerNodeType: function(nt,def) {
-                nodeDefinitions[nt] = def;
-                def.type = nt;
                 if (nt.substring(0,8) != "subflow:") {
+                    if (!nodeSets[typeToId[nt]]) {
+                        var fullType = (RED._loadingModule?("["+RED._loadingModule+"] "):"")+nt
+                        RED.notify(RED._("palette.event.unknownNodeRegistered",{type:fullType}), "error");
+                        return;
+                    }
                     def.set = nodeSets[typeToId[nt]];
                     nodeSets[typeToId[nt]].added = true;
                     nodeSets[typeToId[nt]].enabled = true;
@@ -167,9 +170,13 @@ RED.nodes = (function() {
                         }
                         return result;
                     }
-
                     // TODO: too tightly coupled into palette UI
                 }
+
+                def.type = nt;
+                nodeDefinitions[nt] = def;
+
+
                 if (def.defaults) {
                     for (var d in def.defaults) {
                         if (def.defaults.hasOwnProperty(d)) {
diff --git a/packages/node_modules/@node-red/registry/lib/installer.js b/packages/node_modules/@node-red/registry/lib/installer.js
index 88846bac4..95022fbb1 100644
--- a/packages/node_modules/@node-red/registry/lib/installer.js
+++ b/packages/node_modules/@node-red/registry/lib/installer.js
@@ -299,16 +299,29 @@ async function installModule(module,version,url) {
 
 function reportAddedModules(info) {
     if (info.nodes.length > 0) {
-        log.info(log._("server.added-types"));
+        const installedTypes = [];
+        const errorSets = [];
         for (var i=0;i<info.nodes.length;i++) {
-            for (var j=0;j<info.nodes[i].types.length;j++) {
-                log.info(" - "+
-                    (info.nodes[i].module?info.nodes[i].module+":":"")+
-                    info.nodes[i].types[j]+
-                    (info.nodes[i].err?" : "+info.nodes[i].err:"")
-                );
+            const typeCount = info.nodes[i].types.length;
+            if (typeCount > 0) {
+                for (var j=0;j<typeCount;j++) {
+                    installedTypes.push(" - "+
+                        (info.nodes[i].module?info.nodes[i].module+":":"")+
+                        info.nodes[i].types[j]+
+                        (info.nodes[i].err?" : "+info.nodes[i].err:"")
+                    );
+                }
+            } else if (info.nodes[i].err) {
+                errorSets.push(`[${info.nodes[i].id}] ${info.nodes[i].err}`)
             }
         }
+        if (errorSets.length > 0) {
+            errorSets.forEach(l => log.warn(l))
+        }
+        if (installedTypes.length > 0) {
+            log.info(log._("server.added-types"));
+            installedTypes.forEach(l => log.info(l))
+        }
     }
     return info;
 }

From 8761e61439b8ad94c1d00e05a17850525a8328cc Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 30 Sep 2021 15:39:45 +0100
Subject: [PATCH 2/2] Include load error in notification of unknown node

---
 .../editor-client/locales/en-US/editor.json         |  2 +-
 .../@node-red/editor-client/src/js/nodes.js         | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index e6f927ca1..0e60d17e3 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -545,7 +545,7 @@
             "nodeDisabled": "Node disabled:",
             "nodeDisabled_plural": "Nodes disabled:",
             "nodeUpgraded": "Node module __module__ upgraded to version __version__",
-            "unknownNodeRegistered": "Unrecognised node type registered: <ul><li>__type__</li></ul>"
+            "unknownNodeRegistered": "Error loading node: <ul><li>__type__<br>__error__</li></ul>"
         },
         "editor": {
             "title": "Manage palette",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 3c95239a1..f2252f95c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -144,8 +144,17 @@ RED.nodes = (function() {
             registerNodeType: function(nt,def) {
                 if (nt.substring(0,8) != "subflow:") {
                     if (!nodeSets[typeToId[nt]]) {
-                        var fullType = (RED._loadingModule?("["+RED._loadingModule+"] "):"")+nt
-                        RED.notify(RED._("palette.event.unknownNodeRegistered",{type:fullType}), "error");
+                        var error = "";
+                        var fullType = nt;
+                        if (RED._loadingModule) {
+                            fullType = "["+RED._loadingModule+"] "+nt;
+                            if (nodeSets[RED._loadingModule]) {
+                                error = nodeSets[RED._loadingModule].err || "";
+                            } else {
+                                error = "Unknown error";
+                            }
+                        }
+                        RED.notify(RED._("palette.event.unknownNodeRegistered",{type:fullType, error:error}), "error");
                         return;
                     }
                     def.set = nodeSets[typeToId[nt]];