@flowfuse/nr-launcher 2.31.3 → 2.31.4-5ccdf52-202606300926.0

package/lib/admin.js

@@ -148,6 +148,7 @@ class AdminInterface {
                             await launcher.start(request.body.safe ? States.SAFE : States.RUNNING)
                         } catch (error) {
                             await launcher.logAuditEvent('start-failed', { error })
+                            return response.status(500).send({ error: error.message })
                         }
                         response.send({})
                     }, 2000)
@@ -157,6 +158,7 @@ class AdminInterface {
                         await launcher.start(request.body.safe ? States.SAFE : States.RUNNING)
                     } catch (error) {
                         await launcher.logAuditEvent('start-failed', { error })
+                        return response.status(500).send({ error: error.message })
                     }
                     response.send({})
                 } else {

package/lib/runtimeSettings.js

@@ -265,6 +265,21 @@ function getSettingsFile (settings) {
             },`
         }
     }
+    // Load via page.scripts so they run regardless of active theme; branding is dropped for non-FlowFuse themes.
+    const requestedTheme = projectSettings.theme
+    const themeCommonDir = path.join(__dirname, 'theme', 'common')
+    const pageScripts = [path.join(themeCommonDir, 'forge-platform.js')]
+    if (!requestedTheme || ['forge', 'forge-light', 'forge-dark'].includes(requestedTheme)) {
+        pageScripts.push(path.join(themeCommonDir, 'forge-branding.js'))
+    }
+    projectSettings.page_scripts = `scripts: ${JSON.stringify(pageScripts)},`
+    // launcher values shared by the flowfuse-common plugin settings and the legacy theme settings
+    const ffSettings = {
+        launcherVersion: settings.launcherVersion,
+        projectURL: `${settings.forgeURL}/instance/${settings.projectID}`
+    }
+    projectSettings.flowfuseCommonSettings = `"flowfuse-common": ${JSON.stringify(ffSettings)},`
+
     if (projectSettings.theme) {
         const nrMajor = parseInt((settings.nodeRedVersion || '0.0.0').split('.')[0], 10) || 0
         let activeTheme = projectSettings.theme
@@ -279,12 +294,7 @@ function getSettingsFile (settings) {
             activeTheme = 'forge-light'
         }
 
-        const themeSettings = {
-            launcherVersion: settings.launcherVersion,
-            forgeURL: settings.forgeURL,
-            projectURL: `${settings.forgeURL}/instance/${settings.projectID}`
-        }
-        projectSettings.themeSettings = `"${activeTheme}": ${JSON.stringify(themeSettings)},`
+        projectSettings.themeSettings = `"${activeTheme}": ${JSON.stringify(ffSettings)},`
         projectSettings.theme = `theme: '${activeTheme}',`
     }
 
@@ -419,10 +429,12 @@ module.exports = {
     },
     ${nodesDir}
     ${projectSettings.themeSettings || ''}
+    ${projectSettings.flowfuseCommonSettings || ''}
     editorTheme: {
         ${projectSettings.theme}
         page: {
             title: '${projectSettings.page_title}',
+            ${projectSettings.page_scripts || ''}
             ${projectSettings.page_favicon}
         },
         header: {

package/lib/theme/common/flowfuse-common.js

@@ -0,0 +1,8 @@
+module.exports = function (RED) {
+    RED.plugins.registerPlugin('flowfuse-common', {
+        settings: {
+            launcherVersion: { exportable: true },
+            projectURL: { exportable: true }
+        }
+    })
+}

package/lib/theme/common/forge-branding.js

@@ -0,0 +1,69 @@
+(function () {
+    /* global RED, $ */
+    // Favicon and menu items; runtimeSettings.js omits this script for non-FlowFuse (OEM) themes. Uses helpers from forge-platform.js.
+    function changeFavicon (src) {
+        const link = document.createElement('link')
+        const oldLink = $('link[href="favicon.ico"]')[0] || $('#dynamic-favicon')[0]
+        link.id = 'dynamic-favicon'
+        link.rel = 'shortcut icon'
+        link.href = src
+        if (oldLink) {
+            document.head.removeChild(oldLink)
+        }
+        document.head.appendChild(link)
+    }
+
+    window.addEventListener('load', (_event) => {
+        const favicon32 = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAADzUlEQVR4AcXB206UVxzG4d+71jcbBmYGpjJIg2iHiNYEJaSKrQe4QeMNcOaR11BP2wuwV2JvQSMkxFAiGk1Q8UCjAoJsAkgRZuZb/wJtk6YtuEN4Ht3o7f0B+AXoBhy7w4Bh4FoEXAe+Z3cJ6AauO+Ake+c7B0TsHe/YY44495thjjj0WsdvMMNaZsSHiC7MQwAwkXBSZT6eJ0ml8MmlyziK+ADODEPDJpNU0N1t9qUT94cPkWlvJNDaSzGbxqZTkHBE7yOIYeU/d/v2h2NVFc3c3De3tShcKOO/Ffynic5lhIRDV1FjhyBFr6emh+dQpMk1NTs7xPhGfyEJgQyqft6auLjt48SL7OjqUyGTER4j4CBYCmOGiyOpaWqz59GlrPXdO9W1tcomEeB8z4nLZqqurhEoFC4HI4pgtSWyQc/h02moKBWtob2f/yZNW7OxUTWOjl8R24nLZlicnbe7RI+bHxmx5fFxri4vE5bIsBKJvr1wxzLAQYlsnkLx38t58MkmUTiuZy1Hb1ERtc7PSDQ3Ie8d2zHg3N2dTd++GicFBzY+NaW1hQRbHbJLYJBF1XL3q+FPEZ7I4tsUXL+xVf79NDA7q7fi4s2pVcg4k5D3/FrEDQqVibx48CC9v3tTUyIhW5+cd6+Qc8p7tOHZAqFRs8flz5p8+ZW1hQZghiQ8RsQOiTMYd6evj4IUL9np4OLy8dYu5x49VXVkRziGJrUTjAwO2KYQYEOvknJP35hMJ+XSaVD5PuqFByWwWeS+2kC4U9M3lyzrQ02Ozo6M2PjAQpu/d08rMjKxaFRKS2CSxQb9euhTMTJgZGyQEQjIknPf4VIp0Q4PlDh2i8cQJKx4/rrqWFrkoEtuwEOz36WmbffjQ3ty/r4Vnz1hbWFB1dZVQrWIhoBu9vQEQ2zHDzMAMOUe6ULB9HR124OxZip2dSmaz4j0sBKssL7O2tGSVt2+prKwQl8tEfAgJSfzt3fy8Xt2+rck7d6y+rc1az5+3r8+cobZYdEj8HzmnZC5HMpcT/+D7SqWfAPERJCHnsBC0MjOj6ZERvR4asnczMyFRV0cqn0feiw/g+0qlnwHxiSSxYW1xUbOjo25icJD5J08slMuWqKsjUVODnBNbiNghco4N5aUlTQwOanJoyGqLRQpHj9pXx46FfKmkTLFIMpuVT6Vw3oNzROw0CXkPZlqemmJ5clIv+/uJUilLZrOk8nlL5nJEmQw+kSACYsDxBUgC79kQl8tamZ1lZWZGmPGX2AHD7BJJyDnkPfIeeX/XAdeAO0Bg9wTgN+DHPwAIHJAeMJ00fgAAAABJRU5ErkJggg=='
+        changeFavicon(favicon32)
+
+        const ff = window.FlowFuse || {}
+
+        const addMenuItems = function () {
+            if (!RED || document.querySelector('#usermenu-item-ffsite')) { return }
+            const settings = (RED.settings && RED.settings['flowfuse-common']) || {}
+
+            RED.menu.addItem('red-ui-header-button-sidemenu', null) // menu seperator
+            RED.menu.addItem('red-ui-header-button-sidemenu', {
+                id: 'usermenu-item-ffsite',
+                label: 'About FlowFuse',
+                onselect: function () {
+                    ff.navigateTo('https://flowfuse.com/')
+                }
+            })
+            const projectURL = ff.getProjectURL ? ff.getProjectURL() : ''
+            if (projectURL) {
+                RED.menu.addItem('red-ui-header-button-sidemenu', {
+                    id: 'usermenu-item-ffmain',
+                    label: 'FlowFuse Application',
+                    onselect: function () {
+                        ff.navigateTo(projectURL)
+                    }
+                })
+            }
+            if (settings.launcherVersion) {
+                RED.menu.addItem('red-ui-header-button-sidemenu', {
+                    id: 'usermenu-item-fflv',
+                    label: 'FlowFuse Launcher v' + settings.launcherVersion,
+                    onselect: function () {
+                        // do nothing
+                    }
+                })
+            }
+        }
+
+        // Add now if the menu button already exists; otherwise add it once Node-RED inserts it.
+        if (document.querySelector('#red-ui-header-button-sidemenu')) {
+            addMenuItems()
+        } else {
+            const observer = new MutationObserver(function () {
+                if (document.querySelector('#red-ui-header-button-sidemenu')) {
+                    observer.disconnect()
+                    addMenuItems()
+                }
+            })
+            observer.observe(document.querySelector('#red-ui-header') || document.body, { childList: true, subtree: true })
+            setTimeout(function () { observer.disconnect() }, 30000)
+        }
+    })
+})()

package/lib/theme/common/forge-platform.js

@@ -0,0 +1,59 @@
+(function () {
+    /* global RED, $ */
+    // Navigation interception and iframe messaging; loaded via editorTheme.page.scripts so it runs regardless of active theme.
+    const context = {
+        isEmbedded: window.parent !== window.self,
+        shouldEmitInsteadOfRedirect: false
+    }
+    const navigateTo = (url) => {
+        if (context.shouldEmitInsteadOfRedirect) {
+            window.parent.postMessage({
+                type: 'navigate',
+                payload: url
+            }, '*')
+        } else {
+            window.location = url
+        }
+    }
+    // falls back to the project link in the header when flowfuse-common settings are absent
+    const getProjectURL = () => {
+        const settings = (typeof RED !== 'undefined' && RED.settings && RED.settings['flowfuse-common']) || {}
+        if (settings.projectURL) {
+            return settings.projectURL
+        }
+        const img = $('#red-ui-header > span > a > img')
+        const ownerHref = img.parent().prop('href')
+        if (ownerHref && /http[s]*:\/\/.*\/project\/\w+-\w+-\w+-\w+-\w+.*/.test(ownerHref)) {
+            return ownerHref
+        }
+        return ''
+    }
+    document.addEventListener('click', (e) => {
+        if (e.target.closest('#usermenu-item-logout')) {
+            e.preventDefault()
+            e.stopPropagation()
+            if (context.shouldEmitInsteadOfRedirect) {
+                window.parent.postMessage({ type: 'logout' }, '*')
+            }
+            return
+        }
+        if (e.target.closest('.red-ui-header-logo a')) {
+            e.preventDefault()
+            navigateTo(getProjectURL())
+        }
+    }, true)
+
+    function handleMessage (event) {
+        if (event.data && event.data.type === 'prevent-redirect') {
+            context.shouldEmitInsteadOfRedirect = event.data.payload
+        }
+    }
+
+    if (context.isEmbedded) {
+        window.parent.postMessage({ type: 'load', payload: true }, '*')
+        window.addEventListener('message', handleMessage)
+    }
+
+    // shared with forge-branding.js
+    window.FlowFuse = Object.assign(window.FlowFuse || {}, { navigateTo, getProjectURL })
+})()

package/lib/theme/forge/forge.js

@@ -13,9 +13,6 @@ module.exports = function (RED) {
     RED.plugins.registerPlugin('forge', {
         type: 'node-red-theme',
         schemes: ['light', 'dark'],
-        scripts: [
-            'lib/theme/forge/forge-common.js'
-        ],
         css: [
             'lib/theme/forge/forge.css'
         ],

package/lib/theme/forge-dark/forge-dark.js

@@ -12,10 +12,6 @@ module.exports = function (RED) {
 
     RED.plugins.registerPlugin('forge-dark', {
         type: 'node-red-theme',
-        scripts: [
-            'lib/theme/common/forge-common.js'
-            // /* optional */ 'lib/theme/forge-dark/forge-dark-custom.js'
-        ],
         css: [
             'lib/theme/common/forge-common.css',
             'lib/theme/forge-dark/forge-dark-theme.css'

package/lib/theme/forge-light/forge-light.js

@@ -12,10 +12,6 @@ module.exports = function (RED) {
 
     RED.plugins.registerPlugin('forge-light', {
         type: 'node-red-theme',
-        scripts: [
-            'lib/theme/common/forge-common.js'
-            // /* optional */ 'lib/theme/forge-light/forge-light-custom.js'
-        ],
         css: [
             'lib/theme/common/forge-common.css',
             'lib/theme/forge-light/forge-light-theme.css'

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/nr-launcher",
-    "version": "2.31.3",
+    "version": "2.31.4-5ccdf52-202606300926.0",
     "description": "FlowFuse Launcher for running Node-RED",
     "exports": {
         "./auditLogger": "./lib/auditLogger/index.js",
@@ -13,6 +13,7 @@
     "node-red": {
         "plugins": {
             "flowfuse-auth": "lib/auth/httpAuthPlugin.js",
+            "flowfuse-common": "lib/theme/common/flowfuse-common.js",
             "flowfuse-library": "lib/storage/libraryPlugin.js",
             "flowfuse-blueprint-library": "lib/storage/blueprintPlugin.js",
             "forge-light": "lib/theme/forge-light/forge-light.js",
@@ -47,12 +48,12 @@
     },
     "homepage": "https://github.com/FlowFuse/nr-launcher#readme",
     "dependencies": {
-        "@flowfuse/nr-assistant": "^0.16.0",
-        "@flowfuse/nr-file-nodes": "^0.0.10",
-        "@flowfuse/nr-mqtt-nodes": "^0.3.0",
-        "@flowfuse/nr-project-nodes": "^0.7.8",
+        "@flowfuse/nr-assistant": "0.16.1-4db3964-202606261214.0",
+        "@flowfuse/nr-file-nodes": "0.0.11-cc0b339-202606241506.0",
+        "@flowfuse/nr-mqtt-nodes": "0.3.1-69e7b9c-202606220918.0",
+        "@flowfuse/nr-project-nodes": "0.7.9-783c2eb-202606241244.0",
         "@flowfuse/nr-subflow-export": "^1.0.2",
-        "@flowfuse/nr-tables-nodes": "^0.2.2",
+        "@flowfuse/nr-tables-nodes": "0.2.3-fe7d48f-202606220919.0",
         "@node-red/util": "^3.1.0",
         "body-parser": "^1.20.2",
         "bytes": "^3.1.2",

package/lib/theme/common/forge-common.js

@@ -1,125 +0,0 @@
-(function () {
-    /* global RED, $ */
-    // monitorInsertion: derived from https://github.com/naugtur/insertionQuery/blob/master/insQ.min.js (MIT License Copyright (c) 2014-present Zbyszek Tenerowicz <naugtur@gmail.com>)
-    // eslint-disable-next-line
-    document.head = (document.head || document.getElementsByTagName('head')[0]);
-    // eslint-disable-next-line
-    const monitorInsertion = (function () { 'use strict'; let m = 100; let t = !1; let u = 'animationName'; let d = ''; const n = 'Webkit Moz O ms Khtml'.split(' '); let e = ''; const i = document.createElement('div'); const s = { strictlyNew: !0, timeout: 20, addImportant: !1 }; if (i.style.animationName && (t = !0), !1 === t) for (let o = 0; o < n.length; o++) if (void 0 !== i.style[n[o] + 'AnimationName']) { e = n[o], u = e + 'AnimationName', d = '-' + e.toLowerCase() + '-', t = !0; break } function c (t) { return s.strictlyNew && !0 === t.QinsQ } function r (t, n) { function e (t) { t.animationName !== o && t[u] !== o || c(t.target) || n(t.target) } let i; var o = 'insQ_' + m++; const r = s.addImportant ? ' !important' : ''; (i = document.createElement('style')).innerHTML = '@' + d + 'keyframes ' + o + ' {  from {  outline: 1px solid transparent  } to {  outline: 0px solid transparent }  }\n' + t + ' { animation-duration: 0.001s' + r + '; animation-name: ' + o + r + '; ' + d + 'animation-duration: 0.001s' + r + '; ' + d + 'animation-name: ' + o + r + ';  } ', document.head.appendChild(i); const a = setTimeout(function () { document.addEventListener('animationstart', e, !1), document.addEventListener('MSAnimationStart', e, !1), document.addEventListener('webkitAnimationStart', e, !1) }, s.timeout); return { destroy: function () { clearTimeout(a), i && (document.head.removeChild(i), i = null), document.removeEventListener('animationstart', e), document.removeEventListener('MSAnimationStart', e), document.removeEventListener('webkitAnimationStart', e) } } } function a (t) { t.QinsQ = !0 } function f (t) { if (t) for (a(t), t = t.firstChild; t; t = t.nextSibling) void 0 !== t && t.nodeType === 1 && f(t) } function l (t, n) { let e; let i = []; const o = function () { clearTimeout(e), e = setTimeout(function () { i.forEach(f), n(i), i = [] }, 10) }; return r(t, function (t) { if (!c(t)) { a(t); const n = (function t (n) { return c(n.parentNode) || n.nodeName === 'BODY' ? n : t(n.parentNode) }(t)); i.indexOf(n) < 0 && i.push(n), o() } }) } function v (n) { return !(!t || !n.match(/[^{}]/)) && (s.strictlyNew && f(document.body), { every: function (t) { return r(n, t) }, summary: function (t) { return l(n, t) } }) } return v.config = function (t) { for (const n in t)t.hasOwnProperty(n) && (s[n] = t[n]) }, v }()); typeof module !== 'undefined' && void 0 !== module.exports && (module.exports = monitorInsertion)
-    const context = {
-        isEmbedded: window.parent !== window.self,
-        shouldEmitInsteadOfRedirect: false
-    }
-    const navigateTo = (url) => {
-        if (context.shouldEmitInsteadOfRedirect) {
-            window.parent.postMessage({
-                type: 'navigate',
-                payload: url
-            }, '*')
-        } else {
-            window.location = url
-        }
-    }
-    const interceptLogoClick = (url) => {
-        const logoAnchor = document.querySelector('#red-ui-header > .red-ui-header-logo > a')
-
-        if (logoAnchor) {
-            logoAnchor.addEventListener(
-                'click',
-                (e) => {
-                    e.preventDefault()
-                    navigateTo(url)
-                })
-        }
-    }
-    const interceptLogOutClick = (url) => {
-        document.querySelector('#usermenu-item-logout')
-            .addEventListener('click', (e) => {
-                e.preventDefault()
-                e.stopPropagation()
-                if (context.shouldEmitInsteadOfRedirect) {
-                    window.parent.postMessage({
-                        type: 'logout'
-                    }, '*')
-                }
-            })
-    }
-
-    function changeFavicon (src) {
-        const link = document.createElement('link')
-        const oldLink = $('link[href="favicon.ico"]')[0] || $('#dynamic-favicon"]')[0]
-        link.id = 'dynamic-favicon'
-        link.rel = 'shortcut icon'
-        link.href = src
-        if (oldLink) {
-            document.head.removeChild(oldLink)
-        }
-        document.head.appendChild(link)
-    }
-
-    function handleMessage (event) {
-        if (event.data.type === 'prevent-redirect') {
-            context.shouldEmitInsteadOfRedirect = event.data.payload
-        }
-    }
-
-    if (context.isEmbedded) {
-        window.parent.postMessage({ type: 'load', payload: true }, '*')
-        window.addEventListener('message', handleMessage)
-    }
-
-    window.addEventListener('load', (_event) => {
-        // set favicon
-        const favicon32 = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAADzUlEQVR4AcXB206UVxzG4d+71jcbBmYGpjJIg2iHiNYEJaSKrQe4QeMNcOaR11BP2wuwV2JvQSMkxFAiGk1Q8UCjAoJsAkgRZuZb/wJtk6YtuEN4Ht3o7f0B+AXoBhy7w4Bh4FoEXAe+Z3cJ6AauO+Ake+c7B0TsHe/YY4495thjjj0WsdvMMNaZsSHiC7MQwAwkXBSZT6eJ0ml8MmlyziK+ADODEPDJpNU0N1t9qUT94cPkWlvJNDaSzGbxqZTkHBE7yOIYeU/d/v2h2NVFc3c3De3tShcKOO/Ffynic5lhIRDV1FjhyBFr6emh+dQpMk1NTs7xPhGfyEJgQyqft6auLjt48SL7OjqUyGTER4j4CBYCmOGiyOpaWqz59GlrPXdO9W1tcomEeB8z4nLZqqurhEoFC4HI4pgtSWyQc/h02moKBWtob2f/yZNW7OxUTWOjl8R24nLZlicnbe7RI+bHxmx5fFxri4vE5bIsBKJvr1wxzLAQYlsnkLx38t58MkmUTiuZy1Hb1ERtc7PSDQ3Ie8d2zHg3N2dTd++GicFBzY+NaW1hQRbHbJLYJBF1XL3q+FPEZ7I4tsUXL+xVf79NDA7q7fi4s2pVcg4k5D3/FrEDQqVibx48CC9v3tTUyIhW5+cd6+Qc8p7tOHZAqFRs8flz5p8+ZW1hQZghiQ8RsQOiTMYd6evj4IUL9np4OLy8dYu5x49VXVkRziGJrUTjAwO2KYQYEOvknJP35hMJ+XSaVD5PuqFByWwWeS+2kC4U9M3lyzrQ02Ozo6M2PjAQpu/d08rMjKxaFRKS2CSxQb9euhTMTJgZGyQEQjIknPf4VIp0Q4PlDh2i8cQJKx4/rrqWFrkoEtuwEOz36WmbffjQ3ty/r4Vnz1hbWFB1dZVQrWIhoBu9vQEQ2zHDzMAMOUe6ULB9HR124OxZip2dSmaz4j0sBKssL7O2tGSVt2+prKwQl8tEfAgJSfzt3fy8Xt2+rck7d6y+rc1az5+3r8+cobZYdEj8HzmnZC5HMpcT/+D7SqWfAPERJCHnsBC0MjOj6ZERvR4asnczMyFRV0cqn0feiw/g+0qlnwHxiSSxYW1xUbOjo25icJD5J08slMuWqKsjUVODnBNbiNghco4N5aUlTQwOanJoyGqLRQpHj9pXx46FfKmkTLFIMpuVT6Vw3oNzROw0CXkPZlqemmJ5clIv+/uJUilLZrOk8nlL5nJEmQw+kSACYsDxBUgC79kQl8tamZ1lZWZGmPGX2AHD7BJJyDnkPfIeeX/XAdeAO0Bg9wTgN+DHPwAIHJAeMJ00fgAAAABJRU5ErkJggg=='
-        changeFavicon(favicon32)
-
-        // monitor #red-ui-header-button-sidemenu & add main menu entries
-        monitorInsertion('#red-ui-header-button-sidemenu').summary(function (_arrayOfInsertedNodes) {
-            if (!RED) { return }
-
-            RED.menu.addItem('red-ui-header-button-sidemenu', null) // menu seperator
-            // add main menu item "About FlowFuse"
-            RED.menu.addItem('red-ui-header-button-sidemenu', {
-                id: 'usermenu-item-ffsite',
-                label: 'About FlowFuse',
-                onselect: function () {
-                    navigateTo('https://flowfuse.com/')
-                }
-            })
-            // gather info from settings and page - prep for next 2 menu items
-            const ffThemeSettings = RED.settings['forge-light'] || RED.settings['forge-dark']
-            let projectURL = ''
-            if (ffThemeSettings && ffThemeSettings.projectURL) {
-                projectURL = ffThemeSettings.projectURL
-            } else {
-                const img = $('#red-ui-header > span > a > img')
-                const ownerHref = img.parent().prop('href')
-                // Test the URL is FlowFuse Project alike
-                if (ownerHref && /http[s]*:\/\/.*\/project\/\w+-\w+-\w+-\w+-\w+.*/.test(ownerHref)) {
-                    projectURL = ownerHref
-                }
-            }
-            // if projectURL is present, show link to project in main menu
-            if (projectURL) {
-                RED.menu.addItem('red-ui-header-button-sidemenu', {
-                    id: 'usermenu-item-ffmain',
-                    label: 'FlowFuse Application',
-                    onselect: function () {
-                        navigateTo(projectURL)
-                    }
-                })
-            }
-            // if theme settings are present, add launcher version entry in main menu
-            if (ffThemeSettings && ffThemeSettings.launcherVersion) {
-                RED.menu.addItem('red-ui-header-button-sidemenu', {
-                    id: 'usermenu-item-fflv',
-                    label: 'FlowFuse Launcher v' + ffThemeSettings.launcherVersion,
-                    onselect: function () {
-                        // do nothing
-                    }
-                })
-            }
-            interceptLogOutClick()
-            interceptLogoClick(projectURL)
-        })
-    })
-})()

package/lib/theme/forge/forge-common.js

@@ -1,125 +0,0 @@
-(function () {
-    /* global RED, $ */
-    // monitorInsertion: derived from https://github.com/naugtur/insertionQuery/blob/master/insQ.min.js (MIT License Copyright (c) 2014-present Zbyszek Tenerowicz <naugtur@gmail.com>)
-    // eslint-disable-next-line
-    document.head = (document.head || document.getElementsByTagName('head')[0]);
-    // eslint-disable-next-line
-    const monitorInsertion = (function () { 'use strict'; let m = 100; let t = !1; let u = 'animationName'; let d = ''; const n = 'Webkit Moz O ms Khtml'.split(' '); let e = ''; const i = document.createElement('div'); const s = { strictlyNew: !0, timeout: 20, addImportant: !1 }; if (i.style.animationName && (t = !0), !1 === t) for (let o = 0; o < n.length; o++) if (void 0 !== i.style[n[o] + 'AnimationName']) { e = n[o], u = e + 'AnimationName', d = '-' + e.toLowerCase() + '-', t = !0; break } function c (t) { return s.strictlyNew && !0 === t.QinsQ } function r (t, n) { function e (t) { t.animationName !== o && t[u] !== o || c(t.target) || n(t.target) } let i; var o = 'insQ_' + m++; const r = s.addImportant ? ' !important' : ''; (i = document.createElement('style')).innerHTML = '@' + d + 'keyframes ' + o + ' {  from {  outline: 1px solid transparent  } to {  outline: 0px solid transparent }  }\n' + t + ' { animation-duration: 0.001s' + r + '; animation-name: ' + o + r + '; ' + d + 'animation-duration: 0.001s' + r + '; ' + d + 'animation-name: ' + o + r + ';  } ', document.head.appendChild(i); const a = setTimeout(function () { document.addEventListener('animationstart', e, !1), document.addEventListener('MSAnimationStart', e, !1), document.addEventListener('webkitAnimationStart', e, !1) }, s.timeout); return { destroy: function () { clearTimeout(a), i && (document.head.removeChild(i), i = null), document.removeEventListener('animationstart', e), document.removeEventListener('MSAnimationStart', e), document.removeEventListener('webkitAnimationStart', e) } } } function a (t) { t.QinsQ = !0 } function f (t) { if (t) for (a(t), t = t.firstChild; t; t = t.nextSibling) void 0 !== t && t.nodeType === 1 && f(t) } function l (t, n) { let e; let i = []; const o = function () { clearTimeout(e), e = setTimeout(function () { i.forEach(f), n(i), i = [] }, 10) }; return r(t, function (t) { if (!c(t)) { a(t); const n = (function t (n) { return c(n.parentNode) || n.nodeName === 'BODY' ? n : t(n.parentNode) }(t)); i.indexOf(n) < 0 && i.push(n), o() } }) } function v (n) { return !(!t || !n.match(/[^{}]/)) && (s.strictlyNew && f(document.body), { every: function (t) { return r(n, t) }, summary: function (t) { return l(n, t) } }) } return v.config = function (t) { for (const n in t)t.hasOwnProperty(n) && (s[n] = t[n]) }, v }()); typeof module !== 'undefined' && void 0 !== module.exports && (module.exports = monitorInsertion)
-    const context = {
-        isEmbedded: window.parent !== window.self,
-        shouldEmitInsteadOfRedirect: false
-    }
-    const navigateTo = (url) => {
-        if (context.isEmbedded) {
-            window.parent.postMessage({
-                type: 'navigate',
-                payload: url
-            }, '*')
-        } else {
-            window.location = url
-        }
-    }
-    const interceptLogoClick = (url) => {
-        const logoAnchor = document.querySelector('.red-ui-header-logo a')
-
-        if (logoAnchor) {
-            logoAnchor.addEventListener(
-                'click',
-                (e) => {
-                    e.preventDefault()
-                    navigateTo(url)
-                })
-        }
-    }
-    const interceptLogOutClick = (url) => {
-        document.querySelector('#usermenu-item-logout')
-            .addEventListener('click', (e) => {
-                e.preventDefault()
-                e.stopPropagation()
-                if (context.shouldEmitInsteadOfRedirect) {
-                    window.parent.postMessage({
-                        type: 'logout'
-                    }, '*')
-                }
-            })
-    }
-
-    function changeFavicon (src) {
-        const link = document.createElement('link')
-        const oldLink = $('link[href="favicon.ico"]')[0] || $('#dynamic-favicon"]')[0]
-        link.id = 'dynamic-favicon'
-        link.rel = 'shortcut icon'
-        link.href = src
-        if (oldLink) {
-            document.head.removeChild(oldLink)
-        }
-        document.head.appendChild(link)
-    }
-
-    function handleMessage (event) {
-        if (event.data.type === 'prevent-redirect') {
-            context.shouldEmitInsteadOfRedirect = event.data.payload
-        }
-    }
-
-    if (context.isEmbedded) {
-        window.parent.postMessage({ type: 'load', payload: true }, '*')
-        window.addEventListener('message', handleMessage)
-    }
-
-    window.addEventListener('load', (_event) => {
-        // set favicon
-        const favicon32 = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAADzUlEQVR4AcXB206UVxzG4d+71jcbBmYGpjJIg2iHiNYEJaSKrQe4QeMNcOaR11BP2wuwV2JvQSMkxFAiGk1Q8UCjAoJsAkgRZuZb/wJtk6YtuEN4Ht3o7f0B+AXoBhy7w4Bh4FoEXAe+Z3cJ6AauO+Ake+c7B0TsHe/YY4495thjjj0WsdvMMNaZsSHiC7MQwAwkXBSZT6eJ0ml8MmlyziK+ADODEPDJpNU0N1t9qUT94cPkWlvJNDaSzGbxqZTkHBE7yOIYeU/d/v2h2NVFc3c3De3tShcKOO/Ffynic5lhIRDV1FjhyBFr6emh+dQpMk1NTs7xPhGfyEJgQyqft6auLjt48SL7OjqUyGTER4j4CBYCmOGiyOpaWqz59GlrPXdO9W1tcomEeB8z4nLZqqurhEoFC4HI4pgtSWyQc/h02moKBWtob2f/yZNW7OxUTWOjl8R24nLZlicnbe7RI+bHxmx5fFxri4vE5bIsBKJvr1wxzLAQYlsnkLx38t58MkmUTiuZy1Hb1ERtc7PSDQ3Ie8d2zHg3N2dTd++GicFBzY+NaW1hQRbHbJLYJBF1XL3q+FPEZ7I4tsUXL+xVf79NDA7q7fi4s2pVcg4k5D3/FrEDQqVibx48CC9v3tTUyIhW5+cd6+Qc8p7tOHZAqFRs8flz5p8+ZW1hQZghiQ8RsQOiTMYd6evj4IUL9np4OLy8dYu5x49VXVkRziGJrUTjAwO2KYQYEOvknJP35hMJ+XSaVD5PuqFByWwWeS+2kC4U9M3lyzrQ02Ozo6M2PjAQpu/d08rMjKxaFRKS2CSxQb9euhTMTJgZGyQEQjIknPf4VIp0Q4PlDh2i8cQJKx4/rrqWFrkoEtuwEOz36WmbffjQ3ty/r4Vnz1hbWFB1dZVQrWIhoBu9vQEQ2zHDzMAMOUe6ULB9HR124OxZip2dSmaz4j0sBKssL7O2tGSVt2+prKwQl8tEfAgJSfzt3fy8Xt2+rck7d6y+rc1az5+3r8+cobZYdEj8HzmnZC5HMpcT/+D7SqWfAPERJCHnsBC0MjOj6ZERvR4asnczMyFRV0cqn0feiw/g+0qlnwHxiSSxYW1xUbOjo25icJD5J08slMuWqKsjUVODnBNbiNghco4N5aUlTQwOanJoyGqLRQpHj9pXx46FfKmkTLFIMpuVT6Vw3oNzROw0CXkPZlqemmJ5clIv+/uJUilLZrOk8nlL5nJEmQw+kSACYsDxBUgC79kQl8tamZ1lZWZGmPGX2AHD7BJJyDnkPfIeeX/XAdeAO0Bg9wTgN+DHPwAIHJAeMJ00fgAAAABJRU5ErkJggg=='
-        changeFavicon(favicon32)
-
-        // monitor #red-ui-header-button-sidemenu & add main menu entries
-        monitorInsertion('#red-ui-header-button-sidemenu').summary(function (_arrayOfInsertedNodes) {
-            if (!RED) { return }
-
-            RED.menu.addItem('red-ui-header-button-sidemenu', null) // menu seperator
-            // add main menu item "About FlowFuse"
-            RED.menu.addItem('red-ui-header-button-sidemenu', {
-                id: 'usermenu-item-ffsite',
-                label: 'About FlowFuse',
-                onselect: function () {
-                    navigateTo('https://flowfuse.com/')
-                }
-            })
-            // gather info from settings and page - prep for next 2 menu items
-            const ffThemeSettings = RED.settings['forge']
-            let projectURL = ''
-            if (ffThemeSettings && ffThemeSettings.projectURL) {
-                projectURL = ffThemeSettings.projectURL
-            } else {
-                const img = $('#red-ui-header > span > a > img')
-                const ownerHref = img.parent().prop('href')
-                // Test the URL is FlowFuse Project alike
-                if (ownerHref && /http[s]*:\/\/.*\/project\/\w+-\w+-\w+-\w+-\w+.*/.test(ownerHref)) {
-                    projectURL = ownerHref
-                }
-            }
-            // if projectURL is present, show link to project in main menu
-            if (projectURL) {
-                RED.menu.addItem('red-ui-header-button-sidemenu', {
-                    id: 'usermenu-item-ffmain',
-                    label: 'FlowFuse Application',
-                    onselect: function () {
-                        navigateTo(projectURL)
-                    }
-                })
-            }
-            // if theme settings are present, add launcher version entry in main menu
-            if (ffThemeSettings && ffThemeSettings.launcherVersion) {
-                RED.menu.addItem('red-ui-header-button-sidemenu', {
-                    id: 'usermenu-item-fflv',
-                    label: 'FlowFuse Launcher v' + ffThemeSettings.launcherVersion,
-                    onselect: function () {
-                        // do nothing
-                    }
-                })
-            }
-            interceptLogOutClick()
-            interceptLogoClick(projectURL)
-        })
-    })
-})()