Add timeout to all wallet API calls

api/resolvers/wallet.js

@@ -8,7 +8,8 @@ import { SELECT, itemQueryWithMeta } from './item'
 import { formatMsats, msatsToSats, msatsToSatsDecimal, satsToMsats } from '@/lib/format'
 import {
   USER_ID, INVOICE_RETENTION_DAYS,
-  PAID_ACTION_PAYMENT_METHODS
+  PAID_ACTION_PAYMENT_METHODS,
+  WALLET_CREATE_INVOICE_TIMEOUT_MS
 } from '@/lib/constants'
 import { amountSchema, validateSchema, withdrawlSchema, lnAddrSchema } from '@/lib/validate'
 import assertGofacYourself from './ofac'
@@ -24,6 +25,7 @@ import validateWallet from '@/wallets/validate'
 import { canReceive } from '@/wallets/common'
 import performPaidAction from '../paidAction'
 import performPayingAction from '../payingAction'
+import { withTimeout } from '@/lib/time'
 
 function injectResolvers (resolvers) {
   console.group('injected GraphQL resolvers:')
@@ -65,7 +67,10 @@ function injectResolvers (resolvers) {
         wallet,
         testCreateInvoice:
           walletDef.testCreateInvoice && validateLightning && canReceive({ def: walletDef, config: data })
-            ? (data) => walletDef.testCreateInvoice(data, { logger, me, models })
+            ? (data) => withTimeout(
+                // TODO: pass and use AbortSignal to also abort any pending requests
+                walletDef.testCreateInvoice(data, { logger, me, models }),
+                WALLET_CREATE_INVOICE_TIMEOUT_MS)
             : null
       }, {
         settings,

lib/constants.js

@@ -191,3 +191,6 @@ export const LONG_POLL_INTERVAL = Number(process.env.NEXT_PUBLIC_LONG_POLL_INTER
 export const EXTRA_LONG_POLL_INTERVAL = Number(process.env.NEXT_PUBLIC_EXTRA_LONG_POLL_INTERVAL)
 
 export const ZAP_UNDO_DELAY_MS = 5_000
+
+export const WALLET_SEND_PAYMENT_TIMEOUT_MS = 15_000
+export const WALLET_CREATE_INVOICE_TIMEOUT_MS = 15_000

wallets/blink/server.js

@@ -1,4 +1,3 @@
-import { withTimeout } from '@/lib/time'
 import { getScopes, SCOPE_READ, SCOPE_RECEIVE, SCOPE_WRITE, getWallet, request } from '@/wallets/blink/common'
 import { msatsToSats } from '@/lib/format'
 export * from '@/wallets/blink'
@@ -15,9 +14,8 @@ export async function testCreateInvoice ({ apiKeyRecv, currencyRecv }) {
     throw new Error('missing RECEIVE scope')
   }
 
-  const timeout = 15_000
   currencyRecv = currencyRecv ? currencyRecv.toUpperCase() : 'BTC'
-  return await withTimeout(createInvoice({ msats: 1000, expiry: 1 }, { apiKeyRecv, currencyRecv }), timeout)
+  return await createInvoice({ msats: 1000, expiry: 1 }, { apiKeyRecv, currencyRecv })
 }
 
 export async function createInvoice (

wallets/config.js

@@ -8,6 +8,8 @@ import { REMOVE_WALLET } from '@/fragments/wallet'
 import { useWalletLogger } from '@/wallets/logger'
 import { useWallets } from '.'
 import validateWallet from './validate'
+import { WALLET_SEND_PAYMENT_TIMEOUT_MS } from '@/lib/constants'
+import { withTimeout } from '@/lib/time'
 
 export function useWalletConfigurator (wallet) {
   const { me } = useMe()
@@ -43,7 +45,11 @@ export function useWalletConfigurator (wallet) {
           clientConfig = Object.assign(clientConfig, transformedConfig)
         }
         if (wallet.def.testSendPayment && validateLightning) {
-          transformedConfig = await wallet.def.testSendPayment(clientConfig, { me, logger })
+          transformedConfig = await withTimeout(
+            // TODO: pass and use AbortSignal to also abort any request
+            wallet.def.testSendPayment(clientConfig, { me, logger }),
+            WALLET_SEND_PAYMENT_TIMEOUT_MS
+          )
           if (transformedConfig) {
             clientConfig = Object.assign(clientConfig, transformedConfig)
           }

wallets/nwc/server.js

@@ -1,11 +1,8 @@
-import { withTimeout } from '@/lib/time'
 import { getNwc, supportedMethods, nwcTryRun } from '@/wallets/nwc'
 export * from '@/wallets/nwc'
 
 export async function testCreateInvoice ({ nwcUrlRecv }, { logger }) {
-  const timeout = 15_000
-
-  const supported = await supportedMethods(nwcUrlRecv, { logger, timeout })
+  const supported = await supportedMethods(nwcUrlRecv, { logger })
 
   const supports = (method) => supported.includes(method)
 
@@ -20,7 +17,7 @@ export async function testCreateInvoice ({ nwcUrlRecv }, { logger }) {
     }
   }
 
-  return await withTimeout(createInvoice({ msats: 1000, expiry: 1 }, { nwcUrlRecv }, { logger }), timeout)
+  return await createInvoice({ msats: 1000, expiry: 1 }, { nwcUrlRecv }, { logger })
 }
 
 export async function createInvoice ({ msats, description, expiry }, { nwcUrlRecv }, { logger }) {

wallets/payment.js

@@ -2,13 +2,14 @@ import { useCallback } from 'react'
 import { useSendWallets } from '@/wallets'
 import { formatSats } from '@/lib/format'
 import useInvoice from '@/components/use-invoice'
-import { FAST_POLL_INTERVAL } from '@/lib/constants'
+import { FAST_POLL_INTERVAL, WALLET_SEND_PAYMENT_TIMEOUT_MS } from '@/lib/constants'
 import {
   WalletsNotAvailableError, WalletSenderError, WalletAggregateError, WalletPaymentAggregateError,
   WalletNotEnabledError, WalletSendNotConfiguredError, WalletPaymentError, WalletError, WalletReceiverError
 } from '@/wallets/errors'
 import { canSend } from './common'
 import { useWalletLoggerFactory } from './logger'
+import { withTimeout } from '@/lib/time'
 
 export function useWalletPayment () {
   const wallets = useSendWallets()
@@ -152,7 +153,10 @@ function useSendPayment () {
 
     logger.info(`↗ sending payment: ${formatSats(satsRequested)}`, { bolt11 })
     try {
-      const preimage = await wallet.def.sendPayment(bolt11, wallet.config, { logger })
+      const preimage = await withTimeout(
+        // TODO: pass and use AbortSignal to also abort any pending requests
+        wallet.def.sendPayment(bolt11, wallet.config, { logger }),
+        WALLET_SEND_PAYMENT_TIMEOUT_MS)
       logger.ok(`↗ payment sent: ${formatSats(satsRequested)}`, { bolt11, preimage })
     } catch (err) {
       // we don't log the error here since we want to handle receiver errors separately

wallets/server.js

@@ -15,7 +15,7 @@ import { walletLogger } from '@/api/resolvers/wallet'
 import walletDefs from '@/wallets/server'
 import { parsePaymentRequest } from 'ln-service'
 import { toPositiveBigInt, toPositiveNumber, formatMsats, formatSats, msatsToSats } from '@/lib/format'
-import { PAID_ACTION_TERMINAL_STATES } from '@/lib/constants'
+import { PAID_ACTION_TERMINAL_STATES, WALLET_CREATE_INVOICE_TIMEOUT_MS } from '@/lib/constants'
 import { withTimeout } from '@/lib/time'
 import { canReceive } from './common'
 import wrapInvoice from './wrap'
@@ -193,6 +193,7 @@ async function walletCreateInvoice ({ wallet, def }, {
   }
 
   return await withTimeout(
+    // TODO: pass and use AbortSignal to also abort any pending requests
     def.createInvoice(
       {
         msats,
@@ -202,5 +203,5 @@ async function walletCreateInvoice ({ wallet, def }, {
       },
       wallet.wallet,
       { logger }
-    ), 10_000)
+    ), WALLET_CREATE_INVOICE_TIMEOUT_MS)
 }