fix: remove outdated Node 11+ check

This commit is contained in:
Rotzbua 2024-05-12 22:49:58 +02:00
parent 0e0bba25c1
commit d706c9cb37
No known key found for this signature in database
GPG Key ID: C69022D529C17845
8 changed files with 24 additions and 36 deletions

View File

@ -56,7 +56,6 @@
"refresh-interval": "Erneuerung der https-Einstellungen erfolgt alle __interval__ Stunden", "refresh-interval": "Erneuerung der https-Einstellungen erfolgt alle __interval__ Stunden",
"settings-refreshed": "https-Einstellungen wurden erneuert", "settings-refreshed": "https-Einstellungen wurden erneuert",
"refresh-failed": "Erneuerung der https-Einstellungen fehlgeschlagen: __message__", "refresh-failed": "Erneuerung der https-Einstellungen fehlgeschlagen: __message__",
"nodejs-version": "httpsRefreshInterval erfordert Node.js 11 oder höher",
"function-required": "httpsRefreshInterval erfordert die https-Eigenschaft in Form einer Funktion" "function-required": "httpsRefreshInterval erfordert die https-Eigenschaft in Form einer Funktion"
} }
}, },

View File

@ -58,7 +58,6 @@
"refresh-interval": "Refreshing https settings every __interval__ hours", "refresh-interval": "Refreshing https settings every __interval__ hours",
"settings-refreshed": "Server https settings have been refreshed", "settings-refreshed": "Server https settings have been refreshed",
"refresh-failed": "Failed to refresh https settings: __message__", "refresh-failed": "Failed to refresh https settings: __message__",
"nodejs-version": "httpsRefreshInterval requires Node.js 11 or later",
"function-required": "httpsRefreshInterval requires https property to be a function" "function-required": "httpsRefreshInterval requires https property to be a function"
} }
}, },

View File

@ -57,7 +57,6 @@
"refresh-interval": "Actualizando la configuración HTTPS cada __interval__ horas", "refresh-interval": "Actualizando la configuración HTTPS cada __interval__ horas",
"settings-refreshed": "La configuración HTTPS del servidor se ha actualizado", "settings-refreshed": "La configuración HTTPS del servidor se ha actualizado",
"refresh-failed": "No se pudo actualizar la configuración HTTPS: __message__", "refresh-failed": "No se pudo actualizar la configuración HTTPS: __message__",
"nodejs-version": "httpsRefreshInterval requiere Node.js 11 o superior",
"function-required": "httpsRefreshInterval requiere que la propiedad HTTPS sea una función" "function-required": "httpsRefreshInterval requiere que la propiedad HTTPS sea una función"
} }
}, },

View File

@ -58,7 +58,6 @@
"refresh-interval": "Actualisation des paramètres https toutes les __interval__ heures", "refresh-interval": "Actualisation des paramètres https toutes les __interval__ heures",
"settings-refreshed": "Les paramètres https du serveur ont été actualisés", "settings-refreshed": "Les paramètres https du serveur ont été actualisés",
"refresh-failed": "Échec de l'actualisation des paramètres https : __message__", "refresh-failed": "Échec de l'actualisation des paramètres https : __message__",
"nodejs-version": "httpsRefreshInterval nécessite Node.js 11 ou version ultérieure",
"function-required": "httpsRefreshInterval nécessite que la propriété https soit une fonction" "function-required": "httpsRefreshInterval nécessite que la propriété https soit une fonction"
} }
}, },

View File

@ -58,7 +58,6 @@
"refresh-interval": "__interval__ 時間毎にhttps設定を更新します", "refresh-interval": "__interval__ 時間毎にhttps設定を更新します",
"settings-refreshed": "サーバのhttps設定が更新されました", "settings-refreshed": "サーバのhttps設定が更新されました",
"refresh-failed": "https設定の更新で失敗しました: __message__", "refresh-failed": "https設定の更新で失敗しました: __message__",
"nodejs-version": "httpsRefreshIntervalにはNode.js 11以降が必要です",
"function-required": "httpsRefreshIntervalでは、httpsプロパティはfunctionである必要があります" "function-required": "httpsRefreshIntervalでは、httpsプロパティはfunctionである必要があります"
} }
}, },

View File

@ -57,7 +57,6 @@
"refresh-interval": "Atualizando as configurações de https a cada __interval__ hora(s)", "refresh-interval": "Atualizando as configurações de https a cada __interval__ hora(s)",
"settings-refreshed": "As configurações https do servidor foram atualizadas", "settings-refreshed": "As configurações https do servidor foram atualizadas",
"refresh-failed": "Falha ao atualizar as configurações https: __message__", "refresh-failed": "Falha ao atualizar as configurações https: __message__",
"nodejs-version": "httpsRefreshInterval requer Node.js 11 ou posterior",
"function-required": "httpsRefreshInterval requer que a propriedade https seja uma função" "function-required": "httpsRefreshInterval requer que a propriedade https seja uma função"
} }
}, },

View File

@ -55,7 +55,6 @@
"refresh-interval": "Обновление настроек https каждые __interval__ часов", "refresh-interval": "Обновление настроек https каждые __interval__ часов",
"settings-refreshed": "Настройки сервера https обновлены", "settings-refreshed": "Настройки сервера https обновлены",
"refresh-failed": "Не удалось обновить настройки https: __message__", "refresh-failed": "Не удалось обновить настройки https: __message__",
"nodejs-version": "httpsRefreshInterval требует Node.js 11 или выше",
"function-required": "httpsRefreshInterval требует, чтобы свойство https было функцией" "function-required": "httpsRefreshInterval требует, чтобы свойство https было функцией"
} }
}, },

View File

@ -240,39 +240,34 @@ httpsPromise.then(function(startupHttps) {
// Max value based on (2^31-1)ms - the max that setInterval can accept // Max value based on (2^31-1)ms - the max that setInterval can accept
httpsRefreshInterval = 596; httpsRefreshInterval = 596;
} }
// Check whether setSecureContext is available (Node.js 11+) // Check whether `http` is a callable function
if (server.setSecureContext) { if (typeof settings.https === "function") {
// Check whether `http` is a callable function delayedLogItems.push({type:"info", id:"server.https.refresh-interval", params:{interval:httpsRefreshInterval}});
if (typeof settings.https === "function") { setInterval(function () {
delayedLogItems.push({type:"info", id:"server.https.refresh-interval", params:{interval:httpsRefreshInterval}}); try {
setInterval(function () { // Get the result of the function, because createServer doesn't accept functions as input
try { Promise.resolve(settings.https()).then(function(refreshedHttps) {
// Get the result of the function, because createServer doesn't accept functions as input if (refreshedHttps) {
Promise.resolve(settings.https()).then(function(refreshedHttps) { // The key/cert needs to be updated in the NodeJs http(s) server, when no key/cert is yet available or when the key/cert has changed.
if (refreshedHttps) { // Note that the refreshed key/cert can be supplied as a string or a buffer.
// The key/cert needs to be updated in the NodeJs http(s) server, when no key/cert is yet available or when the key/cert has changed. var updateKey = (server.key == undefined || (Buffer.isBuffer(server.key) && !server.key.equals(refreshedHttps.key)) || (typeof server.key == "string" && server.key != refreshedHttps.key));
// Note that the refreshed key/cert can be supplied as a string or a buffer. var updateCert = (server.cert == undefined || (Buffer.isBuffer(server.cert) && !server.cert.equals(refreshedHttps.cert)) || (typeof server.cert == "string" && server.cert != refreshedHttps.cert));
var updateKey = (server.key == undefined || (Buffer.isBuffer(server.key) && !server.key.equals(refreshedHttps.key)) || (typeof server.key == "string" && server.key != refreshedHttps.key));
var updateCert = (server.cert == undefined || (Buffer.isBuffer(server.cert) && !server.cert.equals(refreshedHttps.cert)) || (typeof server.cert == "string" && server.cert != refreshedHttps.cert));
// Only update the credentials in the server when key or cert has changed // Only update the credentials in the server when key or cert has changed
if(updateKey || updateCert) { if(updateKey || updateCert) {
server.setSecureContext(refreshedHttps); server.setSecureContext(refreshedHttps);
RED.log.info(RED.log._("server.https.settings-refreshed")); RED.log.info(RED.log._("server.https.settings-refreshed"));
}
} }
}).catch(function(err) { }
RED.log.error(RED.log._("server.https.refresh-failed",{message:err})); }).catch(function(err) {
});
} catch(err) {
RED.log.error(RED.log._("server.https.refresh-failed",{message:err})); RED.log.error(RED.log._("server.https.refresh-failed",{message:err}));
} });
}, httpsRefreshInterval*60*60*1000); } catch(err) {
} else { RED.log.error(RED.log._("server.https.refresh-failed",{message:err}));
delayedLogItems.push({type:"warn", id:"server.https.function-required"}); }
} }, httpsRefreshInterval*60*60*1000);
} else { } else {
delayedLogItems.push({type:"warn", id:"server.https.nodejs-version"}); delayedLogItems.push({type:"warn", id:"server.https.function-required"});
} }
} }
} else { } else {