Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/browser-extension-wallet/src/dapp-connector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { render } from 'react-dom';
import { DappConnectorView } from '@routes';
import { StoreProvider } from '@stores';
import '@lib/i18n';
import '@lib/scripts/keep-alive-ui';
import 'antd/dist/antd.css';
import { CurrencyStoreProvider } from '@providers/currency';
import { DatabaseProvider, AppSettingsProvider, AnalyticsProvider, ExternalLinkOpenerProvider } from '@providers';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ export const backgroundServiceProperties: RemoteApiProperties<BackgroundService>
resetStorage: RemoteApiPropertyType.MethodReturningPromise,
getAppVersion: RemoteApiPropertyType.MethodReturningPromise,
backendFailures$: RemoteApiPropertyType.HotObservable,
unhandledError$: RemoteApiPropertyType.HotObservable
unhandledError$: RemoteApiPropertyType.HotObservable,
ping: RemoteApiPropertyType.MethodReturningPromise
};

const { BLOCKFROST_CONFIGS, BLOCKFROST_RATE_LIMIT_CONFIG, SESSION_TIMEOUT } = config();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,8 @@ export const exposeBackgroundService = (wallet$: Observable<ActiveWallet>): void
},
getAppVersion,
backendFailures$,
unhandledError$
unhandledError$,
ping: async () => 'pong' as const
}),
baseChannel: BaseChannels.BACKGROUND_ACTIONS,
properties: backgroundServiceProperties
Expand Down
42 changes: 22 additions & 20 deletions apps/browser-extension-wallet/src/lib/scripts/keep-alive-ui.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
import { consumeRemoteApi } from '@cardano-sdk/web-extension';
import { backgroundServiceProperties } from './background/config';
import { BackgroundService, BaseChannels } from './types';
import { runtime } from 'webextension-polyfill';
import { logger } from '@lace/common';

const TIMEOUT_DURATION = 5000;
const PING_INTERVAL = 5000; // 5 seconds - same as original

const setupKeepAliveConnection = () => {
const port = runtime.connect({ name: 'keepAlive' });
port.onDisconnect.addListener(setupKeepAliveConnection);
};
const backgroundService = consumeRemoteApi<BackgroundService>(
{
baseChannel: BaseChannels.BACKGROUND_ACTIONS,
properties: backgroundServiceProperties
},
{ runtime, logger }
);

const setupFirefoxWakeInterval = () => {
if (process.env.BROWSER === 'firefox') {
setInterval(() => {
runtime
.sendMessage('ping')
.then((response) => {
logger.debug('Response received:', response);
})
.catch((error) => {
logger.error('Connection error:', error);
});
}, TIMEOUT_DURATION);
}
const keepServiceWorkerAlive = () => {
setInterval(async () => {
try {
const response = await backgroundService.ping();
logger.debug('Keep-alive ping response:', response);
} catch (error) {
logger.error('Keep-alive ping failed:', error);
}
}, PING_INTERVAL);
};

setupKeepAliveConnection();
setupFirefoxWakeInterval();
// Start the keep-alive mechanism
keepServiceWorkerAlive();
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export type BackgroundService = {
getAppVersion: () => Promise<string>;
backendFailures$: BehaviorSubject<number>;
unhandledError$: Observable<UnhandledError>;
ping: () => Promise<'pong'>;
};

export type WalletMode = {
Expand Down
1 change: 1 addition & 0 deletions apps/browser-extension-wallet/src/popup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { StoreProvider } from '@stores';
import { CurrencyStoreProvider } from '@providers/currency';
import { AppSettingsProvider, DatabaseProvider, ThemeProvider, AnalyticsProvider } from '@providers';
import '@lib/i18n';
import '@lib/scripts/keep-alive-ui';
import 'antd/dist/antd.css';
import './styles/index.scss';
import 'normalize.css';
Expand Down
Loading