diff --git a/CHANGELOG.md b/CHANGELOG.md index b453108b3..9bb84978a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,12 @@ Nodes - Add expand editor button to Template node - Update catch/status nodes to use selectNodes api and treeList +#### 0.20.7: Maintenance Release + + - Update jsonata to 1.6.5 which should fix #2183 + - Ensure the subflow stop promise is waiting for before restarting + - Properly escape node types in palette + #### 0.20.6: Maintenance Release - Revealing node position needs to account for zoom level Fixes #2172 diff --git a/package.json b/package.json index 400fc0902..b68208e78 100644 --- a/package.json +++ b/package.json @@ -37,38 +37,38 @@ "cron": "1.7.1", "denque": "1.4.1", "express": "4.17.1", - "express-session": "1.16.1", - "fs-extra": "8.0.1", + "express-session": "1.16.2", + "fs-extra": "8.1.0", "fs.notify": "0.0.4", - "hash-sum": "1.0.2", + "hash-sum": "2.0.0", "https-proxy-agent": "2.2.1", "i18next": "15.1.2", - "iconv-lite": "0.4.24", + "iconv-lite": "0.5.0", "is-utf8": "0.2.1", "js-yaml": "3.13.1", "json-stringify-safe": "5.0.1", - "jsonata": "1.6.4", + "jsonata": "1.6.5", "media-typer": "1.1.0", "memorystore": "1.6.1", "mime": "2.4.4", "mqtt": "2.18.8", "multer": "1.4.1", "mustache": "3.0.1", - "node-red-node-email": "^1.4.0", + "node-red-node-email": "^1.6.2", "node-red-node-feedparser": "^0.1.14", "node-red-node-rbe": "^0.2.4", "node-red-node-sentiment": "^0.1.3", "node-red-node-tail": "^0.0.2", - "node-red-node-twitter": "^1.1.4", + "node-red-node-twitter": "^1.1.5", "nopt": "4.0.1", "oauth2orize": "1.11.0", "on-headers": "1.0.2", "passport": "0.4.0", "passport-http-bearer": "1.0.1", "passport-oauth2-client-password": "0.1.2", - "raw-body": "2.4.0", + "raw-body": "2.4.1", "request": "2.88.0", - "semver": "6.1.1", + "semver": "6.2.0", "uglify-js": "3.6.0", "when": "3.7.8", "ws": "6.2.1", @@ -78,7 +78,7 @@ "bcrypt": "3.0.6" }, "devDependencies": { - "grunt": "~1.0.3", + "grunt": "~1.0.4", "grunt-chmod": "~1.1.1", "grunt-cli": "~1.3.2", "grunt-concurrent": "~2.3.1", diff --git a/packages/node_modules/@node-red/editor-api/lib/auth/tokens.js b/packages/node_modules/@node-red/editor-api/lib/auth/tokens.js index 31c12d228..6e867d7df 100644 --- a/packages/node_modules/@node-red/editor-api/lib/auth/tokens.js +++ b/packages/node_modules/@node-red/editor-api/lib/auth/tokens.js @@ -56,7 +56,7 @@ function expireSessions() { } if (nextExpiry < Number.MAX_SAFE_INTEGER) { // Allow 5 seconds grace - expiryTimeout = setTimeout(expireSessions,(nextExpiry - Date.now()) + 5000) + expiryTimeout = setTimeout(expireSessions,Math.min(2147483647,(nextExpiry - Date.now()) + 5000)) } if (modified) { return storage.saveSessions(sessions); @@ -129,7 +129,7 @@ module.exports = { sessions[accessToken] = session; if (!expiryTimeout) { - expiryTimeout = setTimeout(expireSessions,(accessTokenExpiresAt - Date.now()) + 5000) + expiryTimeout = setTimeout(expireSessions,Math.min(2147483647,(accessTokenExpiresAt - Date.now()) + 5000)) } return storage.saveSessions(sessions).then(function() { diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json index 8497fd8b6..e4b3b1f69 100644 --- a/packages/node_modules/@node-red/editor-api/package.json +++ b/packages/node_modules/@node-red/editor-api/package.json @@ -22,7 +22,7 @@ "body-parser": "1.19.0", "clone": "2.1.2", "cors": "2.8.5", - "express-session": "1.16.1", + "express-session": "1.16.2", "express": "4.17.1", "memorystore": "1.6.1", "mime": "2.4.4", @@ -35,6 +35,6 @@ "ws": "6.2.1" }, "optionalDependencies": { - "bcrypt": "3.0.5" + "bcrypt": "3.0.6" } } diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json index 86a901610..55de27d7c 100644 --- a/packages/node_modules/@node-red/nodes/package.json +++ b/packages/node_modules/@node-red/nodes/package.json @@ -24,9 +24,9 @@ "cors": "2.8.5", "cron": "1.7.1", "denque": "1.4.1", - "fs-extra": "8.0.1", + "fs-extra": "8.1.0", "fs.notify": "0.0.4", - "hash-sum": "1.0.2", + "hash-sum": "2.0.0", "https-proxy-agent": "2.2.1", "is-utf8": "0.2.1", "js-yaml": "3.13.1", @@ -35,10 +35,10 @@ "multer": "1.4.1", "mustache": "3.0.1", "on-headers": "1.0.2", - "raw-body": "2.4.0", + "raw-body": "2.4.1", "request": "2.88.0", "ws": "6.2.1", "xml2js": "0.4.19", - "iconv-lite": "0.4.24" + "iconv-lite": "0.5.0" } } diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json index d7da7e017..04d7de24e 100644 --- a/packages/node_modules/@node-red/registry/package.json +++ b/packages/node_modules/@node-red/registry/package.json @@ -17,7 +17,7 @@ ], "dependencies": { "@node-red/util": "1.0.0-beta.2", - "semver": "6.1.1", + "semver": "6.2.0", "uglify-js": "3.6.0", "when": "3.7.8" } diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json index 6a76c32a3..a100b45bf 100644 --- a/packages/node_modules/@node-red/runtime/package.json +++ b/packages/node_modules/@node-red/runtime/package.json @@ -20,7 +20,7 @@ "@node-red/util": "1.0.0-beta.2", "clone": "2.1.2", "express": "4.17.1", - "fs-extra": "8.0.1", + "fs-extra": "8.1.0", "json-stringify-safe": "5.0.1", "when": "3.7.8" } diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json index f7b42ffc8..d0d6275a8 100644 --- a/packages/node_modules/@node-red/util/package.json +++ b/packages/node_modules/@node-red/util/package.json @@ -18,7 +18,7 @@ "clone": "2.1.2", "i18next": "15.1.2", "json-stringify-safe": "5.0.1", - "jsonata": "1.6.4", + "jsonata": "1.6.5", "when": "3.7.8" } } diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json index cf91cdf8b..4ff73131f 100644 --- a/packages/node_modules/node-red/package.json +++ b/packages/node_modules/node-red/package.json @@ -38,18 +38,18 @@ "basic-auth": "2.0.1", "bcryptjs": "2.4.3", "express": "4.17.1", - "fs-extra": "8.0.1", - "node-red-node-email": "^1.4.0", + "fs-extra": "8.1.0", + "node-red-node-email": "^1.6.2", "node-red-node-feedparser": "^0.1.14", "node-red-node-rbe": "^0.2.4", "node-red-node-sentiment": "^0.1.3", "node-red-node-tail": "^0.0.2", - "node-red-node-twitter": "^1.1.4", + "node-red-node-twitter": "^1.1.5", "nopt": "4.0.1", - "semver": "6.1.1" + "semver": "6.2.0" }, "optionalDependencies": { - "bcrypt": "3.0.5" + "bcrypt": "3.0.6" }, "engines": { "node": ">=8" diff --git a/test/nodes/core/io/21-httprequest_spec.js b/test/nodes/core/io/21-httprequest_spec.js index 9a32cef7a..00caa9867 100644 --- a/test/nodes/core/io/21-httprequest_spec.js +++ b/test/nodes/core/io/21-httprequest_spec.js @@ -1291,6 +1291,7 @@ describe('HTTP Request Node', function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); n2.on("input", function(msg) { + console.log(msg.payload); try { msg.payload.headers.should.have.property('content-type').which.startWith('application/json'); msg.payload.headers.should.not.have.property('x-node-red-request-node'); @@ -1301,7 +1302,11 @@ describe('HTTP Request Node', function() { }); // Pass in a headers property with an unmodified x-node-red-request-node hash // This should cause the node to ignore the headers - n1.receive({payload:{foo:"bar"}, headers: { 'content-type': 'text/plain', "x-node-red-request-node":"67690139"}}); + + var headers = { 'content-type': 'text/plain' }; + headers['x-node-red-request-node'] = require("hash-sum")(headers); + + n1.receive({payload:{foo:"bar"}, headers: headers}); }); });