Guard settings access

Fixes #4503

CHANGELOG.md

@@ -1,3 +1,9 @@
+#### 3.1.3: Maintenance Release
+
+Editor
+
+ - Add missing en-us messages (#4475) @knolleary
+
 #### 3.1.2: Maintenance Release
 
 Editor 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "3.1.2",
+    "version": "3.1.3",
     "description": "Low-code programming for event-driven applications",
     "homepage": "https://nodered.org",
     "license": "Apache-2.0",

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

@@ -51,7 +51,7 @@ module.exports = {
 
             var ui = require("./ui");
 
-            ui.init(runtimeAPI);
+            ui.init(settings, runtimeAPI);
 
             const editorApp = apiUtil.createExpressApp(settings)
 

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

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+const crypto = require('crypto')
 var express = require('express');
 var fs = require("fs");
 var path = require("path");
@@ -24,13 +25,16 @@ var apiUtils = require("../util");
 var theme = require("./theme");
 
 var runtimeAPI;
+let settings;
 var editorClientDir = path.dirname(require.resolve("@node-red/editor-client"));
 var defaultNodeIcon = path.join(editorClientDir,"public","red","images","icons","arrow-in.svg");
 var editorTemplatePath = path.join(editorClientDir,"templates","index.mst");
 var editorTemplate;
+let cacheBuster
 
 module.exports = {
-    init: function(_runtimeAPI) {
+    init: function(_settings, _runtimeAPI) {
+        settings = _settings;
         runtimeAPI = _runtimeAPI;
         editorTemplate = fs.readFileSync(editorTemplatePath,"utf8");
         Mustache.parse(editorTemplate);
@@ -91,6 +95,12 @@ module.exports = {
     },
 
     editor: async function(req,res) {
+        if (!cacheBuster) {
+            // settings.instanceId is set asynchronously to the editor-api
+            // being initiaised. So we defer calculating the cacheBuster hash
+            // until the first load of the editor
+            cacheBuster = crypto.createHash('md5').update(`${settings.version || 'version'}-${settings.instanceId || 'instanceId'}`).digest("hex").substring(0,12)    
+        }
 
         let sessionMessages;
         if (req.session && req.session.messages) {
@@ -99,6 +109,7 @@ module.exports = {
         }
         res.send(Mustache.render(editorTemplate,{
             sessionMessages,
+            cacheBuster,
             ...await theme.context()
         }));
     },

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

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

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

@@ -109,7 +109,6 @@
             "selectionToSubflow": "Auswahl in Subflow umwandeln",
             "flows": "Flow",
             "add": "Hinzufügen",
-            "rename": "Umbenennen",
             "delete": "Löschen",
             "keyboardShortcuts": "Tastenkürzel",
             "login": "Anmelden",

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",
@@ -122,7 +122,6 @@
             "selectionToSubflow": "Selection to Subflow",
             "flows": "Flows",
             "add": "Add",
-            "rename": "Rename",
             "delete": "Delete",
             "keyboardShortcuts": "Keyboard shortcuts",
             "login": "Login",
@@ -130,6 +129,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 +515,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)",
@@ -1227,6 +1231,7 @@
         }
     },
     "contextMenu": {
+        "showActionList": "Show action list",
         "insert": "Insert",
         "node": "Node",
         "junction": "Junction",

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

@@ -122,7 +122,6 @@
       "selectionToSubflow": "Convertir en sous-flux",
       "flows": "Flux",
       "add": "Ajouter",
-      "rename": "Renommer",
       "delete": "Supprimer",
       "keyboardShortcuts": "Raccourcis clavier",
       "login": "Se connecter",

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

@@ -122,7 +122,6 @@
             "selectionToSubflow": "選択部分をサブフロー化",
             "flows": "フロー",
             "add": "フローを新規追加",
-            "rename": "フロー名を変更",
             "delete": "フローを削除",
             "keyboardShortcuts": "ショートカットキーの説明",
             "login": "ログイン",

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

@@ -79,7 +79,6 @@
       "selectionToSubflow": "서브 플로우 선택",
       "flows": "플로우",
       "add": "추가",
-      "rename": "이름변경",
       "delete": "삭제",
       "keyboardShortcuts": "단축키",
       "login": "로그인",

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

@@ -109,7 +109,6 @@
             "selectionToSubflow": "Seleção para subfluxo",
             "flows": "Fluxos",
             "add": "Adicionar",
-            "rename": "Renomear",
             "delete": "Apagar",
             "keyboardShortcuts": "Atalhos do teclado",
             "login": "Ingressar",

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

@@ -95,7 +95,6 @@
             "selectionToSubflow": "Выделение в подпоток",
             "flows": "Потоки",
             "add": "Добавить",
-            "rename": "Переименовать",
             "delete": "Удалить",
             "keyboardShortcuts": "Сочетания клавиш",
             "login": "Войти",

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

@@ -120,7 +120,6 @@
       "selectionToSubflow": "将选择部分更改为子流程",
       "flows": "流程",
       "add": "增加",
-      "rename": "重命名",
       "delete": "删除",
       "keyboardShortcuts": "键盘快捷方式",
       "login": "登录",
@@ -156,7 +155,7 @@
       "moveForwards": "向前移动",
       "showNodeHelp":"显示节点帮助",
       "enableSelectedNodes":"启用当前选中节点",
-      "disableDelectedNodes":"禁用当前选中节点",
+      "disableSelectedNodes":"禁用当前选中节点",
       "showSelectedNodeLabels":"显示选中的节点标签",
       "hideSelectedNodeLabels":"隐藏选中的节点标签"
     }

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

@@ -120,7 +120,6 @@
             "selectionToSubflow": "將選擇部分更改為子流程",
             "flows": "流程",
             "add": "增加",
-            "rename": "重新命名",
             "delete": "刪除",
             "keyboardShortcuts": "鍵盤快速鍵",
             "login": "登入",
@@ -156,7 +155,7 @@
             "moveForwards": "向前移動",
             "showNodeHelp":"顯示節點幫助",
             "enableSelectedNodes":"啟用當前選中節點",
-            "disableDelectedNodes":"禁用當前選中節點",
+            "disableSelectedNodes":"禁用當前選中節點",
             "showSelectedNodeLabels":"顯示選中的節點標簽",
             "hideSelectedNodeLabels":"隱藏選中的節點標簽"
         }

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "3.1.2",
+    "version": "3.1.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

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

@@ -39,15 +39,16 @@
              console.warn(evt,args);
          }
          if (handlers[evt]) {
-             for (var i=0;i<handlers[evt].length;i++) {
+             let cpyHandlers = [...handlers[evt]];
+          
+             for (var i=0;i<cpyHandlers.length;i++) {
                  try {
-                     handlers[evt][i].apply(null, args);
+                     cpyHandlers[i].apply(null, args);
                  } catch(err) {
                      console.warn("RED.events.emit error: ["+evt+"] "+(err.toString()));
                      console.warn(err);
                  }
              }
-
          }
      }
      return {

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

@@ -722,7 +722,7 @@ var RED = (function() {
         menuOptions.push({id:"menu-item-config-nodes",label:RED._("menu.label.displayConfig"),onselect:"core:show-config-tab"});
         menuOptions.push({id:"menu-item-workspace",label:RED._("menu.label.flows"),options:[
             {id:"menu-item-workspace-add",label:RED._("menu.label.add"),onselect:"core:add-flow"},
-            {id:"menu-item-workspace-edit",label:RED._("menu.label.rename"),onselect:"core:edit-flow"},
+            {id:"menu-item-workspace-edit",label:RED._("menu.label.edit"),onselect:"core:edit-flow"},
             {id:"menu-item-workspace-delete",label:RED._("menu.label.delete"),onselect:"core:remove-flow"}
         ]});
         menuOptions.push({id:"menu-item-subflow",label:RED._("menu.label.subflows"), options: [

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

@@ -114,7 +114,7 @@ RED.contextMenu = (function () {
                 }
                 nodeOptions.push(
                     { onselect: 'core:enable-selected-nodes', label: RED._('menu.label.enableSelectedNodes') },
-                    { onselect: 'core:disable-selected-nodes', label: RED._('menu.label.disableDelectedNodes') },
+                    { onselect: 'core:disable-selected-nodes', label: RED._('menu.label.disableSelectedNodes') },
                     null,
                     { onselect: 'core:show-selected-node-labels', label: RED._('menu.label.showSelectedNodeLabels') },
                     { onselect: 'core:hide-selected-node-labels', label: RED._('menu.label.hideSelectedNodeLabels') }

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

@@ -484,7 +484,7 @@ RED.palette = (function() {
         var currentLabel = paletteNode.attr("data-palette-label");
         var currentInfo = paletteNode.attr("data-palette-info");
 
-        if (currentLabel !== sf.name || currentInfo !== sf.info) {
+        if (currentLabel !== sf.name || currentInfo !== sf.info || sf.in.length > 0 || sf.out.length > 0) {
             paletteNode.attr("data-palette-info",sf.info);
             setLabel(sf.type+":"+sf.id,paletteNode,sf.name,RED.utils.renderMarkdown(sf.info||""));
         }

packages/node_modules/@node-red/editor-client/templates/index.mst

@@ -24,24 +24,24 @@
 <title>{{ page.title }}</title>
 <link rel="icon" type="image/png" href="{{ page.favicon }}">
 <link rel="mask-icon" href="{{ page.tabicon.icon }}" color="{{ page.tabicon.colour }}">
-<link rel="stylesheet" href="vendor/jquery/css/base/jquery-ui.min.css?v={{ page.version }}">
-<link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css?v={{ page.version }}">
-<link rel="stylesheet" href="red/style.min.css?v={{ page.version }}">
+<link rel="stylesheet" href="vendor/jquery/css/base/jquery-ui.min.css?v={{ cacheBuster }}">
+<link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css?v={{ cacheBuster }}">
+<link rel="stylesheet" href="red/style.min.css?v={{ cacheBuster }}">
 {{#page.css}}
 <link rel="stylesheet" href="{{.}}">
 {{/page.css}}
 {{#asset.vendorMonaco}}
-<link rel="stylesheet" href="vendor/monaco/style.css?v={{ page.version }}">
+<link rel="stylesheet" href="vendor/monaco/style.css?v={{ cacheBuster }}">
 {{/asset.vendorMonaco}}
 </head>
 <body spellcheck="false">
 <div id="red-ui-editor"></div>
-<script src="vendor/vendor.js?v={{ page.version }}"></script>
+<script src="vendor/vendor.js?v={{ cacheBuster }}"></script>
 {{#asset.vendorMonaco}}
-<script src="{{ asset.vendorMonaco }}?v={{ page.version }}"></script>
+<script src="{{ asset.vendorMonaco }}?v={{ cacheBuster }}"></script>
 {{/asset.vendorMonaco}}
-<script src="{{ asset.red }}?v={{ page.version }}"></script>
-<script src="{{ asset.main }}?v={{ page.version }}"></script>
+<script src="{{ asset.red }}?v={{ cacheBuster }}"></script>
+<script src="{{ asset.main }}?v={{ cacheBuster }}"></script>
 {{# page.scripts }}
 <script src="{{.}}"></script>
 {{/ page.scripts }}

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "3.1.2",
+    "version": "3.1.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "3.1.2",
+    "version": "3.1.3",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "3.1.2",
+        "@node-red/util": "3.1.3",
         "clone": "2.1.2",
         "fs-extra": "11.1.1",
         "semver": "7.5.4",

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

@@ -27,6 +27,7 @@ var express = require("express");
 var path = require('path');
 var fs = require("fs");
 var os = require("os");
+const crypto = require("crypto")
 
 const {log,i18n,events,exec,util,hooks} = require("@node-red/util");
 
@@ -51,7 +52,7 @@ var adminApi = {
 var nodeApp;
 var adminApp;
 var server;
-
+let userSettings;
 
 /**
  * Initialise the runtime module.
@@ -61,8 +62,9 @@ var server;
  *                              better abstracted.
  * @memberof @node-red/runtime
  */
-function init(userSettings,httpServer,_adminApi) {
+function init(_userSettings,httpServer,_adminApi) {
     server = httpServer;
+    userSettings = _userSettings
 
     if (server && server.on) {
         // Add a listener to the upgrade event so that we can properly timeout connection
@@ -134,7 +136,12 @@ function start() {
         .then(function() { return settings.load(storage)})
         .then(function() { return library.init(runtime)})
         .then(function() {
-
+            if (settings.available()) {
+                if (settings.get('instanceId') === undefined) {
+                    settings.set('instanceId', crypto.randomBytes(8).toString('hex'))
+                }
+                userSettings.instanceId = settings.get('instanceId') || ''
+            }
             if (log.metric()) {
                 runtimeMetricInterval = setInterval(function() {
                     reportMetrics();

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "3.1.2",
+    "version": "3.1.3",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "3.1.2",
-        "@node-red/util": "3.1.2",
+        "@node-red/registry": "3.1.3",
+        "@node-red/util": "3.1.3",
         "async-mutex": "0.4.0",
         "clone": "2.1.2",
         "express": "4.18.2",

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "3.1.2",
+    "version": "3.1.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/node-red/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "3.1.2",
+    "version": "3.1.3",
     "description": "Low-code programming for event-driven applications",
     "homepage": "https://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "3.1.2",
-        "@node-red/runtime": "3.1.2",
-        "@node-red/util": "3.1.2",
-        "@node-red/nodes": "3.1.2",
+        "@node-red/editor-api": "3.1.3",
+        "@node-red/runtime": "3.1.3",
+        "@node-red/util": "3.1.3",
+        "@node-red/nodes": "3.1.3",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.18.2",

test/unit/@node-red/editor-api/lib/editor/ui_spec.js

@@ -29,7 +29,7 @@ describe("api/editor/ui", function() {
     var app;
 
     before(function() {
-        ui.init({
+        ui.init({}, {
             nodes: {
                 getIcon: function(opts) {
                     return new Promise(function(resolve,reject) {