@cappitolian/network-discovery 0.0.9 → 0.0.11

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

@@ -1,116 +1,116 @@
-package com.cappitolian.plugins.networkdiscovery;
-
-import com.getcapacitor.JSObject;
-import com.getcapacitor.Plugin;
-import com.getcapacitor.PluginCall;
-import com.getcapacitor.PluginMethod;
-import com.getcapacitor.annotation.CapacitorPlugin;
-
-@CapacitorPlugin(name = "NetworkDiscovery")
-public class NetworkDiscoveryPlugin extends Plugin {
-    private NetworkDiscovery implementation;
-
-    @Override
-    public void load() {
-        implementation = new NetworkDiscovery(this, getContext());
-    }
-
-    @PluginMethod
-    public void startAdvertising(PluginCall call) {
-        String serviceName = call.getString("serviceName");
-        String serviceType = call.getString("serviceType");
-        Integer port = call.getInt("port");
-        JSObject txtRecord = call.getObject("txtRecord");
-
-        if (serviceName == null || serviceType == null || port == null) {
-            call.reject("Missing required parameters");
-            return;
-        }
-
-        implementation.startAdvertising(
-            serviceName,
-            serviceType,
-            port,
-            txtRecord,
-            new NetworkDiscovery.AdvertisingCallback() {
-                @Override
-                public void onSuccess() {
-                    JSObject ret = new JSObject();
-                    ret.put("success", true);
-                    call.resolve(ret);
-                }
-
-                @Override
-                public void onError(String error) {
-                    call.reject(error);
-                }
-            }
-        );
-    }
-
-    @PluginMethod
-    public void stopAdvertising(PluginCall call) {
-        implementation.stopAdvertising(new NetworkDiscovery.StopCallback() {
-            @Override
-            public void onSuccess() {
-                JSObject ret = new JSObject();
-                ret.put("success", true);
-                call.resolve(ret);
-            }
-
-            @Override
-            public void onError(String error) {
-                call.reject(error);
-            }
-        });
-    }
-
-    @PluginMethod
-    public void startDiscovery(PluginCall call) {
-        String serviceType = call.getString("serviceType");
-
-        if (serviceType == null) {
-            call.reject("Missing serviceType parameter");
-            return;
-        }
-
-        implementation.startDiscovery(serviceType, new NetworkDiscovery.DiscoveryCallback() {
-            @Override
-            public void onDiscoveryStarted() {
-                call.resolve();
-            }
-
-            @Override
-            public void onServiceFound(JSObject service) {
-                notifyListeners("serviceFound", service);
-            }
-
-            @Override
-            public void onServiceLost(JSObject service) {
-                notifyListeners("serviceLost", service);
-            }
-
-            @Override
-            public void onError(String error) {
-                call.reject(error);
-            }
-        });
-    }
-
-    @PluginMethod
-    public void stopDiscovery(PluginCall call) {
-        implementation.stopDiscovery(new NetworkDiscovery.StopCallback() {
-            @Override
-            public void onSuccess() {
-                JSObject ret = new JSObject();
-                ret.put("success", true);
-                call.resolve(ret);
-            }
-
-            @Override
-            public void onError(String error) {
-                call.reject(error);
-            }
-        });
-    }
+package com.cappitolian.plugins.networkdiscovery;
+
+import com.getcapacitor.JSObject;
+import com.getcapacitor.Plugin;
+import com.getcapacitor.PluginCall;
+import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.CapacitorPlugin;
+
+@CapacitorPlugin(name = "NetworkDiscovery")
+public class NetworkDiscoveryPlugin extends Plugin {
+    private NetworkDiscovery implementation;
+
+    @Override
+    public void load() {
+        implementation = new NetworkDiscovery(this, getContext());
+    }
+
+    @PluginMethod
+    public void startAdvertising(PluginCall call) {
+        String serviceName = call.getString("serviceName");
+        String serviceType = call.getString("serviceType");
+        Integer port = call.getInt("port");
+        JSObject txtRecord = call.getObject("txtRecord");
+
+        if (serviceName == null || serviceType == null || port == null) {
+            call.reject("Missing required parameters");
+            return;
+        }
+
+        implementation.startAdvertising(
+            serviceName,
+            serviceType,
+            port,
+            txtRecord,
+            new NetworkDiscovery.AdvertisingCallback() {
+                @Override
+                public void onSuccess() {
+                    JSObject ret = new JSObject();
+                    ret.put("success", true);
+                    call.resolve(ret);
+                }
+
+                @Override
+                public void onError(String error) {
+                    call.reject(error);
+                }
+            }
+        );
+    }
+
+    @PluginMethod
+    public void stopAdvertising(PluginCall call) {
+        implementation.stopAdvertising(new NetworkDiscovery.StopCallback() {
+            @Override
+            public void onSuccess() {
+                JSObject ret = new JSObject();
+                ret.put("success", true);
+                call.resolve(ret);
+            }
+
+            @Override
+            public void onError(String error) {
+                call.reject(error);
+            }
+        });
+    }
+
+    @PluginMethod
+    public void startDiscovery(PluginCall call) {
+        String serviceType = call.getString("serviceType");
+
+        if (serviceType == null) {
+            call.reject("Missing serviceType parameter");
+            return;
+        }
+
+        implementation.startDiscovery(serviceType, new NetworkDiscovery.DiscoveryCallback() {
+            @Override
+            public void onDiscoveryStarted() {
+                call.resolve();
+            }
+
+            @Override
+            public void onServiceFound(JSObject service) {
+                notifyListeners("serviceFound", service);
+            }
+
+            @Override
+            public void onServiceLost(JSObject service) {
+                notifyListeners("serviceLost", service);
+            }
+
+            @Override
+            public void onError(String error) {
+                call.reject(error);
+            }
+        });
+    }
+
+    @PluginMethod
+    public void stopDiscovery(PluginCall call) {
+        implementation.stopDiscovery(new NetworkDiscovery.StopCallback() {
+            @Override
+            public void onSuccess() {
+                JSObject ret = new JSObject();
+                ret.put("success", true);
+                call.resolve(ret);
+            }
+
+            @Override
+            public void onError(String error) {
+                call.reject(error);
+            }
+        });
+    }
 }

package/ios/Sources/NetworkDiscoveryPlugin/NetworkDiscovery.swift

@@ -13,22 +13,13 @@ import Foundation
         port: Int,
         txtRecord: [String: String]?
     ) {
-        // ✅ 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))
+        netService = NetService(domain: "local.", type: serviceType, 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)
@@ -39,26 +30,17 @@ 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: normalizedServiceType, inDomain: domain)
+        netServiceBrowser?.searchForServices(ofType: serviceType, inDomain: domain)
     }
     
     @objc public func stopDiscovery() {
-        print("⛔ iOS: Stopping discovery")
         netServiceBrowser?.stop()
         netServiceBrowser = nil
         discoveredServices.removeAll()
@@ -67,60 +49,39 @@ 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("✅ iOS: Service published successfully")
-        print("   Name: \(sender.name)")
-        print("   Type: \(sender.type)")
-        print("   Port: \(sender.port)")
+        print("Service published: \(sender.name)")
         delegate?.advertisingDidStart()
     }
     
     public func netService(_ sender: NetService, didNotPublish errorDict: [String : NSNumber]) {
-        print("❌ iOS: Service did NOT publish")
-        print("   Error dict: \(errorDict)")
+        print("Service did not publish: \(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("⛔ iOS: Browser DID stop search")
+        print("Service discovery stopped")
     }
     
     public func netServiceBrowser(_ browser: NetServiceBrowser, didNotSearch errorDict: [String : NSNumber]) {
-        print("❌ iOS: Browser did NOT search")
-        print("   Error dict: \(errorDict)")
+        print("Service discovery failed: \(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("✅ iOS: Service FOUND!")
-        print("   Name: \(service.name)")
-        print("   Type: \(service.type)")
-        print("   Domain: \(service.domain)")
-        print("   More coming: \(moreComing)")
-        
+        print("Service found: \(service.name)")
         discoveredServices.append(service)
         service.delegate = self
         service.resolve(withTimeout: 5.0)
     }
     
     public func netServiceBrowser(_ browser: NetServiceBrowser, didRemove service: NetService, moreComing: Bool) {
-        print("⛔ iOS: Service LOST")
-        print("   Name: \(service.name)")
+        print("Service lost: \(service.name)")
         
         let serviceData: [String: Any] = [
             "serviceName": service.name,
@@ -134,33 +95,46 @@ extension NetworkDiscovery: NetServiceBrowserDelegate {
         }
     }
     
-    public func netServiceWillResolve(_ sender: NetService) {
-        print("🔄 iOS: Service WILL resolve: \(sender.name)")
-    }
-    
     public func netServiceDidResolveAddress(_ sender: NetService) {
-        print("✅ iOS: Service RESOLVED")
-        print("   Name: \(sender.name)")
-        print("   Host: \(sender.hostName ?? "nil")")
-        print("   Port: \(sender.port)")
+        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)
+                }
+            }
+        }
         
-        // ✅ 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
+            "port": sender.port,
+            "addresses": addresses
         ]
         
-        // ✅ SOLO agregar TXT record (aquí está tu IP correcta)
+        // Agregar TXT record
         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
@@ -170,9 +144,7 @@ extension NetworkDiscovery: NetServiceBrowserDelegate {
     }
     
     public func netService(_ sender: NetService, didNotResolve errorDict: [String : NSNumber]) {
-        print("❌ iOS: Service did NOT resolve")
-        print("   Service: \(sender.name)")
-        print("   Error dict: \(errorDict)")
+        print("Service did not resolve: \(errorDict)")
     }
 }
 

package/ios/Sources/NetworkDiscoveryPlugin/NetworkDiscoveryPlugin.swift

@@ -2,32 +2,15 @@ import Foundation
 import Capacitor
 
 @objc(NetworkDiscoveryPlugin)
-public class NetworkDiscoveryPlugin: CAPPlugin, CAPBridgedPlugin, NetworkDiscoveryDelegate {
-    
-    // MARK: - CAPBridgedPlugin Properties
-    public let identifier = "NetworkDiscoveryPlugin"
-    public let jsName = "NetworkDiscovery"
-    public let pluginMethods: [CAPPluginMethod] = [
-        CAPPluginMethod(name: "startAdvertising", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "stopAdvertising", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "startDiscovery", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "stopDiscovery", returnType: CAPPluginReturnPromise)
-    ]
-    
-    // MARK: - Properties
+public class NetworkDiscoveryPlugin: CAPPlugin, NetworkDiscoveryDelegate {
     private var implementation: NetworkDiscovery?
     
-    // MARK: - Lifecycle
-    public override func load() {
-        print("✅ NetworkDiscoveryPlugin: Plugin loaded")
+    override public func load() {
         implementation = NetworkDiscovery()
         implementation?.delegate = self
     }
     
-    // MARK: - Plugin Methods
     @objc func startAdvertising(_ call: CAPPluginCall) {
-        print("📞 NetworkDiscoveryPlugin: startAdvertising() called")
-        
         guard let serviceName = call.getString("serviceName"),
               let serviceType = call.getString("serviceType"),
               let port = call.getInt("port") else {
@@ -37,8 +20,6 @@ public class NetworkDiscoveryPlugin: CAPPlugin, CAPBridgedPlugin, NetworkDiscove
         
         let txtRecord = call.getObject("txtRecord") as? [String: String]
         
-        print("📡 NetworkDiscoveryPlugin: Starting advertising - \(serviceName)")
-        
         implementation?.startAdvertising(
             serviceName: serviceName,
             serviceType: serviceType,
@@ -50,14 +31,11 @@ public class NetworkDiscoveryPlugin: CAPPlugin, CAPBridgedPlugin, NetworkDiscove
     }
     
     @objc func stopAdvertising(_ call: CAPPluginCall) {
-        print("📞 NetworkDiscoveryPlugin: stopAdvertising() called")
         implementation?.stopAdvertising()
         call.resolve(["success": true])
     }
     
     @objc func startDiscovery(_ call: CAPPluginCall) {
-        print("📞 NetworkDiscoveryPlugin: startDiscovery() called")
-        
         guard let serviceType = call.getString("serviceType") else {
             call.reject("Missing serviceType parameter")
             return
@@ -65,40 +43,33 @@ public class NetworkDiscoveryPlugin: CAPPlugin, CAPBridgedPlugin, NetworkDiscove
         
         let domain = call.getString("domain") ?? "local."
         
-        print("🔍 NetworkDiscoveryPlugin: Starting discovery for \(serviceType)")
-        
         implementation?.startDiscovery(serviceType: serviceType, domain: domain)
         call.resolve()
     }
     
     @objc func stopDiscovery(_ call: CAPPluginCall) {
-        print("📞 NetworkDiscoveryPlugin: stopDiscovery() called")
         implementation?.stopDiscovery()
         call.resolve(["success": true])
     }
     
     // MARK: - NetworkDiscoveryDelegate
     public func advertisingDidStart() {
-        print("✅ NetworkDiscoveryPlugin: Advertising started successfully")
+        print("Advertising started successfully")
     }
     
     public func advertisingDidFail(error: String) {
-        print("❌ NetworkDiscoveryPlugin: Advertising failed - \(error)")
+        print("Advertising failed: \(error)")
     }
     
     public func serviceFound(serviceData: [String : Any]) {
-        print("📨 NetworkDiscoveryPlugin: Service found, notifying listeners")
-        print("   Service data: \(serviceData)")
         notifyListeners("serviceFound", data: serviceData)
     }
     
     public func serviceLost(serviceData: [String : Any]) {
-        print("📨 NetworkDiscoveryPlugin: Service lost, notifying listeners")
-        print("   Service data: \(serviceData)")
         notifyListeners("serviceLost", data: serviceData)
     }
     
     public func discoveryDidFail(error: String) {
-        print("❌ NetworkDiscoveryPlugin: Discovery failed - \(error)")
+        print("Discovery failed: \(error)")
     }
 }