Merge branch 'main' into release

Author: DarianM

.github/workflows/deploy.yml

@@ -47,7 +47,7 @@ jobs:
           pnpm install -g "wrangler@${wrangler_version}"
 
       # https://github.com/dorny/paths-filter/issues/232
-      - uses: dorny/paths-filter@v3
+      - uses: dorny/paths-filter@v4
         if: github.event_name != 'pull_request_review'
         id: changes
         with:

.nvmrc

@@ -1 +1 @@
-24.9.0
+24.14.0

README.md

@@ -27,7 +27,7 @@ Please read the [contribution guidelines](.github/contributing.md) before submit
 This is a monorepo containing several packages:
 
 - **`api/`** - Hono-based API server running on Cloudflare Workers. Used by tools embedded on websites to fetch their config, handle payments, and manage probabilistic revenue sharing.
-- **`frontend/`** - Remix-based React frontend application. Provides the configuration interface where publishers customize their Web Monetization tools (banners, widgets, link tags).
+- **`frontend/`** - React Router 7 (framework mode) React frontend. Provides the configuration interface where publishers customize their Web Monetization tools (banners, widgets, link tags).
 - **`components/`** - Lit-based web components for publishers. Contains reusable web components that get embedded into publisher websites.
 - **`cdn/`** - Content delivery network package. Delivers the embeddable scripts and their related assets that publishers include on their websites to show monetization tools.
 - **`shared/`** - Shared utilities and types
@@ -36,7 +36,7 @@ This is a monorepo containing several packages:
 ## Prerequisites
 
 - [Node.js](https://nodejs.org/) 24+
-- [pnpm](https://pnpm.io/) 9.15.9+
+- [pnpm](https://pnpm.io/) 10.33+
 
 ## Installation
 
@@ -122,8 +122,8 @@ This will trigger the deploy workflow and create preview environments for the PR
 
 - **Runtime**: Cloudflare workers
 - **Development**: Node.js
-- **Package Manager**: pnpm 9.15.9
-- **Frontend**: React 19 with Remix framework
+- **Package Manager**: pnpm 10.33+
+- **Frontend**: React Router 7
 - **API**: Hono framework on Cloudflare Workers
 - **Components**: Lit web components
 - **Styling**: TailwindCSS

api/package.json

@@ -17,12 +17,12 @@
     "@hono/zod-validator": "^0.7.6",
     "@interledger/open-payments": "^7.1.3",
     "@noble/ed25519": "^3.0.0",
-    "@paralleldrive/cuid2": "^2.3.1",
+    "@paralleldrive/cuid2": "^3.3.0",
     "@shared/config-storage-service": "workspace:^",
-    "@shared/probabilistic-revenue-share": "workspace:^",
     "@shared/default-data": "workspace:^",
+    "@shared/probabilistic-revenue-share": "workspace:^",
     "@shared/utils": "workspace:^",
-    "hono": "^4.11.3",
+    "hono": "^4.12.7",
     "http-message-signatures": "^1.0.4",
     "httpbis-digest-headers": "^1.0.0",
     "zod": "^4.1.13"

api/src/routes/payment.ts

@@ -1,6 +1,6 @@
 import { zValidator } from '@hono/zod-validator'
 import { APP_URL } from '@shared/defines'
-import { KV_PAYMENTS_PREFIX } from '@shared/types'
+import { KV_PAYMENTS_PREFIX, PAYMENT_ERROR } from '@shared/types'
 import { app } from '../app.js'
 import {
   PaymentQuoteSchema,
@@ -9,7 +9,10 @@ import {
   PaymentStatusParamSchema,
 } from '../schemas/payment.js'
 import type { PaymentStatus } from '../types'
-import { OpenPaymentsService } from '../utils/open-payments.js'
+import {
+  OpenPaymentsService,
+  isNonPositiveAmountError,
+} from '../utils/open-payments.js'
 import { createHTTPException, waitWithAbort } from '../utils/utils'
 
 app.post(
@@ -30,6 +33,15 @@ app.post(
 
       return json(result)
     } catch (error) {
+      if (isNonPositiveAmountError(error)) {
+        return json(
+          {
+            error: PAYMENT_ERROR.NON_POSITIVE_AMOUNT,
+            minSendAmount: error.details?.minSendAmount,
+          },
+          400,
+        )
+      }
       throw createHTTPException(500, 'Payment quote creation error: ', error)
     }
   },

api/src/utils/open-payments.ts

@@ -1,4 +1,5 @@
 import {
+  OpenPaymentsClientError,
   type PendingGrant,
   type WalletAddress,
   type AuthenticatedClient,
@@ -9,6 +10,7 @@ import {
   isPendingGrant,
   createAuthenticatedClient,
 } from '@interledger/open-payments'
+import type { components as RSComponents } from '@interledger/open-payments/dist/openapi/generated/resource-server-types'
 import { createId } from '@paralleldrive/cuid2'
 import { getWalletAddress, urlWithParams } from '@shared/utils'
 import { createHeaders, sleep, createHTTPException } from './utils.js'
@@ -21,6 +23,7 @@ export interface Amount {
 }
 
 export type CreatePayment = { quote: Quote; incomingPaymentGrant: Grant }
+type AmountType = RSComponents['schemas']['amount']
 
 type CreateIncomingPaymentParams = {
   accessToken: string
@@ -308,6 +311,7 @@ export class OpenPaymentsService {
         },
       )
     } catch (error) {
+      if (isOpenPaymentsClientError(error)) throw error
       throw createHTTPException(
         500,
         `Could not create payment quote for receiver ${args.walletAddress.id}.`,
@@ -492,3 +496,19 @@ export class OpenPaymentsService {
     return { success: true }
   }
 }
+
+const isOpenPaymentsClientError = (error: unknown) =>
+  error instanceof OpenPaymentsClientError
+
+// happens during quoting only
+export const isNonPositiveAmountError = (
+  error: unknown,
+): error is OpenPaymentsClientError & {
+  details?: { minSendAmount?: AmountType }
+} => {
+  if (!isOpenPaymentsClientError(error)) return false
+  return (
+    error.status === 400 &&
+    error.description?.toLowerCase()?.includes('non-positive receive amount')
+  )
+}

cdn/package.json

@@ -13,14 +13,14 @@
   },
   "devDependencies": {
     "@fontsource-variable/open-sans": "^5.2.7",
-    "@fontsource-variable/roboto": "^5.2.9",
+    "@fontsource-variable/roboto": "^5.2.10",
     "@fontsource/cookie": "^5.2.7",
     "@fontsource/titillium-web": "^5.2.8",
     "@shared/defines": "workspace:^",
     "@shared/types": "workspace:^",
     "@shared/utils": "workspace:^",
     "@tools/components": "workspace:*",
-    "directory-tree": "^3.5.2",
+    "directory-tree": "^3.6.0",
     "esbuild": "0.27.0",
     "esbuild-plugin-copy": "^2.1.1",
     "typescript": "^5.9.3",

cdn/src/utils/offerwall/WebMonetizationCustomOfferwallChoice.ts

@@ -1,5 +1,5 @@
 import type { OfferwallModal } from '@c/offerwall'
-import type { Controller } from '@c/offerwall/controller'
+import type { Actions } from '@c/offerwall/controller'
 import { applyFontFamily } from '@c/utils'
 import {
   BORDER_RADIUS,
@@ -95,7 +95,9 @@ export class WebMonetizationCustomOfferwallChoice implements OfferwallCustomChoi
 
     const abortController = new AbortController()
     const onDoneResolver = withResolvers<boolean>()
-    const controller: Controller = {
+
+    const owElem = document.createElement(elementName) as OfferwallModal
+    const actions = owElem.setController({
       onExtensionLinkClick() {
         // can start tracking
       },
@@ -106,10 +108,7 @@ export class WebMonetizationCustomOfferwallChoice implements OfferwallCustomChoi
       onDone() {
         onDoneResolver.resolve(true)
       },
-    }
-
-    const owElem = document.createElement(elementName) as OfferwallModal
-    owElem.setController(controller)
+    })
 
     // in case initialize() wasn't called
     this.#configPromise ??= fetchConfig(params)
@@ -119,7 +118,7 @@ export class WebMonetizationCustomOfferwallChoice implements OfferwallCustomChoi
     document.body.appendChild(owElem)
 
     try {
-      await this.#runBusinessLogic(owElem, abortController.signal)
+      await this.#runBusinessLogic(actions, abortController.signal)
       onDoneResolver.resolve(true)
     } catch (error) {
       console.error(error)
@@ -157,7 +156,7 @@ export class WebMonetizationCustomOfferwallChoice implements OfferwallCustomChoi
    *   to give access.
    * - If either of above was within allowed time, give access.
    */
-  #runBusinessLogic = async (elem: OfferwallModal, signal: AbortSignal) => {
+  #runBusinessLogic = async (actions: Actions, signal: AbortSignal) => {
     const { linkElem } = this.#deps
     const wasExtensionInstalledAtStart = isExtensionInstalled()
 
@@ -167,11 +166,11 @@ export class WebMonetizationCustomOfferwallChoice implements OfferwallCustomChoi
       this.#isWithinAllowedTime(lastEvent.timestamp) &&
       isExtensionInstalled()
     ) {
-      return elem.setScreen('all-set')
+      return actions.setScreen('all-set')
     }
 
     if (wasExtensionInstalledAtStart) {
-      elem.setScreen('contribution-required')
+      actions.setScreen('contribution-required')
       while (true) {
         if (!this.#monetizationEventResolver) {
           // if not initialized
@@ -189,7 +188,7 @@ export class WebMonetizationCustomOfferwallChoice implements OfferwallCustomChoi
           this.#isForSameWalletAddress(event.paymentPointer) &&
           (await isValidPayment(event.incomingPayment))
         ) {
-          elem.setScreen('all-set')
+          actions.setScreen('all-set')
           this.#setLastEvent({
             type: 'monetization',
             timestamp: Date.now(),
@@ -211,7 +210,7 @@ export class WebMonetizationCustomOfferwallChoice implements OfferwallCustomChoi
       }
     } else {
       await this.#waitForExtensionInstall(signal)
-      elem.setScreen('all-set')
+      actions.setScreen('all-set')
       this.#setLastEvent({ type: 'install', timestamp: Date.now() })
     }
   }