@tinkerlandai/indiana-react-native 0.9.5 → 0.10.1

package/native-sdk/android/java/ai/tinkerland/indiana/CustomerResponseSemantics.kt

@@ -61,6 +61,7 @@ internal object IndianaCustomerResponseSemantics {
         }; visit(value)
     }
     fun objectValue(v: JSONObject, fields: Set<String>, path: List<String>) {
+        IndianaMerchantCommerceSemantics.validate(v, fields)
         fun has(vararg keys: String) = fields.containsAll(keys.toList())
         if (has("productKind", "seatBundle", "applePromotionalOffer", "replacement", "offerKind")) {
             val apple = v.getString("provider") == "apple"; val member = v.getString("productKind") == "membership"; val kind = v.getString("offerKind"); val replacement = o(v.opt("replacement")); val proof = o(v.opt("applePromotionalOffer"))
@@ -101,7 +102,7 @@ internal object IndianaCustomerResponseSemantics {
         if (has("operationId", "lines", "discount", "charge", "nativeOffer", "execution")) attachQuote(v)
         if (has("executor", "checkoutUrl", "execution")) {
             require(v.isNull("execution") || v.getString("executor") == "merchant")
-            if (has("quoteFinalized", "orderId")) require(v.isNull("checkoutUrl") || v.getString("executor") == "indiana")
+            if (has("quoteFinalized", "orderId")) require(v.isNull("checkoutUrl") || v.getString("executor") == "indiana" || o(v.opt("merchantExecution")).optString("type") == "purchase")
             if (!v.isNull("checkoutUrl")) require(URI(v.getString("checkoutUrl")).scheme == "https")
         }
         if (has("action", "executor", "update", "cancel", "schedule", "release")) {
@@ -157,7 +158,10 @@ internal object IndianaCustomerResponseSemantics {
     }
     private fun attachQuote(v: JSONObject) {
         val lines = a(v.opt("lines")); val trial = o(lines.firstOrNull()?.opt("trial")); val execution = o(v.opt("execution")); val discount = o(v.opt("discount")); val provider = v.getString("provider")
-        if (provider == "stripe") {
+        if (provider == "merchant") {
+            require(execution.getString("provider") == "merchant" && execution.getString("operationId") == v.getString("operationId") && n(execution.opt("catalogAmountMinor")).compareTo(n(v.opt("catalogAmountMinor"))) == 0 && execution.getString("currency") == v.getString("currency") && time(execution.opt("expiresAt")) <= time(v.opt("expiresAt")))
+            require(execution.isNull("trialPeriodDays") == (trial.length() == 0) && (trial.length() == 0 || n(execution.opt("trialPeriodDays")).compareTo(n(trial.opt("days"))) == 0) && o(execution.opt("discount")).optString("grantId") == discount.optString("offerId") && !v.has("nativeOffer"))
+        } else if (provider == "stripe") {
             if (trial.has("cardRequired") && !trial.getBoolean("cardRequired") && !o(execution.opt("invoiceMode")).optBoolean("enabled")) require(execution.length() == 0 && discount.length() == 0)
             else {
                 require(execution.length() > 0 && o(execution.opt("metadata")).optString("grooveCheckoutId") == v.getString("operationId") && time(execution.opt("expiresAt")) <= time(v.opt("expiresAt")))
@@ -169,7 +173,7 @@ internal object IndianaCustomerResponseSemantics {
             }
             require(!v.has("nativeOffer"))
         } else { val selection = o(v.opt("nativeOffer")); require(execution.length() == 0 && selection.length() > 0 && lines.size == 1 && n(selection.opt("discountMinor")) <= n(v.opt("catalogAmountMinor")) && selection.isNull("trialDays") == (trial.length() == 0) && (trial.length() == 0 || n(selection.opt("trialDays")).compareTo(n(trial.opt("days"))) == 0) && (discount.length() == 0 || n(selection.opt("discountMinor")).compareTo(n(discount.opt("amountMinor"))) == 0)) }
-        if (discount.length() > 0) { val allocations = a(discount.opt("allocations")); require(v.isNull("billingSubscriptionId") && (provider == "stripe" || o(discount.opt("duration")).getString("type") == "once") && n(discount.opt("amountMinor")) <= n(v.opt("catalogAmountMinor")) && allocations.size == lines.size); for ((row, line) in allocations.zip(lines)) require(row.getString("productVersionId") == line.getString("productVersionId") && n(row.opt("amountMinor")) <= n(line.opt("catalogAmountMinor"))); require(allocations.fold(BigDecimal.ZERO) { total, row -> total + n(row.opt("amountMinor")) }.compareTo(n(discount.opt("amountMinor"))) == 0) }
+        if (discount.length() > 0) { val allocations = a(discount.opt("allocations")); require(v.isNull("billingSubscriptionId") && (provider in listOf("stripe", "merchant") || o(discount.opt("duration")).getString("type") == "once") && n(discount.opt("amountMinor")) <= n(v.opt("catalogAmountMinor")) && allocations.size == lines.size); for ((row, line) in allocations.zip(lines)) require(row.getString("productVersionId") == line.getString("productVersionId") && n(row.opt("amountMinor")) <= n(line.opt("catalogAmountMinor"))); require(allocations.fold(BigDecimal.ZERO) { total, row -> total + n(row.opt("amountMinor")) }.compareTo(n(discount.opt("amountMinor"))) == 0) }
         if (!v.isNull("charge")) { val charge = v.getJSONObject("charge"); require(!v.isNull("billingSubscriptionId") && n(charge.opt("totalMinor")).compareTo(n(charge.opt("debitMinor")) - n(charge.opt("discountMinor")) + n(charge.opt("taxMinor"))) == 0 && n(charge.opt("discountMinor")) <= n(charge.opt("debitMinor")) && time(charge.opt("periodEndsAt")) > time(charge.opt("effectiveAt"))) }
         require(unique(lines.map { it.getString("lineId") }) && lines.fold(BigDecimal.ZERO) { total, line -> total + n(line.opt("catalogAmountMinor")) }.compareTo(n(v.opt("catalogAmountMinor"))) == 0)
     }

package/native-sdk/android/java/ai/tinkerland/indiana/CustomerSemantics.kt

@@ -29,9 +29,9 @@ internal object IndianaCustomerSemantics {
             val plans = objects(value.getJSONArray("plans")); val provider = value.getString("provider")
             require(plans.map { it.getString("productVersionId") }.distinct().size == plans.size)
             require(plans.all { (it.optJSONObject("featureQuantities")?.length() ?: 0) <= 100 })
-            require(!value.has("offerId") || !value.has("billingSubscriptionId") && (provider == "stripe" || value.has("nativeOffer")))
-            require(!value.has("nativeOffer") || provider != "stripe" && plans.size == 1)
-            require(!value.has("newBillingSubscription") || provider == "stripe" && !value.has("billingSubscriptionId"))
+            require(!value.has("offerId") || !value.has("billingSubscriptionId") && (provider in listOf("stripe", "merchant") || value.has("nativeOffer")))
+            require(!value.has("nativeOffer") || provider in listOf("apple", "google") && plans.size == 1)
+            require(!value.has("newBillingSubscription") || provider in listOf("stripe", "merchant") && !value.has("billingSubscriptionId"))
             require(value.optJSONObject("invoiceMode")?.optBoolean("enabled") != true || provider == "stripe" && !value.has("entityId"))
             value.optJSONObject("nativeOffer")?.let { offer ->
                 require(offer.getString("offerKind") != "none" || offer.isNull("offerId") && offer.getInt("discountMinor") == 0 && offer.isNull("trialDays"))

package/native-sdk/android/java/ai/tinkerland/indiana/GeneratedProtocol.kt

@@ -2,7 +2,7 @@
 package ai.tinkerland.indiana
 enum class IndianaEnvironment(val value: String) { SANDBOX("sandbox"), LIVE("live") }
 internal object IndianaProtocol {
-    val wireProtocol = "0.9"
+    val wireProtocol = "0.10"
     val uuidPattern = Regex("^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-8][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}|00000000-0000-0000-0000-000000000000|ffffffff-ffff-ffff-ffff-ffffffffffff)\$")
     val utcPattern = Regex("^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d:[0-5]\\d(?:\\.\\d+)?(?:Z|([+-](?:[01]\\d|2[0-3]):[0-5]\\d)))\$")
     val scopeKeys = setOf("projectId", "environment")

package/native-sdk/android/java/ai/tinkerland/indiana/IndianaClient.kt

@@ -18,7 +18,7 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
-enum class IndianaSubscriptionProvider(val value: String) { STRIPE("stripe"), APPLE("apple"), GOOGLE("google") }
+enum class IndianaSubscriptionProvider(val value: String) { STRIPE("stripe"), APPLE("apple"), GOOGLE("google"), MERCHANT("merchant") }
 data class IndianaSubscriptionPlan(val productVersionId: UUID, val seatQuantities: Map<String, Int> = emptyMap(), val featureQuantities: Map<UUID, Int> = emptyMap())
 
 interface IndianaGoogleStore: AutoCloseable {
@@ -348,7 +348,7 @@ class IndianaClient internal constructor(private val configuration: IndianaConfi
         val body = JSONObject().put("requestId", requestId.toString()).put("plans", entries).put("provider", provider.value).put("currency", currency)
         billingSubscriptionId?.let { body.put("billingSubscriptionId", it.toString()) }
         if (nativeOffer != null && (!nativeOffer.matches(provider) || plans.size != 1) ||
-            offerId != null && (billingSubscriptionId != null || provider != IndianaSubscriptionProvider.STRIPE && nativeOffer == null)) throw IndianaClientException("invalid_request")
+            offerId != null && (billingSubscriptionId != null || provider !in listOf(IndianaSubscriptionProvider.STRIPE, IndianaSubscriptionProvider.MERCHANT) && nativeOffer == null)) throw IndianaClientException("invalid_request")
         offerId?.let { body.put("offerId", it.toString()) }
         nativeOffer?.let { body.put("nativeOffer", it.wire()) }
         return authenticated("subscriptions/preview-attach", body)

package/native-sdk/android/java/ai/tinkerland/indiana/MerchantCommerceSemantics.kt

@@ -0,0 +1,38 @@
+package ai.tinkerland.indiana
+
+import org.json.JSONObject
+
+/** Merchant refinements dispatch on generated DTO fields, not user JSON. */
+internal object IndianaMerchantCommerceSemantics {
+    fun validate(v: JSONObject, fields: Set<String>) {
+        fun has(vararg keys: String) = fields.containsAll(keys.toList())
+        fun require(value: Boolean) { if (!value) throw IndianaClientException("invalid_response") }
+        fun objects(key: String) = v.getJSONArray(key).let { rows -> (0 until rows.length()).map { rows.getJSONObject(it) } }
+        if (has("configurationRevision", "connectionRevision", "lineItems", "catalogAmountMinor", "discount")) {
+            val lines = objects("lineItems"); val total = v.getLong("catalogAmountMinor")
+            require(lines.sumOf { it.getLong("totalMinor") } == total && (v.isNull("discount") || v.getJSONObject("discount").getLong("amountMinor") <= total) && lines.map { it.getString("priceId") }.distinct().size == lines.size)
+        }
+        if (has("phase", "code", "reason", "retryable", "recovery") && v.optString("reason") == "RESULT_UNKNOWN") require(!v.getBoolean("retryable") && v.getString("recovery") == "recover_operation")
+        if (has("merchantExecutionId", "paymentStatus", "checkoutUrl", "checkoutExpiresAt") && !v.isNull("checkoutUrl")) require(v.getString("paymentStatus") in listOf("not_started", "pending") && !v.isNull("checkoutExpiresAt"))
+        if (has("merchantExecutionId", "scheduledFor", "status") || has("provider", "eventId", "subscription", "scheduledFor", "status")) require((v.getString("status") == "scheduled") == !v.isNull("scheduledFor"))
+        if (has("merchantExecutionId", "merchantRefundId", "status") && v.getString("status") == "succeeded") require(!v.isNull("merchantRefundId"))
+        if (has("lookup", "operationId", "customerId", "execution")) v.optJSONObject("execution")?.let { require(it.getString("operationId") == v.getString("operationId") && it.getString("customerId") == v.getString("customerId")) }
+        if (has("scope", "operationId", "customerId", "confirmedAt", "initialExecutionAllowed", "instruction")) v.getJSONObject("instruction").let { require(it.getString("operationId") == v.getString("operationId") && it.getString("customerId") == v.getString("customerId")) }
+        if (has("merchantSubscriptionId", "periodStartsAt", "periodEndsAt", "items")) {
+            val items = objects("items")
+            require(utcMillis(v.getString("periodEndsAt")) > utcMillis(v.getString("periodStartsAt")) && items.map { it.getString("priceId") }.distinct().size == items.size)
+        }
+        if (has("merchantInvoiceId", "subtotalMinor", "discountMinor", "taxMinor", "totalMinor", "paidMinor")) require(v.getLong("subtotalMinor") - v.getLong("discountMinor") + v.getLong("taxMinor") == v.getLong("totalMinor") && v.getLong("discountMinor") <= v.getLong("subtotalMinor") && v.getLong("paidMinor") == v.getLong("totalMinor"))
+        if (has("merchantInvoiceId", "lines", "paidMinor")) {
+            val lines = objects("lines")
+            require(lines.map { it.getString("merchantLineId") }.distinct().size == lines.size)
+            for (key in listOf("subtotalMinor", "discountMinor", "taxMinor", "totalMinor")) require(lines.sumOf { it.getLong(key) } == v.getLong(key))
+        }
+        if (has("merchantLineId", "subtotalMinor", "discountMinor", "taxMinor", "totalMinor")) {
+            val subtotal = v.getLong("subtotalMinor"); val discount = v.getLong("discountMinor"); val tax = v.getLong("taxMinor")
+            require(subtotal - discount + tax == v.getLong("totalMinor") && (if (subtotal < 0) discount == 0L && tax == 0L else discount <= subtotal))
+        }
+        if (has("provider", "eventId", "merchantOrderId", "paymentStatus", "invoice") && v.getString("paymentStatus") == "paid") require(!v.isNull("invoice"))
+        if (has("provider", "merchantInvoiceId", "cancelSubscriptions", "entitlementAction", "amountMinor") || has("provider", "eventId", "merchantRefundId", "amountMinor", "status")) require(v.getLong("amountMinor") > 0)
+    }
+}

package/native-sdk/android/java/ai/tinkerland/indiana/NativeStoreOffer.kt

@@ -16,7 +16,7 @@ data class IndianaNativeStoreOffer(val offerKind: IndianaNativeOfferKind, val of
     internal fun wire(): JSONObject = JSONObject().put("offerKind", offerKind.value).put("offerId", offerId ?: JSONObject.NULL)
         .put("discountMinor", discountMinor).put("trialDays", trialDays ?: JSONObject.NULL)
     internal fun matches(provider: IndianaSubscriptionProvider): Boolean = when (provider) {
-        IndianaSubscriptionProvider.STRIPE -> false
+        IndianaSubscriptionProvider.STRIPE, IndianaSubscriptionProvider.MERCHANT -> false
         IndianaSubscriptionProvider.APPLE -> (offerKind == IndianaNativeOfferKind.PROMOTIONAL) == (offerId != null)
         IndianaSubscriptionProvider.GOOGLE -> (offerKind == IndianaNativeOfferKind.NONE) == (offerId == null) &&
             (offerId == null || offerId.matches(Regex("[a-z0-9][a-z0-9-]*")))

package/native-sdk/android/java/ai/tinkerland/indiana/SDKVersion.kt

@@ -2,5 +2,5 @@
 package ai.tinkerland.indiana
 
 object IndianaSDK {
-    const val version = "0.9.5"
+    const val version = "0.10.1"
 }