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

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");
     }};
@@ -100,62 +99,13 @@ 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;
     
     // 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;
     
@@ -166,8 +116,7 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
     private Class<?> releaseListenerClass = null;
     
     private static class ClientInfo {
-        String deviceId;          // Original device ID (can be virtual UID)
-        String realClientId;      // Converted client ID (for JNI calls)
+        String deviceId;          // Original device ID
         long sdkClientPtr = 0;    // Actual SDK client pointer (long)
         boolean isConnected = false;
         boolean isLoggedIn = false;
@@ -434,23 +383,10 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                     return;
                 }
                 
-                // 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
+                // Call JNIApi.create(did, serverParam)
+                String serviceParam = getServiceParam(deviceId);
                 Method createMethod = jniApiClass.getMethod("create", String.class, String.class);
-                Object result = createMethod.invoke(null, realClientId, serviceParam);
+                Object result = createMethod.invoke(null, deviceId, serviceParam);
                 long sdkClientPtr = (Long) result;
                 
                 Log.d(TAG, "JNIApi.create result: " + sdkClientPtr);
@@ -461,16 +397,15 @@ 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;
-                clientInfo.realClientId = realClientId;  // Store the converted ID
                 clientInfo.sdkClientPtr = sdkClientPtr;
                 clients.put(ourClientPtr, clientInfo);
                 
-                Log.d(TAG, "Created client: ourPtr=" + ourClientPtr + ", sdkPtr=" + sdkClientPtr + ", realId=" + realClientId);
+                Log.d(TAG, "Created client: ourPtr=" + ourClientPtr + ", sdkPtr=" + sdkClientPtr);
                 promise.resolve(ourClientPtr);
             } catch (Exception e) {
                 Log.e(TAG, "clientCreate failed", e);
@@ -506,11 +441,10 @@ 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;
+                // Construct the service param string
                 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
@@ -578,32 +512,21 @@ public class VStarCamModule extends ReactContextBaseJavaModule {
                 Method loginMethod = jniApiClass.getMethod("login", 
                     long.class, String.class, String.class);
                 
-                Log.d(TAG, "Calling JNIApi.login(" + clientInfo.sdkClientPtr + ", " + username + ", ***)");
+                Log.d(TAG, "Calling JNIApi.login(" + clientInfo.sdkClientPtr + ", " + username + ")");
                 
-                boolean loginSuccess = false;
                 try {
                     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);
-                    promise.resolve(false);
-                    return;
-                } catch (Throwable t) {
-                    Log.e(TAG, "JNIApi.login crashed: " + t.getMessage(), t);
+                } catch (Exception e) {
+                    Log.e(TAG, "Login failed: " + e.getMessage());
                     promise.resolve(false);
                     return;
                 }
                 
-                if (loginSuccess) {
-                    clientInfo.isLoggedIn = true;
-                    clientInfo.username = username;
-                    clientInfo.password = password;
-                }
+                clientInfo.isLoggedIn = true;
+                clientInfo.username = username;
+                clientInfo.password = password;
                 
-                Log.d(TAG, "JNIApi.login completed with result: " + loginSuccess);
-                promise.resolve(loginSuccess);
+                promise.resolve(true);
             } catch (Exception e) {
                 Log.e(TAG, "clientLogin failed", e);
                 promise.reject("LOGIN_ERROR", e.getMessage());
@@ -866,6 +789,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.39",
+  "version": "1.0.41",
   "description": "React Native bridge for VStarCam P2P SDK",
   "main": "src/index.ts",
   "types": "src/index.ts",