feat(horizon): add provider and inline selection

hyochan · hyochan · commit 0c9e7cb20019 · 2025-09-17T11:45:29.000+09:00
Add first-party Horizon OS provider, wire selection in OpenIapStore, and enable optional APP_ID injection. Replace logs with OpenIapLog and surface purchase errors in Example screens. Includes Horizon compat + platform SDK deps.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -12,6 +12,17 @@
             ],
             "console": "integratedTerminal"
         },
+        {
+            "name": "🧱 Android: Assemble Example (Horizon/Auto)",
+            "type": "node",
+            "request": "launch",
+            "runtimeExecutable": "bash",
+            "runtimeArgs": [
+                "-lc",
+                "./gradlew :Example:assembleDebug -PEXAMPLE_OPENIAP_STORE=auto"
+            ],
+            "console": "integratedTerminal"
+        },
         {
             "name": "▶️ Android: Start Example Activity",
             "type": "node",
@@ -66,6 +77,25 @@
                 "./gradlew :openiap:test --no-daemon"
             ],
             "console": "integratedTerminal"
+        },
+        {
+            "name": "🎯 Android: Run Example (Horizon Force)",
+            "type": "node",
+            "request": "launch",
+            "runtimeExecutable": "bash",
+            "runtimeArgs": [
+                "-lc",
+                "./gradlew :Example:installDebug -PEXAMPLE_OPENIAP_STORE=horizon -PEXAMPLE_HORIZON_APP_ID='${input:horizonAppId}' && adb shell am start -n dev.hyo.martie/.MainActivity"
+            ],
+            "console": "integratedTerminal"
+        }
+    ],
+    "inputs": [
+        {
+            "id": "horizonAppId",
+            "type": "promptString",
+            "description": "Enter Horizon APP_ID",
+            "default": ""
         }
     ]
 }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -33,6 +33,20 @@ cd openiap-google
 adb shell am start -n dev.hyo.martie/.MainActivity
 ```
 
+### Horizon Quickstart (Local)
+
+The core library ships Play-only by default but supports Horizon if a provider is on the classpath.
+
+- Provider selection is done via `OpenIapStore(context, store?, appId?)` or BuildConfig flags.
+- Run Example targeting Horizon/auto:
+  - VS Code: use launch config "Android: Run Example (Horizon/Auto)"
+  - CLI: `./gradlew :Example:installDebug -PEXAMPLE_OPENIAP_STORE=auto`
+  - CLI (force): `./gradlew :Example:installDebug -PEXAMPLE_OPENIAP_STORE=horizon -PEXAMPLE_HORIZON_APP_ID=YOUR_APP_ID`
+  - VS Code (force): use launch config "Android: Run Example (Horizon Force)" — it will prompt for `HORIZON_APP_ID` via input box and pass `-PEXAMPLE_HORIZON_APP_ID` to Gradle.
+- Notes:
+  - Use a Quest device with Meta services; emulators are not supported.
+  - If the provider is missing, the factory falls back to Play when using `auto`.
+
 ## Code Style
 
 - Follow the official Kotlin Coding Conventions
diff --git a/Example/build.gradle.kts b/Example/build.gradle.kts
@@ -17,6 +17,17 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
+
+        // Optional store override for example app: play | horizon | auto
+        val store = (project.findProperty("EXAMPLE_OPENIAP_STORE") as String?) ?: "play"
+        buildConfigField("String", "OPENIAP_STORE", "\"${store}\"")
+
+        // Optional Horizon app id (provider-specific)
+        // Prefer EXAMPLE_HORIZON_APP_ID; fallback to legacy EXAMPLE_OPENIAP_APP_ID if provided
+        val appId = (project.findProperty("EXAMPLE_HORIZON_APP_ID") as String?)
+            ?: (project.findProperty("EXAMPLE_OPENIAP_APP_ID") as String?)
+            ?: ""
+        buildConfigField("String", "HORIZON_APP_ID", "\"${appId}\"")
     }
 
     buildTypes {
@@ -44,6 +55,7 @@ android {
 
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 
     packaging {
diff --git a/Example/src/main/java/dev/hyo/martie/Constants.kt b/Example/src/main/java/dev/hyo/martie/Constants.kt
@@ -1,14 +1,27 @@
 package dev.hyo.martie
 
 object IapConstants {
-    // App-defined SKU lists
-    val INAPP_SKUS = listOf(
+    private fun isHorizon(): Boolean =
+        dev.hyo.martie.BuildConfig.OPENIAP_STORE.equals("horizon", ignoreCase = true)
+
+    // Define your Horizon product IDs here (placeholders)
+    private val HORIZON_INAPP = listOf(
         "dev.hyo.martie.10bulbs",
-        "dev.hyo.martie.30bulbs"
+        "dev.hyo.martie.30bulbs",
+    )
+    private val HORIZON_SUBS = listOf(
+        "dev.hyo.martie.premium",
     )
 
-    val SUBS_SKUS = listOf(
-        "dev.hyo.martie.premium"
+    // Google Play product IDs (existing)
+    private val PLAY_INAPP = listOf(
+        "dev.hyo.martie.10bulbs",
+        "dev.hyo.martie.30bulbs",
+    )
+    private val PLAY_SUBS = listOf(
+        "dev.hyo.martie.premium",
     )
-}
 
+    fun inappSkus(): List<String> = if (isHorizon()) HORIZON_INAPP else PLAY_INAPP
+    fun subsSkus(): List<String> = if (isHorizon()) HORIZON_SUBS else PLAY_SUBS
+}
diff --git a/Example/src/main/java/dev/hyo/martie/screens/AvailablePurchasesScreen.kt b/Example/src/main/java/dev/hyo/martie/screens/AvailablePurchasesScreen.kt
@@ -33,8 +33,15 @@ fun AvailablePurchasesScreen(
     storeParam: OpenIapStore? = null
 ) {
     val context = LocalContext.current
+    val appContext = context.applicationContext
     val iapStore = storeParam ?: (IapContext.LocalOpenIapStore.current
-        ?: IapContext.rememberOpenIapStore())
+        ?: remember(appContext) {
+            val storeKey = dev.hyo.martie.BuildConfig.OPENIAP_STORE
+            val appId = dev.hyo.martie.BuildConfig.HORIZON_APP_ID
+            android.util.Log.i("OpenIapFactory", "example-create storeKey=${storeKey} appIdSet=${appId.isNotEmpty()}")
+            runCatching { OpenIapStore(appContext, storeKey, appId) }
+                .getOrElse { OpenIapStore(appContext, "auto", appId) }
+        })
     val purchases by iapStore.availablePurchases.collectAsState()
     val status by iapStore.status.collectAsState()
     val connectionStatus by iapStore.connectionStatus.collectAsState()
diff --git a/Example/src/main/java/dev/hyo/martie/screens/PurchaseFlowScreen.kt b/Example/src/main/java/dev/hyo/martie/screens/PurchaseFlowScreen.kt
@@ -43,7 +43,16 @@ fun PurchaseFlowScreen(
     val activity = context as? Activity
     val uiScope = rememberCoroutineScope()
     val appContext = context.applicationContext as Context
-    val iapStore = storeParam ?: remember(appContext) { OpenIapStore(appContext) }
+    val iapStore = storeParam ?: remember(appContext) {
+        val storeKey = dev.hyo.martie.BuildConfig.OPENIAP_STORE
+        val appId = dev.hyo.martie.BuildConfig.HORIZON_APP_ID
+        android.util.Log.i("OpenIapFactory", "example-create storeKey=${storeKey} appIdSet=${appId.isNotEmpty()}")
+        runCatching { OpenIapStore(appContext, storeKey, appId) }
+            .getOrElse {
+                // Fallback to auto if horizon provider not present
+                OpenIapStore(appContext, "auto", appId)
+            }
+    }
     val products by iapStore.products.collectAsState()
     val purchases by iapStore.availablePurchases.collectAsState()
     val status by iapStore.status.collectAsState()
@@ -64,7 +73,7 @@ fun PurchaseFlowScreen(
                 if (connected) {
                     iapStore.setActivity(activity)
                     iapStore.fetchProducts(
-                        skus = IapConstants.INAPP_SKUS,
+                        skus = IapConstants.inappSkus(),
                         type = ProductRequest.ProductRequestType.InApp
                     )
                     iapStore.getAvailablePurchases()
@@ -97,7 +106,7 @@ fun PurchaseFlowScreen(
                                 try {
                                     iapStore.setActivity(activity)
                                     iapStore.fetchProducts(
-                                        skus = IapConstants.INAPP_SKUS,
+                                        skus = IapConstants.inappSkus(),
                                         type = ProductRequest.ProductRequestType.InApp
                                     )
                                 } catch (_: Exception) { }
@@ -311,7 +320,7 @@ fun PurchaseFlowScreen(
                             scope.launch {
                                 try {
                                     iapStore.fetchProducts(
-                                        skus = IapConstants.INAPP_SKUS,
+                                        skus = IapConstants.inappSkus(),
                                         type = ProductRequest.ProductRequestType.InApp
                                     )
                                 } catch (_: Exception) { }
diff --git a/Example/src/main/java/dev/hyo/martie/screens/SubscriptionFlowScreen.kt b/Example/src/main/java/dev/hyo/martie/screens/SubscriptionFlowScreen.kt
@@ -55,7 +55,13 @@ fun SubscriptionFlowScreen(
     val activity = context as? Activity
     val uiScope = rememberCoroutineScope()
     val appContext = context.applicationContext as Context
-    val iapStore = storeParam ?: remember(appContext) { OpenIapStore(appContext) }
+    val iapStore = storeParam ?: remember(appContext) {
+        val storeKey = dev.hyo.martie.BuildConfig.OPENIAP_STORE
+        val appId = dev.hyo.martie.BuildConfig.HORIZON_APP_ID
+        android.util.Log.i("OpenIapFactory", "example-create storeKey=${storeKey} appIdSet=${appId.isNotEmpty()}")
+        runCatching { OpenIapStore(appContext, storeKey, appId) }
+            .getOrElse { OpenIapStore(appContext, "auto", appId) }
+    }
     val products by iapStore.products.collectAsState()
     val purchases by iapStore.availablePurchases.collectAsState()
     val status by iapStore.status.collectAsState()
@@ -96,7 +102,7 @@ fun SubscriptionFlowScreen(
     LaunchedEffect(purchases) {
         val map = mutableMapOf<String, SubscriptionUiInfo>()
         purchases
-            .filter { it.productId in IapConstants.SUBS_SKUS }
+            .filter { it.productId in IapConstants.subsSkus() }
             .forEach { p ->
                 val token = p.purchaseToken ?: return@forEach
                 val info = fetchSubStatusFromServer(p.productId, token)
@@ -118,9 +124,9 @@ fun SubscriptionFlowScreen(
                 val connected = iapStore.initConnection()
                 if (connected) {
                     iapStore.setActivity(activity)
-                    println("SubscriptionFlow: Loading subscription products: ${IapConstants.SUBS_SKUS}")
+                    println("SubscriptionFlow: Loading subscription products: ${IapConstants.subsSkus()}")
                     iapStore.fetchProducts(
-                        skus = IapConstants.SUBS_SKUS,
+                        skus = IapConstants.subsSkus(),
                         type = ProductRequest.ProductRequestType.Subs
                     )
                     iapStore.getAvailablePurchases()
@@ -154,7 +160,7 @@ fun SubscriptionFlowScreen(
                                 try {
                                     iapStore.setActivity(activity)
                                     iapStore.fetchProducts(
-                                        skus = IapConstants.SUBS_SKUS,
+                                        skus = IapConstants.subsSkus(),
                                         type = ProductRequest.ProductRequestType.Subs
                                     )
                                 } catch (_: Exception) { }
@@ -247,7 +253,7 @@ fun SubscriptionFlowScreen(
             
             // Active Subscriptions Section
             // Treat any purchase with matching subscription SKU as subscribed
-            val activeSubscriptions = purchases.filter { it.productId in IapConstants.SUBS_SKUS }
+            val activeSubscriptions = purchases.filter { it.productId in IapConstants.subsSkus() }
             if (activeSubscriptions.isNotEmpty()) {
                 item {
                     SectionHeaderView(title = "Active Subscriptions")
@@ -454,5 +460,3 @@ fun SubscriptionFlowScreen(
         )
     }
 }
-
-// Moved to reusable component at: screens/uis/ActiveSubscriptionListItem.kt
diff --git a/README.md b/README.md
@@ -60,6 +60,77 @@ dependencies {
 }
 ```
 
+## 🧩 Using From Framework Libraries
+
+- Depend on this artifact from your framework wrapper (Expo/React Native, KMP) and inject the protocol into your bridge.
+- Create an instance with `OpenIapStore(context)` or inject the lower-level `OpenIapProtocol` if you need more control.
+- Forward your host `Activity` into the store via `setActivity(activity)` before `requestPurchase`.
+
+Example in a native module bridge:
+
+```kotlin
+private val store by lazy { OpenIapStore(reactApplicationContext) }
+
+@ReactMethod
+fun bindActivity() {
+  currentActivity?.let { store.setActivity(it) }
+}
+```
+
+### Provider Selection (simple by default)
+
+- Use `OpenIapStore(context, store?, appId?)` to select a provider.
+- Configuration: reads `BuildConfig.OPENIAP_STORE` with values:
+  - `"play"` (default): Google Play Billing
+  - `"horizon"`: Meta Horizon (requires horizon artifact in classpath)
+  - `"auto"`: detect at runtime; prefers Horizon on Quest devices if available, else Play
+
+Default setup:
+
+- This library ships as a single-variant ("play") by default. No flavors needed.
+- `OPENIAP_STORE` defaults to `"play"`; you can set `"auto"` or `"horizon"` if your app includes those providers.
+
+Override in your app or config plugin:
+
+```kotlin
+android {
+  defaultConfig {
+    // "play" | "horizon" | "auto"
+    buildConfigField("String", "OPENIAP_STORE", "\"auto\"")
+  }
+}
+```
+
+Supporting multiple stores:
+
+- Runtime auto: include both provider artifacts in your wrapper/app and set `OPENIAP_STORE="auto"`. The factory detects a Horizon/Quest env and uses Horizon if present, otherwise Play.
+- Optional flavors (scale later): define a `store` flavor dimension in your app/framework repos when you need multiple providers (e.g., `play`, `horizon`, `another1`). Keep this core library single-variant by default.
+
+### Horizon Quickstart
+
+Run the Example app on Horizon/Quest without flavors:
+
+- Build with a store hint: `./gradlew :Example:installDebug -PEXAMPLE_OPENIAP_STORE=auto`
+- Or force Horizon: `./gradlew :Example:installDebug -PEXAMPLE_OPENIAP_STORE=horizon -PEXAMPLE_HORIZON_APP_ID=YOUR_APP_ID`
+- Note: This library bundles the Horizon compatibility provider when configured; ensure you set `HORIZON_APP_ID`.
+
+Integrate Horizon in your app/framework:
+
+- Add the Horizon provider dependency (example coordinates):
+  - Gradle: `implementation("io.github.hyochan.openiap:openiap-horizon:<version>")`
+  - Or include the module and expose the factory class named above.
+- Select provider:
+  - BuildConfig: `buildConfigField("String", "OPENIAP_STORE", "\"horizon\"")`
+  - BuildConfig (Horizon only): `buildConfigField("String", "HORIZON_APP_ID", "\"YOUR_APP_ID\"")`
+  - Or runtime: `OpenIapStore(context, "horizon", "YOUR_APP_ID")` or `OpenIapStore(context, "auto")`.
+- Device notes:
+  - Use a Quest device; emulators won’t have Meta services.
+  - Ensure the right Horizon/Meta services are installed and account is signed in.
+
+### Flavor Setup (optional)
+
+When you need multiple store-specific builds, add a `store` dimension in your app/framework and put provider dependencies under `playImplementation`, `horizonImplementation`, etc. Keep this core lib unchanged and lean.
+
 ## 🚀 Quick Start
 
 ### 1. Initialize in Application
@@ -333,6 +404,11 @@ The included sample app demonstrates:
 - ✅ Error handling and user feedback
 - ✅ Android-specific billing features
 
+Optional: run Example on Horizon/Quest
+
+- Build with a store hint: `./gradlew :Example:installDebug -PEXAMPLE_OPENIAP_STORE=auto`
+- Values: `play` (default) | `auto` | `horizon` (requires horizon provider on classpath)
+
 ## 🔧 Advanced Usage
 
 ### Custom Error Handling
diff --git a/openiap/build.gradle.kts b/openiap/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
     id("com.vanniktech.maven.publish")
 }
 
+// Keep minimal: single-variant by default; BuildConfig flag added below
+
 // Resolve version from either 'openIapVersion' or 'OPENIAP_VERSION' or fallback
 val openIapVersion: String =
     (project.findProperty("openIapVersion")
@@ -20,6 +22,10 @@ android {
         
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
+        // Minimal provider selection (default: play)
+        buildConfigField("String", "OPENIAP_STORE", "\"play\"")
+        // Optional Horizon app id (provider-specific). Empty by default.
+        buildConfigField("String", "HORIZON_APP_ID", "\"\"")
     }
 
     buildTypes {
@@ -44,6 +50,7 @@ android {
     // Enable Compose for composables in this library (IapContext)
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 }
 
@@ -53,6 +60,11 @@ dependencies {
     
     // Google Play Billing Library (align with app/lib v8)
     api("com.android.billingclient:billing-ktx:8.0.0")
+
+    // Meta Horizon Billing Compatibility SDK (optional provider)
+    implementation("com.meta.horizon.billingclient.api:horizon-billing-compatibility:1.1.1")
+    // Meta Horizon Platform SDK (required alongside billing compat)
+    implementation("com.meta.horizon.platform.ovr:android-platform-sdk:72")
     
     // Kotlin Coroutines
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
diff --git a/openiap/src/main/java/dev/hyo/openiap/OpenIapModule.kt b/openiap/src/main/java/dev/hyo/openiap/OpenIapModule.kt
diff --git a/openiap/src/main/java/dev/hyo/openiap/horizon/OpenIapHorizonModule.kt b/openiap/src/main/java/dev/hyo/openiap/horizon/OpenIapHorizonModule.kt
diff --git a/openiap/src/main/java/dev/hyo/openiap/store/OpenIapStore.kt b/openiap/src/main/java/dev/hyo/openiap/store/OpenIapStore.kt
