@bits-innovate/react-native-vstarcam 1.0.44 → 1.0.46

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

@@ -433,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
@@ -482,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;
@@ -774,16 +787,20 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
      */
     @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);
+                result.putString("serialNumber", clientInfo.deviceId != null ? clientInfo.deviceId : "Unknown");
                 result.putString("model", "VStarCam");
                 result.putString("firmware", "Unknown");
                 result.putString("manufacturer", "VStarCam");
@@ -798,9 +815,11 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                 features.putBoolean("wifi", true);
                 result.putMap("features", features);
 
+                Log.d(TAG, "Resolving device info for " + clientInfo.deviceId);
                 promise.resolve(result);
-            } catch (Exception e) {
-                promise.reject("E_GET_INFO_FAILED", e.getMessage());
+            } catch (Throwable t) {
+                Log.e(TAG, "clientGetDeviceInfo crashed: " + t.getMessage(), t);
+                promise.reject("E_GET_INFO_FAILED", t.getMessage());
             }
         });
     }
@@ -811,39 +830,53 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
      */
     @ReactMethod
     public void startVideoStream(int clientPtr, int streamType, Promise promise) {
-        Log.d(TAG, "startVideoStream called with type: " + streamType);
+        boolean success = sendCgiInternal(clientPtr, 
+            String.format("livestream.cgi?streamid=10&substream=%d", streamType), 5);
+        
+        if (success) {
+            WritableMap response = Arguments.createMap();
+            response.putBoolean("success", true);
+            response.putString("message", "Video stream started");
+            response.putInt("resolution", streamType);
+            promise.resolve(response);
+        } else {
+            promise.reject("E_VIDEO_START_FAILED", "Failed to send livestream.cgi");
+        }
+    }
+
+    /**
+     * Helper for internal components to send CGI commands without a Promise
+     */
+    public static boolean sendCgiInternal(int clientPtr, String cgi, int timeout) {
         try {
             ClientInfo clientInfo = clients.get(clientPtr);
             if (clientInfo == null || clientInfo.sdkClientPtr == 0) {
-                promise.reject("E_NOT_CONNECTED", "Client not connected");
-                return;
+                Log.e(TAG, "sendCgiInternal: Client not connected for ptr " + clientPtr);
+                return false;
             }
 
-            // Send livestream.cgi command to start streaming
-            // streamid=10 starts the stream, substream is the resolution
-            String cgi = String.format(
-                "livestream.cgi?streamid=10&substream=%d&loginuse=%s&loginpas=%s",
-                streamType,
-                clientInfo.username != null ? clientInfo.username : "admin",
-                clientInfo.password != null ? clientInfo.password : ""
-            );
-            
-            Log.d(TAG, "Sending livestream start command: " + cgi);
-            
-            Method writeCgiMethod = jniApiClass.getMethod("writeCgi", long.class, String.class, int.class);
-            Object result = writeCgiMethod.invoke(null, clientInfo.sdkClientPtr, cgi, 5);
-            
-            Log.d(TAG, "livestream start command sent, result: " + result);
+            // Append login info if missing
+            String finalCgi = cgi;
+            if (!cgi.contains("loginuse=")) {
+                String sep = cgi.contains("?") ? "&" : "?";
+                finalCgi = cgi + sep + "loginuse=" + (clientInfo.username != null ? clientInfo.username : "admin") + 
+                                "&loginpas=" + (clientInfo.password != null ? clientInfo.password : "");
+            }
+
+            Log.d(TAG, "sendCgiInternal: " + finalCgi);
             
-            WritableMap response = Arguments.createMap();
-            response.putBoolean("success", true);
-            response.putString("message", "Video stream started");
-            response.putInt("resolution", streamType);
-            promise.resolve(response);
+            // Invoke JNIApi.writeCgi
+            // Since we need to access jniApiClass which is not static, we use reflection on the instance if available
+            // but for simplicity, we can just grab the class by name again or make the class ref static.
+            Class<?> jniClass = Class.forName("com.vstarcam.JNIApi");
+            Method writeCgiMethod = jniClass.getMethod("writeCgi", long.class, String.class, int.class);
+            Object result = writeCgiMethod.invoke(null, clientInfo.sdkClientPtr, finalCgi, timeout);
             
+            int res = (Integer) result;
+            return res == 0; // 0 usually means success in VStarCam JNI
         } catch (Exception e) {
-            Log.e(TAG, "startVideoStream error", e);
-            promise.reject("E_VIDEO_START_FAILED", e.getMessage(), e);
+            Log.e(TAG, "sendCgiInternal failed", e);
+            return false;
         }
     }
 
@@ -945,7 +978,7 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
     @ReactMethod
     public void getSdkVersion(Promise promise) {
         WritableMap result = Arguments.createMap();
-        result.putString("version", "1.0.22");
+        result.putString("version", "1.0.46");
         result.putBoolean("nativeLoaded", isNativeLibraryLoaded);
         result.putString("nativeLib", "OKSMARTPPCS");
         result.putBoolean("p2pInitialized", isP2PInitialized);

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

@@ -194,6 +194,11 @@ public class VStarCamVideoView extends FrameLayout
 
         statusView.setText("Starting stream...");
 
+        // Start video stream on camera side via CGI
+        Log.d(TAG, "Requesting livestream start from camera...");
+        VStarCamModule.sendCgiInternal((int) clientPtr, 
+            String.format("livestream.cgi?streamid=10&substream=%d", resolution), 5);
+
         try {
             // 1. Create player instance if needed
             // API: createPlayer(long identifier, Surface surface, int width, int height, int flags)
@@ -245,6 +250,10 @@ public class VStarCamVideoView extends FrameLayout
 
         Log.d(TAG, "Stopping stream...");
 
+        // Stop video stream on camera side via CGI
+        Log.d(TAG, "Requesting livestream stop from camera...");
+        VStarCamModule.sendCgiInternal((int) clientPtr, "livestream.cgi?streamid=11", 5);
+
         try {
             try {
                 Method stopMethod = appPlayerClass.getMethod("stop", long.class);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bits-innovate/react-native-vstarcam",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "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