Merge branch 'main' into release

Author: DarianM

.github/workflows/setup/action.yml

@@ -7,7 +7,7 @@ runs:
 
   steps:
     - name: Setup NodeJS
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v6
       with: { node-version-file: .nvmrc }
 
     - name: Install PNPM

.gitignore

@@ -48,4 +48,7 @@ build
 .cache
 
 # macOS
-.DS_Store
+.DS_Store
+
+# React Router
+.react-router/

api/package.json

@@ -14,24 +14,24 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "@hono/zod-validator": "^0.7.3",
+    "@hono/zod-validator": "^0.7.5",
     "@interledger/open-payments": "^7.1.3",
     "@noble/ed25519": "^3.0.0",
-    "@paralleldrive/cuid2": "^2.2.2",
+    "@paralleldrive/cuid2": "^2.3.1",
     "@shared/config-storage-service": "workspace:^",
     "@shared/probabilistic-revenue-share": "workspace:^",
     "@shared/utils": "workspace:^",
     "hono": "^4.9.8",
     "http-message-signatures": "^1.0.4",
     "httpbis-digest-headers": "^1.0.0",
-    "zod": "^3.25.76"
+    "zod": "^4.1.13"
   },
   "types": "./src/types.ts",
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20251011.0",
     "@shared/defines": "workspace:^",
     "@shared/types": "workspace:^",
-    "typescript": "5.9.2",
+    "typescript": "5.9.3",
     "wrangler": "^4.40.0"
   }
 }

api/src/app.ts

@@ -2,8 +2,8 @@ import { Hono } from 'hono'
 import { cors } from 'hono/cors'
 import { HTTPException } from 'hono/http-exception'
 import { ZodError } from 'zod'
-import { serializeError } from './utils/utils.js'
 import type { KVNamespace } from '@cloudflare/workers-types'
+import { serializeError } from './utils/utils.js'
 
 export type Env = {
   AWS_ACCESS_KEY_ID: string
@@ -46,7 +46,7 @@ app.onError((error, c) => {
       message: 'Validation failed',
       code: 'VALIDATION_ERROR',
       details: {
-        issues: error.errors.map((err) => ({
+        issues: error.issues.map((err) => ({
           path: err.path.join('.'),
           message: err.message,
           code: err.code

api/src/routes/get-config.ts

@@ -1,6 +1,6 @@
-import { zValidator } from '@hono/zod-validator'
 import { HTTPException } from 'hono/http-exception'
-import { z } from 'zod'
+import z from 'zod'
+import { zValidator } from '@hono/zod-validator'
 import { ConfigStorageService } from '@shared/config-storage-service'
 import { AWS_PREFIX } from '@shared/defines'
 import { PRESET_IDS, TOOLS } from '@shared/types'
@@ -26,7 +26,7 @@ app.get(
   zValidator(
     'query',
     z.object({
-      wa: z.string().url(),
+      wa: z.url(),
       preset: z.enum(PRESET_IDS)
     })
   ),

api/src/routes/payment.ts

@@ -1,16 +1,16 @@
 import { zValidator } from '@hono/zod-validator'
 import { APP_URL } from '@shared/defines'
-import { createHTTPException, waitWithAbort } from '../utils/utils'
-import { OpenPaymentsService } from '../utils/open-payments.js'
+import { KV_PAYMENTS_PREFIX } from '@shared/types'
+import { app } from '../app.js'
 import {
   PaymentQuoteSchema,
   PaymentGrantSchema,
   PaymentFinalizeSchema,
   PaymentStatusParamSchema
 } from '../schemas/payment.js'
-import { KV_PAYMENTS_PREFIX } from '@shared/types'
 import type { PaymentStatus } from '../types'
-import { app } from '../app.js'
+import { OpenPaymentsService } from '../utils/open-payments.js'
+import { createHTTPException, waitWithAbort } from '../utils/utils'
 
 app.post(
   '/payment/quote',

api/src/routes/probabilistic-revshare.ts

@@ -1,20 +1,19 @@
 import { HTTPException } from 'hono/http-exception'
-import { zValidator } from '@hono/zod-validator'
-import { z } from 'zod'
 import type { ContentfulStatusCode } from 'hono/utils/http-status'
+import z from 'zod'
+import { zValidator } from '@hono/zod-validator'
 import type { WalletAddress } from '@interledger/open-payments'
 import { decode, pickWeightedRandom } from '@shared/probabilistic-revenue-share'
 import { isWalletAddress, validateWalletAddressOrPointer } from '@shared/utils'
-import { createHTTPException } from '../utils/utils'
-
 import { app } from '../app.js'
+import { createHTTPException } from '../utils/utils'
 
 app.get(
   '/revshare/:payload',
   zValidator(
     'param',
     z.object({
-      payload: z.string().base64url().max(50_000).min(20)
+      payload: z.base64url().max(50_000).min(20)
     })
   ),
   async ({ req, json }) => {

api/src/schemas/payment.ts

@@ -1,8 +1,8 @@
-import * as z from 'zod/v4'
+import z from 'zod'
 
 export const PaymentQuoteSchema = z.object({
-  senderWalletAddress: z.string().url('Invalid sender wallet address'),
-  receiverWalletAddress: z.string().url('Invalid receiver wallet address'),
+  senderWalletAddress: z.url('Invalid sender wallet address'),
+  receiverWalletAddress: z.url('Invalid receiver wallet address'),
   amount: z.number().positive('Amount must be positive'),
   note: z.string().optional()
 })
@@ -35,11 +35,11 @@ export const PaymentFinalizeSchema = z.object({
   walletAddress: WalletAddressSchema,
   pendingGrant: z.object({
     interact: z.object({
-      redirect: z.string().url(),
+      redirect: z.url(),
       finish: z.string()
     }),
     continue: z.object({
-      uri: z.string().url(),
+      uri: z.url(),
       access_token: z.object({
         value: z.string()
       }),
@@ -48,18 +48,18 @@ export const PaymentFinalizeSchema = z.object({
   }),
   quote: z.object({
     id: z.string(),
-    walletAddress: z.string().url('Invalid wallet address'),
-    receiver: z.string().url(),
+    walletAddress: z.url('Invalid wallet address'),
+    receiver: z.url(),
     receiveAmount: AmountSchema,
     debitAmount: AmountSchema,
     method: z.literal('ilp'),
-    createdAt: z.string().datetime(),
-    expiresAt: z.string().datetime().optional()
+    createdAt: z.iso.datetime(),
+    expiresAt: z.iso.datetime().optional()
   }),
   incomingPaymentGrant: z.object({
     access_token: z.object({
       value: z.string(),
-      manage: z.string().url(),
+      manage: z.url(),
       expires_in: z.number().int(),
       access: z.array(
         z.object({
@@ -73,7 +73,7 @@ export const PaymentFinalizeSchema = z.object({
       access_token: z.object({
         value: z.string()
       }),
-      uri: z.string().url(),
+      uri: z.url(),
       wait: z.number().int().optional()
     })
   }),

api/src/types.ts

@@ -1,10 +1,10 @@
+import type z from 'zod'
 import type {
   PaymentFinalizeSchema,
   PaymentGrantSchema,
   PaymentQuoteSchema,
   WalletAddressParamSchema
 } from './schemas/payment.js'
-import type { z } from 'zod/v4'
 
 export type PaymentStatusSuccess = {
   paymentId: string

api/src/utils/open-payments.ts

@@ -9,14 +9,14 @@ import {
   isPendingGrant,
   createAuthenticatedClient
 } from '@interledger/open-payments'
+import { createId } from '@paralleldrive/cuid2'
 import { getWalletAddress } from '@shared/utils'
 import {
   createHeaders,
   sleep,
   createHTTPException,
   urlWithParams
 } from './utils.js'
-import { createId } from '@paralleldrive/cuid2'
 import type { Env } from '../app.js'
 
 export interface Amount {
@@ -52,6 +52,18 @@ type CreateOutgoingPaymentParams = {
   paymentId: string
 }
 
+const OUTGOING_PAYMENT_POLLING_INITIAL_DELAY = 3000
+const OUTGOING_PAYMENT_POLLING_INTERVAL = 1500
+const OUTGOING_PAYMENT_POLLING_MAX_ATTEMPTS = 3
+
+function hasCancellationReason(outgoingPayment: OutgoingPayment): boolean {
+  return (
+    outgoingPayment.failed &&
+    typeof outgoingPayment.metadata === 'object' &&
+    'cancellationReason' in outgoingPayment.metadata
+  )
+}
+
 export class OpenPaymentsService {
   private client: AuthenticatedClient | null = null
   private static _instance: OpenPaymentsService
@@ -248,11 +260,11 @@ export class OpenPaymentsService {
       throw new Error('Could not create outgoing payment.')
     })
 
-    return await this.checkOutgoingPayment(
-      outgoingPayment.id,
-      continuation.access_token.value,
+    return await this.completePaymentProcess(
+      quote.receiver,
       incomingPaymentGrant,
-      quote.receiver
+      outgoingPayment.id,
+      continuation.access_token.value
     )
   }
 
@@ -417,28 +429,46 @@ export class OpenPaymentsService {
     }
   }
 
-  private async checkOutgoingPayment(
-    outgoingPaymentId: OutgoingPayment['id'],
-    continuationAccessToken: string,
+  private async completePaymentProcess(
+    incomingPaymentId: string,
     incomingPaymentGrant: Grant,
-    incomingPaymentId: string
+    outgoingPaymentId: OutgoingPayment['id'],
+    continuationAccessToken: string
   ): Promise<CheckPaymentResult> {
-    await sleep(3000)
+    let attempts = 0
+    await sleep(OUTGOING_PAYMENT_POLLING_INITIAL_DELAY)
+    while (++attempts <= OUTGOING_PAYMENT_POLLING_MAX_ATTEMPTS) {
+      const outgoingPayment = await this.client!.outgoingPayment.get({
+        url: outgoingPaymentId,
+        accessToken: continuationAccessToken
+      })
 
-    const outgoingPayment = await this.client!.outgoingPayment.get({
-      url: outgoingPaymentId,
-      accessToken: continuationAccessToken
-    })
+      if (hasCancellationReason(outgoingPayment)) {
+        return {
+          success: false,
+          error: {
+            code: 'CANCELLATION_REASON',
+            message: `Payment aborted due to: ${outgoingPayment.metadata?.cancellationReason}`
+          }
+        }
+      }
+
+      if (
+        outgoingPayment.debitAmount.value === outgoingPayment.sentAmount.value
+      ) {
+        break
+      }
 
-    // get outgoing payment, to check if there was enough balance
-    if (!(Number(outgoingPayment.sentAmount.value) > 0)) {
-      return {
-        success: false,
-        error: {
-          code: 'INSUFFICIENT_BALANCE',
-          message: 'Insufficient funds. Check your balance and try again.'
+      if (attempts === OUTGOING_PAYMENT_POLLING_MAX_ATTEMPTS) {
+        return {
+          success: false,
+          error: {
+            code: 'OUTGOING_PAYMENT_INCOMPLETE',
+            message: 'The payment did not complete within the expected time.'
+          }
         }
       }
+      await sleep(OUTGOING_PAYMENT_POLLING_INTERVAL)
     }
 
     try {
@@ -458,7 +488,7 @@ export class OpenPaymentsService {
       (error) => {
         throw createHTTPException(
           500,
-          'Could not revoke incoming payment grant. ',
+          'Could not revoke incoming payment grant.',
           error
         )
       }