Merge pull request #4941 from GogoVega/fix-4599

Fix import of module list

packages/node_modules/@node-red/editor-client/locales/en-US/editor.json

@@ -265,6 +265,8 @@
         "download": "Download",
         "importUnrecognised": "Imported unrecognised type:",
         "importUnrecognised_plural": "Imported unrecognised types:",
+        "importWithModuleInfo": "Required dependencies missing",
+        "importWithModuleInfoDesc": "These nodes are not currently installed in your palette and are required for the imported flow:",
         "importDuplicate": "Imported duplicate node:",
         "importDuplicate_plural": "Imported duplicate nodes:",
         "nodesExported": "Nodes exported to clipboard",

packages/node_modules/@node-red/editor-client/src/js/multiplayer.js

@@ -164,7 +164,7 @@ RED.multiplayer = (function () {
                         $(this).show()
                     }
                 })
-                if (users.length < maxShown + 1) {
+                if (users.length < maxShown + 1) { 
                     userCountIcon.hide()
                 } else {
                     userCountSpan.text('+'+(users.length - maxShown))
@@ -365,12 +365,12 @@ RED.multiplayer = (function () {
                 border.setAttribute("r",radius/2);
                 border.setAttribute("class", "red-ui-multiplayer-annotation-border")
                 group.appendChild(border)
-
+          
 
 
                 return group
             }
-
+            
             RED.view.annotations.register("red-ui-multiplayer",{
                 type: 'badge',
                 align: 'left',
@@ -411,7 +411,7 @@ RED.multiplayer = (function () {
             // } else {
                 log('Session ID', activeSessionId)
             // }
-
+            
             headerWidget = $('<li><ul id="red-ui-multiplayer-user-list"></ul></li>').prependTo('.red-ui-header-toolbar')
 
             RED.comms.on('connect', () => {
@@ -422,9 +422,6 @@ RED.multiplayer = (function () {
                 if (location.workspace !== 0) {
                     connectInfo.location = location
                 }
-                if (localStorage.getItem("multiplayer-name") !== undefined && localStorage.getItem("multiplayer-name").length >0) {
-                    connectInfo.name = localStorage.getItem("multiplayer-name");
-                }
                 RED.comms.send('multiplayer/connect', connectInfo)
             })
             RED.comms.subscribe('multiplayer/#', (topic, msg) => {

packages/node_modules/@node-red/editor-client/src/js/nodes.js

@@ -1474,7 +1474,12 @@ RED.nodes = (function() {
     /**
      * Converts the current node selection to an exportable JSON Object
      **/
-    function createExportableNodeSet(set, exportedIds, exportedSubflows, exportedConfigNodes) {
+    function createExportableNodeSet(set, {
+        exportedIds,
+        exportedSubflows,
+        exportedConfigNodes,
+        includeModuleConfig = false
+    } = {}) {
         var nns = [];
 
         exportedIds = exportedIds || {};
@@ -1508,7 +1513,7 @@ RED.nodes = (function() {
                     subflowSet = subflowSet.concat(RED.nodes.junctions(subflowId))
                     subflowSet = subflowSet.concat(RED.nodes.groups(subflowId))
 
-                    var exportableSubflow = createExportableNodeSet(subflowSet, exportedIds, exportedSubflows, exportedConfigNodes);
+                    var exportableSubflow = createExportableNodeSet(subflowSet, { exportedIds, exportedSubflows, exportedConfigNodes });
                     nns = exportableSubflow.concat(nns);
                 }
             }
@@ -1543,19 +1548,23 @@ RED.nodes = (function() {
                 }
                 nns.push(convertedNode);
                 if (node.type === "group") {
-                    nns = nns.concat(createExportableNodeSet(node.nodes, exportedIds, exportedSubflows, exportedConfigNodes));
+                    nns = nns.concat(createExportableNodeSet(node.nodes, { exportedIds, exportedSubflows, exportedConfigNodes }));
                 }
             } else {
                 var convertedSubflow = convertSubflow(node, { credentials: false });
                 nns.push(convertedSubflow);
             }
         }
+        if (includeModuleConfig) {
+            updateGlobalConfigModuleList(nns)
+        }
         return nns;
     }
 
     // Create the Flow JSON for the current configuration
     // opts.credentials (whether to include (known) credentials) - default: true
     // opts.dimensions (whether to include node dimensions) - default: false
+    // opts.includeModuleConfig (whether to include modules) - default: false
     function createCompleteNodeSet(opts) {
         var nns = [];
         var i;
@@ -1587,6 +1596,9 @@ RED.nodes = (function() {
         RED.nodes.eachNode(function(n) {
             nns.push(convertNode(n, opts));
         })
+        if (opts?.includeModuleConfig) {
+            updateGlobalConfigModuleList(nns);
+        }
         return nns;
     }
 
@@ -1802,6 +1814,7 @@ RED.nodes = (function() {
      *       - id:import - import as-is
      *       - id:copy - import with new id
      *       - id:replace - import over the top of existing
+     *  - modules: map of module:version - hints for unknown nodes
      */
     function importNodes(newNodesObj,options) { // createNewIds,createMissingWorkspace) {
         const defOpts = { generateIds: false, addFlow: false, markChanged: false, reimport: false, importMap: {} }
@@ -1937,12 +1950,54 @@ RED.nodes = (function() {
 
         }
         if (!isInitialLoad && unknownTypes.length > 0) {
-            var typeList = $("<ul>");
-            unknownTypes.forEach(function(t) {
-                $("<li>").text(t).appendTo(typeList);
-            })
-            typeList = typeList[0].outerHTML;
-            RED.notify("<p>"+RED._("clipboard.importUnrecognised",{count:unknownTypes.length})+"</p>"+typeList,"error",false,10000);
+            const notificationOptions = {
+                type: "error",
+                fixed: false,
+                timeout: 10000,
+            }
+            let unknownNotification
+            if (options.modules) {
+                notificationOptions.fixed = true
+                delete notificationOptions.timeout
+                // We have module hint list from imported global-config
+                // Provide option to install missing modules
+                notificationOptions.buttons = [
+                    {
+                        text: "Manage dependencies",
+                        class:"primary",
+                        click: function(e) {
+                            unknownNotification.close();
+
+                            RED.actions.invoke('core:manage-palette', {
+                                view: 'install',
+                                filter: '"' + Object.keys(options.modules).join('", "') + '"'
+                            }) 
+                        }
+                    }
+                ]
+                let moduleList = $("<ul>");
+                Object.keys(options.modules).forEach(function(t) {
+                    $("<li>").text(t).appendTo(moduleList);
+                })
+                moduleList = moduleList[0].outerHTML;
+                unknownNotification = RED.notify(
+                    "<p>"+RED._("clipboard.importWithModuleInfo")+"</p>"+
+                    "<p>"+RED._("clipboard.importWithModuleInfoDesc")+"</p>"+
+                    moduleList,
+                    notificationOptions
+                );
+            } else {
+                var typeList = $("<ul>");
+                unknownTypes.forEach(function(t) {
+                    $("<li>").text(t).appendTo(typeList);
+                })
+                typeList = typeList[0].outerHTML;
+                
+                unknownNotification = RED.notify(
+                    "<p>"+RED._("clipboard.importUnrecognised",{count:unknownTypes.length})+"</p>"+typeList,
+                    notificationOptions
+                );
+            }
         }
 
         var activeWorkspace = RED.workspaces.active();
@@ -2310,6 +2365,9 @@ RED.nodes = (function() {
                                     delete node.z;
                                 }
                             }
+                            const unknownTypeDef = RED.nodes.getType('unknown')
+                            node._def.oneditprepare = unknownTypeDef.oneditprepare
+
                             var orig = {};
                             for (var p in n) {
                                 if (n.hasOwnProperty(p) && p!="x" && p!="y" && p!="z" && p!="id" && p!="wires") {
@@ -2319,6 +2377,10 @@ RED.nodes = (function() {
                             node._orig = orig;
                             node.name = n.type;
                             node.type = "unknown";
+                            if (options.modules) {
+                                // We have a module hint list. Attach to the unknown node so we can reference it later
+                                node.modules = Object.keys(options.modules)
+                            }
                         }
                         if (node._def.category != "config") {
                             if (n.hasOwnProperty('inputs')) {
@@ -2931,7 +2993,33 @@ RED.nodes = (function() {
             }
         }
     }
-
+    function getModuleListForNodes(nodes) {
+        const modules = {}
+        nodes.forEach(n => {
+            const nodeSet = RED.nodes.registry.getNodeSetForType(n.type)
+            if (nodeSet) {
+                modules[nodeSet.module] = nodeSet.version
+            }
+        })
+        return modules
+    }
+    function updateGlobalConfigModuleList(nodes) {
+        const modules = getModuleListForNodes(nodes)
+        delete modules['node-red']
+        const hasModules = (Object.keys(modules).length > 0)
+        let globalConfigNode = nodes.find(n => n.type === 'global-config')
+        if (!globalConfigNode && hasModules) {
+            globalConfigNode = {
+                id: RED.nodes.id(),
+                type: 'global-config',
+                env: [],
+                modules
+            }
+            nodes.push(globalConfigNode)
+        } else if (globalConfigNode) {
+            globalConfigNode.modules = modules
+        }
+    }
     return {
         init: function() {
             RED.events.on("registry:node-type-added",function(type) {

packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js

@@ -730,7 +730,7 @@ RED.clipboard = (function() {
                     nodes = RED.view.selection().nodes||[];
                 }
                 // Don't include the subflow meta-port nodes in the exported selection
-                nodes = RED.nodes.createExportableNodeSet(nodes.filter(function(n) { return n.type !== 'subflow'}));
+                nodes = RED.nodes.createExportableNodeSet(nodes.filter(function(n) { return n.type !== 'subflow'}), { includeModuleConfig: true });
             } else if (type === 'flow') {
                 var activeWorkspace = RED.workspaces.active();
                 nodes = RED.nodes.groups(activeWorkspace);
@@ -745,9 +745,9 @@ RED.clipboard = (function() {
                 });
                 var parentNode = RED.nodes.workspace(activeWorkspace)||RED.nodes.subflow(activeWorkspace);
                 nodes.unshift(parentNode);
-                nodes = RED.nodes.createExportableNodeSet(nodes);
+                nodes = RED.nodes.createExportableNodeSet(nodes, { includeModuleConfig: true });
             } else if (type === 'full') {
-                nodes = RED.nodes.createCompleteNodeSet({ credentials: false });
+                nodes = RED.nodes.createCompleteNodeSet({ credentials: false, includeModuleConfig: true });
             }
             if (nodes !== null) {
                 if (format === "red-ui-clipboard-dialog-export-fmt-full") {
@@ -848,7 +848,7 @@ RED.clipboard = (function() {
                     children: []
                 };
                 treeSubflows.push(subflows[node.id])
-            } else {
+            } else if (node.type !== 'global-config') {
                 nodes.push(node);
             }
         });

packages/node_modules/@node-red/editor-client/src/js/ui/env-var.js

@@ -33,8 +33,7 @@ RED.envVar = (function() {
                 id: RED.nodes.id(),
                 type: "global-config",
                 env: [],
-                name: "global-config",
-                label: "",
+                modules: {},
                 hasUsers: false,
                 users: [],
                 credentials: cred,

packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js

@@ -625,8 +625,20 @@ RED.palette.editor = (function() {
             }
         })
 
-        RED.actions.add("core:manage-palette",function() {
+        RED.actions.add("core:manage-palette", function(opts) {
                 RED.userSettings.show('palette');
+                if (opts) {
+                    if (opts.view) {
+                        editorTabs.activateTab(opts.view);
+                    }
+                    if (opts.filter) {
+                        if (opts.view === 'install') {
+                            searchInput.searchBox('value', opts.filter)
+                        } else if (opts.view === 'nodes') {
+                            filterInput.searchBox('value', opts.filter)
+                        }
+                    }
+                }
             });
 
         RED.events.on('registry:module-updated', function(ns) {
@@ -982,8 +994,35 @@ RED.palette.editor = (function() {
                 change: function() {
                     var searchTerm = $(this).val().trim().toLowerCase();
                     if (searchTerm.length > 0 || loadedList.length < 20) {
+                        const searchTerms = []
+                        searchTerm.split(',').forEach(term => {
+                            term = term.trim()
+                            if (term) {
+                                const isExact = term[0] === '"' && term[term.length-1] === '"'
+                                searchTerms.push({
+                                    exact: isExact,
+                                    term: isExact ? term.substring(1,term.length-1) : term
+                                })
+                            }
+                        })
                         filteredList = loadedList.filter(function(m) {
-                            return (m.index.indexOf(searchTerm) > -1);
+                            for (let i = 0; i < searchTerms.length; i++) {
+                                const location = m.index.indexOf(searchTerms[i].term)
+                                if (
+                                    (
+                                        searchTerms[i].exact &&
+                                        (
+                                            location === 0 && (
+                                                m.index.length === searchTerms[i].term.length ||
+                                                m.index[searchTerms[i].term.length] === ','
+                                            )
+                                        )
+                                     ) ||
+                                     (!searchTerms[i].exact && location > -1)) {
+                                        return true
+                                     }
+                            }
+                            return false
                         }).map(function(f) { return {info:f}});
                         refreshFilteredItems();
                         searchInput.searchBox('count',filteredList.length+" / "+loadedList.length);

packages/node_modules/@node-red/editor-client/src/js/ui/view.js

@@ -5664,27 +5664,50 @@ RED.view = (function() {
                 activeSubflowChanged = activeSubflow.changed;
             }
             var filteredNodesToImport = nodesToImport;
-            var globalConfig = null;
-            var gconf = null;
+            var importedGlobalConfig = null;
+            var existingGlobalConfig = null;
 
             RED.nodes.eachConfig(function (conf) {
                 if (conf.type === "global-config") {
-                    gconf = conf;
+                    existingGlobalConfig = conf;
                 }
             });
-            if (gconf) {
+            if (existingGlobalConfig) {
                 filteredNodesToImport = nodesToImport.filter(function (n) {
-                    return (n.type !== "global-config");
+                    if (n.type === "global-config") {
+                        importedGlobalConfig = n
+                        // Do not import it if one exists
+                        // The properties of this one will be merged after import
+                        return false
+                    }
+                    return true
                 });
-                globalConfig = nodesToImport.find(function (n) {
-                    return (n.type === "global-config");
+            } else {
+                filteredNodesToImport = nodesToImport.filter(function (n) {
+                    if (n.type === "global-config") {
+                        importedGlobalConfig = n
+                        if (n.env && n.env.length) {
+                            // No existing global-config
+                            // Contains env and maybe modules, so import it
+                            return true
+                        }
+                        // Contains modules only - do not import it
+                        return false
+                    }
+                    return true
                 });
             }
+
+            const modules = importedGlobalConfig?.modules || {}
+            // Ensure do not import modules - since it can contain it
+            delete importedGlobalConfig?.modules
+
             var result = RED.nodes.import(filteredNodesToImport,{
                 generateIds: options.generateIds,
                 addFlow: addNewFlow,
                 importMap: options.importMap,
-                markChanged: true
+                markChanged: true,
+                modules: modules
             });
             if (result) {
                 var new_nodes = result.nodes;
@@ -5808,38 +5831,38 @@ RED.view = (function() {
                     }
                 }
 
-                if (globalConfig) {
+                if (importedGlobalConfig && existingGlobalConfig) {
                     // merge global env to existing global-config
-                    var env0 = gconf.env;
-                    var env1 = globalConfig.env;
-                    var newEnv = Array.from(env0);
+                    var existingEnv = existingGlobalConfig.env || [];
+                    var importedEnv = importedGlobalConfig.env || []
+                    var newEnv = Array.from(existingEnv);
                     var changed = false;
 
-                    env1.forEach(function (item1) {
-                        var index = newEnv.findIndex(function (item0) {
-                            return (item0.name === item1.name);
+                    importedEnv.forEach(function (importedItem) {
+                        var index = newEnv.findIndex(function (existingItem) {
+                            return (existingItem.name === importedItem.name);
                         });
                         if (index >= 0) {
-                            var item0 = newEnv[index];
-                            if ((item0.type !== item1.type) ||
-                                (item0.value !== item1.value)) {
-                                newEnv[index] = item1;
+                            const existingItem = newEnv[index];
+                            if ((existingItem.type !== importedItem.type) ||
+                                (existingItem.value !== importedItem.value)) {
+                                newEnv[index] = importedItem;
                                 changed = true;
                             }
                         }
                         else {
-                            newEnv.push(item1);
+                            newEnv.push(importedItem);
                             changed = true;
                         }
                     });
-                    if(changed) {
-                        gconf.env = newEnv;
+                    if (changed) {
+                        existingGlobalConfig.env = newEnv;
                         var replaceEvent = {
                             t: "edit",
-                            node: gconf,
+                            node: existingGlobalConfig,
                             changed: true,
                             changes: {
-                                env: env0
+                                env: existingEnv
                             }
                         };
                         historyEvent = {

packages/node_modules/@node-red/nodes/core/common/20-inject.html

@@ -46,12 +46,12 @@
 
     <div class="form-row inject-time-row hidden" id="inject-time-row-interval">
         <span data-i18n="inject.every"></span>
-        <input id="inject-time-interval-count" class="inject-time-count" value="1">
+        <input id="inject-time-interval-count" class="inject-time-count" value="1"></input>
         <select style="width:100px" id="inject-time-interval-units">
             <option value="s" data-i18n="inject.seconds"></option>
             <option value="m" data-i18n="inject.minutes"></option>
             <option value="h" data-i18n="inject.hours"></option>
-        </select><br>
+        </select><br/>
     </div>
 
     <div class="form-row inject-time-row hidden" id="inject-time-row-interval-time">
@@ -68,46 +68,46 @@
             <option value="20">20</option>
             <option value="30">30</option>
             <option value="0">60</option>
-        </select> <span data-i18n="inject.minutes"></span><br>
+        </select> <span data-i18n="inject.minutes"></span><br/>
         <span data-i18n="inject.between"></span> <select id="inject-time-interval-time-start" class="inject-time-times"></select>
-        <span data-i18n="inject.and"></span> <select id="inject-time-interval-time-end" class="inject-time-times"></select><br>
+        <span data-i18n="inject.and"></span> <select id="inject-time-interval-time-end" class="inject-time-times"></select><br/>
         <div id="inject-time-interval-time-days" class="inject-time-days" style="margin-top:5px">
             <div style="display:inline-block; vertical-align:top; margin-right:5px;" data-i18n="inject.on">on</div>
             <div style="display:inline-block;">
                 <div>
-                    <label><input type='checkbox' checked value='1'> <span data-i18n="inject.days.0"></span></label>
-                    <label><input type='checkbox' checked value='2'> <span data-i18n="inject.days.1"></span></label>
-                    <label><input type='checkbox' checked value='3'> <span data-i18n="inject.days.2"></span></label>
+                    <label><input type='checkbox' checked value='1'/> <span data-i18n="inject.days.0"></span></label>
+                    <label><input type='checkbox' checked value='2'/> <span data-i18n="inject.days.1"></span></label>
+                    <label><input type='checkbox' checked value='3'/> <span data-i18n="inject.days.2"></span></label>
                 </div>
                 <div>
-                    <label><input type='checkbox' checked value='4'> <span data-i18n="inject.days.3"></span></label>
-                    <label><input type='checkbox' checked value='5'> <span data-i18n="inject.days.4"></span></label>
-                    <label><input type='checkbox' checked value='6'> <span data-i18n="inject.days.5"></span></label>
+                    <label><input type='checkbox' checked value='4'/> <span data-i18n="inject.days.3"></span></label>
+                    <label><input type='checkbox' checked value='5'/> <span data-i18n="inject.days.4"></span></label>
+                    <label><input type='checkbox' checked value='6'/> <span data-i18n="inject.days.5"></span></label>
                 </div>
                 <div>
-                    <label><input type='checkbox' checked value='0'> <span data-i18n="inject.days.6"></span></label>
+                    <label><input type='checkbox' checked value='0'/> <span data-i18n="inject.days.6"></span></label>
                 </div>
             </div>
         </div>
     </div>
 
     <div class="form-row inject-time-row hidden" id="inject-time-row-time">
-        <span data-i18n="inject.at"></span> <input type="text" id="inject-time-time" value="12:00"><br>
+        <span data-i18n="inject.at"></span> <input type="text" id="inject-time-time" value="12:00"></input><br/>
         <div id="inject-time-time-days" class="inject-time-days">
             <div style="display:inline-block; vertical-align:top; margin-right:5px;" data-i18n="inject.on"></div>
             <div style="display:inline-block;">
                 <div>
-                    <label><input type='checkbox' checked value='1'> <span data-i18n="inject.days.0"></span></label>
-                    <label><input type='checkbox' checked value='2'> <span data-i18n="inject.days.1"></span></label>
-                    <label><input type='checkbox' checked value='3'> <span data-i18n="inject.days.2"></span></label>
+                    <label><input type='checkbox' checked value='1'/> <span data-i18n="inject.days.0"></span></label>
+                    <label><input type='checkbox' checked value='2'/> <span data-i18n="inject.days.1"></span></label>
+                    <label><input type='checkbox' checked value='3'/> <span data-i18n="inject.days.2"></span></label>
                 </div>
                 <div>
-                    <label><input type='checkbox' checked value='4'> <span data-i18n="inject.days.3"></span></label>
-                    <label><input type='checkbox' checked value='5'> <span data-i18n="inject.days.4"></span></label>
-                    <label><input type='checkbox' checked value='6'> <span data-i18n="inject.days.5"></span></label>
+                    <label><input type='checkbox' checked value='4'/> <span data-i18n="inject.days.3"></span></label>
+                    <label><input type='checkbox' checked value='5'/> <span data-i18n="inject.days.4"></span></label>
+                    <label><input type='checkbox' checked value='6'/> <span data-i18n="inject.days.5"></span></label>
                 </div>
                 <div>
-                    <label><input type='checkbox' checked value='0'> <span data-i18n="inject.days.6"></span></label>
+                    <label><input type='checkbox' checked value='0'/> <span data-i18n="inject.days.6"></span></label>
                 </div>
             </div>
         </div>

packages/node_modules/@node-red/nodes/core/common/91-global-config.html

@@ -11,12 +11,13 @@
     RED.nodes.registerType('global-config',{
         category: 'config',
         defaults: {
-            name: { value: "" },
             env: { value: [] },
+            modules: { value: {} }
         },
         credentials: {
             map: { type: "map" }
         },
+        label: 'global-config',
         oneditprepare: function() {
             $('#node-input-edit-env-var').on('click', function(evt) {
                 RED.actions.invoke('core:show-user-settings', 'envvar')

packages/node_modules/@node-red/nodes/core/common/98-unknown.html

@@ -1,14 +1,22 @@
 
 <script type="text/html" data-template-name="unknown">
-    <div class="form-tips"><span data-i18n="[html]unknown.tip"></span></div>
+    <div class="form-tips">
+        <span data-i18n="[html]unknown.tip"></span>
+        <p id="unknown-module-known">
+            <button id="unknown-manage-dependencies" class="red-ui-button">Manage dependencies</button>
+        </p>
+    </div>
+    </div>
+    
 </script>
 
 <script type="text/javascript">
-    RED.nodes.registerType('unknown',{
+    RED.nodes.registerType('unknown', {
         category: 'unknown',
-        color:"#fff0f0",
+        color:"#fff000",
         defaults: {
-            name: {value:""}
+            name: {value:""},
+            modules: { value: [] }
         },
         inputs:1,
         outputs:1,
@@ -18,6 +26,20 @@
         },
         labelStyle: function() {
             return "node_label_unknown";
+        },
+        oneditprepare: function () {
+            const node = this
+            if (this.modules && this.modules.length > 0) {
+                $('#unknown-manage-dependencies').on('click', function () {
+                    RED.actions.invoke('core:cancel-edit-tray')
+                    RED.actions.invoke('core:manage-palette', {
+                        view: 'install',
+                        filter: '"' + node.modules.join('", "') + '"'
+                    })
+                })
+            } else {
+                $('#unknown-module-known').hide()
+            }
         }
     });
 </script>

packages/node_modules/@node-red/nodes/core/function/10-switch.html

@@ -21,8 +21,8 @@
     </div>
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="switch.label.property"></span></label>
-        <input type="text" id="node-input-property" style="width: calc(100% - 105px)">
-        <input type="hidden" id="node-input-outputs">
+        <input type="text" id="node-input-property" style="width: calc(100% - 105px)"/>
+        <input type="hidden" id="node-input-outputs"/>
     </div>
     <div class="form-row node-input-rule-container-row">
         <ol id="node-input-rule-container"></ol>
@@ -35,7 +35,7 @@
     </div>
     <div class="form-row">
         <input type="checkbox" id="node-input-repair" style="display: inline-block; width: auto; vertical-align: top;">
-        <label style="width: auto;" for="node-input-repair"><span data-i18n="switch.label.repair"></span></label>
+        <label style="width: auto;" for="node-input-repair"><span data-i18n="switch.label.repair"></span></label></input>
     </div>
 </script>
 

packages/node_modules/@node-red/nodes/core/function/16-range.html

@@ -2,7 +2,7 @@
 <script type="text/html" data-template-name="range">
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="common.label.property"></span></label>
-        <input type="text" id="node-input-property" style="width:calc(70% - 1px)">
+        <input type="text" id="node-input-property" style="width:calc(70% - 1px)"/>
     </div>
     <div class="form-row">
         <label for="node-input-action"><i class="fa fa-dot-circle-o"></i> <span data-i18n="range.label.action"></span></label>
@@ -13,23 +13,23 @@
             <option value="drop" data-i18n="range.scale.drop"></option>
         </select>
     </div>
-    <br>
+    <br/>
     <div class="form-row"><i class="fa fa-sign-in"></i> <span data-i18n="range.label.inputrange"></span>:</div>
     <div class="form-row"><label></label>
-        <span data-i18n="range.label.from"></span>: <input type="text" id="node-input-minin" data-i18n="[placeholder]range.placeholder.min" style="width:100px;">
-        &nbsp;&nbsp;<span data-i18n="range.label.to"></span>: <input type="text" id="node-input-maxin" data-i18n="[placeholder]range.placeholder.maxin" style="width:100px;">
+        <span data-i18n="range.label.from"></span>: <input type="text" id="node-input-minin" data-i18n="[placeholder]range.placeholder.min" style="width:100px;"/>
+        &nbsp;&nbsp;<span data-i18n="range.label.to"></span>: <input type="text" id="node-input-maxin" data-i18n="[placeholder]range.placeholder.maxin" style="width:100px;"/>
     </div>
     <div class="form-row"><i class="fa fa-sign-out"></i> <span data-i18n="range.label.resultrange"></span>:</div>
     <div class="form-row"><label></label>
-        <span data-i18n="range.label.from"></span>: <input type="text" id="node-input-minout" data-i18n="[placeholder]range.placeholder.min" style="width:100px;">
-        &nbsp;&nbsp;<span data-i18n="range.label.to"></span>: <input type="text" id="node-input-maxout" data-i18n="[placeholder]range.placeholder.maxout" style="width:100px;">
+        <span data-i18n="range.label.from"></span>: <input type="text" id="node-input-minout" data-i18n="[placeholder]range.placeholder.min" style="width:100px;"/>
+        &nbsp;&nbsp;<span data-i18n="range.label.to"></span>: <input type="text" id="node-input-maxout" data-i18n="[placeholder]range.placeholder.maxout" style="width:100px;"/>
     </div>
-    <br>
+    <br/>
     <div class="form-row"><label></label>
         <input type="checkbox" id="node-input-round" style="display: inline-block; width: auto; vertical-align: top;">
-        <label style="width: auto;" for="node-input-round"><span data-i18n="range.label.roundresult"></span></label>
+        <label style="width: auto;" for="node-input-round"><span data-i18n="range.label.roundresult"></span></label></input>
     </div>
-    <br>
+    <br/>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">

packages/node_modules/@node-red/nodes/core/function/89-trigger.html

@@ -63,7 +63,7 @@
             <li><span data-i18n="trigger.label.resetPayload"></span> <input type="text" id="node-input-reset" style="width:150px" data-i18n="[placeholder]trigger.label.resetprompt"></li>
         </ul>
     </div>
-    <br>
+    <br/>
     <div class="form-row">
         <label data-i18n="trigger.for" for="node-input-bytopic"></label>
         <select id="node-input-bytopic" style="width:120px;">
@@ -71,12 +71,12 @@
             <option value="topic" data-i18n="trigger.bytopics"></option>
         </select>
         <span class="form-row" id="node-stream-topic">
-            <input type="text" id="node-input-topic" style="width:46%;">
+            <input type="text" id="node-input-topic" style="width:46%;"/>
         </span>
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
+        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name"></input>
         <input type="hidden" id="node-input-outputs" value="1">
     </div>
 </script>

packages/node_modules/@node-red/nodes/core/function/rbe.html

@@ -25,7 +25,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
-        <input type="text" id="node-input-property" style="width:70%;">
+        <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
     <div class="form-row" style="margin-bottom: 0px;">
         <label> </label>
@@ -34,7 +34,7 @@
     </div>
     <div class="form-row">
         <label> </label>
-        <input type="text" id="node-input-topi"  style="width:70%;">
+        <input type="text" id="node-input-topi"  style="width:70%;"/>
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="rbe.label.name"></span></label>

packages/node_modules/@node-red/nodes/core/network/31-tcpin.html

@@ -50,7 +50,7 @@
     </div>
 
     <div id="node-row-newline" class="form-row hidden" style="padding-left:110px;">
-        <span data-i18n="tcpin.label.delimited"></span> <input type="text" id="node-input-newline" style="width:110px;" data-i18n="[placeholder]tcpin.label.optional"><br>
+        <span data-i18n="tcpin.label.delimited"></span> <input type="text" id="node-input-newline" style="width:110px;" data-i18n="[placeholder]tcpin.label.optional"><br/>
         <input type="checkbox" id="node-input-trim" style="display:inline-block; width:auto; vertical-align:top;"> <span data-i18n="tcpin.label.reattach"></span>
     </div>
 
@@ -317,7 +317,7 @@
         <span id="node-units"></span>
     </div>
     <div id="node-row-newline" class="form-row hidden" style="padding-left:162px;">
-        <span data-i18n="tcpin.label.delimited"></span> <input type="text" id="node-input-newline" style="width:110px;" data-i18n="[placeholder]tcpin.label.optional"><br>
+        <span data-i18n="tcpin.label.delimited"></span> <input type="text" id="node-input-newline" style="width:110px;" data-i18n="[placeholder]tcpin.label.optional"><br/>
         <input type="checkbox" id="node-input-trim" style="display:inline-block; width:auto; vertical-align:top;"> <span data-i18n="tcpin.label.reattach"></span>
     </div>
     <div class="form-row">

packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html

@@ -35,21 +35,21 @@
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
     </div>
-    <hr align="middle">
+    <hr align="middle"/>
     <div class="form-row">
         <label style="width:100%;"><span data-i18n="csv.label.c2o"></span></label>
     </div>
     <div class="form-row" style="padding-left:20px;">
         <label><i class="fa fa-sign-in"></i> <span data-i18n="csv.label.input"></span></label>
-        <span data-i18n="csv.label.skip-s"></span>&nbsp;<input type="text" id="node-input-skip" style="width:40px; height:25px;">&nbsp;<span data-i18n="csv.label.skip-e"></span><br>
+        <span data-i18n="csv.label.skip-s"></span>&nbsp;<input type="text" id="node-input-skip" style="width:40px; height:25px;"/>&nbsp;<span data-i18n="csv.label.skip-e"></span><br/>
         <label>&nbsp;</label>
-        <input style="width:20px; vertical-align:baseline; margin-right:5px;" type="checkbox" id="node-input-hdrin"><label style="width:auto; margin-top:7px;" for="node-input-hdrin"><span data-i18n="csv.label.firstrow"></span></label><br>
+        <input style="width:20px; vertical-align:baseline; margin-right:5px;" type="checkbox" id="node-input-hdrin"><label style="width:auto; margin-top:7px;" for="node-input-hdrin"><span data-i18n="csv.label.firstrow"></span></label><br/>
         <label>&nbsp;</label>
-        <input style="width:20px; vertical-align:baseline; margin-right:5px;" type="checkbox" id="node-input-strings"><label style="width:auto; margin-top:7px;" for="node-input-strings"><span data-i18n="csv.label.usestrings"></span></label><br>
+        <input style="width:20px; vertical-align:baseline; margin-right:5px;" type="checkbox" id="node-input-strings"><label style="width:auto; margin-top:7px;" for="node-input-strings"><span data-i18n="csv.label.usestrings"></span></label><br/>
         <label>&nbsp;</label>
-        <input style="width:20px; vertical-align:baseline; margin-right:5px;" type="checkbox" id="node-input-include_empty_strings"><label style="width:auto; margin-top:7px;" for="node-input-include_empty_strings"><span data-i18n="csv.label.include_empty_strings"></span></label><br>
+        <input style="width:20px; vertical-align:baseline; margin-right:5px;" type="checkbox" id="node-input-include_empty_strings"><label style="width:auto; margin-top:7px;" for="node-input-include_empty_strings"><span data-i18n="csv.label.include_empty_strings"></span></label><br/>
         <label>&nbsp;</label>
-        <input style="width:20px; vertical-align:baseline; margin-right:5px;" type="checkbox" id="node-input-include_null_values"><label style="width:auto; margin-top:7px;" for="node-input-include_null_values"><span data-i18n="csv.label.include_null_values"></span></label><br>
+        <input style="width:20px; vertical-align:baseline; margin-right:5px;" type="checkbox" id="node-input-include_null_values"><label style="width:auto; margin-top:7px;" for="node-input-include_null_values"><span data-i18n="csv.label.include_null_values"></span></label><br/>
     </div>
     <div class="form-row" style="padding-left:20px;">
         <label><i class="fa fa-sign-out"></i> <span data-i18n="csv.label.output"></span></label>

packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html

@@ -33,7 +33,7 @@
         <label for="node-input-chr" style="width: 230px;"><i class="fa fa-tag"></i> <span data-i18n="html.label.prefix"></span></label>
         <input type="text" id="node-input-chr" style="text-align:center; width: 40px;" placeholder="_">
     </div>
-    <br>
+    <br/>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" style="width:70%" data-i18n="[placeholder]common.label.name">

packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html

@@ -10,13 +10,13 @@
     </div>
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="json.label.property"></span></label>
-        <input type="text" id="node-input-property" style="width:70%;">
+        <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
     </div>
-    <hr align="middle">
+    <hr align="middle"/>
     <div class="form-row node-json-to-json-options">
         <label style="width:100%;"><span data-i18n="json.label.o2j"></span></label>
     </div>

packages/node_modules/@node-red/nodes/core/parsers/70-XML.html

@@ -2,13 +2,13 @@
 <script type="text/html" data-template-name="xml">
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="common.label.property"></span></label>
-        <input type="text" id="node-input-property" style="width:70%;">
+        <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
     </div>
-    <hr align="middle">
+    <hr align="middle"/>
     <div class="form-row">
         <label style="width:100%;"><span data-i18n="xml.label.x2o"></span></label>
     </div>

packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html

@@ -2,7 +2,7 @@
 <script type="text/html" data-template-name="yaml">
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="common.label.property"></span></label>
-        <input type="text" id="node-input-property" style="width:70%;">
+        <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>

packages/node_modules/@node-red/nodes/core/sequence/17-split.html

@@ -22,7 +22,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-forward"></i> <span data-i18n="split.splitThe"></span></label>
-        <input type="text" id="node-input-property" style="width:70%;">
+        <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
     <div class="form-row"><span data-i18n="[html]split.strBuff"></span></div>
     <div class="form-row">
@@ -202,7 +202,7 @@
         <div class="form-row">
             <label>&nbsp;</label>
             <input type="checkbox" id="node-input-reduceRight" style="display:inline-block; width:auto; vertical-align:top; margin-left:10px;">
-            <label for="node-input-reduceRight" data-i18n="join.reduce.right" style="width:70%; margin-left:10px;"></label>
+            <label for="node-input-reduceRight" style="width:70%;" data-i18n="join.reduce.right" style="margin-left:10px;"/>
         </div>
     </div>
     <div class="form-tips form-tips-auto hide" data-i18n="[html]join.tip"></div>

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

@@ -42,7 +42,7 @@ module.exports = {
                 let user = opts.user
                 if (!user || user.anonymous) {
                     user = user || { anonymous: true }
-                    user.username = opts?.data?.name || `Anon ${Math.floor(Math.random()*100)}`
+                    user.username = `Anon ${Math.floor(Math.random()*100)}`
                 }
                 session = {
                     session: opts.data.session,