From 249c5dc32db2e500619c6b3f35e0081ab868c1f5 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 15 Jan 2025 19:05:07 +0100 Subject: [PATCH 1/5] make sure to use workerthread only if they are really set to true --- backend/src/password/EncryptionWorker.ts | 2 +- backend/src/password/EncryptorUtils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/password/EncryptionWorker.ts b/backend/src/password/EncryptionWorker.ts index f14d5d1ff..5a223bee1 100644 --- a/backend/src/password/EncryptionWorker.ts +++ b/backend/src/password/EncryptionWorker.ts @@ -46,7 +46,7 @@ export const SecretKeyCryptographyCreateKey = ( return encryptionKeyHash.readBigUInt64LE() } -if (CONFIG.USE_CRYPTO_WORKER) { +if (CONFIG.USE_CRYPTO_WORKER === true) { worker({ SecretKeyCryptographyCreateKey, }) diff --git a/backend/src/password/EncryptorUtils.ts b/backend/src/password/EncryptorUtils.ts index 27432d1a3..f4dc00b6c 100644 --- a/backend/src/password/EncryptorUtils.ts +++ b/backend/src/password/EncryptorUtils.ts @@ -23,7 +23,7 @@ const configLoginServerKey = Buffer.from(CONFIG.LOGIN_SERVER_KEY, 'hex') let encryptionWorkerPool: Pool | undefined -if (CONFIG.USE_CRYPTO_WORKER) { +if (CONFIG.USE_CRYPTO_WORKER === true) { encryptionWorkerPool = pool( path.join(__dirname, '..', '..', 'build', 'src', 'password', '/EncryptionWorker.js'), { From fdec1ccbb06ecee15f49dbc61c5eea3441ca7cbb Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 15 Jan 2025 20:11:31 +0100 Subject: [PATCH 2/5] make sure that worker is only called in child process, even if EncryptionWorker.ts was imported by main thread to make sure it was builded --- backend/src/password/EncryptionWorker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/password/EncryptionWorker.ts b/backend/src/password/EncryptionWorker.ts index 5a223bee1..36c08f1b6 100644 --- a/backend/src/password/EncryptionWorker.ts +++ b/backend/src/password/EncryptionWorker.ts @@ -46,7 +46,7 @@ export const SecretKeyCryptographyCreateKey = ( return encryptionKeyHash.readBigUInt64LE() } -if (CONFIG.USE_CRYPTO_WORKER === true) { +if (CONFIG.USE_CRYPTO_WORKER === true && typeof process.send === 'function') { worker({ SecretKeyCryptographyCreateKey, }) From 39c6782dd42bb064b7e0b3a562d49c8af6f261dd Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 18 Jan 2025 19:33:34 +0100 Subject: [PATCH 3/5] fix copy of env variables --- admin/vite.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/vite.config.js b/admin/vite.config.js index 40c51a167..9d1d13bd9 100644 --- a/admin/vite.config.js +++ b/admin/vite.config.js @@ -51,10 +51,10 @@ export default defineConfig({ PORT: CONFIG.ADMIN_MODULE_PORT, // null, COMMUNITY_HOST: CONFIG.ADMIN_MODULE_HOST, // null, URL_PROTOCOL: CONFIG.ADMIN_MODULE_PROTOCOL, // null, - WALLET_URL: CONFIG.WALLET_AUTH_URL, // null, + WALLET_AUTH_URL: CONFIG.WALLET_AUTH_URL, // null, GRAPHQL_URL: CONFIG.GRAPHQL_URI, // null, GRAPHQL_PATH: process.env.GRAPHQL_PATH ?? '/graphql', // null, - WALLET_AUTH_PATH: CONFIG.WALLET_AUTH_URL, // null, + WALLET_AUTH_PATH: CONFIG.WALLET_AUTH_PATH, // null, WALLET_LOGIN_PATH: CONFIG.WALLET_LOGIN_URL, // null, DEBUG_DISABLE_AUTH: CONFIG.DEBUG_DISABLE_AUTH, // null, // CONFIG_VERSION: CONFIG.CONFIG_VERSION, // null, From c227484fecdf7d110e3508b61838fba8e784bdb3 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 18 Jan 2025 19:42:10 +0100 Subject: [PATCH 4/5] fix admin build test --- admin/vite.config.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/vite.config.js b/admin/vite.config.js index 9d1d13bd9..a3dd28de8 100644 --- a/admin/vite.config.js +++ b/admin/vite.config.js @@ -50,11 +50,12 @@ export default defineConfig({ BUILD_COMMIT: null, PORT: CONFIG.ADMIN_MODULE_PORT, // null, COMMUNITY_HOST: CONFIG.ADMIN_MODULE_HOST, // null, + COMMUNITY_URL: CONFIG.COMMUNITY_URL, URL_PROTOCOL: CONFIG.ADMIN_MODULE_PROTOCOL, // null, - WALLET_AUTH_URL: CONFIG.WALLET_AUTH_URL, // null, + WALLET_AUTH_URL: CONFIG.WALLET_AUTH_URL ?? null, GRAPHQL_URL: CONFIG.GRAPHQL_URI, // null, GRAPHQL_PATH: process.env.GRAPHQL_PATH ?? '/graphql', // null, - WALLET_AUTH_PATH: CONFIG.WALLET_AUTH_PATH, // null, + WALLET_AUTH_PATH: CONFIG.WALLET_AUTH_PATH ?? null, WALLET_LOGIN_PATH: CONFIG.WALLET_LOGIN_URL, // null, DEBUG_DISABLE_AUTH: CONFIG.DEBUG_DISABLE_AUTH, // null, // CONFIG_VERSION: CONFIG.CONFIG_VERSION, // null, From 15db898cfde17d9b63193f3833cd43b57b05acf8 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 18 Jan 2025 19:45:18 +0100 Subject: [PATCH 5/5] check all and set to null if not found --- admin/vite.config.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/admin/vite.config.js b/admin/vite.config.js index a3dd28de8..825690c29 100644 --- a/admin/vite.config.js +++ b/admin/vite.config.js @@ -48,16 +48,16 @@ export default defineConfig({ }), EnvironmentPlugin({ BUILD_COMMIT: null, - PORT: CONFIG.ADMIN_MODULE_PORT, // null, - COMMUNITY_HOST: CONFIG.ADMIN_MODULE_HOST, // null, - COMMUNITY_URL: CONFIG.COMMUNITY_URL, - URL_PROTOCOL: CONFIG.ADMIN_MODULE_PROTOCOL, // null, + PORT: CONFIG.ADMIN_MODULE_PORT ?? null, // null, + COMMUNITY_HOST: CONFIG.ADMIN_MODULE_HOST ?? null, // null, + COMMUNITY_URL: CONFIG.COMMUNITY_URL ?? null, + URL_PROTOCOL: CONFIG.ADMIN_MODULE_PROTOCOL ?? null, // null, WALLET_AUTH_URL: CONFIG.WALLET_AUTH_URL ?? null, - GRAPHQL_URL: CONFIG.GRAPHQL_URI, // null, + GRAPHQL_URL: CONFIG.GRAPHQL_URI ?? null, // null, GRAPHQL_PATH: process.env.GRAPHQL_PATH ?? '/graphql', // null, WALLET_AUTH_PATH: CONFIG.WALLET_AUTH_PATH ?? null, - WALLET_LOGIN_PATH: CONFIG.WALLET_LOGIN_URL, // null, - DEBUG_DISABLE_AUTH: CONFIG.DEBUG_DISABLE_AUTH, // null, + WALLET_LOGIN_PATH: CONFIG.WALLET_LOGIN_URL ?? null, // null, + DEBUG_DISABLE_AUTH: CONFIG.DEBUG_DISABLE_AUTH ?? null, // null, // CONFIG_VERSION: CONFIG.CONFIG_VERSION, // null, }), commonjs(),