expo-iap 3.0.6 → 3.0.7-rc.1

package/ios/expoiap.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/expoiap.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-iap",
-  "version": "3.0.6",
+  "version": "3.0.7-rc.1",
   "description": "In App Purchase module in Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/plugin/build/withIAP.js

@@ -69,7 +69,7 @@ const modifyAppBuildGradle = (gradle, language) => {
     const impl = (ga, v) => language === 'kotlin'
         ? `    implementation("${ga}:${v}")`
         : `    implementation "${ga}:${v}"`;
-    const openiapDep = impl('io.github.hyochan.openiap:openiap-google', '1.1.10');
+    const openiapDep = impl('io.github.hyochan.openiap:openiap-google', '1.1.11');
     // Remove any existing openiap-google lines (any version, groovy/kotlin, implementation/api)
     const openiapAnyLine = /^\s*(?:implementation|api)\s*\(?\s*["']io\.github\.hyochan\.openiap:openiap-google:[^"']+["']\s*\)?\s*$/gm;
     const hadExisting = openiapAnyLine.test(modified);
@@ -81,8 +81,8 @@ const modifyAppBuildGradle = (gradle, language) => {
         // Insert just after the opening `dependencies {` line
         modified = addLineToGradle(modified, /dependencies\s*{/, openiapDep, 1);
         logOnce(hadExisting
-            ? '🛠️ expo-iap: Replaced OpenIAP dependency with 1.1.10'
-            : '🛠️ expo-iap: Added OpenIAP dependency (1.1.10) to build.gradle');
+            ? '🛠️ expo-iap: Replaced OpenIAP dependency with 1.1.11'
+            : '🛠️ expo-iap: Added OpenIAP dependency (1.1.11) to build.gradle');
     }
     return modified;
 };

package/plugin/src/withIAP.ts

@@ -54,7 +54,7 @@ const modifyAppBuildGradle = (
     language === 'kotlin'
       ? `    implementation("${ga}:${v}")`
       : `    implementation "${ga}:${v}"`;
-  const openiapDep = impl('io.github.hyochan.openiap:openiap-google', '1.1.10');
+  const openiapDep = impl('io.github.hyochan.openiap:openiap-google', '1.1.11');
 
   // Remove any existing openiap-google lines (any version, groovy/kotlin, implementation/api)
   const openiapAnyLine =
@@ -74,8 +74,8 @@ const modifyAppBuildGradle = (
     modified = addLineToGradle(modified, /dependencies\s*{/, openiapDep, 1);
     logOnce(
       hadExisting
-        ? '🛠️ expo-iap: Replaced OpenIAP dependency with 1.1.10'
-        : '🛠️ expo-iap: Added OpenIAP dependency (1.1.10) to build.gradle',
+        ? '🛠️ expo-iap: Replaced OpenIAP dependency with 1.1.11'
+        : '🛠️ expo-iap: Added OpenIAP dependency (1.1.11) to build.gradle',
     );
   }
 

package/plugin/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/withIAP.ts","./src/withLocalOpenIAP.ts"],"version":"5.9.2"}
+{"root":["./src/withiap.ts","./src/withlocalopeniap.ts"],"version":"5.9.2"}

package/src/index.ts

@@ -23,12 +23,17 @@ import {
   ErrorCode,
   RequestPurchaseProps,
   RequestPurchasePropsByPlatforms,
+  RequestPurchaseAndroidProps,
+  RequestPurchaseIosProps,
   RequestSubscriptionPropsByPlatforms,
+  RequestSubscriptionAndroidProps,
+  RequestSubscriptionIosProps,
   ProductSubscription,
   PurchaseAndroid,
   DiscountOfferInputIOS,
   VoidResult,
   ReceiptValidationResult,
+  AndroidSubscriptionOfferInput,
 } from './types';
 import {PurchaseError} from './purchase-error';
 
@@ -57,18 +62,31 @@ export function setValueAsync(value: string) {
   return ExpoIapModule.setValueAsync(value);
 }
 
-// Ensure the emitter has proper EventEmitter interface
-export const emitter = (ExpoIapModule || NativeModulesProxy.ExpoIap) as {
-  addListener: (
-    eventName: string,
-    listener: (...args: any[]) => void,
-  ) => {remove: () => void};
-  removeListener: (
-    eventName: string,
-    listener: (...args: any[]) => void,
-  ) => void;
+type ExpoIapEventPayloads = {
+  [OpenIapEvent.PurchaseUpdated]: Purchase;
+  [OpenIapEvent.PurchaseError]: PurchaseError;
+  [OpenIapEvent.PromotedProductIOS]: Product;
+};
+
+type ExpoIapEventListener<E extends OpenIapEvent> = (
+  payload: ExpoIapEventPayloads[E],
+) => void;
+
+type ExpoIapEmitter = {
+  addListener<E extends OpenIapEvent>(
+    eventName: E,
+    listener: ExpoIapEventListener<E>,
+  ): {remove: () => void};
+  removeListener<E extends OpenIapEvent>(
+    eventName: E,
+    listener: ExpoIapEventListener<E>,
+  ): void;
 };
 
+// Ensure the emitter has proper EventEmitter interface
+export const emitter = (ExpoIapModule ||
+  NativeModulesProxy.ExpoIap) as ExpoIapEmitter;
+
 /**
  * TODO(v3.1.0): Remove legacy 'inapp' alias once downstream apps migrate to 'in-app'.
  */
@@ -342,15 +360,31 @@ const offerToRecordIOS = (
 /**
  * Helper to normalize request props to platform-specific format
  */
-const normalizeRequestProps = (
+function normalizeRequestProps(
+  request: RequestPurchasePropsByPlatforms,
+  platform: 'ios',
+): RequestPurchaseIosProps | null | undefined;
+function normalizeRequestProps(
+  request: RequestPurchasePropsByPlatforms,
+  platform: 'android',
+): RequestPurchaseAndroidProps | null | undefined;
+function normalizeRequestProps(
+  request: RequestSubscriptionPropsByPlatforms,
+  platform: 'ios',
+): RequestSubscriptionIosProps | null | undefined;
+function normalizeRequestProps(
+  request: RequestSubscriptionPropsByPlatforms,
+  platform: 'android',
+): RequestSubscriptionAndroidProps | null | undefined;
+function normalizeRequestProps(
   request:
     | RequestPurchasePropsByPlatforms
     | RequestSubscriptionPropsByPlatforms,
   platform: 'ios' | 'android',
-): any => {
+) {
   // Platform-specific format - directly return the appropriate platform data
   return platform === 'ios' ? request.ios : request.android;
-};
+}
 
 /**
  * Request a purchase for products or subscriptions.
@@ -408,7 +442,7 @@ export const requestPurchase = (
     } = normalizedRequest;
 
     return (async () => {
-      const offer = offerToRecordIOS(withOffer);
+      const offer = offerToRecordIOS(withOffer ?? undefined);
       const purchase = await ExpoIapModule.requestPurchase({
         sku,
         andDangerouslyFinishTransactionAutomatically,
@@ -422,15 +456,19 @@ export const requestPurchase = (
   }
 
   if (Platform.OS === 'android') {
-    const normalizedRequest = normalizeRequestProps(request, 'android');
-
-    if (!normalizedRequest?.skus?.length) {
-      throw new Error(
-        'Invalid request for Android. The `skus` property is required and must be a non-empty array.',
-      );
-    }
-
     if (isInAppPurchase) {
+      const normalizedRequest: RequestPurchaseAndroidProps | null | undefined =
+        normalizeRequestProps(
+          request as RequestPurchasePropsByPlatforms,
+          'android',
+        );
+
+      if (!normalizedRequest?.skus?.length) {
+        throw new Error(
+          'Invalid request for Android. The `skus` property is required and must be a non-empty array.',
+        );
+      }
+
       const {
         skus,
         obfuscatedAccountIdAndroid,
@@ -453,25 +491,51 @@ export const requestPurchase = (
     }
 
     if (canonical === 'subs') {
+      const normalizedRequest:
+        | RequestSubscriptionAndroidProps
+        | null
+        | undefined = normalizeRequestProps(
+        request as RequestSubscriptionPropsByPlatforms,
+        'android',
+      );
+
+      if (!normalizedRequest?.skus?.length) {
+        throw new Error(
+          'Invalid request for Android. The `skus` property is required and must be a non-empty array.',
+        );
+      }
+
       const {
         skus,
         obfuscatedAccountIdAndroid,
         obfuscatedProfileIdAndroid,
         isOfferPersonalized,
-        subscriptionOffers = [],
-        replacementModeAndroid = -1,
-        purchaseToken,
+        subscriptionOffers,
+        replacementModeAndroid,
+        purchaseTokenAndroid,
       } = normalizedRequest;
 
+      const normalizedOffers = subscriptionOffers ?? [];
+      const replacementMode = replacementModeAndroid ?? -1;
+      const purchaseToken = purchaseTokenAndroid ?? undefined;
+
       return (async () => {
         return ExpoIapModule.requestPurchase({
           type: native,
           skuArr: skus,
           purchaseToken,
-          replacementMode: replacementModeAndroid,
+          replacementMode,
           obfuscatedAccountId: obfuscatedAccountIdAndroid,
           obfuscatedProfileId: obfuscatedProfileIdAndroid,
-          offerTokenArr: subscriptionOffers.map((so: any) => so.offerToken),
+          offerTokenArr: normalizedOffers.map(
+            (so: AndroidSubscriptionOfferInput) => so.offerToken,
+          ),
+          subscriptionOffers: normalizedOffers.map(
+            (so: AndroidSubscriptionOfferInput) => ({
+              sku: so.sku,
+              offerToken: so.offerToken,
+            }),
+          ),
           isOfferPersonalized: isOfferPersonalized ?? false,
         }) as Promise<Purchase[]>;
       })();
@@ -563,8 +627,8 @@ export const getStorefrontIOS = (): Promise<string> => {
 export const getStorefront = (): Promise<string> => {
   // Cross-platform storefront
   if (Platform.OS === 'android') {
-    if (typeof (ExpoIapModule as any).getStorefrontAndroid === 'function') {
-      return (ExpoIapModule as any).getStorefrontAndroid();
+    if (typeof ExpoIapModule.getStorefrontAndroid === 'function') {
+      return ExpoIapModule.getStorefrontAndroid();
     }
     return Promise.resolve('');
   }