From ad788fbed1cb942ea0d93f586adfefe9e860a543 Mon Sep 17 00:00:00 2001 From: Kristian Heljas Date: Thu, 8 Apr 2021 21:09:44 +0300 Subject: [PATCH 1/5] Function node: describe `node.outputCount` in help text --- .../@node-red/nodes/locales/en-US/function/10-function.html | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html index 891801bf9..02e85922e 100644 --- a/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html +++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html @@ -56,6 +56,7 @@

Using environment variables

Environment variables can be accessed using env.get("MY_ENV_VAR").

From 13406e76de045117afad9beae1d203b953b44f3d Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 12 Apr 2021 10:05:44 +0100 Subject: [PATCH 2/5] Ensure theme login image is passed through to api response Fixes #2929 --- .../node_modules/@node-red/editor-api/lib/auth/index.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/node_modules/@node-red/editor-api/lib/auth/index.js b/packages/node_modules/@node-red/editor-api/lib/auth/index.js index d4ec10f08..fb95ede7b 100644 --- a/packages/node_modules/@node-red/editor-api/lib/auth/index.js +++ b/packages/node_modules/@node-red/editor-api/lib/auth/index.js @@ -90,7 +90,7 @@ function getToken(req,res,next) { return server.token()(req,res,next); } -function login(req,res) { +async function login(req,res) { var response = {}; if (settings.adminAuth) { var mergedAdminAuth = Object.assign({}, settings.adminAuth, settings.adminAuth.module); @@ -116,8 +116,9 @@ function login(req,res) { response.prompts[0].image = theme.serveFile('/login/',mergedAdminAuth.strategy.image); } } - if (theme.context().login && theme.context().login.image) { - response.image = theme.context().login.image; + let themeContext = await theme.context(); + if (themeContext.login && themeContext.login.image) { + response.image = themeContext.login.image; } } res.json(response); From 51aaf1b1503c50d111bc8d3080a888c834ce49f2 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 12 Apr 2021 10:34:43 +0100 Subject: [PATCH 3/5] Handle package.json without dependencies section --- packages/node_modules/@node-red/registry/lib/localfilesystem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/registry/lib/localfilesystem.js b/packages/node_modules/@node-red/registry/lib/localfilesystem.js index 9e08c4c53..62080b4a8 100644 --- a/packages/node_modules/@node-red/registry/lib/localfilesystem.js +++ b/packages/node_modules/@node-red/registry/lib/localfilesystem.js @@ -472,7 +472,7 @@ function getPackageList() { try { var userPackage = path.join(settings.userDir,"package.json"); var pkg = JSON.parse(fs.readFileSync(userPackage,"utf-8")); - return pkg.dependencies; + return pkg.dependencies || {}; } catch(err) { log.error(err); } From 5028377d45a7cb6f7e3998782eef905e499eefcf Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 12 Apr 2021 11:48:10 +0100 Subject: [PATCH 4/5] Fix MQTT Broker TLS config row layout Fixes #2927 --- .../node_modules/@node-red/nodes/core/network/10-mqtt.html | 4 ++-- .../node_modules/@node-red/nodes/locales/de/messages.json | 2 +- .../node_modules/@node-red/nodes/locales/ko/messages.json | 2 +- .../node_modules/@node-red/nodes/locales/ru/messages.json | 2 +- .../node_modules/@node-red/nodes/locales/zh-CN/messages.json | 2 +- .../node_modules/@node-red/nodes/locales/zh-TW/messages.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html index ee5e973b0..7b96aaf2f 100644 --- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html +++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html @@ -186,8 +186,8 @@
- - + +
diff --git a/packages/node_modules/@node-red/nodes/locales/de/messages.json b/packages/node_modules/@node-red/nodes/locales/de/messages.json index aabab9f79..38fe83ce6 100755 --- a/packages/node_modules/@node-red/nodes/locales/de/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/de/messages.json @@ -363,7 +363,7 @@ "keepalive": "Keep-Alive", "cleansession": "Bereinigte Sitzung (clean session) verwenden", "cleanstart": "Verwende bereinigten Start", - "use-tls": "Sichere Verbindung (SSL/TLS) verwenden", + "use-tls": "TLS", "tls-config": "TLS-Konfiguration", "verify-server-cert": "Server-Zertifikat überprüfen", "compatmode": "MQTT 3.1 unterstützen", diff --git a/packages/node_modules/@node-red/nodes/locales/ko/messages.json b/packages/node_modules/@node-red/nodes/locales/ko/messages.json index 8e3a4f325..74a7885d2 100755 --- a/packages/node_modules/@node-red/nodes/locales/ko/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/ko/messages.json @@ -333,7 +333,7 @@ "port": "포트", "keepalive": "킵 얼라이브 시간", "cleansession": "세션 초기화", - "use-tls": "SSL/TLS접속을 사용", + "use-tls": "사용TLS", "tls-config": "TLS설정", "verify-server-cert": "서버인증서를 확인", "compatmode": "구 MQTT 3.1서포트" diff --git a/packages/node_modules/@node-red/nodes/locales/ru/messages.json b/packages/node_modules/@node-red/nodes/locales/ru/messages.json index 08e2b6b73..f32160bf1 100755 --- a/packages/node_modules/@node-red/nodes/locales/ru/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/ru/messages.json @@ -352,7 +352,7 @@ "port": "Порт", "keepalive": "Keep-alive время (сек)", "cleansession": "Использовать чистую сессию", - "use-tls": "Включить безопасное (SSL/TLS) соединение", + "use-tls": "TLS", "tls-config":"Конфигурация TLS", "verify-server-cert":"Проверить сертификат сервера", "compatmode": "Использовать устаревшую поддержку MQTT 3.1" diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json b/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json index ee074c0fe..e2afa0fc1 100644 --- a/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json @@ -353,7 +353,7 @@ "port": "端口", "keepalive": "Keepalive计时(秒)", "cleansession": "使用新的会话", - "use-tls": "使用安全连接 (SSL/TLS)", + "use-tls": "使用 TLS", "tls-config": "TLS 设置", "verify-server-cert": "验证服务器证书", "compatmode": "使用旧式MQTT 3.1支持" diff --git a/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json b/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json index de48fe9f9..1335e9ff2 100644 --- a/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json @@ -353,7 +353,7 @@ "port": "埠", "keepalive": "Keepalive計時(秒)", "cleansession": "使用新的會話", - "use-tls": "使用安全連接 (SSL/TLS)", + "use-tls": "使用 TLS", "tls-config": "TLS 設置", "verify-server-cert": "驗證伺服器憑證", "compatmode": "使用舊式MQTT 3.1支援" From e44131f97a828943aa0da670924ba8bdac10a1ba Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 12 Apr 2021 12:08:07 +0100 Subject: [PATCH 5/5] Update function node help reference to node properties --- .../@node-red/nodes/locales/en-US/function/10-function.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html index 02e85922e..dd13b6732 100644 --- a/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html +++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html @@ -52,7 +52,7 @@ pass msg as a second argument to node.error:

node.error("Error",msg);

Accessing Node Information

-

In the function block, id and name of the node can be referenced using the following properties:

+

The following properties are available to access information about the node:

  • node.id - id of the node
  • node.name - name of the node