From d7a2fc2be4645afe28ab024c4352f0d761380bd3 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Sun, 25 Jul 2021 15:16:49 +0100
Subject: [PATCH 1/5] use them plugin theme `monacoTheme` if present

---
 .../@node-red/editor-api/lib/editor/theme.js  |  1 +
 .../src/js/ui/editors/code-editors/monaco.js  | 40 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
index 2651660bf..f2edf1059 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -246,6 +246,7 @@ module.exports = {
                     theme.page = theme.page || {_:{}}
                     theme.page._.scripts = scriptFiles.concat(theme.page._.scripts || [])
                 }
+                themeSettings.monacoTheme = themePlugin.monacoTheme;
             }
             activeThemeInitialised = true;
         }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
index edde36373..2a4da0e21 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
@@ -54,6 +54,7 @@ RED.editor.codeEditor.monaco = (function() {
     var initialised = false;
     const type = "monaco";
     const monacoThemes = ["vs","vs-dark","hc-black"]; //TODO: consider setting hc-black autmatically based on acessability?
+    let userSelectedTheme;
 
     //TODO: get from externalModules.js  For now this is enough for feature parity with ACE (and then some).
     const knownModules = {
@@ -181,14 +182,42 @@ RED.editor.codeEditor.monaco = (function() {
         var editorSettings = RED.editor.codeEditor.settings || {};
         var editorOptions = editorSettings.options || {};
 
+        //if a theme is set and the plugin has a property monacoTheme, it should be the name of a pre-set theme or a monaco theme object
+        try {
+            if(RED.settings.editorTheme.theme && RED.settings.editorTheme.monacoTheme) {
+                if (typeof RED.settings.editorTheme.monacoTheme == "object") {
+                    let themeThemeName = RED.settings.editorTheme.theme;
+                    monacoThemes.push(themeThemeName);//add to list of loaded themes
+                    monaco.editor.defineTheme(themeThemeName, RED.settings.editorTheme.monacoTheme);
+                    monaco.editor.setTheme(themeThemeName);
+                    userSelectedTheme = themeThemeName;
+                } else if (typeof RED.settings.editorTheme.monacoTheme == "string") {
+                    let themeThemeName = RED.settings.editorTheme.monacoTheme;
+                    let customTheme = 'vendor/monaco/dist/theme/' + editorOptions.theme + '.json';
+                    $.get(customTheme, function (theme) {
+                        monacoThemes.push(themeThemeName);//add to list of loaded themes
+                        if ((theme.rules && Array.isArray(theme.rules)) || theme.colors) {
+                            monaco.editor.defineTheme(themeThemeName, theme);
+                            monaco.editor.setTheme(themeThemeName);
+                            userSelectedTheme = themeThemeName;
+                        }
+                    });
+                }
+            }
+        } catch (error) {
+            console.warn(error);
+        }
+
+        //if a theme is explicitally set, load & choose that
         if (editorOptions.theme) {
             if (!monacoThemes.includes(editorOptions.theme)) {
-                var customTheme = 'vendor/monaco/dist/theme/' + editorOptions.theme + '.json';
+                let customTheme = 'vendor/monaco/dist/theme/' + editorOptions.theme + '.json';
                 $.get(customTheme, function (theme) {
                     monacoThemes.push(editorOptions.theme);//add to list of loaded themes
                     if ((theme.rules && Array.isArray(theme.rules)) || theme.colors) {
                         monaco.editor.defineTheme(editorOptions.theme, theme);
                         monaco.editor.setTheme(editorOptions.theme);
+                        userSelectedTheme = editorOptions.theme;
                     }
                 });
             }
@@ -742,6 +771,10 @@ RED.editor.codeEditor.monaco = (function() {
         var editorOptions = $.extend({}, editorSettings.options, options);
         editorOptions.language = convertAceModeToMonacoLang(options.mode);
 
+        if(userSelectedTheme) {
+            editorOptions.theme = userSelectedTheme;//use user selected theme for this session
+        }
+
         //by default, set javascript editors to text mode.
         //when element becomes visible, it will be (re) set to javascript mode
         //this is to ensure multiple editors sharing the model dont present its 
@@ -1158,7 +1191,10 @@ RED.editor.codeEditor.monaco = (function() {
             return { row: p.lineNumber-1, column: p.column-1 };
         }
 
-        ed.setTheme = monaco.editor.setTheme;
+        ed.setTheme = function(theme) {
+            monaco.editor.setTheme(theme);
+            userSelectedTheme = theme;//remember users choice for this session
+        }
 
         ed.on = function (name, cb) {
             switch (name) {

From 8a1d81989b16787d73e645a29f681ac9a29bbcc6 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 26 Jul 2021 21:02:11 +0100
Subject: [PATCH 2/5] use codeEditor.options.theme

---
 .../@node-red/editor-api/lib/editor/theme.js  |  5 +-
 .../src/js/ui/editors/code-editors/monaco.js  | 50 +++++++------------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
index f2edf1059..918fed420 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -246,7 +246,10 @@ module.exports = {
                     theme.page = theme.page || {_:{}}
                     theme.page._.scripts = scriptFiles.concat(theme.page._.scripts || [])
                 }
-                themeSettings.monacoTheme = themePlugin.monacoTheme;
+                if(theme.codeEditor) {
+                    theme.codeEditor.options = theme.codeEditor.options || {};
+                    theme.codeEditor.options.theme = themePlugin.monacoTheme;
+                }
             }
             activeThemeInitialised = true;
         }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
index 2a4da0e21..fbd9e7e06 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
@@ -182,46 +182,34 @@ RED.editor.codeEditor.monaco = (function() {
         var editorSettings = RED.editor.codeEditor.settings || {};
         var editorOptions = editorSettings.options || {};
 
-        //if a theme is set and the plugin has a property monacoTheme, it should be the name of a pre-set theme or a monaco theme object
+        //if editorOptions.theme is an object (set in theme.js context()), use the plugin theme name as the monaco theme name
+        //if editorOptions.theme is a string, it should be the name of a pre-set theme, load that
         try {
-            if(RED.settings.editorTheme.theme && RED.settings.editorTheme.monacoTheme) {
-                if (typeof RED.settings.editorTheme.monacoTheme == "object") {
-                    let themeThemeName = RED.settings.editorTheme.theme;
-                    monacoThemes.push(themeThemeName);//add to list of loaded themes
-                    monaco.editor.defineTheme(themeThemeName, RED.settings.editorTheme.monacoTheme);
+            const addTheme = function (themeThemeName, theme) {
+                if ((theme.rules && Array.isArray(theme.rules)) || theme.colors) {
+                    monacoThemes.push(themeThemeName); //add to list of loaded themes
+                    monaco.editor.defineTheme(themeThemeName, theme);
                     monaco.editor.setTheme(themeThemeName);
                     userSelectedTheme = themeThemeName;
-                } else if (typeof RED.settings.editorTheme.monacoTheme == "string") {
-                    let themeThemeName = RED.settings.editorTheme.monacoTheme;
-                    let customTheme = 'vendor/monaco/dist/theme/' + editorOptions.theme + '.json';
-                    $.get(customTheme, function (theme) {
-                        monacoThemes.push(themeThemeName);//add to list of loaded themes
-                        if ((theme.rules && Array.isArray(theme.rules)) || theme.colors) {
-                            monaco.editor.defineTheme(themeThemeName, theme);
-                            monaco.editor.setTheme(themeThemeName);
-                            userSelectedTheme = themeThemeName;
-                        }
-                    });
+                }
+            };
+            if (editorOptions.theme) {
+                if (typeof editorOptions.theme == "object" && RED.settings.editorTheme.theme) {
+                    let themeThemeName = editorOptions.theme.name || RED.settings.editorTheme.theme;
+                    addTheme(themeThemeName, editorOptions.theme);
+                } else if (typeof editorOptions.theme == "string") {
+                    let themeThemeName = editorOptions.theme;
+                    if (!monacoThemes.includes(themeThemeName)) {
+                        $.get('vendor/monaco/dist/theme/' + themeThemeName + '.json', function (theme) {
+                            addTheme(themeThemeName, theme);
+                        });
+                    }
                 }
             }
         } catch (error) {
             console.warn(error);
         }
 
-        //if a theme is explicitally set, load & choose that
-        if (editorOptions.theme) {
-            if (!monacoThemes.includes(editorOptions.theme)) {
-                let customTheme = 'vendor/monaco/dist/theme/' + editorOptions.theme + '.json';
-                $.get(customTheme, function (theme) {
-                    monacoThemes.push(editorOptions.theme);//add to list of loaded themes
-                    if ((theme.rules && Array.isArray(theme.rules)) || theme.colors) {
-                        monaco.editor.defineTheme(editorOptions.theme, theme);
-                        monaco.editor.setTheme(editorOptions.theme);
-                        userSelectedTheme = editorOptions.theme;
-                    }
-                });
-            }
-        }
 
         //Helper function to simplify snippet setup
         function createMonacoCompletionItem(label, insertText, documentation, range, kind) {

From 08049252f21221955dc6d391a9375967287e3423 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Sat, 31 Jul 2021 10:24:48 +0100
Subject: [PATCH 3/5] permit plugin theme to change other monaco options

---
 packages/node_modules/@node-red/editor-api/lib/editor/theme.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
index 918fed420..69c9345a0 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -247,8 +247,7 @@ module.exports = {
                     theme.page._.scripts = scriptFiles.concat(theme.page._.scripts || [])
                 }
                 if(theme.codeEditor) {
-                    theme.codeEditor.options = theme.codeEditor.options || {};
-                    theme.codeEditor.options.theme = themePlugin.monacoTheme;
+                    theme.codeEditor.options = Object.assign({}, theme.codeEditor.options, themePlugin.monacoOptions);
                 }
             }
             activeThemeInitialised = true;

From c20ca3399ed036913c17461c0173fee5505a6d67 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Tue, 21 Sep 2021 14:12:21 +0100
Subject: [PATCH 4/5] codeEditor.options should take precedence - over plugins
 monacoOptions

---
 packages/node_modules/@node-red/editor-api/lib/editor/theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
index f926af253..6ffc2fc01 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -254,7 +254,7 @@ module.exports = {
                     theme.page._.scripts = scriptFiles.concat(theme.page._.scripts || [])
                 }
                 if(theme.codeEditor) {
-                    theme.codeEditor.options = Object.assign({}, theme.codeEditor.options, themePlugin.monacoOptions);
+                    theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
                 }
             }
             activeThemeInitialised = true;

From 3759e0f778d22a6597ea413f9d7734518e4e099f Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 4 Oct 2021 14:04:59 +0100
Subject: [PATCH 5/5] Add option to only send http response errors to Catch
 node

---
 .../nodes/core/network/21-httprequest.html        |  9 ++++++++-
 .../nodes/core/network/21-httprequest.js          | 15 ++++++++++++---
 .../@node-red/nodes/locales/en-US/messages.json   |  1 +
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
index 96330ef2b..bf1f76b7f 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
@@ -86,6 +86,12 @@
         </div>
     </div>
 
+    <div class="form-row">
+        <input type="checkbox" id="node-input-senderr" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-senderr" style="width: auto" data-i18n="httpin.senderr"></label>
+    </div>
+
+
     <div class="form-row">
         <label for="node-input-ret"><i class="fa fa-arrow-left"></i> <span data-i18n="httpin.label.return"></span></label>
         <select type="text" id="node-input-ret" style="width:70%;">
@@ -114,7 +120,8 @@
             tls: {type:"tls-config",required: false},
             persist: {value:false},
             proxy: {type:"http proxy",required: false},
-            authType: {value: ""}
+            authType: {value: ""},
+            senderr: {value: false}
         },
         credentials: {
             user: {type:"text"},
diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
index 43d8ee42f..3fe58d772 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
@@ -72,6 +72,7 @@ in your Node-RED user directory (${RED.settings.userDir}).
         var paytoqs = false;
         var paytobody = false;
         var redirectList = [];
+        var sendErrorsToCatch = n.senderr;
 
         var nodeHTTPPersistent = n["persist"];
         if (n.tls) {
@@ -537,10 +538,16 @@ in your Node-RED user directory (${RED.settings.userDir}).
                 nodeSend(msg);
                 nodeDone();
             }).catch(err => {
-                if(err.code === 'ETIMEDOUT' || err.code === 'ESOCKETTIMEDOUT') {
+                // Pre 2.1, any errors would be sent to both Catch node and sent on as normal.
+                // This is not ideal but is the legacy behaviour of the node.
+                // 2.1 adds the 'senderr' option, if set to true, will *only* send errors
+                // to Catch nodes. If false, it still does both behaviours.
+                // TODO: 3.0 - make it one or the other.
+
+                if (err.code === 'ETIMEDOUT' || err.code === 'ESOCKETTIMEDOUT') {
                     node.error(RED._("common.notification.errors.no-response"), msg);
                     node.status({fill:"red", shape:"ring", text:"common.notification.errors.no-response"});
-                }else{
+                } else {
                     node.error(err,msg);
                     node.status({fill:"red", shape:"ring", text:err.code});
                 }
@@ -549,7 +556,9 @@ in your Node-RED user directory (${RED.settings.userDir}).
                 if (node.metric() && timingLog) {
                     emitTimingMetricLog(err.timings, msg);
                 }
-                nodeSend(msg);
+                if (!sendErrorsToCatch) {
+                    nodeSend(msg);
+                }
                 nodeDone();
             });
         });
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 59d8f5c1a..8dc695205 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -486,6 +486,7 @@
         "proxy-config": "Proxy Configuration",
         "use-proxyauth": "Use proxy authentication",
         "noproxy-hosts": "Ignore hosts",
+        "senderr": "Only send non-2xx responses to Catch node",
         "utf8": "a UTF-8 string",
         "binary": "a binary buffer",
         "json": "a parsed JSON object",