@blocklet/payment-react-headless 1.29.9 → 1.29.11

package/es/checkout/hooks/useSubmit.js

@@ -91,9 +91,20 @@ export function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit
       }
     };
   }, [subscriptionRef.current, status]);
-  const handleCompletion = useMemoizedFn(async () => {
+  const reconcileStripe = useMemoizedFn(async () => {
+    await api.post(API.RECONCILE_STRIPE_SESSION(sessionId));
+  });
+  const handleCompletion = useMemoizedFn(async (withStripeReconcile = false) => {
     try {
-      const completionResult = await waitForCheckoutComplete(sessionId);
+      if (withStripeReconcile) {
+        try {
+          await reconcileStripe();
+        } catch {
+        }
+      }
+      const completionResult = await waitForCheckoutComplete(sessionId, {
+        reconcile: withStripeReconcile ? reconcileStripe : void 0
+      });
       if (!mountedRef.current) return;
       setResult(completionResult);
       updateSessionData?.(completionResult);
@@ -126,7 +137,7 @@ export function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit
     }
     setStatus("submitting");
     setContext(null);
-    handleCompletion();
+    handleCompletion(true);
   }, [sessionId]);
   useEffect(() => {
     if (status !== "completed" || !sessionId) return void 0;
@@ -502,7 +513,7 @@ export function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit
     if (status !== "waiting_stripe") return;
     setStatus("submitting");
     setContext(null);
-    await handleCompletion();
+    await handleCompletion(true);
   });
   const stripeCancel = useMemoizedFn(async () => {
     if (status !== "waiting_stripe") return;

package/es/shared/api.d.ts

@@ -22,6 +22,7 @@ export declare const API: {
     readonly START_PAYMENT_LINK: (id: string) => string;
     readonly RETRIEVE_SESSION: (id: string) => string;
     readonly STATUS_SESSION: (id: string) => string;
+    readonly RECONCILE_STRIPE_SESSION: (id: string) => string;
     readonly SWITCH_CURRENCY: (id: string) => string;
     readonly SUBMIT: (id: string) => string;
     readonly DONATE_SUBMIT: (id: string) => string;

package/es/shared/api.js

@@ -62,6 +62,7 @@ export const API = {
   START_PAYMENT_LINK: (id) => `/api/checkout-sessions/start/${id}`,
   RETRIEVE_SESSION: (id) => `/api/checkout-sessions/retrieve/${id}`,
   STATUS_SESSION: (id) => `/api/checkout-sessions/status/${id}`,
+  RECONCILE_STRIPE_SESSION: (id) => `/api/checkout-sessions/${id}/stripe-reconcile`,
   SWITCH_CURRENCY: (id) => `/api/checkout-sessions/${id}/switch-currency`,
   SUBMIT: (id) => `/api/checkout-sessions/${id}/submit`,
   DONATE_SUBMIT: (id) => `/api/checkout-sessions/${id}/donate-submit`,

package/es/shared/polling.d.ts

@@ -1,4 +1,9 @@
 import type { CheckoutResult } from '../checkout/types';
+type PollOptions = {
+    reconcile?: () => Promise<void>;
+    now?: () => number;
+    sleep?: (ms: number) => Promise<void>;
+};
 /**
  * Poll for checkout session completion.
  *
@@ -8,9 +13,10 @@ import type { CheckoutResult } from '../checkout/types';
  *
  * This reduces D1 load during payment processing and speeds up detection.
  */
-export declare function waitForCheckoutComplete(sessionId: string): Promise<CheckoutResult>;
+export declare function waitForCheckoutComplete(sessionId: string, options?: PollOptions): Promise<CheckoutResult>;
 /**
  * Generate unique idempotency key for submit (Final Freeze Architecture).
  * Format: ${sessionId}-${currencyId}-${timestamp}-${random}
  */
 export declare function generateIdempotencyKey(sessionId: string, currencyId: string): string;
+export {};

package/es/shared/polling.js

@@ -1,13 +1,17 @@
 import api, { API } from "./api.js";
 const POLL_TIMEOUT_MS = 5 * 60 * 1e3;
+const STRIPE_RECONCILE_CHECKPOINTS_MS = [2e3, 5e3, 1e4];
 function nextPollInterval(elapsedMs) {
   if (elapsedMs < 5e3) return 500;
   if (elapsedMs < 3e4) return 1500;
   return 3e3;
 }
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-export async function waitForCheckoutComplete(sessionId) {
-  const startedAt = Date.now();
+export async function waitForCheckoutComplete(sessionId, options = {}) {
+  const now = options.now ?? Date.now;
+  const wait = options.sleep ?? sleep;
+  const startedAt = now();
+  let reconcileIndex = 0;
   while (true) {
     const { data: data2 } = await api.get(API.STATUS_SESSION(sessionId));
     if (data2.paymentIntent && data2.paymentIntent.status === "requires_action" && data2.paymentIntent.last_payment_error) {
@@ -15,11 +19,18 @@ export async function waitForCheckoutComplete(sessionId) {
     }
     const done = data2.checkoutSession?.status === "complete" && ["paid", "no_payment_required"].includes(data2.checkoutSession?.payment_status);
     if (done) break;
-    const elapsed = Date.now() - startedAt;
+    const elapsed = now() - startedAt;
     if (elapsed >= POLL_TIMEOUT_MS) {
       throw new Error("waitForCheckoutComplete: timed out");
     }
-    await sleep(nextPollInterval(elapsed));
+    if (options.reconcile && reconcileIndex < STRIPE_RECONCILE_CHECKPOINTS_MS.length && elapsed >= STRIPE_RECONCILE_CHECKPOINTS_MS[reconcileIndex]) {
+      reconcileIndex += 1;
+      try {
+        await options.reconcile();
+      } catch {
+      }
+    }
+    await wait(nextPollInterval(elapsed));
   }
   const { data } = await api.get(API.RETRIEVE_SESSION(sessionId));
   return data;

package/lib/checkout/hooks/useSubmit.js

@@ -87,9 +87,19 @@ function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit, isDon
       }
     };
   }, [subscriptionRef.current, status]);
-  const handleCompletion = (0, _ahooks.useMemoizedFn)(async () => {
+  const reconcileStripe = (0, _ahooks.useMemoizedFn)(async () => {
+    await _api.default.post(_api.API.RECONCILE_STRIPE_SESSION(sessionId));
+  });
+  const handleCompletion = (0, _ahooks.useMemoizedFn)(async (withStripeReconcile = false) => {
     try {
-      const completionResult = await (0, _polling.waitForCheckoutComplete)(sessionId);
+      if (withStripeReconcile) {
+        try {
+          await reconcileStripe();
+        } catch {}
+      }
+      const completionResult = await (0, _polling.waitForCheckoutComplete)(sessionId, {
+        reconcile: withStripeReconcile ? reconcileStripe : void 0
+      });
       if (!mountedRef.current) return;
       setResult(completionResult);
       updateSessionData?.(completionResult);
@@ -128,7 +138,7 @@ function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit, isDon
     }
     setStatus("submitting");
     setContext(null);
-    handleCompletion();
+    handleCompletion(true);
   }, [sessionId]);
   (0, _react.useEffect)(() => {
     if (status !== "completed" || !sessionId) return void 0;
@@ -522,7 +532,7 @@ function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit, isDon
     if (status !== "waiting_stripe") return;
     setStatus("submitting");
     setContext(null);
-    await handleCompletion();
+    await handleCompletion(true);
   });
   const stripeCancel = (0, _ahooks.useMemoizedFn)(async () => {
     if (status !== "waiting_stripe") return;

package/lib/shared/api.d.ts

@@ -22,6 +22,7 @@ export declare const API: {
     readonly START_PAYMENT_LINK: (id: string) => string;
     readonly RETRIEVE_SESSION: (id: string) => string;
     readonly STATUS_SESSION: (id: string) => string;
+    readonly RECONCILE_STRIPE_SESSION: (id: string) => string;
     readonly SWITCH_CURRENCY: (id: string) => string;
     readonly SUBMIT: (id: string) => string;
     readonly DONATE_SUBMIT: (id: string) => string;

package/lib/shared/api.js

@@ -69,6 +69,7 @@ const API = exports.API = {
   START_PAYMENT_LINK: id => `/api/checkout-sessions/start/${id}`,
   RETRIEVE_SESSION: id => `/api/checkout-sessions/retrieve/${id}`,
   STATUS_SESSION: id => `/api/checkout-sessions/status/${id}`,
+  RECONCILE_STRIPE_SESSION: id => `/api/checkout-sessions/${id}/stripe-reconcile`,
   SWITCH_CURRENCY: id => `/api/checkout-sessions/${id}/switch-currency`,
   SUBMIT: id => `/api/checkout-sessions/${id}/submit`,
   DONATE_SUBMIT: id => `/api/checkout-sessions/${id}/donate-submit`,

package/lib/shared/polling.d.ts

@@ -1,4 +1,9 @@
 import type { CheckoutResult } from '../checkout/types';
+type PollOptions = {
+    reconcile?: () => Promise<void>;
+    now?: () => number;
+    sleep?: (ms: number) => Promise<void>;
+};
 /**
  * Poll for checkout session completion.
  *
@@ -8,9 +13,10 @@ import type { CheckoutResult } from '../checkout/types';
  *
  * This reduces D1 load during payment processing and speeds up detection.
  */
-export declare function waitForCheckoutComplete(sessionId: string): Promise<CheckoutResult>;
+export declare function waitForCheckoutComplete(sessionId: string, options?: PollOptions): Promise<CheckoutResult>;
 /**
  * Generate unique idempotency key for submit (Final Freeze Architecture).
  * Format: ${sessionId}-${currencyId}-${timestamp}-${random}
  */
 export declare function generateIdempotencyKey(sessionId: string, currencyId: string): string;
+export {};

package/lib/shared/polling.js

@@ -9,14 +9,18 @@ var _api = _interopRequireWildcard(require("./api"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const POLL_TIMEOUT_MS = 5 * 60 * 1e3;
+const STRIPE_RECONCILE_CHECKPOINTS_MS = [2e3, 5e3, 1e4];
 function nextPollInterval(elapsedMs) {
   if (elapsedMs < 5e3) return 500;
   if (elapsedMs < 3e4) return 1500;
   return 3e3;
 }
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
-async function waitForCheckoutComplete(sessionId) {
-  const startedAt = Date.now();
+async function waitForCheckoutComplete(sessionId, options = {}) {
+  const now = options.now ?? Date.now;
+  const wait = options.sleep ?? sleep;
+  const startedAt = now();
+  let reconcileIndex = 0;
   while (true) {
     const {
       data: data2
@@ -26,11 +30,17 @@ async function waitForCheckoutComplete(sessionId) {
     }
     const done = data2.checkoutSession?.status === "complete" && ["paid", "no_payment_required"].includes(data2.checkoutSession?.payment_status);
     if (done) break;
-    const elapsed = Date.now() - startedAt;
+    const elapsed = now() - startedAt;
     if (elapsed >= POLL_TIMEOUT_MS) {
       throw new Error("waitForCheckoutComplete: timed out");
     }
-    await sleep(nextPollInterval(elapsed));
+    if (options.reconcile && reconcileIndex < STRIPE_RECONCILE_CHECKPOINTS_MS.length && elapsed >= STRIPE_RECONCILE_CHECKPOINTS_MS[reconcileIndex]) {
+      reconcileIndex += 1;
+      try {
+        await options.reconcile();
+      } catch {}
+    }
+    await wait(nextPollInterval(elapsed));
   }
   const {
     data

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react-headless",
-  "version": "1.29.9",
+  "version": "1.29.11",
   "description": "Headless React hooks for payment-kit checkout",
   "keywords": [
     "react",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@arcblock/ws": "^1.30.24",
     "@blocklet/js-sdk": "workspace:*",
-    "@blocklet/payment-types": "1.29.9",
+    "@blocklet/payment-types": "1.29.11",
     "@ocap/util": "^1.30.24",
     "ahooks": "^3.8.5",
     "google-libphonenumber": "^3.2.42",
@@ -60,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "249bd9bf3c6cc54f77c260edb4b4d3c0be60f126"
+  "gitHead": "775c2d6b9624e70d12a3872f46f7b2deb52591ba"
 }

package/src/checkout/hooks/useSubmit.ts

@@ -181,9 +181,22 @@ export function useSubmit(
   }, [subscriptionRef.current, status]); // eslint-disable-line react-hooks/exhaustive-deps
 
   // Common completion handler
-  const handleCompletion = useMemoizedFn(async () => {
+  const reconcileStripe = useMemoizedFn(async () => {
+    await api.post(API.RECONCILE_STRIPE_SESSION(sessionId));
+  });
+
+  const handleCompletion = useMemoizedFn(async (withStripeReconcile = false) => {
     try {
-      const completionResult = await waitForCheckoutComplete(sessionId);
+      if (withStripeReconcile) {
+        try {
+          await reconcileStripe();
+        } catch {
+          // Continue polling; webhook delivery may still reconcile the payment.
+        }
+      }
+      const completionResult = await waitForCheckoutComplete(sessionId, {
+        reconcile: withStripeReconcile ? reconcileStripe : undefined,
+      });
       if (!mountedRef.current) return;
       setResult(completionResult);
       // Update session context so downstream consumers (e.g. SuccessView) have fresh data
@@ -235,7 +248,7 @@ export function useSubmit(
     // early-throws on a surfaced last_payment_error, so a hard decline still ends fast.
     setStatus('submitting');
     setContext(null);
-    handleCompletion();
+    handleCompletion(true);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [sessionId]);
 
@@ -720,7 +733,7 @@ export function useSubmit(
     if (status !== 'waiting_stripe') return;
     setStatus('submitting');
     setContext(null);
-    await handleCompletion();
+    await handleCompletion(true);
   });
 
   // Stripe cancel

package/src/shared/api.ts

@@ -99,6 +99,7 @@ export const API = {
   START_PAYMENT_LINK: (id: string) => `/api/checkout-sessions/start/${id}`,
   RETRIEVE_SESSION: (id: string) => `/api/checkout-sessions/retrieve/${id}`,
   STATUS_SESSION: (id: string) => `/api/checkout-sessions/status/${id}`,
+  RECONCILE_STRIPE_SESSION: (id: string) => `/api/checkout-sessions/${id}/stripe-reconcile`,
   SWITCH_CURRENCY: (id: string) => `/api/checkout-sessions/${id}/switch-currency`,
   SUBMIT: (id: string) => `/api/checkout-sessions/${id}/submit`,
   DONATE_SUBMIT: (id: string) => `/api/checkout-sessions/${id}/donate-submit`,

package/src/shared/polling.ts

@@ -2,6 +2,13 @@ import api, { API } from './api';
 import type { CheckoutResult } from '../checkout/types';
 
 const POLL_TIMEOUT_MS = 5 * 60 * 1000;
+const STRIPE_RECONCILE_CHECKPOINTS_MS = [2_000, 5_000, 10_000];
+
+type PollOptions = {
+  reconcile?: () => Promise<void>;
+  now?: () => number;
+  sleep?: (ms: number) => Promise<void>;
+};
 
 /**
  * Progressive polling interval — typical DID Connect + on-chain confirm + DB
@@ -26,8 +33,14 @@ const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
  *
  * This reduces D1 load during payment processing and speeds up detection.
  */
-export async function waitForCheckoutComplete(sessionId: string): Promise<CheckoutResult> {
-  const startedAt = Date.now();
+export async function waitForCheckoutComplete(
+  sessionId: string,
+  options: PollOptions = {}
+): Promise<CheckoutResult> {
+  const now = options.now ?? Date.now;
+  const wait = options.sleep ?? sleep;
+  const startedAt = now();
+  let reconcileIndex = 0;
 
   // Phase 1: Lightweight status polling with progressive backoff.
   // First check fires immediately — happy-path DID flows where the backend
@@ -48,11 +61,24 @@ export async function waitForCheckoutComplete(sessionId: string): Promise<Checko
       ['paid', 'no_payment_required'].includes(data.checkoutSession?.payment_status);
     if (done) break;
 
-    const elapsed = Date.now() - startedAt;
+    const elapsed = now() - startedAt;
     if (elapsed >= POLL_TIMEOUT_MS) {
       throw new Error('waitForCheckoutComplete: timed out');
     }
-    await sleep(nextPollInterval(elapsed));
+    if (
+      options.reconcile &&
+      reconcileIndex < STRIPE_RECONCILE_CHECKPOINTS_MS.length &&
+      elapsed >= STRIPE_RECONCILE_CHECKPOINTS_MS[reconcileIndex]!
+    ) {
+      reconcileIndex += 1;
+      try {
+        await options.reconcile();
+      } catch {
+        // Webhook remains the primary path. A failed fallback must not stop
+        // local status polling or turn a successful payment into a UI error.
+      }
+    }
+    await wait(nextPollInterval(elapsed));
   }
 
   // Phase 2: Full retrieve for success page data

package/tests/shared/polling.spec.ts

@@ -0,0 +1,65 @@
+import { describe, expect, it, jest } from '@jest/globals';
+
+const get = jest.fn<(url: string) => Promise<any>>();
+
+jest.mock('../../src/shared/api', () => ({
+  __esModule: true,
+  default: { get },
+  API: {
+    STATUS_SESSION: (id: string) => `/status/${id}`,
+    RETRIEVE_SESSION: (id: string) => `/retrieve/${id}`,
+  },
+}));
+
+import { waitForCheckoutComplete } from '../../src/shared/polling';
+
+describe('waitForCheckoutComplete Stripe reconciliation', () => {
+  it('reconciles at bounded checkpoints while local status remains pending', async () => {
+    let elapsed = 0;
+    const reconcile = jest.fn<() => Promise<void>>().mockResolvedValue();
+    get.mockImplementation(async (url: string) => {
+      if (url.startsWith('/retrieve/')) {
+        return { data: { checkoutSession: { status: 'complete', payment_status: 'paid' } } };
+      }
+      if (reconcile.mock.calls.length >= 2) {
+        return {
+          data: {
+            checkoutSession: { status: 'complete', payment_status: 'paid' },
+            paymentIntent: { status: 'succeeded' },
+          },
+        };
+      }
+      return {
+        data: {
+          checkoutSession: { status: 'open', payment_status: 'unpaid' },
+          paymentIntent: { status: 'processing' },
+        },
+      };
+    });
+
+    const result = await waitForCheckoutComplete('cs_1', {
+      reconcile,
+      now: () => elapsed,
+      sleep: async (ms: number) => {
+        elapsed += ms;
+      },
+    });
+
+    expect(reconcile).toHaveBeenCalledTimes(2);
+    expect(elapsed).toBeGreaterThanOrEqual(5000);
+    expect(result.checkoutSession.status).toBe('complete');
+  });
+
+  it('does not reconcile non-Stripe polling when no callback is supplied', async () => {
+    get
+      .mockResolvedValueOnce({
+        data: { checkoutSession: { status: 'complete', payment_status: 'paid' }, paymentIntent: null },
+      })
+      .mockResolvedValueOnce({
+        data: { checkoutSession: { status: 'complete', payment_status: 'paid' } },
+      });
+
+    await expect(waitForCheckoutComplete('cs_2')).resolves.toBeTruthy();
+    expect(get).toHaveBeenCalledTimes(2);
+  });
+});