@bits-innovate/react-native-vstarcam 1.0.52 → 1.0.54

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

@@ -11,14 +11,13 @@ 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;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.HashMap;
@@ -46,7 +45,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";
     
@@ -204,6 +203,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);
         
@@ -234,6 +236,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");
@@ -246,126 +281,62 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
         }
         
         try {
-            // Create dynamic proxy for ClientStateListener
-            stateListenerProxy = Proxy.newProxyInstance(
-                stateListenerClass.getClassLoader(),
-                new Class<?>[] { stateListenerClass },
-                new InvocationHandler() {
+            // Create CONCRETE listener implementations (NOT dynamic proxies).
+            // Dynamic Proxies ($Proxy0 classes) crash under CheckJNI when invoked
+            // from the C++ SDK's native pthreads via CallVoidMethod. Concrete
+            // anonymous classes have real vtables that work correctly.
+            
+            com.vstarcam.app_p2p_api.ClientStateListener stateListener = 
+                new com.vstarcam.app_p2p_api.ClientStateListener() {
                     @Override
-                    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+                    public void stateListener(long clientPtr, int state) {
                         try {
-                            String methodName = method.getName();
-                            
-                            // Handle standard Object methods
-                            if (method.getDeclaringClass() == Object.class) {
-                                if (methodName.equals("equals")) return proxy == args[0];
-                                if (methodName.equals("hashCode")) return System.identityHashCode(proxy);
-                                if (methodName.equals("toString")) return proxy.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(proxy));
-                            }
-
-                            Log.d(TAG, "ClientStateListener." + methodName + " called");
-                            if (methodName.equals("stateListener")) {
-                                // args: long clientPtr, int state
-                                long clientPtr = 0;
-                                int state = 0;
-                                
-                                if (args != null && args.length >= 2) {
-                                    if (args[0] instanceof Number) clientPtr = ((Number) args[0]).longValue();
-                                    if (args[1] instanceof Number) state = ((Number) args[1]).intValue();
-                                }
-                                
-                                Log.d(TAG, "State callback: clientPtr=" + clientPtr + ", state=" + state);
-                                
-                                // Post to main thread for React Native compatibility
-                                VStarCamModule.handleStateChange(clientPtr, state);
-                            }
+                            Log.d(TAG, "State callback: clientPtr=" + clientPtr + ", state=" + state);
+                            VStarCamModule.handleStateChange(clientPtr, state);
                         } catch (Exception e) {
                             Log.e(TAG, "Error in stateListener callback", e);
                         }
-                        return null;
                     }
-                }
-            );
-            jniProxyRoots.add(stateListenerProxy);
+                };
             
-            // Create dynamic proxy for ClientCommandListener
-            commandListenerProxy = Proxy.newProxyInstance(
-                commandListenerClass.getClassLoader(),
-                new Class<?>[] { commandListenerClass },
-                new InvocationHandler() {
+            com.vstarcam.app_p2p_api.ClientCommandListener commandListener = 
+                new com.vstarcam.app_p2p_api.ClientCommandListener() {
                     @Override
-                    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+                    public void commandListener(long clientPtr, byte[] data, int length) {
                         try {
-                            String methodName = method.getName();
-                            
-                            // Handle standard Object methods
-                            if (method.getDeclaringClass() == Object.class) {
-                                if (methodName.equals("equals")) return proxy == args[0];
-                                if (methodName.equals("hashCode")) return System.identityHashCode(proxy);
-                                if (methodName.equals("toString")) return proxy.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(proxy));
-                            }
-
-                            Log.d(TAG, "ClientCommandListener." + methodName + " called");
-                            if (methodName.equals("commandListener")) {
-                                // args: long clientPtr, byte[] data, int length (from interface)
-                                long clientPtr = 0;
-                                byte[] data = null;
-                                int length = 0;
-                                
-                                if (args != null && args.length >= 3) {
-                                    if (args[0] instanceof Number) clientPtr = ((Number) args[0]).longValue();
-                                    if (args[1] instanceof byte[]) data = (byte[]) args[1];
-                                    if (args[2] instanceof Number) length = ((Number) args[2]).intValue();
-                                }
-                                
-                                Log.d(TAG, "Command callback: clientPtr=" + clientPtr + ", dataLen=" + (data != null ? data.length : 0));
-                                
-                                // Post to main thread for React Native compatibility
-                                VStarCamModule.handleCommandReceive(clientPtr, 0, data);
-                            }
+                            Log.d(TAG, "Command callback: clientPtr=" + clientPtr + ", dataLen=" + (data != null ? data.length : 0));
+                            VStarCamModule.handleCommandReceive(clientPtr, 0, data);
                         } catch (Exception e) {
                             Log.e(TAG, "Error in commandListener callback", e);
                         }
-                        return null;
                     }
-                }
-            );
-            jniProxyRoots.add(commandListenerProxy);
+                };
             
-            // Create dynamic proxy for ClientReleaseListener
-            releaseListenerProxy = Proxy.newProxyInstance(
-                releaseListenerClass.getClassLoader(),
-                new Class<?>[] { releaseListenerClass },
-                new InvocationHandler() {
+            com.vstarcam.app_p2p_api.ClientReleaseListener releaseListener = 
+                new com.vstarcam.app_p2p_api.ClientReleaseListener() {
                     @Override
-                    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+                    public void releaseListener(long clientPtr) {
                         try {
-                            String methodName = method.getName();
-                            
-                            // Handle standard Object methods
-                            if (method.getDeclaringClass() == Object.class) {
-                                if (methodName.equals("equals")) return proxy == args[0];
-                                if (methodName.equals("hashCode")) return System.identityHashCode(proxy);
-                                if (methodName.equals("toString")) return proxy.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(proxy));
-                            }
-
-                            Log.d(TAG, "ClientReleaseListener." + methodName + " called");
+                            Log.d(TAG, "Release callback: clientPtr=" + clientPtr);
                         } catch (Exception e) {
                             Log.e(TAG, "Error in releaseListener callback", e);
                         }
-                        return null;
                     }
-                }
-            );
-            jniProxyRoots.add(releaseListenerProxy);
+                };
+            
+            // Keep strong references to prevent GC
+            stateListenerProxy = stateListener;
+            commandListenerProxy = commandListener;
+            releaseListenerProxy = releaseListener;
+            jniProxyRoots.add(stateListener);
+            jniProxyRoots.add(commandListener);
+            jniProxyRoots.add(releaseListener);
             
             // Call JNIApi.init(stateListener, commandListener, releaseListener)
-            Method initMethod = VStarCamModule.jniApiClass.getMethod("init", 
-                VStarCamModule.stateListenerClass, VStarCamModule.commandListenerClass, VStarCamModule.releaseListenerClass);
-            initMethod.invoke(null, stateListenerProxy, commandListenerProxy, releaseListenerProxy);
+            com.vstarcam.JNIApi.init(stateListener, commandListener, releaseListener);
             
             VStarCamModule.isP2PInitialized = true;
-            Log.d(TAG, "P2P system initialized successfully!");
+            Log.d(TAG, "P2P system initialized successfully with concrete listeners!");
         } catch (Exception e) {
             Log.e(TAG, "Failed to initialize P2P: " + e.getMessage(), e);
         }

package/package.json

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