@funnelsgrove/payments 0.15.0 → 0.15.3

package/dist/providers/stripe/components/StripeCheckoutExpressCheckoutButton.js

@@ -53,6 +53,15 @@ const normalizeStripeCheckoutProviderError = (error) => {
 };
 export function StripeCheckoutExpressCheckoutButton({ beforeConfirm, checkoutAnalytics, checkoutSessionId, returnUrl, confirmEmail = true, customerEmail, className, options, availabilityPaymentMethods = ['applePay'], initialAvailable, keepInitialAvailableOnReady = false, serverUpdateKey, supportedCountries, onServerUpdate, onAvailabilityChange, onCancel, onError, onPaymentInfoSubmitted, onPaymentRejected, onSuccess, unsupportedCountryMessage, }) {
     const checkoutState = useCheckout();
+    const [loadRetry, setLoadRetry] = useState(0);
+    const loadRetryUsedRef = useRef(false);
+    const walletReadyRef = useRef(false);
+    const loadRetryTimerRef = useRef(null);
+    useEffect(() => () => {
+        if (loadRetryTimerRef.current !== null) {
+            clearTimeout(loadRetryTimerRef.current);
+        }
+    }, []);
     const appliedServerUpdateKeyRef = useRef('');
     const [appliedServerUpdateKey, setAppliedServerUpdateKey] = useState('');
     const serverUpdatePromiseRef = useRef(null);
@@ -312,10 +321,27 @@ export function StripeCheckoutExpressCheckoutButton({ beforeConfirm, checkoutAna
                 ]
                     .filter(Boolean)
                     .join(' '), children: _jsx(ExpressCheckoutElementWithCancel, { options: resolvedOptions, onCancel: handleCancel, onClick: handleClick, onConfirm: (event) => void handleConfirm(event), onLoadError: ({ error }) => {
+                        if (loadRetryTimerRef.current !== null) {
+                            return;
+                        }
+                        if (!walletReadyRef.current && !loadRetryUsedRef.current) {
+                            loadRetryUsedRef.current = true;
+                            // Replace only the failed Element, retaining the Checkout Session.
+                            loadRetryTimerRef.current = setTimeout(() => {
+                                loadRetryTimerRef.current = null;
+                                setLoadRetry(1);
+                            }, 1000);
+                            return;
+                        }
                         setWalletAvailable(false);
                         onAvailabilityChange === null || onAvailabilityChange === void 0 ? void 0 : onAvailabilityChange(false);
                         reportFailure(error.message || 'Unable to load wallet checkout.', 'wallet_load');
                     }, onReady: ({ availablePaymentMethods: availablePaymentMethodsMap }) => {
+                        walletReadyRef.current = true;
+                        if (loadRetryTimerRef.current !== null) {
+                            clearTimeout(loadRetryTimerRef.current);
+                            loadRetryTimerRef.current = null;
+                        }
                         const available = Boolean(availabilityPaymentMethods.some((paymentMethod) => availablePaymentMethodsMap === null || availablePaymentMethodsMap === void 0 ? void 0 : availablePaymentMethodsMap[paymentMethod]));
                         const resolvedAvailable = available || (keepInitialAvailableOnReady && initialAvailable === true);
                         setWalletAvailable(resolvedAvailable);
@@ -323,7 +349,7 @@ export function StripeCheckoutExpressCheckoutButton({ beforeConfirm, checkoutAna
                         if (resolvedAvailable) {
                             onError === null || onError === void 0 ? void 0 : onError(null);
                         }
-                    } }) })), _jsx("style", { children: stripeExpressCheckoutButtonStyles })] }));
+                    } }, loadRetry) })), _jsx("style", { children: stripeExpressCheckoutButtonStyles })] }));
 }
 const stripeExpressCheckoutButtonStyles = `
 .stripe-express-checkout-button {

package/dist/providers/stripe/hooks/useStripeOneTimeCheckoutSession.js

@@ -239,6 +239,7 @@ export function useStripeOneTimeCheckoutSession({ runtimeConfigRevisionId, payme
                             paymentMethod: options.paymentMethod,
                             provider: 'stripe',
                             providerErrorCode: failure.providerErrorCode,
+                            checkoutRequestId: failure.checkoutRequestId,
                         });
                     }
                     setError(message);

package/dist/providers/stripe/hooks/useStripeSubscriptionCheckoutSession.js

@@ -259,6 +259,7 @@ export function useStripeSubscriptionCheckoutSession({ checkoutMode, analyticsMe
                             paymentMethod: options.paymentMethod,
                             provider: 'stripe',
                             providerErrorCode: failure.providerErrorCode,
+                            checkoutRequestId: failure.checkoutRequestId,
                         });
                     }
                     setError(message);
@@ -380,6 +381,7 @@ export function useStripeSubscriptionCheckoutSession({ checkoutMode, analyticsMe
                     failureStage: 'checkout_session_update',
                     provider: 'stripe',
                     providerErrorCode: failure.providerErrorCode,
+                    checkoutRequestId: failure.checkoutRequestId,
                 });
             }
             setError(message);

package/dist/providers/stripe/services/stripeCheckoutFailure.d.ts

@@ -1,4 +1,5 @@
 export type StripeCheckoutFailure = {
+    checkoutRequestId?: string;
     errorCode?: string;
     message: string;
     providerErrorCode?: string;

package/dist/providers/stripe/services/stripeCheckoutFailure.js

@@ -14,9 +14,8 @@ export const describeStripeCheckoutFailure = (error) => {
         : rawMessage === 'Internal server error'
             ? 'Unable to initialize checkout. Stripe settings may be missing for this funnel.'
             : rawMessage;
-    return {
-        errorCode,
+    return Object.assign(Object.assign({}, (error instanceof FunnelSdkHttpError && error.checkoutRequestId
+        ? { checkoutRequestId: error.checkoutRequestId } : {})), { errorCode,
         message,
-        providerErrorCode,
-    };
+        providerErrorCode });
 };

package/dist/services/checkoutObservability.service.d.ts

@@ -23,6 +23,7 @@ type CheckoutObservabilityInput = {
     provider: 'solidgate' | 'stripe';
 };
 type CheckoutFailureShownInput = CheckoutObservabilityInput & {
+    checkoutRequestId?: string;
     errorCode?: string | null;
     errorMessage: string;
     providerDeclineCode?: string | null;

package/dist/services/checkoutObservability.service.js

@@ -96,6 +96,7 @@ const reportCheckoutObservability = (input) => {
             : buildSdkHeaders({ 'Content-Type': 'application/json' }),
         body: JSON.stringify({
             checkoutSessionId: input.checkoutSessionId || undefined,
+            checkoutRequestId: input.checkoutRequestId,
             environment,
             errorCode: input.errorCode,
             errorMessage: input.errorMessage,
@@ -134,7 +135,7 @@ const resolveErrorCode = (message, requestedCode) => {
 const emitCheckoutObservability = (eventType, input, failure) => {
     var _a, _b, _c, _d;
     const paymentMethod = toAnalyticsPaymentMethod(input.paymentMethod);
-    const metadata = Object.assign(Object.assign({}, ((_a = input.analytics.metadata) !== null && _a !== void 0 ? _a : {})), { checkout_session_id: ((_b = input.checkoutSessionId) === null || _b === void 0 ? void 0 : _b.trim()) || undefined, checkout_failure_stage: input.failureStage, payment_provider: input.provider, payment_method: paymentMethod || undefined, error_code: failure === null || failure === void 0 ? void 0 : failure.errorCode, error_message: failure === null || failure === void 0 ? void 0 : failure.errorMessage, checkout_failure_category: (_c = failure === null || failure === void 0 ? void 0 : failure.failureCategory) !== null && _c !== void 0 ? _c : (eventType === 'checkout_canceled' ? 'user_canceled' : undefined), provider_decline_code: failure === null || failure === void 0 ? void 0 : failure.providerDeclineCode, provider_error_code: failure === null || failure === void 0 ? void 0 : failure.providerErrorCode, provider_error_type: failure === null || failure === void 0 ? void 0 : failure.providerErrorType });
+    const metadata = Object.assign(Object.assign({}, ((_a = input.analytics.metadata) !== null && _a !== void 0 ? _a : {})), { checkout_session_id: ((_b = input.checkoutSessionId) === null || _b === void 0 ? void 0 : _b.trim()) || undefined, checkout_request_id: failure === null || failure === void 0 ? void 0 : failure.checkoutRequestId, checkout_failure_stage: input.failureStage, payment_provider: input.provider, payment_method: paymentMethod || undefined, error_code: failure === null || failure === void 0 ? void 0 : failure.errorCode, error_message: failure === null || failure === void 0 ? void 0 : failure.errorMessage, checkout_failure_category: (_c = failure === null || failure === void 0 ? void 0 : failure.failureCategory) !== null && _c !== void 0 ? _c : (eventType === 'checkout_canceled' ? 'user_canceled' : undefined), provider_decline_code: failure === null || failure === void 0 ? void 0 : failure.providerDeclineCode, provider_error_code: failure === null || failure === void 0 ? void 0 : failure.providerErrorCode, provider_error_type: failure === null || failure === void 0 ? void 0 : failure.providerErrorType });
     const eventId = publicAnalyticsSdk.track({
         eventType,
         environment: input.analytics.environment,
@@ -151,6 +152,7 @@ const emitCheckoutObservability = (eventType, input, failure) => {
     void reportCheckoutObservability({
         analytics: input.analytics,
         checkoutSessionId: input.checkoutSessionId,
+        checkoutRequestId: failure === null || failure === void 0 ? void 0 : failure.checkoutRequestId,
         errorCode: failure === null || failure === void 0 ? void 0 : failure.errorCode,
         errorMessage: failure === null || failure === void 0 ? void 0 : failure.errorMessage,
         failureCategory: (_d = failure === null || failure === void 0 ? void 0 : failure.failureCategory) !== null && _d !== void 0 ? _d : (eventType === 'checkout_canceled' ? 'user_canceled' : undefined),
@@ -184,6 +186,9 @@ export const trackCheckoutFailureShown = (input) => {
     });
     const paymentRejected = failureCategory === 'payment_rejection';
     return emitCheckoutObservability(paymentRejected ? 'checkout_payment_rejected' : 'checkout_failure_shown', input, {
+        checkoutRequestId: input.checkoutRequestId
+            && /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(input.checkoutRequestId)
+            ? input.checkoutRequestId : undefined,
         errorCode: paymentRejected
             ? providerDeclineCode || providerErrorCode || 'payment_rejected'
             : resolveErrorCode(errorMessage, input.errorCode),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/payments",
-  "version": "0.15.0",
+  "version": "0.15.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/The-Solid-Grove/funnelsgrove.git",
@@ -32,8 +32,8 @@
     "test:run": "vitest run --passWithNoTests"
   },
   "dependencies": {
-    "@funnelsgrove/analytics": "^0.1.97",
-    "@funnelsgrove/runtime": "^0.13.0",
+    "@funnelsgrove/analytics": "^0.1.100",
+    "@funnelsgrove/runtime": "0.14.0",
     "@solidgate/react-sdk": "1.34.0",
     "@stripe/react-stripe-js": "^5.6.0",
     "@stripe/stripe-js": "^8.7.0",