@onborn/billing 0.1.0-beta.4 → 0.1.0-beta.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.1.0-beta.5
+
+- Wait for the native store connection before loading localized products,
+  purchasing, or restoring. This prevents a cold-open paywall from showing an
+  unavailable state that only clears after a manual retry.
+
 ## 0.1.0-beta.4
 
 - Surface native store product-loading failures instead of silently falling

package/dist/expo-iap.d.ts

@@ -3,6 +3,8 @@ import type { OnbornBillingAdapter } from "./types";
 export type ExpoIapBillingAdapterOptions = {
     /** Additional subscription SKUs that should share the adapter product cache. */
     productIds?: string[];
+    /** Maximum time an operation waits for the native store connection. */
+    connectionTimeoutMs?: number;
     purchaseTimeoutMs?: number;
     purchaseRecoveryDelayMs?: number;
     productCacheMs?: number;

package/dist/expo-iap.js

@@ -3,6 +3,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Platform } from "react-native";
 import { createNativeStoresBillingAdapter } from "./adapters/nativeStores";
 const DEFAULT_PURCHASE_TIMEOUT_MS = 2 * 60 * 1000;
+const DEFAULT_CONNECTION_TIMEOUT_MS = 15_000;
 const DEFAULT_RECOVERY_DELAY_MS = 750;
 const DEFAULT_PRODUCT_CACHE_MS = 10_000;
 const DEFAULT_PRODUCT_RETRY_DELAY_MS = 500;
@@ -15,6 +16,8 @@ const DEFAULT_RESTORE_SETTLE_DELAY_MS = 300;
  */
 export function useExpoIapBillingAdapter(options = {}) {
     const pendingPurchaseRef = useRef(null);
+    const connectedRef = useRef(false);
+    const connectionWaitersRef = useRef(new Set());
     const productCacheRef = useRef(null);
     const productRequestRef = useRef(null);
     const knownProductIdsRef = useRef(new Set(normalizeIds(options.productIds)));
@@ -59,13 +62,48 @@ export function useExpoIapBillingAdapter(options = {}) {
             settlePendingPurchase((current) => current.reject(normalized));
         },
     });
+    useEffect(() => {
+        connectedRef.current = connected;
+        if (!connected)
+            return;
+        for (const waiter of connectionWaitersRef.current) {
+            clearTimeout(waiter.timeout);
+            waiter.resolve();
+        }
+        connectionWaitersRef.current.clear();
+    }, [connected]);
+    const waitForConnection = useCallback(async () => {
+        if (connectedRef.current)
+            return;
+        await new Promise((resolve, reject) => {
+            const waiter = {
+                resolve,
+                reject,
+                timeout: setTimeout(() => {
+                    connectionWaitersRef.current.delete(waiter);
+                    reject(new Error("Native store connection timed out."));
+                }, options.connectionTimeoutMs ?? DEFAULT_CONNECTION_TIMEOUT_MS),
+            };
+            connectionWaitersRef.current.add(waiter);
+            // The connection may have completed between the first check and
+            // registering this waiter.
+            if (connectedRef.current) {
+                connectionWaitersRef.current.delete(waiter);
+                clearTimeout(waiter.timeout);
+                resolve();
+            }
+        });
+    }, [options.connectionTimeoutMs]);
     useEffect(() => () => {
         settlePendingPurchase((item) => item.reject(new Error("Purchase interrupted.")));
+        for (const waiter of connectionWaitersRef.current) {
+            clearTimeout(waiter.timeout);
+            waiter.reject(new Error("Native store connection was interrupted."));
+        }
+        connectionWaitersRef.current.clear();
     }, [settlePendingPurchase]);
     const loadProducts = useCallback(async (requestedProductIds, force = false) => {
-        if (!connected) {
-            throw new Error("Native store is not connected.");
-        }
+        await waitForConnection();
         const requestedIds = normalizeIds(requestedProductIds);
         for (const productId of requestedIds) {
             knownProductIdsRef.current.add(productId);
@@ -111,10 +149,10 @@ export function useExpoIapBillingAdapter(options = {}) {
         }
         return matches;
     }, [
-        connected,
         options.productCacheMs,
         options.productRetryCount,
         options.productRetryDelayMs,
+        waitForConnection,
     ]);
     const reloadProducts = useCallback(async (productIds = options.productIds ?? []) => {
         const normalizedIds = normalizeIds(productIds);
@@ -141,9 +179,7 @@ export function useExpoIapBillingAdapter(options = {}) {
                 return nativeProducts.map(normalizeStoreProduct);
             },
             async purchaseProduct({ storeProductId }) {
-                if (!connected) {
-                    throw new Error("Native store is not connected.");
-                }
+                await waitForConnection();
                 if (pendingPurchaseRef.current) {
                     throw new Error("Another purchase is already in progress.");
                 }
@@ -212,9 +248,7 @@ export function useExpoIapBillingAdapter(options = {}) {
                 return normalizeStorePurchase(purchase);
             },
             async restorePurchases({ products: configuredProducts }) {
-                if (!connected) {
-                    throw new Error("Native store is not connected.");
-                }
+                await waitForConnection();
                 const subscriptionIds = normalizeIds([
                     ...configuredProducts.map((product) => product.storeProductId),
                     ...knownProductIdsRef.current,
@@ -285,7 +319,6 @@ export function useExpoIapBillingAdapter(options = {}) {
             },
         };
     }, [
-        connected,
         finishTransaction,
         loadProducts,
         options.purchaseTimeoutMs,
@@ -293,6 +326,7 @@ export function useExpoIapBillingAdapter(options = {}) {
         recoverPurchase,
         requestPurchase,
         settlePendingPurchase,
+        waitForConnection,
     ]);
     return {
         billingAdapter,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onborn/billing",
-  "version": "0.1.0-beta.4",
+  "version": "0.1.0-beta.5",
   "description": "Headless billing, offerings, purchases, restores, and entitlements for Onborn.",
   "license": "UNLICENSED",
   "repository": {