@tinkerlandai/longplay-react-native 0.10.8 → 0.10.11

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

@@ -1,7 +1,6 @@
 package ai.tinkerland.indiana
 
 import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import org.json.JSONObject
 import org.json.JSONArray
 import java.net.URI
@@ -20,6 +19,7 @@ class IndianaPaywallSession internal constructor(
     private val quoted = AtomicReference<JSONObject?>(null)
     private val purchased = AtomicReference<JSONObject?>(null)
     private val mutex = Mutex()
+    private val stateLock = Any()
     private var pendingPreview: String? = null
     @Volatile private var invalidation: (() -> Unit)? = null
     private val selector: JSONObject
@@ -29,8 +29,17 @@ class IndianaPaywallSession internal constructor(
         else JSONObject().put("type", "version").put("versionId", versionId.toString())
     }
     val current: JSONObject? get() = view.get()?.let { JSONObject(it.toString()) }
-    fun close() { token.set(null); view.set(null); quoted.set(null); purchased.set(null); invalidation?.invoke(); invalidation = null }
-    internal fun onInvalidation(callback: () -> Unit) { invalidation = callback; if (token.get() == null) callback() }
+    fun close() {
+        val callback = synchronized(stateLock) {
+            token.set(null); view.set(null); quoted.set(null); purchased.set(null); pendingPreview = null
+            val current = invalidation; invalidation = null; current
+        }
+        callback?.invoke()
+    }
+    internal fun onInvalidation(callback: () -> Unit) {
+        val closed = synchronized(stateLock) { if (token.get() == null) true else { invalidation = callback; false } }
+        if (closed) callback()
+    }
     internal fun hostConfiguration() = configuration
     internal fun hostInit() = JSONObject().put("event", "init").put("surface", "paywall")
         .put("scope", JSONObject().put("projectId", configuration.scope.projectId.toString()).put("environment", configuration.scope.environment.value))
@@ -51,64 +60,78 @@ class IndianaPaywallSession internal constructor(
         return result
     }
     suspend fun refresh(): JSONObject = hostCommand(JSONObject().put("operation", "resolve").put("input", JSONObject()))
-    internal suspend fun hostCommand(payload: JSONObject): JSONObject = mutex.withLock {
-        if (token.get() == null || payload.keys().asSequence().toSet() != setOf("operation", "input")) throw IndianaClientException("invalid_command")
-        val input = payload.getJSONObject("input")
-        when (val action = payload.getString("operation")) {
-            "resolve" -> {
-                if (input.length() != 0) throw IndianaClientException("invalid_command")
-                val prior = view.get()
-                val selected = prior?.let { JSONObject().put("type", "version").put("versionId", it.getString("id")) } ?: selector
-                val result = send("resolvePaywall", "paywalls/resolve", JSONObject().put("selector", selected)
-                    .put("commerce", JSONObject().put("provider", provider.value).put("currency", currency)).put("locale", locale)).getJSONObject("paywall")
-                val key = if (selector.getString("type") == "version") "id" else "paywallId"
-                if (result.getString(key) != selector.getString(if (key == "id") "versionId" else key) ||
-                    prior != null && (result.getString("id") != prior.getString("id") || result.getJSONObject("offering").getString("id") != prior.getJSONObject("offering").getString("id") || result.getJSONObject("content").getJSONObject("artifact").getString("sha256") != prior.getJSONObject("content").getJSONObject("artifact").getString("sha256")) ||
-                    result.getJSONObject("document").getString("offeringVersionId") != result.getJSONObject("offering").getString("id")) throw IndianaClientException("invalid_response")
-                view.set(result); JSONObject(result.toString())
-            }
-            "preview" -> {
-                if (!setOf("actionId", "productVersionId", "requestId", "offerId", "nativeOffer", "featureQuantities").containsAll(input.keys().asSequence().toSet())) throw IndianaClientException("invalid_command")
-                val product = input.getString("productVersionId")
-                val policy = view.get()?.getJSONObject("document")?.getJSONObject("buttons")?.optJSONObject(input.getString("actionId")) ?: throw IndianaClientException("invalid_command")
-                if (policy.optString("type") != "checkout") throw IndianaClientException("invalid_command")
-                val selection = policy.getJSONObject("product")
-                val allowed = if (selection.getString("type") == "fixed") selection.getString("productVersionId") == product
-                    else selection.getJSONArray("allowedProductVersionIds").let { ids -> (0 until ids.length()).any { ids.getString(it) == product } }
-                if (!allowed) throw IndianaClientException("invalid_command")
-                val fingerprint = canonical(payload)
-                if (pendingPreview != null && pendingPreview != fingerprint) {
-                    val status = purchased.get()?.optString("status")
-                    if (status == null || status == "pending") throw IndianaClientException("command_pending")
-                    quoted.set(null); purchased.set(null)
+    internal suspend fun hostCommand(payload: JSONObject): JSONObject {
+        if (!mutex.tryLock()) throw IndianaClientException("command_pending")
+        try {
+            if (token.get() == null || payload.keys().asSequence().toSet() != setOf("operation", "input")) throw IndianaClientException("invalid_command")
+            val input = payload.getJSONObject("input")
+            return when (val action = payload.getString("operation")) {
+                "resolve" -> {
+                    if (input.length() != 0) throw IndianaClientException("invalid_command")
+                    val prior = view.get()
+                    val selected = prior?.let { JSONObject().put("type", "version").put("versionId", it.getString("id")) } ?: selector
+                    val result = send("resolvePaywall", "paywalls/resolve", JSONObject().put("selector", selected)
+                        .put("commerce", JSONObject().put("provider", provider.value).put("currency", currency)).put("locale", locale)).getJSONObject("paywall")
+                    val key = if (selector.getString("type") == "version") "id" else "paywallId"
+                    if (result.getString(key) != selector.getString(if (key == "id") "versionId" else key) ||
+                        prior != null && (result.getString("id") != prior.getString("id") || result.getJSONObject("offering").getString("id") != prior.getJSONObject("offering").getString("id") || result.getJSONObject("content").getJSONObject("artifact").getString("sha256") != prior.getJSONObject("content").getJSONObject("artifact").getString("sha256")) ||
+                        result.getJSONObject("document").getString("offeringVersionId") != result.getJSONObject("offering").getString("id")) throw IndianaClientException("invalid_response")
+                    synchronized(stateLock) {
+                        if (token.get() == null) throw IndianaClientException("identity_changed")
+                        view.set(result); JSONObject(result.toString())
+                    }
                 }
-                if (pendingPreview == fingerprint) quoted.get()?.let { return@withLock JSONObject(it.toString()) }
-                val selectedPlan = JSONObject().put("productVersionId", product)
-                if (input.has("featureQuantities")) selectedPlan.put("featureQuantities", input.getJSONObject("featureQuantities"))
-                val body = JSONObject().put("requestId", input.getString("requestId"))
-                    .put("plans", JSONArray().put(selectedPlan)).put("provider", provider.value).put("currency", currency)
-                for (key in listOf("offerId", "nativeOffer")) if (input.has(key)) body.put(key, input.get(key))
-                IndianaSchema.validate("previewAttachRequest", body)
-                pendingPreview = fingerprint
-                val result = send("previewAttach", "subscriptions/preview-attach", body).getJSONObject("quote")
-                if (result.getString("provider") != provider.value || result.getString("currency") != currency || result.getJSONArray("lines").length() != 1 || result.getJSONArray("lines").getJSONObject(0).getString("productVersionId") != product) throw IndianaClientException("invalid_response")
-                quoted.set(result); purchased.set(null); JSONObject(result.toString())
-            }
-            "confirm", "cancel", "read" -> {
-                if (input.length() != 0) throw IndianaClientException("invalid_command")
-                val id = quoted.get()?.getString("operationId") ?: throw IndianaClientException("invalid_command")
-                val body = JSONObject().put("operationId", id)
-                if (action != "read") body.put("intent", action)
-                val result = send(if (action == "read") "readSubscriptionOperation" else "attach",
-                    if (action == "read") "subscriptions/operations/read" else "subscriptions/attach", body).getJSONObject("operation")
-                if (result.getString("operationId") != id || result.getString("currency") != currency) throw IndianaClientException("invalid_response")
-                purchased.get()?.takeIf { it.getString("status") == "complete" }?.let { return@withLock JSONObject(it.toString()) }
-                purchased.set(result)
-                if (result.getString("status") !in setOf("pending", "complete")) { pendingPreview = null; quoted.set(null) }
-                JSONObject(result.toString())
+                "preview" -> {
+                    if (!setOf("actionId", "productVersionId", "requestId", "offerId", "nativeOffer", "featureQuantities").containsAll(input.keys().asSequence().toSet())) throw IndianaClientException("invalid_command")
+                    val product = input.getString("productVersionId")
+                    val policy = view.get()?.getJSONObject("document")?.getJSONObject("buttons")?.optJSONObject(input.getString("actionId")) ?: throw IndianaClientException("invalid_command")
+                    if (policy.optString("type") != "checkout") throw IndianaClientException("invalid_command")
+                    val selection = policy.getJSONObject("product")
+                    val allowed = if (selection.getString("type") == "fixed") selection.getString("productVersionId") == product
+                        else selection.getJSONArray("allowedProductVersionIds").let { ids -> (0 until ids.length()).any { ids.getString(it) == product } }
+                    if (!allowed) throw IndianaClientException("invalid_command")
+                    val fingerprint = canonical(payload)
+                    if (pendingPreview != null && pendingPreview != fingerprint) {
+                        val status = purchased.get()?.optString("status")
+                        if (status == null || status == "pending") throw IndianaClientException("command_pending")
+                    }
+                    if (pendingPreview == fingerprint) quoted.get()?.let { return JSONObject(it.toString()) }
+                    val selectedPlan = JSONObject().put("productVersionId", product)
+                    if (input.has("featureQuantities")) selectedPlan.put("featureQuantities", input.getJSONObject("featureQuantities"))
+                    val body = JSONObject().put("requestId", input.getString("requestId"))
+                        .put("plans", JSONArray().put(selectedPlan)).put("provider", provider.value).put("currency", currency)
+                    for (key in listOf("offerId", "nativeOffer")) if (input.has(key)) body.put(key, input.get(key))
+                    IndianaSchema.validate("previewAttachRequest", body)
+                    synchronized(stateLock) {
+                        if (token.get() == null) throw IndianaClientException("identity_changed")
+                        if (pendingPreview != fingerprint) { quoted.set(null); purchased.set(null) }
+                        pendingPreview = fingerprint
+                    }
+                    val result = send("previewAttach", "subscriptions/preview-attach", body).getJSONObject("quote")
+                    if (result.getString("provider") != provider.value || result.getString("currency") != currency || result.getJSONArray("lines").length() != 1 || result.getJSONArray("lines").getJSONObject(0).getString("productVersionId") != product) throw IndianaClientException("invalid_response")
+                    synchronized(stateLock) {
+                        if (token.get() == null) throw IndianaClientException("identity_changed")
+                        quoted.set(result); purchased.set(null); JSONObject(result.toString())
+                    }
+                }
+                "confirm", "cancel", "read" -> {
+                    if (input.length() != 0) throw IndianaClientException("invalid_command")
+                    val id = quoted.get()?.getString("operationId") ?: throw IndianaClientException("invalid_command")
+                    val body = JSONObject().put("operationId", id)
+                    if (action != "read") body.put("intent", action)
+                    val result = send(if (action == "read") "readSubscriptionOperation" else "attach",
+                        if (action == "read") "subscriptions/operations/read" else "subscriptions/attach", body).getJSONObject("operation")
+                    if (result.getString("operationId") != id || result.getString("currency") != currency) throw IndianaClientException("invalid_response")
+                    synchronized(stateLock) {
+                        if (token.get() == null) throw IndianaClientException("identity_changed")
+                        purchased.get()?.takeIf { it.getString("status") == "complete" || it.getString("status") != "pending" && result.getString("status") == "pending" }?.let { return JSONObject(it.toString()) }
+                        purchased.set(result)
+                        JSONObject(result.toString())
+                    }
+                }
+                else -> throw IndianaClientException("invalid_command")
             }
-            else -> throw IndianaClientException("invalid_command")
-        }
+        } finally { mutex.unlock() }
     }
     internal fun trustedPurchase(value: JSONObject): JSONObject {
         val saved = purchased.get() ?: throw IndianaClientException("invalid_command")

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

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

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

@@ -3,8 +3,10 @@ import org.json.JSONObject
 import org.json.JSONArray
 import java.net.URI
 import java.util.UUID
+import java.util.concurrent.ConcurrentHashMap
 /** Generated contract interpreter for the native wire boundary; no business policy is evaluated here. */
 internal object IndianaSchema {
+    private val patterns = ConcurrentHashMap<String, Regex>()
     private val schemas: JSONObject by lazy { IndianaSchema::class.java.getResourceAsStream("/funnel-wire-schemas.json")?.bufferedReader(Charsets.UTF_8)?.use { JSONObject(it.readText()) } ?: throw IndianaClientException("invalid_response") }
     fun validate(name: String, value: JSONObject) { val root = schemas.getJSONObject(name);if (!valid(value, root, root, 0)) throw IndianaClientException("invalid_response") }
     fun customerResponse(name: String, value: JSONObject): JSONObject { val root = schemas.getJSONObject(name); return adapt(value, root, root, listOf(name), 0) as JSONObject }
@@ -47,7 +49,7 @@ internal object IndianaSchema {
         }
         if (value is String) {
             if (schema.has("minLength") && value.length < schema.getInt("minLength") || schema.has("maxLength") && value.length > schema.getInt("maxLength")) return false
-            if (schema.has("pattern") && !Regex(schema.getString("pattern")).containsMatchIn(value)) return false
+            if (schema.has("pattern") && !patterns.getOrPut(schema.getString("pattern")) { Regex(schema.getString("pattern")) }.containsMatchIn(value)) return false
             try { when (schema.optString("format")) { "uuid" -> UUID.fromString(value);"date-time" -> utcMillis(value);"uri" -> if (URI(value).scheme == null) return false } } catch (_: Exception) { return false }
         }
         if (value is Number) {

package/native-sdk/android/java/ai/tinkerland/longplay/Longplay.kt

@@ -30,3 +30,6 @@ typealias LongplayStoreException = ai.tinkerland.indiana.IndianaStoreException
 typealias LongplayStoreSubscriptions = ai.tinkerland.indiana.IndianaStoreSubscriptions
 typealias LongplaySubscriptionPlan = ai.tinkerland.indiana.IndianaSubscriptionPlan
 typealias LongplaySubscriptionProvider = ai.tinkerland.indiana.IndianaSubscriptionProvider
+
+typealias LongplayFunnelProcess = ai.tinkerland.indiana.IndianaFunnelProcess
+typealias LongplayFunnelProcessBridge = ai.tinkerland.indiana.IndianaFunnelProcessBridge