expo-iap 2.9.6 → 3.0.0

package/codecov.yml

@@ -6,8 +6,8 @@ codecov:
 coverage:
   precision: 2
   round: down
-  range: "50...100"
-  
+  range: '50...100'
+
   status:
     project:
       default:
@@ -18,7 +18,7 @@ coverage:
           - unittests
         paths:
           - src
-      
+
       example:
         target: 40%
         threshold: 10%
@@ -27,7 +27,7 @@ coverage:
           - example
         paths:
           - example
-    
+
     patch:
       default:
         target: 60%
@@ -43,7 +43,7 @@ parsers:
       macro: no
 
 comment:
-  layout: "reach,diff,flags,files,footer"
+  layout: 'reach,diff,flags,files,footer'
   behavior: default
   require_changes: false
   require_base: false
@@ -54,21 +54,17 @@ flags:
     paths:
       - src/
     carryforward: false
-  
-  example:
-    paths:
-      - example/
-    carryforward: false
 
 ignore:
-  - "**/__tests__/**"
-  - "**/*.test.ts"
-  - "**/*.test.tsx"
-  - "**/node_modules/**"
-  - "build/**"
-  - "android/**"
-  - "ios/**"
-  - "docs/**"
-  - "plugin/**"
-  - "*.config.js"
-  - "*.setup.js"
+  - '**/__tests__/**'
+  - '**/*.test.ts'
+  - '**/*.test.tsx'
+  - '**/node_modules/**'
+  - 'build/**'
+  - 'android/**'
+  - 'ios/**'
+  - 'docs/**'
+  - 'plugin/**'
+  - '*.config.js'
+  - '*.setup.js'
+  - 'example/**'

package/ios/ExpoIapModule.swift

@@ -22,6 +22,8 @@ struct OpenIapEvent {
 @available(iOS 15.0, tvOS 15.0, *)
 @MainActor
 public class ExpoIapModule: Module {
+    // Connection state for local validation parity with RN module
+    private var isInitialized: Bool = false
     // Subscriptions for OpenIapModule event listeners
     private var purchaseUpdatedSub: Subscription?
     private var purchaseErrorSub: Subscription?
@@ -65,6 +67,8 @@ public class ExpoIapModule: Module {
         AsyncFunction("initConnection") { () async throws -> Bool in
             logDebug("initConnection called")
             let isConnected = try await OpenIapModule.shared.initConnection()
+            // Track initialization locally for ensureConnection()
+            await MainActor.run { self.isInitialized = isConnected }
             logDebug("Connection initialized: \(isConnected)")
             return isConnected
         }
@@ -74,12 +78,14 @@ public class ExpoIapModule: Module {
             let _ = try await OpenIapModule.shared.endConnection()
             
             logDebug("Connection ended")
+            await MainActor.run { self.isInitialized = false }
             return true
         }
         
         // MARK: - Product Management
         
         AsyncFunction("fetchProducts") { (params: [String: Any]) async throws -> [[String: Any?]] in
+            try await ensureConnection()
             logDebug("fetchProducts raw params: \(params)")
             
             // Handle both object format {skus: [...], type: "..."} and array format
@@ -148,6 +154,7 @@ public class ExpoIapModule: Module {
             guard let sku = params["sku"] as? String, !sku.isEmpty else {
                 throw OpenIapError.make(code: OpenIapError.E_PURCHASE_ERROR, message: "Missing required 'sku'")
             }
+            try await ensureConnection()
 
             // Optional fields
             let andFinish = (params["andDangerouslyFinishTransactionAutomatically"] as? Bool) ?? false
@@ -205,6 +212,7 @@ public class ExpoIapModule: Module {
         }
         
         AsyncFunction("finishTransaction") { (transactionId: String) async throws -> Bool in
+            try await ensureConnection()
             logDebug("finishTransaction called with id: \(transactionId)")
             let result = try await OpenIapModule.shared.finishTransaction(transactionIdentifier: transactionId)
             return result
@@ -213,6 +221,7 @@ public class ExpoIapModule: Module {
         // MARK: - Purchase History
         
         AsyncFunction("getAvailablePurchases") { (options: [String: Any?]?) async throws -> [[String: Any?]] in
+            try await ensureConnection()
             logDebug("getAvailablePurchases called")
             
             // Build options and get purchases directly from OpenIapModule
@@ -228,6 +237,7 @@ public class ExpoIapModule: Module {
         
         // Legacy function for backward compatibility
         AsyncFunction("getAvailableItems") { (alsoPublishToEventListener: Bool, onlyIncludeActiveItems: Bool) async throws -> [[String: Any?]] in
+            try await ensureConnection()
             logDebug("getAvailableItems called (legacy)")
             
             let purchaseOptions = OpenIapGetAvailablePurchasesProps(
@@ -239,6 +249,7 @@ public class ExpoIapModule: Module {
         }
         
         AsyncFunction("getPendingTransactionsIOS") { () async throws -> [[String: Any?]] in
+            try await ensureConnection()
             logDebug("getPendingTransactionsIOS called")
             
             let pendingTransactions = try await OpenIapModule.shared.getPendingTransactionsIOS()
@@ -246,6 +257,7 @@ public class ExpoIapModule: Module {
         }
         
         AsyncFunction("clearTransactionIOS") { () async throws -> Bool in
+            try await ensureConnection()
             logDebug("clearTransactionIOS called")
             try await OpenIapModule.shared.clearTransactionIOS()
             return true
@@ -254,17 +266,27 @@ public class ExpoIapModule: Module {
         // MARK: - Receipt & Validation
         
         AsyncFunction("getReceiptIOS") { () async throws -> String in
+            try await ensureConnection()
             logDebug("getReceiptIOS called")
             return try await OpenIapModule.shared.getReceiptDataIOS() ?? ""
         }
         
+        // Backward-compatible alias expected by JS layer/tests
+        AsyncFunction("getReceiptDataIOS") { () async throws -> String in
+            try await ensureConnection()
+            logDebug("getReceiptDataIOS called (alias of getReceiptIOS)")
+            return try await OpenIapModule.shared.getReceiptDataIOS() ?? ""
+        }
+        
         AsyncFunction("requestReceiptRefreshIOS") { () async throws -> String in
+            try await ensureConnection()
             logDebug("requestReceiptRefreshIOS called")
             // Receipt refresh is handled automatically by StoreKit 2
             return try await OpenIapModule.shared.getReceiptDataIOS() ?? ""
         }
         
         AsyncFunction("validateReceiptIOS") { (sku: String) async throws -> [String: Any?] in
+            try await ensureConnection()
             logDebug("validateReceiptIOS called for sku: \(sku)")
             do {
                 // Use OpenIapReceiptValidationProps to keep naming parity with OpenIAP
@@ -286,15 +308,17 @@ public class ExpoIapModule: Module {
         // MARK: - iOS Specific Features
         
         AsyncFunction("presentCodeRedemptionSheetIOS") { () async throws -> Bool in
+            try await ensureConnection()
             logDebug("presentCodeRedemptionSheetIOS called")
             let _ = try await OpenIapModule.shared.presentCodeRedemptionSheetIOS()
             return true
         }
         
-        AsyncFunction("showManageSubscriptionsIOS") { () async throws -> Bool in
+        AsyncFunction("showManageSubscriptionsIOS") { () async throws -> [[String: Any?]] in
+            try await ensureConnection()
             logDebug("showManageSubscriptionsIOS called")
-            let _ = try await OpenIapModule.shared.showManageSubscriptionsIOS()
-            return true
+            let purchases = try await OpenIapModule.shared.showManageSubscriptionsIOS()
+            return OpenIapSerialization.purchases(purchases)
         }
         
         AsyncFunction("deepLinkToSubscriptionsIOS") { () async throws in
@@ -310,11 +334,13 @@ public class ExpoIapModule: Module {
         }
         
         AsyncFunction("beginRefundRequestIOS") { (sku: String) async throws -> String? in
+            try await ensureConnection()
             logDebug("beginRefundRequestIOS called for sku: \(sku)")
             return try await OpenIapModule.shared.beginRefundRequestIOS(sku: sku)
         }
         
         AsyncFunction("getPromotedProductIOS") { () async throws -> [String: Any?]? in
+            try await ensureConnection()
             logDebug("getPromotedProductIOS called")
             
             if let promoted = try await OpenIapModule.shared.getPromotedProductIOS() {
@@ -327,11 +353,13 @@ public class ExpoIapModule: Module {
             return nil
         }
         AsyncFunction("getStorefrontIOS") { () async throws -> String in
+            try await ensureConnection()
             logDebug("getStorefrontIOS called")
             return try await OpenIapModule.shared.getStorefrontIOS()
         }
         
         AsyncFunction("syncIOS") { () async throws -> Bool in
+            try await ensureConnection()
             logDebug("syncIOS called")
             return try await OpenIapModule.shared.syncIOS()
         }
@@ -339,21 +367,25 @@ public class ExpoIapModule: Module {
         // MARK: - Additional iOS Methods
         
         AsyncFunction("isTransactionVerifiedIOS") { (sku: String) async throws -> Bool in
+            try await ensureConnection()
             logDebug("isTransactionVerifiedIOS called for sku: \(sku)")
             return await OpenIapModule.shared.isTransactionVerifiedIOS(sku: sku)
         }
         
         AsyncFunction("getTransactionJwsIOS") { (sku: String) async throws -> String? in
+            try await ensureConnection()
             logDebug("getTransactionJwsIOS called for sku: \(sku)")
             return try await OpenIapModule.shared.getTransactionJwsIOS(sku: sku)
         }
         
         AsyncFunction("isEligibleForIntroOfferIOS") { (groupID: String) async throws -> Bool in
+            try await ensureConnection()
             logDebug("isEligibleForIntroOfferIOS called for groupID: \(groupID)")
             return await OpenIapModule.shared.isEligibleForIntroOfferIOS(groupID: groupID)
         }
         
         AsyncFunction("subscriptionStatusIOS") { (sku: String) async throws -> [[String: Any?]]? in
+            try await ensureConnection()
             logDebug("subscriptionStatusIOS called for sku: \(sku)")
             
             if let statuses = try await OpenIapModule.shared.subscriptionStatusIOS(sku: sku) {
@@ -365,27 +397,9 @@ public class ExpoIapModule: Module {
                     ]
 
                     if let info = status.renewalInfo {
-                        // Convert autoRenewStatus to a proper boolean for willAutoRenew
-                        let willAutoRenew: Bool = {
-                            // Try boolean first
-                            if let b = info.autoRenewStatus as? Bool { return b }
-                            // Fallback to string normalization
-                            let normalized = String(describing: info.autoRenewStatus).lowercased()
-                            let truthy = Set([
-                                "willrenew",
-                                "will_autorenew",
-                                "will-auto-renew",
-                                "auto_renew_on",
-                                "true",
-                                "1",
-                                "on",
-                                "yes",
-                            ])
-                            return truthy.contains(normalized)
-                        }()
-
+                        // autoRenewStatus is a Bool from OpenIAP types
                         let renewalInfo: [String: Any?] = [
-                            "willAutoRenew": willAutoRenew,
+                            "willAutoRenew": info.autoRenewStatus,
                             "autoRenewPreference": info.autoRenewPreference
                         ]
                         dict["renewalInfo"] = renewalInfo
@@ -398,6 +412,7 @@ public class ExpoIapModule: Module {
         }
         
         AsyncFunction("currentEntitlementIOS") { (sku: String) async throws -> [String: Any?]? in
+            try await ensureConnection()
             logDebug("currentEntitlementIOS called for sku: \(sku)")
             do {
                 if let entitlement = try await OpenIapModule.shared.currentEntitlementIOS(sku: sku) {
@@ -410,6 +425,7 @@ public class ExpoIapModule: Module {
         }
         
         AsyncFunction("latestTransactionIOS") { (sku: String) async throws -> [String: Any?]? in
+            try await ensureConnection()
             logDebug("latestTransactionIOS called for sku: \(sku)")
             do {
                 if let transaction = try await OpenIapModule.shared.latestTransactionIOS(sku: sku) {
@@ -468,4 +484,15 @@ public class ExpoIapModule: Module {
         _ = try? await OpenIapModule.shared.endConnection()
     }
     
+    // MARK: - Private Helper Methods
+    
+    private func ensureConnection() throws {
+        guard isInitialized else {
+            throw OpenIapError.make(
+                code: OpenIapError.E_INIT_CONNECTION,
+                message: "Connection not initialized. Call initConnection() first."
+            )
+        }
+    }
+
 }

package/jest.config.js

@@ -1,7 +1,6 @@
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
-  // Disable watchman to avoid sandbox/permission issues in CI and sandboxes
   watchman: false,
   roots: ['<rootDir>/src'],
   testMatch: [
@@ -34,12 +33,9 @@ module.exports = {
     '!src/ExpoIapModule.ts',
     '!src/ExpoIapModule.web.ts',
   ],
-  coverageThreshold: {
-    global: {
-      branches: 15,
-      functions: 15,
-      lines: 15,
-      statements: 15,
-    },
-  },
+  coveragePathIgnorePatterns: [
+    '<rootDir>/src/useIAP.ts',
+    '<rootDir>/src/ExpoIap.types.ts',
+    '<rootDir>/src/utils/constants.ts',
+  ],
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-iap",
-  "version": "2.9.6",
+  "version": "3.0.0",
   "description": "In App Purchase module in Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -11,10 +11,11 @@
     "lint:eslint": "eslint --fix 'src/**/*.{ts,tsx}' 'plugin/src/**/*.{ts,tsx}'",
     "lint:prettier": "prettier --write \"**/*.{md,js,jsx,ts,tsx}\"",
     "lint:tsc": "tsc -p tsconfig.json --noEmit --skipLibCheck",
-    "lint:ci": "bun run lint:tsc && bun run lint:eslint && bun run lint:prettier",
+    "lint:kt": "sh -c 'command -v ktlint >/dev/null 2>&1 && ktlint --format ./android || { echo \"ktlint not installed; skipping\"; exit 0; }'",
+    "lint:ci": "bun run lint:tsc && bun run lint:eslint && bun run lint:prettier && bun run lint:kt",
     "test": "jest",
     "test:coverage": "jest --coverage",
-    "prepare": "expo-module prepare",
+    "prepare": "expo-module prepare && husky install",
     "expo-module": "expo-module",
     "open:ios": "xed example/ios",
     "open:android": "open -a \"Android Studio\" example/android",
@@ -42,6 +43,7 @@
   "license": "MIT",
   "homepage": "https://github.com/hyochan/expo-iap#readme",
   "devDependencies": {
+    "husky": "^9.0.11",
     "@jest/globals": "^30.0.5",
     "@types/jest": "^30.0.0",
     "@types/react": "~19.1.7",

package/plugin/build/withIAP.d.ts

@@ -1,7 +1,10 @@
 import { ConfigPlugin } from 'expo/config-plugins';
 export interface ExpoIapPluginOptions {
     /** Local development path for OpenIAP library */
-    localPath?: string;
+    localPath?: string | {
+        ios?: string;
+        android?: string;
+    };
     /** Enable local development mode */
     enableLocalDev?: boolean;
 }

package/plugin/build/withIAP.js

@@ -55,39 +55,43 @@ const addLineToGradle = (content, anchor, lineToAdd, offset = 1) => {
     const lines = content.split('\n');
     const index = lines.findIndex((line) => line.match(anchor));
     if (index === -1) {
-        console.warn(`Anchor "${anchor}" not found in build.gradle. Appending to end.`);
-        lines.push(lineToAdd);
+        config_plugins_1.WarningAggregator.addWarningAndroid('expo-iap', `dependencies { ... } block not found; skipping injection: ${lineToAdd.trim()}`);
+        return content;
     }
     else {
         lines.splice(index + offset, 0, lineToAdd);
     }
     return lines.join('\n');
 };
-const modifyAppBuildGradle = (gradle) => {
+const modifyAppBuildGradle = (gradle, language) => {
     let modified = gradle;
-    // Add billing library dependencies to app-level build.gradle
-    const billingDep = `    implementation "com.android.billingclient:billing-ktx:8.0.0"`;
-    const gmsDep = `    implementation "com.google.android.gms:play-services-base:18.1.0"`;
+    // Add OpenIAP dependency to app-level build.gradle(.kts)
+    const impl = (ga, v) => language === 'kotlin'
+        ? `    implementation("${ga}:${v}")`
+        : `    implementation "${ga}:${v}"`;
+    // Pin OpenIAP Google library to 1.1.0
+    const openiapDep = impl('io.github.hyochan.openiap:openiap-google', '1.1.0');
+    const hasGA = (ga) => new RegExp(String.raw `\b(?:implementation|api)\s*\(?["']${ga}:`, 'm').test(modified);
     let hasAddedDependency = false;
-    if (!modified.includes(billingDep)) {
-        modified = addLineToGradle(modified, /dependencies\s*{/, billingDep);
-        hasAddedDependency = true;
-    }
-    if (!modified.includes(gmsDep)) {
-        modified = addLineToGradle(modified, /dependencies\s*{/, gmsDep, 1);
+    if (!hasGA('io.github.hyochan.openiap:openiap-google')) {
+        modified = addLineToGradle(modified, /dependencies\s*{/, openiapDep, 0);
         hasAddedDependency = true;
     }
     // Log only once and only if we actually added dependencies
     if (hasAddedDependency)
-        logOnce('🛠️ expo-iap: Added billing dependencies to build.gradle');
+        logOnce('🛠️ expo-iap: Added OpenIAP dependency to build.gradle');
     return modified;
 };
-const withIapAndroid = (config) => {
-    // Add IAP dependencies to app build.gradle
-    config = (0, config_plugins_1.withAppBuildGradle)(config, (config) => {
-        config.modResults.contents = modifyAppBuildGradle(config.modResults.contents);
-        return config;
-    });
+const withIapAndroid = (config, props) => {
+    const addDeps = props?.addDeps ?? true;
+    if (addDeps) {
+        config = (0, config_plugins_1.withAppBuildGradle)(config, (config) => {
+            // language provided by config-plugins: 'groovy' | 'kotlin'
+            const language = config.modResults.language || 'groovy';
+            config.modResults.contents = modifyAppBuildGradle(config.modResults.contents, language);
+            return config;
+        });
+    }
     config = (0, config_plugins_1.withAndroidManifest)(config, (config) => {
         const manifest = config.modResults;
         if (!manifest.manifest['uses-permission']) {
@@ -137,17 +141,27 @@ const withIapIOS = (config) => {
 };
 const withIap = (config, options) => {
     try {
-        // Apply Android modifications
-        let result = withIapAndroid(config);
+        const isLocalDev = !!(options?.enableLocalDev || options?.localPath);
+        // Apply Android modifications (skip adding deps when linking local module)
+        let result = withIapAndroid(config, { addDeps: !isLocalDev });
         // iOS: choose one path to avoid overlap
         if (options?.enableLocalDev || options?.localPath) {
             if (!options?.localPath) {
                 config_plugins_1.WarningAggregator.addWarningIOS('expo-iap', 'enableLocalDev is true but no localPath provided. Skipping local OpenIAP integration.');
             }
             else {
-                const localPath = path.resolve(options.localPath);
-                logOnce(`🔧 [expo-iap] Enabling local OpenIAP development at: ${localPath}`);
-                result = (0, withLocalOpenIAP_1.default)(result, { localPath });
+                const raw = options.localPath;
+                const resolved = typeof raw === 'string'
+                    ? path.resolve(raw)
+                    : {
+                        ios: raw.ios ? path.resolve(raw.ios) : undefined,
+                        android: raw.android ? path.resolve(raw.android) : undefined,
+                    };
+                const preview = typeof resolved === 'string'
+                    ? resolved
+                    : `ios=${resolved.ios ?? 'auto'}, android=${resolved.android ?? 'auto'}`;
+                logOnce(`🔧 [expo-iap] Enabling local OpenIAP: ${preview}`);
+                result = (0, withLocalOpenIAP_1.default)(result, { localPath: resolved });
             }
         }
         else {

package/plugin/build/withLocalOpenIAP.d.ts

@@ -1,9 +1,13 @@
-import { ConfigPlugin } from '@expo/config-plugins';
+import { ConfigPlugin } from 'expo/config-plugins';
 /**
  * Plugin to add local OpenIAP pod dependency for development
  * This is only for local development with openiap-apple library
  */
+type LocalPathOption = string | {
+    ios?: string;
+    android?: string;
+};
 declare const withLocalOpenIAP: ConfigPlugin<{
-    localPath?: string;
+    localPath?: LocalPathOption;
 } | void>;
 export default withLocalOpenIAP;