@bits-innovate/react-native-vstarcam 1.0.15 → 1.0.17

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

@@ -13,13 +13,21 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.regex.Pattern;
+
+import org.json.JSONObject;
+
 
 /**
  * VStarCam React Native Module
@@ -78,6 +86,56 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
         return param;
     }
     
+    // Pattern to detect virtual UIDs (like ACAE0001151GWYQ)
+    // Virtual UIDs: start with letters, have 7+ digits, end with letters
+    private static final Pattern VIRTUAL_UID_PATTERN = Pattern.compile("^[a-zA-Z]{1,}\\d{7,}.*[a-zA-Z]$");
+    
+    // Check if a device ID is a virtual UID that needs conversion
+    private static boolean isVirtualId(String deviceId) {
+        if (deviceId == null || deviceId.length() < 10) return false;
+        return VIRTUAL_UID_PATTERN.matcher(deviceId).matches();
+    }
+    
+    // Convert virtual UID to real client ID using VStarCam API
+    // Returns: {uid, supplier, cluster} or null on failure
+    private String[] convertVirtualUid(String virtualUid) {
+        try {
+            URL url = new URL("https://vuid.eye4.cn?vuid=" + virtualUid);
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("GET");
+            conn.setConnectTimeout(10000);
+            conn.setReadTimeout(10000);
+            conn.setRequestProperty("Content-Type", "application/json; charset=utf-8");
+            
+            int responseCode = conn.getResponseCode();
+            if (responseCode == 200) {
+                BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+                StringBuilder response = new StringBuilder();
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    response.append(line);
+                }
+                reader.close();
+                
+                JSONObject json = new JSONObject(response.toString());
+                String uid = json.optString("uid", null);
+                String supplier = json.optString("supplier", "");
+                String cluster = json.optString("cluster", "");
+                
+                if (uid != null && !uid.isEmpty()) {
+                    Log.d(TAG, "Converted virtual UID " + virtualUid + " -> real UID: " + uid + " (supplier: " + supplier + ", cluster: " + cluster + ")");
+                    return new String[]{uid, supplier, cluster};
+                }
+            } else {
+                Log.e(TAG, "Virtual UID conversion failed, HTTP " + responseCode);
+            }
+            conn.disconnect();
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to convert virtual UID: " + e.getMessage(), e);
+        }
+        return null;
+    }
+    
     private final ReactApplicationContext reactContext;
     private final ExecutorService executor;
     
@@ -93,12 +151,14 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
     private Class<?> releaseListenerClass = null;
     
     private static class ClientInfo {
-        String deviceId;
-        long sdkClientPtr = 0; // Actual SDK client pointer (long)
+        String deviceId;          // Original device ID (can be virtual UID)
+        String realClientId;      // Converted client ID (for JNI calls)
+        long sdkClientPtr = 0;    // Actual SDK client pointer (long)
         boolean isConnected = false;
         boolean isLoggedIn = false;
     }
 
+
     public VStarCamModule(ReactApplicationContext reactContext) {
         super(reactContext);
         this.reactContext = reactContext;
@@ -334,10 +394,23 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                     return;
                 }
                 
-                // Call JNIApi.create(did, serverParam)
-                String serviceParam = getServiceParam(deviceId);
+                // Check if this is a virtual UID that needs conversion
+                String realClientId = deviceId;
+                if (isVirtualId(deviceId)) {
+                    Log.d(TAG, "Device ID " + deviceId + " looks like a virtual UID, converting...");
+                    String[] conversionResult = convertVirtualUid(deviceId);
+                    if (conversionResult != null && conversionResult[0] != null) {
+                        realClientId = conversionResult[0];
+                        Log.d(TAG, "Using converted client ID: " + realClientId);
+                    } else {
+                        Log.w(TAG, "Virtual UID conversion failed, trying with original ID");
+                    }
+                }
+                
+                // Call JNIApi.create(did, serverParam) with real client ID
+                String serviceParam = getServiceParam(realClientId);  // Use real client ID prefix
                 Method createMethod = jniApiClass.getMethod("create", String.class, String.class);
-                Object result = createMethod.invoke(null, deviceId, serviceParam);
+                Object result = createMethod.invoke(null, realClientId, serviceParam);
                 long sdkClientPtr = (Long) result;
                 
                 Log.d(TAG, "JNIApi.create result: " + sdkClientPtr);
@@ -353,10 +426,11 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                 
                 ClientInfo clientInfo = new ClientInfo();
                 clientInfo.deviceId = deviceId;
+                clientInfo.realClientId = realClientId;  // Store the converted ID
                 clientInfo.sdkClientPtr = sdkClientPtr;
                 clients.put(ourClientPtr, clientInfo);
                 
-                Log.d(TAG, "Created client: ourPtr=" + ourClientPtr + ", sdkPtr=" + sdkClientPtr);
+                Log.d(TAG, "Created client: ourPtr=" + ourClientPtr + ", sdkPtr=" + sdkClientPtr + ", realId=" + realClientId);
                 promise.resolve(ourClientPtr);
             } catch (Exception e) {
                 Log.e(TAG, "clientCreate failed", e);
@@ -392,19 +466,25 @@ 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;
                 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
+                int actualConnectType = (connectType <= 0) ? 126 : connectType;
                 
                 // Call JNIApi.connect(sdkClientPtr, timeout, serverParam, connectType)
                 // Signature: connect([long, int, class java.lang.String, int])
                 Method connectMethod = jniApiClass.getMethod("connect", 
                     long.class, int.class, String.class, int.class);
                 
-                Log.d(TAG, "Calling JNIApi.connect(" + clientInfo.sdkClientPtr + ", 15, " + param + ", " + connectType + ")");
+                Log.d(TAG, "Calling JNIApi.connect(" + clientInfo.sdkClientPtr + ", 15, " + param + ", " + actualConnectType + ")");
                 
                 try {
-                    connectMethod.invoke(null, clientInfo.sdkClientPtr, 15, param, connectType);
+                    connectMethod.invoke(null, clientInfo.sdkClientPtr, 15, param, actualConnectType);
                     Log.d(TAG, "JNIApi.connect returned normally");
                 } catch (java.lang.reflect.InvocationTargetException ite) {
                     Log.e(TAG, "JNIApi.connect threw exception: " + ite.getCause(), ite.getCause());
@@ -459,7 +539,17 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                     long.class, String.class, String.class);
                 
                 Log.d(TAG, "Calling JNIApi.login(" + clientInfo.sdkClientPtr + ", " + username + ", ***)");
-                loginMethod.invoke(null, clientInfo.sdkClientPtr, username, password);
+                
+                try {
+                    loginMethod.invoke(null, clientInfo.sdkClientPtr, username, password);
+                    Log.d(TAG, "JNIApi.login returned normally");
+                } catch (java.lang.reflect.InvocationTargetException ite) {
+                    Log.e(TAG, "JNIApi.login threw exception: " + ite.getCause(), ite.getCause());
+                    throw ite;
+                } catch (Throwable t) {
+                    Log.e(TAG, "JNIApi.login crashed: " + t.getMessage(), t);
+                    throw t;
+                }
                 
                 clientInfo.isLoggedIn = true;
                 Log.d(TAG, "JNIApi.login called successfully");
@@ -614,25 +704,38 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
      */
     @ReactMethod
     public void clientCheckMode(int clientPtr, Promise promise) {
+        Log.d(TAG, "clientCheckMode called for: " + clientPtr);
         try {
             ClientInfo clientInfo = clients.get(clientPtr);
             
             int mode = 0;
-            if (clientInfo != null && jniApiClass != null && clientInfo.sdkClientPtr > 0) {
+            // Note: sdkClientPtr can be negative (unsigned to signed cast) - only check != 0
+            if (clientInfo != null && jniApiClass != null && clientInfo.sdkClientPtr != 0) {
                 try {
                     Method checkModeMethod = jniApiClass.getMethod("checkMode", long.class);
                     Object result = checkModeMethod.invoke(null, clientInfo.sdkClientPtr);
                     mode = (Integer) result;
-                    Log.d(TAG, "JNIApi.checkMode result: " + mode);
+                    Log.d(TAG, "JNIApi.checkMode result: " + mode + " (0=none, 1=P2P, 2=relay, 3=sock)");
                 } catch (Exception e) {
-                    Log.e(TAG, "checkMode failed", 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)
+            boolean connected = mode > 0;
+            if (connected && clientInfo != null) {
+                clientInfo.isConnected = true;
             }
             
             WritableMap result = Arguments.createMap();
-            result.putBoolean("success", clientInfo != null && clientInfo.isConnected);
+            result.putBoolean("success", connected);
             result.putInt("mode", mode);
             result.putDouble("sessionHandle", clientInfo != null ? clientInfo.sdkClientPtr : -1);
+            Log.d(TAG, "clientCheckMode returning: success=" + connected + ", mode=" + mode);
             promise.resolve(result);
         } catch (Exception e) {
             Log.e(TAG, "clientCheckMode failed", e);
@@ -654,7 +757,7 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
     @ReactMethod
     public void getSdkVersion(Promise promise) {
         WritableMap result = Arguments.createMap();
-        result.putString("version", "1.0.15");
+        result.putString("version", "1.0.17");
         result.putBoolean("nativeLoaded", isNativeLibraryLoaded);
         result.putString("nativeLib", "OKSMARTPPCS");
         result.putBoolean("p2pInitialized", isP2PInitialized);

package/package.json

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