From 711ec39327fce0306a9b33e7f057cd2db265f492 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Fri, 6 Aug 2021 21:16:34 +0100 Subject: [PATCH 1/7] Fix editor-client package.json The main entry pointed to non-existant entry. Also fixed error when loading nodes lazily --- packages/node_modules/@node-red/editor-client/package.json | 2 +- .../node_modules/@node-red/editor-client/src/js/ui/tab-help.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json index ee3f1d8ad..ce146d418 100644 --- a/packages/node_modules/@node-red/editor-client/package.json +++ b/packages/node_modules/@node-red/editor-client/package.json @@ -14,5 +14,5 @@ "name": "Dave Conway-Jones" } ], - "main": "./lib/index.js" + "main": "./index.js" } diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js index 6add6abe9..b15b45cc0 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js @@ -233,7 +233,7 @@ RED.sidebar.help = (function() { var div = $('
',{class:"red-ui-node-list-item"}); var icon = RED.utils.createNodeIcon(n).appendTo(div); var label = n.name; - if (!label && n._def.paletteLabel) { + if (!label && n._def && n._def.paletteLabel) { try { label = (typeof n._def.paletteLabel === "function" ? n._def.paletteLabel.call(n._def) : n._def.paletteLabel)||""; } catch (err) { From 1aaab2a81407c669ba1705b03c2d4925e5b6aaa6 Mon Sep 17 00:00:00 2001 From: Sam Machin Date: Thu, 12 Aug 2021 16:41:32 +0100 Subject: [PATCH 2/7] change template characters Added note about changing template characters --- .../@node-red/nodes/locales/en-US/function/80-template.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html index 95fa14225..196d14c74 100644 --- a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html +++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html @@ -47,5 +47,9 @@ {{global.name}}, or for persistable store store use {{flow[store].name}} or {{global[store].name}}.

Note: By default, mustache will escape any non-alphanumeric or HTML entities in the values it substitutes. - To prevent this, use {{{triple}}} braces. + To prevent this, use {{{triple}}} braces.

+

You can change the characters used for templating (if for example you need to use {{ }} within your content) by adding a line to the top of the template itself, + to change to use [[ ]] add: + {{=[[ ]]=}} + To the start of your template.

From 702dfa4b79a2bf83d95815bdb5867a0d706c927a Mon Sep 17 00:00:00 2001 From: Sam Machin Date: Tue, 31 Aug 2021 16:59:32 +0100 Subject: [PATCH 3/7] Update packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html Co-authored-by: Nick O'Leary --- .../nodes/locales/en-US/function/80-template.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html index 196d14c74..d2ffe43f9 100644 --- a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html +++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html @@ -48,8 +48,8 @@ {{global[store].name}}.

Note: By default, mustache will escape any non-alphanumeric or HTML entities in the values it substitutes. To prevent this, use {{{triple}}} braces.

-

You can change the characters used for templating (if for example you need to use {{ }} within your content) by adding a line to the top of the template itself, - to change to use [[ ]] add: - {{=[[ ]]=}} - To the start of your template.

+

If you need to use {{ }} within your content, you can change the characters + used to mark the templated sections. For example, to use [[ ]] + instead, add the following line to the top of the template:

+ 
{{=[[ ]]=}}
From 17f98294980daed82d16e2bdcfacc030492f61fd Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Fri, 3 Sep 2021 13:00:06 +0100 Subject: [PATCH 4/7] Fix for incorrect tcpout connection count to Close #3098 seems to need dummy data receiver in order to recognise other callbacks. --- .../node_modules/@node-red/nodes/core/network/31-tcpin.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js index 11d533619..a83e7a37e 100644 --- a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js +++ b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js @@ -372,12 +372,13 @@ module.exports = function(RED) { socket.setKeepAlive(true,120000); if (socketTimeout !== null) { socket.setTimeout(socketTimeout); } node.log(RED._("tcpin.status.connection-from",{host:socket.remoteAddress, port:socket.remotePort})); - connectedSockets.push(socket); - node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.length})}); socket.on('timeout', function() { node.log(RED._("tcpin.errors.timeout",{port:node.port})); socket.end(); }); + socket.on('data', function(d) { + // console.log("DATA",d) + }); socket.on('close',function() { node.log(RED._("tcpin.status.connection-closed",{host:socket.remoteAddress, port:socket.remotePort})); connectedSockets.splice(connectedSockets.indexOf(socket),1); @@ -388,6 +389,8 @@ module.exports = function(RED) { connectedSockets.splice(connectedSockets.indexOf(socket),1); node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.length})}); }); + connectedSockets.push(socket); + node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.length})}); }); node.on("input", function(msg, nodeSend, nodeDone) { From bbf066f030b54b61a3a37088ea9a9ef3c41a197c Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Fri, 10 Sep 2021 08:33:07 +0100 Subject: [PATCH 5/7] Fixes to fs promises so that electron version runs --- packages/node_modules/@node-red/registry/lib/library.js | 4 ++-- packages/node_modules/@node-red/util/lib/i18n.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/node_modules/@node-red/registry/lib/library.js b/packages/node_modules/@node-red/registry/lib/library.js index b305456a5..0b242b270 100644 --- a/packages/node_modules/@node-red/registry/lib/library.js +++ b/packages/node_modules/@node-red/registry/lib/library.js @@ -14,7 +14,7 @@ * limitations under the License. **/ -var fs = require('fs-extra'); +var fs = require('fs'); var fspath = require('path'); var runtime; @@ -25,7 +25,7 @@ var exampleFlows = null; async function getFlowsFromPath(path) { var result = {}; var validFiles = []; - return fs.readdir(path).then(files => { + return fs.promises.readdir(path).then(files => { var promises = []; if (files) { files.forEach(function(file) { diff --git a/packages/node_modules/@node-red/util/lib/i18n.js b/packages/node_modules/@node-red/util/lib/i18n.js index 96a66ba1d..e65ede8e9 100644 --- a/packages/node_modules/@node-red/util/lib/i18n.js +++ b/packages/node_modules/@node-red/util/lib/i18n.js @@ -23,7 +23,7 @@ var i18n = require("i18next"); var path = require("path"); -var fs = require("fs-extra"); +var fs = require("fs"); var defaultLang = "en-US"; @@ -50,7 +50,7 @@ async function registerMessageCatalog(namespace,dir,file) { return initPromise.then(function() { return new Promise((resolve,reject) => { resourceMap[namespace] = { basedir:dir, file:file, lngs: []}; - fs.readdir(dir,function(err, files) { + fs.promises.readdir(dir,function(err, files) { if (err) { resolve(); } else { @@ -89,7 +89,7 @@ async function readFile(lng, ns) { return resourceCache[ns][lng]; } else if (resourceMap[ns]) { const file = path.join(resourceMap[ns].basedir, lng, resourceMap[ns].file); - const content = await fs.readFile(file, "utf8"); + const content = await fs.promises.readFile(file, "utf8"); resourceCache[ns] = resourceCache[ns] || {}; resourceCache[ns][lng] = JSON.parse(content.replace(/^\uFEFF/, '')); var baseLng = lng.split('-')[0]; From 4f23847546981324568b24ac406e1cbd7631b200 Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Thu, 16 Sep 2021 16:22:01 +0100 Subject: [PATCH 6/7] Fix UDP node to not not use port if unassigned --- packages/node_modules/@node-red/nodes/core/network/32-udp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/core/network/32-udp.js b/packages/node_modules/@node-red/nodes/core/network/32-udp.js index 894c19d77..d42d3a7c3 100644 --- a/packages/node_modules/@node-red/nodes/core/network/32-udp.js +++ b/packages/node_modules/@node-red/nodes/core/network/32-udp.js @@ -178,7 +178,7 @@ module.exports = function(RED) { var sock; var p = this.outport || this.port || "0"; node.tout = setTimeout(function() { - if (udpInputPortsInUse[p]) { + if ((p != 0) && udpInputPortsInUse[p]) { sock = udpInputPortsInUse[p]; if (node.multicast != "false") { sock.setBroadcast(true); From 2fe78cf971c301d580896b51c57b31c20e38a386 Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Sat, 25 Sep 2021 14:51:47 +0100 Subject: [PATCH 7/7] Update packages/node_modules/@node-red/util/lib/i18n.js Co-authored-by: Nick O'Leary --- packages/node_modules/@node-red/util/lib/i18n.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/util/lib/i18n.js b/packages/node_modules/@node-red/util/lib/i18n.js index e65ede8e9..ef472c659 100644 --- a/packages/node_modules/@node-red/util/lib/i18n.js +++ b/packages/node_modules/@node-red/util/lib/i18n.js @@ -50,7 +50,7 @@ async function registerMessageCatalog(namespace,dir,file) { return initPromise.then(function() { return new Promise((resolve,reject) => { resourceMap[namespace] = { basedir:dir, file:file, lngs: []}; - fs.promises.readdir(dir,function(err, files) { + fs.readdir(dir,function(err, files) { if (err) { resolve(); } else {