@bits-innovate/react-native-vstarcam 1.0.38 → 1.0.40

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

@@ -80,7 +80,6 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
         put("ACAE", "EEGDFHBLKGJIGEJLEKGOFMEDHAMHHJNAGGFABMCOBGJOLHLJDFAFCPPHGILKIKLMANNHKEDKOINIBNCPJOMK:vstarcam2018"); // Try VSTH params
         put("ACDG", "EEGDFHBLKGJIGEJLEKGOFMEDHAMHHJNAGGFABMCOBGJOLHLJDFAFCPPHGILKIKLMANNHKEDKOINIBNCPJOMK:vstarcam2018"); // Same as ACAE/VSTH
         put("ACAQ", "EEGDFHBLKGJIGEJLEKGOFMEDHAMHHJNAGGFABMCOBGJOLHLJDFAFCPPHGILKIKLMANNHKEDKOINIBNCPJOMK:vstarcam2018"); // Same as ACAE/VSTH
-        put("ACAG", "EEGDFHBLKGJIGEJLEKGOFMEDHAMHHJNAGGFABMCOBGJOLHLJDFAFCPPHGILKIKLMANNHKEDKOINIBNCPJOMK:vstarcam2018"); // Same as ACAE/VSTH
         // Fallback for unknown prefixes
         put("DEFAULT", "EBGBEMBMKGJMGAJPEIGIFKEGHBMCHMNFGKEGBFCBBMJELILDCJADCIOLHHLLJBKEAMMBLCDGONMDBJCJJPNFJP");
     }};
@@ -155,7 +154,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 java.util.concurrent.ConcurrentHashMap<>();
+    private static Map<Integer, ClientInfo> clients = new HashMap<>();
     private boolean isNativeLibraryLoaded = false;
     private boolean isP2PInitialized = false;
     
@@ -461,8 +460,8 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                     return;
                 }
                 
-                // Generate a unique internal client ID
-                int ourClientPtr = nextClientPtr.getAndIncrement();
+                // Generate our own client ID (hash of deviceId) and store mapping
+                int ourClientPtr = Math.abs(deviceId.hashCode());
                 
                 ClientInfo clientInfo = new ClientInfo();
                 clientInfo.deviceId = deviceId;
@@ -580,23 +579,11 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                 
                 Log.d(TAG, "Calling JNIApi.login(" + clientInfo.sdkClientPtr + ", " + username + ", ***)");
                 
-                boolean loginResult = false;
+                boolean loginSuccess = false;
                 try {
-                    Object result = loginMethod.invoke(null, clientInfo.sdkClientPtr, username, password);
-                    Log.d(TAG, "JNIApi.login result: " + result);
-                    // 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
-                    } else {
-                        loginResult = true; // result == null (void return) means success if no exception
-                    }
+                    loginMethod.invoke(null, clientInfo.sdkClientPtr, username, password);
+                    Log.d(TAG, "JNIApi.login returned normally");
+                    loginSuccess = true;
                 } catch (java.lang.reflect.InvocationTargetException ite) {
                     Throwable cause = ite.getCause();
                     Log.e(TAG, "JNIApi.login threw exception: " + cause, cause);
@@ -608,14 +595,14 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                     return;
                 }
                 
-                if (loginResult) {
+                if (loginSuccess) {
                     clientInfo.isLoggedIn = true;
                     clientInfo.username = username;
                     clientInfo.password = password;
                 }
                 
-                Log.d(TAG, "JNIApi.login completed with result: " + loginResult);
-                promise.resolve(loginResult);
+                Log.d(TAG, "JNIApi.login completed with result: " + loginSuccess);
+                promise.resolve(loginSuccess);
             } catch (Exception e) {
                 Log.e(TAG, "clientLogin failed", e);
                 promise.reject("LOGIN_ERROR", e.getMessage());
@@ -740,6 +727,42 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
         });
     }
 
+    /**
+     * Get device information
+     */
+    @ReactMethod
+    public void clientGetDeviceInfo(int clientPtr, Promise promise) {
+        executor.execute(() -> {
+            try {
+                ClientInfo clientInfo = clients.get(clientPtr);
+                if (clientInfo == null) {
+                    promise.reject("E_CLIENT_NOT_FOUND", "Client not found");
+                    return;
+                }
+
+                WritableMap result = Arguments.createMap();
+                result.putString("serialNumber", clientInfo.deviceId);
+                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);
+
+                promise.resolve(result);
+            } catch (Exception e) {
+                promise.reject("E_GET_INFO_FAILED", e.getMessage());
+            }
+        });
+    }
+
     /**
      * Start video stream by sending livestream.cgi command
      * Resolution: 1=high, 2=general, 4=low, 100=superHD
@@ -842,6 +865,10 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                 } catch (Exception e) {
                     Log.e(TAG, "checkMode JNI call failed", e);
                 }
+            } else {
+                Log.w(TAG, "checkMode skipped: clientInfo=" + clientInfo + 
+                    ", jniApiClass=" + (jniApiClass != null) + 
+                    ", sdkPtr=" + (clientInfo != null ? clientInfo.sdkClientPtr : "null"));
             }
             
             // Mode > 0 means connected (1=P2P, 2=Relay, 3=Socket)

package/package.json

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

package/src/index.ts

@@ -279,6 +279,15 @@ class VStarCamClient {
     };
   }
 
+  /**
+   * Check the current connection mode
+   * @returns Mode result including connection type and session handle
+   */
+  async checkConnectionMode(): Promise<any> {
+    if (!this.clientPtr) return { success: false, mode: 0 };
+    return VStarCamModule.clientCheckMode(this.clientPtr);
+  }
+
   /**
    * Login to the camera
    * @param username Camera username (default: admin)