Fix context store handling in autocomplete

Add auto-complete for env vars

.github/PULL_REQUEST_TEMPLATE.md

@@ -30,5 +30,5 @@ the [forum](https://discourse.nodered.org) or
 
 - [ ] I have read the [contribution guidelines](https://github.com/node-red/node-red/blob/master/CONTRIBUTING.md)
 - [ ] For non-bugfix PRs, I have discussed this change on the forum/slack team.
-- [ ] I have run `grunt` to verify the unit tests pass
+- [ ] I have run `npm run test` to verify the unit tests pass
 - [ ] I have added suitable unit tests to cover the new/changed functionality

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "monthly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/release.yml

@@ -14,25 +14,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out node-red repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
             path: 'node-red'
       - name: Check out node-red-docker repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
             repository: 'node-red/node-red-docker'
             path: 'node-red-docker'
       - name: Check out node-red.github.io repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
             repository: 'node-red/node-red.github.io'
             path: 'node-red.github.io'
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
             node-version: '16'
       - run: node ./node-red/.github/scripts/update-node-red-docker.js
       - name: Create Docker Pull Request
-        uses: peter-evans/create-pull-request@v2
+        uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.NR_REPO_TOKEN }}
           committer: GitHub <noreply@github.com>
@@ -48,7 +48,7 @@ jobs:
             This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary
       - run: node ./node-red/.github/scripts/update-node-red-website.js
       - name: Create Website Pull Request
-        uses: peter-evans/create-pull-request@v2
+        uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.NR_REPO_TOKEN }}
           committer: GitHub <noreply@github.com>

.github/workflows/tests.yml

@@ -19,9 +19,9 @@ jobs:
       matrix:
         node-version: [16, 18, 20]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
     - name: Install Dependencies

.gitignore

@@ -27,3 +27,4 @@ docs
 .vscode
 .nyc_output
 sync.ffs_db
+package-lock.json

CHANGELOG.md

@@ -1,4 +1,112 @@
-#### 3.1.0-beta.4: Beta Release
+#### 3.1.3: Maintenance Release
+
+Editor
+
+ - Add missing en-us messages (#4475) @knolleary
+
+#### 3.1.2: Maintenance Release
+
+Editor 
+
+ - Relax some node validators to allow undefined value (#4471) @knolleary
+ - Fix switch validation of typeof field (#4465) @knolleary
+ - Use move cursor when hovering on group border (#4467) @knolleary
+ - Added action list Chinese (Simplified and Traditional) translation + v3.1.1 changes (#4470) @wangyiyi2056
+ - Add French translation of `action-list` + v3.1.1 changes (#4466) @GogoVega
+ 
+ Runtime
+
+ - Ensure nested groups inside subflows have their g props remapped (#4472) @knolleary
+ 
+#### 3.1.1: Maintenance Release
+
+Editor
+
+ - Fix debug filter (#4461) @knolleary
+ - Fix various issues with debug pop-out window (#4459) @knolleary
+ - Ensure subflow instances keep track of their groups (#4457) @knolleary
+ - Fix `validateNodeProperty` without validator provided (#4455) @GogoVega
+ - Debounce node-removed notifications (#4453) @knolleary
+ - Don't try to load the parents of the first commit (#4448) @bonanitech
+ - Allow a theme to specifiy which theme mermaid should use (#4441) @knolleary
+ - Update browser title with flow name if set (#4427) @knolleary
+ - Ensure typeSearch handles undefined node definitions (#4423) @knolleary
+ - Ensure group w/h are imported if present (#4426) @knolleary
+ - Hide node status background when there is no status to show (#4425) @knolleary
+ - Add a close button to the restart-required notification (#4407) @knolleary
+ - Extend typedInput "num" type validity check to NaN, binary, octal & hex (#4371) @ralphwetzel
+ - Fix unintended new line in node name (#4399) @kazuhitoyokoi
+ - Ctrl-Enter does not close tray (Monaco) #4377 (#4382) @hazymat
+ - fix buffer viewer to handle 0b style binary (#4393) @dceejay
+ - Rework mermaid integration to support off-DOM rendering (#4364) @knolleary
+ - Add missing nls labels to context menu (#4365) @knolleary
+
+Runtime
+
+ - Bump the github-actions group with 2 updates (#4404) @app/dependabot
+ - Handle unknown node reference inside subflow module (#4460) @knolleary
+ - Add modules.install audit event when external module installed (#4452) @knolleary
+ - Allow import of modules with subpath in specifier (#4451) @knolleary
+ - Update node-red-admin version (#4438) @knolleary
+ - Handle false-like env vars properly (#4411) @knolleary
+ - Only save settings once during node load process (#4409) @knolleary
+ - Ensure global-config nodes lookup cred values properly (#4405) @knolleary
+ - Handle credential env var evaluation when no value set (#4362) @knolleary
+ - Don't commit package-lock.json (#4354) @bonanitech
+ - Fix env evaluation when one env references another in the same object (#4361) @knolleary
+ - Add dependabot for Github Actions (#4312) @Rotzbua
+ - Update outdated Github Actions (#4311) @Rotzbua
+ - github: Request `npm run test` in PR template (#4348) @ZJvandeWeg
+ - Add French translation of v3.1.0-beta.4 changes + slight improvements (#4329) @GogoVega
+ - Handle nodes with multiple input handlers properly (#4332) @knolleary
+ - Soften the language around unrequited PRs (#4351) @knolleary
+
+Nodes
+
+ - CSV: make CSV export way faster by not re-allocating and handling huge string (#4349) @Fadoli
+ - Delay: Fix regression in delay node to not pass on msg.reset (#4350) @dceejay
+ - Link Call: Handle undefined linkType value for existing link-call nodes (#4331) @knolleary
+ - MQTT: Guard against node.broker being undefined (#4454) @knolleary
+ - MQTT: check topic length > 0 before publish (#4416) @dceejay
+ - Switch/Change: Improve validation of switch/change node rules (#4368) @knolleary
+ - Template: Fix height of description editor in template node (#4346) @kazuhitoyokoi
+ - Various: Add validators to any fields using msg-typed Input (#4440) @knolleary
+
+#### 3.1.0: Milestone Release
+
+Editor
+
+ - Default filter to All Catalogues and show nodes for small lists (#4318) @knolleary
+ - Better distinguish between ctrl and meta keys on mac (#4310) @knolleary
+ - Ensure junction appears when filtering quick-add list (#4297) @knolleary
+ - Update message catalogs for JSONata Expression editor (#4287) @kazuhitoyokoi
+ - Add tooltip to relevance sort button in user settings UI (#4288) @kazuhitoyokoi
+ - Capture workspace dirty state when quick-adding junction (#4283) @knolleary
+ - Add docs for $clone function (#4284) @knolleary
+
+Runtime
+
+ - Dependency updates (#4317) @knolleary
+ - Ensure storage/util.writeFile handles concurrent write attempts (#4316) @knolleary
+ - Migrate http -> https for nodered.org (#4313) @Rotzbua
+ - Add Node 20 to GH Action test matrix (#4305) @Rotzbua
+ - Handle group-scoped nodes inside subflow (#4301) @knolleary
+ - Handle non-url-safe chars in context api (#4298) @knolleary
+ - Fix git pull operation in project feature (#4290) @kazuhitoyokoi
+ - Change linefeed codes in Korean message catalogs (#4286) @kazuhitoyokoi
+ - Fix file permissions of message catalogs (#4285) @kazuhitoyokoi
+ - Update tour (#4278) @knolleary
+ 
+Nodes
+
+ - File: Fix handling in file nodes when number is specified as file name (#4267) @kazuhitoyokoi
+ - Function: Adding function timeout to settings file (#4265) (#4309) @knolleary
+ - Function: Fix function setup tab layout (#4299) @knolleary
+ - HTTP Request: Handle 204 in httprequest JSON (#4262) @sammachin
+ - JSON: Fix test cases of JSON node (#4275) @kazuhitoyokoi
+ - MQTT: Remove unnecessary check for clientid if autoUnsub set (#4302) @knolleary
+
+##### 3.1.0-beta.4: Beta Release
 
  Editor
 
@@ -28,7 +136,7 @@
  - Fix delay node flush issue (#4203) @dceejay
  - Update status and catch node labels in group mode (#4207) @Steve-Mcl
 
-#### 3.1.0-beta.3: Beta Release
+##### 3.1.0-beta.3: Beta Release
 
 Editor
 
@@ -63,7 +171,7 @@ Nodes
  - MQTT: Option to disable MQTT topic unsubscribe on disconnect (#4078) @flying7eleven
 
 
-#### 3.1.0-beta.2: Beta Release
+##### 3.1.0-beta.2: Beta Release
 
 Editor
 
@@ -113,7 +221,7 @@ Nodes
  - File Out: Fix extra newline append for multipart file write (#3915) @dceejay
  - Add validators for complete and link call nodes (#4056) @kazuhitoyokoi
 
-#### 3.1.0-beta.1: Beta Release
+##### 3.1.0-beta.1: Beta Release
 
 Editor
 

CONTRIBUTING.md

@@ -16,6 +16,9 @@ behavior to the project's core team at team@nodered.org.
 Please raise any bug reports on the relevant project's issue tracker. Be sure to
 search the list to see if your issue has already been raised.
 
+If your issue is more of a question on how to do something with Node-RED, please
+consider using the [community forum](https://discourse.nodered.org/).
+
 A good bug report is one that make it easy for us to understand what you were
 trying to do and what went wrong.
 
@@ -35,14 +38,18 @@ For feature requests, please raise them on the [forum](https://discourse.nodered
 ## Pull-Requests
 
 If you want to raise a pull-request with a new feature, or a refactoring
-of existing code, it may well get rejected if you haven't discussed it on
-the [forum](https://discourse.nodered.org) first.
+of existing code, please come and discuss it with us first. We prefer to
+do it that way to make sure your time and effort is well spent on something
+that fits with our goals.
+
+If you've got a bug-fix or similar for us, then you are most welcome to
+get it raised - just make sure you link back to the issue it's fixing and
+try to include some tests!
 
 All contributors need to sign the OpenJS Foundation's Contributor License Agreement.
 It is an online process and quick to do. If you raise a pull-request without
 having signed the CLA, you will be prompted to do so automatically.
 
-
 ### Code Branches
 
 When raising a PR for a fix or a new feature, it is important to target the right branch.

Gruntfile.js

@@ -151,7 +151,6 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/font-awesome.js",
                     "packages/node_modules/@node-red/editor-client/src/js/history.js",
                     "packages/node_modules/@node-red/editor-client/src/js/validators.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/mermaid.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/utils.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js",

README.md

@@ -1,16 +1,16 @@
 # Node-RED
 
-http://nodered.org
+https://nodered.org
 
 [![Build Status](https://github.com/node-red/node-red/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/node-red/node-red/actions?query=branch%3Amaster)
 
 Low-code programming for event-driven applications.
 
-![Node-RED: Low-code programming for event-driven applications](http://nodered.org/images/node-red-screenshot.png)
+![Node-RED: Low-code programming for event-driven applications](https://nodered.org/images/node-red-screenshot.png)
 
 ## Quick Start
 
-Check out http://nodered.org/docs/getting-started/ for full instructions on getting
+Check out https://nodered.org/docs/getting-started/ for full instructions on getting
 started.
 
 1. `sudo npm install -g --unsafe-perm node-red`
@@ -19,7 +19,7 @@ started.
 
 ## Getting Help
 
-More documentation can be found [here](http://nodered.org/docs).
+More documentation can be found [here](https://nodered.org/docs).
 
 For further help, or general discussion, please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack).
 

package.json

@@ -1,8 +1,8 @@
 {
     "name": "node-red",
-    "version": "3.1.0-beta.4",
+    "version": "4.0.0-dev",
     "description": "Low-code programming for event-driven applications",
-    "homepage": "http://nodered.org",
+    "homepage": "https://nodered.org",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -64,8 +64,8 @@
         "mqtt": "4.3.7",
         "multer": "1.4.5-lts.1",
         "mustache": "4.2.0",
-        "node-red-admin": "^3.0.0",
-        "node-watch": "0.7.3",
+        "node-red-admin": "^3.1.1",
+        "node-watch": "0.7.4",
         "nopt": "5.0.0",
         "oauth2orize": "1.11.1",
         "on-headers": "1.0.2",
@@ -73,16 +73,16 @@
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
         "raw-body": "2.5.2",
-        "semver": "7.5.0",
+        "semver": "7.5.4",
         "tar": "6.1.13",
-        "tough-cookie": "4.1.2",
+        "tough-cookie": "4.1.3",
         "uglify-js": "3.17.4",
         "uuid": "9.0.0",
         "ws": "7.5.6",
-        "xml2js": "0.6.0"
+        "xml2js": "0.6.2"
     },
     "optionalDependencies": {
-        "bcrypt": "5.1.0"
+        "bcrypt": "5.1.1"
     },
     "devDependencies": {
         "dompurify": "2.4.1",
@@ -109,7 +109,7 @@
         "jquery-i18next": "1.2.1",
         "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
         "marked": "4.3.0",
-        "mermaid": "^9.4.3",
+        "mermaid": "^10.4.0",
         "minami": "1.2.3",
         "mocha": "9.2.2",
         "node-red-node-test-helper": "^0.3.2",

packages/node_modules/@node-red/editor-api/lib/admin/context.js

@@ -33,6 +33,9 @@ module.exports = {
             store: req.query['store'],
             req: apiUtils.getRequestLogObject(req)
         }
+        if (req.query['keysOnly'] !== undefined) {
+            opts.keysOnly = true
+        }
         runtimeAPI.context.getValue(opts).then(function(result) {
             res.json(result);
         }).catch(function(err) {

packages/node_modules/@node-red/editor-api/lib/editor/theme.js

@@ -339,6 +339,8 @@ module.exports = {
                 }
                 theme.codeEditor = theme.codeEditor || {}
                 theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
+
+                theme.mermaid = Object.assign({}, themePlugin.mermaid, theme.mermaid)
             }
             activeThemeInitialised = true;
         }

packages/node_modules/@node-red/editor-api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "3.1.0-beta.4",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "3.1.0-beta.4",
-        "@node-red/editor-client": "3.1.0-beta.4",
+        "@node-red/util": "4.0.0-dev",
+        "@node-red/editor-client": "4.0.0-dev",
         "bcryptjs": "2.4.3",
         "body-parser": "1.20.2",
         "clone": "2.1.2",

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

@@ -113,7 +113,7 @@
             "displayStatus": "Show node status",
             "displayConfig": "Configuration nodes",
             "import": "Import",
-            "importExample": "Import Example Flow",
+            "importExample": "Import example flow",
             "export": "Export",
             "search": "Search flows",
             "searchInput": "search your flows",
@@ -130,6 +130,11 @@
             "editPalette": "Manage palette",
             "other": "Other",
             "showTips": "Show tips",
+            "showNodeHelp": "Show node help",
+            "enableSelectedNodes": "Enable selected nodes",
+            "disableSelectedNodes": "Disable selected nodes",
+            "showSelectedNodeLabels": "Show selected node labels",
+            "hideSelectedNodeLabels": "Hide selected node labels",
             "showWelcomeTours": "Show guided tours for new versions",
             "help": "Node-RED website",
             "projects": "Projects",
@@ -511,8 +516,8 @@
         "selectAllConnected": "Select connected",
         "addRemoveNode": "Add/remove node from selection",
         "editSelected": "Edit selected node",
-        "deleteSelected": "Delete selected nodes or link",
-        "deleteReconnect": "Delete and Reconnect",
+        "deleteSelected": "Delete selection",
+        "deleteReconnect": "Delete and reconnect",
         "importNode": "Import nodes",
         "exportNode": "Export nodes",
         "nudgeNode": "Move selected nodes (1px)",
@@ -1215,11 +1220,9 @@
     "validator": {
         "errors": {
             "invalid-json": "Invalid JSON data: __error__",
-            "invalid-json-prop": "__prop__: invalid JSON data: __error__",
+            "invalid-expr": "Invalid JSONata expression: __error__",
             "invalid-prop": "Invalid property expression",
-            "invalid-prop-prop": "__prop__: invalid property expression",
             "invalid-num": "Invalid number",
-            "invalid-num-prop": "__prop__: invalid number",
             "invalid-regexp": "Invalid input pattern",
             "invalid-regex-prop": "__prop__: invalid input pattern",
             "missing-required-prop": "__prop__: property value missing",
@@ -1229,6 +1232,7 @@
         }
     },
     "contextMenu": {
+        "showActionList": "Show action list",
         "insert": "Insert",
         "node": "Node",
         "junction": "Junction",

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

@@ -119,7 +119,7 @@
       "searchInput": "Rechercher vos flux",
       "subflows": "Sous-flux",
       "createSubflow": "Créer un sous-flux",
-      "selectionToSubflow": "Selection d'un sous-flux",
+      "selectionToSubflow": "Convertir en sous-flux",
       "flows": "Flux",
       "add": "Ajouter",
       "rename": "Renommer",
@@ -274,23 +274,23 @@
     "recoveredNodesInfo": "Les noeuds importés sur ce flux contiennent un mauvais identifiant de flux. Ces noeuds ont été ajoutés à ce flux afin que vous puissiez les restaurer ou les supprimer.",
     "recoveredNodesNotification": "<p>Noeuds importés sans identifiant de flux valide</p><p>Ils ont été ajoutés à un nouveau flux appelé '__flowName__'.</p>",
     "export": {
-      "selected": "noeuds sélectionnés",
-      "current": "flux actuel",
+      "selected": "les noeuds sélectionnés",
+      "current": "le flux actuel",
       "all": "tous les flux",
-      "compact": "condensé",
-      "formatted": "formaté",
+      "compact": "Condensé",
+      "formatted": "Formaté",
       "copy": "Copier dans le presse-papier",
       "export": "Exporter vers la bibliothèque",
-      "exportAs": "Exporter en tant que",
+      "exportAs": "Exporter comme",
       "overwrite": "Remplacer",
       "exists": "<p><b>\"__file__\"</b> existe déjà.</p><p>Voulez-vous le remplacer ?</p>"
     },
     "import": {
       "import": "Importer vers",
-      "importSelected": "Importation sélectionnée",
+      "importSelected": "Importer la sélection",
       "importCopy": "Importer une copie",
-      "viewNodes": "Afficher les noeuds...",
-      "newFlow": "Nouveau flux",
+      "viewNodes": "Vérifier ces noeuds",
+      "newFlow": "un nouveau flux",
       "replace": "Remplacer",
       "errors": {
         "notArray": "L'entrée n'est pas un tableau JSON",
@@ -299,7 +299,7 @@
         "missingType": "L'entrée n'est pas un flux valide - l'élément '__index__' n'a pas de propriété 'type'"
       },
       "conflictNotification1": "Certains des noeuds que vous avez importés existent déjà dans votre espace de travail.",
-      "conflictNotification2": "Sélectionner les noeuds à importer et choisir s'il faut remplacer les noeuds existants ou en importer une copie."
+      "conflictNotification2": "Sélectionnez les noeuds à importer et choisissez s'il faut remplacer les noeuds existants ou en importer une copie."
     },
     "copyMessagePath": "Chemin copié",
     "copyMessageValue": "Valeur copiée",
@@ -391,10 +391,10 @@
     "subflowInstances": "Il existe __count__ instance de ce modèle de sous-flux",
     "subflowInstances_plural": "Il existe __count__ instances de ce modèle de sous-flux",
     "editSubflowProperties": "modifier les propriétés",
-    "input": "entrées:",
-    "output": "sorties:",
-    "status": "statut du noeud",
-    "deleteSubflow": "supprimer le sous-flux",
+    "input": "Entrées:",
+    "output": "Sorties:",
+    "status": "Statut du noeud",
+    "deleteSubflow": "Supprimer le sous-flux",
     "confirmDelete": "Voulez-vous vraiment supprimer ce sous-flux ?",
     "info": "Description",
     "category": "Catégorie",
@@ -416,6 +416,7 @@
     },
     "errors": {
       "noNodesSelected": "<strong>Impossible de créer un sous-flux</strong> : aucun noeud sélectionné",
+      "acrossMultipleGroups": "Impossible de créer un sous-flux sur plusieurs groupes",
       "multipleInputsToSelection": "<strong>Impossible de créer un sous-flux</strong> : plusieurs entrées pour la sélection"
     }
   },
@@ -447,8 +448,8 @@
     "default": "Par défaut",
     "noDefaultLabel": "Aucune",
     "defaultLabel": "Utiliser l'étiquette par défaut",
-    "searchIcons": "Icônes de recherche",
-    "useDefault": "Utilisation par défaut",
+    "searchIcons": "Rechercher une icône",
+    "useDefault": "Icône par défaut",
     "description": "Description",
     "show": "Afficher",
     "hide": "Masquer",
@@ -498,13 +499,13 @@
   "keyboard": {
     "title": "Raccourcis clavier",
     "keyboard": "Clavier",
-    "filterActions": "Actions de filtrage",
-    "shortcut": "raccourci",
-    "scope": "portée",
+    "filterActions": "Rechercher l'action",
+    "shortcut": "Raccourci",
+    "scope": "Portée",
     "unassigned": "Non attribué",
-    "global": "global",
-    "workspace": "espace de travail",
-    "editor": "boîte de dialogue d'édition",
+    "global": "Global",
+    "workspace": "Espace de travail",
+    "editor": "Boîte de dialogue d'édition",
     "selectAll": "Tout sélectionner",
     "selectNone": "Ne rien sélectionner",
     "selectAllConnected": "Sélectionner tous les éléments connectés",
@@ -550,22 +551,22 @@
   },
   "palette": {
     "noInfo": "Pas d'information disponible",
-    "filter": "Filtrer les noeuds",
+    "filter": "Rechercher le noeud",
     "search": "Rechercher les modules",
     "addCategory": "Ajouter un nouveau...",
     "label": {
-      "subflows": "sous-flux",
-      "network": "réseau",
-      "common": "commun",
-      "input": "entrée",
-      "output": "sortie",
-      "function": "fonction",
-      "sequence": "séquence",
-      "parser": "analyseur",
-      "social": "social",
-      "storage": "stockage",
-      "analysis": "analyse",
-      "advanced": "avancé"
+      "subflows": "Sous-flux",
+      "network": "Réseau",
+      "common": "Commun",
+      "input": "Entrée",
+      "output": "Sortie",
+      "function": "Fonction",
+      "sequence": "Séquence",
+      "parser": "Analyseur",
+      "social": "Social",
+      "storage": "Stockage",
+      "analysis": "Analyse",
+      "advanced": "Avancé"
     },
     "actions": {
       "collapse-all": "Réduire toutes les catégories",
@@ -586,6 +587,7 @@
     "editor": {
       "title": "Gérer la palette",
       "palette": "Palette",
+      "allCatalogs": "Tous les catalogues",
       "times": {
         "seconds": "il y a quelques secondes",
         "minutes": "il y a quelques minutes",
@@ -609,24 +611,25 @@
       "nodeCount_plural": "__label__ noeuds",
       "moduleCount": "__count__ module disponible",
       "moduleCount_plural": "__count__ modules disponibles",
-      "inuse": "en cours d'utilisation",
-      "enableall": "activer tout",
-      "disableall": "désactiver tout",
-      "enable": "activer",
-      "disable": "désactiver",
-      "remove": "supprimer",
-      "update": "mettre à jour vers __version__",
-      "updated": "mis à jour",
-      "install": "installer",
-      "installed": "installé",
-      "conflict": "conflit",
+      "inuse": "En cours d'utilisation",
+      "enableall": "Activer tout",
+      "disableall": "Désactiver tout",
+      "enable": "Activer",
+      "disable": "Désactiver",
+      "remove": "Supprimer",
+      "update": "Mettre à jour vers __version__",
+      "updated": "Mis à jour",
+      "install": "Installer",
+      "installed": "Installé",
+      "conflict": "Conflit",
       "conflictTip": "<p>Ce module ne peut pas être installé car il inclut un<br/>type de noeud qui a déjà été installé</p><p>Conflits avec <code>__module__</code></p>",
       "loading": "Chargement des catalogues...",
       "tab-nodes": "Noeuds",
       "tab-install": "Installer",
-      "sort": "trier:",
-      "sortAZ": "a-z",
-      "sortRecent": "récent",
+      "sort": "Trier:",
+      "sortRelevance": "Pertinence",
+      "sortAZ": "A-Z",
+      "sortRecent": "Récent",
       "more": "+ __count__ en plus",
       "upload": "Charger le fichier tgz du module",
       "refresh": "Actualiser la liste des modules",
@@ -667,7 +670,7 @@
     "info": {
       "name": "Information",
       "tabName": "Nom",
-      "label": "info",
+      "label": "Info",
       "node": "Noeud",
       "type": "Type",
       "group": "Groupe",
@@ -681,10 +684,10 @@
       "properties": "Propriétés",
       "info": "Information",
       "desc": "Description",
-      "blank": "vide",
-      "null": "nul",
-      "showMore": "afficher en plus",
-      "showLess": "afficher en moins",
+      "blank": "Vide",
+      "null": "Nul",
+      "showMore": "Afficher en plus",
+      "showLess": "Afficher en moins",
       "flow": "Flux",
       "selection": "Sélection",
       "nodes": "__count__ noeuds",
@@ -695,7 +698,7 @@
       "arrayItems": "__count__ éléments",
       "showTips": "Vous pouvez ouvrir les astuces à partir du panneau des paramètres",
       "outline": "Plan",
-      "empty": "vide",
+      "empty": "Vide",
       "globalConfig": "Noeuds de configuration globale",
       "triggerAction": "Déclencher une action",
       "find": "Rechercher dans l'espace de travail",
@@ -706,7 +709,7 @@
     },
     "help": {
       "name": "Aide",
-      "label": "aide",
+      "label": "Aide",
       "search": "Aide à la recherche",
       "nodeHelp": "Aide sur les noeuds",
       "showHelp": "Afficher l'aide",
@@ -717,23 +720,23 @@
     },
     "config": {
       "name": "Noeuds de configuration",
-      "label": "configuration",
+      "label": "Configuration",
       "global": "Tous les flux",
-      "none": "aucun",
-      "subflows": "sous-flux",
-      "flows": "flux",
-      "filterAll": "tout",
+      "none": "Aucun",
+      "subflows": "Sous-flux",
+      "flows": "Flux",
+      "filterAll": "Tout",
       "showAllConfigNodes": "Afficher tous les noeuds de configuration",
-      "filterUnused": "inutilisé",
+      "filterUnused": "Inutilisé",
       "showAllUnusedConfigNodes": "Afficher tous les noeuds de configuration inutilisés",
       "filtered": "__count__ caché(s)"
     },
     "context": {
       "name": "Données contextuelles",
-      "label": "contexte",
-      "none": "aucune sélection",
-      "refresh": "actualiser pour charger",
-      "empty": "vide",
+      "label": "Contexte",
+      "none": "Aucune sélection",
+      "refresh": "Actualiser pour charger",
+      "empty": "Vide",
       "node": "Noeud",
       "flow": "Flux",
       "global": "Global",
@@ -744,10 +747,10 @@
     },
     "palette": {
       "name": "Gestion des palettes",
-      "label": "palette"
+      "label": "Palette"
     },
     "project": {
-      "label": "projet",
+      "label": "Projet",
       "name": "Projet",
       "description": "Description",
       "dependencies": "Dépendances",
@@ -760,11 +763,11 @@
       "showProjectSettings": "Afficher les paramètres du projet",
       "projectSettings": {
         "title": "Paramètres du projet",
-        "edit": "modifier",
+        "edit": "Modifier",
         "none": "Vide",
-        "install": "installer",
-        "removeFromProject": "supprimer du projet",
-        "addToProject": "ajouter au projet",
+        "install": "Installer",
+        "removeFromProject": "Supprimer du projet",
+        "addToProject": "Ajouter au projet",
         "files": "Fichiers",
         "flow": "Flux",
         "credentials": "Identifiants",
@@ -812,7 +815,7 @@
         "workflowAutoTip": "Les modifications sont validées automatiquement à chaque déploiement",
         "sshKeys": "Clés SSH",
         "sshKeysTip": "Vous permet de créer des connexions sécurisées aux référentiels Git distants.",
-        "add": "ajouter une clé",
+        "add": "Ajouter une clé",
         "addSshKey": "Ajouter une clé SSH",
         "addSshKeyTip": "Générer une nouvelle paire de clés publique/privée",
         "name": "Nom",
@@ -848,7 +851,7 @@
         "none": "Vide",
         "conflictResolve": "Tous les conflits ont été résolus. Valider les modifications pour terminer la fusion.",
         "localFiles": "Fichiers locaux",
-        "all": "tout",
+        "all": "Tout",
         "unmergedChanges": "Modifications non fusionnées",
         "abortMerge": "Abandonner la fusion",
         "commit": "Valider",
@@ -1097,9 +1100,9 @@
       "desc8": "Le fichier contenant les identifiants ne sera pas crypté et son contenu sera facilement lisible",
       "create-project-files": "Créer des fichiers de projet",
       "create-project": "Créer un projet",
-      "already-exists": "existe déjà",
+      "already-exists": "Existe déjà",
       "git-error": "Erreur Git",
-      "git-auth-error": "erreur d'authentification Git"
+      "git-auth-error": "Erreur d'authentification Git"
     },
     "create-success": {
       "success": "Vous avez créé avec succès votre premier projet !",
@@ -1135,8 +1138,8 @@
       "desc2": "Avant de pouvoir cloner un référentiel sur ssh, vous devez ajouter une clé SSH pour y accéder.",
       "add-ssh-key": "Ajouter une clé ssh",
       "credentials-encryption-key": "Clé de chiffrement des identifiants",
-      "already-exists-2": "existe déjà",
-      "git-error": "erreur git",
+      "already-exists-2": "Existe déjà",
+      "git-error": "Erreur git",
       "con-failed": "La connexion a échoué",
       "not-git": "Ce n'est pas un dépôt git",
       "no-resource": "Référentiel introuvable",
@@ -1148,8 +1151,8 @@
       "confirm": "Voulez-vous vraiment supprimer ce projet ?"
     },
     "create-project-list": {
-      "search": "rechercher vos projets",
-      "current": "actuel"
+      "search": "Rechercher vos projets",
+      "current": "Actuel"
     },
     "require-clean": {
       "confirm": "<p>Vous avez des modifications non déployées qui seront perdues.</p><p>Voulez-vous continuer ?</p>"
@@ -1212,11 +1215,9 @@
   "validator": {
     "errors": {
       "invalid-json": "Données JSON invalides : __error__",
-      "invalid-json-prop": "__prop__: données JSON invalides : __error__",
-      "invalid-prop": "Expression de propriété non valide",
-      "invalid-prop-prop": "__prop__: expression de propriété invalide",
+      "invalid-expr": "Expression JSONata invalide : __error__",
+      "invalid-prop": "Expression de propriété invalide",
       "invalid-num": "Numéro invalide",
-      "invalid-num-prop": "__prop__: numéro invalide",
       "invalid-regexp": "Modèle d'entrée non valide",
       "invalid-regex-prop": "__prop__: modèle d'entrée non valide",
       "missing-required-prop": "__prop__: valeur de la propriété manquante",
@@ -1235,5 +1236,159 @@
     "environment": "Environment",
     "header": "Variables d'environnement globales",
     "revert": "Rétablir"
+  },
+  "action-list": {
+    "toggle-show-tips": "Basculer l'affichage des astuces",
+    "show-about": "Afficher la description de Node-RED",
+    "show-welcome-tour": "Afficher la visite de bienvenue",
+    "show-next-tab": "Afficher l'onglet suivant",
+    "show-previous-tab": "Afficher l'onglet précédent",
+    "add-flow": "Ajouter un flux",
+    "add-flow-to-right": "Ajouter un flux à droite",
+    "edit-flow": "Modifier le flux",
+    "remove-flow": "Supprimer le flux",
+    "enable-flow": "Activer le flux",
+    "disable-flow": "Désactiver le flux",
+    "hide-flow": "Masquer le flux",
+    "hide-other-flows": "Masquer les autres flux",
+    "hide-all-flows": "Masquer tous les flux",
+    "show-all-flows": "Afficher tous les flux",
+    "show-last-hidden-flow": "Afficher le dernier flux masqué",
+    "list-modified-nodes": "Afficher les flux modifiés",
+    "list-hidden-flows": "Afficher les flux cachés",
+    "list-flows": "Lister les flux",
+    "list-subflows": "Liste les sous-flux",
+    "go-to-previous-location": "Aller à l'emplacement précédent",
+    "go-to-next-location": "Aller à l'emplacement suivant",
+    "copy-selection-to-internal-clipboard": "Copier la sélection dans le presse-papiers",
+    "cut-selection-to-internal-clipboard": "Couper la sélection dans le presse-papiers",
+    "paste-from-internal-clipboard": "Coller depuis le presse-papiers",
+    "detach-selected-nodes": "Détacher les noeuds sélectionnés",
+    "delete-selection": "Supprimer la sélection",
+    "delete-selection-and-reconnect": "Supprimer la sélection et reconnecter",
+    "edit-selected-node": "Modifier le noeud sélectionné",
+    "go-to-selection": "Aller à la sélection",
+    "undo": "Annuler les modifications",
+    "redo": "Rétablir les modifications",
+    "select-all-nodes": "Sélectionner tous les noeuds",
+    "select-none": "Sélectionner un noeud",
+    "enable-selected-nodes": "Activer les noeuds sélectionnés",
+    "disable-selected-nodes": "Désactiver les noeuds sélectionnés",
+    "toggle-show-grid": "Basculer l'affichage de la grille",
+    "toggle-snap-grid": "Basculer l'aide au placement des noeuds",
+    "toggle-status": "Commuter l'état",
+    "show-selected-node-labels": "Afficher les étiquettes des noeuds sélectionnés",
+    "hide-selected-node-labels": "Masquer les étiquettes des noeuds sélectionnés",
+    "scroll-view-up": "Faire défiler vers le haut",
+    "scroll-view-right": "Faire défiler vers la droite",
+    "scroll-view-down": "Faire défiler vers le bas",
+    "scroll-view-left": "Faire défiler vers la gauche",
+    "step-view-up": "Faire défiler d'une unité vers le haut",
+    "step-view-right": "Faire défiler d'une unité vers la droite",
+    "step-view-down": "Faire défiler d'une unité vers le bas",
+    "step-view-left": "Faire défiler d'une unité vers la gauche",
+    "move-selection-up": "Déplacer la sélection vers le haut",
+    "move-selection-right": "Déplacer la sélection vers la droite",
+    "move-selection-down": "Déplacer la sélection vers le bas",
+    "move-selection-left": "Déplacer la sélection vers la gauche",
+    "move-selection-forwards": "Avancer la sélection",
+    "move-selection-backwards": "Reculer la sélection",
+    "move-selection-to-front": "Déplacer la sélection vers l'avant",
+    "move-selection-to-back": "Déplacer la sélection vers l'arrière",
+    "step-selection-up": "Déplacer la sélection d'une unité vers le haut",
+    "step-selection-right": "Déplacer la sélection d'une unité vers la droite",
+    "step-selection-down": "Déplacer la sélection d'une unité vers le bas",
+    "step-selection-left": "Déplacer la sélection d'une unité vers la gauche",
+    "select-connected-nodes": "Sélectionner les noeuds connectés",
+    "select-downstream-nodes": "Sélectionner les noeuds connectés en aval",
+    "select-upstream-nodes": "Sélectionner les noeuds connectés en amont",
+    "go-to-next-node": "Aller au noeud suivant",
+    "go-to-previous-node": "Aller au noeud précédent",
+    "go-to-next-sibling": "Aller au noeud frère suivant",
+    "go-to-previous-sibling": "Aller au noeud frère précédent",
+    "go-to-nearest-node-on-left": "Aller au noeud gauche le plus proche",
+    "go-to-nearest-node-on-right": "Aller au noeud droit le plus proche",
+    "go-to-nearest-node-above": "Aller au noeud supérieur le plus proche",
+    "go-to-nearest-node-below": "Aller au noeud le plus proche ci-dessous",
+    "align-selection-to-grid": "Aligner la sélection",
+    "align-selection-to-left": "Aligner la sélection à gauche",
+    "align-selection-to-right": "Aligner la sélection à droite",
+    "align-selection-to-top": "Aligner la sélection en haut",
+    "align-selection-to-bottom": "Aligner la sélection vers le bas",
+    "align-selection-to-middle": "Aligner la sélection au centre verticalement",
+    "align-selection-to-center": "Aligner la sélection au centre horizontalement",
+    "distribute-selection-horizontally": "Distribuer la sélection horizontalement",
+    "distribute-selection-vertical": "Distribuer la sélection verticalement",
+    "wire-series-of-nodes": "Connecter les noeuds en série",
+    "wire-node-to-multiple": "Connecter les noeuds à plusieurs",
+    "wire-multiple-to-node": "Connecter plusieurs au noeud",
+    "split-wire-with-link-nodes": "Diviser le fil avec des noeuds de liaison",
+    "generate-node-names": "Générer les noms de noeuds",
+    "show-user-settings": "Afficher les paramètres utilisateur",
+    "show-help": "Afficher l'aide",
+    "toggle-palette": "Basculer l'affichage de la palette",
+    "show-event-log": "Afficher le journal des événements",
+    "manage-palette": "Gérer la palette",
+    "toggle-sidebar": "Basculer l'affichage de la barre latérale",
+    "show-info-tab": "Afficher l'onglet d'informations sur le noeud",
+    "show-help-tab": "Afficher l'onglet d'aide du noeud",
+    "show-config-tab": "Afficher l'onglet du noeud de configuration",
+    "select-all-config-nodes": "Sélectionner tous les noeuds de configuration",
+    "delete-config-selection": "Supprimer le noeud de configuration sélectionné",
+    "show-context-tab": "Afficher l'onglet des données contextuelles",
+    "create-subflow": "Créer un sous-flux",
+    "convert-to-subflow": "Convertir la sélection en sous-flux",
+    "group-selection": "Grouper la sélection",
+    "ungroup-selection": "Dissocier la sélection",
+    "merge-selection-to-group": "Fusionner la sélection dans le groupe",
+    "remove-selection-from-group": "Supprimer la sélection du groupe",
+    "copy-group-style": "Copier le style du groupe",
+    "paste-group-style": "Coller le style du groupe",
+    "show-export-dialog": "Afficher la boîte de dialogue d'exportation",
+    "show-import-dialog": "Afficher la boîte de dialogue d'importation",
+    "show-library-export-dialog": "Afficher la boîte de dialogue d'exportation de la bibliothèque",
+    "show-library-import-dialog": "Afficher la boîte de dialogue d'importation de bibliothèque",
+    "show-examples-import-dialog": "Afficher la boîte de dialogue d'importation d'exemples",
+    "search": "Rechercher",
+    "search-previous": "Recherche précédente",
+    "search-next": "Recherche suivante",
+    "show-action-list": "Afficher la liste d'actions",
+    "confirm-edit-tray": "Confirmer la modification",
+    "cancel-edit-tray": "Annuler la modification",
+    "show-remote-diff": "Afficher les différences avec les modifications distantes",
+    "deploy-flows": "Déployer des flux",
+    "restart-flows": "Redémarrer les flux",
+    "set-deploy-type-to-full": "Définir le déploiement sur 'tout'",
+    "set-deploy-type-to-modified-flows": "Définir le déploiement sur 'flux modifiés'",
+    "set-deploy-type-to-modified-nodes": "Définir le déploiement sur 'noeuds modifiés'",
+    "show-debug-tab": "Afficher l'onglet de débogage",
+    "clear-debug-messages": "Supprimer les messages de débogage",
+    "clear-filtered-debug-messages": "Supprimer les messages de débogage filtrés",
+    "activate-selected-debug-nodes": "Activer les noeuds de débogage sélectionnés",
+    "activate-all-debug-nodes": "Activer tous les noeuds de débogage",
+    "activate-all-flow-debug-nodes": "Activer tous les noeuds de débogage dans un flux",
+    "deactivate-selected-debug-nodes": "Désactiver les noeuds de débogage sélectionnés",
+    "deactivate-all-debug-nodes": "Désactiver tous les noeuds de débogage",
+    "deactivate-all-flow-debug-nodes": "Désactiver tous les noeuds de débogage dans un flux",
+    "zoom-in": "Zoomer",
+    "zoom-out": "Dézoomer",
+    "zoom-reset": "Réinitialiser le zoom",
+    "toggle-navigator": "Basculer l'affichage du navigateur",
+    "show-system-info": "Afficher les informations système",
+    "split-wires-with-junctions": "Diviser les fils avec des jonctions",
+    "new-project": "Nouveau projet",
+    "open-project": "Ouvrir le projet",
+    "show-project-settings": "Afficher les paramètres du projet",
+    "show-version-control-tab": "Afficher l'onglet de contrôle de version",
+    "start-flows": "Démarrer les flux",
+    "stop-flows": "Arrêter les flux",
+    "copy-item-url": "Copier l'URL de l'élément",
+    "copy-item-edit-url": "Copier l'URL de modification de l'élément",
+    "move-flow-to-start": "Déplacer le flux jusqu'au début",
+    "move-flow-to-end": "Déplacer le flux jusqu'à la fin",
+    "show-global-env": "Afficher les variables d'environnement globales",
+    "lock-flow": "Verrouiller le flux",
+    "unlock-flow": "Déverrouiller le flux",
+    "show-node-help": "Afficher l'aide du noeud"
   }
 }

packages/node_modules/@node-red/editor-client/locales/fr/jsonata.json

@@ -270,5 +270,9 @@
     "$moment": {
         "args": "[str]",
         "desc": "Obtient un objet de date à l'aide de la bibliothèque Moment."
+    },
+    "$clone": {
+        "args": "valeur",
+        "desc": "Cloner un objet en toute sécurité."
     }
 }

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

@@ -1215,11 +1215,8 @@
     "validator": {
         "errors": {
             "invalid-json": "JSONデータが不正: __error__",
-            "invalid-json-prop": "__prop__: JSONデータが不正: __error__",
             "invalid-prop": "プロパティ式が不正",
-            "invalid-prop-prop": "__prop__: プロパティ式が不正",
             "invalid-num": "数値が不正",
-            "invalid-num-prop": "__prop__: 数値が不正",
             "invalid-regexp": "入力パターンが不正",
             "invalid-regex-prop": "__prop__: 入力パターンが不正",
             "missing-required-prop": "__prop__: プロパティが未設定",

packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json

@@ -1186,11 +1186,8 @@
     "validator": {
         "errors": {
             "invalid-json": "Dados JSON inválidos: __error__",
-            "invalid-json-prop": "__prop__: dados JSON inválidos: __error__",
             "invalid-prop": "Expressão de propriedade inválida",
-            "invalid-prop-prop": "__prop__: expressão de propriedade inválida",
             "invalid-num": "Número inválido",
-            "invalid-num-prop": "__prop__: número inválido",
             "invalid-regexp": "Padrão de entrada inválido",
             "invalid-regex-prop": "__prop__: Padrão de entrada inválido",
             "missing-required-prop": "__prop__: valor de propriedade ausente",

packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json

@@ -23,7 +23,11 @@
       "position": "位置",
       "enable": "启用",
       "disable": "禁用",
-      "upload": "上传"
+      "upload": "上传",
+      "lock": "锁定",
+      "unlock": "解锁",
+      "locked": "锁定",
+      "unlocked": "解锁"
     },
     "type": {
       "string": "字符串",
@@ -68,7 +72,13 @@
     "enabled": "有效",
     "disabled": "无效",
     "info": "详细描述",
-    "selectNodes": "点击节点来选择"
+    "selectNodes": "点击节点来选择",
+    "enableFlow": "启用流程",
+    "disableFlow": "禁用流程",
+    "lockFlow": "锁定流程",
+    "unlockFlow": "解除锁定",
+    "moveToStart": "移动到起始",
+    "moveToEnd": "移动到末尾"
   },
   "menu": {
     "label": {
@@ -101,6 +111,7 @@
       "displayStatus": "显示节点状态",
       "displayConfig": "修改节点配置",
       "import": "导入",
+      "importExample": "导入示例流程",
       "export": "导出",
       "search": "查找流程",
       "searchInput": "查找流程",
@@ -142,7 +153,12 @@
       "moveToBack": "置于底层",
       "moveToFront": "置于顶层",
       "moveBackwards": "向后移动",
-      "moveForwards": "向前移动"
+      "moveForwards": "向前移动",
+      "showNodeHelp":"显示节点帮助",
+      "enableSelectedNodes":"启用当前选中节点",
+      "disableSelectedNodes":"禁用当前选中节点",
+      "showSelectedNodeLabels":"显示选中的节点标签",
+      "hideSelectedNodeLabels":"隐藏选中的节点标签"
     }
   },
   "actions": {
@@ -403,6 +419,7 @@
     },
     "errors": {
       "noNodesSelected": "<strong>无法创建子流程</strong>: 未选择节点",
+      "acrossMultipleGroups": "无法跨多个组创建子流",
       "multipleInputsToSelection": "<strong>无法创建子流程</strong>: 多个输入到了选择"
     }
   },
@@ -491,12 +508,14 @@
     "unassigned": "未分配",
     "global": "全局",
     "workspace": "工作区",
+    "editor": "编辑对话框",
     "selectAll": "选择所有节点",
     "selectNone": "取消所有选择",
     "selectAllConnected": "选择所有连接的节点",
     "addRemoveNode": "从选择中添加/删除节点",
     "editSelected": "编辑选定节点",
     "deleteSelected": "删除选定节点或链接",
+    "deleteReconnect": "删除并重新连接",
     "importNode": "导入节点",
     "exportNode": "导出节点",
     "nudgeNode": "移动所选节点(1px)",
@@ -571,6 +590,7 @@
     "editor": {
       "title": "面板管理",
       "palette": "控制板",
+      "allCatalogs": "所有目录",
       "times": {
         "seconds": "秒前",
         "minutes": "分前",
@@ -610,6 +630,7 @@
       "tab-nodes": "节点",
       "tab-install": "安装",
       "sort": "排序:",
+      "sortRelevance": "关联",
       "sortAZ": "a-z顺序",
       "sortRecent": "日期顺序",
       "more": "增加 __count__ 个",
@@ -683,7 +704,11 @@
       "empty": "空的",
       "globalConfig": "全局配置节点",
       "triggerAction": "触发动作",
-      "find": "在工作区中查找"
+      "find": "在工作区中查找",
+      "copyItemUrl": "复制地址",
+	    "copyURL2Clipboard": "复制地址到剪贴板",
+      "showFlow": "显示流程",
+      "hideFlow": "隐藏流程"
     },
     "help": {
       "name": "帮助",
@@ -984,7 +1009,10 @@
     "quote": "引用",
     "link": "链接",
     "horizontal-rule": "水平线",
-    "toggle-preview": "切换预览"
+    "toggle-preview": "切换预览",
+    "mermaid": {
+      "summary": "美人鱼图"
+    }
   },
   "bufferEditor": {
     "title": "Buffer 编辑器",
@@ -1147,17 +1175,6 @@
       "create": "创建分支",
       "current": "当前的"
     },
-    "languages": {
-        "de": "德语",
-        "en-US": "英文",
-        "fr": "法语",
-        "ja": "日语",
-        "ko": "韩文",
-        "pt-BR":"葡萄牙语",
-        "ru":"俄語",
-        "zh-CN": "简体中文",
-        "zh-TW": "繁体中文"
-    },
     "create-default-file-set": {
       "no-active": "没有活动项目就无法创建默认文件集",
       "no-empty": "无法在非空项目上创建默认文件集",
@@ -1188,22 +1205,22 @@
     "title": "系统信息"
   },
   "languages": {
-    "de": "德语-Deutsch",
-    "en-US": "英文-English",
-    "ja": "日语-日本",
-    "ko": "韩文-한국인",
-    "ru": "俄语-Русский",
+    "de": "德语",
+    "en-US": "英文",
+    "fr": "法语",
+    "ja": "日语",
+    "ko": "韩文",
+    "pt-BR":"葡萄牙语",
+    "ru":"俄語",
     "zh-CN": "简体中文",
-    "zh-TW": "繁體中文"
+    "zh-TW": "繁体中文"
   },
   "validator": {
     "errors": {
       "invalid-json": "无效的 JSON 数据： __error__",
-      "invalid-json-prop": "__prop__: 无效的 JSON 数据： __error__",
+      "invalid-expr": "无效的 JSONata 表达式: __error__",
       "invalid-prop": "无效的属性表达式",
-      "invalid-prop-prop": "__prop__: 无效的属性表达式",
       "invalid-num": "无效的数字",
-      "invalid-num-prop": "__prop__: 无效的数字",
       "invalid-regexp": "输入格式无效",
       "invalid-regex-prop": "__prop__: 输入格式无效",
       "missing-required-prop": "__prop__: 缺少属性值",
@@ -1213,9 +1230,15 @@
     }
   },
   "contextMenu": {
+    "showActionList":"显示动作列表",
     "insert": "插入",
     "node": "节点",
     "junction": "连接点",
     "linkNodes": "链接节点"
+  },
+  "env-var": {
+    "environment": "环境配置",
+    "header": "全局环境变量",
+    "revert": "重置"
   }
 }

packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json

@@ -270,5 +270,9 @@
     "$moment": {
         "args": "[str]",
         "desc": "使用Moment库获取日期对象。"
+    },
+    "$clone": {
+        "args": "value",
+        "desc": "安全克隆对象."
     }
 }

packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json

@@ -23,7 +23,11 @@
             "position": "位置",
             "enable": "啟用",
             "disable": "禁用",
-            "upload": "上傳"
+            "upload": "上傳",
+            "lock": "鎖定",
+            "unlock": "解鎖",
+            "locked": "鎖定",
+            "unlocked": "解鎖"
         },
         "type": {
             "string": "字符串",
@@ -38,11 +42,14 @@
         }
     },
     "event": {
+        "loadPlugins": "加載插件",
         "loadPalette": "加載控制板",
         "loadNodeCatalogs": "加載節點目錄",
         "loadNodes": "加載 __count__ 個節點",
         "loadFlows": "加載流程",
-        "importFlows": "往工作區中加載流程"
+        "importFlows": "往工作區中加載流程",
+        "importError": "<p>加載流程錯誤</p><p>__message__</p>",
+        "loadingProject": "加載項目"
     },
     "workspace": {
         "defaultName": "流程__number__",
@@ -51,18 +58,35 @@
         "delete": "確定想要刪除 '__label__'?",
         "dropFlowHere": "把流程放到這裡",
         "addFlow": "新增流程",
-        "listFlows": "流程列表",
+        "addFlowToRight": "在右側新增流程",
+        "hideFlow": "隱藏流程",
+        "hideOtherFlows": "隱藏其它流程",
+        "showAllFlows": "顯示所有流程",
+        "hideAllFlows": "隱藏所有流程",
+        "hiddenFlows": "列出 __count__ 個隱藏流程",
+        "hiddenFlows_plural": "列出 __count__ 個隱藏流程",
+        "showLastHiddenFlow": "顯示最後一個隱藏流程",
+        " ": "流程列表",
+        "listSubflows": "列出子流程",
         "status": "狀態",
         "enabled": "有效",
         "disabled": "無效",
         "info": "詳細描述",
-        "selectNodes": "點擊節點用於選擇"
+        "selectNodes": "點擊節點用於選擇",
+        "enableFlow": "啟用流程",
+        "disableFlow": "禁用流程",
+        "lockFlow": "鎖定流程",
+        "unlockFlow": "解除鎖定",
+        "moveToStart": "移動到起始",
+        "moveToEnd": "移動到末尾"
     },
     "menu": {
         "label": {
             "view": {
                 "view": "顯示",
                 "grid": "格線",
+                "storeZoom": "加載時還原縮放尺寸",
+                "storePosition": "加載時還原滾動位置",
                 "showGrid": "顯示格線",
                 "snapGrid": "對齊格線",
                 "gridSize": "格線尺寸",
@@ -80,12 +104,14 @@
             "palette": {
                 "show": "顯示控制板"
             },
+            "edit": "編輯",
             "settings": "設置",
             "userSettings": "使用者設置",
             "nodes": "節點",
             "displayStatus": "顯示節點狀態",
             "displayConfig": "修改節點配置",
             "import": "匯入",
+            "importExample": "導入示例流程",
             "export": "匯出",
             "search": "搜尋流程",
             "searchInput": "搜尋流程",
@@ -102,24 +128,48 @@
             "editPalette": "節點管理",
             "other": "其他",
             "showTips": "顯示小提示",
-            "help": "Node-RED website",
+            "showWelcomeTours": "顯示新版本向導",
+            "help": "Node-RED 文檔主頁",
             "projects": "專案",
             "projects-new": "新專案",
             "projects-open": "開啟專案",
             "projects-settings": "專案設定",
             "showNodeLabelDefault": "顯示新添加節點的標籤",
+            "codeEditor": "代碼編輯器",
             "groups": "組",
             "groupSelection": "選擇組",
             "ungroupSelection": "取消選擇組",
             "groupMergeSelection": "合并選擇",
-            "groupRemoveSelection": "從組中移除"
+            "groupRemoveSelection": "從組中移除",
+            "arrange": "布局",
+            "alignLeft": "左對齊",
+            "alignCenter": "居中對齊",
+            "alignRight": "右對齊",
+            "alignTop": "頂部對齊",
+            "alignMiddle": "垂直居中對齊",
+            "alignBottom": "底部對齊",
+            "distributeHorizontally": "横向分布",
+            "distributeVertically": "垂直分布",
+            "moveToBack": "置於底層",
+            "moveToFront": "置於頂層",
+            "moveBackwards": "向後移動",
+            "moveForwards": "向前移動",
+            "showNodeHelp":"顯示節點幫助",
+            "enableSelectedNodes":"啟用當前選中節點",
+            "disableSelectedNodes":"禁用當前選中節點",
+            "showSelectedNodeLabels":"顯示選中的節點標簽",
+            "hideSelectedNodeLabels":"隱藏選中的節點標簽"
         }
     },
     "actions": {
         "toggle-navigator": "切換導航器",
         "zoom-out": "縮小",
         "zoom-reset": "重置縮放",
-        "zoom-in": "放大"
+        "zoom-in": "放大",
+        "search-flows": "搜索流程",
+        "search-prev": "上一個",
+        "search-next": "下一個",
+        "search-counter": "\"__term__\" __result__ of __count__"
     },
     "user": {
         "loggedInAs": "作為 __name__ 登入",
@@ -135,12 +185,17 @@
         }
     },
     "notification": {
+        "state": {
+          "flowsStopped": "流程已停止",
+          "flowsStarted": "流程已啟動"
+        },
         "warning": "<strong>警告</strong>: __message__",
         "warnings": {
             "undeployedChanges": "節點中存在未部署的更改",
             "nodeActionDisabled": "節點動作在子流程中被禁用",
             "nodeActionDisabledSubflow": "子流程中禁用了節點操作",
             "missing-types": "流程由於缺少節點類型而停止。請檢查日誌的詳細資訊",
+            "missing-modules": "<p>流程因缺少模塊而停止。</p>",
             "safe-mode": "<p>流程在安全模式下停止。</p><p>您可以修改流程並部署更改以重新啟動。</p>",
             "restartRequired": "Node-RED必須重新啟動，以啟用升級的模組",
             "credentials_load_failed": "<p>流程由於無法解密證書而停止。</p> <p>流程證書文件已加密，但是項目的加密密鑰丟失或無效。</p>",
@@ -151,7 +206,7 @@
             "project_not_found": "<p>找不到項目的'__project__'</p>",
             "git_merge_conflict": "<p>自動合併更改失敗。</p><p>修復未合併的衝突，然後提交結果。</p>"
         },
-        "error": "<strong>Error</strong>: __message__",
+        "error": "<strong>錯誤</strong>: __message__",
         "errors": {
             "lostConnection": "丟失與伺服器的連接，重新連接...",
             "lostConnectionReconnect": "丟失與伺服器的連接，__time__ 秒後重新連接",
@@ -208,6 +263,8 @@
         "download": "下載",
         "importUnrecognised": "匯入了無法識別的類型:",
         "importUnrecognised_plural": "匯入了無法識別的類型:",
+        "importDuplicate": "導入了重復節點：",
+        "importDuplicate_plural": "導入了重復節點：",
         "nodesExported": "節點匯出到了剪貼簿",
         "nodesImported": "已匯入:",
         "nodeCopied": "已複製 __count__ 個節點",
@@ -259,6 +316,10 @@
         "modifiedFlowsDesc": "只部署包含已更改節點的流程",
         "modifiedNodes": "已更改的節點",
         "modifiedNodesDesc": "只部署已經更改的節點",
+        "startFlows": "啟動",
+        "startFlowsDesc": "啟動流程",
+        "stopFlows": "停止",
+        "stopFlowsDesc": "停止流程",
         "restartFlows": "重新啟動流程",
         "restartFlowsDesc": "重新啟動當前部署的流程",
         "successfulDeploy": "部署成功",
@@ -337,14 +398,28 @@
         "output": "輸出:",
         "status": "狀態節點",
         "deleteSubflow": "刪除子流程",
+        "confirmDelete": "您確定要刪除此子流程？",
         "info": "詳細描述",
         "category": "類別",
+        "module": "模塊",
+        "license": "許可",
+        "licenseNone": "無",
+        "licenseOther": "其它",
+        "type": "節點類型",
+        "version": "版本",
+        "versionPlaceholder": "x.y.z",
+        "keys": "關鍵字",
+        "keysPlaceholder": "使用英文逗號分隔關鍵字",
+        "author": "作者",
+        "authorPlaceholder": "名字 <email@example.com>",
+        "desc": "描述",
         "env": {
             "restore": "恢復為默認子流程",
             "remove": "類別刪除環境變量"
         },
         "errors": {
             "noNodesSelected": "<strong>無法創建子流程</strong>: 未選擇節點",
+            "acrossMultipleGroups": "無法跨多個組創建子流",
             "multipleInputsToSelection": "<strong>無法創建子流程</strong>: 多個輸入到了選擇"
         }
     },
@@ -367,12 +442,12 @@
         "editConfig": "編輯 __type__ 配置",
         "addNewType": "添加新的 __type__ 節點",
         "nodeProperties": "節點屬性",
-        "label": "Label",
+        "label": "標簽",
         "color": "顏色",
         "portLabels": "埠標籤",
         "labelInputs": "輸入",
         "labelOutputs": "輸出",
-        "settingIcon": "Icon",
+        "settingIcon": "圖標",
         "default": "默認",
         "noDefaultLabel": "無",
         "defaultLabel": "使用默認標籤",
@@ -385,6 +460,7 @@
         "icon": "圖標",
         "inputType": "輸入類型",
         "selectType": "選擇類型...",
+        "loadCredentials": "加載節點憑證",
         "inputs": {
             "input": "輸入",
             "select": "選擇",
@@ -419,7 +495,8 @@
         },
         "errors": {
             "scopeChange": "更改範圍將使其他流程中的節點無法使用",
-            "invalidProperties": "無效的屬性："
+            "invalidProperties": "無效的屬性：",
+            "credentialLoadFailed": "無法加載節點憑據"
         }
     },
     "keyboard": {
@@ -431,11 +508,14 @@
         "unassigned": "未分配",
         "global": "全局",
         "workspace": "工作區",
+        "editor": "編輯對話框",
         "selectAll": "選擇所有節點",
+        "selectNone": "取消所有選擇",
         "selectAllConnected": "選擇所有連接的節點",
         "addRemoveNode": "從選擇中添加/刪除節點",
         "editSelected": "編輯選定節點",
         "deleteSelected": "刪除選定節點或連結",
+        "deleteReconnect": "刪除並重新連接",
         "importNode": "匯入節點",
         "exportNode": "匯出節點",
         "nudgeNode": "移動所選節點(1px)",
@@ -445,10 +525,14 @@
         "copyNode": "複製所選節點",
         "cutNode": "剪切所選節點",
         "pasteNode": "粘貼節點",
+        "copyGroupStyle": "復製組樣式",
+        "pasteGroupStyle": "粘貼組樣式",
         "undoChange": "撤銷上次執行的更改",
+        "redoChange": "重做",
         "searchBox": "打開搜尋框",
         "managePalette": "管理面板",
-        "actionList": "動作列表"
+        "actionList": "動作列表",
+        "splitWireWithLinks": "使用Link節點拆分已選項"
     },
     "library": {
         "library": "庫",
@@ -466,12 +550,11 @@
         "types": {
             "local": "本地",
             "examples": "例子"
-        },
-        "exportToLibrary": "將節點匯出到庫"
+        }
     },
     "palette": {
         "noInfo": "無可用資訊",
-        "filter": "過濾節點",
+        "filter": "過濾已安裝模組",
         "search": "搜尋模組",
         "addCategory": "添加新的...",
         "label": {
@@ -501,11 +584,13 @@
             "nodeEnabled_plural": "啟用多個節點:",
             "nodeDisabled": "禁用節點:",
             "nodeDisabled_plural": "禁用多個節點:",
-            "nodeUpgraded": "節點模組__module__升級到__version__版本"
+            "nodeUpgraded": "節點模組__module__升級到__version__版本",
+            "unknownNodeRegistered": "加載節點錯誤： <ul><li>__type__<br>__error__</li></ul>"
         },
         "editor": {
             "title": "面板管理",
-            "palette": "Palette",
+            "palette": "控製板",
+            "allCatalogs": "所有目錄",
             "times": {
                 "seconds": "秒前",
                 "minutes": "分前",
@@ -545,10 +630,12 @@
             "tab-nodes": "節點",
             "tab-install": "安裝",
             "sort": "排序:",
+            "sortRelevance": "關聯",
             "sortAZ": "a-z順序",
             "sortRecent": "日期順序",
             "more": "增加 __count__ 個",
             "upload": "上傳模塊tgz文件",
+            "refresh": "更新模塊列表",
             "errors": {
                 "catalogLoadFailed": "無法載入節點目錄。<br>查看瀏覽器控制臺瞭解更多資訊",
                 "installFailed": "無法安裝: __module__<br>__message__<br>查看日誌瞭解更多資訊",
@@ -617,7 +704,11 @@
             "empty": "空的",
             "globalConfig": "全局配置節點",
             "triggerAction": "觸發動作",
-            "find": "在工作區中查找"
+            "find": "在工作區中查找",
+            "copyItemUrl": "復製地址",
+            "copyURL2Clipboard": "復製地址到剪貼板",
+            "showFlow": "顯示流程",
+            "hideFlow": "隱藏流程"
         },
         "help": {
             "name": "幫助",
@@ -627,7 +718,8 @@
             "showHelp": "顯示幫助",
             "showInOutline": "在大綱中顯示",
             "showTopics": "顯示主題",
-            "noHelp": "未選擇幫助主題"
+            "noHelp": "未選擇幫助主題",
+            "changeLog": "更新日誌"
         },
         "config": {
             "name": "配置節點",
@@ -828,31 +920,37 @@
             "json": "JSON",
             "bin": "二進位流",
             "date": "時間戳記",
-            "jsonata": "expression",
-            "env": "env variable",
+            "jsonata": "表達式",
+            "env": "環境變量",
             "cred": "證書"
         }
     },
     "editableList": {
-        "add": "添加"
+        "add": "添加",
+        "addTitle": "添加項"
     },
     "search": {
-        "empty": "找不到匹配",
+        "history": "搜索歷史",
+        "clear": "清除所有",
+        "empty": "找不到匹配項",
         "addNode": "添加一個節點...",
         "options": {
             "configNodes": "配置節點",
             "unusedConfigNodes": "未使用的配置節點",
             "invalidNodes": "無效的節點",
             "uknownNodes": "未知的節點",
-            "unusedSubflows": "未使用的子流程"
+            "unusedSubflows": "未使用的子流程",
+            "hiddenFlows": "隱藏的流程",
+            "modifiedNodes": "已修改的節點或流程",
+            "thisFlow": "當前流程"
         }
     },
     "expressionEditor": {
         "functions": "功能",
-        "functionReference": "Function reference",
+        "functionReference": "功能參考",
         "insert": "插入",
         "title": "JSONata運算式編輯器",
-        "test": "Test",
+        "test": "測試",
         "data": "示例消息",
         "result": "結果",
         "format": "格式表達方法",
@@ -863,20 +961,28 @@
             "invalid-expr": "無效的JSONata運算式:\n  __message__",
             "invalid-msg": "無效的示例JSON消息:\n  __message__",
             "context-unsupported": "無法測試上下文函數\n $flowContext 或 $globalContext",
+            "env-unsupported": "無法測試 $env 函數",
+            "moment-unsupported": "無法測試 $moment 函數",
+            "clone-unsupported": "無法測試 $clone 函數",
             "eval": "評估運算式錯誤:\n  __message__"
         }
     },
+    "monaco": {
+      "setTheme": "設置主題"
+    },
     "jsEditor": {
         "title": "JavaScript 編輯器"
     },
     "textEditor": {
-        "title": "Text 編輯器"
+        "title": "文本編輯器"
     },
     "jsonEditor": {
         "title": "JSON編輯器",
         "format": "格式化JSON",
         "rawMode": "編輯 JSON",
-        "uiMode": "Visual編輯器",
+        "uiMode": "可視化編輯器",
+        "rawMode-readonly": "原始JSON",
+        "uiMode-readonly": "可視化",
         "insertAbove": "在上方插入",
         "insertBelow": "在下方插入",
         "addItem": "添加項目",
@@ -892,9 +998,9 @@
         "title": "Markdown 編輯器",
         "expand": "展開",
         "format": "F使用markdown格式化",
-        "heading1": "Heading 1",
-        "heading2": "Heading 2",
-        "heading3": "Heading 3",
+        "heading1": "標題 1",
+        "heading2": "標題 2",
+        "heading3": "標題 3",
         "bold": "粗體",
         "italic": "斜體",
         "code": "程式碼",
@@ -903,7 +1009,10 @@
         "quote": "引用",
         "link": "連結",
         "horizontal-rule": "分隔線",
-        "toggle-preview": "預覽"
+        "toggle-preview": "切換預覽",
+        "mermaid": {
+          "summary": "美人魚圖"
+        }
     },
     "bufferEditor": {
         "title": "緩衝區編輯器",
@@ -1038,7 +1147,8 @@
             "not-git": "不是git倉庫",
             "no-resource": "找不到存儲庫",
             "cant-get-ssh-key-path": "錯誤！ 無法獲取所選的SSH密鑰路徑。",
-            "unexpected_error": "意外的錯誤"
+            "unexpected_error": "意外的錯誤",
+            "clearContext": "更改項目時清除上下文"
         },
         "delete": {
             "confirm": "您確定要刪除此項目嗎？"
@@ -1068,7 +1178,7 @@
         "create-default-file-set": {
             "no-active": "沒有活動項目就無法創建默認文件集",
             "no-empty": "無法在非空項目上創建默認文件集",
-            "git-error": "git error"
+            "git-error": "git錯誤"
         },
         "errors": {
             "no-username-email": "您的Git客戶端未配置用戶名/電子郵件。",
@@ -1079,11 +1189,20 @@
     "editor-tab": {
         "properties": "屬性",
         "envProperties": "環境變量",
+        "module": "模塊屬性",
         "description": "描述",
         "appearance": "外觀",
         "preview": "UI預覽",
-        "defaultValue": "默認值",
-        "env": "環境變量"
+        "defaultValue": "默認值"
+    },
+    "tourGuide": {
+      "takeATour": "查看更新內容",
+      "start": "開始",
+      "next": "下一個",
+      "welcomeTours": "歡迎使用 Node-RED"
+    },
+    "diagnostics": {
+      "title": "系统信息"
     },
     "languages": {
         "de": "德語",
@@ -1095,5 +1214,31 @@
         "ru":"俄語",
         "zh-CN": "簡體中文",
         "zh-TW": "繁體中文"
+    },
+    "validator": {
+      "errors": {
+        "invalid-json": "無效的 JSON 數據： __error__",
+        "invalid-expr": "無效的 JSONata 表達式: __error__",
+        "invalid-prop": "無效的屬性表達式",
+        "invalid-num": "無效的數字",
+        "invalid-regexp": "輸入格式無效",
+        "invalid-regex-prop": "__prop__: 輸入格式無效",
+        "missing-required-prop": "__prop__: 缺少屬性值",
+        "invalid-config": "__prop__: 無效的配置節點",
+        "missing-config": "__prop__: 缺少配置節點",
+        "validation-error": "__prop__: 驗證錯誤: __node__, __id__: __error__"
+      }
+    },
+    "contextMenu": {
+      "showActionList":"顯示動作列表",
+      "insert": "插入",
+      "node": "節點",
+      "junction": "連接點",
+      "linkNodes": "鏈接節點"
+    },
+    "env-var": {
+      "environment": "環境配置",
+      "header": "全局環境變量",
+      "revert": "重置"
     }
 }

packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json

@@ -270,5 +270,9 @@
     "$moment": {
         "args": "[str]",
         "desc": "使用Moment庫獲取日期對象。"
+    },
+    "$clone": {
+      "args": "value",
+      "desc": "安全克隆對象."
     }
 }

packages/node_modules/@node-red/editor-client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "3.1.0-beta.4",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

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

@@ -797,8 +797,8 @@ RED.nodes = (function() {
 
         if (node && node._def.onremove) {
             // Deprecated: never documented but used by some early nodes
-            console.log("Deprecated API warning: node type ",node.type," has an onremove function - should be oneditremove - please report");
-            node._def.onremove.call(n);
+            console.log("Deprecated API warning: node type ",node.type," has an onremove function - should be oneditdelete - please report");
+            node._def.onremove.call(node);
         }
         return {links:removedLinks,nodes:removedNodes};
     }
@@ -2198,6 +2198,12 @@ RED.nodes = (function() {
                         }
                         node._config.x = node.x;
                         node._config.y = node.y;
+                        if (n.hasOwnProperty('w')) {
+                            node.w = n.w
+                        }
+                        if (n.hasOwnProperty('h')) {
+                            node.h = n.h
+                        }
                     } else if (n.type.substring(0,7) === "subflow") {
                         var parentId = n.type.split(":")[1];
                         var subflow = subflow_denylist[parentId]||subflow_map[parentId]||getSubflow(parentId);

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

@@ -498,6 +498,15 @@ var RED = (function() {
                             ]
                         }
                     }
+                } else if (notificationId === 'restart-required') {
+                    options.buttons = [
+                        {
+                            text: RED._("common.label.close"),
+                            click: function() {
+                                persistentNotifications[notificationId].hideNotification();
+                            }
+                        }
+                    ]
                 }
                 if (!persistentNotifications.hasOwnProperty(notificationId)) {
                     persistentNotifications[notificationId] = RED.notify(text,options);
@@ -525,6 +534,10 @@ var RED = (function() {
                 RED.view.redrawStatus(node);
             }
         });
+
+        let pendingNodeRemovedNotifications = []
+        let pendingNodeRemovedTimeout
+
         RED.comms.subscribe("notification/node/#",function(topic,msg) {
             var i,m;
             var typeList;
@@ -562,8 +575,15 @@ var RED = (function() {
                     m = msg[i];
                     info = RED.nodes.removeNodeSet(m.id);
                     if (info.added) {
-                        typeList = "<ul><li>"+m.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
-                        RED.notify(RED._("palette.event.nodeRemoved", {count:m.types.length})+typeList,"success");
+                        pendingNodeRemovedNotifications = pendingNodeRemovedNotifications.concat(m.types.map(RED.utils.sanitize))
+                        if (pendingNodeRemovedTimeout) {
+                            clearTimeout(pendingNodeRemovedTimeout)
+                        }
+                        pendingNodeRemovedTimeout = setTimeout(function () {
+                            typeList = "<ul><li>"+pendingNodeRemovedNotifications.join("</li><li>")+"</li></ul>";
+                            RED.notify(RED._("palette.event.nodeRemoved", {count:pendingNodeRemovedNotifications.length})+typeList,"success");
+                            pendingNodeRemovedNotifications = []
+                        }, 200)
                     }
                 }
                 loadIconList();
@@ -731,7 +751,7 @@ var RED = (function() {
         }
         menuOptions.push({id:"menu-item-help",
             label: RED.settings.theme("menu.menu-item-help.label",RED._("menu.label.help")),
-            href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs")
+            href: RED.settings.theme("menu.menu-item-help.url","https://nodered.org/docs")
         });
         menuOptions.push({id:"menu-item-node-red-version", label:"v"+RED.settings.version, onselect: "core:show-about" });
 

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

@@ -54,25 +54,26 @@
         return icon;
     }
 
-    var autoComplete = function(options) {
-        function getMatch(value, searchValue) {
-            const idx = value.toLowerCase().indexOf(searchValue.toLowerCase());
-            const len = idx > -1 ? searchValue.length : 0;
-            return {
-                index: idx,
-                found: idx > -1,
-                pre: value.substring(0,idx),
-                match: value.substring(idx,idx+len),
-                post: value.substring(idx+len),
-            }
-        }
-        function generateSpans(match) {
-            const els = [];
-            if(match.pre) { els.push($('<span/>').text(match.pre)); }
-            if(match.match) { els.push($('<span/>',{style:"font-weight: bold; color: var(--red-ui-text-color-link);"}).text(match.match)); }
-            if(match.post) { els.push($('<span/>').text(match.post)); }
-            return els;
+    function getMatch(value, searchValue) {
+        const idx = value.toLowerCase().indexOf(searchValue.toLowerCase());
+        const len = idx > -1 ? searchValue.length : 0;
+        return {
+            index: idx,
+            found: idx > -1,
+            pre: value.substring(0,idx),
+            match: value.substring(idx,idx+len),
+            post: value.substring(idx+len),
         }
+    }
+    function generateSpans(match) {
+        const els = [];
+        if(match.pre) { els.push($('<span/>').text(match.pre)); }
+        if(match.match) { els.push($('<span/>',{style:"font-weight: bold; color: var(--red-ui-text-color-link);"}).text(match.match)); }
+        if(match.post) { els.push($('<span/>').text(match.post)); }
+        return els;
+    }
+    
+    const msgAutoComplete = function(options) {
         return function(val) {
             var matches = [];
             options.forEach(opt => {
@@ -102,6 +103,197 @@
         }
     }
 
+    function getEnvVars (obj, envVars = {}) {
+        contextKnownKeys.env = contextKnownKeys.env || {}
+        if (contextKnownKeys.env[obj.id]) {
+            return contextKnownKeys.env[obj.id]
+        }
+        let parent
+        if (obj.type === 'tab' || obj.type === 'subflow') {
+            RED.nodes.eachConfig(function (conf) {
+                if (conf.type === "global-config") {
+                    parent = conf;
+                }
+            })
+        } else if (obj.g) {
+            parent = RED.nodes.group(obj.g)
+        } else if (obj.z) {
+            parent = RED.nodes.workspace(obj.z) || RED.nodes.subflow(obj.z)
+        }
+        if (parent) {
+            getEnvVars(parent, envVars)
+        }
+        if (obj.env) {
+            obj.env.forEach(env => {
+                envVars[env.name] = obj
+            })
+        }
+        contextKnownKeys.env[obj.id] = envVars
+        return envVars
+    }
+
+    const envAutoComplete = function (val) {
+        const editStack = RED.editor.getEditStack()
+        if (editStack.length === 0) {
+            done([])
+            return
+        }
+        const editingNode = editStack.pop()
+        if (!editingNode) {
+            return []
+        }
+        const envVarsMap = getEnvVars(editingNode)
+        const envVars = Object.keys(envVarsMap)
+        const matches = []
+        const i = val.lastIndexOf('${')
+        let searchKey = val
+        let isSubkey = false
+        if (i > -1) {
+            if (val.lastIndexOf('}') < i) {
+                searchKey = val.substring(i+2)
+                isSubkey = true
+            }
+        }
+        envVars.forEach(v => {
+            let valMatch = getMatch(v, searchKey);
+            if (valMatch.found) {
+                const optSrc = envVarsMap[v]
+                const element = $('<div>',{style: "display: flex"});
+                const valEl = $('<div/>',{style:"font-family: var(--red-ui-monospace-font); white-space:nowrap; overflow: hidden; flex-grow:1"});
+                valEl.append(generateSpans(valMatch))
+                valEl.appendTo(element)
+
+                if (optSrc) {
+                    const optEl = $('<div>').css({ "font-size": "0.8em" });
+                    let label
+                    if (optSrc.type === 'global-config') {
+                        label = RED._('sidebar.context.global')
+                    } else if (optSrc.type === 'group') {
+                        label = RED.utils.getNodeLabel(optSrc) || (RED._('sidebar.info.group') + ': '+optSrc.id)
+                    } else {
+                        label = RED.utils.getNodeLabel(optSrc) || optSrc.id
+                    }
+
+                    optEl.append(generateSpans({ match: label }));
+                    optEl.appendTo(element);
+                }
+                matches.push({
+                    value: isSubkey ? val + v + '}' : v,
+                    label: element,
+                    i: valMatch.index
+                });
+            }
+        })
+        matches.sort(function(A,B){return A.i-B.i})
+        return matches
+    }
+
+    let contextKnownKeys = {}
+    let contextCache = {}
+    if (RED.events) {
+        RED.events.on("editor:close", function () {
+            contextCache = {}
+            contextKnownKeys = {}
+        });
+    }
+
+    const contextAutoComplete = function() {
+        const that = this
+        const getContextKeysFromRuntime = function(scope, store, searchKey, done) {
+            contextKnownKeys[scope] = contextKnownKeys[scope] || {}
+            contextKnownKeys[scope][store] = contextKnownKeys[scope][store] || new Set()
+            if (searchKey.length > 0) {
+                try {
+                    RED.utils.normalisePropertyExpression(searchKey)
+                } catch (err) {
+                    // Not a valid context key, so don't try looking up
+                    done()
+                    return
+                }
+            }
+            const url = `context/${scope}/${encodeURIComponent(searchKey)}?store=${store}&keysOnly`
+            if (contextCache[url]) {
+                // console.log('CACHED', url)
+                done()
+            } else {
+                // console.log('GET', url)
+                $.getJSON(url, function(data) {
+                    // console.log(data)
+                    contextCache[url] = true
+                    const result = data[store] || {}
+                    const keys = result.keys || []
+                    const keyPrefix = searchKey + (searchKey.length > 0 ? '.' : '')
+                    keys.forEach(key => {
+                        if (/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(key)) {
+                            contextKnownKeys[scope][store].add(keyPrefix + key)
+                        } else {
+                            contextKnownKeys[scope][store].add(searchKey + "[\""+key.replace(/"/,"\\\"")+"\"]")
+                        }                        
+                    })
+                    done()
+                })
+            }
+        }
+        const getContextKeys = function(key, done) {
+            const keyParts = key.split('.')
+            const partialKey = keyParts.pop()
+            let scope = that.propertyType
+            if (scope === 'flow') {
+                // Get the flow id of the node we're editing
+                const editStack = RED.editor.getEditStack()
+                if (editStack.length === 0) {
+                    done([])
+                    return
+                }
+                const editingNode = editStack.pop()
+                if (editingNode.z) {
+                    scope = `${scope}/${editingNode.z}`
+                } else {
+                    done([])
+                    return
+                }
+            }
+            const store = (contextStoreOptions.length === 1) ? contextStoreOptions[0].value : that.optionValue
+            const searchKey = keyParts.join('.')
+           
+            getContextKeysFromRuntime(scope, store, searchKey, function() {
+                if (contextKnownKeys[scope][store].has(key) || key.endsWith(']')) {
+                    getContextKeysFromRuntime(scope, store, key, function() {
+                        done(contextKnownKeys[scope][store])
+                    })
+                }
+                done(contextKnownKeys[scope][store])
+            })
+        }
+
+        return function(val, done) {
+            getContextKeys(val, function (keys) {
+                const matches = []
+                keys.forEach(v => {
+                    let optVal = v
+                    let valMatch = getMatch(optVal, val);
+                    if (!valMatch.found && val.length > 0 && val.endsWith('.')) {
+                        // Search key ends in '.' - but doesn't match. Check again
+                        // with [" at the end instead so we match bracket notation
+                        valMatch = getMatch(optVal, val.substring(0, val.length - 1) + '["')
+                    }
+                    if (valMatch.found) {
+                        const element = $('<div>',{style: "display: flex"});
+                        const valEl = $('<div/>',{style:"font-family: var(--red-ui-monospace-font); white-space:nowrap; overflow: hidden; flex-grow:1"});
+                        valEl.append(generateSpans(valMatch))
+                        valEl.appendTo(element)
+                        matches.push({
+                            value: optVal,
+                            label: element,
+                        });
+                    }
+                })
+                matches.sort(function(a, b) { return a.value.localeCompare(b.value) });
+                done(matches);
+            })
+        }
+    }
+
     // This is a hand-generated list of completions for the core nodes (based on the node help html).
     var msgCompletions = [
         { value: "payload" },
@@ -166,23 +358,27 @@
         { value: "_session", source: ["websocket out","tcp out"] },
     ]
     var allOptions = {
-        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression, autoComplete: autoComplete(msgCompletions)},
+        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression, autoComplete: msgAutoComplete(msgCompletions)},
         flow: {value:"flow",label:"flow.",hasValue:true,
             options:[],
             validate:RED.utils.validatePropertyExpression,
             parse: contextParse,
             export: contextExport,
-            valueLabel: contextLabel
+            valueLabel: contextLabel,
+            autoComplete: contextAutoComplete
         },
         global: {value:"global",label:"global.",hasValue:true,
             options:[],
             validate:RED.utils.validatePropertyExpression,
             parse: contextParse,
             export: contextExport,
-            valueLabel: contextLabel
+            valueLabel: contextLabel,
+            autoComplete: contextAutoComplete
         },
         str: {value:"str",label:"string",icon:"red/images/typedInput/az.svg"},
-        num: {value:"num",label:"number",icon:"red/images/typedInput/09.svg",validate:/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/},
+        num: {value:"num",label:"number",icon:"red/images/typedInput/09.svg",validate: function(v) {
+            return (true === RED.utils.validateTypedProperty(v, "num"));
+        } },
         bool: {value:"bool",label:"boolean",icon:"red/images/typedInput/bool.svg",options:["true","false"]},
         json: {
             value:"json",
@@ -249,7 +445,8 @@
         env: {
             value: "env",
             label: "env variable",
-            icon: "red/images/typedInput/env.svg"
+            icon: "red/images/typedInput/env.svg",
+            autoComplete: envAutoComplete
         },
         node: {
             value: "node",
@@ -425,6 +622,7 @@
     }
 
     var nlsd = false;
+    let contextStoreOptions;
 
     $.widget( "nodered.typedInput", {
         _create: function() {
@@ -436,7 +634,7 @@
                     }
                 }
                 var contextStores = RED.settings.context.stores;
-                var contextOptions = contextStores.map(function(store) {
+                contextStoreOptions = contextStores.map(function(store) {
                     return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database"></i>'}
                 }).sort(function(A,B) {
                     if (A.value === RED.settings.context.default) {
@@ -447,12 +645,12 @@
                         return A.value.localeCompare(B.value);
                     }
                 })
-                if (contextOptions.length < 2) {
+                if (contextStoreOptions.length < 2) {
                     allOptions.flow.options = [];
                     allOptions.global.options = [];
                 } else {
-                    allOptions.flow.options = contextOptions;
-                    allOptions.global.options = contextOptions;
+                    allOptions.flow.options = contextStoreOptions;
+                    allOptions.global.options = contextStoreOptions;
                 }
             }
             nlsd = true;
@@ -542,7 +740,7 @@
                 that.element.trigger('paste',evt);
             });
             this.input.on('keydown', function(evt) {
-                if (that.typeMap[that.propertyType].autoComplete) {
+                if (that.typeMap[that.propertyType].autoComplete || that.input.hasClass('red-ui-autoComplete')) {
                     return
                 }
                 if (evt.keyCode >= 37 && evt.keyCode <= 40) {
@@ -965,6 +1163,9 @@
                     // If previousType is !null, then this is a change of the type, rather than the initialisation
                     var previousType = this.typeMap[this.propertyType];
                     previousValue = this.input.val();
+                    if (this.input.hasClass('red-ui-autoComplete')) {
+                        this.input.autoComplete("destroy");
+                    }
 
                     if (previousType && this.typeChanged) {
                         if (this.options.debug) { console.log(this.identifier,"typeChanged",{previousType,previousValue}) }
@@ -1011,7 +1212,9 @@
                             this.input.val(this.oldValues.hasOwnProperty("_")?this.oldValues["_"]:(opt.default||""))
                         }
                         if (previousType.autoComplete) {
-                            this.input.autoComplete("destroy");
+                            if (this.input.hasClass('red-ui-autoComplete')) {
+                                this.input.autoComplete("destroy");
+                            }
                         }
                     }
                     this.propertyType = type;
@@ -1139,6 +1342,16 @@
                                 } else {
                                     this.optionSelectTrigger.hide();
                                 }
+                                if (opt.autoComplete) {
+                                    let searchFunction = opt.autoComplete
+                                    if (searchFunction.length === 0) {
+                                        searchFunction = opt.autoComplete.call(this)
+                                    }
+                                    this.input.autoComplete({
+                                        search: searchFunction,
+                                        minLength: 0
+                                    })
+                                }
                             }
                             this.optionMenu = this._createMenu(opt.options,opt,function(v){
                                 if (!opt.multiple) {
@@ -1181,8 +1394,12 @@
                             this.valueLabelContainer.hide();
                             this.elementDiv.show();
                             if (opt.autoComplete) {
+                                let searchFunction = opt.autoComplete
+                                if (searchFunction.length === 0) {
+                                    searchFunction = opt.autoComplete.call(this)
+                                }
                                 this.input.autoComplete({
-                                    search: opt.autoComplete,
+                                    search: searchFunction,
                                     minLength: 0
                                 })
                             }

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

@@ -44,7 +44,7 @@ RED.contextMenu = (function () {
             }
 
             menuItems.push(
-                { onselect: 'core:show-action-list', onpostselect: function () { } }
+                { onselect: 'core:show-action-list', label: RED._("contextMenu.showActionList"), onpostselect: function () { } }
             )
 
             const insertOptions = []
@@ -108,16 +108,16 @@ RED.contextMenu = (function () {
                 const nodeOptions = []
                 if (!hasMultipleSelection && !isGroup) {
                     nodeOptions.push(
-                        { onselect: 'core:show-node-help' },
+                        { onselect: 'core:show-node-help', label: RED._('menu.label.showNodeHelp') },
                         null
                     )
                 }
                 nodeOptions.push(
-                    { onselect: 'core:enable-selected-nodes' },
-                    { onselect: 'core:disable-selected-nodes' },
+                    { onselect: 'core:enable-selected-nodes', label: RED._('menu.label.enableSelectedNodes') },
+                    { onselect: 'core:disable-selected-nodes', label: RED._('menu.label.disableSelectedNodes') },
                     null,
-                    { onselect: 'core:show-selected-node-labels' },
-                    { onselect: 'core:hide-selected-node-labels' }
+                    { onselect: 'core:show-selected-node-labels', label: RED._('menu.label.showSelectedNodeLabels') },
+                    { onselect: 'core:hide-selected-node-labels', label: RED._('menu.label.hideSelectedNodeLabels') }
                 )
                 menuItems.push({
                     label: RED._('sidebar.info.node'),
@@ -126,8 +126,8 @@ RED.contextMenu = (function () {
                 menuItems.push({
                     label: RED._('sidebar.info.group'),
                     options: [
-                        { onselect: 'core:group-selection' },
-                        { onselect: 'core:ungroup-selection', disabled: !hasGroup },
+                        { onselect: 'core:group-selection', label: RED._("menu.label.groupSelection") },
+                        { onselect: 'core:ungroup-selection', label: RED._("menu.label.ungroupSelection"), disabled: !hasGroup },
                     ]
                 })
                 if (hasGroup) {
@@ -143,8 +143,8 @@ RED.contextMenu = (function () {
                 }
                 menuItems[menuItems.length - 1].options.push(
                     null,
-                    { onselect: 'core:copy-group-style', disabled: !hasGroup },
-                    { onselect: 'core:paste-group-style', disabled: !hasGroup}
+                    { onselect: 'core:copy-group-style', label: RED._("keyboard.copyGroupStyle"), disabled: !hasGroup },
+                    { onselect: 'core:paste-group-style', label: RED._("keyboard.pasteGroupStyle"), disabled: !hasGroup}
                 )
             }
             if (canEdit && hasMultipleSelection) {
@@ -168,16 +168,16 @@ RED.contextMenu = (function () {
 
             menuItems.push(
                 null,
-                { onselect: 'core:undo', disabled: RED.history.list().length === 0 },
-                { onselect: 'core:redo', disabled: RED.history.listRedo().length === 0 },
+                { onselect: 'core:undo', label: RED._("keyboard.undoChange"), disabled: RED.history.list().length === 0 },
+                { onselect: 'core:redo', label: RED._("keyboard.redoChange"), disabled: RED.history.listRedo().length === 0 },
                 null,
                 { onselect: 'core:cut-selection-to-internal-clipboard', label: RED._("keyboard.cutNode"), disabled: !canEdit || !hasSelection },
                 { onselect: 'core:copy-selection-to-internal-clipboard', label: RED._("keyboard.copyNode"), disabled: !hasSelection },
                 { onselect: 'core:paste-from-internal-clipboard', label: RED._("keyboard.pasteNode"), disabled: !canEdit || !RED.view.clipboard() },
-                { onselect: 'core:delete-selection', disabled: !canEdit || !canDelete },
+                { 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' },
+                { onselect: 'core:select-all-nodes', label: RED._("keyboard.selectAll") },
             )
         }
 

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

@@ -989,9 +989,10 @@ RED.diff = (function() {
             }
             if (localNode && remoteNode && typeof localNode[d] === "string") {
                 if (/\n/.test(localNode[d]) || /\n/.test(remoteNode[d])) {
-                    $('<button class="red-ui-button red-ui-button-small red-ui-diff-text-diff-button"><i class="fa fa-file-o"> <i class="fa fa-caret-left"></i> <i class="fa fa-caret-right"></i> <i class="fa fa-file-o"></i></button>').on("click", function() {
+                    var textDiff = $('<button class="red-ui-button red-ui-button-small red-ui-diff-text-diff-button"><i class="fa fa-file-o"> <i class="fa fa-caret-left"></i> <i class="fa fa-caret-right"></i> <i class="fa fa-file-o"></i></button>').on("click", function() {
                         showTextDiff(localNode[d],remoteNode[d]);
                     }).appendTo(propertyNameCell);
+                    RED.popover.tooltip(textDiff, RED._("diff.compareChanges"));
                 }
             }
 

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

@@ -115,8 +115,9 @@ RED.editor = (function() {
                 var valid = validateNodeProperty(node, definition, prop, properties[prop]);
                 if ((typeof valid) === "string") {
                     result.push(valid);
-                }
-                else if(!valid) {
+                } else if (Array.isArray(valid)) {
+                    result = result.concat(valid)
+                } else if(!valid) {
                     result.push(prop);
                 }
             }
@@ -165,7 +166,7 @@ RED.editor = (function() {
                 // If the validator takes two arguments, it is a 3.x validator that
                 // can return a String to mean 'invalid' and provide a reason
                 if ((definition[property].validate.length === 2) &&
-                    ((typeof valid) === "string")) {
+                    ((typeof valid) === "string") || Array.isArray(valid)) {
                     return valid;
                 } else {
                     // Otherwise, a 2.x returns a truth-like/false-like value that
@@ -181,6 +182,17 @@ RED.editor = (function() {
                     error: err.message
                 });
             }
+        } else if (valid) {
+            // If the validator is not provided in node property => Check if the input has a validator
+            if ("category" in node._def) {
+                const isConfig = node._def.category === "config";
+                const prefix = isConfig ? "node-config-input" : "node-input";
+                const input = $("#"+prefix+"-"+property);
+                const isTypedInput = input.length > 0 && input.next(".red-ui-typedInput-container").length > 0;
+                if (isTypedInput) {
+                    valid = input.typedInput("validate");
+                }
+            }
         }
         if (valid && definition[property].type && RED.nodes.getType(definition[property].type) && !("validate" in definition[property])) {
             if (!value || value == "_ADD_") {
@@ -2070,6 +2082,7 @@ RED.editor = (function() {
             }
         },
         editBuffer: function(options) { showTypeEditor("_buffer", options) },
+        getEditStack: function () { return [...editStack] },
         buildEditForm: buildEditForm,
         validateNode: validateNode,
         updateNodeProperties: updateNodeProperties,

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

@@ -121,7 +121,7 @@
                         var i=0,l=bufferBinValue.length;
                         var c = 0;
                         for(i=0;i<l;i++) {
-                            var d = parseInt(bufferBinValue[i]);
+                            var d = parseInt(Number(bufferBinValue[i]));
                             if (!isString && (isNaN(d) || d < 0 || d > 255)) {
                                 valid = false;
                                 break;

packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js

@@ -966,12 +966,10 @@ RED.editor.codeEditor.monaco = (function() {
 
         //Unbind ctrl-Enter (default action is to insert a newline in editor) This permits the shortcut to close the tray.
         try {
-            ed._standaloneKeybindingService.addDynamicKeybinding(
-                '-editor.action.insertLineAfter', // command ID prefixed by '-'
-                null, // keybinding
-                () => {} // need to pass an empty handler
-            );
-        } catch (error) { }
+            monaco.editor.addKeybindingRule({keybinding: 0, command: "-editor.action.insertLineAfter"});
+        } catch (error) {
+            console.warn(error)
+        }
 
         ed.nodered = {
             refreshModuleLibs: refreshModuleLibs //expose this for function node externalModules refresh

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

@@ -169,7 +169,7 @@
                             var currentScrollTop = $(".red-ui-editor-type-markdown-panel-preview").scrollTop();
                             $(".red-ui-editor-type-markdown-panel-preview").html(RED.utils.renderMarkdown(expressionEditor.getValue()));
                             $(".red-ui-editor-type-markdown-panel-preview").scrollTop(currentScrollTop);
-                            mermaid.init();
+                            RED.editor.mermaid.render()
                         },200);
                     })
                     if (options.header) {
@@ -178,7 +178,7 @@
 
                     if (value) {
                         $(".red-ui-editor-type-markdown-panel-preview").html(RED.utils.renderMarkdown(expressionEditor.getValue()));
-                        mermaid.init();
+                        RED.editor.mermaid.render()
                     }
                     panels = RED.panels.create({
                         id:"red-ui-editor-type-markdown-panels",

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

@@ -0,0 +1,54 @@
+RED.editor.mermaid = (function () {
+    let initializing = false
+    let loaded = false
+    let pendingEvals = []
+    let diagramIds = 0
+
+    function render(selector = '.mermaid') {
+        // $(selector).hide()
+        if (!loaded) {
+            pendingEvals.push(selector)
+            
+            if (!initializing) {
+                initializing = true
+                $.getScript(
+                    'vendor/mermaid/mermaid.min.js',
+                    function (data, stat, jqxhr) {
+                        mermaid.initialize({
+                            startOnLoad: false,
+                            theme: RED.settings.get('mermaid', {}).theme
+                        })
+                        loaded = true
+                        while(pendingEvals.length > 0) {
+                            const pending = pendingEvals.shift()
+                            render(pending)
+                        }
+                    }
+                )
+            }
+        } else {
+            const nodes = document.querySelectorAll(selector)
+
+            nodes.forEach(async node => {
+                if (!node.getAttribute('mermaid-processed')) {
+                    const mermaidContent = node.innerText
+                    node.setAttribute('mermaid-processed', true)
+                    try {
+                        const { svg } = await mermaid.render('mermaid-render-'+Date.now()+'-'+(diagramIds++), mermaidContent);
+                        node.innerHTML = svg
+                    } catch (err) {
+                        $('<div>').css({
+                            fontSize: '0.8em',
+                            border: '1px solid var(--red-ui-border-color-error)',
+                            padding: '5px',
+                            marginBottom: '10px',
+                        }).text(err.toString()).prependTo(node)
+                    }
+                }
+            })
+        }
+    }  
+    return {
+        render: render,
+    };
+})();

packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/appearance.js

@@ -196,7 +196,7 @@
         }
 
         $('<div class="form-row">'+
-            '<label for="node-input-show-label-btn" data-i18n="editor.label"></label>'+
+            '<label for="node-input-show-label" data-i18n="editor.label"></label>'+
             '<span style="margin-right: 2px;"/>'+
             '<input type="checkbox" id="node-input-show-label"/>'+
         '</div>').appendTo(dialogForm);

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

@@ -1,46 +0,0 @@
-// Mermaid diagram stub library for on-demand dynamic loading
-// Will be overwritten after script loading by $.getScript
-var mermaid = (function () {
-    var enabled /* = undefined */;
-    
-    var initializing = false;
-    var initCalled = false;
-
-    function initialize(opt) {
-        if (enabled === undefined) {
-            if (RED.settings.markdownEditor &&
-                RED.settings.markdownEditor.mermaid) {
-                enabled = RED.settings.markdownEditor.mermaid.enabled;
-            }
-            else {
-                enabled = true;
-            }
-        }
-        if (enabled) {
-            initializing = true;
-            $.getScript("vendor/mermaid/mermaid.min.js",
-                        function (data, stat, jqxhr) {
-                            $(".mermaid").show();
-                            // invoke loaded mermaid API
-                            initializing = false; 
-                            mermaid.initialize(opt);
-                            if (initCalled) {
-                                mermaid.init();
-                                initCalled = false;
-                            }
-                        });
-        }
-    }
-
-    function init() {
-        if (initializing) {
-            $(".mermaid").hide();
-            initCalled = true;
-        }
-    }
-    
-    return {
-        initialize: initialize,
-        init: init,
-    };
-})();

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

@@ -494,6 +494,7 @@ RED.palette.editor = (function() {
         // if there is only 1 catalog, hide the select
         if (catalogEntries.length > 1) {
             catalogSelection.prepend(`<option value="all">${RED._('palette.editor.allCatalogs')}</option>`)
+            catalogSelection.val('all')
             catalogSelection.removeAttr('disabled') // permit the user to select a catalog
         }
         // refresh the searchInput counter and trigger a change
@@ -523,7 +524,7 @@ RED.palette.editor = (function() {
     function refreshFilteredItems() {
         packageList.editableList('empty');
         var currentFilter = searchInput.searchBox('value').trim();
-        if (currentFilter === ""){
+        if (currentFilter === "" && loadedList.length > 20){
             packageList.editableList('addItem',{count:loadedList.length})
             return;
         }
@@ -893,7 +894,7 @@ RED.palette.editor = (function() {
                 delay: 300,
                 change: function() {
                     var searchTerm = $(this).val().trim().toLowerCase();
-                    if (searchTerm.length > 0) {
+                    if (searchTerm.length > 0 || loadedList.length < 20) {
                         filteredList = loadedList.filter(function(m) {
                             return (m.index.indexOf(searchTerm) > -1);
                         }).map(function(f) { return {info:f}});

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

@@ -166,7 +166,7 @@ RED.projects.settings = (function() {
         var description = addTargetToExternalLinks($('<span class="red-ui-text-bidi-aware" dir=\"'+RED.text.bidi.resolveBaseTextDir(desc)+'">'+desc+'</span>')).appendTo(container);
         description.find(".red-ui-text-bidi-aware").contents().filter(function() { return this.nodeType === 3 && this.textContent.trim() !== "" }).wrap( "<span></span>" );
         setTimeout(function () {
-            mermaid.init();
+            RED.editor.mermaid.render()
         }, 200);
     }
 

packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js

@@ -647,9 +647,9 @@ RED.sidebar.versionControl = (function() {
                             $.getJSON("projects/"+activeProject.name+"/commits/"+entry.sha,function(result) {
                                 result.project = activeProject;
                                 result.parents = entry.parents;
-                                result.oldRev = entry.sha+"~1";
+                                result.oldRev = entry.parents[0].length !== 0 ? entry.sha+"~1" : entry.sha;
                                 result.newRev = entry.sha;
-                                result.oldRevTitle = RED._("sidebar.project.versionControl.commitCapital")+" "+entry.sha.substring(0,7)+"~1";
+                                result.oldRevTitle = entry.parents[0].length !== 0 ? RED._("sidebar.project.versionControl.commitCapital")+" "+entry.sha.substring(0,7)+"~1" : " ";
                                 result.newRevTitle = RED._("sidebar.project.versionControl.commitCapital")+" "+entry.sha.substring(0,7);
                                 result.date = humanizeSinceDate(parseInt(entry.date));
                                 RED.diff.showCommitDiff(result);

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

@@ -383,6 +383,7 @@ RED.sidebar.help = (function() {
                 $(this).toggleClass('expanded',!isExpanded);
             })
         helpSection.parent().scrollTop(0);
+        RED.editor.mermaid.render()
     }
 
     function set(html,title) {

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

@@ -464,7 +464,7 @@ RED.sidebar.info = (function() {
                 }
                 $(this).toggleClass('expanded',!isExpanded);
             });
-        mermaid.init();
+        RED.editor.mermaid.render()
     }
 
     var tips = (function() {

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

@@ -323,7 +323,7 @@ RED.typeSearch = (function() {
         }
     }
     function applyFilter(filter,type,def) {
-        return !filter ||
+        return !def || !filter ||
             (
                 (!filter.spliceMultiple) &&
                 (!filter.type || type === filter.type) &&

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

@@ -101,28 +101,8 @@ RED.utils = (function() {
 
     renderer.code = function (code, lang) {
         if(lang === "mermaid") {
-            // mermaid diagram rendering 
-            if (mermaidIsEnabled === undefined) {
-                if (RED.settings.markdownEditor &&
-                    RED.settings.markdownEditor.mermaid) {
-                    mermaidIsEnabled = RED.settings.markdownEditor.mermaid.enabled;
-                }
-                else {
-                    mermaidIsEnabled = true;
-                }
-            }
-            if (mermaidIsEnabled) {
-                if (!mermaidIsInitialized) {
-                    mermaidIsInitialized = true;
-                    mermaid.initialize({startOnLoad:false});
-                }
-                return `<pre class='mermaid'>${code}</pre>`;
-            }
-            else {
-                return `<details><summary>${RED._("markdownEditor.mermaid.summary")}</summary><pre><code>${code}</code></pre></details>`;
-            }
-        }
-        else {
+            return `<pre class='mermaid'>${code}</pre>`;
+        } else {
             return "<pre><code>" +code +"</code></pre>";
         }
     };
@@ -917,6 +897,51 @@ RED.utils = (function() {
         }
     }
 
+    /**
+     * Checks a typed property is valid according to the type.
+     * Returns true if valid.
+     * Return String error message if invalid
+     * @param {*} propertyType 
+     * @param {*} propertyValue 
+     * @returns true if valid, String if invalid
+     */
+    function validateTypedProperty(propertyValue, propertyType, opt) {
+
+        let error
+        if (propertyType === 'json') {
+            try {
+                JSON.parse(propertyValue);
+            } catch(err) {
+                error = RED._("validator.errors.invalid-json", {
+                    error: err.message
+                })
+            }
+        } else if (propertyType === 'msg' || propertyType === 'flow' || propertyType === 'global' ) {
+            if (!RED.utils.validatePropertyExpression(propertyValue)) {
+                error = RED._("validator.errors.invalid-prop")
+            }
+        } else if (propertyType === 'num') {
+            if (!/^NaN$|^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$|^[+-]?(0b|0B)[01]+$|^[+-]?(0o|0O)[0-7]+$|^[+-]?(0x|0X)[0-9a-fA-F]+$/.test(propertyValue)) {
+                error = RED._("validator.errors.invalid-num")
+            }
+        } else if (propertyType === 'jsonata') {
+            try { 
+                jsonata(propertyValue)
+            } catch(err) {
+                error = RED._("validator.errors.invalid-expr", {
+                    error: err.message
+                })
+            }
+        }
+        if (error) {
+            if (opt && opt.label) {
+                return opt.label+': '+error
+            }
+            return error
+        }
+        return true
+    }
+
     function getMessageProperty(msg,expr) {
         var result = null;
         var msgPropParts;
@@ -1451,6 +1476,7 @@ RED.utils = (function() {
         getDarkerColor: getDarkerColor,
         parseModuleList: parseModuleList,
         checkModuleAllowed: checkModuleAllowed,
-        getBrowserInfo: getBrowserInfo
+        getBrowserInfo: getBrowserInfo,
+        validateTypedProperty: validateTypedProperty
     }
 })();

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

@@ -302,11 +302,21 @@ RED.view = (function() {
         return api
     })()
 
+    const isMac = RED.utils.getBrowserInfo().os === 'mac'
+    // 'Control' is the main modifier key for mouse actions. On Windows,
+    // that is the standard Ctrl key. On Mac that is the Cmd key.
+    function isControlPressed (event) {
+        return (isMac && event.metaKey) || (!isMac && event.ctrlKey)
+    }
 
     function init() {
 
         chart = $("#red-ui-workspace-chart");
         chart.on('contextmenu', function(evt) {
+            if (RED.view.DEBUG) {
+                console.warn("contextmenu", { mouse_mode, event: d3.event });
+            }
+            mouse_mode = RED.state.DEFAULT
             evt.preventDefault()
             evt.stopPropagation()
             RED.contextMenu.show({
@@ -1190,7 +1200,7 @@ RED.view = (function() {
             lasso = null;
         }
         if (d3.event.touches || d3.event.button === 0) {
-            if ((mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) && (d3.event.metaKey || d3.event.ctrlKey) && !(d3.event.altKey || d3.event.shiftKey)) {
+            if ((mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) && isControlPressed(d3.event) && !(d3.event.altKey || d3.event.shiftKey)) {
                 // Trigger quick add dialog
                 d3.event.stopPropagation();
                 clearSelection();
@@ -1200,7 +1210,7 @@ RED.view = (function() {
                     clickedGroup = clickedGroup || RED.nodes.group(drag_lines[0].node.g)
                 }
                 showQuickAddDialog({ position: point, group: clickedGroup });
-            } else if (mouse_mode === 0 && !(d3.event.metaKey || d3.event.ctrlKey)) {
+            } else if (mouse_mode === 0 && !isControlPressed(d3.event)) {
                 // CTRL not being held
                 if (!d3.event.altKey) {
                     // ALT not held (shift is allowed) Trigger lasso
@@ -3540,7 +3550,7 @@ RED.view = (function() {
             d3.event.preventDefault()
             document.getSelection().removeAllRanges()
             if (d.type != "subflow") {
-                if (/^subflow:/.test(d.type) && (d3.event.ctrlKey || d3.event.metaKey)) {
+                if (/^subflow:/.test(d.type) && isControlPressed(d3.event)) {
                     RED.workspaces.show(d.type.substring(8));
                 } else {
                     RED.editor.edit(d);
@@ -3704,12 +3714,12 @@ RED.view = (function() {
             d.type !== 'junction'
         lastClickNode = mousedown_node;
      
-        if (d.selected && (d3.event.ctrlKey||d3.event.metaKey)) {
+        if (d.selected && isControlPressed(d3.event)) {
             mousedown_node.selected = false;
             movingSet.remove(mousedown_node);
         } else {
             if (d3.event.shiftKey) {
-                if (!(d3.event.ctrlKey||d3.event.metaKey)) {
+                if (!isControlPressed(d3.event)) {
                     clearSelection();
                 }
                 var clickPosition = (d3.event.offsetX/scaleFactor - mousedown_node.x)
@@ -3878,10 +3888,10 @@ RED.view = (function() {
         }
         mousedown_link = d;
 
-        if (!(d3.event.metaKey || d3.event.ctrlKey)) {
+        if (!isControlPressed(d3.event)) {
             clearSelection();
         }
-        if (d3.event.metaKey || d3.event.ctrlKey) {
+        if (isControlPressed(d3.event)) {
             if (!selectedLinks.has(mousedown_link)) {
                 selectedLinks.add(mousedown_link);
             } else {
@@ -3896,7 +3906,7 @@ RED.view = (function() {
         redraw();
         focusView();
         d3.event.stopPropagation();
-        if (!mousedown_link.link && movingSet.length() === 0 && (d3.event.touches || d3.event.button === 0) && selectedLinks.length() === 1 && selectedLinks.has(mousedown_link) && (d3.event.metaKey || d3.event.ctrlKey)) {
+        if (!mousedown_link.link && movingSet.length() === 0 && (d3.event.touches || d3.event.button === 0) && selectedLinks.length() === 1 && selectedLinks.has(mousedown_link) && isControlPressed(d3.event)) {
             d3.select(this).classed("red-ui-flow-link-splice",true);
             var point = d3.mouse(this);
             var clickedGroup = getGroupAt(point[0],point[1]);
@@ -3977,7 +3987,7 @@ RED.view = (function() {
         );
         lastClickNode = g;
 
-        if (g.selected && (d3.event.ctrlKey||d3.event.metaKey)) {
+        if (g.selected && isControlPressed(d3.event)) {
             selectedGroups.remove(g);
             d3.event.stopPropagation();
         } else {
@@ -4177,7 +4187,7 @@ RED.view = (function() {
                 nodeEl.__statusGroup__.style.display = "none";
             } else {
                 nodeEl.__statusGroup__.style.display = "inline";
-                let backgroundWidth = 12
+                let backgroundWidth = 15
                 var fill = status_colours[d.status.fill]; // Only allow our colours for now
                 if (d.status.shape == null && fill == null) {
                     backgroundWidth = 0
@@ -4197,7 +4207,11 @@ RED.view = (function() {
                     nodeEl.__statusLabel__.textContent = "";
                 }
                 const textSize = nodeEl.__statusLabel__.getBBox()
-                nodeEl.__statusBackground__.setAttribute('width', backgroundWidth + textSize.width + 6)
+                backgroundWidth += textSize.width
+                if (backgroundWidth > 0 && textSize.width > 0) {
+                    backgroundWidth += 6
+                }
+                nodeEl.__statusBackground__.setAttribute('width', backgroundWidth)
             }
             delete d.dirtyStatus;
         }
@@ -4609,8 +4623,8 @@ RED.view = (function() {
                 statusBackground.setAttribute("y",-1);
                 statusBackground.setAttribute("width",200);
                 statusBackground.setAttribute("height",13);
-                statusBackground.setAttribute("rx",1);
-                statusBackground.setAttribute("ry",1);
+                statusBackground.setAttribute("rx",2);
+                statusBackground.setAttribute("ry",2);
                 
                 statusEl.appendChild(statusBackground);
                 node[0][0].__statusBackground__ = statusBackground;

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

@@ -17,6 +17,8 @@
 
 RED.workspaces = (function() {
 
+    const documentTitle = document.title;
+
     var activeWorkspace = 0;
     var workspaceIndex = 0;
 
@@ -339,12 +341,18 @@ RED.workspaces = (function() {
                     $("#red-ui-workspace-chart").show();
                     activeWorkspace = tab.id;
                     window.location.hash = 'flow/'+tab.id;
+                    if (tab.label) {
+                        document.title = `${documentTitle} : ${tab.label}`
+                    } else {
+                        document.title = documentTitle
+                    }
                     $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled", !!tab.disabled);
                     $("#red-ui-workspace").toggleClass("red-ui-workspace-locked", !!tab.locked);
                 } else {
                     $("#red-ui-workspace-chart").hide();
                     activeWorkspace = 0;
                     window.location.hash = '';
+                    document.title = documentTitle
                 }
                 event.workspace = activeWorkspace;
                 RED.events.emit("workspace:change",event);

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

@@ -40,46 +40,32 @@ RED.validators = {
             return opt ? RED._("validator.errors.invalid-regexp") : false;
         };
     },
-    typedInput: function(ptypeName,isConfig,mopt) {
+    typedInput: function(ptypeName, isConfig, mopt) {
+        let options = ptypeName
+        if (typeof ptypeName === 'string' ) {
+            options = {}
+            options.typeField = ptypeName
+            options.isConfig = isConfig
+            options.allowBlank = false
+        }
         return function(v, opt) {
-            var ptype = $("#node-"+(isConfig?"config-":"")+"input-"+ptypeName).val() || this[ptypeName];
-            if (ptype === 'json') {
-                try {
-                    JSON.parse(v);
-                    return true;
-                } catch(err) {
-                    if (opt && opt.label) {
-                        return RED._("validator.errors.invalid-json-prop", {
-                            error: err.message,
-                            prop: opt.label,
-                        });
-                    }
-                    return opt ? RED._("validator.errors.invalid-json", {
-                        error: err.message
-                    }) : false;
-                }
-            } else if (ptype === 'msg' || ptype === 'flow' || ptype === 'global' ) {
-                if (RED.utils.validatePropertyExpression(v)) {
-                    return true;
-                }
-                if (opt && opt.label) {
-                    return RED._("validator.errors.invalid-prop-prop", {
-                        prop: opt.label
-                    });
-                }
-                return opt ? RED._("validator.errors.invalid-prop") : false;
-            } else if (ptype === 'num') {
-                if (/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/.test(v)) {
-                    return true;
-                }
-                if (opt && opt.label) {
-                    return RED._("validator.errors.invalid-num-prop", {
-                        prop: opt.label
-                    });
-                }
-                return opt ? RED._("validator.errors.invalid-num") : false;
+            let ptype = options.type
+            if (!ptype && options.typeField) {
+                ptype = $("#node-"+(options.isConfig?"config-":"")+"input-"+options.typeField).val() || this[options.typeField];
             }
-            return true;
-        };
+            if (options.allowBlank && v === '') {
+                return true
+            }
+            if (options.allowUndefined && v === undefined) {
+                return true
+            }
+            const result = RED.utils.validateTypedProperty(v, ptype, opt)
+            if (result === true || opt) {
+                // Valid, or opt provided - return result as-is
+                return result
+            }
+            // No opt - need to return false for backwards compatibilty
+            return false
+        }
     }
-};
+};

packages/node_modules/@node-red/editor-client/src/sass/flow.scss

@@ -114,6 +114,7 @@
     pointer-events: stroke;
 }
 .red-ui-flow-group-outline-select {
+    cursor: move;
     fill: none;
     stroke: var(--red-ui-node-selected-color);
     pointer-events: none;

packages/node_modules/@node-red/editor-client/src/sass/projects.scss

@@ -825,6 +825,7 @@ div.red-ui-projects-dialog-ssh-public-key {
         margin-top: 0 !important;
         padding: 5px 10px;
         margin-bottom: 10px;
+        border-radius: 3px 3px 0px 0px;
     }
 }
 

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

@@ -320,7 +320,7 @@
             }
             // but replace with repeat one if set to repeat
             if ((this.repeat && this.repeat != 0) || this.crontab) {
-                suffix = " ↻";
+                suffix = "\t↻";
             }
             if (this.name) {
                 return this.name+suffix;

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

@@ -109,9 +109,8 @@ module.exports = function(RED) {
                 }
                 const p = props.shift()
                 const property = p.p;
-                const value = p.v ? p.v : '';
-                const valueType = p.vt ? p.vt : 'str';
-
+                const value = p.v !== undefined ? p.v : '';
+                const valueType = p.vt !== undefined ? p.vt : 'str';
                 if (property) {
                     if (valueType === "jsonata") {
                         if (p.v) {

packages/node_modules/@node-red/nodes/core/common/21-debug.html

@@ -86,7 +86,7 @@
         },
         label: function() {
             var suffix = "";
-            if (this.console === true || this.console === "true") { suffix = " ⇲"; }
+            if (this.console === true || this.console === "true") { suffix = "\t⇲"; }
             if (this.targetType === "jsonata") {
                 return (this.name || "JSONata") + suffix;
             }
@@ -195,6 +195,119 @@
                         node.dirty = true;
                     });
                     RED.view.redraw();
+                },
+                requestDebugNodeList: function(filteredNodes) {
+                    var workspaceOrder = RED.nodes.getWorkspaceOrder();
+                    var workspaceOrderMap = {};
+                    workspaceOrder.forEach(function(ws,i) {
+                        workspaceOrderMap[ws] = i;
+                    });
+
+                    var candidateNodes = [];
+                    var candidateSFs = [];
+                    var subflows = {};
+                    RED.nodes.eachNode(function (n) {
+                        var nt = n.type;
+                        if (nt === "debug") {
+                            if (n.z in workspaceOrderMap) {
+                                candidateNodes.push(n);
+                            }
+                            else {
+                                var sf = RED.nodes.subflow(n.z);
+                                if (sf) {
+                                    subflows[sf.id] = {
+                                        debug: true,
+                                        subflows: {}
+                                    };
+                                }
+                            }
+                        }
+                        else if(nt.substring(0, 8) === "subflow:") {
+                            if (n.z in workspaceOrderMap) {
+                                candidateSFs.push(n);
+                            }
+                            else {
+                                var psf = RED.nodes.subflow(n.z);
+                                if (psf) {
+                                    var sid = nt.substring(8);
+                                    var item = subflows[psf.id];
+                                    if (!item) {
+                                        item = {
+                                            debug: undefined,
+                                            subflows: {}
+                                        };
+                                        subflows[psf.id] = item;
+                                    }
+                                    item.subflows[sid] = true;
+                                }
+                            }
+                        }
+                    });
+                    candidateSFs.forEach(function (sf) {
+                        var sid = sf.type.substring(8);
+                        if (containsDebug(sid, subflows)) {
+                            candidateNodes.push(sf);
+                        }
+                    });
+
+                    candidateNodes.sort(function(A,B) {
+                        var wsA = workspaceOrderMap[A.z];
+                        var wsB = workspaceOrderMap[B.z];
+                        if (wsA !== wsB) {
+                            return wsA-wsB;
+                        }
+                        var labelA = RED.utils.getNodeLabel(A,A.id);
+                        var labelB = RED.utils.getNodeLabel(B,B.id);
+                        return labelA.localeCompare(labelB);
+                    });
+                    var currentWs = null;
+                    var data = [];
+                    var currentFlow;
+                    var currentSelectedCount = 0;
+                    candidateNodes.forEach(function(node) {
+                        if (currentWs !== node.z) {
+                            if (currentFlow && currentFlow.checkbox) {
+                                currentFlow.selected = currentSelectedCount === currentFlow.children.length
+                            }
+                            currentSelectedCount = 0;
+                            currentWs = node.z;
+                            var parent = RED.nodes.workspace(currentWs) || RED.nodes.subflow(currentWs);
+                            currentFlow = {
+                                label: RED.utils.getNodeLabel(parent, currentWs),
+                            }
+                            if (!parent.disabled) {
+                                currentFlow.children = [];
+                                currentFlow.checkbox = true;
+                            } else {
+                                currentFlow.class = "disabled"
+                            }
+                            data.push(currentFlow);
+                        }
+                        if (currentFlow.children) {
+                            if (!filteredNodes[node.id]) {
+                                currentSelectedCount++;
+                            }
+                            currentFlow.children.push({
+                                label: RED.utils.getNodeLabel(node,node.id),
+                                node: {
+                                    id: node.id
+                                },
+                                checkbox: true,
+                                selected: !filteredNodes[node.id]
+                            });
+                        }
+                    });
+                    if (currentFlow && currentFlow.checkbox) {
+                        currentFlow.selected = currentSelectedCount === currentFlow.children.length
+                    }
+                    if (subWindow) {
+                        try {
+                            subWindow.postMessage({event:"refreshDebugNodeList", nodes:data},"*");
+                        } catch(err) {
+                            console.log(err);
+                        }
+                    }
+                    RED.debug.refreshDebugNodeList(data)
                 }
             };
 
@@ -396,6 +509,26 @@
                 }
             }
 
+            function containsDebug(sid, map) {
+                var item = map[sid];
+                if (item) {
+                    if (item.debug === undefined) {
+                        var sfs = Object.keys(item.subflows);
+                        var contain = false;
+                        for (var i = 0; i < sfs.length; i++) {
+                            var sf = sfs[i];
+                            if (containsDebug(sf, map)) {
+                                contain = true;
+                                break;
+                            }
+                        }
+                        item.debug = contain;
+                    }
+                    return item.debug;
+                }
+                return false;
+            }
+
             $("#red-ui-sidebar-debug-open").on("click", function(e) {
                 e.preventDefault();
                 subWindow = window.open(document.location.toString().replace(/[?#].*$/,"")+"debug/view/view.html"+document.location.search,"nodeREDDebugView","menubar=no,location=no,toolbar=no,chrome,height=500,width=600");
@@ -427,6 +560,8 @@
                     options.messageSourceClick(msg.id,msg._alias,msg.path);
                 } else if (msg.event === "clear") {
                     options.clear();
+                } else if (msg.event === "requestDebugNodeList") {
+                    options.requestDebugNodeList(msg.filteredNodes)
                 }
             };
             window.addEventListener('message',this.handleWindowMessage);

packages/node_modules/@node-red/nodes/core/common/21-debug.js

@@ -5,6 +5,7 @@ module.exports = function(RED) {
     const fs = require("fs-extra");
     const path = require("path");
     var debuglength = RED.settings.debugMaxLength || 1000;
+    var statuslength = RED.settings.debugStatusLength || 32;
     var useColors = RED.settings.debugUseColors || false;
     util.inspect.styles.boolean = "red";
     const { hasOwnProperty } = Object.prototype;
@@ -164,7 +165,7 @@ module.exports = function(RED) {
                             }
                         }
 
-                        if (st.length > 32) { st = st.substr(0,32) + "..."; }
+                        if (st.length > statuslength) { st = st.substr(0,statuslength) + "..."; }
 
                         var newStatus = {fill:fill, shape:shape, text:st};
                         if (JSON.stringify(newStatus) !== node.oldState) { // only send if we have to

packages/node_modules/@node-red/nodes/core/common/60-link.html

@@ -275,7 +275,7 @@
                 value: [],
                 type: "link in[]",
                 validate: function (v, opt) {
-                    if ((this.linkType === "static" && v.length > 0)
+                    if (((this.linkType || "static") === "static" && v.length > 0)
                       || this.linkType === "dynamic") {
                         return true;
                     }

packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js

@@ -167,19 +167,13 @@ RED.debug = (function() {
             var menu = RED.popover.menu({
                 options: options,
                 onselect: function(item) {
-                    if (item.value !== filterType) {
-                        filterType = item.value;
-                        $('#red-ui-sidebar-debug-filter span').text(RED._('node-red:debug.sidebar.'+filterType));
-                        refreshMessageList();
-                        RED.settings.set("debug.filter",filterType)
-                    }
+                    setFilterType(item.value)
                     if (filterType === 'filterSelected') {
-                        refreshDebugNodeList();
+                        config.requestDebugNodeList(filteredNodes);
                         filterDialog.slideDown(200);
                         filterDialogShown = true;
                         debugNodeTreeList.focus();
                     }
-
                 }
             });
             menu.show({
@@ -254,131 +248,7 @@ RED.debug = (function() {
 
     }
 
-
-    function containsDebug(sid, map) {
-        var item = map[sid];
-        if (item) {
-            if (item.debug === undefined) {
-                var sfs = Object.keys(item.subflows);
-                var contain = false;
-                for (var i = 0; i < sfs.length; i++) {
-                    var sf = sfs[i];
-                    if (containsDebug(sf, map)) {
-                        contain = true;
-                        break;
-                    }
-                }
-                item.debug = contain;
-            }
-            return item.debug;
-        }
-        return false;
-    }
-
-
-    function refreshDebugNodeList() {
-        var workspaceOrder = RED.nodes.getWorkspaceOrder();
-        var workspaceOrderMap = {};
-        workspaceOrder.forEach(function(ws,i) {
-            workspaceOrderMap[ws] = i;
-        });
-
-        var candidateNodes = [];
-        var candidateSFs = [];
-        var subflows = {};
-        RED.nodes.eachNode(function (n) {
-            var nt = n.type;
-            if (nt === "debug") {
-                if (n.z in workspaceOrderMap) {
-                    candidateNodes.push(n);
-                }
-                else {
-                    var sf = RED.nodes.subflow(n.z);
-                    if (sf) {
-                        subflows[sf.id] = {
-                            debug: true,
-                            subflows: {}
-                        };
-                    }
-                }
-            }
-            else if(nt.substring(0, 8) === "subflow:") {
-                if (n.z in workspaceOrderMap) {
-                    candidateSFs.push(n);
-                }
-                else {
-                    var psf = RED.nodes.subflow(n.z);
-                    if (psf) {
-                        var sid = nt.substring(8);
-                        var item = subflows[psf.id];
-                        if (!item) {
-                            item = {
-                                debug: undefined,
-                                subflows: {}
-                            };
-                            subflows[psf.id] = item;
-                        }
-                        item.subflows[sid] = true;
-                    }
-                }
-            }
-        });
-        candidateSFs.forEach(function (sf) {
-            var sid = sf.type.substring(8);
-            if (containsDebug(sid, subflows)) {
-                candidateNodes.push(sf);
-            }
-        });
-
-        candidateNodes.sort(function(A,B) {
-            var wsA = workspaceOrderMap[A.z];
-            var wsB = workspaceOrderMap[B.z];
-            if (wsA !== wsB) {
-                return wsA-wsB;
-            }
-            var labelA = RED.utils.getNodeLabel(A,A.id);
-            var labelB = RED.utils.getNodeLabel(B,B.id);
-            return labelA.localeCompare(labelB);
-        });
-        var currentWs = null;
-        var data = [];
-        var currentFlow;
-        var currentSelectedCount = 0;
-        candidateNodes.forEach(function(node) {
-            if (currentWs !== node.z) {
-                if (currentFlow && currentFlow.checkbox) {
-                    currentFlow.selected = currentSelectedCount === currentFlow.children.length
-                }
-                currentSelectedCount = 0;
-                currentWs = node.z;
-                var parent = RED.nodes.workspace(currentWs) || RED.nodes.subflow(currentWs);
-                currentFlow = {
-                    label: RED.utils.getNodeLabel(parent, currentWs),
-                }
-                if (!parent.disabled) {
-                    currentFlow.children = [];
-                    currentFlow.checkbox = true;
-                } else {
-                    currentFlow.class = "disabled"
-                }
-                data.push(currentFlow);
-            }
-            if (currentFlow.children) {
-                if (!filteredNodes[node.id]) {
-                    currentSelectedCount++;
-                }
-                currentFlow.children.push({
-                    label: RED.utils.getNodeLabel(node,node.id),
-                    node: node,
-                    checkbox: true,
-                    selected: !filteredNodes[node.id]
-                });
-            }
-        });
-        if (currentFlow && currentFlow.checkbox) {
-            currentFlow.selected = currentSelectedCount === currentFlow.children.length
-        }
-
+    function refreshDebugNodeList(data) {
         debugNodeTreeList.treeList("data", data);
     }
 
@@ -401,7 +271,7 @@ RED.debug = (function() {
         },200);
     }
     function _refreshMessageList(_activeWorkspace) {
-        if (_activeWorkspace) {
+        if (typeof _activeWorkspace === 'string') {
             activeWorkspace = _activeWorkspace.replace(/\./g,"_");
         }
         if (filterType === "filterAll") {
@@ -479,12 +349,12 @@ RED.debug = (function() {
                         filteredNodes[n.id] = true;
                     });
                     delete filteredNodes[sourceId];
-                    $("#red-ui-sidebar-debug-filterSelected").trigger("click");
                     RED.settings.set('debug.filteredNodes',Object.keys(filteredNodes))
+                    setFilterType('filterSelected')
                     refreshMessageList();
                 }},
                 {id:"red-ui-debug-msg-menu-item-clear-filter",label:RED._("node-red:debug.messageMenu.clearFilter"),onselect:function(){
-                    $("#red-ui-sidebar-debug-filterAll").trigger("click");
+                    clearFilterSettings()
                     refreshMessageList();
                 }}
             );
@@ -713,9 +583,17 @@ RED.debug = (function() {
         if (!!clearFilter) {
             clearFilterSettings();
         }
-        refreshDebugNodeList();
+        config.requestDebugNodeList(filteredNodes);
     }
 
+    function setFilterType(type) {
+        if (type !== filterType) {
+            filterType = type;
+            $('#red-ui-sidebar-debug-filter span').text(RED._('node-red:debug.sidebar.'+filterType));
+            refreshMessageList();
+            RED.settings.set("debug.filter",filterType)
+        }
+    }
     function clearFilterSettings() {
         filteredNodes = {};
         filterType = 'filterAll';
@@ -728,6 +606,7 @@ RED.debug = (function() {
         init: init,
         refreshMessageList:refreshMessageList,
         handleDebugMessage: handleDebugMessage,
-        clearMessageList: clearMessageList
+        clearMessageList: clearMessageList,
+        refreshDebugNodeList: refreshDebugNodeList
     }
 })();

packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js

@@ -12,6 +12,9 @@ $(function() {
             },
             clear: function() {
                 window.opener.postMessage({event:"clear"},'*');
+            },
+            requestDebugNodeList: function(filteredNodes) {
+                window.opener.postMessage({event: 'requestDebugNodeList', filteredNodes},'*')
             }
         }
 
@@ -26,6 +29,8 @@ $(function() {
                     RED.debug.refreshMessageList(evt.data.activeWorkspace);
                 } else if (evt.data.event === "projectChange") {
                     RED.debug.clearMessageList(true);
+                } else if (evt.data.event === "refreshDebugNodeList") {
+                    RED.debug.refreshDebugNodeList(evt.data.nodes)
                 }
             },false);
         } catch(err) {

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

@@ -366,7 +366,7 @@
             name: {value:"_DEFAULT_"},
             func: {value:"\nreturn msg;"},
             outputs: {value:1},
-            timeout:{value:0},
+            timeout:{value:RED.settings.functionTimeout || 0},
             noerr: {value:0,required:true,
                     validate: function(v, opt) {
                         if (!v) {

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

@@ -521,7 +521,8 @@ module.exports = function(RED) {
     RED.nodes.registerType("function",FunctionNode, {
         dynamicModuleList: "libs",
         settings: {
-            functionExternalModules: { value: true, exportable: true }
+            functionExternalModules: { value: true, exportable: true },
+            functionTimeout: { value:0, exportable: true }
         }
     });
     RED.library.register("functions");

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

@@ -103,7 +103,6 @@
             } else if (type === "istype") {
                 r.v = rule.find(".node-input-rule-type-value").typedInput('type');
                 r.vt = rule.find(".node-input-rule-type-value").typedInput('type');
-                r.vt = (r.vt === "number") ? "num" : "str";
             } else if (type === "jsonata_exp") {
                 r.v = rule.find(".node-input-rule-exp-value").typedInput('value');
                 r.vt = rule.find(".node-input-rule-exp-value").typedInput('type');
@@ -168,7 +167,35 @@
                        label:RED._("node-red:common.label.payload"),
                        validate: RED.validators.typedInput("propertyType", false)},
             propertyType: { value:"msg" },
-            rules: {value:[{t:"eq", v:"", vt:"str"}]},
+            rules: {
+                value:[{t:"eq", v:"", vt:"str"}],
+                validate: function (rules, opt) {
+                    let msg;
+                    const errors = []
+                    if (!rules || rules.length === 0) { return true }
+                    for (var i=0;i<rules.length;i++) {
+                        const opt = { label: RED._('node-red:switch.label.rule')+' '+(i+1) }
+                        const r = rules[i];
+                        if (r.t !== 'istype') {
+                            if (r.hasOwnProperty('v')) {
+                                if ((msg = RED.utils.validateTypedProperty(r.v,r.vt,opt)) !== true) {
+                                    errors.push(msg)
+                                }
+                            }
+                            if (r.hasOwnProperty('v2')) {
+                                if ((msg = RED.utils.validateTypedProperty(r.v2,r.v2t,opt)) !== true) {
+                                    errors.push(msg)
+                                }
+                            }
+                        }
+                    }
+                    if (errors.length) {
+                        console.log(errors)
+                        return errors
+                    }
+                    return true;
+                }
+            },
             checkall: {value:"true", required:true},
             repair: {value:false},
             outputs: {value:1}
@@ -218,7 +245,11 @@
                         if (i > 0) {
                             var lastRule = $("#node-input-rule-container").editableList('getItemAt',i-1);
                             var exportedRule = exportRule(lastRule.element);
-                            opt.r.vt = exportedRule.vt;
+                            if (exportedRule.t === "istype") {
+                                opt.r.vt = (exportedRule.vt === "number") ? "num" : "str";
+                            } else {
+                                opt.r.vt = exportedRule.vt;
+                            }
                             opt.r.v = "";
                             // We could copy the value over as well and preselect it (see the 'activeElement' code below)
                             // But not sure that feels right. Is copying over the last value 'expected' behaviour?

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

@@ -19,71 +19,42 @@
 
 <script type="text/javascript">
 (function() {
-    function isInvalidProperty(v,vt) {
-        if (/msg|flow|global/.test(vt)) {
-            if (!RED.utils.validatePropertyExpression(v)) {
-                return RED._("node-red:change.errors.invalid-prop", {
-                    property: v
-                });
-            }
-        } else if (vt === "jsonata") {
-            try{ jsonata(v); } catch(e) {
-                return RED._("node-red:change.errors.invalid-expr", {
-                    error: e.message
-                });
-            }
-        } else if (vt === "json") {
-            try{ JSON.parse(v); } catch(e) {
-                return RED._("node-red:change.errors.invalid-json-data", {
-                    error: e.message
-                });
-            }
-        }
-        return false;
-    }
-
     RED.nodes.registerType('change', {
         color: "#E2D96E",
         category: 'function',
         defaults: {
             name: {value:""},
-            rules:{value:[{t:"set",p:"payload",pt:"msg",to:"",tot:"str"}],validate: function(rules, opt) {
-                var msg;
-                if (!rules || rules.length === 0) { return true }
-                for (var i=0;i<rules.length;i++) {
-                    var r = rules[i];
-                    if (r.t === 'set') {
-                        if (msg = isInvalidProperty(r.p,r.pt)) {
-                            return msg;
+            rules:{
+                value:[{t:"set",p:"payload",pt:"msg",to:"",tot:"str"}],
+                validate: function(rules, opt) {
+                    let msg;
+                    const errors = []
+                    if (!rules || rules.length === 0) { return true }
+                    for (var i=0;i<rules.length;i++) {
+                        const opt = { label: RED._('node-red:change.label.rule')+' '+(i+1) }
+                        const r = rules[i];
+                        if (r.t === 'set' || r.t === 'change' || r.t === 'delete' || r.t === 'move') {
+                            if ((msg = RED.utils.validateTypedProperty(r.p,r.pt,opt)) !== true) {
+                                errors.push(msg)
+                            }
                         }
-                        if (msg = isInvalidProperty(r.to,r.tot)) {
-                            return msg;
+                        if (r.t === 'set' || r.t === 'change' || r.t === 'move') {
+                            if ((msg = RED.utils.validateTypedProperty(r.to,r.tot,opt)) !== true) {
+                                errors.push(msg)
+                            }
                         }
-                    } else if (r.t === 'change') {
-                        if (msg = isInvalidProperty(r.p,r.pt)) {
-                            return msg;
-                        }
-                        if(msg = isInvalidProperty(r.from,r.fromt)) {
-                            return msg;
-                        }
-                        if(msg = isInvalidProperty(r.to,r.tot)) {
-                            return msg;
-                        }
-                    } else if (r.t === 'delete') {
-                        if (msg = isInvalidProperty(r.p,r.pt)) {
-                            return msg;
-                        }
-                    } else if (r.t === 'move') {
-                        if (msg = isInvalidProperty(r.p,r.pt)) {
-                            return msg;
-                        }
-                        if (msg = isInvalidProperty(r.to,r.tot)) {
-                            return msg;
+                        if (r.t === 'change') {
+                            if ((msg = RED.utils.validateTypedProperty(r.from,r.fromt,opt)) !== true) {
+                                errors.push(msg)
+                            }
                         }
                     }
+                    if (errors.length) {
+                        return errors
+                    }
+                    return true;
                 }
-                return true;
-            }},
+            },
             // legacy
             action: {value:""},
             property: {value:""},

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

@@ -57,7 +57,9 @@
             action: {value:"scale"},
             round: {value:false},
             property: {value:"payload",required:true,
-                       label:RED._("node-red:common.label.property")},
+                       label:RED._("node-red:common.label.property"),
+                       validate: RED.validators.typedInput({ type: 'msg', allowBlank: true })
+                    },
             name: {value:""}
         },
         inputs: 1,

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

@@ -153,7 +153,7 @@
             }
             var editorRow = $("#dialog-form>div.node-text-editor-row");
             height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-            $(".node-text-editor").css("height",height+"px");
+            $("#dialog-form .node-text-editor").css("height",height+"px");
             this.editor.resize();
         }
     });

packages/node_modules/@node-red/nodes/core/function/89-delay.js

@@ -284,7 +284,7 @@ module.exports = function(RED) {
                         done();
                     }
                 }
-                else {
+                else if (!msg.hasOwnProperty("reset")) {
                     if (maxKeptMsgsCount(node) > 0) {
                         if (node.intervalID === -1) {
                             node.send(msg);

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

@@ -56,7 +56,7 @@
         color:"darksalmon",
         defaults: {
             command: {value:""},
-            addpay: {value:""},
+            addpay: {value:"", validate: RED.validators.typedInput({ type: 'msg', allowBlank: true })},
             append: {value:""},
             useSpawn: {value:"false"},
             timer: {value:""},

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

@@ -56,9 +56,11 @@
             inout: {value:"out"},
             septopics: {value:true},
             property: {value:"payload", required:true,
-                       label:RED._("node-red:rbe.label.property")},
+                       label:RED._("node-red:rbe.label.property"),
+                       validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })},
             topi: {value:"topic", required:true,
-                   label:RED._("node-red:rbe.label.topic")}
+                   label:RED._("node-red:rbe.label.topic"),
+                   validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })}
         },
         inputs:1,
         outputs:1,

packages/node_modules/@node-red/nodes/core/network/10-mqtt.js

@@ -24,7 +24,6 @@ module.exports = function(RED) {
         "text/css":"string",
         "text/html":"string",
         "text/plain":"string",
-        "text/html":"string",
         "application/json":"json",
         "application/octet-stream":"buffer",
         "application/pdf":"buffer",
@@ -105,6 +104,7 @@ module.exports = function(RED) {
      * @returns `true` if it is a valid topic
      */
     function isValidPublishTopic(topic) {
+        if (topic.length === 0) return false;
         return !/[\+#\b\f\n\r\t\v\0]/.test(topic);
     }
 
@@ -220,8 +220,8 @@ module.exports = function(RED) {
      */
     function subscriptionHandler(node, datatype ,topic, payload, packet) {
         const msg = {topic:topic, payload:null, qos:packet.qos, retain:packet.retain};
-        const v5 = (node && node.brokerConn) 
-            ? node.brokerConn.v5() 
+        const v5 = (node && node.brokerConn)
+            ? node.brokerConn.v5()
             : Object.prototype.hasOwnProperty.call(packet, "properties");
         if(v5 && packet.properties) {
             setStrProp(packet.properties, msg, "responseTopic");
@@ -452,7 +452,7 @@ module.exports = function(RED) {
 
     /**
      * Perform the disconnect action
-     * @param {MQTTInNode|MQTTOutNode} node 
+     * @param {MQTTInNode|MQTTOutNode} node
      * @param {Function} done
      */
     function handleDisconnectAction(node, done) {
@@ -612,7 +612,7 @@ module.exports = function(RED) {
                 node.brokerurl = node.url;
             } else {
                 // if the broker is ws:// or wss:// or tcp://
-                if (node.broker.indexOf("://") > -1) {
+                if ((typeof node.broker  === 'string') && node.broker.indexOf("://") > -1) {
                     node.brokerurl = node.broker;
                     // Only for ws or wss, check if proxy env var for additional configuration
                     if (node.brokerurl.indexOf("wss://") > -1 || node.brokerurl.indexOf("ws://") > -1) {
@@ -866,7 +866,7 @@ module.exports = function(RED) {
              * Call end and wait for the client to end (or timeout)
              * @param {mqtt.MqttClient} client The broker client
              * @param {number} ms The time to wait for the client to end
-             * @returns 
+             * @returns
              */
             let waitEnd = (client, ms) => {
                 return new Promise( (resolve, reject) => {
@@ -906,7 +906,7 @@ module.exports = function(RED) {
         node.subid = 1;
 
         //typedef for subscription object:
-        /** 
+        /**
          * @typedef {Object} Subscription
          * @property {String} topic - topic to subscribe to
          * @property {Object} [options] - options object
@@ -934,7 +934,7 @@ module.exports = function(RED) {
             const ref = _ref || 0;
             let options
             let qos = 1 // default to QoS 1 (AWS and several other brokers don't support QoS 2)
-            
+
             // if options is an object, then clone it
             if (typeof _options == "object") {
                 options = RED.util.cloneMessage(_options || {})
@@ -948,7 +948,7 @@ module.exports = function(RED) {
             if (typeof qos === "number" && qos >= 0 && qos <= 2) {
                 options.qos = qos;
             }
-            
+
             subscription.topic = _topic;
             subscription.qos = qos;
             subscription.options = RED.util.cloneMessage(options);
@@ -958,16 +958,16 @@ module.exports = function(RED) {
         }
 
         /**
-         * If topic is a subscription object, then use that, otherwise look up the topic in 
+         * If topic is a subscription object, then use that, otherwise look up the topic in
          * the  subscriptions object.  If the topic is not found, then create a new subscription
          * object and add it to the subscriptions object.
-         * @param {Subscription|String} topic 
-         * @param {*} options 
-         * @param {*} callback 
-         * @param {*} ref 
+         * @param {Subscription|String} topic
+         * @param {*} options
+         * @param {*} callback
+         * @param {*} ref
          */
         node.subscribe = function (topic, options, callback, ref) {
-            /** @type {Subscription} */ 
+            /** @type {Subscription} */
             let subscription
             let doCompare = false
             let changesFound = false
@@ -1005,7 +1005,7 @@ module.exports = function(RED) {
                     _brokerConn.unsubscribe(sub.topic, sub.ref, true)
                 }
             })
-            
+
             // if subscription is found (or sent in as a parameter), then check for changes.
             // if there are any changes requested, tidy up the old subscription
             if (subscription) {
@@ -1092,7 +1092,7 @@ module.exports = function(RED) {
                         delete sub[ref]
                     }
                 }
-                // if instructed to remove the actual MQTT client subscription 
+                // if instructed to remove the actual MQTT client subscription
                 if (unsub) {
                     // if there are no more subscriptions for the topic, then remove the topic
                     if (Object.keys(sub).length === 0) {

packages/node_modules/@node-red/nodes/core/network/21-httprequest.js

@@ -452,10 +452,6 @@ in your Node-RED user directory (${RED.settings.userDir}).
                                     formData.append(opt, val);
                                 } else if (typeof val === 'object' && val.hasOwnProperty('value')) {
                                     formData.append(opt,val.value,val.options || {});
-                                } else if (Array.isArray(val)) {
-                                    for (var i=0; i<val.length; i++) {
-                                        formData.append(opt, val[i])
-                                    }
                                 } else {
                                     formData.append(opt,JSON.stringify(val));
                                 }

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

@@ -411,23 +411,33 @@ module.exports = function(RED) {
                 if (msg._session && msg._session.type == "tcp") {
                     var client = connectionPool[msg._session.id];
                     if (client) {
-                        if (Buffer.isBuffer(msg.payload)) {
-                            client.write(msg.payload);
-                        } else if (typeof msg.payload === "string" && node.base64) {
-                            client.write(Buffer.from(msg.payload,'base64'));
-                        } else {
-                            client.write(Buffer.from(""+msg.payload));
+                        if (msg?.reset === true) {
+                            client.destroy();
+                        }
+                        else {
+                            if (Buffer.isBuffer(msg.payload)) {
+                                client.write(msg.payload);
+                            } else if (typeof msg.payload === "string" && node.base64) {
+                                client.write(Buffer.from(msg.payload,'base64'));
+                            } else {
+                                client.write(Buffer.from(""+msg.payload));
+                            }
                         }
                     }
                 }
                 else {
                     for (var i in connectionPool) {
-                        if (Buffer.isBuffer(msg.payload)) {
-                            connectionPool[i].write(msg.payload);
-                        } else if (typeof msg.payload === "string" && node.base64) {
-                            connectionPool[i].write(Buffer.from(msg.payload,'base64'));
-                        } else {
-                            connectionPool[i].write(Buffer.from(""+msg.payload));
+                        if (msg?.reset === true) {
+                            connectionPool[i].destroy();
+                        }
+                        else {
+                            if (Buffer.isBuffer(msg.payload)) {
+                                connectionPool[i].write(msg.payload);
+                            } else if (typeof msg.payload === "string" && node.base64) {
+                                connectionPool[i].write(Buffer.from(msg.payload,'base64'));
+                            } else {
+                                connectionPool[i].write(Buffer.from(""+msg.payload));
+                            }
                         }
                     }
                 }
@@ -547,13 +557,33 @@ module.exports = function(RED) {
 
         this.on("input", function(msg, nodeSend, nodeDone) {
             var i = 0;
-            if ((!Buffer.isBuffer(msg.payload)) && (typeof msg.payload !== "string")) {
+            if (msg.payload !== undefined && (!Buffer.isBuffer(msg.payload)) && (typeof msg.payload !== "string")) {
                 msg.payload = msg.payload.toString();
             }
 
             var host = node.server || msg.host;
             var port = node.port || msg.port;
 
+            if (node.out === "sit" && msg?.reset) {
+                if (msg.reset === true) { // kill all connections
+                    for (var cl in clients) {
+                        if (clients[cl].hasOwnProperty("client")) {
+                            clients[cl].client.destroy();
+                            delete clients[cl];
+                        }
+                    }
+                }
+                if (typeof(msg.reset) === "string" && msg.reset.includes(":")) {  // just kill connection host:port
+                    if (clients.hasOwnProperty(msg.reset) && clients[msg.reset].hasOwnProperty("client")) {
+                        clients[msg.reset].client.destroy();
+                        delete clients[msg.reset];
+                    }
+                }
+                const cc = Object.keys(clients).length;
+                node.status({fill:"green",shape:cc===0?"ring":"dot",text:RED._("tcpin.status.connections",{count:cc})});
+                if ((host === undefined || port === undefined) && !msg.hasOwnProperty("payload")) { return; }
+            }
+
             // Store client information independently
             // the clients object will have:
             // clients[id].client, clients[id].msg, clients[id].timeout
@@ -621,13 +651,16 @@ module.exports = function(RED) {
                     clients[connection_id].connecting = true;
                     clients[connection_id].client.connect(connOpts, function() {
                         //node.log(RED._("tcpin.errors.client-connected"));
-                        node.status({fill:"green",shape:"dot",text:"common.status.connected"});
+                        // node.status({fill:"green",shape:"dot",text:"common.status.connected"});
+                        node.status({fill:"green",shape:"dot",text:RED._("tcpin.status.connections",{count:Object.keys(clients).length})});
                         if (clients[connection_id] && clients[connection_id].client) {
                             clients[connection_id].connected = true;
                             clients[connection_id].connecting = false;
                             let event;
                             while (event = dequeue(clients[connection_id].msgQueue)) {
-                                clients[connection_id].client.write(event.msg.payload);
+                                if (event.msg.payload !== undefined) {
+                                    clients[connection_id].client.write(event.msg.payload);
+                                }
                                 event.nodeDone();
                             }
                             if (node.out === "time" && node.splitc < 0) {
@@ -823,7 +856,9 @@ module.exports = function(RED) {
             else if (!clients[connection_id].connecting && clients[connection_id].connected) {
                 if (clients[connection_id] && clients[connection_id].client) {
                     let event = dequeue(clients[connection_id].msgQueue)
-                    clients[connection_id].client.write(event.msg.payload);
+                    if (event.msg.payload !== undefined ) {
+                        clients[connection_id].client.write(event.msg.payload);
+                    }
                     event.nodeDone();
                 }
             }

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

@@ -63,7 +63,7 @@ module.exports = function(RED) {
                         if (!(notemplate && (msg.hasOwnProperty("parts") && msg.parts.hasOwnProperty("index") && msg.parts.index > 0))) {
                             template = clean(node.template);
                         }
-                        var ou = "";
+                        const ou = [];
                         if (!Array.isArray(msg.payload)) { msg.payload = [ msg.payload ]; }
                         if (node.hdrout !== "none" && node.hdrSent === false) {
                             if ((template.length === 1) && (template[0] === '')) {
@@ -74,7 +74,7 @@ module.exports = function(RED) {
                                     template = Object.keys(msg.payload[0]);
                                 }
                             }
-                            ou += template.map(v => v.indexOf(node.sep)!==-1 ? '"'+v+'"' : v).join(node.sep) + node.ret;
+                            ou.push(template.map(v => v.indexOf(node.sep)!==-1 ? '"'+v+'"' : v).join(node.sep));
                             if (node.hdrout === "once") { node.hdrSent = true; }
                         }
                         for (var s = 0; s < msg.payload.length; s++) {
@@ -93,7 +93,7 @@ module.exports = function(RED) {
                                         msg.payload[s][t] = node.quo + msg.payload[s][t].toString() + node.quo;
                                     }
                                 }
-                                ou += msg.payload[s].join(node.sep) + node.ret;
+                                ou.push(msg.payload[s].join(node.sep));
                             }
                             else {
                                 if ((template.length === 1) && (template[0] === '') && (msg.hasOwnProperty("columns"))) {
@@ -105,6 +105,7 @@ module.exports = function(RED) {
                                         node.warn(RED._("csv.errors.obj_csv"));
                                         tmpwarn = false;
                                     }
+                                    const row = [];
                                     for (var p in msg.payload[0]) {
                                         /* istanbul ignore else */
                                         if (msg.payload[s].hasOwnProperty(p)) {
@@ -118,21 +119,22 @@ module.exports = function(RED) {
                                                 }
                                                 if (q.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                     q = q.replace(/"/g, '""');
-                                                    ou += node.quo + q + node.quo + node.sep;
+                                                    row.push(node.quo + q + node.quo);
                                                 }
                                                 else if (q.indexOf(node.sep) !== -1 || p.indexOf("\n") !== -1) { // add quotes if any "commas" or "\n"
-                                                    ou += node.quo + q + node.quo + node.sep;
+                                                    row.push(node.quo + q + node.quo);
                                                 }
-                                                else { ou += q + node.sep; } // otherwise just add
+                                                else { row.push(q); } // otherwise just add
                                             }
                                         }
                                     }
-                                    ou = ou.slice(0,-1) + node.ret;
+                                    ou.push(row.join(node.sep)); // add separator
                                 }
                                 else {
+                                    const row = [];
                                     for (var t=0; t < template.length; t++) {
                                         if (template[t] === '') {
-                                            ou += node.sep;
+                                            row.push('');
                                         }
                                         else {
                                             var tt = template[t];
@@ -146,19 +148,20 @@ module.exports = function(RED) {
                                             p = RED.util.ensureString(p);
                                             if (p.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                 p = p.replace(/"/g, '""');
-                                                ou += node.quo + p + node.quo + node.sep;
+                                                row.push(node.quo + p + node.quo);
                                             }
                                             else if (p.indexOf(node.sep) !== -1 || p.indexOf("\n") !== -1) { // add quotes if any "commas" or "\n"
-                                                ou += node.quo + p + node.quo + node.sep;
+                                                row.push(node.quo + p + node.quo);
                                             }
-                                            else { ou += p + node.sep; } // otherwise just add
+                                            else { row.push(p); } // otherwise just add
                                         }
                                     }
-                                    ou = ou.slice(0,-1) + node.ret; // remove final "comma" and add "newline"
+                                    ou.push(row.join(node.sep)); // add separator
                                 }
                             }
                         }
-                        msg.payload = ou;
+                        // join lines, don't forget to add the last new line
+                        msg.payload = ou.join(node.ret) + node.ret;
                         msg.columns = template.map(v => v.indexOf(',')!==-1 ? '"'+v+'"' : v).join(',');
                         if (msg.payload !== '') { send(msg); }
                         done();

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

@@ -41,8 +41,8 @@
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
-            property: {value:"payload"},
-            outproperty: {value:"payload"},
+            property: {value:"payload", validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true }) },
+            outproperty: {value:"payload", validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true }) },
             tag: {value:""},
             ret: {value:"html"},
             as: {value:"single"}

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

@@ -32,6 +32,7 @@
         defaults: {
             name: {value:""},
             property: {value:"payload",required:true,
+                       validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true}),
                        label:RED._("node-red:json.label.property")},
             action: {value:""},
             pretty: {value:false}

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

@@ -27,7 +27,8 @@
         defaults: {
             name: {value:""},
             property: {value:"payload",required:true,
-                       label:RED._("node-red:common.label.property")},
+                       label:RED._("node-red:common.label.property"),
+                       validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })},
             attr: {value:""},
             chr: {value:""}
         },

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

@@ -16,6 +16,7 @@
         color:"#DEBD5C",
         defaults: {
             property: {value:"payload",required:true,
+                       validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true }),
                        label:RED._("node-red:common.label.property")},
             name: {value:""}
         },

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

@@ -57,7 +57,7 @@
             arraySplt: {value:1},
             arraySpltType: {value:"len"},
             stream: {value:false},
-            addname: {value:""}
+            addname: {value:"", validate: RED.validators.typedInput({ type: 'msg', allowBlank: true })}
         },
         inputs:1,
         outputs:1,
@@ -208,7 +208,22 @@
                 validate:RED.validators.typedInput("propertyType", false)
             },
             propertyType: { value:"msg"},
-            key: {value:"topic"},
+            key: {value:"topic", validate: (function () {
+                const typeValidator = RED.validators.typedInput({ type: 'msg' })
+                return function(v, opt) {
+                    const joinMode = $("#node-input-mode").val() || this.mode
+                    if (joinMode !== 'custom') {
+                        return true
+                    }
+                    const buildType = $("#node-input-build").val() || this.build
+                    if (buildType !== 'object') {
+                        return true
+                    } else {
+                        return typeValidator(v, opt)
+                    }
+                }
+                })()
+            },
             joiner: { value:"\\n"},
             joinerType: { value:"str"},
             accumulate: { value:"false" },

packages/node_modules/@node-red/nodes/core/storage/10-file.html

@@ -198,7 +198,7 @@
         category: 'storage',
         defaults: {
             name: {value:""},
-            filename: {value:""},
+            filename: {value:"", validate: RED.validators.typedInput({ typeField: 'filenameType' })},
             filenameType: {value:"str"},
             appendNewline: {value:true},
             createDir: {value:false},
@@ -297,7 +297,7 @@
         category: 'storage',
         defaults: {
             name: {value:""},
-            filename: {value:""},
+            filename: {value:"", validate: RED.validators.typedInput({ typeField: 'filenameType' }) },
             filenameType: {value:"str"},
             format: {value:"utf8"},
             chunk: {value:false},

packages/node_modules/@node-red/nodes/icons/arduino.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff"><path d="m9.7884 22.379c-5.2427-0.41732-9.6475 5.7885-7.4975 10.585 2.0949 5.2041 9.9782 6.6154 13.727 2.4477 3.633-3.5613 5.0332-9.0411 9.4821-11.853 4.5205-3.0872 11.797-0.172 12.68 5.3144 0.86 5.2537-4.8017 10.364-9.9231 8.8205-3.7873-0.85449-6.5051-4.0905-8.0487-7.4975-1.9019-3.2526-4.3882-6.7257-8.2693-7.6077-0.6891-0.15656-1.4003-0.21831-2.1059-0.21721z" stroke-width="3.3"/><path d="m6.7012 29.821h6.6154" stroke-width="1.4"/><path d="m26.988 29.821h5.5128m-2.8115-2.7564v5.5128" stroke-width="1.8"/></g></svg>

packages/node_modules/@node-red/nodes/icons/bluetooth.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m8.3474 17.75 22.298 22.444-10.747 13.013v-46.497l10.747 12.428-22.298 21.859" fill="none" stroke="#fff" stroke-width="4"/></svg>

packages/node_modules/@node-red/nodes/icons/leveldb.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m2.7078 12.986c0 7.7994-0.36386 21.569 0 32.545s35.118 9.8751 34.848 0c-0.26959-9.8751 0-24.82 0-32.545 0-7.7243-34.848-7.7995-34.848 0z" fill="none" stroke="#fff"/><g fill="#fff"><path d="m3.8741 13.406v8.955c0.021834 3.5781 19.543 5.0789 25.575 3.2543 0 0 0.02229-2.6683 0.02998-2.6673l5.5325 0.7238c0.64508 0.0844 1.1345-0.74597 1.134-1.3284v-8.573l-0.99896 0.93349-15.217-2.2765c4.5883 2.1798 9.808 4.1312 9.808 4.1312-9.3667 3.1562-25.846-0.31965-25.864-3.1525z"/><path d="m3.886 26.607v8.1052c3.2188 6.1087 29.901 5.8574 32.272 0v-8.1052c-3.3598 4.6685-29.204 5.1534-32.272 0z"/><path d="m4.0032 39.082v7.1522c2.556 7.4622 28.918 7.6072 32.272 0v-7.1522c-3.2345 4.9471-29.087 5.359-32.272 0z"/></g></svg>

packages/node_modules/@node-red/nodes/icons/mongodb.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m23.515 13.831c-4.7594-5.8789-2.6084-5.7751-7.3474 0-8.0368 10.477-8.3322 24.431 2.5476 32.935 0.13181 2.0418 0.46056 4.9803 0.46056 4.9803h1.315s0.32875-2.9219 0.46017-4.9803c2.8458-2.2339 16.799-14.619 2.5641-32.935z" fill="#fff"/></svg>

packages/node_modules/@node-red/nodes/icons/mouse.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff" stroke-width="3"><path d="m6 30c6 5 24 4 29-0.07"/><path d="m21 33 0.1-19c0.02-4 4-3 4-6s-4-2-4-5"/><path d="m6 22c0-11 29-10 29 0v21c0 18-29 19-29 0s4e-7 -11 0-21z"/></g></svg>

packages/node_modules/@node-red/nodes/icons/rbe.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m29 12s0.1 30 0.05 31-3 5-7 5-19 0.04-19 0.04c6-4 9-5 17-5 0 0 4-0.1 4-2 0-2 8e-3 -29 8e-3 -29z" fill="#fff"/><path d="m12 47s-0.1-30-0.05-31 3-5 7-5 19-0.04 19-0.04c-6 4-9 5-17 5 0 0-4 0.1-4 2 0 2-8e-3 29-8e-3 29z" fill="#fff"/></svg>

packages/node_modules/@node-red/nodes/icons/redis.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff" stroke-width="3"><path class="cls-4" d="m17.639 30.221c-1.7087-0.88225-12.465-5.6284-14.414-6.636-1.9492-1.0075-1.9868-1.7073-0.075164-2.5188 1.9117-0.81145 12.643-5.3861 14.91-6.2738 2.2675-0.8877 3.0517-0.91493 4.9785-0.14704 1.9267 0.76789 12.026 5.1329 13.923 5.8898 1.8966 0.75699 1.9843 1.386 0.02631 2.4861-1.958 1.1001-12.1 5.6611-14.285 6.8729s-3.355 1.2091-5.0636 0.32685z"/><path class="cls-4" d="m32.23 25.251c2.8239 1.2039 4.155 1.764 4.7307 1.9938 1.8966 0.75699 1.9843 1.386 0.0263 2.4861s-12.1 5.6611-14.285 6.8729c-2.1848 1.2117-3.3548 1.209-5.0634 0.32676-1.7087-0.88225-12.465-5.6284-14.414-6.636-1.9492-1.0075-1.9868-1.7073-0.075164-2.5188 10.883-4.6196-9.1087 3.8612 4.9598-2.1076"/><path class="cls-4" d="m32.23 31.961c2.8239 1.2039 4.155 1.764 4.7307 1.9938 1.8966 0.75699 1.9843 1.386 0.0263 2.4861s-12.1 5.6611-14.285 6.8729c-2.1848 1.2117-3.3548 1.209-5.0634 0.32676-1.7087-0.88225-12.465-5.6284-14.414-6.636-1.9492-1.0075-1.9868-1.7073-0.075164-2.5188 10.883-4.6196-9.1087 3.8612 4.9598-2.1076"/></g></svg>

packages/node_modules/@node-red/nodes/locales/de/function/10-function.html

@@ -25,7 +25,7 @@
     <p>Wenn ein promise-Objekt aus dem Start-Code zurückgegeben wird,
        beginnt danach die reguläre Verarbeitung der Eingangsnachrichten.</p>
     <h3>Details</h3>
-    <p>Siehe  <a target="_blank" href="http://nodered.org/docs/writing-functions.html">Onlinedokumentation</a>
+    <p>Siehe  <a target="_blank" href="https://nodered.org/docs/writing-functions.html">Onlinedokumentation</a>
        für weitere Informationen zum Schreiben von Funktionen.</p>
     <h4><b>Nachrichten senden</b></h4>
     <p>Die Funktion kann die Nachrichten zurückgeben, die sie an die nächsten Nodes im Flow weitergeben möchte,

packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html

@@ -26,7 +26,7 @@
     <p>If the On Start code returns a Promise object, the node will not start handling messages
         until the promise is resolved.</p>
     <h3>Details</h3>
-    <p>See the <a target="_blank" href="http://nodered.org/docs/writing-functions.html">online documentation</a>
+    <p>See the <a target="_blank" href="https://nodered.org/docs/writing-functions.html">online documentation</a>
     for more information on writing functions.</p>
     <h4>Sending messages</h4>
     <p>The function can either return the messages it wants to pass on to the next nodes

packages/node_modules/@node-red/nodes/locales/en-US/network/31-tcpin.html

@@ -30,6 +30,8 @@
     before being sent.</p>
     <p>If <code>msg._session</code> is not present the payload is
     sent to <b>all</b> connected clients.</p>
+    <p>In Reply-to mode, setting <code>msg.reset = true</code> will reset the connection
+        specified by _session.id, or all connections if no _session.id is specified.</p>
     <p><b>Note: </b>On some systems you may need root or administrator access
     to access ports below 1024.</p>
 </script>
@@ -40,6 +42,8 @@
     returned characters into a fixed buffer, match a specified character before returning,
     wait a fixed timeout from first reply and then return, sit and wait for data, or send then close the connection
     immediately, without waiting for a reply.</p>
+    <p>If in sit and wait mode (remain connected) you can send <code>msg.reset = true</code> or <code>msg.reset = "host:port"</code> to force a break in
+    the connection and an automatic reconnection.</p>
     <p>The response will be output in <code>msg.payload</code> as a buffer, so you may want to .toString() it.</p>
     <p>If you leave tcp host or port blank they must be set by using the <code>msg.host</code> and <code>msg.port</code> properties in every message sent to the node.</p>
 </script>

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

@@ -36,5 +36,5 @@
 <p><b>Remarque</b> : Les options <i>"Intervalle entre les heures"</i> et <i>"à une heure précise"</i> utilisent le système cron standard.
   Cela signifie que pour la première option, vous pouvez envoyer un message à intervalle régulier entre les heures voulues.
   Si vous voulez envoyer un message toutes les minutes à partir de maintenant, utiliser l'option <i>"intervalle"</i>.</p>
-<p><b>Remarque</b> : Pour inclure une nouvelle ligne dans une chaîne, vous devez utiliser un noeud de fonction pour créer la charge utile.</p>
+<p><b>Remarque</b> : Pour inclure une nouvelle ligne dans une chaîne, vous devez utiliser soit un noeud de fonction soit le noeud template pour créer la charge utile.</p>
 </script>

packages/node_modules/@node-red/nodes/locales/fr/function/10-function.html

@@ -26,7 +26,7 @@
     <p>Si le code 'Au démarrage' renvoie un objet Promise (promesse), le noeud ne commencera pas à gérer les messages
       jusqu'à ce que la promesse soit résolue.</p>
     <h3>Détails</h3>
-    <p>Voir la <a target="_blank" href="http://nodered.org/docs/writing-functions.html">documentation en ligne</a>
+    <p>Voir la <a target="_blank" href="https://nodered.org/docs/writing-functions.html">documentation en ligne</a>
       pour plus d'informations sur les fonctions d'écriture.</p>
     <h4>Envoi de messages</h4>
     <p>La fonction peut envoyer les messages qu'elle souhaite transmettre aux noeuds suivants

packages/node_modules/@node-red/nodes/locales/fr/messages.json

@@ -11,11 +11,11 @@
             "expand": "Développer"
         },
         "status": {
-            "connected": "connecté",
-            "not-connected": "pas connecté",
-            "disconnected": "déconnecté",
-            "connecting": "connexion",
-            "error": "erreur",
+            "connected": "Connecté",
+            "not-connected": "Pas connecté",
+            "disconnected": "Déconnecté",
+            "connecting": "Connexion",
+            "error": "Erreur",
             "ok": "OK"
         },
         "notification": {
@@ -32,7 +32,7 @@
     },
     "inject": {
         "inject": "Injecter",
-        "injectNow": "injecter maintenant",
+        "injectNow": "Injecter maintenant",
         "repeat": "répéter = __repeat__",
         "crontab": "crontab = __crontab__",
         "stopped": "arrêté",
@@ -98,7 +98,7 @@
         "catchUncaught": "catch : non capturé",
         "label": {
             "source": "Détecter les erreurs de",
-            "selectAll": "tout sélectionner",
+            "selectAll": "Tout sélectionner",
             "uncaught": "Ignorer les erreurs gérées par les autres noeuds Catch"
         },
         "scope": {
@@ -112,7 +112,7 @@
         "statusNodes": "statut : __number__",
         "label": {
             "source": "Signaler l'état de",
-            "sortByType": "trier par type"
+            "sortByType": "Trier par type"
         },
         "scope": {
             "all": "tous les noeuds",
@@ -148,23 +148,23 @@
             "deactivated": "Désactivé avec succès : __label__"
         },
         "sidebar": {
-            "label": "débogage",
+            "label": "Débogage",
             "name": "Messages de débogage",
-            "filterAll": "tous les noeuds",
-            "filterSelected": "noeuds sélectionnés",
-            "filterCurrent": "flux actuel",
+            "filterAll": "Tous les noeuds",
+            "filterSelected": "Noeuds sélectionnés",
+            "filterCurrent": "Flux actuel",
             "debugNodes": "noeuds de débogage",
-            "clearLog": "Effacer les messages",
-            "clearFilteredLog": "Effacer les messages filtrés",
+            "clearLog": "Tous les messages",
+            "clearFilteredLog": "Les messages filtrés",
             "filterLog": "Filtrer les messages",
             "openWindow": "Ouvrir dans une nouvelle fenêtre",
             "copyPath": "Copier le chemin",
             "copyPayload": "Copier la valeur",
             "pinPath": "Épingler le chemin",
-            "selectAll": "tout sélectionner",
-            "selectNone": "ne rien sélectionner",
-            "all": "tout",
-            "filtered": "filtré"
+            "selectAll": "Tout sélectionner",
+            "selectNone": "Ne rien sélectionner",
+            "all": "Tout",
+            "filtered": "Filtrés"
         },
         "messageMenu": {
             "collapseAll": "Réduire tous les chemins",
@@ -177,11 +177,11 @@
         "linkIn": "Lien entrant",
         "linkOut": "Lien sortant",
         "linkCall": "Appel de lien",
-        "linkOutReturn": "retour de lien",
+        "linkOutReturn": "Retour de lien",
         "outMode": "Mode",
         "sendToAll": "Envoyer à tous les noeuds de liaison connectés",
         "returnToCaller": "Retour au noeud de liaison appelant",
-        "timeout": "temps mort",
+        "timeout": "Temps mort",
         "linkCallType": "Type de liaison",
         "staticLinkCall": "Lien fixe",
         "dynamicLinkCall": "Lien dynamique (msg.target)",
@@ -225,7 +225,7 @@
             "command": "Commande",
             "append": "Joindre",
             "timeout": "Temps mort",
-            "timeoutplace": "facultatif",
+            "timeoutplace": "Facultatif",
             "return": "Sortie",
             "seconds": "secondes",
             "stdout": "stdout",
@@ -234,7 +234,7 @@
             "winHide": "Masquer la console"
         },
         "placeholder": {
-            "extraparams": "paramètres d'entrée supplémentaires"
+            "extraparams": "Paramètres d'entrée supplémentaires"
         },
         "opt": {
             "exec": "lorsque la commande est terminée - mode exec",
@@ -319,7 +319,7 @@
         "queuemsg": "Mettre en file d'attente les messages intermédiaires",
         "dropmsg": "Supprimer les messages intermédiaires",
         "sendmsg": "Envoyer les messages intermédiaires sur la 2ème sortie",
-        "allowrate": "autoriser msg.rate (en ms) à remplacer le débit",
+        "allowrate": "Autoriser msg.rate (en ms) à remplacer le débit",
         "label": {
             "delay": "retard",
             "variable": "variable",
@@ -349,7 +349,7 @@
             }
         },
         "errors": {
-            "too-many": "trop de messages en attente dans le noeud 'Delay'",
+            "too-many": "Trop de messages en attente dans le noeud 'Delay'",
             "invalid-timeout": "Valeur de délai invalide",
             "invalid-rate": "Valeur de taux invalide",
             "invalid-rate-unit": "Valeur de débit invalide",
@@ -359,8 +359,8 @@
     },
     "trigger": {
         "send": "Envoyer",
-        "then": "puis",
-        "then-send": "puis envoyer",
+        "then": "Puis",
+        "then-send": "Puis envoyer",
         "output": {
             "string": "la chaîne",
             "number": "le nombre",
@@ -381,9 +381,9 @@
             "m": "Minutes",
             "h": "Heures"
         },
-        "extend": " prolonger le délai si un nouveau message arrive",
-        "override": "remplacer le délai avec msg.delay",
-        "second": " envoyer un deuxième message à une sortie séparée",
+        "extend": " Prolonger le délai si un nouveau message arrive",
+        "override": "Remplacer le délai avec msg.delay",
+        "second": " Envoyer un deuxième message à une sortie séparée",
         "label": {
             "trigger": "déclencher",
             "trigger-block": "déclencher et bloquer",
@@ -408,7 +408,7 @@
     "mqtt": {
         "label": {
             "broker": "Serveur",
-            "example": "par exemple. localhost",
+            "example": "expl. localhost",
             "output": "Sortie",
             "qos": "QoS",
             "retain": "Conserver",
@@ -438,7 +438,7 @@
             "sessionExpiry": "Expiration de la session (secondes)",
             "topicAlias": "Alias",
             "payloadFormatIndicator": "Formater",
-            "payloadFormatIndicatorFalse": "octets non spécifiés (par défaut)",
+            "payloadFormatIndicatorFalse": "Octets non spécifiés (par défaut)",
             "payloadFormatIndicatorTrue": "Charge utile encodée en UTF-8",
             "protocolVersion": "Protocole",
             "protocolVersion3": "MQTT V3.1 (hérité)",
@@ -493,8 +493,8 @@
         "false": "faux",
         "tip": "Conseil : laisser le sujet, le qos ou le contenu vide si vous souhaitez les définir via les propriétés du msg.",
         "errors": {
-            "not-defined": "sujet non défini",
-            "missing-config": "configuration du courtier manquante",
+            "not-defined": "Sujet non défini",
+            "missing-config": "Configuration du courtier manquante",
             "invalid-topic": "Sujet invalide spécifié",
             "nonclean-missingclientid": "Aucun ID client défini, utilisation d'une session propre",
             "invalid-json-string": "Chaîne JSON invalide",
@@ -514,7 +514,7 @@
             "upload": "Accepter les téléchargements de fichiers ?",
             "status": "Code d'état",
             "headers": "En-têtes",
-            "other": "autre",
+            "other": "Autre",
             "paytoqs": {
                 "ignore": "Ignorer",
                 "query": "Joindre aux paramètres de chaîne de requête",
@@ -625,7 +625,7 @@
             "chars": "caractères",
             "close": "Fermer",
             "optional": "(facultatif)",
-            "reattach": "rattacher le délimiteur"
+            "reattach": "Rattacher le délimiteur"
         },
         "type": {
             "listen": "Écoute sur",
@@ -633,8 +633,8 @@
             "reply": "Répondre sur TCP"
         },
         "output": {
-            "stream": "flux de",
-            "single": "unique",
+            "stream": "Flux de",
+            "single": "Unique",
             "buffer": "Tampon",
             "string": "Chaîne",
             "base64": "Chaîne en Base64"
@@ -657,15 +657,15 @@
             "connections_plural": "__count__ connexions"
         },
         "errors": {
-            "connection-lost": "connexion perdue avec __host__:__port__",
-            "timeout": "délai d'expiration du port __port__ du socket fermé",
-            "cannot-listen": "impossible d'écouter sur le port __port__, erreur : __error__",
-            "error": "erreur : __error__",
-            "socket-error": "erreur de courtier depuis __host__:__port__",
+            "connection-lost": "Connexion perdue avec __host__:__port__",
+            "timeout": "Délai d'expiration du port __port__ du socket fermé",
+            "cannot-listen": "Impossible d'écouter sur le port __port__, erreur : __error__",
+            "error": "Erreur : __error__",
+            "socket-error": "Erreur de courtier depuis __host__:__port__",
             "no-host": "Hôte et/ou port non défini",
-            "connect-timeout": "délai de connexion",
-            "connect-fail": "la connexion a échoué",
-            "bad-string": "échec de la conversion en chaîne",
+            "connect-timeout": "Délai de connexion",
+            "connect-fail": "La connexion a échoué",
+            "bad-string": "Échec de la conversion en chaîne",
             "invalid-host": "Hôte invalide",
             "invalid-port": "Port invalide"
         }
@@ -722,7 +722,7 @@
         },
         "errors": {
             "access-error": "Erreur d'accès UDP, vous aurez peut-être besoin d'un accès root pour les ports inférieurs à 1024",
-            "error": "erreur : __erreur__",
+            "error": "Erreur : __erreur__",
             "bad-mcaddress": "Mauvaise adresse de multidiffusion",
             "interface": "Doit être l'adresse IP de l'interface requise",
             "ip-notset": "udp : adresse IP non définie",
@@ -730,7 +730,7 @@
             "port-invalid": "udp : numéro de port non valide",
             "alreadyused": "udp : port __port__ déjà utilisé",
             "ifnotfound": "udp : interface __iface__ introuvable",
-            "invalid-group": "groupe de multidiffusion invalide"
+            "invalid-group": "Groupe de multidiffusion invalide"
         }
     },
     "switch": {
@@ -738,15 +738,15 @@
         "label": {
             "property": "Propriété",
             "rule": "règle",
-            "repair": "recréer des séquences du messages",
-            "value-rules": "règles de valeur",
-            "sequence-rules": "règles de séquence"
+            "repair": "Recréer des séquences du messages",
+            "value-rules": "Règles de valeur",
+            "sequence-rules": "Règles de séquence"
         },
         "previous": "valeur précédente",
         "and": "et",
-        "checkall": "vérifier toutes les règles",
-        "stopfirst": "arrêter après la première concordance",
-        "ignorecase": "ignorer la casse",
+        "checkall": "Vérifier toutes les règles",
+        "stopfirst": "Arrêter après la première concordance",
+        "ignorecase": "Ignorer la casse",
         "rules": {
             "btwn": "est entre",
             "cont": "contient",
@@ -767,7 +767,7 @@
         },
         "errors": {
             "invalid-expr": "Expression JSONata non valide : __error__",
-            "too-many": "trop de messages en attente dans le noeud de commutation"
+            "too-many": "Trop de messages en attente dans le noeud de commutation"
         }
     },
     "change": {
@@ -840,13 +840,13 @@
             "entrée": "Entrée",
             "skip-s": "Passer en premier",
             "skip-e": "lignes",
-            "firstrow": "la première ligne contient les noms des colonnes",
+            "firstrow": "La première ligne contient les noms des colonnes",
             "output": "Sortie",
-            "includerow": "inclure la ligne du nom de la colonne",
+            "includerow": "Inclure la ligne du nom de la colonne",
             "newline": "Nouvelle ligne",
-            "usestrings": "analyser les valeurs numériques",
-            "include_empty_strings": "inclure les chaînes vides",
-            "include_null_values": "inclure les valeurs nulles"
+            "usestrings": "Analyser les valeurs numériques",
+            "include_empty_strings": "Inclure les chaînes vides",
+            "include_null_values": "Inclure les valeurs nulles"
         },
         "placeholder": {
             "columns": "noms de colonnes séparés par des virgules"
@@ -936,8 +936,8 @@
     },
     "file": {
         "label": {
-            "write": "écrire le fichier",
-            "read": "lire le fichier",
+            "write": "Écrire le fichier",
+            "read": "Lire le fichier",
             "filename": "Nom du fichier",
             "path": "chemin",
             "action": "Action",
@@ -972,8 +972,8 @@
             "appendedfile": "ajouté au fichier : __file__"
         },
         "encoding": {
-            "none": "par défaut",
-            "setbymsg": "défini par msg.encoding",
+            "none": "Par défaut",
+            "setbymsg": "Défini par msg.encoding",
             "native": "Natif",
             "unicode": "Unicode",
             "japanese": "Japonais",
@@ -990,10 +990,10 @@
         "errors": {
             "nofilename": "Aucun nom de fichier spécifié",
             "invaliddelete": "Attention : suppression non valide. Veuiller utiliser une option de suppression spécifique dans la boîte de dialogue de configuration.",
-            "deletefail": "échec de la suppression du fichier : __error__",
-            "writefail": "échec de l'écriture dans le fichier : __error__",
-            "appendfail": "échec de l'ajout au fichier : __error__",
-            "createfail": "échec de la création du fichier : __error__"
+            "deletefail": "Échec de la suppression du fichier : __error__",
+            "writefail": "Échec de l'écriture dans le fichier : __error__",
+            "appendfail": "Échec de l'ajout au fichier : __error__",
+            "createfail": "Échec de la création du fichier : __error__"
         },
         "tip": "Astuce : Le nom du fichier doit être un chemin absolu, sinon il sera relatif au répertoire de travail du processus Node-RED."
     },
@@ -1018,9 +1018,9 @@
             "reduce": "réduire la séquence",
             "custom": "manuel"
         },
-        "combine": "Combine each",
+        "combine": "Combiner chaque",
         "completeMessage": "message complet",
-        "create": "créer",
+        "create": "Créer",
         "type": {
             "string": "une Chaîne",
             "array": "un Tableau",
@@ -1028,13 +1028,13 @@
             "object": "un Objet clé/valeur",
             "merged": "un Objet fusionné"
         },
-        "using": "en utilisant la valeur de",
-        "key": "comme la clé",
+        "using": "En utilisant la valeur du",
+        "key": "comme clé",
         "joinedUsing": "joint en utilisant",
         "send": "Envoyer le message :",
-        "afterCount": "Après un certain nombre de parties du message",
-        "count": "compter",
-        "subsequent": "et tous les messages suivants.",
+        "afterCount": "Après un nombre de parties du message",
+        "count": "nombre",
+        "subsequent": "Et tous les messages suivants.",
         "afterTimeout": "Après un délai d'attente après le premier message",
         "seconds": "secondes",
         "complete": "Après un message avec la propriété <code>msg.complete</code> définie",
@@ -1068,10 +1068,10 @@
         "order": "Sens",
         "ascending": "croissant",
         "descending": "descendant",
-        "as-number": "comme nombre",
+        "as-number": "Comme nombre",
         "invalid-exp": "Expression JSONata invalide dans le noeud sort: __message__",
         "too-many": "Trop de messages en attente dans le noeud sort",
-        "clear": "effacer le message en attente dans le noeud sort"
+        "clear": "Effacer le message en attente dans le noeud sort"
     },
     "batch": {
         "batch": "Regrouper",
@@ -1084,21 +1084,21 @@
         "count": {
             "label": "Nombre de messages",
             "overlap": "Chevauchement",
-            "count": "compter",
+            "count": "nombre",
             "invalid": "Comptage et chevauchement invalides"
         },
         "interval": {
             "label": "Intervalle",
             "seconds": "secondes",
-            "empty": "envoyer un message vide lorsqu'aucun message n'arrive"
+            "empty": "Envoyer un message vide lorsqu'aucun message n'arrive"
         },
         "concat": {
             "topics-label": "Sujets",
             "topic": "sujet"
         },
-        "too-many": "trop de messages en attente dans le noeud batch",
-        "unexpected": "mode inattendu",
-        "no-parts": "aucune propriété de pièces dans le message",
+        "too-many": "Trop de messages en attente dans le noeud batch",
+        "unexpected": "Mode inattendu",
+        "no-parts": "Aucune propriété de pièces dans le message",
         "error": {
             "invalid-count": "Compte invalide",
             "invalid-overlap": "Recouvrement invalide",
@@ -1132,7 +1132,7 @@
             "out": "par rapport à la dernière valeur de sortie valide"
         },
         "warn": {
-            "nonumber": "aucun numéro trouvé dans la charge utile"
+            "nonumber": "Aucun numéro trouvé dans la charge utile"
         }
     },
     "global-config": {

packages/node_modules/@node-red/nodes/locales/ja/function/10-function.html

@@ -22,7 +22,7 @@
     <p><b>初期化処理</b>タブにはノードの開始時に実行されるコードを、<b>終了処理</b>タブにはノードの終了時に実行されるコードを指定します。</p>
     <p>初期化処理タブの返却値としてPromiseオブジェクトを返却すると、入力メッセージの処理を開始する前にその完了を待ちます。</p>
     <h3>詳細</h3>
-    <p>コードの書き方の詳細については、<a target="_blank" href="http://nodered.org/docs/writing-functions.html">オンラインドキュメント</a>を参照してください。</p>
+    <p>コードの書き方の詳細については、<a target="_blank" href="https://nodered.org/docs/writing-functions.html">オンラインドキュメント</a>を参照してください。</p>
     <h4>メッセージの送信</h4>
     <p>フロー内の次ノードにメッセージを渡すためには、メッセージを返却するか<code>node.send(messages)</code>を呼び出します。</p>
     <p>返却/sendの対象は次のとおりです:</p>

packages/node_modules/@node-red/nodes/locales/ko/function/10-function.html

@@ -20,7 +20,7 @@
     <p><code>msg</code>오브젝트는<code>msg.payload</code>프로퍼티에 메시지 본체를 유지하는 것이 관례입니다.</p>
     <p>보통 코드는 메시지 오브젝트(혹은 여러 메시지 객체)를 반환합니다.후속 플로우의 실행을 정지하고 싶은 경우에는, 오브젝트를 반환하지 않아도 상관없습니다.</p>
     <h3>상세</h3>
-    <p>코드 쓰는 방식에 대한 자세한 내용은, <a target="_blank" href="http://nodered.org/docs/writing-functions.html">공식 홈페이지</a>를 참조해 주세요.</p>
+    <p>코드 쓰는 방식에 대한 자세한 내용은, <a target="_blank" href="https://nodered.org/docs/writing-functions.html">공식 홈페이지</a>를 참조해 주세요.</p>
     <h4>메세지 송신</h4>
     <p>플로우 내의 다음 노드에 메세지를 전달하기 위해서는, 메세지를 반환하거나, <code>node.send(messages)</code>를 호출합니다.</p>
     <p>반환/send 대상은 다음과 같습니다:</p>

packages/node_modules/@node-red/nodes/locales/pt-BR/function/10-function.html

@@ -26,7 +26,7 @@
       <p>Se o código <b>On Start</b> retornar um objeto do tipo promessa, o nó não começará a tratar as mensagens
           até que a promessa seja resolvida.</p>
       <h3>Detalhes</h3>
-      <p>Consulte a <a target="_blank" href="http://nodered.org/docs/writing-functions.html">documentação online</a>
+      <p>Consulte a <a target="_blank" href="https://nodered.org/docs/writing-functions.html">documentação online</a>
       para obter maiores informações sobre funções de escrita.</p>
       <h4>Enviando mensagens</h4>
       <p>A função pode retornar as mensagens que deseja passar para os próximos nós

packages/node_modules/@node-red/nodes/locales/ru/function/10-function.html

@@ -36,7 +36,7 @@
 
   <h3>Подробности</h3>
   <p>
-    Смотрите <a target="_blank" href="http://nodered.org/docs/writing-functions.html">онлайн-документацию</a> для получения дополнительной информации по написанию функций.
+    Смотрите <a target="_blank" href="https://nodered.org/docs/writing-functions.html">онлайн-документацию</a> для получения дополнительной информации по написанию функций.
   </p>
 
   <h4>Отправка сообщений</h4>

packages/node_modules/@node-red/nodes/locales/zh-CN/function/10-function.html

@@ -20,7 +20,7 @@
     <p>通常，<code>msg</code>对象将消息正文保留在<code>msg.payload</code>属性中。</p>
     <p>该函数一般会返回一个消息对象（或多个消息对象），但也可以为了停止流而什么都不返回。</p>
     <h3>详细</h3>
-    <p>请参见<a target="_blank" href="http://nodered.org/docs/writing-functions.html">在线文档</a>来获得更多有关编写函数的信息。</p>
+    <p>请参见<a target="_blank" href="https://nodered.org/docs/writing-functions.html">在线文档</a>来获得更多有关编写函数的信息。</p>
     <h4>传送消息</h4>
     <p>要将消息传递到流中的下一个节点，请返回消息或调用<code>node.send(messages)</code>。</p>
     <p>它将返回/send:</p>

packages/node_modules/@node-red/nodes/locales/zh-TW/function/10-function.html

@@ -20,7 +20,7 @@
   <p>通常，<code>msg</code>對象將消息正文保留在<code>msg.payload</code>屬性中。</p>
   <p>該函數一般會返回一個消息對象（或多個消息對象），但也可以爲了停止流程而什麽都不返回。</p>
   <h3>詳細</h3>
-  <p>請參見<a target="_blank" href="http://nodered.org/docs/writing-functions.html">在線文檔</a>來獲得更多有關編寫函數的信息。</p>
+  <p>請參見<a target="_blank" href="https://nodered.org/docs/writing-functions.html">在線文檔</a>來獲得更多有關編寫函數的信息。</p>
   <h4>傳送消息</h4>
   <p>要將消息傳遞到流程中的下一個節點，請返回消息或調用<code>node.send(messages)</code>。</p>
   <p>它將返回/send:</p>

packages/node_modules/@node-red/nodes/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "3.1.0-beta.4",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -38,13 +38,13 @@
         "mqtt": "4.3.7",
         "multer": "1.4.5-lts.1",
         "mustache": "4.2.0",
-        "node-watch": "0.7.3",
+        "node-watch": "0.7.4",
         "on-headers": "1.0.2",
         "raw-body": "2.5.2",
-        "tough-cookie": "4.1.2",
+        "tough-cookie": "4.1.3",
         "uuid": "9.0.0",
         "ws": "7.5.6",
-        "xml2js": "0.6.0",
+        "xml2js": "0.6.2",
         "iconv-lite": "0.6.3"
     }
 }