fix: keep alive service worker

Author: jinoosss

packages/adena-extension/src/background.ts

@@ -106,7 +106,7 @@ chrome.alarms.onAlarm.addListener(async (alarm) => {
 chrome.tabs.onUpdated.addListener((tabId, changeInfo) => {
   // Check metadata when tab is updated
   if (changeInfo.status === 'complete') {
-    chrome.tabs.sendMessage(tabId, CommandMessage.command('checkMetadata'));
+    chrome.tabs.sendMessage(tabId, CommandMessage.command('checkMetadata')).catch(console.info);
   }
 });
 
@@ -120,9 +120,22 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
 });
 
 function initAlarms(): void {
-  SCHEDULE_ALARMS.map((alarm) => {
+  SCHEDULE_ALARMS.map(initAlarmWithDelay);
+}
+
+function initAlarmWithDelay(alarm: { key: string; periodInMinutes: number; delay: number }): void {
+  if (alarm.delay === 0) {
     chrome.alarms.create(alarm.key, {
       periodInMinutes: alarm.periodInMinutes,
     });
-  });
+    return;
+  }
+
+  setTimeout(
+    () =>
+      chrome.alarms.create(alarm.key, {
+        periodInMinutes: alarm.periodInMinutes,
+      }),
+    alarm.delay,
+  );
 }

packages/adena-extension/src/common/constants/alarm-key.constant.ts

@@ -5,9 +5,9 @@ export enum AlarmKey {
   WAKE_ALARM_DELAY_40S = 'WAKE_ALARM_DELAY_40S',
 }
 
-export const SCHEDULE_ALARMS: { key: string; periodInMinutes: number }[] = [
-  { key: AlarmKey.EXPIRED_PASSWORD, periodInMinutes: 1 },
-  { key: AlarmKey.WAKE_ALARM, periodInMinutes: 1 },
-  { key: AlarmKey.WAKE_ALARM_DELAY_20S, periodInMinutes: 1 },
-  { key: AlarmKey.WAKE_ALARM_DELAY_40S, periodInMinutes: 1 },
+export const SCHEDULE_ALARMS: { key: string; periodInMinutes: number; delay: number }[] = [
+  { key: AlarmKey.EXPIRED_PASSWORD, periodInMinutes: 1, delay: 0 },
+  { key: AlarmKey.WAKE_ALARM, periodInMinutes: 1, delay: 0 },
+  { key: AlarmKey.WAKE_ALARM_DELAY_20S, periodInMinutes: 1, delay: 20_000 },
+  { key: AlarmKey.WAKE_ALARM_DELAY_40S, periodInMinutes: 1, delay: 40_000 },
 ];

packages/adena-extension/src/common/utils/crypto-utils.ts

@@ -16,7 +16,7 @@ export const encryptPassword = async (
   password: string,
 ): Promise<{ encryptedKey: string; encryptedPassword: string }> => {
   const result = await sendMessage(CommandMessage.command('encryptPassword', { password }));
-  if (result.code !== 200) {
+  if (!result || result.code !== 200) {
     throw new Error('Encryption key not initialized.');
   }
 
@@ -34,7 +34,7 @@ export const decryptPassword = async (iv: string, encryptedPassword: string): Pr
       encryptedPassword,
     }),
   );
-  if (result?.code !== 200 || !result?.data?.password) {
+  if (!result || result?.code !== 200 || !result?.data?.password) {
     throw new Error('Encryption key not initialized.');
   }
 
@@ -45,8 +45,11 @@ export const clearInMemoryKey = async (): Promise<void> => {
   await sendMessage(CommandMessage.command('clearEncryptKey'));
 };
 
-function sendMessage<T = any>(message: CommandMessageData): Promise<CommandMessageData<T>> {
-  return new Promise((resolve) => {
+function sendMessage<T = any>(message: CommandMessageData): Promise<CommandMessageData<T> | null> {
+  return new Promise<CommandMessageData<T> | null>((resolve) => {
     chrome.runtime.sendMessage(message, resolve);
+  }).catch((error) => {
+    console.warn(error);
+    return null;
   });
 }

packages/adena-extension/src/components/pages/router/side-menu-layout/side-menu-container.tsx

@@ -97,7 +97,13 @@ const SideMenuContainer: React.FC<SideMenuContainerProps> = ({ open, setOpen })
     setOpen(false);
     await walletService.lockWallet();
     await clearWallet();
-    await chrome.runtime.sendMessage(CommandMessage.command('clearPopup'));
+
+    try {
+      await chrome.runtime.sendMessage(CommandMessage.command('clearPopup'));
+    } catch (error) {
+      console.warn(error);
+    }
+
     await loadAccounts();
     navigate(RoutePath.Login, { replace: true });
   }, [walletService, navigate]);

packages/adena-extension/src/content.ts

@@ -3,19 +3,6 @@ import { EventMessageData } from '@inject/message';
 import { CommandHandler } from '@inject/message/command-handler';
 import { CommandMessageData } from '@inject/message/command-message';
 
-const sendMessage = (event: MessageEvent): void => {
-  const message = event.data;
-
-  chrome.runtime.sendMessage(message, (response) => {
-    Promise.resolve(response).then((result) => {
-      event.source?.postMessage(result, {
-        targetOrigin: event.origin,
-      });
-    });
-    return true;
-  });
-};
-
 const loadScript = (): void => {
   const container = document.head || document.documentElement;
   const scriptElement = document.createElement('script');
@@ -63,6 +50,21 @@ const initExtensionListener = (): void => {
   });
 };
 
+const sendMessage = (event: MessageEvent): void => {
+  const message = event.data;
+
+  chrome.runtime.sendMessage(message, (response) => {
+    Promise.resolve(response)
+      .then((result) => {
+        event.source?.postMessage(result, {
+          targetOrigin: event.origin,
+        });
+      })
+      .catch(console.info);
+    return true;
+  });
+};
+
 loadScript();
 initListener();
 initExtensionListener();

packages/adena-extension/src/hooks/use-event.tsx

@@ -12,7 +12,7 @@ export const useEvent = (): UseEventReturn => {
         return;
       }
       const tabId = currentTab.id;
-      chrome.tabs.sendMessage(tabId, message);
+      chrome.tabs.sendMessage(tabId, message).catch(console.warn);
     });
   }
 

packages/adena-extension/src/inject/executor/executor.ts

@@ -170,7 +170,11 @@ export class AdenaExecutor {
       key: this.eventKey,
     };
 
-    window.postMessage(this.eventMessage, window.location.origin);
+    try {
+      window.postMessage(this.eventMessage, window.location.origin);
+    } catch (error) {
+      console.warn(error);
+    }
     this.messages[this.eventKey] = {
       request: this.eventMessage,
       response: undefined,

packages/adena-extension/src/inject/message/command-handler.ts

@@ -71,7 +71,7 @@ export class CommandHandler {
         return;
       }
     } catch (error) {
-      console.error(error);
+      console.info(error);
       sendResponse(makeInternalErrorResponse(message));
     }