From cd3aba2b89e0d570c99210820e703aab2a360a32 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 29 Apr 2021 10:17:07 +0100
Subject: [PATCH] Allow nodes to access resolved theme files Fixes #2968

---
 .../@node-red/editor-api/lib/editor/theme.js  | 10 +++++++
 .../@node-red/nodes/core/common/21-debug.js   | 28 +++++++++++++++++--
 .../nodes/core/common/lib/debug/view.html     |  1 +
 3 files changed, 37 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 3ea4ede73..fc65753bf 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
@@ -129,6 +129,14 @@ module.exports = {
             }
 
             themeContext.page.title = theme.page.title || themeContext.page.title;
+
+            // Store the resolved urls to these resources so nodes (such as Debug)
+            // can access them
+            theme.page._ = {
+                css: themeContext.page.css,
+                scripts: themeContext.page.scripts,
+                favicon: themeContext.page.favicon
+            }
         }
 
         if (theme.header) {
@@ -223,6 +231,7 @@ module.exports = {
                         themePlugin.path
                     );
                     themeContext.page.css = cssFiles.concat(themeContext.page.css || [])
+                    theme.page._.css = cssFiles.concat(theme.page._.css || [])
                 }
                 if (themePlugin.scripts) {
                     const scriptFiles = serveFilesFromTheme(
@@ -232,6 +241,7 @@ module.exports = {
                         themePlugin.path
                     )
                     themeContext.page.scripts = scriptFiles.concat(themeContext.page.scripts || [])
+                    theme.page._.scripts = cssFiles.concat(theme.page._.scripts || [])
                 }
             }
             activeThemeInitialised = true;
diff --git a/packages/node_modules/@node-red/nodes/core/common/21-debug.js b/packages/node_modules/@node-red/nodes/core/common/21-debug.js
index 0e00a8fff..8d2121580 100644
--- a/packages/node_modules/@node-red/nodes/core/common/21-debug.js
+++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.js
@@ -2,7 +2,8 @@ module.exports = function(RED) {
     "use strict";
     var util = require("util");
     var events = require("events");
-    //var path = require("path");
+    const fs = require("fs-extra");
+    const path = require("path");
     var debuglength = RED.settings.debugMaxLength || 1000;
     var useColors = RED.settings.debugUseColors || false;
     util.inspect.styles.boolean = "red";
@@ -249,11 +250,34 @@ module.exports = function(RED) {
         }
     });
 
+    let cachedDebugView;
+    RED.httpAdmin.get("/debug/view/view.html", function(req,res) {
+        if (!cachedDebugView) {
+            fs.readFile(path.join(__dirname,"lib","debug","view.html")).then(data => {
+                let customStyles = "";
+                try {
+                    let customStyleList = RED.settings.editorTheme.page._.css || [];
+                    customStyleList.forEach(style => {
+                        customStyles += `<link rel="stylesheet" href="../../${style}">\n`
+                    })
+                } catch(err) {}
+                cachedDebugView = data.toString().replace("<!-- INSERT-THEME-CSS -->",customStyles)
+                res.set('Content-Type', 'text/html');
+                res.send(cachedDebugView).end();
+            }).catch(err => {
+                res.sendStatus(404);
+            })
+        } else {
+            res.send(cachedDebugView).end();
+        }
+
+    });
+
     // As debug/view/debug-utils.js is loaded via <script> tag, it won't get
     // the auth header attached. So do not use RED.auth.needsPermission here.
     RED.httpAdmin.get("/debug/view/*",function(req,res) {
         var options = {
-            root: __dirname + '/lib/debug/',
+            root: path.join(__dirname,"lib","debug"),
             dotfiles: 'deny'
         };
         res.sendFile(req.params[0], options);
diff --git a/packages/node_modules/@node-red/nodes/core/common/lib/debug/view.html b/packages/node_modules/@node-red/nodes/core/common/lib/debug/view.html
index 3f0bdcfa1..5a07e3779 100644
--- a/packages/node_modules/@node-red/nodes/core/common/lib/debug/view.html
+++ b/packages/node_modules/@node-red/nodes/core/common/lib/debug/view.html
@@ -2,6 +2,7 @@
 <head>
     <link rel="stylesheet" href="../../red/style.min.css">
     <link rel="stylesheet" href="../../vendor/font-awesome/css/font-awesome.min.css">
+    <!-- INSERT-THEME-CSS -->
     <title>Node-RED Debug Tools</title>
 </head>
 <body class="red-ui-editor red-ui-debug-window">