From 9449dab209c953d9ed03a4c43af10b0a5e56cf5c Mon Sep 17 00:00:00 2001 From: Martin Varmuza Date: Tue, 11 Feb 2025 10:29:58 +0100 Subject: [PATCH] fix(suite-web): start using local sharedworker on localhost and production --- packages/suite-build/configs/web.webpack.config.ts | 11 +++++++++++ suite-common/connect-init/src/connectInitThunks.ts | 9 ++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/packages/suite-build/configs/web.webpack.config.ts b/packages/suite-build/configs/web.webpack.config.ts index 06a866a7503..60a028257bb 100644 --- a/packages/suite-build/configs/web.webpack.config.ts +++ b/packages/suite-build/configs/web.webpack.config.ts @@ -40,6 +40,17 @@ const config: webpack.Configuration = { concurrency: 100, }, }), + new CopyWebpackPlugin({ + patterns: [ + { + from: path.join( + __dirname, + '../../connect-iframe/build/workers/sessions-background-sharedworker.js', + ), + to: path.join(baseDir, 'build', 'static'), + }, + ], + }), // Html files ...routes.map( route => diff --git a/suite-common/connect-init/src/connectInitThunks.ts b/suite-common/connect-init/src/connectInitThunks.ts index a96a96e1098..39129ffbd33 100644 --- a/suite-common/connect-init/src/connectInitThunks.ts +++ b/suite-common/connect-init/src/connectInitThunks.ts @@ -118,13 +118,13 @@ export const connectInitThunk = createThunk( // ====================================================== ==================== ==================== // localhost:8000 localhost:8088 NO // https://dev.suite.sldev.cz/suite-web/develop/web/ https://dev.suite.sldev.cz/connect/develop/ YES - connect - // suite.trezor.io/web connect.trezor.io/9(x.y)/ YES - connect + // suite.trezor.io/web connect.trezor.io/9(x.y)/ NO let _sessionsBackgroundUrl: string | null = null; - + const localSharedWorker = '/static/sessions-background-sharedworker.js'; if (typeof window !== 'undefined' && !isNative()) { if (window.location.origin.includes('localhost')) { - _sessionsBackgroundUrl = null; + _sessionsBackgroundUrl = localSharedWorker; } else if (window.location.origin.endsWith('dev.suite.sldev.cz')) { // we are expecting accompanying connect build at specified location const assetPrefixArr = (process.env.ASSET_PREFIX || '').split('/').filter(Boolean); @@ -141,8 +141,7 @@ export const connectInitThunk = createThunk( _sessionsBackgroundUrl = `${window.location.origin}/${relevantSegments.join('/')}/workers/sessions-background-sharedworker.js`; } else { - _sessionsBackgroundUrl = - 'https://connect.trezor.io/9/workers/sessions-background-sharedworker.js'; + _sessionsBackgroundUrl = localSharedWorker; } }