@bits-innovate/react-native-vstarcam 1.0.51 → 1.0.53

package/android/src/main/java/com/reactnativevstarcam/VStarCamModule.java

@@ -11,6 +11,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
@@ -46,7 +47,7 @@ import org.json.JSONObject;
  *   - init(ClientStateListener, ClientCommandListener, ClientReleaseListener)
  */
 @ReactModule(name = VStarCamModule.MODULE_NAME)
-public class VStarCamModule extends ReactContextBaseJavaModule {
+public class VStarCamModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
     private static final String TAG = "VStarCamModule";
     public final static String MODULE_NAME = "VStarCam";
     
@@ -60,6 +61,9 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
     private static Object commandListenerProxy;
     private static Object releaseListenerProxy;
     
+    // Hard reference root to completely prevent Dalvik GC of our JNI proxies
+    private static final java.util.ArrayList<Object> jniProxyRoots = new java.util.ArrayList<>();
+    
     // Static context reference for reloads
     private static java.lang.ref.WeakReference<ReactApplicationContext> currentContext;
     
@@ -201,6 +205,9 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
         this.reactContext = reactContext;
         this.executor = Executors.newCachedThreadPool();
         
+        // Register for lifecycle events to tear down JNI on fast-refresh
+        reactContext.addLifecycleEventListener(this);
+        
         // Update current context for static proxies
         currentContext = new java.lang.ref.WeakReference<>(reactContext);
         
@@ -231,6 +238,39 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
         }
     }
     
+    @Override
+    public void onHostResume() {
+    }
+
+    @Override
+    public void onHostPause() {
+    }
+
+    @Override
+    public void onHostDestroy() {
+        Log.d(TAG, "onHostDestroy: Tearing down all P2P connections before JNI environment goes out of scope.");
+        executor.execute(() -> {
+            try {
+                if (jniApiClass != null) {
+                    Method disconnectMethod = jniApiClass.getMethod("disconnect", long.class);
+                    Method destroyMethod = jniApiClass.getMethod("destroy", long.class);
+                    
+                    for (Map.Entry<Integer, ClientInfo> entry : clients.entrySet()) {
+                        long sdkPtr = entry.getValue().sdkClientPtr;
+                        if (sdkPtr != 0) {
+                            Log.d(TAG, "Teardown SDK client: " + sdkPtr);
+                            try { disconnectMethod.invoke(null, sdkPtr); } catch (Exception e) {}
+                            try { destroyMethod.invoke(null, sdkPtr); } catch (Exception e) {}
+                        }
+                    }
+                    clients.clear();
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to teardown P2P in onHostDestroy", e);
+            }
+        });
+    }
+    
     private void initializeP2P() {
         if (!VStarCamModule.isNativeLibraryLoaded || VStarCamModule.jniApiClass == null) {
             Log.e(TAG, "Cannot initialize P2P: native library or JNIApi not available");
@@ -283,6 +323,7 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                     }
                 }
             );
+            jniProxyRoots.add(stateListenerProxy);
             
             // Create dynamic proxy for ClientCommandListener
             commandListenerProxy = Proxy.newProxyInstance(
@@ -326,6 +367,7 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                     }
                 }
             );
+            jniProxyRoots.add(commandListenerProxy);
             
             // Create dynamic proxy for ClientReleaseListener
             releaseListenerProxy = Proxy.newProxyInstance(
@@ -352,6 +394,7 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                     }
                 }
             );
+            jniProxyRoots.add(releaseListenerProxy);
             
             // Call JNIApi.init(stateListener, commandListener, releaseListener)
             Method initMethod = VStarCamModule.jniApiClass.getMethod("init", 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bits-innovate/react-native-vstarcam",
-  "version": "1.0.51",
+  "version": "1.0.53",
   "description": "React Native bridge for VStarCam P2P SDK",
   "main": "src/index.ts",
   "types": "src/index.ts",