frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into diagnostics

Browse Source
This commit is contained in:
Stephen McLaughlin
2022-04-27 12:08:32 +01:00
committed by GitHub
parent 4054d0eca7 e8f20285af
commit e714ff35c4
210 changed files with 26309 additions and 21234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/runtime/lib/flows/Flow.js vendored
View File

@@ -582,7 +582,7 @@ class Flow {
reportingNode = node;
}
if (!muteStatusEvent) {
if (statusMessage.hasOwnProperty("text") && typeof(statusMessage.text !== "string")) {
if (statusMessage.hasOwnProperty("text") && typeof statusMessage.text !== "string") {
try {
statusMessage.text = statusMessage.text.toString();
}

8
packages/node_modules/@node-red/runtime/lib/index.js vendored
View File

@@ -207,8 +207,12 @@ function start() {
if (settings.readOnly){
log.info(log._("settings.readonly-mode"))
}
if (settings.httpStatic) {
log.info(log._("runtime.paths.httpStatic",{path:path.resolve(settings.httpStatic)}));
if (settings.httpStatic && settings.httpStatic.length) {
for (let si = 0; si < settings.httpStatic.length; si++) {
let p = path.resolve(settings.httpStatic[si].path);
let r = settings.httpStatic[si].root || "/";
log.info(log._("runtime.paths.httpStatic",{path:`${p} > ${r}`}));
}
}
return redNodes.loadContextsPlugin().then(function () {
redNodes.loadFlows().then(redNodes.startFlows).catch(function(err) {});

10
packages/node_modules/@node-red/runtime/lib/nodes/credentials.js vendored
View File

@@ -239,7 +239,15 @@ var api = module.exports = {
throw error;
}
} else {
credentialCache = credentials;
if (encryptionEnabled) {
// Our config expects the credentials to be encrypted but the encrypted object is not found
log.warn(log._("nodes.credentials.encryptedNotFound"))
credentialCache = credentials;
} else {
// credentialSecret is set to False
log.warn(log._("nodes.credentials.unencrypted"))
credentialCache = credentials;
}
}
if (clearInvalidFlag) {
// TODO: this delves too deep into Project structure

4
packages/node_modules/@node-red/runtime/locales/en-US/runtime.json vendored
View File

@@ -104,7 +104,9 @@
"error":"Error loading credentials: __message__",
"error-saving":"Error saving credentials: __message__",
"not-registered": "Credential type '__type__' is not registered",
"system-key-warning": "\n\n---------------------------------------------------------------------\nYour flow credentials file is encrypted using a system-generated key.\n\nIf the system-generated key is lost for any reason, your credentials\nfile will not be recoverable, you will have to delete it and re-enter\nyour credentials.\n\nYou should set your own key using the 'credentialSecret' option in\nyour settings file. Node-RED will then re-encrypt your credentials\nfile using your chosen key the next time you deploy a change.\n---------------------------------------------------------------------\n"
"system-key-warning": "\n\n---------------------------------------------------------------------\nYour flow credentials file is encrypted using a system-generated key.\n\nIf the system-generated key is lost for any reason, your credentials\nfile will not be recoverable, you will have to delete it and re-enter\nyour credentials.\n\nYou should set your own key using the 'credentialSecret' option in\nyour settings file. Node-RED will then re-encrypt your credentials\nfile using your chosen key the next time you deploy a change.\n---------------------------------------------------------------------\n",
"unencrypted" : "Using unencrypted credentials",
"encryptedNotFound" : "Encrypted credentials not found"
},
"flows": {
"safe-mode": "Flows stopped in safe mode. Deploy to start.",