Fix linting

Add user presence indication to tabs and nodes
Merge branch 'master' into dev
2025-03-01 10:36:34 +00:00 · 2024-04-23 09:40:01 +02:00 · 2024-04-23 09:27:35 +02:00 · 2024-04-12 13:04:54 +01:00 · 2024-04-11 19:22:24 +01:00 · 2024-04-11 19:15:46 +01:00
56 changed files with 1675 additions and 331 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+#### 4.0.0-beta.2: Beta Release
+
+Editor
+
+ - Introduce multiplayer feature (#4629) @knolleary
+ - Separate the "add new config-node" option into a new (+) button (#4627) @GogoVega
+ - Retain Palette categories collapsed and filter to localStorage (#4634) @knolleary
+ - Ensure palette filter reapplies and clear up unknown categories (#4637) @knolleary
+ - Add support for plugin (only) modules to the palette manager (#4620) @knolleary
+ - Update monaco to latest and node types to 18 LTS (#4615) @Steve-Mcl
+
+Runtime
+
+ - Fix handling of subflow config-node select type in sf module (#4643) @knolleary
+ - Comms API updates (#4628) @knolleary
+ - Add French translations for 4.0.0-beta.1 (#4621) @GogoVega
+ - Add Japanese translations for 4.0.0-beta.1 (#4612) @kazuhitoyokoi
+
+Nodes
+ - Fix change node handling of replacing with boolean (#4639) @knolleary
+
 #### 4.0.0-beta.1: Beta Release

 Editor
@@ -29,6 +50,22 @@ Nodes
 - Let debug node status msg length be settable via settings (#4402) @dceejay
 - Feat: Add ability to set headers for WebSocket client (#4436) @marcus-j-davies

+#### 3.1.9: Maintenance Release
+
+ - Prevent subflow being added to itself (#4654) @knolleary
+ - Fix use of spawn on windows with cmd files (#4652) @knolleary
+ - Guard refresh of unknown subflow (#4640) @knolleary
+ - Fix subflow module sending messages to debug sidebar (#4642) @knolleary
+
+#### 3.1.8: Maintenance Release
+
+ - Add validation and error handling on subflow instance properties (#4632) @knolleary
+ - Hide import/export context menu if disabled in theme (#4633) @knolleary
+ - Show change indicator on subflow tabs (#4631) @knolleary
+ - Bump dependencies (#4630) @knolleary
+ - Reset workspace index when clearing nodes (#4619) @knolleary
+ - Remove typo in global config (#4613) @kazuhitoyokoi
+
 #### 3.1.7: Maintenance Release

 - Add Japanese translation for v3.1.6 (#4603) @kazuhitoyokoi
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -143,6 +143,7 @@ module.exports = function(grunt) {
                    "packages/node_modules/@node-red/editor-client/src/js/user.js",
                    "packages/node_modules/@node-red/editor-client/src/js/comms.js",
                    "packages/node_modules/@node-red/editor-client/src/js/runtime.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/multiplayer.js",
                    "packages/node_modules/@node-red/editor-client/src/js/text/bidi.js",
                    "packages/node_modules/@node-red/editor-client/src/js/text/format.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/state.js",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "node-red",
-    "version": "4.0.0-beta.1",
+    "version": "4.0.0-beta.2",
    "description": "Low-code programming for event-driven applications",
    "homepage": "https://nodered.org",
    "license": "Apache-2.0",
@@ -41,7 +41,7 @@
        "cors": "2.8.5",
        "cronosjs": "1.7.1",
        "denque": "2.1.0",
-        "express": "4.18.2",
+        "express": "4.19.2",
        "express-session": "1.17.3",
        "form-data": "4.0.0",
        "fs-extra": "11.1.1",
@@ -64,7 +64,7 @@
        "mqtt": "4.3.7",
        "multer": "1.4.5-lts.1",
        "mustache": "4.2.0",
-        "node-red-admin": "^3.1.2",
+        "node-red-admin": "^3.1.3",
        "node-watch": "0.7.4",
        "nopt": "5.0.0",
        "oauth2orize": "1.11.1",
@@ -74,7 +74,7 @@
        "passport-oauth2-client-password": "0.1.2",
        "raw-body": "2.5.2",
        "semver": "7.5.4",
-        "tar": "6.1.13",
+        "tar": "6.2.1",
        "tough-cookie": "4.1.3",
        "uglify-js": "3.17.4",
        "uuid": "9.0.0",
@@ -112,7 +112,7 @@
        "mermaid": "^10.4.0",
        "minami": "1.2.3",
        "mocha": "9.2.2",
-        "node-red-node-test-helper": "^0.3.2",
+        "node-red-node-test-helper": "^0.3.3",
        "nodemon": "2.0.20",
        "proxy": "^1.0.2",
        "sass": "1.62.1",
--- a/packages/node_modules/@node-red/editor-api/lib/editor/comms.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/comms.js
@@ -77,6 +77,53 @@ function CommsConnection(ws, user) {
        log.trace("comms.close "+self.session);
        removeActiveConnection(self);
    });
+
+    const handleAuthPacket = function(msg) {
+        Tokens.get(msg.auth).then(function(client) {
+            if (client) {
+                Users.get(client.user).then(function(user) {
+                    if (user) {
+                        self.user = user;
+                        log.audit({event: "comms.auth",user:self.user});
+                        completeConnection(msg, client.scope,msg.auth,true);
+                    } else {
+                        log.audit({event: "comms.auth.fail"});
+                        completeConnection(msg, null,null,false);
+                    }
+                });
+            } else {
+                Users.tokens(msg.auth).then(function(user) {
+                    if (user) {
+                        self.user = user;
+                        log.audit({event: "comms.auth",user:self.user});
+                        completeConnection(msg, user.permissions,msg.auth,true);
+                    } else {
+                        log.audit({event: "comms.auth.fail"});
+                        completeConnection(msg, null,null,false);
+                    }
+                });
+            }
+        });
+    }
+    const completeConnection = function(msg, userScope, session, sendAck) {
+        try {
+            if (!userScope || !Permissions.hasPermission(userScope,"status.read")) {
+                ws.send(JSON.stringify({auth:"fail"}));
+                ws.close();
+            } else {
+                pendingAuth = false;
+                addActiveConnection(self);
+                self.token = msg.auth;
+                if (sendAck) {
+                    ws.send(JSON.stringify({auth:"ok"}));
+                }
+            }
+        } catch(err) {
+            console.log(err.stack);
+            // Just in case the socket closes before we attempt
+            // to send anything.
+        }
+    }
    ws.on('message', function(data,flags) {
        var msg = null;
        try {
@@ -86,68 +133,34 @@ function CommsConnection(ws, user) {
            return;
        }
        if (!pendingAuth) {
-            if (msg.subscribe) {
+            if (msg.auth) {
+                handleAuthPacket(msg)
+            } else if (msg.subscribe) {
                self.subscribe(msg.subscribe);
                // handleRemoteSubscription(ws,msg.subscribe);
+            } else if (msg.topic) {
+                runtimeAPI.comms.receive({
+                    user: self.user,
+                    client: self,
+                    topic: msg.topic,
+                    data: msg.data
+                })
            }
        } else {
-            var completeConnection = function(userScope,session,sendAck) {
-                try {
-                    if (!userScope || !Permissions.hasPermission(userScope,"status.read")) {
-                        ws.send(JSON.stringify({auth:"fail"}));
-                        ws.close();
-                    } else {
-                        pendingAuth = false;
-                        addActiveConnection(self);
-                        self.token = msg.auth;
-                        if (sendAck) {
-                            ws.send(JSON.stringify({auth:"ok"}));
-                        }
-                    }
-                } catch(err) {
-                    console.log(err.stack);
-                    // Just in case the socket closes before we attempt
-                    // to send anything.
-                }
-            }
            if (msg.auth) {
-                Tokens.get(msg.auth).then(function(client) {
-                    if (client) {
-                        Users.get(client.user).then(function(user) {
-                            if (user) {
-                                self.user = user;
-                                log.audit({event: "comms.auth",user:self.user});
-                                completeConnection(client.scope,msg.auth,true);
-                            } else {
-                                log.audit({event: "comms.auth.fail"});
-                                completeConnection(null,null,false);
-                            }
-                        });
-                    } else {
-                        Users.tokens(msg.auth).then(function(user) {
-                            if (user) {
-                                self.user = user;
-                                log.audit({event: "comms.auth",user:self.user});
-                                completeConnection(user.permissions,msg.auth,true);
-                            } else {
-                                log.audit({event: "comms.auth.fail"});
-                                completeConnection(null,null,false);
-                            }
-                        });
-                    }
-                });
+                handleAuthPacket(msg)
            } else {
                if (anonymousUser) {
                    log.audit({event: "comms.auth",user:anonymousUser});
                    self.user = anonymousUser;
-                    completeConnection(anonymousUser.permissions,null,false);
+                    completeConnection(msg, anonymousUser.permissions, null, false);
                    //TODO: duplicated code - pull non-auth message handling out
                    if (msg.subscribe) {
                        self.subscribe(msg.subscribe);
                    }
                } else {
                    log.audit({event: "comms.auth.fail"});
-                    completeConnection(null,null,false);
+                    completeConnection(msg, null,null,false);
                }
            }
        }
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -233,6 +233,10 @@ module.exports = {
            themeSettings.projects = theme.projects;
        }

+        if (theme.hasOwnProperty("multiplayer")) {
+            themeSettings.multiplayer = theme.multiplayer;
+        }
+
        if (theme.hasOwnProperty("keymap")) {
            themeSettings.keymap = theme.keymap;
        }
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/editor-api",
-    "version": "4.0.0-beta.1",
+    "version": "4.0.0-beta.2",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,14 +16,14 @@
        }
    ],
    "dependencies": {
-        "@node-red/util": "4.0.0-beta.1",
-        "@node-red/editor-client": "4.0.0-beta.1",
+        "@node-red/util": "4.0.0-beta.2",
+        "@node-red/editor-client": "4.0.0-beta.2",
        "bcryptjs": "2.4.3",
        "body-parser": "1.20.2",
        "clone": "2.1.2",
        "cors": "2.8.5",
        "express-session": "1.17.3",
-        "express": "4.18.2",
+        "express": "4.19.2",
        "memorystore": "1.6.7",
        "mime": "3.0.0",
        "multer": "1.4.5-lts.1",
--- a/packages/node_modules/@node-red/editor-client/locales/fr/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/fr/editor.json
@@ -924,7 +924,14 @@
      "date": "horodatage",
      "jsonata": "expression",
      "env": "variable d'environnement",
-      "cred": "identifiant"
+      "cred": "identifiant",
+      "conf-types": "noeud de configuration"
+    },
+    "date": {
+      "format": {
+        "timestamp": "millisecondes depuis l'époque",
+        "object": "Objet de date JavaScript"
+      }
    }
  },
  "editableList": {
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/editor-client",
-    "version": "4.0.0-beta.1",
+    "version": "4.0.0-beta.2",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- a/packages/node_modules/@node-red/editor-client/src/js/comms.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/comms.js
@@ -26,6 +26,15 @@ RED.comms = (function() {
    var reconnectAttempts = 0;
    var active = false;

+    RED.events.on('login', function(username) {
+        // User has logged in
+        // Need to upgrade the connection to be authenticated
+        if (ws && ws.readyState == 1) {
+            const auth_tokens = RED.settings.get("auth-tokens");
+            ws.send(JSON.stringify({auth:auth_tokens.access_token}))
+        }
+    })
+
    function connectWS() {
        active = true;
        var wspath;
@@ -56,6 +65,7 @@ RED.comms = (function() {
                    ws.send(JSON.stringify({subscribe:t}));
                }
            }
+            emit('connect')
        }

        ws = new WebSocket(wspath);
@@ -180,9 +190,53 @@ RED.comms = (function() {
        }
    }

+    function send(topic, msg) {
+        if (ws && ws.readyState == 1) {
+            ws.send(JSON.stringify({
+                topic,
+                data: msg
+            }))
+        }
+    }
+
+    const eventHandlers = {};
+    function on(evt,func) {
+        eventHandlers[evt] = eventHandlers[evt]||[];
+        eventHandlers[evt].push(func);
+    }
+    function off(evt,func) {
+        const handler = eventHandlers[evt];
+        if (handler) {
+            for (let i=0;i<handler.length;i++) {
+                if (handler[i] === func) {
+                    handler.splice(i,1);
+                    return;
+                }
+            }
+        }
+    }
+    function emit() {
+        const evt = arguments[0]
+        const args = Array.prototype.slice.call(arguments,1);
+        if (eventHandlers[evt]) {
+            let cpyHandlers = [...eventHandlers[evt]];
+            for (let i=0;i<cpyHandlers.length;i++) {
+                try {
+                    cpyHandlers[i].apply(null, args);
+                } catch(err) {
+                    console.warn("RED.comms.emit error: ["+evt+"] "+(err.toString()));
+                    console.warn(err);
+                }
+            }
+        }
+    }
+
    return {
        connect: connectWS,
        subscribe: subscribe,
-        unsubscribe:unsubscribe
+        unsubscribe:unsubscribe,
+        on,
+        off,
+        send
    }
 })();
--- a/packages/node_modules/@node-red/editor-client/src/js/multiplayer.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/multiplayer.js
@@ -0,0 +1,490 @@
+RED.multiplayer = (function () {
+
+    // activeSessionId - used to identify sessions across websocket reconnects
+    let activeSessionId
+
+    let headerWidget
+    // Map of session id to { session:'', user:{}, location:{}}
+    let sessions = {}
+    // Map of username to { user:{}, sessions:[] }
+    let users = {}
+
+    function addUserSession (session) {
+        if (sessions[session.session]) {
+            // This is an existing connection that has been authenticated
+            const existingSession = sessions[session.session]
+            if (existingSession.user.username !== session.user.username) {
+                removeUserHeaderButton(users[existingSession.user.username])
+            }
+        }
+        sessions[session.session] = session
+        const user = users[session.user.username] = users[session.user.username] || {
+            user: session.user,
+            sessions: []
+        }
+        if (session.user.profileColor === undefined) {
+            session.user.profileColor = (1 + Math.floor(Math.random() * 5))
+        }
+        session.location = session.location || {}
+        user.sessions.push(session)
+
+        if (session.session === activeSessionId) {
+            // This is the current user session - do not add a extra button for them
+        } else {
+            if (user.sessions.length === 1) {
+                if (user.button) {
+                    clearTimeout(user.inactiveTimeout)
+                    clearTimeout(user.removeTimeout)
+                    user.button.removeClass('inactive')
+                } else {
+                    addUserHeaderButton(user)
+                }
+            }
+            sessions[session.session].location = session.location
+            updateUserLocation(session.session)
+        }
+    }
+
+    function removeUserSession (sessionId, isDisconnected) {
+        removeUserLocation(sessionId)
+        const session = sessions[sessionId]
+        delete sessions[sessionId]
+        const user = users[session.user.username]
+        const i = user.sessions.indexOf(session)
+        user.sessions.splice(i, 1)
+        if (isDisconnected) {
+            removeUserHeaderButton(user)
+        } else {
+            if (user.sessions.length === 0) {
+                // Give the user 5s to reconnect before marking inactive
+                user.inactiveTimeout = setTimeout(() => {
+                    user.button.addClass('inactive')
+                    // Give the user further 20 seconds to reconnect before removing them
+                    // from the user toolbar entirely
+                    user.removeTimeout = setTimeout(() => {
+                        removeUserHeaderButton(user)
+                    }, 20000)
+                }, 5000)
+            }
+        }
+    }
+
+    function addUserHeaderButton (user) {
+        user.button = $('<li class="red-ui-multiplayer-user"><button type="button" class="red-ui-multiplayer-user-icon"></button></li>')
+            .attr('data-username', user.user.username)
+            .prependTo("#red-ui-multiplayer-user-list");
+        var button = user.button.find("button")
+        RED.popover.tooltip(button, user.user.username)
+        button.on('click', function () {
+            const location = user.sessions[0].location
+            revealUser(location)
+        })
+
+        const userProfile = RED.user.generateUserIcon(user.user)
+        userProfile.appendTo(button)
+    }
+
+    function removeUserHeaderButton (user) {
+        user.button.remove()
+        delete user.button
+    }
+
+    function getLocation () {
+        const location = {
+            workspace: RED.workspaces.active()
+        }
+        const editStack = RED.editor.getEditStack()
+        for (let i = editStack.length - 1; i >= 0; i--) {
+            if (editStack[i].id) {
+                location.node = editStack[i].id
+                break
+            }
+        }
+        return location
+    }
+    function publishLocation () {
+        const location = getLocation()
+        if (location.workspace !== 0) {
+            log('send', 'multiplayer/location', location)
+            RED.comms.send('multiplayer/location', location)
+        }
+    }
+
+    function revealUser(location, skipWorkspace) {
+        if (location.node) {
+            // Need to check if this is a known node, so we can fall back to revealing
+            // the workspace instead
+            const node = RED.nodes.node(location.node)
+            if (node) {
+                RED.view.reveal(location.node)
+            } else if (!skipWorkspace && location.workspace) {
+                RED.view.reveal(location.workspace)
+            }
+        } else if (!skipWorkspace && location.workspace) {
+            RED.view.reveal(location.workspace)
+        }
+    }
+
+    const workspaceTrays = {}
+    function getWorkspaceTray(workspaceId) {
+        // console.log('get tray for',workspaceId)
+        if (!workspaceTrays[workspaceId]) {
+            const tray = $('<div class="red-ui-multiplayer-users-tray"></div>')
+            const users = []
+            const userIcons = {}
+
+            const userCountIcon = $(`<div class="red-ui-multiplayer-user-location"><span class="red-ui-user-profile red-ui-multiplayer-user-count"><span></span></span></div>`)
+            const userCountSpan = userCountIcon.find('span span')
+            userCountIcon.hide()
+            userCountSpan.text('')
+            userCountIcon.appendTo(tray)
+            const userCountTooltip = RED.popover.tooltip(userCountIcon, function () {
+                    const content = $('<div>')
+                    users.forEach(sessionId => {
+                        $('<div>').append($('<a href="#">').text(sessions[sessionId].user.username).on('click', function (evt) {
+                            evt.preventDefault()
+                            revealUser(sessions[sessionId].location, true)
+                            userCountTooltip.close()
+                        })).appendTo(content)
+                    })
+                    return content
+                },
+                null,
+                true
+            )
+
+            const updateUserCount = function () {
+                const maxShown = 2
+                const children = tray.children()
+                children.each(function (index, element) {
+                    const i = users.length - index
+                    if (i > maxShown) {
+                        $(this).hide()
+                    } else if (i >= 0) {
+                        $(this).show()
+                    }
+                })
+                if (users.length < maxShown + 1) { 
+                    userCountIcon.hide()
+                } else {
+                    userCountSpan.text('+'+(users.length - maxShown))
+                    userCountIcon.show()
+                }
+            }
+            workspaceTrays[workspaceId] = {
+                attached: false,
+                tray,
+                users,
+                userIcons,
+                addUser: function (sessionId) {
+                    if (users.indexOf(sessionId) === -1) {
+                        // console.log(`addUser ws:${workspaceId} session:${sessionId}`)
+                        users.push(sessionId)
+                        const userLocationId = `red-ui-multiplayer-user-location-${sessionId}`
+                        const userLocationIcon = $(`<div class="red-ui-multiplayer-user-location" id="${userLocationId}"></div>`)
+                        RED.user.generateUserIcon(sessions[sessionId].user).appendTo(userLocationIcon)
+                        userLocationIcon.prependTo(tray)
+                        RED.popover.tooltip(userLocationIcon, sessions[sessionId].user.username)
+                        userIcons[sessionId] = userLocationIcon
+                        updateUserCount()
+                    }
+                },
+                removeUser: function (sessionId) {
+                    // console.log(`removeUser ws:${workspaceId} session:${sessionId}`)
+                    const userLocationId = `red-ui-multiplayer-user-location-${sessionId}`
+                    const index = users.indexOf(sessionId)
+                    if (index > -1) {
+                        users.splice(index, 1)
+                        userIcons[sessionId].remove()
+                        delete userIcons[sessionId]
+                    }
+                    updateUserCount()
+                },
+                updateUserCount
+            }
+        }
+        const trayDef = workspaceTrays[workspaceId]
+        if (!trayDef.attached) {
+            const workspaceTab = $(`#red-ui-tab-${workspaceId}`)
+            if (workspaceTab.length > 0) {
+                trayDef.attached = true
+                trayDef.tray.appendTo(workspaceTab)
+                trayDef.users.forEach(sessionId => {
+                    trayDef.userIcons[sessionId].on('click', function (evt) {
+                        revealUser(sessions[sessionId].location, true)
+                    })
+                })
+            }
+        }
+        return workspaceTrays[workspaceId]
+    }
+    function attachWorkspaceTrays () {
+        let viewTouched = false
+        for (let sessionId of Object.keys(sessions)) {
+            const location = sessions[sessionId].location
+            if (location) {
+                if (location.workspace) {
+                    getWorkspaceTray(location.workspace).updateUserCount()
+                }
+                if (location.node) {
+                    addUserToNode(sessionId, location.node)
+                    viewTouched = true
+                }
+            }
+        }
+        if (viewTouched) {
+            RED.view.redraw()
+        }
+    }
+
+    function addUserToNode(sessionId, nodeId) {
+        const node = RED.nodes.node(nodeId)
+        if (node) {
+            if (!node._multiplayer) {
+                node._multiplayer = {
+                    users: [sessionId]
+                }
+                node._multiplayer_refresh = true
+            } else {
+                if (node._multiplayer.users.indexOf(sessionId) === -1) {
+                    node._multiplayer.users.push(sessionId)
+                    node._multiplayer_refresh = true
+                }
+            }
+        }
+    }
+    function removeUserFromNode(sessionId, nodeId) {
+        const node = RED.nodes.node(nodeId)
+        if (node && node._multiplayer) {
+            const i = node._multiplayer.users.indexOf(sessionId)
+            if (i > -1) {
+                node._multiplayer.users.splice(i, 1)
+            }
+            if (node._multiplayer.users.length === 0) {
+                delete node._multiplayer
+            } else {
+                node._multiplayer_refresh = true
+            }
+        }
+
+    }
+
+    function removeUserLocation (sessionId) {
+        updateUserLocation(sessionId, {})
+    }
+    function updateUserLocation (sessionId, location) {
+        let viewTouched = false
+        const oldLocation = sessions[sessionId].location
+        if (location) {
+            if (oldLocation.workspace !== location.workspace) {
+                // console.log('removing', sessionId, oldLocation.workspace)
+                workspaceTrays[oldLocation.workspace]?.removeUser(sessionId)
+            }
+            if (oldLocation.node !== location.node) {
+                removeUserFromNode(sessionId, oldLocation.node)
+                viewTouched = true
+            }
+            sessions[sessionId].location = location
+        } else {
+            location = sessions[sessionId].location
+        }
+        // console.log(`updateUserLocation sessionId:${sessionId} oldWS:${oldLocation?.workspace} newWS:${location.workspace}`)
+        if (location.workspace) {
+            getWorkspaceTray(location.workspace).addUser(sessionId)
+        }
+        if (location.node) {
+            addUserToNode(sessionId, location.node)
+            viewTouched = true
+        }
+        if (viewTouched) {
+            RED.view.redraw()
+        }
+    }
+
+    // function refreshUserLocations () {
+    //     for (const session of Object.keys(sessions)) {
+    //         if (session !== activeSessionId) {
+    //             updateUserLocation(session)
+    //         }
+    //     }
+    // }
+
+    return {
+        init: function () {
+
+            function createAnnotationUser(user) {
+
+                const group = document.createElementNS("http://www.w3.org/2000/svg","g");
+                const badge = document.createElementNS("http://www.w3.org/2000/svg","circle");
+                const radius = 20
+                badge.setAttribute("cx",radius/2);
+                badge.setAttribute("cy",radius/2);
+                badge.setAttribute("r",radius/2);
+                badge.setAttribute("class", "red-ui-multiplayer-annotation-background")
+                group.appendChild(badge)
+                if (user && user.profileColor !== undefined) {
+                    badge.setAttribute("class", "red-ui-multiplayer-annotation-background red-ui-user-profile-color-" + user.profileColor)
+                }
+                if (user && user.image) {
+                    const image = document.createElementNS("http://www.w3.org/2000/svg","image");
+                    image.setAttribute("width", radius)
+                    image.setAttribute("height", radius)
+                    image.setAttribute("href", user.image)
+                    image.setAttribute("clip-path", "circle("+Math.floor(radius/2)+")")
+                    group.appendChild(image)
+                } else if (user && user.anonymous) {
+                    const anonIconHead = document.createElementNS("http://www.w3.org/2000/svg","circle");
+                    anonIconHead.setAttribute("cx", radius/2)
+                    anonIconHead.setAttribute("cy", radius/2 - 2)
+                    anonIconHead.setAttribute("r", 2.4)
+                    anonIconHead.setAttribute("class","red-ui-multiplayer-annotation-anon-label");
+                    group.appendChild(anonIconHead)
+                    const anonIconBody = document.createElementNS("http://www.w3.org/2000/svg","path");
+                    anonIconBody.setAttribute("class","red-ui-multiplayer-annotation-anon-label");
+                    // anonIconBody.setAttribute("d",`M ${radius/2 - 4} ${radius/2 + 1} h 8 v4 h -8 z`);
+                    anonIconBody.setAttribute("d",`M ${radius/2} ${radius/2 + 5} h -2.5 c -2 1 -2 -5 0.5 -4.5 c 2 1 2 1 4 0 c 2.5 -0.5  2.5 5.5  0 4.5  z`);
+                    group.appendChild(anonIconBody)
+                } else {
+                    const labelText = user.username ? user.username.substring(0,2) : user
+                    const label = document.createElementNS("http://www.w3.org/2000/svg","text");
+                    if (user.username) {
+                        label.setAttribute("class","red-ui-multiplayer-annotation-label");
+                        label.textContent = user.username.substring(0,2)
+                    } else {
+                        label.setAttribute("class","red-ui-multiplayer-annotation-label red-ui-multiplayer-user-count")
+                        label.textContent = user
+                    }
+                    label.setAttribute("text-anchor", "middle")
+                    label.setAttribute("x",radius/2);
+                    label.setAttribute("y",radius/2 + 3);
+                    group.appendChild(label)
+                }
+                const border = document.createElementNS("http://www.w3.org/2000/svg","circle");
+                border.setAttribute("cx",radius/2);
+                border.setAttribute("cy",radius/2);
+                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',
+                class: "red-ui-multiplayer-annotation",
+                show: "_multiplayer",
+                refresh: "_multiplayer_refresh",
+                element: function(node) {
+                    const containerGroup = document.createElementNS("http://www.w3.org/2000/svg","g");
+                    containerGroup.setAttribute("transform","translate(0,-4)")
+                    if (node._multiplayer) {
+                        let y = 0
+                        for (let i = Math.min(1, node._multiplayer.users.length - 1); i >= 0; i--) {
+                            const user = sessions[node._multiplayer.users[i]].user
+                            const group = createAnnotationUser(user)
+                            group.setAttribute("transform","translate("+y+",0)")
+                            y += 15
+                            containerGroup.appendChild(group)
+                        }
+                        if (node._multiplayer.users.length > 2) {
+                            const group = createAnnotationUser('+'+(node._multiplayer.users.length - 2))
+                            group.setAttribute("transform","translate("+y+",0)")
+                            y += 12
+                            containerGroup.appendChild(group)
+                        }
+
+                    }
+                    return containerGroup;
+                },
+                tooltip: node => { return node._multiplayer.users.map(u => sessions[u].user.username).join('\n') }
+            });
+
+
+            // activeSessionId = RED.settings.getLocal('multiplayer:sessionId')
+            // if (!activeSessionId) {
+                activeSessionId = RED.nodes.id()
+            //     RED.settings.setLocal('multiplayer:sessionId', activeSessionId)
+            //     log('Session ID (new)', activeSessionId)
+            // } 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', () => {
+                const location = getLocation()
+                const connectInfo = {
+                    session: activeSessionId
+                }
+                if (location.workspace !== 0) {
+                    connectInfo.location = location
+                }
+                RED.comms.send('multiplayer/connect', connectInfo)
+            })
+            RED.comms.subscribe('multiplayer/#', (topic, msg) => {
+                log('recv', topic, msg)
+                if (topic === 'multiplayer/init') {
+                    // We have just reconnected, runtime has sent state to
+                    // initialise the world
+                    sessions = {}
+                    users = {}
+                    $('#red-ui-multiplayer-user-list').empty()
+
+                    msg.sessions.forEach(session => {
+                        addUserSession(session)
+                    })
+                } else if (topic === 'multiplayer/connection-added') {
+                    addUserSession(msg)
+                } else if (topic === 'multiplayer/connection-removed') {
+                    removeUserSession(msg.session, msg.disconnected)
+                } else if (topic === 'multiplayer/location') {
+                    const session = msg.session
+                    delete msg.session
+                    updateUserLocation(session, msg)
+                }
+            })
+
+            RED.events.on('workspace:change', (event) => {
+                getWorkspaceTray(event.workspace)
+                publishLocation()
+            })
+            RED.events.on('editor:open', () => {
+                publishLocation()
+            })
+            RED.events.on('editor:close', () => {
+                publishLocation()
+            })
+            RED.events.on('editor:change', () => {
+                publishLocation()
+            })
+            RED.events.on('login', () => {
+                publishLocation()
+            })
+            RED.events.on('flows:loaded', () => {
+                attachWorkspaceTrays()
+            })
+            RED.events.on('workspace:close', (event) => {
+                // A subflow tab has been closed. Need to mark its tray as detached
+                if (workspaceTrays[event.workspace]) {
+                    workspaceTrays[event.workspace].attached = false
+                }
+            })
+            RED.events.on('logout', () => {
+                const disconnectInfo = {
+                    session: activeSessionId
+                }
+                RED.comms.send('multiplayer/disconnect', disconnectInfo)
+                RED.settings.removeLocal('multiplayer:sessionId')
+            })
+        }
+    }
+
+    function log() {
+        if (RED.multiplayer.DEBUG) {
+            console.log('[multiplayer]', ...arguments)
+        }
+    }
+})();
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -574,12 +574,16 @@ RED.nodes = (function() {
             * @param {String} z tab id
             */
            checkTabState: function (z) {
-                const ws = workspaces[z]
+                const ws = workspaces[z] || subflows[z]
                if (ws) {
                    const contentsChanged = tabDirtyMap[z].size > 0 || tabDeletedNodesMap[z].size > 0
                    if (Boolean(ws.contentsChanged) !== contentsChanged) {
                        ws.contentsChanged = contentsChanged
-                        RED.events.emit("flows:change", ws);
+                        if (ws.type === 'tab') {
+                            RED.events.emit("flows:change", ws);
+                        } else {
+                            RED.events.emit("subflows:change", ws);
+                        }
                    }
                }
            }
@@ -1052,7 +1056,22 @@ RED.nodes = (function() {
        RED.nodes.registerType("subflow:"+sf.id, {
            defaults:{
                name:{value:""},
-                env:{value:[]}
+                env:{value:[], validate: function(value) {
+                    const errors = []
+                    if (value) {
+                        value.forEach(env => {
+                            const r = RED.utils.validateTypedProperty(env.value, env.type)
+                            if (r !== true) {
+                                errors.push(env.name+': '+r)
+                            }
+                        })
+                    }
+                    if (errors.length === 0) {
+                        return true
+                    } else {
+                        return errors
+                    }
+                }}
            },
            icon: function() { return sf.icon||"subflow.svg" },
            category: sf.category || "subflows",
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -298,6 +298,7 @@ var RED = (function() {
                                RED.workspaces.show(workspaces[0]);
                            }
                        }
+                        RED.events.emit('flows:loaded')
                    } catch(err) {
                        console.warn(err);
                        RED.notify(
@@ -839,6 +840,10 @@ var RED = (function() {

        RED.nodes.init();
        RED.runtime.init()
+
+        if (RED.settings.theme("multiplayer.enabled",false)) {
+            RED.multiplayer.init()
+        }
        RED.comms.connect();

        $("#red-ui-main-container").show();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
@@ -211,7 +211,7 @@ RED.popover = (function() {
                        closePopup(true);
                    });
                }
-                if (trigger === 'hover' && options.interactive) {
+                if (/*trigger === 'hover' && */options.interactive) {
                    div.on('mouseenter', function(e) {
                        clearTimeout(timer);
                        active = true;
@@ -445,9 +445,12 @@ RED.popover = (function() {

    return {
        create: createPopover,
-        tooltip: function(target,content, action) {
+        tooltip: function(target,content, action, interactive) {
            var label = function() {
                var label = content;
+                if (typeof content === 'function') {
+                    label = content()
+                }
                if (action) {
                    var shortcut = RED.keyboard.getShortcut(action);
                    if (shortcut && shortcut.key) {
@@ -463,6 +466,7 @@ RED.popover = (function() {
                size: "small",
                direction: "bottom",
                content: label,
+                interactive,
                delay: { show: 750, hide: 50 }
            });
            popover.setContent = function(newContent) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
@@ -118,10 +118,16 @@ RED.contextMenu = (function () {
                    onselect: 'core:split-wire-with-link-nodes',
                    disabled: !canEdit || !hasLinks
                },
-                null,
-                { onselect: 'core:show-import-dialog', label: RED._('common.label.import')},
-                { onselect: 'core:show-examples-import-dialog', label: RED._('menu.label.importExample') }
+                null
            )
+            if (RED.settings.theme("menu.menu-item-import-library", true)) {
+                insertOptions.push(
+                    { onselect: 'core:show-import-dialog', label: RED._('common.label.import')},
+                    { onselect: 'core:show-examples-import-dialog', label: RED._('menu.label.importExample') }
+                )
+            }
+
+
            if (hasSelection && canEdit) {
                const nodeOptions = []
                if (!hasMultipleSelection && !isGroup) {
@@ -194,8 +200,14 @@ RED.contextMenu = (function () {
                { onselect: 'core:paste-from-internal-clipboard', label: RED._("keyboard.pasteNode"), disabled: !canEdit || !RED.view.clipboard() },
                { onselect: 'core:delete-selection', label: RED._('keyboard.deleteSelected'), disabled: !canEdit || !canDelete },
                { onselect: 'core:delete-selection-and-reconnect', label: RED._('keyboard.deleteReconnect'), disabled: !canEdit || !canDelete },
-                { onselect: 'core:show-export-dialog', label: RED._("menu.label.export") },
-                { onselect: 'core:select-all-nodes', label: RED._("keyboard.selectAll") },
+            )
+            if (RED.settings.theme("menu.menu-item-export-library", true)) {
+                menuItems.push(
+                    { onselect: 'core:show-export-dialog', label: RED._("menu.label.export") }
+                )
+            }
+            menuItems.push(
+                { onselect: 'core:select-all-nodes', label: RED._("keyboard.selectAll") }
            )
        }

--- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
@@ -112,16 +112,23 @@ RED.deploy = (function() {
            RED.actions.add("core:set-deploy-type-to-modified-nodes",function() { RED.menu.setSelected("deploymenu-item-node",true); });
        }

-
+        window.addEventListener('beforeunload', function (event) {
+            if (RED.nodes.dirty()) {
+                event.preventDefault();
+                event.stopImmediatePropagation()
+                event.returnValue = RED._("deploy.confirm.undeployedChanges");
+                return
+            }
+        })

        RED.events.on('workspace:dirty',function(state) {
            if (state.dirty) {
-                window.onbeforeunload = function() {
-                    return RED._("deploy.confirm.undeployedChanges");
-                }
+                // window.onbeforeunload = function() {
+                //     return 
+                // }
                $("#red-ui-header-button-deploy").removeClass("disabled");
            } else {
-                window.onbeforeunload = null;
+                // window.onbeforeunload = null;
                $("#red-ui-header-button-deploy").addClass("disabled");
            }
        });
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -341,8 +341,9 @@ RED.editor = (function() {
            nodeValue = node[property]
        }

-        const buttonId = `${prefix}-lookup-${property}`
-        const selectId = prefix + '-' + property
+        const addBtnId = `${prefix}-btn-${property}-add`;
+        const editBtnId = `${prefix}-btn-${property}-edit`;
+        const selectId = prefix + '-' + property;
        const input = $(`#${selectId}`);
        if (input.length === 0) {
            return;
@@ -365,40 +366,68 @@ RED.editor = (function() {
        select.css({
            'flex-grow': 1
        });
+
        updateConfigNodeSelect(property, type, nodeValue, prefix, filter);
-        const disableButton = function(disabled) {
-            btn.prop( "disabled", !!disabled)
-            btn.toggleClass("disabled", !!disabled)
-        }
+
        // create the edit button
-        const btn = $('<a id="' + buttonId + '" class="red-ui-button"><i class="fa fa-pencil"></i></a>')
+        const editButton = $('<a id="' + editBtnId + '" class="red-ui-button"><i class="fa fa-pencil"></i></a>')
            .css({ "margin-left": "10px" })
            .appendTo(outerWrap);

+        RED.popover.tooltip(editButton, RED._('editor.editConfig', { type }));
+
+        // create the add button
+        const addButton = $('<a id="' + addBtnId + '" class="red-ui-button"><i class="fa fa-plus"></i></a>')
+            .css({ "margin-left": "10px" })
+            .appendTo(outerWrap);
+        RED.popover.tooltip(addButton, RED._('editor.addNewConfig', { type }));
+
+        const disableButton = function(button, disabled) {
+            $(button).prop("disabled", !!disabled)
+            $(button).toggleClass("disabled", !!disabled)
+        };
+
        // add the click handler
-        btn.on("click", function (e) {
+        addButton.on("click", function (e) {
+            if (addButton.prop("disabled")) { return }
+            showEditConfigNodeDialog(property, type, "_ADD_", prefix, node);
+            e.preventDefault();
+        });
+        editButton.on("click", function (e) {
            const selectedOpt = select.find(":selected")
            if (selectedOpt.data('env')) { return } // don't show the dialog for env vars items (MVP. Future enhancement: lookup the env, if present, show the associated edit dialog)
-            if (btn.prop("disabled")) { return }
+            if (editButton.prop("disabled")) { return }
            showEditConfigNodeDialog(property, type, selectedOpt.val(), prefix, node);
            e.preventDefault();
        });

        // dont permit the user to click the button if the selected option is an env var
        select.on("change", function () {
-            const selectedOpt = select.find(":selected")
+            const selectedOpt = select.find(":selected");
+            const optionsLength = select.find("option").length;
            if (selectedOpt?.data('env')) {
-                disableButton(true)
+                disableButton(addButton, true);
+                disableButton(editButton, true);
+            // disable the edit button if no options available
+            } else if (optionsLength === 1 && selectedOpt.val() === "_ADD_") {
+                disableButton(addButton, false);
+                disableButton(editButton, true);
+            } else if (selectedOpt.val() === "") {
+                disableButton(addButton, false);
+                disableButton(editButton, true);
            } else {
-                disableButton(false)
+                disableButton(addButton, false);
+                disableButton(editButton, false);
            }
        });
+
        var label = "";
        var configNode = RED.nodes.node(nodeValue);

        if (configNode) {
            label = RED.utils.getNodeLabel(configNode, configNode.id);
        }
+
        input.val(label);
    }

@@ -892,7 +921,12 @@ RED.editor = (function() {
                    }
                }

-                select.append('<option value="_ADD_"'+(value===""?" selected":"")+'>'+RED._("editor.addNewType", {type:label})+'</option>');
+                if (!configNodes.length) {
+                    select.append('<option value="_ADD_" selected>' + RED._("editor.addNewType", { type: label }) + '</option>');
+                } else {
+                    select.append('<option value="">' + RED._("editor.inputs.none") + '</option>');
+                }
+
                window.setTimeout(function() { select.trigger("change");},50);
            }
        }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/env-var.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/env-var.js
@@ -153,10 +153,6 @@ RED.envVar = (function() {
    }

    function init(done) {
-        if (!RED.user.hasPermission("settings.write")) {
-            RED.notify(RED._("user.errors.settings"),"error");
-            return;
-        }
        RED.userSettings.add({
            id:'envvar',
            title: RED._("env-var.environment"),
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -35,6 +35,10 @@ RED.palette = (function() {
    var categoryContainers = {};
    var sidebarControls;

+    let paletteState = { filter: "", collapsed: [] };
+
+    let filterRefreshTimeout
+
    function createCategory(originalCategory,rootCategory,category,ns) {
        if ($("#red-ui-palette-base-category-"+rootCategory).length === 0) {
            createCategoryContainer(originalCategory,rootCategory, ns+":palette.label."+rootCategory);
@@ -60,20 +64,57 @@ RED.palette = (function() {
        catDiv.data('label',label);
        categoryContainers[category] = {
            container: catDiv,
-            close: function() {
+            hide: function (instant) {
+                if (instant) {
+                    catDiv.hide()
+                } else {
+                    catDiv.slideUp()
+                }
+            },
+            show: function () {
+                catDiv.show()
+            },
+            isOpen: function () {
+                return !!catDiv.hasClass("red-ui-palette-open")
+            },
+            getNodeCount: function (visibleOnly) {
+                const nodes = catDiv.find(".red-ui-palette-node")
+                if (visibleOnly) {
+                    return nodes.filter(function() { return $(this).css('display') !== 'none'}).length
+                } else {
+                    return nodes.length
+                }
+            },
+            close: function(instant, skipSaveState) {
                catDiv.removeClass("red-ui-palette-open");
                catDiv.addClass("red-ui-palette-closed");
-                $("#red-ui-palette-base-category-"+category).slideUp();
+                if (instant) {
+                    $("#red-ui-palette-base-category-"+category).hide();
+                } else {
+                    $("#red-ui-palette-base-category-"+category).slideUp();
+                }
                $("#red-ui-palette-header-"+category+" i").removeClass("expanded");
+                if (!skipSaveState) {
+                    if (!paletteState.collapsed.includes(category)) {
+                        paletteState.collapsed.push(category);
+                        savePaletteState();
+                    }
+                }
            },
-            open: function() {
+            open: function(skipSaveState) {
                catDiv.addClass("red-ui-palette-open");
                catDiv.removeClass("red-ui-palette-closed");
                $("#red-ui-palette-base-category-"+category).slideDown();
                $("#red-ui-palette-header-"+category+" i").addClass("expanded");
+                if (!skipSaveState) {
+                    if (paletteState.collapsed.includes(category)) {
+                        paletteState.collapsed.splice(paletteState.collapsed.indexOf(category), 1);
+                        savePaletteState();
+                    }
+                }
            },
            toggle: function() {
-                if (catDiv.hasClass("red-ui-palette-open")) {
+                if (categoryContainers[category].isOpen()) {
                    categoryContainers[category].close();
                } else {
                    categoryContainers[category].open();
@@ -415,8 +456,16 @@ RED.palette = (function() {

            var categoryNode = $("#red-ui-palette-container-"+rootCategory);
            if (categoryNode.find(".red-ui-palette-node").length === 1) {
-                categoryContainers[rootCategory].open();
+                if (!paletteState?.collapsed?.includes(rootCategory)) {
+                    categoryContainers[rootCategory].open();
+                } else {
+                    categoryContainers[rootCategory].close(true);
+                }
            }
+            clearTimeout(filterRefreshTimeout)
+            filterRefreshTimeout = setTimeout(() => {
+                refreshFilter()
+            }, 200)

        }
    }
@@ -516,7 +565,8 @@ RED.palette = (function() {
        paletteNode.css("backgroundColor", sf.color);
    }

-    function filterChange(val) {
+    function refreshFilter() {
+        const val = $("#red-ui-palette-search input").val()
        var re = new RegExp(val.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'),'i');
        $("#red-ui-palette-container .red-ui-palette-node").each(function(i,el) {
            var currentLabel = $(el).attr("data-palette-label");
@@ -528,16 +578,26 @@ RED.palette = (function() {
            }
        });

-        for (var category in categoryContainers) {
+        for (let category in categoryContainers) {
            if (categoryContainers.hasOwnProperty(category)) {
-                if (categoryContainers[category].container
-                        .find(".red-ui-palette-node")
-                        .filter(function() { return $(this).css('display') !== 'none'}).length === 0) {
-                    categoryContainers[category].close();
-                    categoryContainers[category].container.slideUp();
+                const categorySection = categoryContainers[category]
+                if (categorySection.getNodeCount(true) === 0) {
+                    categorySection.hide()
                } else {
-                    categoryContainers[category].open();
-                    categoryContainers[category].container.show();
+                    categorySection.show()
+                    if (val) {
+                        // There is a filter being applied and it has matched
+                        // something in this category - show the contents
+                        categorySection.open(true)
+                    } else {
+                        // No filter. Only show the category if it isn't in lastState
+                        if (!paletteState.collapsed.includes(category)) {
+                            categorySection.open(true)
+                        } else if (categorySection.isOpen()) {
+                            // This section should be collapsed but isn't - so make it so
+                            categorySection.close(true, true)
+                        }
+                    }
                }
            }
        }
@@ -553,6 +613,9 @@ RED.palette = (function() {

        $("#red-ui-palette > .red-ui-palette-spinner").show();

+        RED.events.on('logout', function () {
+            RED.settings.removeLocal('palette-state')
+        })

        RED.events.on('registry:node-type-added', function(nodeType) {
            var def = RED.nodes.getType(nodeType);
@@ -596,14 +659,14 @@ RED.palette = (function() {

        RED.events.on("subflows:change",refreshSubflow);

-
-
        $("#red-ui-palette-search input").searchBox({
            delay: 100,
            change: function() {
-                filterChange($(this).val());
+                refreshFilter();
+                paletteState.filter = $(this).val();
+                savePaletteState();
            }
-        })
+        });

        sidebarControls = $('<div class="red-ui-sidebar-control-left"><i class="fa fa-chevron-left"></i></div>').appendTo($("#red-ui-palette"));
        RED.popover.tooltip(sidebarControls,RED._("keyboard.togglePalette"),"core:toggle-palette");
@@ -669,7 +732,23 @@ RED.palette = (function() {
                togglePalette(state);
            }
        });
+
+        try {
+            paletteState = JSON.parse(RED.settings.getLocal("palette-state") || '{"filter":"", "collapsed": []}');
+            if (paletteState.filter) {
+                // Apply the category filter
+                $("#red-ui-palette-search input").searchBox("value", paletteState.filter);
+            }
+        } catch (error) {
+            console.error("Unexpected error loading palette state from localStorage: ", error);
+        }
+        setTimeout(() => {
+            // Lazily tidy up any categories that haven't been reloaded
+            paletteState.collapsed = paletteState.collapsed.filter(category => !!categoryContainers[category])
+            savePaletteState()
+        }, 10000)
    }
+
    function togglePalette(state) {
        if (!state) {
            $("#red-ui-main-container").addClass("red-ui-palette-closed");
@@ -689,6 +768,15 @@ RED.palette = (function() {
        })
        return categories;
    }
+
+    function savePaletteState() {
+        try {
+            RED.settings.setLocal("palette-state", JSON.stringify(paletteState));
+        } catch (error) {
+            console.error("Unexpected error saving palette state to localStorage: ", error);
+        }
+    }
+
    return {
        init: init,
        add:addNodeType,
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -1280,14 +1280,20 @@ RED.subflow = (function() {
                    var nodePropValue = nodeProp;
                    if (prop.ui && prop.ui.type === "cred") {
                        nodePropType = "cred";
+                    } else if (prop.ui && prop.ui.type === "conf-types") {
+                        nodePropType = prop.value.type
                    } else {
                        switch(typeof nodeProp) {
                            case "string": nodePropType = "str"; break;
                            case "number": nodePropType = "num"; break;
                            case "boolean": nodePropType = "bool"; nodePropValue = nodeProp?"true":"false"; break;
                            default:
-                            nodePropType = nodeProp.type;
-                            nodePropValue = nodeProp.value;
+                                if (nodeProp) {
+                                    nodePropType = nodeProp.type;
+                                    nodePropValue = nodeProp.value;
+                                } else {
+                                    nodePropType = 'str'
+                                }
                        }
                    }
                    var item = {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
@@ -158,8 +158,10 @@ RED.sidebar.help = (function() {

    function refreshSubflow(sf) {
        var item = treeList.treeList('get',"node-type:subflow:"+sf.id);
-        item.subflowLabel = sf._def.label().toLowerCase();
-        item.treeList.replaceElement(getNodeLabel({_def:sf._def,type:sf._def.label()}));
+        if (item) {
+            item.subflowLabel = sf._def.label().toLowerCase();
+            item.treeList.replaceElement(getNodeLabel({_def:sf._def,type:sf._def.label()}));
+        }
    }

    function hideTOC() {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
@@ -264,6 +264,7 @@
                setTimeout(function() {
                    oldTray.tray.detach();
                    showTray(options);
+                    RED.events.emit('editor:change')
                },250)
            } else {
                if (stack.length > 0) {
@@ -333,6 +334,7 @@
                        RED.view.focus();
                    } else {
                        stack[stack.length-1].tray.css("z-index", "auto");
+                        RED.events.emit('editor:change')
                    }
                },250)
            }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view-annotations.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view-annotations.js
@@ -9,14 +9,27 @@ RED.view.annotations = (function() {
                    addAnnotation(evt.node.__pendingAnnotation__,evt);
                    delete evt.node.__pendingAnnotation__;
                }
-                var badgeDX = 0;
-                var controlDX = 0;
-                for (var i=0,l=evt.el.__annotations__.length;i<l;i++) {
-                    var annotation = evt.el.__annotations__[i];
+                let badgeRDX = 0;
+                let badgeLDX = 0;
+                
+                for (let i=0,l=evt.el.__annotations__.length;i<l;i++) {
+                    const annotation = evt.el.__annotations__[i];
                    if (annotations.hasOwnProperty(annotation.id)) {
-                        var opts = annotations[annotation.id];
-                        var showAnnotation = true;
-                        var isBadge = opts.type === 'badge';
+                        const opts = annotations[annotation.id];
+                        let showAnnotation = true;
+                        const isBadge = opts.type === 'badge';
+                        if (opts.refresh !== undefined) {
+                            let refreshAnnotation = false
+                            if (typeof opts.refresh === "string") {
+                                refreshAnnotation = !!evt.node[opts.refresh]
+                                delete evt.node[opts.refresh]
+                            } else if (typeof opts.refresh === "function") {
+                                refreshAnnotation = opts.refresh(evnt.node)
+                            }
+                            if (refreshAnnotation) {
+                                refreshAnnotationElement(annotation.id, annotation.node, annotation.element)
+                            }
+                        }
                        if (opts.show !== undefined) {
                            if (typeof opts.show === "string") {
                                showAnnotation = !!evt.node[opts.show]
@@ -29,17 +42,24 @@ RED.view.annotations = (function() {
                        }
                        if (isBadge) {
                            if (showAnnotation) {
-                                var rect = annotation.element.getBoundingClientRect();
-                                badgeDX += rect.width;
-                                annotation.element.setAttribute("transform", "translate("+(evt.node.w-3-badgeDX)+", -8)");
-                                badgeDX += 4;
-                            }
-                        } else {
-                            if (showAnnotation) {
-                                var rect = annotation.element.getBoundingClientRect();
-                                annotation.element.setAttribute("transform", "translate("+(3+controlDX)+", -12)");
-                                controlDX += rect.width + 4;
+                                const rect = annotation.element.getBoundingClientRect();
+                                let annotationX
+                                if (!opts.align || opts.align === 'right') {
+                                    annotationX = evt.node.w - 3 - badgeRDX - rect.width
+                                    badgeRDX += rect.width + 4;
+
+                                } else if (opts.align === 'left') {
+                                    annotationX = 3 + badgeLDX
+                                    badgeLDX += rect.width + 4;
+                                }
+                                annotation.element.setAttribute("transform", "translate("+annotationX+", -8)");
                            }
+                        // } else {
+                        //     if (showAnnotation) {
+                        //         var rect = annotation.element.getBoundingClientRect();
+                        //         annotation.element.setAttribute("transform", "translate("+(3+controlDX)+", -12)");
+                        //         controlDX += rect.width + 4;
+                        //     }
                        }
                    } else {
                        annotation.element.parentNode.removeChild(annotation.element);
@@ -95,15 +115,25 @@ RED.view.annotations = (function() {
        annotationGroup.setAttribute("class",opts.class || "");
        evt.el.__annotations__.push({
            id:id,
+            node: evt.node,
            element: annotationGroup
        });
-        var annotation = opts.element(evt.node);
+        refreshAnnotationElement(id, evt.node, annotationGroup)
+        evt.el.appendChild(annotationGroup);
+    }
+
+    function refreshAnnotationElement(id, node, annotationGroup) {
+        const opts = annotations[id];
+        const annotation = opts.element(node);
        if (opts.tooltip) {
-            annotation.addEventListener("mouseenter", getAnnotationMouseEnter(annotation,evt.node,opts.tooltip));
+            annotation.addEventListener("mouseenter", getAnnotationMouseEnter(annotation, node, opts.tooltip));
            annotation.addEventListener("mouseleave", annotationMouseLeave);
        }
+        if (annotationGroup.hasChildNodes()) {
+            annotationGroup.removeChild(annotationGroup.firstChild)
+        }
        annotationGroup.appendChild(annotation);
-        evt.el.appendChild(annotationGroup);
+
    }


--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -646,120 +646,128 @@ RED.view = (function() {
                }
                d3.event = event;
                var selected_tool = $(ui.draggable[0]).attr("data-palette-type");
-                var result = createNode(selected_tool);
-                if (!result) {
-                    return;
-                }
-                var historyEvent = result.historyEvent;
-                var nn = RED.nodes.add(result.node);
-
-                var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
-                if (showLabel !== undefined &&  (nn._def.hasOwnProperty("showLabel")?nn._def.showLabel:true) && !nn._def.defaults.hasOwnProperty("l")) {
-                    nn.l = showLabel;
-                }
-
-                var helperOffset = d3.touches(ui.helper.get(0))[0]||d3.mouse(ui.helper.get(0));
-                var helperWidth = ui.helper.width();
-                var helperHeight = ui.helper.height();
-                var mousePos = d3.touches(this)[0]||d3.mouse(this);
-
                try {
-                    var isLink = (nn.type === "link in" || nn.type === "link out")
-                    var hideLabel = nn.hasOwnProperty('l')?!nn.l : isLink;
-
-                    var label = RED.utils.getNodeLabel(nn, nn.type);
-                    var labelParts = getLabelParts(label, "red-ui-flow-node-label");
-                    if (hideLabel) {
-                        nn.w = node_height;
-                        nn.h = Math.max(node_height,(nn.outputs || 0) * 15);
-                    } else {
-                        nn.w = Math.max(node_width,20*(Math.ceil((labelParts.width+50+(nn._def.inputs>0?7:0))/20)) );
-                        nn.h = Math.max(6+24*labelParts.lines.length,(nn.outputs || 0) * 15, 30);
+                    var result = createNode(selected_tool);
+                    if (!result) {
+                        return;
                    }
-                } catch(err) {
-                }
+                    var historyEvent = result.historyEvent;
+                    var nn = RED.nodes.add(result.node);

-                mousePos[1] += this.scrollTop + ((helperHeight/2)-helperOffset[1]);
-                mousePos[0] += this.scrollLeft + ((helperWidth/2)-helperOffset[0]);
-                mousePos[1] /= scaleFactor;
-                mousePos[0] /= scaleFactor;
+                    var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
+                    if (showLabel !== undefined &&  (nn._def.hasOwnProperty("showLabel")?nn._def.showLabel:true) && !nn._def.defaults.hasOwnProperty("l")) {
+                        nn.l = showLabel;
+                    }

-                nn.x = mousePos[0];
-                nn.y = mousePos[1];
+                    var helperOffset = d3.touches(ui.helper.get(0))[0]||d3.mouse(ui.helper.get(0));
+                    var helperWidth = ui.helper.width();
+                    var helperHeight = ui.helper.height();
+                    var mousePos = d3.touches(this)[0]||d3.mouse(this);

-                var minX = nn.w/2 -5;
-                if (nn.x < minX) {
-                    nn.x = minX;
-                }
-                var minY = nn.h/2 -5;
-                if (nn.y < minY) {
-                    nn.y = minY;
-                }
-                var maxX = space_width -nn.w/2 +5;
-                if (nn.x > maxX) {
-                    nn.x = maxX;
-                }
-                var maxY = space_height -nn.h +5;
-                if (nn.y > maxY) {
-                    nn.y = maxY;
-                }
+                    try {
+                        var isLink = (nn.type === "link in" || nn.type === "link out")
+                        var hideLabel = nn.hasOwnProperty('l')?!nn.l : isLink;

-                if (snapGrid) {
-                    var gridOffset = RED.view.tools.calculateGridSnapOffsets(nn);
-                    nn.x -= gridOffset.x;
-                    nn.y -= gridOffset.y;
-                }
+                        var label = RED.utils.getNodeLabel(nn, nn.type);
+                        var labelParts = getLabelParts(label, "red-ui-flow-node-label");
+                        if (hideLabel) {
+                            nn.w = node_height;
+                            nn.h = Math.max(node_height,(nn.outputs || 0) * 15);
+                        } else {
+                            nn.w = Math.max(node_width,20*(Math.ceil((labelParts.width+50+(nn._def.inputs>0?7:0))/20)) );
+                            nn.h = Math.max(6+24*labelParts.lines.length,(nn.outputs || 0) * 15, 30);
+                        }
+                    } catch(err) {
+                    }

-                var linkToSplice = $(ui.helper).data("splice");
-                if (linkToSplice) {
-                    spliceLink(linkToSplice, nn, historyEvent)
-                }
+                    mousePos[1] += this.scrollTop + ((helperHeight/2)-helperOffset[1]);
+                    mousePos[0] += this.scrollLeft + ((helperWidth/2)-helperOffset[0]);
+                    mousePos[1] /= scaleFactor;
+                    mousePos[0] /= scaleFactor;
+
+                    nn.x = mousePos[0];
+                    nn.y = mousePos[1];
+
+                    var minX = nn.w/2 -5;
+                    if (nn.x < minX) {
+                        nn.x = minX;
+                    }
+                    var minY = nn.h/2 -5;
+                    if (nn.y < minY) {
+                        nn.y = minY;
+                    }
+                    var maxX = space_width -nn.w/2 +5;
+                    if (nn.x > maxX) {
+                        nn.x = maxX;
+                    }
+                    var maxY = space_height -nn.h +5;
+                    if (nn.y > maxY) {
+                        nn.y = maxY;
+                    }
+
+                    if (snapGrid) {
+                        var gridOffset = RED.view.tools.calculateGridSnapOffsets(nn);
+                        nn.x -= gridOffset.x;
+                        nn.y -= gridOffset.y;
+                    }
+
+                    var linkToSplice = $(ui.helper).data("splice");
+                    if (linkToSplice) {
+                        spliceLink(linkToSplice, nn, historyEvent)
+                    }
+
+                    var group = $(ui.helper).data("group");
+                    if (group) {
+                        var oldX = group.x; 
+                        var oldY = group.y; 
+                        RED.group.addToGroup(group, nn);
+                        var moveEvent = null;
+                        if ((group.x !== oldX) ||
+                            (group.y !== oldY)) {
+                            moveEvent = {
+                                t: "move",
+                                nodes: [{n: group,
+                                        ox: oldX, oy: oldY,
+                                        dx: group.x -oldX,
+                                        dy: group.y -oldY}],
+                                dirty: true
+                            };
+                        }
+                        historyEvent = {
+                            t: 'multi',
+                            events: [historyEvent],

-                var group = $(ui.helper).data("group");
-                if (group) {
-                    var oldX = group.x; 
-                    var oldY = group.y; 
-                    RED.group.addToGroup(group, nn);
-                    var moveEvent = null;
-                    if ((group.x !== oldX) ||
-                        (group.y !== oldY)) {
-                        moveEvent = {
-                            t: "move",
-                            nodes: [{n: group,
-                                     ox: oldX, oy: oldY,
-                                     dx: group.x -oldX,
-                                     dy: group.y -oldY}],
-                            dirty: true
                        };
+                        if (moveEvent) {
+                            historyEvent.events.push(moveEvent)
+                        }
+                        historyEvent.events.push({
+                            t: "addToGroup",
+                            group: group,
+                            nodes: nn
+                        })
                    }
-                    historyEvent = {
-                        t: 'multi',
-                        events: [historyEvent],

-                    };
-                    if (moveEvent) {
-                        historyEvent.events.push(moveEvent)
+                    RED.history.push(historyEvent);
+                    RED.editor.validateNode(nn);
+                    RED.nodes.dirty(true);
+                    // auto select dropped node - so info shows (if visible)
+                    clearSelection();
+                    nn.selected = true;
+                    movingSet.add(nn);
+                    updateActiveNodes();
+                    updateSelection();
+                    redraw();
+
+                    if (nn._def.autoedit) {
+                        RED.editor.edit(nn);
+                    }
+                } catch (error) {
+                    if (error.code != "NODE_RED") {
+                        RED.notify(RED._("notification.error",{message:error.toString()}),"error");
+                    } else {
+                        RED.notify(RED._("notification.error",{message:error.message}),"error");
                    }
-                    historyEvent.events.push({
-                        t: "addToGroup",
-                        group: group,
-                        nodes: nn
-                    })
-                }
-
-                RED.history.push(historyEvent);
-                RED.editor.validateNode(nn);
-                RED.nodes.dirty(true);
-                // auto select dropped node - so info shows (if visible)
-                clearSelection();
-                nn.selected = true;
-                movingSet.add(nn);
-                updateActiveNodes();
-                updateSelection();
-                redraw();
-
-                if (nn._def.autoedit) {
-                    RED.editor.edit(nn);
                }
            }
        });
@@ -6063,14 +6071,19 @@ RED.view = (function() {
     function createNode(type, x, y, z) {
        const wasDirty = RED.nodes.dirty()
        var m = /^subflow:(.+)$/.exec(type);
-        var activeSubflow = z ? RED.nodes.subflow(z) : null;
+        var activeSubflow = (z || RED.workspaces.active()) ? RED.nodes.subflow(z || RED.workspaces.active()) : null;
+
        if (activeSubflow && m) {
            var subflowId = m[1];
+            let err
            if (subflowId === activeSubflow.id) {
-                throw new Error(RED._("notification.error", { message: RED._("notification.errors.cannotAddSubflowToItself") }))
+                err = new Error(RED._("notification.errors.cannotAddSubflowToItself"))
+            } else if (RED.nodes.subflowContains(m[1], activeSubflow.id)) {
+                err = new Error(RED._("notification.errors.cannotAddCircularReference"))
            }
-            if (RED.nodes.subflowContains(m[1], activeSubflow.id)) {
-                throw new Error(RED._("notification.error", { message: RED._("notification.errors.cannotAddCircularReference") }))
+            if (err) {
+                err.code = 'NODE_RED'
+                throw err
            }
        }

--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -401,6 +401,7 @@ RED.workspaces = (function() {
                if (tab.type === "tab") {
                    workspaceTabCount--;
                } else {
+                    RED.events.emit("workspace:close",{workspace: tab.id})
                    hideStack.push(tab.id);
                }
                RED.menu.setDisabled("menu-item-workspace-delete",activeWorkspace === 0 || workspaceTabCount <= 1);
@@ -491,6 +492,11 @@ RED.workspaces = (function() {
        createWorkspaceTabs();
        RED.events.on("sidebar:resize",workspace_tabs.resize);

+        RED.events.on("workspace:clear", () => {
+            // Reset the index used to generate new flow names
+            workspaceIndex = 0
+        })
+
        RED.actions.add("core:show-next-tab",function() {
            var oldActive = activeWorkspace;
            workspace_tabs.nextTab();
@@ -657,6 +663,9 @@ RED.workspaces = (function() {
        RED.events.on("flows:change", (ws) => {
            $("#red-ui-tab-"+(ws.id.replace(".","-"))).toggleClass('red-ui-workspace-changed',!!(ws.contentsChanged || ws.changed || ws.added));
        })
+        RED.events.on("subflows:change", (ws) => {
+            $("#red-ui-tab-"+(ws.id.replace(".","-"))).toggleClass('red-ui-workspace-changed',!!(ws.contentsChanged || ws.changed || ws.added));
+        })

        hideWorkspace();
    }
--- a/packages/node_modules/@node-red/editor-client/src/js/user.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/user.js
@@ -187,6 +187,7 @@ RED.user = (function() {
    }

    function logout() {
+        RED.events.emit('logout')
        var tokens = RED.settings.get("auth-tokens");
        var token = tokens?tokens.access_token:"";
        $.ajax({
@@ -211,6 +212,8 @@ RED.user = (function() {

    function updateUserMenu() {
        $("#red-ui-header-button-user-submenu li").remove();
+        const userMenu = $("#red-ui-header-button-user")
+        userMenu.empty()
        if (RED.settings.user.anonymous) {
            RED.menu.addItem("red-ui-header-button-user",{
                id:"usermenu-item-login",
@@ -238,7 +241,8 @@ RED.user = (function() {
                }
            });
        }
-
+        const userIcon = generateUserIcon(RED.settings.user)
+        userIcon.appendTo(userMenu);
    }

    function init() {
@@ -247,14 +251,6 @@ RED.user = (function() {

                var userMenu = $('<li><a id="red-ui-header-button-user" class="button hide" href="#"></a></li>')
                    .prependTo(".red-ui-header-toolbar");
-                if (RED.settings.user.image) {
-                    $('<span class="user-profile"></span>').css({
-                        backgroundImage: "url("+RED.settings.user.image+")",
-                    }).appendTo(userMenu.find("a"));
-                } else {
-                    $('<i class="fa fa-user"></i>').appendTo(userMenu.find("a"));
-                }
-
                RED.menu.init({id:"red-ui-header-button-user",
                    options: []
                });
@@ -317,12 +313,30 @@ RED.user = (function() {
        return false;
    }

+    function generateUserIcon(user) {
+        const userIcon = $('<span class="red-ui-user-profile"></span>')
+        if (user.image) {
+            userIcon.addClass('has_profile_image')
+            userIcon.css({
+                backgroundImage: "url("+user.image+")",
+            })
+        } else if (user.anonymous) {
+            $('<i class="fa fa-user"></i>').appendTo(userIcon);
+        } else {
+            $('<span>').text(user.username.substring(0,2)).appendTo(userIcon);
+        }
+        if (user.profileColor !== undefined) {
+            userIcon.addClass('red-ui-user-profile-color-' + user.profileColor)
+        }
+        return userIcon
+    }

    return {
        init: init,
        login: login,
        logout: logout,
-        hasPermission: hasPermission
+        hasPermission: hasPermission,
+        generateUserIcon
    }

 })();
--- a/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
@@ -314,6 +314,16 @@ $spinner-color: #999;

 $tab-icon-color: #dedede;

+// Anonymous User Colors
+
+$user-profile-colors: (
+    1: #822e81,
+    2: #955e42,
+    3: #9c914f,
+    4: #748e54,
+    5: #06bcc1
+);
+
 // Deprecated
 $text-color-green: $text-color-success;
 $info-text-code-color: $text-color-code;
--- a/packages/node_modules/@node-red/editor-client/src/sass/header.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
@@ -63,25 +63,29 @@
    }

    .red-ui-header-toolbar {
+        display: flex;
+        align-items: stretch;
        padding: 0;
        margin: 0;
        list-style: none;
        float: right;

        > li {
-            display: inline-block;
+            display: inline-flex;
+            align-items: stretch;
            padding: 0;
            margin: 0;
            position: relative;
-
        }
    }

    .button {
+        height: 100%;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
        min-width: 20px;
        text-align: center;
-        line-height: 40px;
-        display: inline-block;
        font-size: 20px;
        padding: 0px 12px;
        text-decoration: none;
@@ -270,18 +274,44 @@
    #usermenu-item-username > .red-ui-menu-label {
        color: var(--red-ui-header-menu-heading-color);
    }
+}

-    #red-ui-header-button-user .user-profile {
-        background-position: center center;
-        background-repeat: no-repeat;
-        background-size: contain;
-        display: inline-block;
-        width: 40px;
-        height: 35px;
-        vertical-align: middle;
+
+.red-ui-user-profile {
+    background-color: var(--red-ui-header-background);
+    border: 2px solid var(--red-ui-header-menu-color);
+    border-radius: 30px;
+    overflow: hidden;
+
+    background-position: center center;
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    vertical-align: middle;
+    width: 30px;
+    height: 30px;
+    font-size: 20px;
+
+    &.red-ui-user-profile-color-1 {
+        background-color: var(--red-ui-user-profile-colors-1);
+    }
+    &.red-ui-user-profile-color-2 {
+        background-color: var(--red-ui-user-profile-colors-2);
+    }
+    &.red-ui-user-profile-color-3 {
+        background-color: var(--red-ui-user-profile-colors-3);
+    }
+    &.red-ui-user-profile-color-4 {
+        background-color: var(--red-ui-user-profile-colors-4);
+    }
+    &.red-ui-user-profile-color-5 {
+        background-color: var(--red-ui-user-profile-colors-5);
    }
 }

+
@media only screen and (max-width: 450px) {
    span.red-ui-header-logo > span {
        display: none;
--- a/packages/node_modules/@node-red/editor-client/src/sass/multiplayer.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/multiplayer.scss
@@ -0,0 +1,116 @@
+#red-ui-multiplayer-user-list {
+    display: inline-flex;
+    align-items: center;
+    margin: 0 5px;
+    li {
+        display: inline-flex;
+        align-items: center;
+        margin: 0 2px;
+    }
+
+}
+
+.red-ui-multiplayer-user-icon {
+    background: none;
+    border: none;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    text-align: center;
+    box-sizing: border-box;
+    text-decoration: none;
+    color: var(--red-ui-header-menu-color);
+    padding: 0px;
+    margin: 0px;
+    vertical-align: middle;
+
+    &:focus {
+        outline: none;
+    }
+
+    .red-ui-multiplayer-user.inactive & {
+        opacity: 0.5;
+    }
+    .red-ui-user-profile {
+        width: 20px;
+        border-radius: 20px;
+        height: 20px;
+        font-size: 12px
+    }
+}
+.red-ui-multiplayer-users-tray {
+    position: absolute;
+    top: 5px;
+    right: 20px;
+    line-height: normal;
+    cursor: pointer;
+    // &:hover {
+    //     .red-ui-multiplayer-user-location {
+    //         margin-left: 1px;
+    //     }
+    // }
+}
+$multiplayer-user-icon-background: var(--red-ui-primary-background);
+$multiplayer-user-icon-border: var(--red-ui-view-background);
+$multiplayer-user-icon-text-color: var(--red-ui-header-menu-color);
+$multiplayer-user-icon-count-text-color: var(--red-ui-primary-color);
+$multiplayer-user-icon-shadow: 0px 0px 4px var(--red-ui-shadow);
+.red-ui-multiplayer-user-location {
+    display: inline-block;
+    margin-left: -6px;
+    transition: margin-left 0.2s;
+    .red-ui-user-profile {
+        border: 1px solid $multiplayer-user-icon-border;
+        color: $multiplayer-user-icon-text-color;
+        width: 18px;
+        height: 18px;
+        border-radius: 18px;
+        font-size: 10px;
+        font-weight: normal;
+        box-shadow: $multiplayer-user-icon-shadow;
+        &.red-ui-multiplayer-user-count {
+            color: $multiplayer-user-icon-count-text-color;
+            background-color: $multiplayer-user-icon-background;
+        }
+    }
+}
+
+.red-ui-multiplayer-annotation {
+    .red-ui-multiplayer-annotation-background {
+        filter: drop-shadow($multiplayer-user-icon-shadow);
+        fill: $multiplayer-user-icon-background;
+        &.red-ui-user-profile-color-1 {
+            fill: var(--red-ui-user-profile-colors-1);
+        }
+        &.red-ui-user-profile-color-2 {
+            fill: var(--red-ui-user-profile-colors-2);
+        }
+        &.red-ui-user-profile-color-3 {
+            fill: var(--red-ui-user-profile-colors-3);
+        }
+        &.red-ui-user-profile-color-4 {
+            fill: var(--red-ui-user-profile-colors-4);
+        }
+        &.red-ui-user-profile-color-5 {
+            fill: var(--red-ui-user-profile-colors-5);
+        }
+    }
+    .red-ui-multiplayer-annotation-border {
+        stroke: $multiplayer-user-icon-border;
+        stroke-width: 1px;
+        fill: none;
+    }
+    .red-ui-multiplayer-annotation-anon-label {
+        fill: $multiplayer-user-icon-text-color;
+        stroke: none;
+    }
+    text {
+        user-select: none;
+        fill: $multiplayer-user-icon-text-color;
+        stroke: none;
+        font-size: 10px;   
+        &.red-ui-multiplayer-user-count {
+            fill: $multiplayer-user-icon-count-text-color;
+        }     
+    }
+}
--- a/packages/node_modules/@node-red/editor-client/src/sass/style.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/style.scss
@@ -73,3 +73,5 @@
@import "radialMenu";

@import "tourGuide";
+
+@import "multiplayer";
--- a/packages/node_modules/@node-red/editor-client/src/sass/variables.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/variables.scss
@@ -299,4 +299,7 @@

    --red-ui-tab-icon-color: #{$tab-icon-color};

+    @each $current-color in 1 2 3 4 5 {
+        --red-ui-user-profile-colors-#{"" + $current-color}: #{map-get($user-profile-colors, $current-color)};
+    }
 }
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-config-select.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-config-select.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-multiplayer.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-multiplayer.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-plugins.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-plugins.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/welcome.js
+++ b/packages/node_modules/@node-red/editor-client/src/tours/welcome.js
@@ -1,12 +1,12 @@
 export default {
-    version: "4.0.0-beta.1",
+    version: "4.0.0-beta.2",
    steps: [
        {
            titleIcon: "fa fa-map-o",
            title: {
-                "en-US": "Welcome to Node-RED 4.0 Beta 1!",
-                "ja": "Node-RED 4.0 Beta 1へようこそ!",
-                "fr": "Bienvenue dans Node-RED 4.0 Beta 1!"
+                "en-US": "Welcome to Node-RED 4.0 Beta 2!",
+                "ja": "Node-RED 4.0 Beta 2へようこそ!",
+                "fr": "Bienvenue dans Node-RED 4.0 Beta 2!"
            },
            description: {
                "en-US": "<p>Let's take a moment to discover the new features in this release.</p>",
@@ -14,10 +14,63 @@ export default {
                "fr": "<p>Prenons un moment pour découvrir les nouvelles fonctionnalités de cette version.</p>"
            }
        },
+        {
+            title: {
+                "en-US": "Multiplayer Mode"
+            },
+            image: 'images/nr4-multiplayer.png',
+            description: {
+                "en-US": `<p>This release includes the first small steps towards making Node-RED easier
+                to work with when you have multiple people editing flows at the same time.</p>
+                <p>When this feature is enabled, you will now see who else has the editor open and some
+                basic information on where they are in the editor.</p>
+                <p>Check the release post for details on how to enable this feature in your settings file.</p>`
+            }
+        },
+        {
+            title: {
+                "en-US": "Better Configuration Node UX"
+            },
+            image: 'images/nr4-config-select.png',
+            description: {
+                "en-US": `<p>The Configuration node selection UI has had a small update to have a dedicated 'add' button
+                next to the select box.</p>
+                <p>It's a small change, but should make it easier to work with your config nodes.</p>`
+            }
+        },
+        {
+            title: {
+                "en-US": "Remembering palette state"
+            },
+            description: {
+                "en-US": `<p>The palette now remembers what categories you have hidden between reloads - as well as any
+                filter you have applied.</p>`
+            }
+        },
+        {
+            title: {
+                "en-US": "Plugins shown in the Palette Manager"
+            },
+            image: 'images/nr4-plugins.png',
+            description: {
+                "en-US": `<p>The palette manager now shows any plugin modules you have installed, such as
+                <code>node-red-debugger</code>. Previously they would only be shown if they plugin include
+                nodes for the palette.</p>`
+            }
+        },
+        {
+            title: {
+                "en-US": "That's if for Beta 2!"
+            },
+            description: {
+                "en-US": `<p>Keep clicking through to see what was added in Beta 1</p>`
+            }
+        },
        {
            title: {
                "en-US": "Timestamp formatting options",
-                "ja": "タイムスタンプの形式の項目"
+                "ja": "タイムスタンプの形式の項目",
+                "fr": "Options de formatage de l'horodatage"
            },
            image: 'images/nr4-timestamp-formatting.png',
            description: {
@@ -34,13 +87,21 @@ export default {
                    <li>エポックからのミリ秒 - 従来動作と同じになるタイムスタンプの項目</li>
                    <li>ISO 8601 - 多くのシステムで使用されている共通の形式</li>
                    <li>JavaScript日付オブジェクト</li>
+                </ul>`,
+                "fr": `<p>Les noeuds qui vous permettent de définir un horodatage disposent désormais d'options sur le format dans lequel cet horodatage peut être défini.</p>
+                <p>Nous gardons les choses simples en proposant trois options :<p>
+                <ul>
+                    <li>Millisecondes depuis l'époque : il s'agit du comportement existant de l'option d'horodatage</li>
+                    <li>ISO 8601 : un format commun utilisé par de nombreux systèmes</li>
+                    <li>Objet Date JavaScript</li>
                </ul>`
            }
        },
        {
            title: {
                "en-US": "Auto-complete of flow/global and env types",
-                "ja": "フロー/グローバル、環境変数の型の自動補完"
+                "ja": "フロー/グローバル、環境変数の型の自動補完",
+                "fr": "Saisie automatique des types de flux/global et env"
            },
            image: 'images/nr4-auto-complete.png',
            description: {
@@ -48,13 +109,17 @@ export default {
                now all include auto-complete suggestions based on the live state of your flows.</p>
                `,
                "ja": `<p><code>flow</code>/<code>global</code>コンテキストや<code>env</code>の入力を、現在のフローの状態をもとに自動補完で提案するようになりました。</p>
-                `
+                `,
+                "fr": `<p>Les entrées contextuelles <code>flow</code>/<code>global</code> et l'entrée <code>env</code>
+                incluent désormais des suggestions de saisie semi-automatique basées sur l'état actuel de vos flux.</p>
+                `,
            }
        },
        {
            title: {
                "en-US": "Config node customisation in Subflows",
-                "ja": "サブフローでの設定ノードのカスタマイズ"
+                "ja": "サブフローでの設定ノードのカスタマイズ",
+                "fr": "Personnalisation du noeud de configuration dans les sous-flux"
            },
            image: 'images/nr4-sf-config.png',
            description: {
@@ -65,6 +130,11 @@ export default {
                `,
                "ja": `<p>サブフローをカスタマイズして、選択した型の異なる設定ノードを各インスタンスが使用できるようになりました。</p>
                <p>例えば、MQTTブローカへ接続し、メッセージ受信と後処理を行うサブフローの各インスタンスに異なるブローカを指定することも可能です。</p>
+                `,
+                "fr": `<p>Les sous-flux peuvent désormais être personnalisés pour permettre à chaque instance d'utiliser un
+                noeud de configuration d'un type sélectionné.</p>
+                <p>Par exemple, chaque instance d'un sous-flux qui se connecte à un courtier MQTT et effectue un post-traitement
+                des messages reçus peut être pointée vers un autre courtier.</p>
                `
            }
        },
@@ -90,6 +160,14 @@ export default {
                            <li>WebSocketノードのカスタマイズ可能なヘッダ</li>
                            <li>Splitノードは、メッセージプロパティで操作できるようになりました</li>
                            <li>他にも沢山あります...</li>
+                          </ul>`,
+                "fr": `<p>Les noeuds principaux ont reçu de nombreux correctifs mineurs ainsi que des améliorations. La documentation a été mise à jour.
+                          Consultez le journal des modifications dans la barre latérale d'aide pour une liste complète. Ci-dessous, les changements les plus importants :</p>
+                          <ul>
+                            <li>Un mode CSV entièrement conforme à la norme RFC4180</li>
+                            <li>En-têtes personnalisables pour le noeud WebSocket</li>
+                            <li>Le noeud Split peut désormais fonctionner sur n'importe quelle propriété de message</li>
+                            <li>Et bien plus encore...</li>
                          </ul>`
            }
        }
--- a/packages/node_modules/@node-red/nodes/core/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.html
@@ -378,7 +378,7 @@
                            return { id: id, label: RED.nodes.workspace(id).label } //flow id + name
                        } else {
                            const instanceNode = RED.nodes.node(id)
-                            const pathLabel = (instanceNode.name || RED.nodes.subflow(instanceNode.type.substring(8)).name)
+                            const pathLabel = (instanceNode.name || RED.nodes.subflow(instanceNode.type.substring(8))?.name || instanceNode.type)
                            return { id: id, label: pathLabel }
                        }
                    })
--- a/packages/node_modules/@node-red/nodes/core/function/15-change.js
+++ b/packages/node_modules/@node-red/nodes/core/function/15-change.js
@@ -233,9 +233,12 @@ module.exports = function(RED) {
                                                    // only replace if they match exactly
                                                    RED.util.setMessageProperty(msg,property,value);
                                                } else {
-                                                    // if target is boolean then just replace it
-                                                    if (rule.tot === "bool") { current = value; }
-                                                    else { current = current.replace(fromRE,value); }
+                                                    current = current.replace(fromRE,value);
+                                                    if (rule.tot === "bool" && current === ""+value) {
+                                                        // If the target type is boolean, and the replace call has resulted in "true"/"false",
+                                                        // convert to boolean type (which 'value' already is)
+                                                        current = value
+                                                    }
                                                    RED.util.setMessageProperty(msg,property,current);
                                                }
                                            } else if ((typeof current === 'number' || current instanceof Number) && fromType === 'num') {
--- a/packages/node_modules/@node-red/nodes/core/function/90-exec.js
+++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.js
@@ -20,6 +20,7 @@ module.exports = function(RED) {
    var exec = require('child_process').exec;
    var fs = require('fs');
    var isUtf8 = require('is-utf8');
+    const isWindows = process.platform === 'win32'

    function ExecNode(n) {
        RED.nodes.createNode(this,n);
@@ -85,9 +86,12 @@ module.exports = function(RED) {
                        }
                    });
                    var cmd = arg.shift();
+                    // Since 18.20.2/20.12.2, it is invalid to call spawn on Windows with a .bat/.cmd file
+                    // without using shell: true. 
+                    const opts = isWindows ? { ...node.spawnOpt, shell: true } : node.spawnOpt
                    /* istanbul ignore else  */
                    node.debug(cmd+" ["+arg+"]");
-                    child = spawn(cmd,arg,node.spawnOpt);
+                    child = spawn(cmd,arg,opts);
                    node.status({fill:"blue",shape:"dot",text:"pid:"+child.pid});
                    var unknownCommand = (child.pid === undefined);
                    if (node.timer !== 0) {
--- a/packages/node_modules/@node-red/nodes/locales/fr/common/91-global-config.html
+++ b/packages/node_modules/@node-red/nodes/locales/fr/common/91-global-config.html
@@ -0,0 +1,3 @@
+<script type="text/html" data-help-name="global-config">
+    <p>Un noeud pour contenir la configuration globale des flux.</p>
+</script>
--- a/packages/node_modules/@node-red/nodes/locales/fr/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/fr/messages.json
@@ -94,6 +94,7 @@
    },
    "catch": {
        "catch": "catch : tout",
+        "catchGroup": "catch: groupe",
        "catchNodes": "catch : __number__",
        "catchUncaught": "catch : non capturé",
        "label": {
@@ -109,6 +110,7 @@
    },
    "status": {
        "status": "statut : tout",
+        "statusGroup": "statut: groupe",
        "statusNodes": "statut : __number__",
        "label": {
            "source": "Signaler l'état de",
@@ -250,7 +252,8 @@
            "initialize": "Au démarrage",
            "finalize": "À l'arrêt",
            "outputs": "Sorties",
-            "modules": "Modules"
+            "modules": "Modules",
+            "timeout": "Délai d'attente"
        },
        "text": {
            "initialize": "// Le code ajouté ici sera exécuté une fois\n// à chaque démarrage du noeud.\n",
@@ -847,7 +850,13 @@
            "newline": "Nouvelle ligne",
            "usestrings": "Analyser les valeurs numériques",
            "include_empty_strings": "Inclure les chaînes vides",
-            "include_null_values": "Inclure les valeurs nulles"
+            "include_null_values": "Inclure les valeurs nulles",
+            "spec": "Analyseur"
+        },
+        "spec": {
+            "rfc": "RFC4180",
+            "legacy": "Hérité (Legacy)",
+            "legacy_warning": "Le mode hérité sera supprimé dans une prochaine version."
        },
        "placeholder": {
            "columns": "noms de colonnes séparés par des virgules"
@@ -876,6 +885,7 @@
            "once": "envoyer les en-têtes une fois, jusqu'à msg.reset"
        },
        "errors": {
+            "bad_template": "Colonnes du modèle mal formées.",
            "csv_js": "Ce noeud ne gère que les chaînes CSV ou les objets js.",
            "obj_csv": "Aucun modèle de colonnes spécifié pour l'objet -> CSV.",
            "bad_csv": "Données CSV mal formées - sortie probablement corrompue."
@@ -885,12 +895,14 @@
        "label": {
            "select": "Sélecteur",
            "output": "Sortie",
-            "in": "dans"
+            "in": "dans",
+            "prefix": "Nom de la propriété pour le contenu HTML"
        },
        "output": {
            "html": "le contenu html des éléments",
            "text": "uniquement le contenu textuel des éléments",
-            "attr": "un objet de n'importe quel attribut des éléments"
+            "attr": "un objet de n'importe quel attribut des éléments",
+            "compl": "un objet pour tous les attributs de tous les éléments ainsi que du contenu HTML"
        },
        "format": {
            "single": "comme un seul message contenant un tableau",
--- a/packages/node_modules/@node-red/nodes/locales/fr/network/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/locales/fr/network/31-tcpin.html
@@ -30,6 +30,8 @@
    avant d'être envoyé.</p>
    <p>Si <code>msg._session</code> n'est pas présent, la charge utile est
    envoyé à <b>tous</b> les clients connectés.</p>
+    <p>En mode Répondre à, définir <code>msg.reset = true</code> réinitialisera la connexion
+    spécifiée par _session.id ou toutes les connexions si aucun _session.id n'est spécifié.</p>
    <p><b>Remarque</b> : Sur certains systèmes, vous aurez peut-être besoin d'un accès root ou administrateur
    pour accéder aux ports inférieurs à 1024.</p>
 </script>
@@ -40,6 +42,8 @@
    caractères renvoyés dans un tampon fixe, correspondant à un caractère spécifié avant de revenir,
    attendre un délai fixe à partir de la première réponse, puis revenir, s'installer et attender les données, ou envoie puis ferme la connexion
    immédiatement, sans attendre de réponse.</p>
+    <p>Dans le cas du mode veille (maintien de la connexion), vous pouvez envoyer <code>msg.reset = true</code> ou <code>msg.reset = "host:port"</code> pour forcer une interruption
+    de la connexion et une reconnexion automatique.</p>
    <p>La réponse sortira dans <code>msg.payload</code> en tant que tampon, vous pouvez alors utiliser la fonction .toString().</p>
    <p>Si vous laissez l'hôte ou le port tcp vide, ils doivent être définis à l'aide des propriétés <code>msg.host</code> et <code>msg.port</code> dans chaque message envoyé au noeud.</ p>
 </script>
--- a/packages/node_modules/@node-red/nodes/locales/fr/parsers/70-CSV.html
+++ b/packages/node_modules/@node-red/nodes/locales/fr/parsers/70-CSV.html
@@ -36,7 +36,9 @@
    </dl>
    <h3>Détails</h3>
    <p>Le modèle de colonne peut contenir une liste ordonnée de noms de colonnes. Lors de la conversion de CSV en objet, les noms de colonne
-        seront utilisés comme noms de propriété. Alternativement, les noms de colonne peuvent être tirés de la première ligne du CSV.</p>
+        seront utilisés comme noms de propriété. Alternativement, les noms de colonne peuvent être tirés de la première ligne du CSV.
+        <p>Lorsque l'analyseur RFC est sélectionné, le modèle de colonne doit être conforme à la norme RFC4180.</p>
+    </p>
    <p>Lors de la conversion au format CSV, le modèle de colonnes est utilisé pour identifier les propriétés à extraire de l'objet et dans quel ordre.</p>
    <p>Si le modèle de colonnes est vide, vous pouvez utiliser une simple liste de propriétés séparées par des virgules fournies dans <code>msg.columns</code> pour
        déterminer quoi extraire et dans quel ordre. Si ni l'un ni l'autre n'est présent, toutes les propriétés de l'objet sont sorties dans l'ordre
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/nodes",
-    "version": "4.0.0-beta.1",
+    "version": "4.0.0-beta.2",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- a/packages/node_modules/@node-red/registry/lib/externalModules.js
+++ b/packages/node_modules/@node-red/registry/lib/externalModules.js
@@ -273,7 +273,7 @@ async function installModule(moduleDetails) {
                let extraArgs = triggerPayload.args || [];
                let args = ['install', ...extraArgs, installSpec]
                log.trace(NPM_COMMAND + JSON.stringify(args));
-                return exec.run(NPM_COMMAND, args, { cwd: installDir },true)
+                return exec.run(NPM_COMMAND, args, { cwd: installDir, shell: true },true)
            } else {
                log.trace("skipping npm install");
            }
--- a/packages/node_modules/@node-red/registry/lib/installer.js
+++ b/packages/node_modules/@node-red/registry/lib/installer.js
@@ -25,14 +25,17 @@ const registryUtil = require("./util");
 const library = require("./library");
 const {exec,log,events,hooks} = require("@node-red/util");
 const child_process = require('child_process');
-const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-let installerEnabled = false;

 const plugins = require("./plugins");

+const isWindows = process.platform === 'win32'
+const npmCommand =  isWindows ? 'npm.cmd' : 'npm';
+
+let installerEnabled = false;
 let settings;
+
 const moduleRe = /^(@[^/@]+?[/])?[^/@]+?$/;
-const slashRe = process.platform === "win32" ? /\\|[/]/ : /[/]/;
+const slashRe = isWindows ? /\\|[/]/ : /[/]/;
 const pkgurlRe = /^(https?|git(|\+https?|\+ssh|\+file)):\/\//;
 const localtgzRe = /^([a-zA-Z]:|\/).+tgz$/;

@@ -227,7 +230,7 @@ async function installModule(module,version,url) {
                let extraArgs = triggerPayload.args || [];
                let args = ['install', ...extraArgs, installName]
                log.trace(npmCommand + JSON.stringify(args));
-                return exec.run(npmCommand,args,{ cwd: installDir}, true)
+                return exec.run(npmCommand,args,{ cwd: installDir, shell: true }, true)
            } else {
                log.trace("skipping npm install");
            }
@@ -262,7 +265,7 @@ async function installModule(module,version,url) {
                log.warn("------------------------------------------");
                e = new Error(log._("server.install.install-failed")+": "+err.toString());
                if (err.hook === "postInstall") {
-                    return exec.run(npmCommand,["remove",module],{ cwd: installDir}, false).finally(() => {
+                    return exec.run(npmCommand,["remove",module],{ cwd: installDir, shell: true }, false).finally(() => {
                        throw e;
                    })
                }
@@ -366,7 +369,7 @@ async function getModuleVersionFromNPM(module, version) {
    }

    return new Promise((resolve, reject) => {
-        child_process.execFile(npmCommand,['info','--json',installName],function(err,stdout,stderr) {
+        child_process.execFile(npmCommand,['info','--json',installName],{ shell: true },function(err,stdout,stderr) {
            try {
                if (!stdout) {
                    log.warn(log._("server.install.install-failed-not-found",{name:module}));
@@ -525,7 +528,7 @@ function uninstallModule(module) {
                    let extraArgs = triggerPayload.args || [];
                    let args = ['remove', ...extraArgs, module]
                    log.trace(npmCommand + JSON.stringify(args));
-                    return exec.run(npmCommand,args,{ cwd: installDir}, true)
+                    return exec.run(npmCommand,args,{ cwd: installDir, shell: true }, true)
                } else {
                    log.trace("skipping npm uninstall");
                }
@@ -592,7 +595,7 @@ async function checkPrereq() {
        installerEnabled = false;
    } else {
        return new Promise(resolve => {
-            child_process.execFile(npmCommand,['-v'],function(err,stdout) {
+            child_process.execFile(npmCommand,['-v'],{ shell: true },function(err,stdout) {
                if (err) {
                    log.info(log._("server.palette-editor.npm-not-found"));
                    installerEnabled = false;
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/registry",
-    "version": "4.0.0-beta.1",
+    "version": "4.0.0-beta.2",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,11 +16,11 @@
        }
    ],
    "dependencies": {
-        "@node-red/util": "4.0.0-beta.1",
+        "@node-red/util": "4.0.0-beta.2",
        "clone": "2.1.2",
        "fs-extra": "11.1.1",
        "semver": "7.5.4",
-        "tar": "6.1.13",
+        "tar": "6.2.1",
        "uglify-js": "3.17.4"
    }
 }
--- a/packages/node_modules/@node-red/runtime/lib/api/comms.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/comms.js
@@ -36,7 +36,7 @@ var connections = [];
 const events = require("@node-red/util").events;

 function handleCommsEvent(event) {
-    publish(event.topic,event.data,event.retain);
+    publish(event.topic,event.data,event.retain,event.session,event.excludeSession);
 }
 function handleStatusEvent(event) {
    if (!event.status) {
@@ -74,13 +74,17 @@ function handleEventLog(event) {
    publish("event-log/"+event.id,event.payload||{});
 }

-function publish(topic,data,retain) {
+function publish(topic, data, retain, session, excludeSession) {
    if (retain) {
        retained[topic] = data;
    } else {
        delete retained[topic];
    }
-    connections.forEach(connection => connection.send(topic,data))
+    connections.forEach(connection => {
+        if ((!session || connection.session === session) && (!excludeSession || connection.session !== excludeSession)) {
+            connection.send(topic,data)
+        }
+    })
 }


@@ -109,6 +113,10 @@ var api = module.exports = {
    */
    addConnection: async function(opts) {
        connections.push(opts.client);
+        events.emit('comms:connection-added', {
+            session: opts.client.session,
+            user: opts.client.user
+        })
    },

    /**
@@ -126,6 +134,9 @@ var api = module.exports = {
                break;
            }
        }
+        events.emit('comms:connection-removed', { 
+            session: opts.client.session
+        })
    },

    /**
@@ -157,5 +168,23 @@ var api = module.exports = {
    * @return {Promise<Object>} - resolves when complete
    * @memberof @node-red/runtime_comms
    */
-    unsubscribe: async function(opts) {}
+    unsubscribe: async function(opts) {},
+
+    /**
+     * @param {Object} opts
+     * @param {User} opts.user - the user calling the api
+     * @param {CommsConnection} opts.client - the client connection
+     * @param {String} opts.topic - the message topic
+     * @param {String} opts.data - the message data
+     * @return {Promise<Object>} - resolves when complete
+     */
+    receive: async function (opts) {
+        if (opts.topic) {
+            events.emit('comms:message:' + opts.topic, {
+                session: opts.client.session,
+                user: opts.user,
+                data: opts.data
+            })
+        }
+    }
 };
--- a/packages/node_modules/@node-red/runtime/lib/flows/util.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/util.js
@@ -106,14 +106,22 @@ async function evaluateEnvProperties(flow, env, credentials) {
                            result = { value: result, __clone__: true}
                        }
                        evaluatedEnv[name] = result
+                    } else {
+                        evaluatedEnv[name] = undefined
+                        flow.error(`Error evaluating env property '${name}': ${err.toString()}`)
                    }
                    resolve()
                });
            }))
        } else {
-            value = redUtil.evaluateNodeProperty(value, type, {_flow: flow}, null, null);
-            if (typeof value  === 'object') {
-                value = { value: value, __clone__: true}
+            try {
+                value = redUtil.evaluateNodeProperty(value, type, {_flow: flow}, null, null);
+                if (typeof value  === 'object') {
+                    value = { value: value, __clone__: true}
+                }
+            } catch (err) {
+                value = undefined
+                flow.error(`Error evaluating env property '${name}': ${err.toString()}`)
            }
        }
        evaluatedEnv[name] = value
--- a/packages/node_modules/@node-red/runtime/lib/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/index.js
@@ -22,6 +22,7 @@ var storage = require("./storage");
 var library = require("./library");
 var plugins = require("./plugins");
 var settings = require("./settings");
+const multiplayer = require("./multiplayer");

 var express = require("express");
 var path = require('path');
@@ -135,6 +136,7 @@ function start() {
        .then(function() { return storage.init(runtime)})
        .then(function() { return settings.load(storage)})
        .then(function() { return library.init(runtime)})
+        .then(function() { return multiplayer.init(runtime)})
        .then(function() {
            if (settings.available()) {
                if (settings.get('instanceId') === undefined) {
--- a/packages/node_modules/@node-red/runtime/lib/multiplayer/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/multiplayer/index.js
@@ -0,0 +1,119 @@
+let runtime
+
+/**
+ * Active sessions, mapped by multiplayer session ids
+ */
+const sessions = new Map()
+
+/**
+ * Active connections, mapping comms session to multiplayer session
+ */
+const connections = new Map()
+
+
+function getSessionsList() {
+    return Array.from(sessions.values()).filter(session => session.active)
+}
+
+module.exports = {
+    init: function(_runtime) {
+        runtime = _runtime
+        runtime.events.on('comms:connection-removed', (opts) => {
+            const existingSessionId = connections.get(opts.session)
+            if (existingSessionId) {
+                connections.delete(opts.session)
+                const session = sessions.get(existingSessionId)
+                session.active = false
+                session.idleTimeout = setTimeout(() => {
+                    sessions.delete(existingSessionId)
+                }, 30000)
+                runtime.events.emit('comms', {
+                    topic: "multiplayer/connection-removed",
+                    data: { session: existingSessionId }
+                })
+            }
+        })
+        runtime.events.on('comms:message:multiplayer/connect', (opts) => {
+            let session
+            if (!sessions.has(opts.data.session)) {
+                // Brand new session
+                let user = opts.user
+                if (!user || user.anonymous) {
+                    user = user || { anonymous: true }
+                    user.username = `Anon ${Math.floor(Math.random()*100)}`
+                }
+                session = {
+                    session: opts.data.session,
+                    user,
+                    active: true
+                }
+                sessions.set(opts.data.session, session)
+                connections.set(opts.session, opts.data.session)
+                runtime.log.trace(`multiplayer new session:${opts.data.session} user:${user.username}`)
+            } else {
+                // Reconnected connection - keep existing state
+                connections.set(opts.session, opts.data.session)
+                // const existingConnection  = connections.get(opts.data.session)
+                session = sessions.get(opts.data.session)
+                session.active = true
+                runtime.log.trace(`multiplayer reconnected session:${opts.data.session} user:${session.user.username}`)
+                clearTimeout(session.idleTimeout)
+            }
+            // Tell existing sessions about the new connection
+            runtime.events.emit('comms', {
+                topic: "multiplayer/connection-added",
+                excludeSession: opts.session,
+                data: session
+            })
+
+            // Send init info to new connection
+            const initPacket = {
+                topic: "multiplayer/init",
+                data: { sessions: getSessionsList() },
+                session: opts.session
+            }
+            // console.log('<<', initPacket)
+            runtime.events.emit('comms', initPacket)
+        })
+        runtime.events.on('comms:message:multiplayer/disconnect', (opts) => {
+            const existingSessionId = connections.get(opts.session)
+            connections.delete(opts.session)
+            sessions.delete(existingSessionId)
+
+            runtime.events.emit('comms', {
+                topic: "multiplayer/connection-removed",
+                data: { session: existingSessionId, disconnected: true }
+            })
+        })
+        runtime.events.on('comms:message:multiplayer/location', (opts) => {
+            // console.log('>>>', opts.user, opts.data)
+
+            const sessionId = connections.get(opts.session)
+            const session = sessions.get(sessionId)
+
+            if (opts.user) {
+                if (session.user.anonymous !== opts.user.anonymous) {
+                    session.user = opts.user
+                    runtime.events.emit('comms', {
+                        topic: 'multiplayer/connection-added',
+                        excludeSession: opts.session,
+                        data: session
+                    })
+                }
+            }
+
+            session.location = opts.data
+
+            const payload = {
+                session: sessionId,
+                workspace: opts.data.workspace,
+                node: opts.data.node
+            }
+            runtime.events.emit('comms', {
+                topic: 'multiplayer/location',
+                data: payload,
+                excludeSession: opts.session
+            })
+        })
+    }
+}
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/runtime",
-    "version": "4.0.0-beta.1",
+    "version": "4.0.0-beta.2",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,11 +16,11 @@
        }
    ],
    "dependencies": {
-        "@node-red/registry": "4.0.0-beta.1",
-        "@node-red/util": "4.0.0-beta.1",
+        "@node-red/registry": "4.0.0-beta.2",
+        "@node-red/util": "4.0.0-beta.2",
        "async-mutex": "0.4.0",
        "clone": "2.1.2",
-        "express": "4.18.2",
+        "express": "4.19.2",
        "fs-extra": "11.1.1",
        "json-stringify-safe": "5.0.1"
    }
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/util",
-    "version": "4.0.0-beta.1",
+    "version": "4.0.0-beta.2",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
    "name": "node-red",
-    "version": "4.0.0-beta.1",
+    "version": "4.0.0-beta.2",
    "description": "Low-code programming for event-driven applications",
    "homepage": "https://nodered.org",
    "license": "Apache-2.0",
@@ -31,15 +31,15 @@
        "flow"
    ],
    "dependencies": {
-        "@node-red/editor-api": "4.0.0-beta.1",
-        "@node-red/runtime": "4.0.0-beta.1",
-        "@node-red/util": "4.0.0-beta.1",
-        "@node-red/nodes": "4.0.0-beta.1",
+        "@node-red/editor-api": "4.0.0-beta.2",
+        "@node-red/runtime": "4.0.0-beta.2",
+        "@node-red/util": "4.0.0-beta.2",
+        "@node-red/nodes": "4.0.0-beta.2",
        "basic-auth": "2.0.1",
        "bcryptjs": "2.4.3",
-        "express": "4.18.2",
+        "express": "4.19.2",
        "fs-extra": "11.1.1",
-        "node-red-admin": "^3.1.2",
+        "node-red-admin": "^3.1.3",
        "nopt": "5.0.0",
        "semver": "7.5.4"
    },
--- a/packages/node_modules/node-red/settings.js
+++ b/packages/node_modules/node-red/settings.js
@@ -437,6 +437,10 @@ module.exports = {
            }
        },

+        multiplayer: {
+            /** To enable the Multiplayer feature, set this value to true */
+            enabled: false
+        },
    },

 /*******************************************************************************
--- a/test/nodes/core/function/15-change_spec.js
+++ b/test/nodes/core/function/15-change_spec.js
@@ -918,7 +918,7 @@ describe('change Node', function() {
            });
        });

-        it('changes the value and type of the message property if a complete match', function(done) {
+        it('changes the value and type of the message property if a complete match - number', function(done) {
            var flow = [{"id":"changeNode1","type":"change",rules:[{ "t": "change", "p": "payload", "pt": "msg", "from": "123", "fromt": "str", "to": "456", "tot": "num" }],"reg":false,"name":"changeNode","wires":[["helperNode1"]]},
                        {id:"helperNode1", type:"helper", wires:[]}];
            helper.load(changeNode, flow, function() {
@@ -938,6 +938,25 @@ describe('change Node', function() {
            });
        });

+        it('changes the value and type of the message property if a complete match - boolean', function(done) {
+            var flow = [{"id":"changeNode1","type":"change",rules:[{ "t": "change", "p": "payload.a", "pt": "msg", "from": "123", "fromt": "str", "to": "true", "tot": "bool" }, { "t": "change", "p": "payload.b", "pt": "msg", "from": "456", "fromt": "str", "to": "false", "tot": "bool" }],"reg":false,"name":"changeNode","wires":[["helperNode1"]]},
+                        {id:"helperNode1", type:"helper", wires:[]}];
+            helper.load(changeNode, flow, function() {
+                var changeNode1 = helper.getNode("changeNode1");
+                var helperNode1 = helper.getNode("helperNode1");
+                helperNode1.on("input", function(msg) {
+                    try {
+                        msg.payload.a.should.equal(true);
+                        msg.payload.b.should.equal(false);
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                changeNode1.receive({payload: { a: "123", b: "456" }});
+            });
+        });
+
        it('changes the value of a multi-level message property', function(done) {
            var flow = [{"id":"changeNode1","type":"change","action":"change","property":"foo.bar","from":"Hello","to":"Goodbye","reg":false,"name":"changeNode","wires":[["helperNode1"]]},
                        {id:"helperNode1", type:"helper", wires:[]}];
@@ -993,20 +1012,28 @@ describe('change Node', function() {
        });

        it('changes the value of the message property based on a regex', function(done) {
-            var flow = [{"id":"changeNode1","type":"change","action":"change","property":"payload","from":"\\d+","to":"NUMBER","reg":true,"name":"changeNode","wires":[["helperNode1"]]},
-                        {id:"helperNode1", type:"helper", wires:[]}];
+            const flow = [
+                {"id":"changeNode1","type":"change",rules:[
+                    { "t": "change", "p": "payload.a", "pt": "msg", "from": "\\d+", "fromt": "re", "to": "NUMBER", "tot": "str" },
+                    { "t": "change", "p": "payload.b", "pt": "msg", "from": "on", "fromt": "re", "to": "true", "tot": "bool" },
+                    { "t": "change", "p": "payload.c", "pt": "msg", "from": "off", "fromt": "re", "to": "false", "tot": "bool" }
+                ],"reg":false,"name":"changeNode","wires":[["helperNode1"]]},
+                {id:"helperNode1", type:"helper", wires:[]}
+            ];
            helper.load(changeNode, flow, function() {
                var changeNode1 = helper.getNode("changeNode1");
                var helperNode1 = helper.getNode("helperNode1");
                helperNode1.on("input", function(msg) {
                    try {
-                        msg.payload.should.equal("Replace all numbers NUMBER and NUMBER");
+                        msg.payload.a.should.equal("Replace all numbers NUMBER and NUMBER");
+                        msg.payload.b.should.equal(true)
+                        msg.payload.c.should.equal(false)
                        done();
                    } catch(err) {
                        done(err);
                    }
                });
-                changeNode1.receive({payload:"Replace all numbers 12 and 14"});
+                changeNode1.receive({payload:{ a: "Replace all numbers 12 and 14", b: 'on', c: 'off' } });
            });
        });

--- a/test/nodes/core/network/21-httprequest_spec.js
+++ b/test/nodes/core/network/21-httprequest_spec.js
@@ -60,6 +60,7 @@ describe('HTTP Request Node', function() {
    function startServer(done) {
        testPort += 1;
        testServer = stoppable(http.createServer(testApp));
+        const promises = []
        testServer.listen(testPort,function(err) {
            testSslPort += 1;
            console.log("ssl port", testSslPort);
@@ -81,13 +82,17 @@ describe('HTTP Request Node', function() {
                */
            };
            testSslServer = stoppable(https.createServer(sslOptions,testApp));
-            testSslServer.listen(testSslPort, function(err){
-                if (err) {
-                    console.log(err);
-                } else {
-                    console.log("started testSslServer");
-                }
-            });
+            console.log('> start testSslServer')
+            promises.push(new Promise((resolve, reject) => {
+                testSslServer.listen(testSslPort, function(err){
+                    console.log(' done testSslServer')
+                    if (err) {
+                        reject(err)
+                    } else {
+                        resolve()
+                    }
+                });
+            }))

            testSslClientPort += 1;
            var sslClientOptions = {
@@ -97,10 +102,17 @@ describe('HTTP Request Node', function() {
                requestCert: true
            };
            testSslClientServer = stoppable(https.createServer(sslClientOptions, testApp));
-            testSslClientServer.listen(testSslClientPort, function(err){
-                console.log("ssl-client", err)
-            });
-
+            console.log('> start testSslClientServer')
+            promises.push(new Promise((resolve, reject) => {
+                testSslClientServer.listen(testSslClientPort, function(err){
+                    console.log(' done testSslClientServer')
+                    if (err) {
+                        reject(err)
+                    } else {
+                        resolve()
+                    }
+                });
+            }))
            testProxyPort += 1;
            testProxyServer = stoppable(httpProxy(http.createServer()))

@@ -109,7 +121,17 @@ describe('HTTP Request Node', function() {
                    res.setHeader("x-testproxy-header", "foobar")
                }
            })
-            testProxyServer.listen(testProxyPort)
+            console.log('> testProxyServer')
+            promises.push(new Promise((resolve, reject) => {
+                testProxyServer.listen(testProxyPort, function(err) {
+                    console.log(' done testProxyServer')
+                    if (err) {
+                        reject(err)
+                    } else {
+                        resolve()
+                    }
+                })
+            }))

            testProxyAuthPort += 1
            testProxyServerAuth = stoppable(httpProxy(http.createServer()))
@@ -131,9 +153,19 @@ describe('HTTP Request Node', function() {
                    res.setHeader("x-testproxy-header", "foobar")
                }
            })
-            testProxyServerAuth.listen(testProxyAuthPort)
+            console.log('> testProxyServerAuth')
+            promises.push(new Promise((resolve, reject) => {
+                testProxyServerAuth.listen(testProxyAuthPort, function(err) {
+                    console.log(' done testProxyServerAuth')
+                    if (err) {
+                        reject(err)
+                    } else {
+                        resolve()
+                    }
+                })
+            }))

-            done(err);
+            Promise.all(promises).then(() => { done() }).catch(done)
        });
    }

@@ -429,7 +461,11 @@ describe('HTTP Request Node', function() {
            if (err) {
                done(err);
            }
-            helper.startServer(done);
+            console.log('> helper.startServer')
+            helper.startServer(function(err) {
+                console.log('> helper started')
+                done(err)
+            });
        });
    });

--- a/test/unit/@node-red/runtime/lib/multiplayer/index_spec.js
+++ b/test/unit/@node-red/runtime/lib/multiplayer/index_spec.js
@@ -0,0 +1,2 @@
+describe('multiplayer', function() {
+})
Author	SHA1	Message	Date
Nick O'Leary	595933d046	Fix linting	2024-04-23 09:40:01 +02:00
Nick O'Leary	789426f80e	Add user presence indication to tabs and nodes	2024-04-23 09:27:35 +02:00
Nick O'Leary	d218af8619	Merge branch 'master' into dev	2024-04-12 13:04:54 +01:00
Nick O'Leary	29ed5b2792	Merge pull request #4655 from node-red/rel319 Bump for 3.1.9 release	2024-04-11 19:22:24 +01:00
Nick O'Leary	e39216e65a	Bump for 3.1.9 release	2024-04-11 19:15:46 +01:00
Nick O'Leary	7ac7f9b4c8	Merge pull request #4654 from node-red/fix-subflow-recursion-check Prevent subflow being added to itself	2024-04-11 19:12:43 +01:00
Stephen McLaughlin	4709eb9d49	Merge pull request #4652 from node-red/fix-windows-spawn Fix use of spawn on windows with cmd files	2024-04-11 17:51:13 +01:00
Nick O'Leary	c13b8266dd	Prevent subflow being added to itself	2024-04-11 17:05:10 +01:00
Nick O'Leary	bd58431603	Fix use of spawn on windows with cmd files	2024-04-11 14:40:29 +01:00
Nick O'Leary	3075b82792	Add one more tour image	2024-04-05 11:18:17 +01:00
Nick O'Leary	240082481f	Merge pull request #4646 from node-red/rel400b2 Bump for beta.2	2024-04-05 10:53:03 +01:00
Nick O'Leary	ea95552285	Bump for beta.2	2024-04-04 18:25:10 +01:00
Nick O'Leary	5358b06123	Merge pull request #4645 from node-red/fix-mp-tests Add placeholder tests for multiplayer	2024-04-04 16:19:53 +01:00
Nick O'Leary	99391431da	Add placeholder tests for multiplayer	2024-04-04 16:17:30 +01:00
Nick O'Leary	d396f50a9a	Merge pull request #4627 from GogoVega/button-add-config-node Separate the "add new config-node" option into a new (+) button	2024-04-04 16:11:52 +01:00
Nick O'Leary	affa8ea42b	Apply suggestions from code review	2024-04-04 16:08:59 +01:00
Nick O'Leary	d711b01fe5	Merge pull request #4629 from node-red/multiplayer-1 Introduce multiplayer feature	2024-04-04 15:24:29 +01:00
Nick O'Leary	6e7fa6f921	Merge branch 'dev' into button-add-config-node	2024-04-03 14:02:40 +01:00
Nick O'Leary	343cde75a2	Merge pull request #4644 from node-red/resyn-dev Resync recent fixes from master to dev	2024-04-03 14:02:17 +01:00
Nick O'Leary	2dc446e45b	Merge branch 'dev' into resyn-dev	2024-04-03 13:57:10 +01:00
Nick O'Leary	884b7fa16a	Merge pull request #4643 from node-red/fix-subflow-mod-config-select Fix handling of subflow config-node select type in sf module	2024-04-03 13:54:41 +01:00
Nick O'Leary	173e065b68	Merge pull request #4639 from node-red/4638-fix-change-replace-bool Fix change node handling of replacing with boolean	2024-04-02 20:07:01 +01:00
Nick O'Leary	9a3cb0b2b5	Merge pull request #4640 from node-red/fix-subflow-init-err Guard refresh of unknown subflow	2024-04-02 20:06:47 +01:00
Nick O'Leary	6beae5a806	Merge pull request #4642 from node-red/4641-fix-subflow-module-debug-logging Fix subflow module sending messages to debug sidebar	2024-04-02 20:06:31 +01:00
Nick O'Leary	66f4008bb8	Fix handling of subflow config-node select type in sf module	2024-04-02 20:01:48 +01:00
Nick O'Leary	a0636632a1	Fix subflow module sending messages to debug sidebar Fixes #4641	2024-04-02 17:42:19 +01:00
Nick O'Leary	5dfa47ab6c	Guard refresh of unknown subflow	2024-04-02 15:54:34 +01:00
Nick O'Leary	e9efe493f9	Remove only	2024-04-02 13:59:15 +01:00
Nick O'Leary	3bd782e62a	Fix change node handling of replacing with boolean Fixes #4638	2024-04-02 13:57:19 +01:00
Nick O'Leary	963fe87f14	Merge pull request #4637 from node-red/tidy-up-palette-state Ensure palette filter reapplies and clear up unknown categories	2024-03-28 15:36:05 +00:00
Nick O'Leary	ade4679e8c	Merge pull request #4636 from node-red/rel318 Bump for 3.1.8	2024-03-28 15:23:07 +00:00
Nick O'Leary	40060a470b	Merge pull request #4635 from node-red/sync-dev Sync dev	2024-03-28 15:22:57 +00:00
Nick O'Leary	a6e8fbb54a	Ensure palette filter reapplies and clear up unknown categories	2024-03-28 15:21:04 +00:00
Nick O'Leary	410b938442	Bump for 3.1.8	2024-03-28 15:02:02 +00:00
Nick O'Leary	ab7e9f94fa	Merge branch 'dev' into sync-dev	2024-03-28 14:56:36 +00:00
Nick O'Leary	28e9ccd372	Merge pull request #4634 from node-red/pr_4623 Retain Palette categories collapsed and filter to localStorage	2024-03-28 14:53:15 +00:00
Nick O'Leary	9a66d9addd	Merge pull request #4620 from node-red/pr_4387 Add support for plugin (only) modules to the palette manager	2024-03-28 14:35:33 +00:00
Nick O'Leary	8843bda477	Merge pull request #4628 from node-red/comms-updates Comms API updates	2024-03-28 14:33:10 +00:00
Nick O'Leary	3278303eec	Clear localStorage state on logout	2024-03-28 14:31:31 +00:00
Nick O'Leary	f5fd6e3a36	Rework palette state management	2024-03-28 14:23:39 +00:00
Gauthier Dandele	a173e8e70f	Apply suggestions from code review Co-authored-by: Nick O'Leary <nick.oleary@gmail.com>	2024-03-28 12:57:04 +01:00
Nick O'Leary	19dcc3a683	Merge pull request #4632 from node-red/4625-sf-env-err-handling Add validation and error handling on subflow instance properties	2024-03-28 11:10:28 +00:00
Nick O'Leary	20d067c1ea	Merge pull request #4633 from node-red/4617-hide-library-context-options Hide import/export context menu if disabled in theme	2024-03-28 11:10:14 +00:00
Nick O'Leary	9526566799	Hide import/export context menu if disabled in theme	2024-03-28 11:00:10 +00:00
Nick O'Leary	0b9dd82c91	Merge pull request #4631 from node-red/4626-subflow-change-notification Show change indicator on subflow tabs	2024-03-27 19:10:39 +00:00
Nick O'Leary	19213434f9	Add validation to subflow instance env properties	2024-03-27 19:08:25 +00:00
Nick O'Leary	014691346a	Handle malformed env var values and log errors	2024-03-27 18:23:12 +00:00
Nick O'Leary	6738b95c29	Merge pull request #4630 from node-red/bump-express Bump dependencies	2024-03-27 18:11:54 +00:00
Nick O'Leary	6a8230ec1e	Show change icon on subflow tabs Fixes #4626	2024-03-27 18:10:04 +00:00
Nick O'Leary	5679d264b6	Bump dependencies	2024-03-27 18:00:06 +00:00
Nick O'Leary	b20c5f3a8d	Merge pull request #4621 from GogoVega/addfrench-v4 Add French translations for 4.0.0-beta.1	2024-03-27 17:48:07 +00:00
Nick O'Leary	014f206e9c	Initial multiplayer feature	2024-03-27 17:30:44 +00:00
Nick O'Leary	068b93befa	CComms API updates	2024-03-27 17:21:12 +00:00
GogoVega	65d8872cea	Separate the "add new config-node" option into a button	2024-03-27 14:59:49 +01:00
GogoVega	bffd1d61b2	Improve with error handling, storage cleanup and centralization in one object	2024-03-26 16:58:45 +01:00
GogoVega	4788b81220	Replace setTimeout with a listener	2024-03-26 13:05:38 +01:00
GogoVega	9a07fc03c6	Retain palette collapse and filter to localStorage	2024-03-25 20:47:55 +01:00
GogoVega	954f518030	Add French translations for 4.0.0-beta.1	2024-03-25 12:02:38 +01:00
GogoVega	9f8ff71757	Add French translations for TCP and CSV nodes	2024-03-25 11:58:35 +01:00
GogoVega	06dd59dc81	Add missing global-config translation	2024-03-25 10:51:12 +01:00
Nick O'Leary	37265cf4ef	Merge pull request #4619 from node-red/4600-reset-workspace-index Reset workspace index when clearing nodes	2024-03-21 17:38:39 +00:00
Nick O'Leary	8a63275989	Merge pull request #4613 from kazuhitoyokoi/master-fixglobalconfig Remove typo in global config	2024-03-21 16:54:01 +00:00
Nick O'Leary	7fc64a84e8	Bump test helper	2024-03-21 15:16:49 +00:00
Nick O'Leary	02f7cdd5aa	Ensure all httpRequest test servers are ready before tests run	2024-03-21 15:03:37 +00:00
Nick O'Leary	d7dcceef60	Add debug for http tests	2024-03-21 11:32:29 +00:00
Nick O'Leary	ae5e1570ae	Reset workspace index when clearing nodes Fixes #4600	2024-03-21 11:14:34 +00:00
Kazuhito Yokoi	3ca045394a	Remove typo in global config	2024-03-16 18:51:13 +09:00