refactor: simplify and add failure/cancel error utils (#1324)

Author: sidvishnoi

src/background/services/keyAutoAdd.ts

@@ -8,7 +8,11 @@ import {
   type ErrorWithKeyLike,
   type I18nInfo,
 } from '@/shared/helpers';
-import { createTab } from '@/background/utils';
+import {
+  createTab,
+  WalletStatusCancelError,
+  WalletStatusFailureError,
+} from '@/background/utils';
 import type { Browser, Runtime, Scripting } from 'webextension-polyfill';
 import type { WalletStatus, TabId, WalletInfo } from '@/shared/types';
 import type { Cradle } from '@/background/container';
@@ -90,7 +94,7 @@ export class KeyAutoAddService {
     const BASE_TIMEOUT = 5 * 1000;
     const timeout = new Timeout(BASE_TIMEOUT, () => {
       removeListeners();
-      reject(new ErrorWithKey('connectWallet_error_timeout'));
+      reject(new WalletStatusFailureError('timeout'));
     });
 
     const tabID = await createTab(this.browser, url);
@@ -105,7 +109,7 @@ export class KeyAutoAddService {
     const onTabCloseListener: OnTabRemovedCallback = (tabId) => {
       if (tabId !== tabID) return;
       removeListeners();
-      reject(new ErrorWithKey('connectWallet_error_tabClosed'));
+      reject(new WalletStatusCancelError('tab_closed'));
     };
 
     const ports = new Set<Runtime.Port>();

src/background/services/outgoingPaymentGrant.ts

@@ -21,7 +21,11 @@ import {
   isInvalidContinuationError,
   isNotFoundError,
 } from '@/background/services/openPayments';
-import { createTabIfNotExists } from '@/background/utils';
+import {
+  createTabIfNotExists,
+  WalletStatusCancelError,
+  WalletStatusFailureError,
+} from '@/background/utils';
 
 interface InteractionParams {
   interactRef: string;
@@ -284,7 +288,7 @@ export class OutgoingPaymentGrantService {
       if (tabId !== tabID) return;
 
       removeListeners();
-      reject(new ErrorWithKey('connectWallet_error_tabClosed'));
+      reject(new WalletStatusCancelError('tab_closed'));
     };
 
     const getInteractionInfo: TabUpdateCallback = async (tabId, changeInfo) => {
@@ -306,9 +310,9 @@ export class OutgoingPaymentGrantService {
         if (interactRef && hash) {
           resolve({ interactRef, hash, tabId });
         } else if (result === 'grant_rejected') {
-          reject(new ErrorWithKey('connectWallet_error_grantRejected'));
+          reject(new WalletStatusCancelError('grant_rejected'));
         } else if (result === 'grant_invalid') {
-          reject(new ErrorWithKey('connectWallet_error_grantInvalid'));
+          reject(new WalletStatusFailureError('grant_invalid'));
         }
       } catch {
         /* do nothing */
@@ -337,7 +341,7 @@ export class OutgoingPaymentGrantService {
       'verifyInteractionHash failed with authServer without trailing slash',
     );
     if (hash === (await computeHash(ensureEnd(authServer, '/')))) return;
-    throw new ErrorWithKey('connectWallet_error_hashFailed');
+    throw new WalletStatusFailureError('grant_hash_failed');
   }
 
   private computeHash = async (
@@ -365,10 +369,11 @@ export class OutgoingPaymentGrantService {
 
       return continuation;
     } catch (error) {
-      this.logger.error('connectWallet_error_continuationFailed', {
-        cause: error,
+      const err = new WalletStatusFailureError('grant_continuation_failed', {
+        details: error,
       });
-      throw new ErrorWithKey('connectWallet_error_continuationFailed');
+      this.logger.error(err);
+      throw err;
     }
   }