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

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

@@ -35,21 +35,9 @@ import org.json.JSONObject;
  * 
  * Implements P2P camera connectivity using the VStarCam SDK.
  * Uses JNI calls to the native OKSMARTPPCS library via JNIApi class.
- * 
- * JNI API Methods (discovered via reflection):
- *   - create(String did, String serverParam) -> long clientPtr
- *   - connect(long clientPtr, int timeout, String serverParam, int connectType) 
- *   - login(long clientPtr, String username, String password)
- *   - disconnect(long clientPtr)
- *   - destroy(long clientPtr)
- *   - writeCgi(long clientPtr, String cgi, int timeout)
- *   - init(ClientStateListener, ClientCommandListener, ClientReleaseListener)
  */
 @ReactModule(name = "VStarCam")
 public class VStarCamModule extends ReactContextBaseJavaModule {
-    static {
-        Log.d("VStarCamModule", "VStarCamModule class loaded by JVM");
-    }
     private static final String TAG = "VStarCamModule";
     public static final String MODULE_NAME = "VStarCam";
     
@@ -60,7 +48,6 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
     private static final java.util.concurrent.atomic.AtomicInteger nextClientPtr = new java.util.concurrent.atomic.AtomicInteger(1000);
     
     // Static proxy references to prevent GC. 
-    // If the native SDK holds these, Java must not collect them.
     private static Object stateListenerProxy;
     private static Object commandListenerProxy;
     private static Object releaseListenerProxy;
@@ -103,11 +90,6 @@ 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) {
@@ -226,41 +208,11 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                 jniApiClass = Class.forName("com.vstarcam.JNIApi");
                 Log.d(TAG, "JNIApi class found: " + jniApiClass.getName());
                 
-                // Log JNIApi methods to find hidden functionality (Sound Wave, SmartConfig, etc.)
-                Log.d(TAG, "=== JNIApi Methods ===");
-                for (Method m : jniApiClass.getDeclaredMethods()) {
-                    StringBuilder sb = new StringBuilder();
-                    sb.append("  -> ").append(m.getReturnType().getSimpleName()).append(" ");
-                    sb.append(m.getName()).append("(");
-                    Class<?>[] params = m.getParameterTypes();
-                    for (int i = 0; i < params.length; i++) {
-                        sb.append(params[i].getName());
-                        if (i < params.length - 1) sb.append(", ");
-                    }
-                    sb.append(")");
-                    Log.d(TAG, sb.toString());
-                }
-                Log.d(TAG, "======================");
-                
-                // Load listener interfaces using the same ClassLoader as JNIApi for consistency
+                // Load listener interfaces
                 stateListenerClass = Class.forName("com.vstarcam.app_p2p_api.ClientStateListener", true, jniApiClass.getClassLoader());
                 commandListenerClass = Class.forName("com.vstarcam.app_p2p_api.ClientCommandListener", true, jniApiClass.getClassLoader());
                 releaseListenerClass = Class.forName("com.vstarcam.app_p2p_api.ClientReleaseListener", true, jniApiClass.getClassLoader());
-                Log.d(TAG, "Listener interfaces loaded from ClassLoader: " + jniApiClass.getClassLoader());
-                
-                // Log all methods on each listener for debugging
-                Log.d(TAG, "ClientStateListener methods:");
-                for (Method m : stateListenerClass.getDeclaredMethods()) {
-                    Log.d(TAG, "  -> " + m.getReturnType().getSimpleName() + " " + m.getName() + "(" + java.util.Arrays.toString(m.getParameterTypes()) + ")");
-                }
-                Log.d(TAG, "ClientCommandListener methods:");
-                for (Method m : commandListenerClass.getDeclaredMethods()) {
-                    Log.d(TAG, "  -> " + m.getReturnType().getSimpleName() + " " + m.getName() + "(" + java.util.Arrays.toString(m.getParameterTypes()) + ")");
-                }
-                Log.d(TAG, "ClientReleaseListener methods:");
-                for (Method m : releaseListenerClass.getDeclaredMethods()) {
-                    Log.d(TAG, "  -> " + m.getReturnType().getSimpleName() + " " + m.getName() + "(" + java.util.Arrays.toString(m.getParameterTypes()) + ")");
-                }
+                Log.d(TAG, "Listener interfaces loaded");
                 
                 // Initialize P2P system with listeners
                 initializeP2P();
@@ -290,7 +242,7 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                         try {
                             String methodName = method.getName();
                             
-                            // Handle standard Object methods to avoid crashes on hashCode/toString calls via JNI
+                            // 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);
@@ -317,7 +269,7 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                         } catch (Exception e) {
                             Log.e(TAG, "Error in stateListener callback", e);
                         }
-                        return null; // void stateListener
+                        return null;
                     }
                 }
             );
@@ -345,12 +297,20 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                                 final byte[] data = (byte[]) args[1];
                                 final int length = (Integer) args[2];
                                 Log.d(TAG, "Command callback: sdkPtr=" + sdkPtr + ", len=" + length);
-                                handleCommandReceive(sdkPtr, 0, data);
+                                
+                                if (reactContext != null) {
+                                    reactContext.runOnUiQueueThread(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            handleCommandReceive(sdkPtr, 0, data);
+                                        }
+                                    });
+                                }
                             }
                         } catch (Exception e) {
                             Log.e(TAG, "Error in commandListener callback", e);
                         }
-                        return null; // void commandListener
+                        return null;
                     }
                 }
             );
@@ -373,19 +333,10 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                             }
 
                             Log.d(TAG, "ClientReleaseListener." + methodName + " called");
-                            if (methodName.equals("releaseListener")) {
-                                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);
                         }
-                        return null; // void releaseListener
+                        return null;
                     }
                 }
             );
@@ -393,7 +344,6 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
             // Call JNIApi.init(stateListener, commandListener, releaseListener)
             Method initMethod = jniApiClass.getMethod("init", 
                 stateListenerClass, commandListenerClass, releaseListenerClass);
-            Log.d(TAG, "Calling JNIApi.init with proxies...");
             initMethod.invoke(null, stateListenerProxy, commandListenerProxy, releaseListenerProxy);
             
             isP2PInitialized = true;
@@ -417,7 +367,7 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                 sendEvent("onConnectionStateChanged", params);
                 
                 // Update connected state
-                entry.getValue().isConnected = (state == 2); // ONLINE is 2 in native, 3 in JS (now aligned to 2 in index.ts)
+                entry.getValue().isConnected = (state == 3); // ONLINE
                 break;
             }
         }
@@ -511,15 +461,6 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                     return;
                 }
                 
-                // Explicitly retain the client pointer to prevent premature release by native SDK
-                try {
-                    Method retainMethod = jniApiClass.getMethod("retain", long.class);
-                    retainMethod.invoke(null, sdkClientPtr);
-                    Log.d(TAG, "JNIApi.retain called for: " + sdkClientPtr);
-                } catch (Exception re) {
-                    Log.e(TAG, "Failed to call retain: " + re.getMessage());
-                }
-                
                 // Generate a unique internal client ID
                 int ourClientPtr = nextClientPtr.getAndIncrement();
                 
@@ -565,12 +506,11 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                 params.putInt("state", 1); // CONNECTING
                 sendEvent("onConnectionStateChanged", params);
                 
-                // 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.
+                // Use realClientId for service param lookup (it has the correct prefix like VSTN)
+                String realId = clientInfo.realClientId != null ? clientInfo.realClientId : clientInfo.deviceId;
                 String param = (serverParam != null && !serverParam.isEmpty()) 
                     ? serverParam 
-                    : getServiceParam(clientInfo.deviceId); 
+                    : getServiceParam(realId);
                 
                 // Default connectType to 126 (from V1 app) if not specified
                 // connectType 126 = P2P/Relay combination that works reliably
@@ -586,21 +526,6 @@ 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);
                 } catch (java.lang.reflect.InvocationTargetException ite) {
                     Log.e(TAG, "JNIApi.connect threw exception: " + ite.getCause(), ite.getCause());
                     throw ite;
@@ -655,21 +580,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
-                    }
+                    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);
@@ -681,14 +596,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());
@@ -813,6 +728,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
@@ -915,10 +866,6 @@ 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)
@@ -963,82 +910,4 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
         }
         promise.resolve(result);
     }
-
-    /**
-     * Get device info via get_status.cgi
-     */
-    @ReactMethod
-    public void clientGetDeviceInfo(int clientPtr, Promise promise) {
-        executor.execute(() -> {
-            try {
-                ClientInfo clientInfo = clients.get(clientPtr);
-                if (clientInfo == null || clientInfo.sdkClientPtr == 0) {
-                    promise.reject("E_NOT_CONNECTED", "Client not connected");
-                    return;
-                }
-
-                // Use get_status.cgi to check if camera is responsive on network
-                String cgi = "get_status.cgi?loginuse=admin&loginpas=888888";
-                if (clientInfo.username != null) {
-                    cgi = String.format("get_status.cgi?loginuse=%s&loginpas=%s", 
-                        clientInfo.username, clientInfo.password);
-                }
-
-                Method writeCgiMethod = jniApiClass.getMethod("writeCgi", long.class, String.class, int.class);
-                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();
-                response.putString("serialNumber", clientInfo.deviceId);
-                response.putString("model", "VStarCam Device");
-                response.putBoolean("responsive", true);
-                promise.resolve(response);
-            } catch (Exception e) {
-                Log.e(TAG, "clientGetDeviceInfo failed", e);
-                promise.reject("E_GET_INFO_FAILED", e.getMessage());
-            }
-        });
-    }
-
-    /**
-     * Get the current Wi-Fi SSID of the Android device
-     */
-    @ReactMethod
-    public void getWiFiSSID(Promise promise) {
-        try {
-            android.net.wifi.WifiManager wifiManager = (android.net.wifi.WifiManager) 
-                reactContext.getApplicationContext().getSystemService(android.content.Context.WIFI_SERVICE);
-            
-            if (wifiManager != null) {
-                android.net.wifi.WifiInfo info = wifiManager.getConnectionInfo();
-                if (info != null) {
-                    String ssid = info.getSSID();
-                    // Android returns SSID with quotes, e.g. "MyNetwork", remove them
-                    if (ssid != null && ssid.length() > 1 && ssid.startsWith("\"") && ssid.endsWith("\"")) {
-                        ssid = ssid.substring(1, ssid.length() - 1);
-                    }
-                    // Handle "unknown ssid" case
-                    if ("<unknown ssid>".equals(ssid)) {
-                        promise.resolve(null);
-                    } else {
-                        promise.resolve(ssid);
-                    }
-                    return;
-                }
-            }
-            promise.resolve(null);
-        } catch (Exception e) {
-            Log.e(TAG, "Failed to get WiFi SSID", e);
-            promise.resolve(null);
-        }
-    }
 }

package/package.json

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

package/src/index.ts

@@ -95,17 +95,17 @@ const VStarCamModule = NativeModules.VStarCam
 
 // Connection states
 export enum ConnectionState {
-  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,
+  CONNECTING = 1,
+  INITIALIZING = 2,
+  ONLINE = 3,
+  CONNECT_FAILED = 4,
+  DISCONNECTED = 5,
+  INVALID_ID = 6,
+  OFFLINE = 7,
+  TIMEOUT = 8,
+  WRONG_PWD = 9,
+  INVALID_CLIENT = 10,
+  MAX_SESSION = 11,
 }
 
 // Connection modes
@@ -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)