@bits-innovate/react-native-vstarcam 1.0.34 → 1.0.36

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

@@ -103,6 +103,11 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
         if (did == null || did.length() < 4) {
             return SERVICE_PARAM_MAP.get("DEFAULT");
         }
+        
+        // Special case: If it was converted from an ACAE/ACxx virtual UID, 
+        // it might work better with the vstarcam2018 parameters even if the real prefix is VSTJ/VSTN.
+        // However, we'll try prefix-specific first.
+        
         String prefix = did.substring(0, 4).toUpperCase();
         String param = SERVICE_PARAM_MAP.get(prefix);
         if (param == null) {
@@ -168,7 +173,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;
     
@@ -336,20 +341,11 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
 
                             Log.d(TAG, "ClientCommandListener." + methodName + " called");
                             if (methodName.equals("commandListener")) {
-                                // args: long clientPtr, byte[] data, int length
-                                final long clientPtr = (Long) args[0];
+                                final long sdkPtr = (Long) args[0];
                                 final byte[] data = (byte[]) args[1];
                                 final int length = (Integer) args[2];
-                                Log.d(TAG, "Command callback: clientPtr=" + clientPtr + ", dataLen=" + (data != null ? data.length : 0));
-                                
-                                if (reactContext != null) {
-                                    reactContext.runOnUiQueueThread(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            handleCommandReceive(clientPtr, 0, data);
-                                        }
-                                    });
-                                }
+                                Log.d(TAG, "Command callback: sdkPtr=" + sdkPtr + ", len=" + length);
+                                handleCommandReceive(sdkPtr, 0, data);
                             }
                         } catch (Exception e) {
                             Log.e(TAG, "Error in commandListener callback", e);
@@ -378,8 +374,13 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
 
                             Log.d(TAG, "ClientReleaseListener." + methodName + " called");
                             if (methodName.equals("releaseListener")) {
-                                final long clientPtr = (Long) args[0];
-                                Log.d(TAG, "Release callback: clientPtr=" + clientPtr);
+                                final long sdkPtr = (Long) args[0];
+                                Log.d(TAG, "Release callback: sdkPtr=" + sdkPtr);
+                                
+                                // info.sdkClientPtr = 0
+                                // NOTE: In 1.0.35 we cleared the pointer here, but it caused "Client not connected"
+                                // because the SDK seems to call this on various events, not just destruction.
+                                // We will only clear it on explicit disconnect/destroy.
                             }
                         } catch (Exception e) {
                             Log.e(TAG, "Error in releaseListener callback", e);
@@ -564,11 +565,12 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                 params.putInt("state", 1); // CONNECTING
                 sendEvent("onConnectionStateChanged", params);
                 
-                // Use realClientId for service param lookup (it has the correct prefix like VSTN)
-                String realId = clientInfo.realClientId != null ? clientInfo.realClientId : clientInfo.deviceId;
+                // CRITICAL: For virtual UIDs (like ACAE...), always use the ORIGINAL device ID 
+                // to look up service parameters. Even if it's converted to a VSTJ/VSTN real ID,
+                // it often must connect via the specific vstarcam2018/2019 servers matched to its prefix.
                 String param = (serverParam != null && !serverParam.isEmpty()) 
                     ? serverParam 
-                    : getServiceParam(realId);
+                    : getServiceParam(clientInfo.deviceId); 
                 
                 // Default connectType to 126 (from V1 app) if not specified
                 // connectType 126 = P2P/Relay combination that works reliably
@@ -584,6 +586,22 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                 try {
                     Object result = connectMethod.invoke(null, clientInfo.sdkClientPtr, 15, param, actualConnectType);
                     Log.d(TAG, "JNIApi.connect result: " + result);
+                    
+                    int res = (Integer) result;
+                    Log.d(TAG, "JNIApi.connect result: " + res);
+                    
+                    // CRITICAL: In some P2P SDKs, handles can be negative (like pointers).
+                    // We also saw '7' as a successful handle.
+                    // We will only reject if it's a specific known error code (usually -1 or -2, but we'll be permissive).
+                    if (res == -1) {
+                        Log.w(TAG, "JNIApi.connect failed with code: " + res);
+                        promise.reject("CONNECT_FAILED", "SDK connect error code: " + res);
+                        return;
+                    }
+                    
+                    // Code >= 0 or other negative values might be a success (Session ID or State)
+                    Log.d(TAG, "JNIApi.connect successful or handle returned: " + res);
+                    clientInfo.isConnected = true; // Optimistically set this if we got a handle
                 } catch (java.lang.reflect.InvocationTargetException ite) {
                     Log.e(TAG, "JNIApi.connect threw exception: " + ite.getCause(), ite.getCause());
                     throw ite;
@@ -645,8 +663,13 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                     // result is likely boolean based on signature log
                     if (result instanceof Boolean) {
                         loginResult = (Boolean) result;
+                    } else if (result instanceof Integer) {
+                        int res = (Integer) result;
+                        Log.d(TAG, "JNIApi.login integer result: " + res);
+                        // If it's a handle or 0 (success), treat as true
+                        loginResult = (res >= 0 || res < -2); // Permissive: only reject -1, -2 as common errors
                     } else if (result != null) {
-                        loginResult = true; // Non-null result usually means success for some SDKs
+                        loginResult = true; // Non-null result usually means success
                     }
                 } catch (java.lang.reflect.InvocationTargetException ite) {
                     Throwable cause = ite.getCause();
@@ -966,6 +989,13 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                 Log.d(TAG, "Verifying network: " + cgi);
                 Object result = writeCgiMethod.invoke(null, clientInfo.sdkClientPtr, cgi, 5);
                 
+                boolean writeSuccess = (result instanceof Boolean) ? (Boolean) result : true;
+                if (!writeSuccess) {
+                    Log.w(TAG, "Network verification failed: writeCgi returned false");
+                    promise.reject("E_NOT_RESPONSIVE", "Camera not responsive to commands");
+                    return;
+                }
+                
                 // If we reach here, the CGI command was at least sent.
                 // We'll return a basic object representing success for now.
                 WritableMap response = Arguments.createMap();

package/package.json

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

package/src/index.ts

@@ -388,11 +388,11 @@ class VStarCamClient {
 
     // Wait for confirmation
     return new Promise((resolve) => {
-      const timeout = setTimeout(() => resolve(false), 10000);
+      const waitTimeout = setTimeout(() => resolve(false), 10000);
 
       const handler: CommandEventListener = (_, cmd, data) => {
         if (cmd === 24593) {
-          clearTimeout(timeout);
+          clearTimeout(waitTimeout);
           this.removeCommandListener(handler);
           const params = this.parseResponse(new TextDecoder().decode(data));
           resolve(params["result"] === "0");
@@ -407,36 +407,14 @@ class VStarCamClient {
    * Get device information
    */
   async getDeviceInfo(): Promise<DeviceInfo | null> {
-    const success = await this.sendCommand("get_status.cgi?");
-    if (!success) return null;
-
-    return new Promise((resolve) => {
-      const timeout = setTimeout(() => resolve(null), 5000);
-
-      const handler: CommandEventListener = (_, cmd, data) => {
-        clearTimeout(timeout);
-        this.removeCommandListener(handler);
-        const params = this.parseResponse(new TextDecoder().decode(data));
-
-        resolve({
-          serialNumber: params["id"] || "",
-          model: params["model"] || "",
-          firmware: params["sys_ver"] || "",
-          manufacturer: "VStarCam",
-          features: {
-            ptz: params["ptz"] === "1",
-            audio: params["haveAudio"] === "1",
-            twoWayAudio: params["support_talk"] === "1",
-            nightVision: params["haveIR"] === "1",
-            motionDetection: params["support_alarm"] === "1",
-            wifi: params["haveWifi"] === "1",
-          },
-          responsive: true,
-        });
-      };
-
-      this.addCommandListener(handler);
-    });
+    try {
+      // The native module handles credentials and basic command sending.
+      // It returns a promise that resolves with the device info and responsive: true.
+      return await VStarCamModule.clientGetDeviceInfo(this.clientPtr);
+    } catch (e: any) {
+      console.error("[VStarCam] getDeviceInfo failed:", e);
+      return null;
+    }
   }
 
   /**