From 9d115f29adc8d893661ef174827b07b70e39ca95 Mon Sep 17 00:00:00 2001 From: sam detweiler Date: Sat, 13 Jul 2024 12:21:44 -0500 Subject: [PATCH 1/3] test app.js with hash checking for loading node_helper for modules, only one time --- js/app.js | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/js/app.js b/js/app.js index f9313ed403..7b9717bbcc 100644 --- a/js/app.js +++ b/js/app.js @@ -9,6 +9,7 @@ const Log = require("logger"); const Server = require(`${__dirname}/server`); const Utils = require(`${__dirname}/utils`); const defaultModules = require(`${__dirname}/../modules/default/defaultmodules`); +const helperhash = {}; // Get version number. global.version = require(`${__dirname}/../package.json`).version; @@ -175,14 +176,23 @@ function App () { const helperPath = `${moduleFolder}/node_helper.js`; - let loadHelper = true; - try { - fs.accessSync(helperPath, fs.R_OK); - } catch (e) { - loadHelper = false; - Log.log(`No helper found for module: ${moduleName}.`); - } + // find out if helper was loaded before for this module + // only lload it once + let loadHelper = helperhash[moduleName] ? false : true; + // if this is the 1st time for this module, check for helper file + // otherwise, its already loaded, if found + if (loadHelper) { + try { + fs.accessSync(helperPath, fs.R_OK); + // indicte we found one to load for this module + helperhash[moduleName] = true; + } catch (e) { + loadHelper = false; + Log.log(`No helper found for module: ${moduleName}.`); + } + } + // if the helper was found, AND needed 1st time if (loadHelper) { const Module = require(helperPath); let m = new Module(); From c2ab4ce413aecb08493219dce9229ac00118ba8a Mon Sep 17 00:00:00 2001 From: sam detweiler Date: Sat, 3 Aug 2024 13:27:51 -0500 Subject: [PATCH 2/3] fix for async loading node_helper --- js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/app.js b/js/app.js index 7b9717bbcc..7792750c48 100644 --- a/js/app.js +++ b/js/app.js @@ -177,7 +177,7 @@ function App () { const helperPath = `${moduleFolder}/node_helper.js`; // find out if helper was loaded before for this module - // only lload it once + // only load it once let loadHelper = helperhash[moduleName] ? false : true; // if this is the 1st time for this module, check for helper file From 0c705c657fd091a90896cdb267113fe7f8012f03 Mon Sep 17 00:00:00 2001 From: sam detweiler Date: Sat, 3 Aug 2024 15:15:03 -0500 Subject: [PATCH 3/3] add check for node_helper loaded for this module prevent reloading for multiple instances --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f62d40b3cd..89ffbeda48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ _This release is scheduled to be released on 2024-10-01._ ### Fixed +[core] add check for node_helper loading for multiple instances of same module (#3502) + ## [2.28.0] - 2024-07-01 Thanks to: @btoconnor, @bugsounet, @JasonStieber, @khassel, @kleinmantara and @WallysWellies.