react-native-userleap 4.1.0 → 4.1.1

package/android/build.gradle

@@ -85,6 +85,6 @@ dependencies {
     if (findProject(':userleap-android-sdk') != null) {
         implementation project(':userleap-android-sdk')
     } else {
-        implementation ("com.userleap:userleap-android-sdk:2.27.0") // update this version on android updates
+        implementation ("com.userleap:userleap-android-sdk:2.27.2") // update this version on android updates
     }
 }

package/ios/UserLeapBindings.h

@@ -1,7 +1,8 @@
 #import <UserLeapKit/UserLeapKit.h>
 #import <UserLeapKit/UserLeapKit-Swift.h>
 
+#import <React/RCTInvalidating.h>
 #import <RNUserLeapBindingsSpec/RNUserLeapBindingsSpec.h>
 
-@interface UserLeapBindings : NativeUserLeapBindingsSpecBase <NativeUserLeapBindingsSpec, _SGRNExtractor>
+@interface UserLeapBindings : NativeUserLeapBindingsSpecBase <NativeUserLeapBindingsSpec, _SGRNExtractor, RCTInvalidating>
 @end

package/ios/UserLeapBindings.mm

@@ -1,5 +1,7 @@
 #import "UserLeapBindings.h"
 #import <React/RCTUtils.h>
+#import <ReactCommon/CallInvoker.h>
+#import <os/lock.h>
 // Legacy Paper includes gated on RCT_REMOVE_LEGACY_ARCH: these classes are removed on RN 0.85+.
 #ifndef RCT_REMOVE_LEGACY_ARCH
 #import <React/RCTTextView.h>
@@ -16,7 +18,9 @@
 #import <RNUserLeapBindingsSpec/RNUserLeapBindingsSpec.h>
 
 @implementation UserLeapBindings {
+    os_unfair_lock _lock;   // guards _alive and _jsInvoker (shared_ptr copy isn't atomic); never held across an emit
     BOOL _alive;
+    std::shared_ptr<facebook::react::CallInvoker> _jsInvoker;
 }
 
 + (BOOL)requiresMainQueueSetup
@@ -27,16 +31,25 @@
 - (instancetype)init
 {
     if (self = [super init]) {
+        _lock = OS_UNFAIR_LOCK_INIT;
         _alive = YES;
-        // emitOnSprigEvent is a safe no-op when JS has no listener, so eager subscription is fine.
         [self subscribeToSdkEvents];
     }
     return self;
 }
 
-- (void)dealloc
+// Deterministic teardown hook: stop delivering before the runtime is destroyed.
+- (void)invalidate
 {
+    os_unfair_lock_lock(&_lock);
     _alive = NO;
+    os_unfair_lock_unlock(&_lock);
+    [self unsubscribeFromSdkEvents];
+}
+
+- (void)dealloc
+{
+    // Backstop; -invalidate is the real teardown path.
     [self unsubscribeFromSdkEvents];
 }
 
@@ -433,11 +446,26 @@ surveyStateCallback:(RCTResponseSenderBlock)surveyStateCallback
 
         [sdk registerEventListenerFor:eventType listener:^(NSDictionary<NSString *,id> * _Nonnull data) {
             __strong __typeof(weakSelf) strongSelf = weakSelf;
-            // Weak capture + _alive guard: a callback firing during teardown must not touch a dead module.
-            if (!strongSelf || !strongSelf->_alive) return;
+            if (!strongSelf) return;
+
+            // Snapshot liveness + invoker under the lock; bail if torn down.
+            std::shared_ptr<facebook::react::CallInvoker> invoker;
+            os_unfair_lock_lock(&strongSelf->_lock);
+            if (strongSelf->_alive) { invoker = strongSelf->_jsInvoker; }
+            os_unfair_lock_unlock(&strongSelf->_lock);
+            if (!invoker) return;
+
             NSDictionary *payload = [strongSelf normalizePayloadForEvent:name data:data];
             NSString *json = [strongSelf jsonStringFromDictionary:payload];
-            [strongSelf emitOnSprigEvent:@{@"name": name, @"json": json}];
+
+            // Emit on the JS thread so it can't race runtime teardown; dropped if already invalidated.
+            invoker->invokeAsync([strongSelf, name, json]() {
+                os_unfair_lock_lock(&strongSelf->_lock);
+                BOOL alive = strongSelf->_alive;
+                os_unfair_lock_unlock(&strongSelf->_lock);
+                if (!alive) return;
+                [strongSelf emitOnSprigEvent:@{@"name": name, @"json": json}];
+            });
         }];
     }
 }
@@ -453,6 +481,10 @@ surveyStateCallback:(RCTResponseSenderBlock)surveyStateCallback
 
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
 {
+    // Capture the JS CallInvoker so event callbacks can marshal emits onto the JS thread.
+    os_unfair_lock_lock(&_lock);
+    _jsInvoker = params.jsInvoker;
+    os_unfair_lock_unlock(&_lock);
     return std::make_shared<facebook::react::NativeUserLeapBindingsSpecJSI>(params);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-userleap",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "React Native module for UserLeap",
   "main": "index.js",
   "types": "index.d.ts",

package/react-native-userleap.podspec

@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,c,m,mm,swift}"
   s.requires_arc = true
 
-  s.dependency "UserLeapKit", "4.33.0"
+  s.dependency "UserLeapKit", "4.33.1"
 
   # New Architecture: wires up the React-Codegen dependency and header search
   # paths so the generated RNUserLeapBindingsSpec (Obj-C++) resolves.