@cappitolian/network-discovery 0.0.7 → 0.0.8

package/android/src/main/java/com/cappitolian/plugins/networkdiscovery/NetworkDiscovery.java

@@ -3,13 +3,13 @@ package com.cappitolian.plugins.networkdiscovery;
 import android.content.Context;
 import android.net.nsd.NsdManager;
 import android.net.nsd.NsdServiceInfo;
-import android.net.wifi.WifiManager;
 import android.util.Log;
 
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 
 import org.json.JSONArray;
+import org.json.JSONException;
 
 import java.net.InetAddress;
 import java.util.Map;
@@ -18,7 +18,6 @@ import java.util.Iterator;
 public class NetworkDiscovery {
     private static final String TAG = "NetworkDiscovery";
     private NsdManager nsdManager;
-    private WifiManager.MulticastLock multicastLock;
     private NsdManager.RegistrationListener registrationListener;
     private NsdManager.DiscoveryListener discoveryListener;
     private NsdServiceInfo serviceInfo;
@@ -27,14 +26,6 @@ public class NetworkDiscovery {
     public NetworkDiscovery(Plugin plugin, Context context) {
         this.plugin = plugin;
         this.nsdManager = (NsdManager) context.getSystemService(Context.NSD_SERVICE);
-        
-        // Configuración del MulticastLock
-        // Es vital para que Android responda a las peticiones mDNS de iOS
-        WifiManager wifi = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-        if (wifi != null) {
-            this.multicastLock = wifi.createMulticastLock("ssspos_discovery_lock");
-            this.multicastLock.setReferenceCounted(true);
-        }
     }
 
     public void startAdvertising(
@@ -44,9 +35,6 @@ public class NetworkDiscovery {
         JSObject txtRecord,
         AdvertisingCallback callback
     ) {
-        // 1. Adquirir el lock antes de publicar
-        acquireMulticastLock();
-
         serviceInfo = new NsdServiceInfo();
         serviceInfo.setServiceName(serviceName);
         serviceInfo.setServiceType(serviceType);
@@ -56,7 +44,7 @@ public class NetworkDiscovery {
         if (txtRecord != null) {
             Iterator<String> keys = txtRecord.keys();
             while (keys.hasNext()) {
-                String key = keys.next();
+            String key = keys.next();
                 try {
                     String value = txtRecord.getString(key);
                     serviceInfo.setAttribute(key, value);
@@ -70,7 +58,6 @@ public class NetworkDiscovery {
             @Override
             public void onRegistrationFailed(NsdServiceInfo serviceInfo, int errorCode) {
                 Log.e(TAG, "Service registration failed: " + errorCode);
-                releaseMulticastLock(); // Liberar si falla
                 callback.onError("Registration failed with error code: " + errorCode);
             }
 
@@ -88,7 +75,6 @@ public class NetworkDiscovery {
             @Override
             public void onServiceUnregistered(NsdServiceInfo serviceInfo) {
                 Log.d(TAG, "Service unregistered");
-                releaseMulticastLock();
             }
         };
 
@@ -100,10 +86,8 @@ public class NetworkDiscovery {
             try {
                 nsdManager.unregisterService(registrationListener);
                 registrationListener = null;
-                // El lock se libera en el callback onServiceUnregistered
                 callback.onSuccess();
             } catch (Exception e) {
-                releaseMulticastLock();
                 callback.onError("Error stopping advertising: " + e.getMessage());
             }
         } else {
@@ -112,15 +96,11 @@ public class NetworkDiscovery {
     }
 
     public void startDiscovery(String serviceType, DiscoveryCallback callback) {
-        // También es recomendable adquirir el lock durante el discovery
-        acquireMulticastLock();
-
         discoveryListener = new NsdManager.DiscoveryListener() {
             @Override
             public void onStartDiscoveryFailed(String serviceType, int errorCode) {
                 Log.e(TAG, "Discovery start failed: " + errorCode);
                 nsdManager.stopServiceDiscovery(this);
-                releaseMulticastLock();
                 callback.onError("Discovery failed with error code: " + errorCode);
             }
 
@@ -138,7 +118,6 @@ public class NetworkDiscovery {
             @Override
             public void onDiscoveryStopped(String serviceType) {
                 Log.d(TAG, "Service discovery stopped");
-                releaseMulticastLock();
             }
 
             @Override
@@ -154,6 +133,7 @@ public class NetworkDiscovery {
                     @Override
                     public void onServiceResolved(NsdServiceInfo serviceInfo) {
                         Log.d(TAG, "Service resolved: " + serviceInfo);
+                        
                         JSObject serviceData = buildServiceObject(serviceInfo);
                         callback.onServiceFound(serviceData);
                     }
@@ -163,9 +143,11 @@ public class NetworkDiscovery {
             @Override
             public void onServiceLost(NsdServiceInfo service) {
                 Log.d(TAG, "Service lost: " + service.getServiceName());
+                
                 JSObject serviceData = new JSObject();
                 serviceData.put("serviceName", service.getServiceName());
                 serviceData.put("serviceType", service.getServiceType());
+                
                 callback.onServiceLost(serviceData);
             }
         };
@@ -180,7 +162,6 @@ public class NetworkDiscovery {
                 discoveryListener = null;
                 callback.onSuccess();
             } catch (Exception e) {
-                releaseMulticastLock();
                 callback.onError("Error stopping discovery: " + e.getMessage());
             }
         } else {
@@ -188,20 +169,6 @@ public class NetworkDiscovery {
         }
     }
 
-    private void acquireMulticastLock() {
-        if (multicastLock != null && !multicastLock.isHeld()) {
-            multicastLock.acquire();
-            Log.d(TAG, "MulticastLock acquired");
-        }
-    }
-
-    private void releaseMulticastLock() {
-        if (multicastLock != null && multicastLock.isHeld()) {
-            multicastLock.release();
-            Log.d(TAG, "MulticastLock released");
-        }
-    }
-
     private JSObject buildServiceObject(NsdServiceInfo serviceInfo) {
         JSObject serviceData = new JSObject();
         serviceData.put("serviceName", serviceInfo.getServiceName());
@@ -209,6 +176,7 @@ public class NetworkDiscovery {
         serviceData.put("hostName", serviceInfo.getHost() != null ? serviceInfo.getHost().getHostName() : "");
         serviceData.put("port", serviceInfo.getPort());
         
+        // Agregar direcciones IP
         InetAddress host = serviceInfo.getHost();
         if (host != null) {
           JSONArray addresses = new JSONArray();
@@ -216,6 +184,7 @@ public class NetworkDiscovery {
           serviceData.put("addresses", addresses);
         }
         
+        // Agregar TXT records
         Map<String, byte[]> attributes = serviceInfo.getAttributes();
         if (attributes != null && !attributes.isEmpty()) {
             JSObject txtRecordObj = new JSObject();
@@ -228,6 +197,7 @@ public class NetworkDiscovery {
         return serviceData;
     }
 
+    // Callbacks interfaces
     public interface AdvertisingCallback {
         void onSuccess();
         void onError(String error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cappitolian/network-discovery",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "A Capacitor plugin for network service discovery using mDNS/Bonjour. Allows automatic server-client connection without manual IP configuration.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",