@bits-innovate/react-native-vstarcam 1.0.43 → 1.0.45

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.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import java.io.BufferedReader;
@@ -44,12 +45,21 @@ import org.json.JSONObject;
  *   - writeCgi(long clientPtr, String cgi, int timeout)
  *   - init(ClientStateListener, ClientCommandListener, ClientReleaseListener)
  */
+@ReactModule(name = VStarCamModule.MODULE_NAME)
 public class VStarCamModule extends ReactContextBaseJavaModule {
     private static final String TAG = "VStarCamModule";
-    private static final String MODULE_NAME = "VStarCam";
+    public final static String MODULE_NAME = "VStarCam";
     
     // Set to true for verbose logging during development
-    private static final boolean DEBUG_LOGGING = false;
+    private static final boolean DEBUG_LOGGING = true;
+    
+    // Counter for unique internal client IDs
+    private static final java.util.concurrent.atomic.AtomicInteger nextClientPtr = new java.util.concurrent.atomic.AtomicInteger(1000);
+    
+    // Static proxy references to prevent GC. 
+    private static Object stateListenerProxy;
+    private static Object commandListenerProxy;
+    private static Object releaseListenerProxy;
     
     // Helper for conditional debug logging
     private static void logDebug(String message) {
@@ -151,7 +161,7 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
     
     // Client tracking - maps our clientPtr to actual SDK client handle
     // Made static so VStarCamVideoView can access SDK pointers
-    private static Map<Integer, ClientInfo> clients = new HashMap<>();
+    private static Map<Integer, ClientInfo> clients = new java.util.concurrent.ConcurrentHashMap<>();
     private boolean isNativeLibraryLoaded = false;
     private boolean isP2PInitialized = false;
     
@@ -243,15 +253,24 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
         
         try {
             // Create dynamic proxy for ClientStateListener
-            Object stateListener = Proxy.newProxyInstance(
+            stateListenerProxy = Proxy.newProxyInstance(
                 stateListenerClass.getClassLoader(),
                 new Class<?>[] { stateListenerClass },
                 new InvocationHandler() {
                     @Override
                     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
                         try {
-                            Log.d(TAG, "ClientStateListener." + method.getName() + " called with " + (args != null ? args.length : 0) + " args");
-                            if (method.getName().equals("stateListener")) {
+                            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
                                 final long clientPtr = (Long) args[0];
                                 final int state = (Integer) args[1];
@@ -276,15 +295,24 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
             );
             
             // Create dynamic proxy for ClientCommandListener
-            Object commandListener = Proxy.newProxyInstance(
+            commandListenerProxy = Proxy.newProxyInstance(
                 commandListenerClass.getClassLoader(),
                 new Class<?>[] { commandListenerClass },
                 new InvocationHandler() {
                     @Override
                     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
                         try {
-                            Log.d(TAG, "ClientCommandListener." + method.getName() + " called with " + (args != null ? args.length : 0) + " args");
-                            if (method.getName().equals("commandListener")) {
+                            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)
                                 final long clientPtr = (Long) args[0];
                                 final byte[] data = (byte[]) args[1];
@@ -309,14 +337,23 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
             );
             
             // Create dynamic proxy for ClientReleaseListener
-            Object releaseListener = Proxy.newProxyInstance(
+            releaseListenerProxy = Proxy.newProxyInstance(
                 releaseListenerClass.getClassLoader(),
                 new Class<?>[] { releaseListenerClass },
                 new InvocationHandler() {
                     @Override
                     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
                         try {
-                            Log.d(TAG, "ClientReleaseListener." + method.getName() + " called");
+                            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");
                         } catch (Exception e) {
                             Log.e(TAG, "Error in releaseListener callback", e);
                         }
@@ -328,7 +365,7 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
             // Call JNIApi.init(stateListener, commandListener, releaseListener)
             Method initMethod = jniApiClass.getMethod("init", 
                 stateListenerClass, commandListenerClass, releaseListenerClass);
-            initMethod.invoke(null, stateListener, commandListener, releaseListener);
+            initMethod.invoke(null, stateListenerProxy, commandListenerProxy, releaseListenerProxy);
             
             isP2PInitialized = true;
             Log.d(TAG, "P2P system initialized successfully!");
@@ -396,13 +433,26 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
     }
 
     private void sendEvent(String eventName, @Nullable WritableMap params) {
-        if (reactContext.hasActiveReactInstance()) {
+        if (reactContext != null && reactContext.hasActiveReactInstance()) {
             reactContext
                 .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                 .emit(eventName, params);
         }
     }
 
+    /**
+     * Test the bridge connection
+     */
+    @ReactMethod
+    public void testBridge(Promise promise) {
+        Log.d(TAG, "testBridge called");
+        WritableMap result = Arguments.createMap();
+        result.putBoolean("success", true);
+        result.putString("message", "Bridge is working");
+        result.putDouble("timestamp", (double) System.currentTimeMillis());
+        promise.resolve(result);
+    }
+
     /**
      * Create a P2P client for a device
      * JNIApi.create(String did, String serverParam) -> long
@@ -445,8 +495,8 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                     return;
                 }
                 
-                // Generate our own client ID (hash of deviceId) and store mapping
-                int ourClientPtr = Math.abs(deviceId.hashCode());
+                // Generate our own client ID and store mapping
+                int ourClientPtr = nextClientPtr.getAndIncrement();
                 
                 ClientInfo clientInfo = new ClientInfo();
                 clientInfo.deviceId = deviceId;
@@ -537,6 +587,24 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
         });
     }
 
+    /**
+     * Get the current connection state of a client
+     */
+    @ReactMethod
+    public void clientGetState(int clientPtr, Promise promise) {
+        ClientInfo clientInfo = clients.get(clientPtr);
+        if (clientInfo == null) {
+            promise.resolve(5); // DISCONNECTED
+            return;
+        }
+        
+        WritableMap result = Arguments.createMap();
+        result.putInt("state", clientInfo.isConnected ? 3 : 1); // 3=ONLINE, 1=CONNECTING (approx)
+        result.putBoolean("isConnected", clientInfo.isConnected);
+        result.putBoolean("isLoggedIn", clientInfo.isLoggedIn);
+        promise.resolve(result);
+    }
+
     /**
      * Login to camera
      * JNIApi.login(long clientPtr, String username, String password)
@@ -714,6 +782,48 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
         });
     }
 
+    /**
+     * Get device information
+     */
+    @ReactMethod
+    public void clientGetDeviceInfo(int clientPtr, Promise promise) {
+        Log.d(TAG, "clientGetDeviceInfo called for ptr: " + clientPtr);
+        executor.execute(() -> {
+            try {
+                ClientInfo clientInfo = clients.get(clientPtr);
+                if (clientInfo == null) {
+                    Log.w(TAG, "clientGetDeviceInfo: client not found for ptr " + clientPtr);
+                    promise.reject("E_CLIENT_NOT_FOUND", "Client not found");
+                    return;
+                }
+
+                Log.d(TAG, "Fetching device info for device: " + clientInfo.deviceId);
+                
+                WritableMap result = Arguments.createMap();
+                result.putString("serialNumber", clientInfo.deviceId != null ? clientInfo.deviceId : "Unknown");
+                result.putString("model", "VStarCam");
+                result.putString("firmware", "Unknown");
+                result.putString("manufacturer", "VStarCam");
+                result.putBoolean("responsive", clientInfo.isConnected);
+                
+                WritableMap features = Arguments.createMap();
+                features.putBoolean("ptz", true);
+                features.putBoolean("audio", true);
+                features.putBoolean("twoWayAudio", true);
+                features.putBoolean("nightVision", true);
+                features.putBoolean("motionDetection", true);
+                features.putBoolean("wifi", true);
+                result.putMap("features", features);
+
+                Log.d(TAG, "Resolving device info for " + clientInfo.deviceId);
+                promise.resolve(result);
+            } catch (Throwable t) {
+                Log.e(TAG, "clientGetDeviceInfo crashed: " + t.getMessage(), t);
+                promise.reject("E_GET_INFO_FAILED", t.getMessage());
+            }
+        });
+    }
+
     /**
      * Start video stream by sending livestream.cgi command
      * Resolution: 1=high, 2=general, 4=low, 100=superHD

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

@@ -90,6 +90,7 @@ public class VStarCamVideoView extends FrameLayout
             // Based on decompiling app_player-5.0.0.aar classes.jar
             String[] classNames = {
                 "com.veepai.AppPlayerApi",           // Main API class from AAR
+                "com.veepai.AppPlayer",              // Added as alternative
                 "com.veepai.app_player.AppPlayerPlugin",  // Flutter plugin wrapper
                 "com.vstarcam.player.AppPlayer",
                 "com.vstarcam.AppPlayer",

package/package.json

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

package/src/index.ts

@@ -237,6 +237,10 @@ class VStarCamClient {
     });
   }
 
+  async testBridge(): Promise<any> {
+    return VStarCamModule.testBridge();
+  }
+
   /**
    * Create a P2P client for a device
    * @param deviceId The device ID (DID) from VStarCam