@founderroute/analytics-react-native 0.1.0-beta.1 → 1.0.0-rc.2

package/FounderRouteAnalytics.podspec

@@ -3,7 +3,7 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 Pod::Spec.new do |s|
   s.name = "FounderRouteAnalytics"
   s.version = package["version"]
-  s.summary = "Native consent-first FounderRoute Analytics for React Native"
+  s.summary = "Native FounderRoute Analytics for React Native"
   s.homepage = "https://github.com/itsreed/founderroute-analytics"
   s.license = "MIT"
   s.author = "FounderRoute"

package/android/src/main/java/com/founderroute/analytics/FounderRouteAnalytics.kt

@@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit
 import java.util.concurrent.Callable
 import java.util.concurrent.atomic.AtomicBoolean
 
-class FounderRouteAnalytics private constructor(private val context: Context, private val key: String, private val endpoint: String, private val appId: String, private val allowedProperties: Set<String>, private val allowedTraits: Set<String>,private val verificationId:String?) : DefaultLifecycleObserver {
+class FounderRouteAnalytics private constructor(private val context: Context, private val key: String, private val endpoint: String, private val appId: String, private val allowedProperties: Set<String>, private val allowedTraits: Set<String>,private val verificationId:String?, private val requestedMode:String?, private var propertyId:String?, private var environment:String?) : DefaultLifecycleObserver {
     companion object {
         private fun timestamp(value:Long):String = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",Locale.US).apply { timeZone=TimeZone.getTimeZone("UTC") }.format(Date(value))
         private fun timestampMillis(value:String):Long {
@@ -29,39 +29,81 @@ class FounderRouteAnalytics private constructor(private val context: Context, pr
         }
         @Volatile internal var connectionFactory:(URL)->HttpURLConnection = { it.openConnection() as HttpURLConnection }
         @Volatile private var instance: FounderRouteAnalytics? = null
-        @Synchronized fun init(context: Context, key: String, endpoint: String, appId: String, allowedProperties: Set<String> = emptySet(), allowedTraits: Set<String> = emptySet(),verificationId:String?=null): FounderRouteAnalytics {
+        @Synchronized fun init(context: Context, key: String, endpoint: String, appId: String, allowedProperties: Set<String> = emptySet(), allowedTraits: Set<String> = emptySet(),verificationId:String?=null, collectionMode:String?=null, propertyId:String?=null, environment:String?=null): FounderRouteAnalytics {
             require(key.startsWith("fr_pk_")); require(endpoint.startsWith("https://") || endpoint.startsWith("http://localhost"))
-            return instance ?: FounderRouteAnalytics(context.applicationContext,key,endpoint.trimEnd('/'),appId,allowedProperties,allowedTraits,verificationId).also { instance=it; android.os.Handler(android.os.Looper.getMainLooper()).post { ProcessLifecycleOwner.get().lifecycle.addObserver(it) } }
+            return instance ?: FounderRouteAnalytics(context.applicationContext,key,endpoint.trimEnd('/'),appId,allowedProperties,allowedTraits,verificationId,collectionMode,propertyId,environment).also { instance=it; android.os.Handler(android.os.Looper.getMainLooper()).post { ProcessLifecycleOwner.get().lifecycle.addObserver(it) } }
         }
         fun current() = instance
         fun restore(context:Context,data:Data):FounderRouteAnalytics? {
             val key=data.getString("key")?:return null
-            val file=File(context.noBackupFilesDir,"founderroute-${key.takeLast(16)}.json")
+            val scope=if(data.getString("propertyId")!=null) "${data.getString("propertyId")}-${data.getString("environment")}" else key.takeLast(16)
+            val file=File(context.noBackupFilesDir,"founderroute-$scope.json")
+            if(File(context.noBackupFilesDir,"founderroute-$scope.refusal").exists())return null
             if(!file.exists())return null
             val saved=try{JSONObject(file.readText())}catch(_:Exception){return null}
-            if(!saved.optBoolean("consent",false))return null
+            if(!saved.optBoolean("collection_enabled",saved.optBoolean("consent",false)))return null
             return init(context,key,data.getString("endpoint")?:return null,data.getString("appId")?:return null,
-              (data.getStringArray("properties")?:emptyArray()).toSet(),(data.getStringArray("traits")?:emptyArray()).toSet(),data.getString("verificationId")).also{it.setConsent(true)}
+              (data.getStringArray("properties")?:emptyArray()).toSet(),(data.getStringArray("traits")?:emptyArray()).toSet(),data.getString("verificationId"),data.getString("collectionMode"),data.getString("propertyId"),data.getString("environment")).also{client->client.executor.execute{client.consentState=saved.optString("consent_state",if(saved.optBoolean("consent",false))"granted" else "not_provided");client.reconcileCollection()}}
         }
     }
     private val executor = Executors.newSingleThreadScheduledExecutor()
     private val permitted = AtomicBoolean(false)
+    private val stopRequested = AtomicBoolean(false)
+    private var configurationReady = false
     @Volatile private var activeConnection:HttpURLConnection?=null
+    private var collectionMode:String? = null
+    private var consentState = "not_provided"
+    private var refused = false
+    private var destroyed = false
     private var consent = false; private var foreground = true; private var events = mutableListOf<JSONObject>()
     private var anonymousId: String? = null; private var userId: String? = null; private var accountId: String? = null; private var token: String? = null
     private var traits = JSONObject(); private var session = ""; private var lastActivity = 0L
     private var campaign = JSONObject()
     private var dropped = 0; private var rejected = 0; private var acknowledged = 0; private var lastError: String? = null; private var retryAt = 0L; private var failures = 0
-    private val file get() = File(context.noBackupFilesDir,"founderroute-${key.takeLast(16)}.json")
-    init { executor.scheduleWithFixedDelay({ if(consent) { if(foreground) enqueue("fr_session","session",JSONObject(),JSONObject().put("active_ms",15000)); deliver() } },15,15,TimeUnit.SECONDS) }
-    fun setConsent(granted: Boolean) { permitted.set(granted); if(!granted)activeConnection?.disconnect(); executor.execute {
-        if(consent==granted)return@execute
+    private val scope get() = if(propertyId!=null&&environment!=null) "$propertyId-$environment" else key.takeLast(16)
+    private val file get() = File(context.noBackupFilesDir,"founderroute-$scope.json")
+    private val legacyFile get() = File(context.noBackupFilesDir,"founderroute-${key.takeLast(16)}.json")
+    private val refusalFile get() = File(context.noBackupFilesDir,"founderroute-$scope.refusal")
+    private fun saveRefusal(value:Boolean) {
+        refused=value
+        try { if(value) refusalFile.writeText("refused") else if(refusalFile.exists()&&!refusalFile.delete())throw IllegalStateException() }
+        catch(_:Exception){lastError="preference_storage_unavailable"}
+    }
+    private fun configureCollection() {
+        try {
+            require(requestedMode==null||requestedMode in listOf("automatic","consent"))
+            if(propertyId==null||environment==null||requestedMode==null) {
+                val connection=connectionFactory(URL("$endpoint/api/analytics/v2/config?key=${java.net.URLEncoder.encode(key,"UTF-8")}"))
+                val config=try { connection.connectTimeout=10000;connection.readTimeout=10000;require(connection.responseCode==200);JSONObject(connection.inputStream.bufferedReader().use{it.readText()}) }finally{connection.disconnect()}
+                propertyId=config.getString("property_id");environment=config.getString("environment");collectionMode=requestedMode?:config.getString("collection_mode")
+            } else collectionMode=requestedMode
+            require(propertyId!!.matches(Regex("[a-zA-Z0-9_-]+"))&&environment in listOf("production","test")&&collectionMode in listOf("automatic","consent"))
+            refused=refused||refusalFile.exists()
+            if(refused)saveRefusal(true)
+            configurationReady=true
+            reconcileCollection()
+        } catch(_:Exception){lastError="configuration_unavailable";permitted.set(false)}
+    }
+    fun optOut() { stopRequested.set(true);permitted.set(false);activeConnection?.disconnect();executor.execute{consentState="denied";saveRefusal(true);reconcileCollection()} }
+    fun optIn() { stopRequested.set(false);executor.execute{saveRefusal(false);if(consentState=="denied")consentState="not_provided";reconcileCollection()} }
+    fun setCollectionMode(mode:String) { require(mode in listOf("automatic","consent"));executor.execute{collectionMode=mode;reconcileCollection()} }
+    fun destroy() { synchronized(Companion){if(instance===this)instance=null};stopRequested.set(true);permitted.set(false);activeConnection?.disconnect();executor.execute{destroyed=true;consent=false;WorkManager.getInstance(context).cancelUniqueWork("founderroute-delivery");android.os.Handler(android.os.Looper.getMainLooper()).post{ProcessLifecycleOwner.get().lifecycle.removeObserver(this)};synchronized(Companion){if(instance===this)instance=null};executor.shutdown()} }
+    private fun reconcileCollection() {
+        val enabled=configurationReady&&!stopRequested.get()&&!destroyed&&!refused&&(collectionMode=="automatic"||(collectionMode=="consent"&&consentState=="granted"))
+        setCollecting(enabled)
+    }
+    init { executor.execute{configureCollection()};executor.scheduleWithFixedDelay({ if(consent) { if(foreground) enqueue("fr_session","session",JSONObject(),JSONObject().put("active_ms",15000)); deliver() } },15,15,TimeUnit.SECONDS) }
+    fun setConsent(granted: Boolean) { stopRequested.set(!granted);if(!granted){permitted.set(false);activeConnection?.disconnect()};executor.execute{consentState=if(granted)"granted" else "denied";saveRefusal(!granted);reconcileCollection()} }
+    private fun setCollecting(requested: Boolean) { val granted=requested&&!stopRequested.get();permitted.set(granted); if(!granted)activeConnection?.disconnect();
+        if(!granted&&refused){file.delete();legacyFile.delete()}
+        if(consent==granted)return
         consent=granted
-        if(!granted) { events.clear(); anonymousId=null; userId=null; accountId=null; token=null; traits=JSONObject(); campaign=JSONObject(); file.delete(); WorkManager.getInstance(context).cancelUniqueWork("founderroute-delivery"); return@execute }
-        try { if(file.exists()) { val saved=JSONObject(file.readText()); dropped=saved.optInt("dropped",0); anonymousId=saved.optString("anonymous_id").takeIf{it.isNotBlank()}; val queue=saved.optJSONArray("events")?:JSONArray(); events=(0 until queue.length()).map { queue.getJSONObject(it) }.toMutableList() } } catch(_:Exception) { lastError="storage_unavailable" }
+        if(!granted) { events.clear(); anonymousId=null; userId=null; accountId=null; token=null; traits=JSONObject(); campaign=JSONObject(); file.delete(); WorkManager.getInstance(context).cancelUniqueWork("founderroute-delivery"); return }
+        val restoreFile=if(file.exists())file else legacyFile
+        try { if(restoreFile.exists()) { val saved=JSONObject(restoreFile.readText()); dropped=saved.optInt("dropped",0); anonymousId=saved.optString("anonymous_id").takeIf{it.isNotBlank()}; val queue=saved.optJSONArray("events")?:JSONArray(); events=(0 until queue.length()).map { queue.getJSONObject(it) }.toMutableList() } } catch(_:Exception) { lastError="storage_unavailable" }
         if(anonymousId==null)anonymousId=UUID.randomUUID().toString()
-        prune(); persist(); schedule(); deliver()
-    } }
+        prune(); persist(); if(file.exists()&&legacyFile!=file)legacyFile.delete(); schedule(); deliver()
+    }
     fun identify(id:String, identityToken:String?=null, userTraits:JSONObject=JSONObject()) { executor.execute { if(consent) { if(userId!=null&&userId!=id) resetIdentity(); userId=id;token=identityToken;traits=JSONObject(userTraits.toString());enqueue("fr_identify","identify",JSONObject()) } } }
     fun setAccount(id:String?) { executor.execute { if(consent)accountId=id } }
     fun reset() { executor.execute { if(consent) {resetIdentity();persist()} } }
@@ -82,15 +124,15 @@ class FounderRouteAnalytics private constructor(private val context: Context, pr
         while(consent&&permitted.get()&&events.isNotEmpty()&&System.currentTimeMillis()<deadline&&System.currentTimeMillis()>=retryAt)deliver()
         !permitted.get()||events.isEmpty()
     }).get(30,TimeUnit.SECONDS)
-    fun getDiagnostics(callback:(JSONObject)->Unit) { executor.execute { callback(JSONObject().put("consent",consent).put("queued",events.size).put("dropped",dropped).put("rejected",rejected).put("acknowledged",acknowledged).put("anonymousId",anonymousId?:JSONObject.NULL).put("lastError",lastError?:JSONObject.NULL)) } }
+    fun getDiagnostics(callback:(JSONObject)->Unit) { executor.execute { callback(JSONObject().put("consent",consentState=="granted").put("collectionMode",collectionMode?:JSONObject.NULL).put("consentState",consentState).put("optedOut",refused).put("collectionEnabled",consent&&permitted.get()).put("queued",events.size).put("dropped",dropped).put("rejected",rejected).put("acknowledged",acknowledged).put("anonymousId",anonymousId?:JSONObject.NULL).put("lastError",lastError?:JSONObject.NULL)) } }
     private fun sanitize(input:JSONObject, allowed:Set<String>):JSONObject { val output=JSONObject();input.keys().forEach { key -> val value=input.opt(key); if(key in allowed&&!Regex("password|secret|token|email|phone|authorization|address|full.?name",RegexOption.IGNORE_CASE).containsMatchIn(key)) { if(value is String)output.put(key,value.take(500));else if(value is Number||value is Boolean||value==JSONObject.NULL)output.put(key,value) } };return output }
     private fun enqueue(name:String,kind:String,properties:JSONObject,extra:JSONObject=JSONObject(),outcomeId:String?=null) {
         if(!consent||!permitted.get()||anonymousId==null)return
         val now=System.currentTimeMillis();if(now-lastActivity>=1800000)session=UUID.randomUUID().toString();lastActivity=now
-        val ctx=JSONObject().put("sdk","android").put("sdk_version","0.1.0-beta.1").put("app_id",appId);extra.keys().forEach { ctx.put(it,extra.get(it)) }
+        val ctx=JSONObject().put("sdk","android").put("sdk_version","1.0.0-rc.2").put("app_id",appId);extra.keys().forEach { ctx.put(it,extra.get(it)) }
         verificationId?.let{ctx.put("verification_id",it)}
         campaign.keys().forEach { ctx.put(it,campaign.get(it)) }
-        val event=JSONObject().put("event_id",UUID.randomUUID().toString()).put("protocol",1).put("name",name).put("kind",kind).put("occurred_at",timestamp(now)).put("anonymous_id",anonymousId).put("session_id",session).put("consent",true).put("properties",sanitize(properties,allowedProperties)).put("traits",sanitize(traits,allowedTraits)).put("context",ctx)
+        val event=JSONObject().put("event_id",UUID.randomUUID().toString()).put("protocol",2).put("name",name).put("kind",kind).put("occurred_at",timestamp(now)).put("anonymous_id",anonymousId).put("session_id",session).put("collection_mode",collectionMode).put("consent_state",if(consentState=="granted")"granted" else "not_provided").put("properties",sanitize(properties,allowedProperties)).put("traits",sanitize(traits,allowedTraits)).put("context",ctx)
         userId?.let{event.put("user_id",it)};accountId?.let{event.put("account_id",it)};token?.let{event.put("identity_token",it)};outcomeId?.let{event.put("outcome_id",it)}
         if(event.toString().toByteArray().size>8192){rejected++;lastError="event_too_large";return}
         events.add(event);prune();persist();schedule()
@@ -100,14 +142,14 @@ class FounderRouteAnalytics private constructor(private val context: Context, pr
         events.removeAll { try { timestampMillis(it.getString("occurred_at"))<cutoff } catch(_:Exception){true} };dropped+=size-events.size
         while(events.size>10000||JSONArray(events).toString().toByteArray().size>10*1024*1024){events.removeAt(0);dropped++}
     }
-    private fun persist() { if(!consent||!permitted.get())return;try { val temp=File(file.path+".tmp");temp.writeText(JSONObject().put("consent",true).put("dropped",dropped).put("anonymous_id",anonymousId).put("events",JSONArray(events)).toString()); if(!temp.renameTo(file)){file.writeText(temp.readText());temp.delete()} }catch(_:Exception){lastError="storage_unavailable"} }
-    private fun schedule() { val constraints=Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build();val request=OneTimeWorkRequestBuilder<AnalyticsDeliveryWorker>().setInputData(workDataOf("key" to key,"endpoint" to endpoint,"appId" to appId,"properties" to allowedProperties.toTypedArray(),"traits" to allowedTraits.toTypedArray(),"verificationId" to verificationId)).setConstraints(constraints).setBackoffCriteria(BackoffPolicy.EXPONENTIAL,30,TimeUnit.SECONDS).build();WorkManager.getInstance(context).enqueueUniqueWork("founderroute-delivery",ExistingWorkPolicy.KEEP,request) }
+    private fun persist() { if(!consent||!permitted.get())return;try { val temp=File(file.path+".tmp");temp.writeText(JSONObject().put("collection_enabled",true).put("consent_state",consentState).put("dropped",dropped).put("anonymous_id",anonymousId).put("events",JSONArray(events)).toString()); if(!temp.renameTo(file)){file.writeText(temp.readText());temp.delete()} }catch(_:Exception){lastError="storage_unavailable"} }
+    private fun schedule() { val constraints=Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build();val request=OneTimeWorkRequestBuilder<AnalyticsDeliveryWorker>().setInputData(workDataOf("key" to key,"endpoint" to endpoint,"appId" to appId,"properties" to allowedProperties.toTypedArray(),"traits" to allowedTraits.toTypedArray(),"verificationId" to verificationId,"collectionMode" to collectionMode,"propertyId" to propertyId,"environment" to environment)).setConstraints(constraints).setBackoffCriteria(BackoffPolicy.EXPONENTIAL,30,TimeUnit.SECONDS).build();WorkManager.getInstance(context).enqueueUniqueWork("founderroute-delivery",ExistingWorkPolicy.KEEP,request) }
     private fun deliver() {
         if(!consent||!permitted.get()||System.currentTimeMillis()<retryAt)return
         prune();val batch=mutableListOf<JSONObject>();for(event in events.take(50)){if(JSONObject().put("key",key).put("events",JSONArray(batch+event)).toString().toByteArray().size>65536)break;batch.add(event)};if(batch.isEmpty())return
         var connection:HttpURLConnection?=null
         try {
-            connection=connectionFactory(URL("$endpoint/api/analytics/v1/collect"));activeConnection=connection;connection.requestMethod="POST";connection.setRequestProperty("Content-Type","application/json");connection.doOutput=true;connection.connectTimeout=10000;connection.readTimeout=15000
+            connection=connectionFactory(URL("$endpoint/api/analytics/v2/collect"));activeConnection=connection;connection.requestMethod="POST";connection.setRequestProperty("Content-Type","application/json");connection.doOutput=true;connection.connectTimeout=10000;connection.readTimeout=15000
             if(!permitted.get())return
             connection.outputStream.use{it.write(JSONObject().put("key",key).put("events",JSONArray(batch)).toString().toByteArray())}
             val status=connection.responseCode
@@ -115,6 +157,7 @@ class FounderRouteAnalytics private constructor(private val context: Context, pr
             if(status==429||status>=500){retry("delivery_$status");return}
             if(status!=200){val ids=batch.map{it.getString("event_id")}.toSet();events.removeAll{it.getString("event_id") in ids};rejected+=ids.size;lastError="delivery_rejected";persist();return}
             val response=JSONObject(connection.inputStream.bufferedReader().use{it.readText()});val results=response.optJSONArray("results")?:JSONArray();val ids=mutableSetOf<String>()
+            if(!permitted.get())return
             for(i in 0 until results.length()){val receipt=results.getJSONObject(i);val state=receipt.optString("status");if(state in listOf("accepted","duplicate","rejected")){ids.add(receipt.getString("event_id"));if(state=="rejected"){rejected++;lastError=receipt.optString("reason")}else acknowledged++}}
             events.removeAll{it.getString("event_id") in ids};failures=0;retryAt=0;persist()
         }catch(_:Exception){retry("network_unavailable")}finally{connection?.disconnect();activeConnection=null}

package/android/src/main/java/com/founderroute/analytics/reactnative/FounderRouteAnalyticsModule.kt

@@ -8,7 +8,11 @@ import org.json.JSONObject
 class FounderRouteAnalyticsModule(private val context:ReactApplicationContext):ReactContextBaseJavaModule(context) {
     override fun getName()="FounderRouteAnalyticsModule"
     private var client:FounderRouteAnalytics?=null
-    @ReactMethod fun configure(key:String,endpoint:String,appId:String,properties:ReadableArray,traits:ReadableArray,verificationId:String?) { client=FounderRouteAnalytics.init(context,key,endpoint,appId,properties.toArrayList().map{it.toString()}.toSet(),traits.toArrayList().map{it.toString()}.toSet(),verificationId) }
+    @ReactMethod fun configure(key:String,endpoint:String,appId:String,properties:ReadableArray,traits:ReadableArray,verificationId:String?,collectionMode:String?,propertyId:String?,environment:String?) { client=FounderRouteAnalytics.init(context,key,endpoint,appId,properties.toArrayList().map{it.toString()}.toSet(),traits.toArrayList().map{it.toString()}.toSet(),verificationId,collectionMode,propertyId,environment) }
+    @ReactMethod fun optOut(){client?.optOut()}
+    @ReactMethod fun optIn(){client?.optIn()}
+    @ReactMethod fun setCollectionMode(mode:String){client?.setCollectionMode(mode)}
+    @ReactMethod fun destroy(){client?.destroy();client=null}
     @ReactMethod fun setConsent(value:Boolean){client?.setConsent(value)}
     @ReactMethod fun identify(id:String,token:String?,traits:ReadableMap){client?.identify(id,token,JSONObject(traits.toHashMap()))}
     @ReactMethod fun setAccount(id:String?){client?.setAccount(id)}

package/bridge.js

@@ -3,8 +3,12 @@ export function createBridge(native, platform, options) {
   if (!native) throw new Error("Link FounderRoute's native module and rebuild the application.");
   const config = {...options, ...options[platform]};
   if (!config.key || !config.appId) throw new Error(`Register a ${platform} property and provide its public key and app ID.`);
-  native.configure(config.key, config.endpoint, config.appId, config.allowedProperties ?? [], config.allowedTraits ?? [],config.verificationId??null);
+  native.configure(config.key, config.endpoint, config.appId, config.allowedProperties ?? [], config.allowedTraits ?? [],config.verificationId??null, config.collectionMode??null, config.propertyId??null, config.environment??null);
   return {
+    optOut: () => native.optOut(),
+    optIn: () => native.optIn(),
+    setCollectionMode: mode => native.setCollectionMode(mode),
+    destroy: () => native.destroy(),
     setConsent: granted => native.setConsent(Boolean(granted)),
     identify: (id, {token, traits = {}} = {}) => native.identify(id, token ?? null, traits),
     setAccount: id => native.setAccount(id ?? null),

package/index.d.ts

@@ -1,12 +1,14 @@
-export interface Options { endpoint: string; verificationId?:string; ios: {key:string;appId:string}; android: {key:string;appId:string}; allowedProperties?:string[]; allowedTraits?:string[] }
+export interface PropertyOptions {key:string;appId:string;propertyId?:string;environment?:"production"|"test";collectionMode?:"automatic"|"consent"}
+export interface Options { endpoint: string; verificationId?:string; collectionMode?:"automatic"|"consent"; ios: PropertyOptions; android: PropertyOptions; allowedProperties?:string[]; allowedTraits?:string[] }
 export interface Client {
+  optOut():void; optIn():void; destroy():void; setCollectionMode(mode:"automatic"|"consent"):void;
   setConsent(granted:boolean):void;
   identify(id:string,options?:{token?:string;traits?:Record<string,string|number|boolean|null>}):void;
   setAccount(id:string|null):void;
   track(name:string,properties?:Record<string,string|number|boolean|null>,options?:{outcomeId?:string}):void;
   screen(name:string):void; reset():void; flush():void;
   setCampaignContext(url:string):void;
-  getDiagnostics():Promise<{consent:boolean;queued:number;dropped:number;anonymousId:string|null}>;
+  getDiagnostics():Promise<{consent:boolean;collectionMode:"automatic"|"consent"|null;consentState:"not_provided"|"granted"|"denied";optedOut:boolean;collectionEnabled:boolean;queued:number;dropped:number;anonymousId:string|null}>;
 }
 export function init(options:Options):Client;
 export function navigationAdapter(client:Client,ref:{current?:{getCurrentRoute():{name:string}|undefined}|null}):()=>void;

package/index.js

@@ -2,7 +2,10 @@ import { NativeModules, Platform } from "react-native";
 import { createBridge } from "./bridge.js";
 let client;
 export function init(options) {
-  client ??= createBridge(NativeModules.FounderRouteAnalyticsModule, Platform.OS, options);
+  if (!client) {
+    const bridge = createBridge(NativeModules.FounderRouteAnalyticsModule, Platform.OS, options);
+    client = {...bridge, destroy() { bridge.destroy(); client = undefined; }};
+  }
   return client;
 }
 export function navigationAdapter(client, navigationRef) {

package/ios/FounderRouteAnalyticsModule.m

@@ -1,6 +1,10 @@
 #import <React/RCTBridgeModule.h>
 @interface RCT_EXTERN_MODULE(FounderRouteAnalyticsModule, NSObject)
-RCT_EXTERN_METHOD(configure:(NSString *)key endpoint:(NSString *)endpoint appId:(NSString *)appId properties:(NSArray *)properties traits:(NSArray *)traits verificationId:(NSString *)verificationId)
+RCT_EXTERN_METHOD(configure:(NSString *)key endpoint:(NSString *)endpoint appId:(NSString *)appId properties:(NSArray *)properties traits:(NSArray *)traits verificationId:(NSString *)verificationId collectionMode:(NSString *)collectionMode propertyId:(NSString *)propertyId environment:(NSString *)environment)
+RCT_EXTERN_METHOD(optOut)
+RCT_EXTERN_METHOD(optIn)
+RCT_EXTERN_METHOD(destroy)
+RCT_EXTERN_METHOD(setCollectionMode:(NSString *)mode)
 RCT_EXTERN_METHOD(setConsent:(BOOL)value)
 RCT_EXTERN_METHOD(identify:(NSString *)identifier token:(NSString *)token traits:(NSDictionary *)traits)
 RCT_EXTERN_METHOD(setAccount:(NSString *)identifier)

package/ios/FounderRouteAnalyticsModule.swift

@@ -5,7 +5,11 @@ import React
 final class FounderRouteAnalyticsModule: NSObject {
     private let analytics = FounderRouteAnalytics.shared
     @objc static func requiresMainQueueSetup() -> Bool { false }
-    @objc func configure(_ key: String, endpoint: String, appId: String, properties: [String], traits: [String], verificationId: String?) { analytics.configure(key: key, endpoint: endpoint, appId: appId, allowedProperties: properties, allowedTraits: traits, verificationId: verificationId) }
+    @objc func configure(_ key: String, endpoint: String, appId: String, properties: [String], traits: [String], verificationId: String?, collectionMode: String?, propertyId: String?, environment: String?) { analytics.configure(key: key, endpoint: endpoint, appId: appId, allowedProperties: properties, allowedTraits: traits, verificationId: verificationId, collectionMode: collectionMode, propertyId: propertyId, environment: environment) }
+    @objc func optOut() { analytics.optOut() }
+    @objc func optIn() { analytics.optIn() }
+    @objc func setCollectionMode(_ mode: String) { analytics.setCollectionMode(mode) }
+    @objc func destroy() { analytics.destroy() }
     @objc func setConsent(_ value: Bool) { analytics.setConsent(value) }
     @objc func identify(_ id: String, token: String?, traits: [String: Any]) { analytics.identify(id, token: token, traits: traits) }
     @objc func setAccount(_ id: String?) { analytics.setAccount(id) }

package/ios/core/FounderRouteAnalytics.swift

@@ -9,6 +9,12 @@ public final class FounderRouteAnalytics: @unchecked Sendable {
     private var key = "", endpoint = "", appId = ""
     private var verificationId: String?
     private var campaign: [String:Any] = [:]
+    private var collectionMode: String?, propertyId: String?, environment: String?
+    private var consentState = "not_provided", refused = false, configurationReady = false, destroyed = false
+    private let permissionLock = NSLock()
+    private var stopRequested = false
+    private func requestStop(_ stop: Bool) { permissionLock.lock(); stopRequested = stop; permissionLock.unlock() }
+    private var stopped: Bool { permissionLock.lock(); defer { permissionLock.unlock() }; return stopRequested }
     private var consent = false, sending = false, foreground = true
     private var anonymousId: String?, userId: String?, accountId: String?, identityToken: String?
     private var traits: [String: Any] = [:], allowedTraits: Set<String> = [], allowedProperties: Set<String> = []
@@ -21,12 +27,19 @@ public final class FounderRouteAnalytics: @unchecked Sendable {
     private let transport: URLSession
     public init(transport: URLSession = .shared) { self.transport = transport }
 
-    public func configure(key: String, endpoint: String, appId: String, allowedProperties: [String] = [], allowedTraits: [String] = [], verificationId: String? = nil) {
+    public func configure(key: String, endpoint: String, appId: String, allowedProperties: [String] = [], allowedTraits: [String] = [], verificationId: String? = nil, collectionMode: String? = nil, propertyId: String? = nil, environment: String? = nil) {
         work.async {
-            guard self.key.isEmpty else { return }
+            guard self.key.isEmpty || self.destroyed else { return }
+            if self.destroyed {
+                self.destroyed = false; self.configurationReady = false; self.refused = false
+                self.consentState = "not_provided"; self.events = []; self.anonymousId = nil
+                self.userId = nil; self.accountId = nil; self.identityToken = nil; self.traits = [:]
+                self.sending = false; self.requestStop(false)
+            }
             guard key.hasPrefix("fr_pk_"), let url = URL(string: endpoint), url.scheme == "https" || url.host == "localhost" else { self.lastError = "invalid_configuration"; return }
             self.key = key; self.endpoint = endpoint.trimmingCharacters(in: CharacterSet(charactersIn: "/")); self.appId = appId
             self.verificationId = verificationId
+            self.propertyId = propertyId; self.environment = environment; self.collectionMode = collectionMode
             self.allowedProperties = Set(allowedProperties); self.allowedTraits = Set(allowedTraits)
             #if canImport(UIKit)
             self.observers.append(NotificationCenter.default.addObserver(forName: UIApplication.didEnterBackgroundNotification, object: nil, queue: nil) { [weak self] _ in
@@ -36,27 +49,83 @@ public final class FounderRouteAnalytics: @unchecked Sendable {
                 self?.work.async { self?.foreground = true; self?.retryAt = .distantPast; self?.deliver() }
             })
             #endif
+            if collectionMode != nil && propertyId != nil && environment != nil { self.finishConfiguration() }
+            else {
+                var components = URLComponents(string: self.endpoint + "/api/analytics/v2/config")!
+                components.queryItems = [URLQueryItem(name: "key", value: key)]
+                let configurationGeneration = self.generation
+                self.transport.dataTask(with: components.url!) { data, response, _ in
+                    self.work.async {
+                        guard !self.destroyed, self.generation == configurationGeneration, let response = response as? HTTPURLResponse, response.statusCode == 200,
+                              let data, let config = (try? JSONSerialization.jsonObject(with: data)) as? [String: Any] else { self.lastError = "configuration_unavailable"; return }
+                        self.propertyId = config["property_id"] as? String; self.environment = config["environment"] as? String
+                        self.collectionMode = collectionMode ?? config["collection_mode"] as? String
+                        self.finishConfiguration()
+                    }
+                }.resume()
+            }
         }
     }
+    private var scope: String { if let propertyId, let environment { return propertyId + "-" + environment }; return String(key.suffix(16)) }
+    private var refusalURL: URL? { fileURL?.appendingPathExtension("refusal") }
+    private func finishConfiguration() {
+        guard let propertyId, propertyId.range(of: "^[a-zA-Z0-9_-]+$", options: .regularExpression) != nil,
+              ["production", "test"].contains(environment ?? ""), ["automatic", "consent"].contains(collectionMode ?? "") else { lastError = "configuration_unavailable"; return }
+        if let refusalURL { refused = refused || FileManager.default.fileExists(atPath: refusalURL.path) }
+        if refused { saveRefusal(true) }
+        configurationReady = true; reconcileCollection()
+    }
+    private func saveRefusal(_ value: Bool) {
+        refused = value
+        do {
+            guard let url = refusalURL else { throw CocoaError(.fileNoSuchFile) }
+            if value {
+                try FileManager.default.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true)
+                try Data("refused".utf8).write(to: url, options: .atomic)
+            } else if FileManager.default.fileExists(atPath: url.path) { try FileManager.default.removeItem(at: url) }
+        } catch { lastError = "preference_storage_unavailable" }
+    }
+    public func optOut() { requestStop(true); work.async { self.consentState = "denied"; self.saveRefusal(true); self.reconcileCollection() } }
+    public func optIn() { requestStop(false); work.async { self.saveRefusal(false); if self.consentState == "denied" { self.consentState = "not_provided" }; self.reconcileCollection() } }
+    public func setCollectionMode(_ mode: String) { work.async { guard ["automatic", "consent"].contains(mode) else { self.lastError = "invalid_configuration"; return }; self.collectionMode = mode; self.reconcileCollection() } }
+    public func destroy() { requestStop(true); work.async { self.destroyed = true; self.consent = false; self.generation += 1; self.task?.cancel(); self.timer?.cancel(); self.timer = nil; self.observers.forEach { NotificationCenter.default.removeObserver($0) }; self.observers = [] } }
+    private func reconcileCollection() {
+        setCollecting(configurationReady && !destroyed && !stopped && !refused && (collectionMode == "automatic" || (collectionMode == "consent" && consentState == "granted")))
+    }
     private var fileURL: URL? {
+        guard !key.isEmpty else { return nil }
+        return FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first?.appendingPathComponent("founderroute-\(scope).json")
+    }
+    private var legacyFileURL: URL? {
         guard !key.isEmpty else { return nil }
         return FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first?.appendingPathComponent("founderroute-\(key.suffix(16)).json")
     }
     public func setConsent(_ granted: Bool) {
-        work.async {
-            guard granted != self.consent, !self.key.isEmpty else { return }
+        requestStop(!granted)
+        work.async { self.consentState = granted ? "granted" : "denied"; self.saveRefusal(!granted); self.reconcileCollection() }
+    }
+    private func setCollecting(_ requested: Bool) {
+            let granted = requested && !stopped
+            guard !self.key.isEmpty else { return }
+            if !granted && self.refused {
+                if let file = self.fileURL { try? FileManager.default.removeItem(at: file) }
+                if let file = self.legacyFileURL { try? FileManager.default.removeItem(at: file) }
+            }
+            guard granted != self.consent else { return }
             self.consent = granted; self.generation += 1
             if !granted {
-                self.task?.cancel(); self.timer?.cancel(); self.timer = nil; self.events = []; self.anonymousId = nil
+                self.task?.cancel(); self.sending = false; self.timer?.cancel(); self.timer = nil; self.events = []; self.anonymousId = nil
                 self.userId = nil; self.accountId = nil; self.identityToken = nil; self.traits = [:]; self.campaign = [:]
                 if let file = self.fileURL { try? FileManager.default.removeItem(at: file) }; return
             }
-            if let file = self.fileURL, let data = try? Data(contentsOf: file), let saved = (try? JSONSerialization.jsonObject(with: data)) as? [String: Any] {
+            let restoreFile = self.fileURL.flatMap { FileManager.default.fileExists(atPath: $0.path) ? $0 : self.legacyFileURL }
+            if let file = restoreFile, let data = try? Data(contentsOf: file), let saved = (try? JSONSerialization.jsonObject(with: data)) as? [String: Any] {
                 self.dropped = saved["dropped"] as? Int ?? 0
                 self.events = saved["events"] as? [[String: Any]] ?? []; self.anonymousId = saved["anonymous_id"] as? String
             }
             self.anonymousId = self.anonymousId ?? UUID().uuidString
             self.prune(); self.persist()
+            if let legacy = self.legacyFileURL, legacy != self.fileURL, let current = self.fileURL, FileManager.default.fileExists(atPath: current.path) { try? FileManager.default.removeItem(at: legacy) }
             let timer = DispatchSource.makeTimerSource(queue: self.work)
             timer.schedule(deadline: .now() + 15, repeating: 15)
             timer.setEventHandler { [weak self] in
@@ -65,24 +134,23 @@ public final class FounderRouteAnalytics: @unchecked Sendable {
                 self.deliver()
             }
             self.timer = timer; timer.resume(); self.deliver()
-        }
     }
     public func identify(_ userId: String, token: String? = nil, traits: [String: Any] = [:]) {
         work.async {
-            guard self.consent else { return }
+            guard self.consent, !self.stopped else { return }
             if let old = self.userId, old != userId { self.resetIdentity() }
             self.userId = userId; self.identityToken = token; self.traits = traits
             self.enqueue("fr_identify", kind: "identify", properties: [:])
         }
     }
-    public func setAccount(_ id: String?) { work.async { if self.consent { self.accountId = id } } }
-    public func reset() { work.async { if self.consent { self.resetIdentity(); self.persist() } } }
+    public func setAccount(_ id: String?) { work.async { if self.consent && !self.stopped { self.accountId = id } } }
+    public func reset() { work.async { if self.consent && !self.stopped { self.resetIdentity(); self.persist() } } }
     private func resetIdentity() { anonymousId = UUID().uuidString; userId = nil; accountId = nil; identityToken = nil; traits = [:]; sessionId = UUID().uuidString; lastActivity = .distantPast }
     public func track(_ name: String, properties: [String: Any] = [:], outcomeId: String? = nil) { work.async { self.enqueue(name, kind: "custom", properties: properties, outcomeId: outcomeId) } }
     public func screen(_ name: String) { work.async { self.enqueue("screen_view", kind: "screen", properties: [:], context: ["screen": String(name.prefix(150))]) } }
     /// Supply an installed-app deep link after consent; this does not infer app-store attribution.
     public func setCampaignContext(_ url: String) { work.async {
-        guard self.consent, let items = URLComponents(string:url)?.queryItems else { return }
+        guard self.consent, !self.stopped, let items = URLComponents(string:url)?.queryItems else { return }
         var next: [String:Any] = [:]
         for item in items {
             guard let value = item.value else { continue }
@@ -93,7 +161,7 @@ public final class FounderRouteAnalytics: @unchecked Sendable {
     } }
     public func flush() { work.async { self.deliver() } }
     public func getDiagnostics(_ completion: @escaping ([String: Any]) -> Void) {
-        work.async { let result: [String: Any] = ["consent": self.consent, "queued": self.events.count, "dropped": self.dropped, "rejected": self.rejected, "acknowledged": self.acknowledged, "anonymousId": self.anonymousId.map { $0 as Any } ?? NSNull(), "lastError": self.lastError.map { $0 as Any } ?? NSNull()]; completion(result) }
+        work.async { let result: [String: Any] = ["consent": self.consentState == "granted", "collectionMode": self.collectionMode.map { $0 as Any } ?? NSNull(), "consentState": self.consentState, "optedOut": self.refused, "collectionEnabled": self.consent && !self.stopped, "queued": self.events.count, "dropped": self.dropped, "rejected": self.rejected, "acknowledged": self.acknowledged, "anonymousId": self.anonymousId.map { $0 as Any } ?? NSNull(), "lastError": self.lastError.map { $0 as Any } ?? NSNull()]; completion(result) }
     }
     private func sanitize(_ input: [String: Any], allowed: Set<String>) -> [String: Any] {
         var result: [String: Any] = [:]
@@ -104,13 +172,13 @@ public final class FounderRouteAnalytics: @unchecked Sendable {
         return result
     }
     private func enqueue(_ name: String, kind: String, properties: [String: Any], context: [String: Any] = [:], outcomeId: String? = nil) {
-        guard consent, let anonymousId else { return }
+        guard consent, !stopped, let anonymousId else { return }
         let now = Date(); if now.timeIntervalSince(lastActivity) >= 1800 { sessionId = UUID().uuidString }; lastActivity = now
-        var ctx: [String: Any] = ["sdk": "ios", "sdk_version": "0.1.0-beta.1", "app_id": appId]
+        var ctx: [String: Any] = ["sdk": "ios", "sdk_version": "1.0.0-rc.2", "app_id": appId]
         ctx["verification_id"] = verificationId
         for (key, value) in campaign { ctx[key] = value }
         for (key, value) in context { ctx[key] = value }
-        var event: [String: Any] = ["event_id": UUID().uuidString, "protocol": 1, "name": name, "kind": kind, "occurred_at": ISO8601DateFormatter().string(from: now), "anonymous_id": anonymousId, "session_id": sessionId, "consent": true, "properties": sanitize(properties, allowed: allowedProperties), "traits": sanitize(traits, allowed: allowedTraits), "context": ctx]
+        var event: [String: Any] = ["event_id": UUID().uuidString, "protocol": 2, "name": name, "kind": kind, "occurred_at": ISO8601DateFormatter().string(from: now), "anonymous_id": anonymousId, "session_id": sessionId, "collection_mode": collectionMode ?? "consent", "consent_state": consentState == "granted" ? "granted" : "not_provided", "properties": sanitize(properties, allowed: allowedProperties), "traits": sanitize(traits, allowed: allowedTraits), "context": ctx]
         event["user_id"] = userId; event["identity_token"] = identityToken; event["account_id"] = accountId; event["outcome_id"] = outcomeId
         guard let bytes = try? JSONSerialization.data(withJSONObject: event), bytes.count <= 8192 else { rejected += 1; lastError = "event_too_large"; return }
         events.append(event); prune(); persist()
@@ -122,7 +190,7 @@ public final class FounderRouteAnalytics: @unchecked Sendable {
         while events.count > 10000 || ((try? JSONSerialization.data(withJSONObject: events).count) ?? 0) > 10 * 1024 * 1024 { events.removeFirst(); dropped += 1 }
     }
     private func persist() {
-        guard consent, let file = fileURL else { return }
+        guard consent, !stopped, let file = fileURL else { return }
         do {
             try FileManager.default.createDirectory(at: file.deletingLastPathComponent(), withIntermediateDirectories: true)
             let data = try JSONSerialization.data(withJSONObject: ["anonymous_id": anonymousId ?? "", "events": events, "dropped": dropped])
@@ -131,7 +199,7 @@ public final class FounderRouteAnalytics: @unchecked Sendable {
         } catch { lastError = "storage_unavailable" }
     }
     private func deliver() {
-        guard consent, !sending, Date() >= retryAt, let url = URL(string: endpoint + "/api/analytics/v1/collect") else { return }
+        guard consent, !stopped, !sending, Date() >= retryAt, let url = URL(string: endpoint + "/api/analytics/v2/collect") else { return }
         prune(); var batch: [[String: Any]] = []
         for event in events.prefix(50) {
             guard let data = try? JSONSerialization.data(withJSONObject: ["key": key, "events": batch + [event]]), data.count <= 65536 else { break }; batch.append(event)
@@ -142,7 +210,7 @@ public final class FounderRouteAnalytics: @unchecked Sendable {
         task = transport.dataTask(with: request) { [weak self] data, response, error in
             guard let self else { return }
             self.work.async {
-                self.sending = false; guard self.consent, self.generation == currentGeneration else { return }
+                guard self.generation == currentGeneration else { return }; self.sending = false; guard self.consent, !self.stopped else { return }
                 guard error == nil, let response = response as? HTTPURLResponse else { self.retry("network_unavailable"); return }
                 let status = response.statusCode
                 if status == 429 || status >= 500 { self.retry("delivery_\(status)"); return }

package/package.json

@@ -1,15 +1,35 @@
 {
   "name": "@founderroute/analytics-react-native",
-  "version": "0.1.0-beta.1",
-  "description": "Consent-first FounderRoute analytics for React Native",
+  "version": "1.0.0-rc.2",
+  "description": "FounderRoute analytics for React Native",
   "license": "MIT",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
-  "files": ["*.js", "*.cjs", "*.d.ts", "*.podspec", "android", "ios", "LICENSE"],
-  "peerDependencies": {"react": ">=18 <20", "react-native": ">=0.76 <1"},
-  "repository": { "type": "git", "url": "git+https://github.com/itsreed/founderroute-analytics.git", "directory": "packages/react-native" },
+  "files": [
+    "*.js",
+    "*.cjs",
+    "*.d.ts",
+    "*.podspec",
+    "android",
+    "ios",
+    "LICENSE"
+  ],
+  "peerDependencies": {
+    "react": ">=18 <20",
+    "react-native": ">=0.76 <1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/itsreed/founderroute-analytics.git",
+    "directory": "packages/react-native"
+  },
   "homepage": "https://github.com/itsreed/founderroute-analytics#readme",
-  "bugs": { "url": "https://github.com/itsreed/founderroute-analytics/issues" },
-  "publishConfig": { "access": "public", "provenance": true }
+  "bugs": {
+    "url": "https://github.com/itsreed/founderroute-analytics/issues"
+  },
+  "publishConfig": {
+    "access": "public",
+    "provenance": true
+  }
 }