@bits-innovate/react-native-vstarcam 1.0.35 → 1.0.37

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

@@ -377,15 +377,10 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                                 final long sdkPtr = (Long) args[0];
                                 Log.d(TAG, "Release callback: sdkPtr=" + sdkPtr);
                                 
-                                // Clean up our reference to this SDK pointer
-                                for (ClientInfo info : clients.values()) {
-                                    if (info.sdkClientPtr == sdkPtr) {
-                                        Log.d(TAG, "SDK released client: " + info.deviceId + " (clearing sdkClientPtr)");
-                                        info.sdkClientPtr = 0;
-                                        info.isConnected = false;
-                                        info.isLoggedIn = false;
-                                    }
-                                }
+                                // 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);
@@ -422,7 +417,7 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                 sendEvent("onConnectionStateChanged", params);
                 
                 // Update connected state
-                entry.getValue().isConnected = (state == 3); // ONLINE
+                entry.getValue().isConnected = (state == 2); // ONLINE is 2 in native, 3 in JS (now aligned to 2 in index.ts)
                 break;
             }
         }
@@ -570,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
@@ -592,11 +588,19 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                     Log.d(TAG, "JNIApi.connect result: " + result);
                     
                     int res = (Integer) result;
-                    if (res != 0 && res != 1) {
+                    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);
                 } catch (java.lang.reflect.InvocationTargetException ite) {
                     Log.e(TAG, "JNIApi.connect threw exception: " + ite.getCause(), ite.getCause());
                     throw ite;
@@ -658,8 +662,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();

package/package.json

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

package/src/index.ts

@@ -95,18 +95,17 @@ const VStarCamModule = NativeModules.VStarCam
 
 // Connection states
 export enum ConnectionState {
-  INVALID_CLIENT = 0,
-  CONNECTING = 1,
-  INITIALIZING = 2,
-  ONLINE = 3,
-  CONNECT_FAILED = 4,
-  DISCONNECTED = 5,
-  INVALID_ID = 6,
-  OFFLINE = 7,
-  TIMEOUT = 8,
-  MAX_SESSION = 9,
-  MAX = 10,
-  REMOVE_CLOSE = 11,
+  CONNECTING = 0,
+  INITIALIZING = 1,
+  ONLINE = 2,
+  CONNECT_FAILED = 3,
+  DISCONNECTED = 4,
+  INVALID_ID = 5,
+  OFFLINE = 6,
+  TIMEOUT = 7,
+  WRONG_PWD = 8,
+  INVALID_CLIENT = 9,
+  MAX_SESSION = 10,
 }
 
 // Connection modes
@@ -388,11 +387,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");
@@ -411,7 +410,7 @@ class VStarCamClient {
       // 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) {
+    } catch (e: any) {
       console.error("[VStarCam] getDeviceInfo failed:", e);
       return null;
     }