@cappitolian/network-discovery 0.0.7 → 0.0.9

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

@@ -3,7 +3,6 @@ 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;
@@ -12,13 +11,13 @@ import com.getcapacitor.Plugin;
 import org.json.JSONArray;
 
 import java.net.InetAddress;
-import java.util.Map;
 import java.util.Iterator;
+import java.util.Map;
 
 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,12 +35,17 @@ public class NetworkDiscovery {
         JSObject txtRecord,
         AdvertisingCallback callback
     ) {
-        // 1. Adquirir el lock antes de publicar
-        acquireMulticastLock();
-
+        // ✅ Normalizar service type (agregar punto final si no lo tiene)
+        String normalizedServiceType = serviceType.endsWith(".") ? serviceType : serviceType + ".";
+        
+        Log.d(TAG, "📡 Android: Starting advertising");
+        Log.d(TAG, "   Service name: " + serviceName);
+        Log.d(TAG, "   Service type (normalized): " + normalizedServiceType);
+        Log.d(TAG, "   Port: " + port);
+        
         serviceInfo = new NsdServiceInfo();
         serviceInfo.setServiceName(serviceName);
-        serviceInfo.setServiceType(serviceType);
+        serviceInfo.setServiceType(normalizedServiceType);
         serviceInfo.setPort(port);
 
         // Agregar TXT records
@@ -60,6 +56,7 @@ public class NetworkDiscovery {
                 try {
                     String value = txtRecord.getString(key);
                     serviceInfo.setAttribute(key, value);
+                    Log.d(TAG, "   TXT Record: " + key + " = " + value);
                 } catch (Exception e) {
                     Log.e(TAG, "Error setting attribute: " + key, e);
                 }
@@ -69,26 +66,27 @@ public class NetworkDiscovery {
         registrationListener = new NsdManager.RegistrationListener() {
             @Override
             public void onRegistrationFailed(NsdServiceInfo serviceInfo, int errorCode) {
-                Log.e(TAG, "Service registration failed: " + errorCode);
-                releaseMulticastLock(); // Liberar si falla
+                Log.e(TAG, "❌ Android: Service registration FAILED");
+                Log.e(TAG, "   Error code: " + errorCode);
                 callback.onError("Registration failed with error code: " + errorCode);
             }
 
             @Override
             public void onUnregistrationFailed(NsdServiceInfo serviceInfo, int errorCode) {
-                Log.e(TAG, "Service unregistration failed: " + errorCode);
+                Log.e(TAG, "❌ Android: Service unregistration FAILED");
+                Log.e(TAG, "   Error code: " + errorCode);
             }
 
             @Override
             public void onServiceRegistered(NsdServiceInfo serviceInfo) {
-                Log.d(TAG, "Service registered: " + serviceInfo.getServiceName());
+                Log.d(TAG, "✅ Android: Service registered successfully");
+                Log.d(TAG, "   Service name: " + serviceInfo.getServiceName());
                 callback.onSuccess();
             }
 
             @Override
             public void onServiceUnregistered(NsdServiceInfo serviceInfo) {
-                Log.d(TAG, "Service unregistered");
-                releaseMulticastLock();
+                Log.d(TAG, "⛔ Android: Service unregistered");
             }
         };
 
@@ -98,62 +96,76 @@ public class NetworkDiscovery {
     public void stopAdvertising(StopCallback callback) {
         if (registrationListener != null) {
             try {
+                Log.d(TAG, "⛔ Android: Stopping advertising");
                 nsdManager.unregisterService(registrationListener);
                 registrationListener = null;
-                // El lock se libera en el callback onServiceUnregistered
                 callback.onSuccess();
             } catch (Exception e) {
-                releaseMulticastLock();
+                Log.e(TAG, "❌ Android: Error stopping advertising", e);
                 callback.onError("Error stopping advertising: " + e.getMessage());
             }
         } else {
+            Log.w(TAG, "⚠️ Android: No active advertising to stop");
             callback.onError("No active advertising to stop");
         }
     }
 
     public void startDiscovery(String serviceType, DiscoveryCallback callback) {
-        // También es recomendable adquirir el lock durante el discovery
-        acquireMulticastLock();
-
+        // ✅ Normalizar service type
+        String normalizedServiceType = serviceType.endsWith(".") ? serviceType : serviceType + ".";
+        
+        Log.d(TAG, "🔍 Android: Starting discovery");
+        Log.d(TAG, "   Service type (normalized): " + normalizedServiceType);
+        
         discoveryListener = new NsdManager.DiscoveryListener() {
             @Override
             public void onStartDiscoveryFailed(String serviceType, int errorCode) {
-                Log.e(TAG, "Discovery start failed: " + errorCode);
+                Log.e(TAG, "❌ Android: Discovery start FAILED");
+                Log.e(TAG, "   Service type: " + serviceType);
+                Log.e(TAG, "   Error code: " + errorCode);
                 nsdManager.stopServiceDiscovery(this);
-                releaseMulticastLock();
                 callback.onError("Discovery failed with error code: " + errorCode);
             }
 
             @Override
             public void onStopDiscoveryFailed(String serviceType, int errorCode) {
-                Log.e(TAG, "Discovery stop failed: " + errorCode);
+                Log.e(TAG, "❌ Android: Discovery stop FAILED");
+                Log.e(TAG, "   Error code: " + errorCode);
             }
 
             @Override
             public void onDiscoveryStarted(String serviceType) {
-                Log.d(TAG, "Service discovery started");
+                Log.d(TAG, "✅ Android: Service discovery STARTED");
+                Log.d(TAG, "   Service type: " + serviceType);
                 callback.onDiscoveryStarted();
             }
 
             @Override
             public void onDiscoveryStopped(String serviceType) {
-                Log.d(TAG, "Service discovery stopped");
-                releaseMulticastLock();
+                Log.d(TAG, "⛔ Android: Service discovery STOPPED");
             }
 
             @Override
             public void onServiceFound(NsdServiceInfo service) {
-                Log.d(TAG, "Service found: " + service.getServiceName());
+                Log.d(TAG, "✅ Android: Service FOUND!");
+                Log.d(TAG, "   Name: " + service.getServiceName());
+                Log.d(TAG, "   Type: " + service.getServiceType());
                 
                 nsdManager.resolveService(service, new NsdManager.ResolveListener() {
                     @Override
                     public void onResolveFailed(NsdServiceInfo serviceInfo, int errorCode) {
-                        Log.e(TAG, "Resolve failed: " + errorCode);
+                        Log.e(TAG, "❌ Android: Resolve FAILED");
+                        Log.e(TAG, "   Service: " + serviceInfo.getServiceName());
+                        Log.e(TAG, "   Error code: " + errorCode);
                     }
 
                     @Override
                     public void onServiceResolved(NsdServiceInfo serviceInfo) {
-                        Log.d(TAG, "Service resolved: " + serviceInfo);
+                        Log.d(TAG, "✅ Android: Service RESOLVED");
+                        Log.d(TAG, "   Name: " + serviceInfo.getServiceName());
+                        Log.d(TAG, "   Host: " + (serviceInfo.getHost() != null ? serviceInfo.getHost().getHostAddress() : "null"));
+                        Log.d(TAG, "   Port: " + serviceInfo.getPort());
+                        
                         JSObject serviceData = buildServiceObject(serviceInfo);
                         callback.onServiceFound(serviceData);
                     }
@@ -162,65 +174,55 @@ public class NetworkDiscovery {
 
             @Override
             public void onServiceLost(NsdServiceInfo service) {
-                Log.d(TAG, "Service lost: " + service.getServiceName());
+                Log.d(TAG, "⛔ Android: Service LOST");
+                Log.d(TAG, "   Name: " + service.getServiceName());
+                
                 JSObject serviceData = new JSObject();
                 serviceData.put("serviceName", service.getServiceName());
                 serviceData.put("serviceType", service.getServiceType());
+                
                 callback.onServiceLost(serviceData);
             }
         };
 
-        nsdManager.discoverServices(serviceType, NsdManager.PROTOCOL_DNS_SD, discoveryListener);
+        nsdManager.discoverServices(normalizedServiceType, NsdManager.PROTOCOL_DNS_SD, discoveryListener);
     }
 
     public void stopDiscovery(StopCallback callback) {
         if (discoveryListener != null) {
             try {
+                Log.d(TAG, "⛔ Android: Stopping discovery");
                 nsdManager.stopServiceDiscovery(discoveryListener);
                 discoveryListener = null;
                 callback.onSuccess();
             } catch (Exception e) {
-                releaseMulticastLock();
+                Log.e(TAG, "❌ Android: Error stopping discovery", e);
                 callback.onError("Error stopping discovery: " + e.getMessage());
             }
         } else {
+            Log.w(TAG, "⚠️ Android: No active discovery to stop");
             callback.onError("No active discovery to stop");
         }
     }
 
-    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());
         serviceData.put("serviceType", serviceInfo.getServiceType());
+        serviceData.put("domain", "local.");
         serviceData.put("hostName", serviceInfo.getHost() != null ? serviceInfo.getHost().getHostName() : "");
         serviceData.put("port", serviceInfo.getPort());
         
-        InetAddress host = serviceInfo.getHost();
-        if (host != null) {
-          JSONArray addresses = new JSONArray();
-          addresses.put(host.getHostAddress());
-          serviceData.put("addresses", addresses);
-        }
+        // ✅ NO incluir addresses - Solo usar txtRecord para la IP
         
+        // Agregar TXT records (aquí está tu IP correcta)
         Map<String, byte[]> attributes = serviceInfo.getAttributes();
         if (attributes != null && !attributes.isEmpty()) {
             JSObject txtRecordObj = new JSObject();
             for (Map.Entry<String, byte[]> entry : attributes.entrySet()) {
-                txtRecordObj.put(entry.getKey(), new String(entry.getValue()));
+                String value = new String(entry.getValue());
+                txtRecordObj.put(entry.getKey(), value);
+                Log.d(TAG, "   TXT Record retrieved: " + entry.getKey() + " = " + value);
             }
             serviceData.put("txtRecord", txtRecordObj);
         }
@@ -228,6 +230,7 @@ public class NetworkDiscovery {
         return serviceData;
     }
 
+    // Callbacks interfaces
     public interface AdvertisingCallback {
         void onSuccess();
         void onError(String error);

package/ios/Sources/NetworkDiscoveryPlugin/NetworkDiscovery.swift

@@ -13,13 +13,22 @@ import Foundation
         port: Int,
         txtRecord: [String: String]?
     ) {
-        netService = NetService(domain: "local.", type: serviceType, name: serviceName, port: Int32(port))
+        // ✅ Normalizar service type (agregar punto final si no lo tiene)
+        let normalizedServiceType = serviceType.hasSuffix(".") ? serviceType : serviceType + "."
+        
+        print("📡 iOS: Starting advertising")
+        print("   Service name: \(serviceName)")
+        print("   Service type (normalized): \(normalizedServiceType)")
+        print("   Port: \(port)")
+        
+        netService = NetService(domain: "local.", type: normalizedServiceType, name: serviceName, port: Int32(port))
         
         // Configurar TXT record
         if let txtRecord = txtRecord, !txtRecord.isEmpty {
             var txtData: [String: Data] = [:]
             for (key, value) in txtRecord {
                 txtData[key] = value.data(using: .utf8)
+                print("   TXT Record: \(key) = \(value)")
             }
             let txtRecordData = NetService.data(fromTXTRecord: txtData)
             netService?.setTXTRecord(txtRecordData)
@@ -30,17 +39,26 @@ import Foundation
     }
     
     @objc public func stopAdvertising() {
+        print("⛔ iOS: Stopping advertising")
         netService?.stop()
         netService = nil
     }
     
     @objc public func startDiscovery(serviceType: String, domain: String = "local.") {
+        // ✅ Normalizar service type
+        let normalizedServiceType = serviceType.hasSuffix(".") ? serviceType : serviceType + "."
+        
+        print("🔍 iOS: Starting discovery")
+        print("   Service type (normalized): \(normalizedServiceType)")
+        print("   Domain: \(domain)")
+        
         netServiceBrowser = NetServiceBrowser()
         netServiceBrowser?.delegate = self
-        netServiceBrowser?.searchForServices(ofType: serviceType, inDomain: domain)
+        netServiceBrowser?.searchForServices(ofType: normalizedServiceType, inDomain: domain)
     }
     
     @objc public func stopDiscovery() {
+        print("⛔ iOS: Stopping discovery")
         netServiceBrowser?.stop()
         netServiceBrowser = nil
         discoveredServices.removeAll()
@@ -49,39 +67,60 @@ import Foundation
 
 // MARK: - NetServiceDelegate
 extension NetworkDiscovery: NetServiceDelegate {
+    public func netServiceWillPublish(_ sender: NetService) {
+        print("🔄 iOS: Service WILL publish: \(sender.name)")
+    }
+    
     public func netServiceDidPublish(_ sender: NetService) {
-        print("Service published: \(sender.name)")
+        print("✅ iOS: Service published successfully")
+        print("   Name: \(sender.name)")
+        print("   Type: \(sender.type)")
+        print("   Port: \(sender.port)")
         delegate?.advertisingDidStart()
     }
     
     public func netService(_ sender: NetService, didNotPublish errorDict: [String : NSNumber]) {
-        print("Service did not publish: \(errorDict)")
+        print("❌ iOS: Service did NOT publish")
+        print("   Error dict: \(errorDict)")
         let errorCode = errorDict[NetService.errorCode]?.intValue ?? -1
+        print("   Error code: \(errorCode)")
         delegate?.advertisingDidFail(error: "Failed to publish service. Error code: \(errorCode)")
     }
 }
 
 // MARK: - NetServiceBrowserDelegate
 extension NetworkDiscovery: NetServiceBrowserDelegate {
+    public func netServiceBrowserWillSearch(_ browser: NetServiceBrowser) {
+        print("🔄 iOS: Browser WILL search")
+    }
+    
     public func netServiceBrowserDidStopSearch(_ browser: NetServiceBrowser) {
-        print("Service discovery stopped")
+        print("⛔ iOS: Browser DID stop search")
     }
     
     public func netServiceBrowser(_ browser: NetServiceBrowser, didNotSearch errorDict: [String : NSNumber]) {
-        print("Service discovery failed: \(errorDict)")
+        print("❌ iOS: Browser did NOT search")
+        print("   Error dict: \(errorDict)")
         let errorCode = errorDict[NetService.errorCode]?.intValue ?? -1
+        print("   Error code: \(errorCode)")
         delegate?.discoveryDidFail(error: "Discovery failed. Error code: \(errorCode)")
     }
     
     public func netServiceBrowser(_ browser: NetServiceBrowser, didFind service: NetService, moreComing: Bool) {
-        print("Service found: \(service.name)")
+        print("✅ iOS: Service FOUND!")
+        print("   Name: \(service.name)")
+        print("   Type: \(service.type)")
+        print("   Domain: \(service.domain)")
+        print("   More coming: \(moreComing)")
+        
         discoveredServices.append(service)
         service.delegate = self
         service.resolve(withTimeout: 5.0)
     }
     
     public func netServiceBrowser(_ browser: NetServiceBrowser, didRemove service: NetService, moreComing: Bool) {
-        print("Service lost: \(service.name)")
+        print("⛔ iOS: Service LOST")
+        print("   Name: \(service.name)")
         
         let serviceData: [String: Any] = [
             "serviceName": service.name,
@@ -95,46 +134,33 @@ extension NetworkDiscovery: NetServiceBrowserDelegate {
         }
     }
     
+    public func netServiceWillResolve(_ sender: NetService) {
+        print("🔄 iOS: Service WILL resolve: \(sender.name)")
+    }
+    
     public func netServiceDidResolveAddress(_ sender: NetService) {
-        print("Service resolved: \(sender.name)")
-        
-        var addresses: [String] = []
-        
-        if let addressesData = sender.addresses {
-            for addressData in addressesData {
-                let address = addressData.withUnsafeBytes { (pointer: UnsafeRawBufferPointer) -> String? in
-                    guard let baseAddress = pointer.baseAddress else { return nil }
-                    let data = baseAddress.assumingMemoryBound(to: sockaddr.self)
-                    
-                    var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
-                    if getnameinfo(data, socklen_t(addressData.count), &hostname, socklen_t(hostname.count), nil, 0, NI_NUMERICHOST) == 0 {
-                        return String(cString: hostname)
-                    }
-                    return nil
-                }
-                
-                if let addr = address {
-                    addresses.append(addr)
-                }
-            }
-        }
+        print("✅ iOS: Service RESOLVED")
+        print("   Name: \(sender.name)")
+        print("   Host: \(sender.hostName ?? "nil")")
+        print("   Port: \(sender.port)")
         
+        // ✅ NO incluir addresses - Solo usar txtRecord
         var serviceData: [String: Any] = [
             "serviceName": sender.name,
             "serviceType": sender.type,
             "domain": sender.domain,
             "hostName": sender.hostName ?? "",
-            "port": sender.port,
-            "addresses": addresses
+            "port": sender.port
         ]
         
-        // Agregar TXT record
+        // ✅ SOLO agregar TXT record (aquí está tu IP correcta)
         if let txtData = sender.txtRecordData() {
             let txtRecord = NetService.dictionary(fromTXTRecord: txtData)
             var txtRecordDict: [String: String] = [:]
             for (key, value) in txtRecord {
                 if let strValue = String(data: value, encoding: .utf8) {
                     txtRecordDict[key] = strValue
+                    print("   TXT Record retrieved: \(key) = \(strValue)")
                 }
             }
             serviceData["txtRecord"] = txtRecordDict
@@ -144,7 +170,9 @@ extension NetworkDiscovery: NetServiceBrowserDelegate {
     }
     
     public func netService(_ sender: NetService, didNotResolve errorDict: [String : NSNumber]) {
-        print("Service did not resolve: \(errorDict)")
+        print("❌ iOS: Service did NOT resolve")
+        print("   Service: \(sender.name)")
+        print("   Error dict: \(errorDict)")
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cappitolian/network-discovery",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "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",