@cappitolian/network-discovery 0.0.12 → 0.0.14

package/ios/Sources/NetworkDiscoveryPlugin/NetworkDiscovery.swift

@@ -1,158 +1,171 @@
 import Foundation
+import Network
 
 @objc public class NetworkDiscovery: NSObject {
-    private var netService: NetService?
-    private var netServiceBrowser: NetServiceBrowser?
-    private var discoveredServices: [NetService] = []
-    
-    weak var delegate: NetworkDiscoveryDelegate?
-    
-    @objc public func startAdvertising(
-        serviceName: String,
-        serviceType: String,
-        port: Int,
-        txtRecord: [String: String]?
-    ) {
-        netService = NetService(domain: "local.", type: serviceType, name: serviceName, port: Int32(port))
+    private var listener: NWListener?
+    private var browser: NWBrowser?
+    private var activeConnections: [NWConnection] = []
+
+    @objc public func startPublishing(name: String, type: String, port: Int, metadata: [String: String]) throws {
+        stopServer()
+        let nwPort = NWEndpoint.Port(integerLiteral: UInt16(port))
+        let cleanType = type.contains("_") ? type : "_\(type)._tcp"
         
-        // Configurar TXT record
-        if let txtRecord = txtRecord, !txtRecord.isEmpty {
-            var txtData: [String: Data] = [:]
-            for (key, value) in txtRecord {
-                txtData[key] = value.data(using: .utf8)
-            }
-            let txtRecordData = NetService.data(fromTXTRecord: txtData)
-            netService?.setTXTRecord(txtRecordData)
+        let ipForName = metadata["ip"] ?? ""
+        let displayName = ipForName.isEmpty ? name : "\(name)-\(ipForName)"
+        
+        let mappedMetadata = metadata.mapValues { $0.data(using: .utf8)! }
+        let txtData = NetService.data(fromTXTRecord: mappedMetadata)
+        
+        // --- CONFIGURACIÓN MEJORADA PARA COMPATIBILIDAD CROSS-PLATFORM ---
+        let params = NWParameters.tcp
+        params.includePeerToPeer = true
+        params.allowLocalEndpointReuse = true // Permite reutilización del puerto
+        params.acceptLocalOnly = false // Acepta conexiones de toda la red local
+        
+        // Configuración adicional para que Android pueda resolver
+        if let tcpOptions = params.defaultProtocolStack.internetProtocol as? NWProtocolIP.Options {
+            tcpOptions.version = .any // IPv4 e IPv6
         }
         
-        netService?.delegate = self
-        netService?.publish()
-    }
-    
-    @objc public func stopAdvertising() {
-        netService?.stop()
-        netService = nil
-    }
-    
-    @objc public func startDiscovery(serviceType: String, domain: String = "local.") {
-        netServiceBrowser = NetServiceBrowser()
-        netServiceBrowser?.delegate = self
-        netServiceBrowser?.searchForServices(ofType: serviceType, inDomain: domain)
-    }
-    
-    @objc public func stopDiscovery() {
-        netServiceBrowser?.stop()
-        netServiceBrowser = nil
-        discoveredServices.removeAll()
-    }
-}
-
-// MARK: - NetServiceDelegate
-extension NetworkDiscovery: NetServiceDelegate {
-    public func netServiceDidPublish(_ sender: NetService) {
-        print("Service published: \(sender.name)")
-        delegate?.advertisingDidStart()
-    }
-    
-    public func netService(_ sender: NetService, didNotPublish errorDict: [String : NSNumber]) {
-        print("Service did not publish: \(errorDict)")
-        let errorCode = errorDict[NetService.errorCode]?.intValue ?? -1
-        delegate?.advertisingDidFail(error: "Failed to publish service. Error code: \(errorCode)")
-    }
-}
-
-// MARK: - NetServiceBrowserDelegate
-extension NetworkDiscovery: NetServiceBrowserDelegate {
-    public func netServiceBrowserDidStopSearch(_ browser: NetServiceBrowser) {
-        print("Service discovery stopped")
-    }
-    
-    public func netServiceBrowser(_ browser: NetServiceBrowser, didNotSearch errorDict: [String : NSNumber]) {
-        print("Service discovery failed: \(errorDict)")
-        let errorCode = errorDict[NetService.errorCode]?.intValue ?? -1
-        delegate?.discoveryDidFail(error: "Discovery failed. Error code: \(errorCode)")
-    }
-    
-    public func netServiceBrowser(_ browser: NetServiceBrowser, didFind service: NetService, moreComing: Bool) {
-        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("Service lost: \(service.name)")
+        let service = NWListener.Service(name: displayName, type: cleanType, domain: nil, txtRecord: txtData)
+        
+        listener = try NWListener(using: params, on: nwPort)
+        listener?.service = service
+        
+        // --- HANDLER CRÍTICO: Aceptar conexiones entrantes ---
+        listener?.newConnectionHandler = { [weak self] connection in
+            print("NSD_LOG: iOS recibió conexión de: \(connection.endpoint)")
+            
+            // Iniciar la conexión para que Android pueda resolver el servicio
+            connection.start(queue: .main)
+            self?.activeConnections.append(connection)
+            
+            // Configurar handlers básicos
+            connection.stateUpdateHandler = { state in
+                if case .ready = state {
+                    print("NSD_LOG: Conexión establecida con Android")
+                }
+            }
+            
+            // Limpieza automática cuando la conexión termine
+            connection.receiveMessage { _, _, _, error in
+                if error != nil {
+                    connection.cancel()
+                    self?.activeConnections.removeAll { $0 === connection }
+                }
+            }
+        }
         
-        let serviceData: [String: Any] = [
-            "serviceName": service.name,
-            "serviceType": service.type
-        ]
+        listener?.stateUpdateHandler = { state in
+            switch state {
+            case .ready:
+                if let port = self.listener?.port {
+                    print("NSD_LOG: ✅ iOS Servidor LISTO en puerto \(port): \(displayName)")
+                }
+            case .failed(let error):
+                print("NSD_LOG: ❌ iOS Servidor falló: \(error)")
+            case .waiting(let error):
+                print("NSD_LOG: ⏳ iOS Servidor esperando: \(error)")
+            default:
+                break
+            }
+        }
         
-        delegate?.serviceLost(serviceData: serviceData)
+        listener?.start(queue: .main)
         
-        if let index = discoveredServices.firstIndex(of: service) {
-            discoveredServices.remove(at: index)
+        // Pequeño delay para asegurar que el servicio esté completamente publicado
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            print("NSD_LOG: Servicio iOS completamente inicializado")
         }
     }
-    
-    public func netServiceDidResolveAddress(_ sender: NetService) {
-        print("Service resolved: \(sender.name)")
+
+    @objc public func findService(name: String, type: String, timeout: TimeInterval, completion: @escaping ([String: Any]?) -> Void) {
+        stopDiscovery()
+        let cleanType = type.contains("_") ? type : "_\(type)._tcp"
         
-        var addresses: [String] = []
+        // Configuración mejorada para el browser
+        let params = NWParameters()
+        params.includePeerToPeer = true
         
-        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)
+        let browser = NWBrowser(for: .bonjour(type: cleanType, domain: nil), using: params)
+        self.browser = browser
+        var finished = false
+
+        browser.browseResultsChangedHandler = { [weak self] results, _ in
+            for result in results {
+                if case let .service(foundName, _, _, _) = result.endpoint, foundName.contains(name) {
+                    if !finished {
+                        finished = true
+                        
+                        print("NSD_LOG: iOS Cliente encontró servicio: \(foundName)")
+                        
+                        var meta: [String: String] = [:]
+                        if case let .bonjour(txt) = result.metadata {
+                            for (k, v) in txt.dictionary {
+                                if let dataValue = v as? Data {
+                                    meta[k] = String(data: dataValue, encoding: .utf8) ?? ""
+                                }
+                            }
+                        }
+                        
+                        // --- LÓGICA DE EXTRACCIÓN ROBUSTA ---
+                        var ip = meta["ip"] ?? ""
+                        
+                        if (ip.isEmpty || ip == "0.0.0.0") && foundName.contains("-") {
+                            ip = foundName.components(separatedBy: "-").last ?? ""
+                        }
+                        
+                        if ip.isEmpty || ip == "0.0.0.0" {
+                            if case let .hostPort(host, _) = result.endpoint {
+                                ip = "\(host)".components(separatedBy: "%").first ?? "\(host)"
+                            }
+                        }
+
+                        print("NSD_LOG: IP extraída: \(ip)")
+                        
+                        self?.stopDiscovery()
+                        completion(["ip": ip, "port": 8081, "metadata": meta])
                     }
-                    return nil
-                }
-                
-                if let addr = address {
-                    addresses.append(addr)
+                    return
                 }
             }
         }
         
-        var serviceData: [String: Any] = [
-            "serviceName": sender.name,
-            "serviceType": sender.type,
-            "domain": sender.domain,
-            "hostName": sender.hostName ?? "",
-            "port": sender.port,
-            "addresses": addresses
-        ]
+        browser.stateUpdateHandler = { state in
+            switch state {
+            case .ready:
+                print("NSD_LOG: iOS Browser listo para buscar")
+            case .failed(let error):
+                print("NSD_LOG: iOS Browser falló: \(error)")
+            default:
+                break
+            }
+        }
         
-        // 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
-                }
+        browser.start(queue: .main)
+        DispatchQueue.main.asyncAfter(deadline: .now() + timeout) { [weak self] in
+            if !finished {
+                finished = true
+                print("NSD_LOG: iOS Búsqueda timeout")
+                self?.stopDiscovery()
+                completion(nil)
             }
-            serviceData["txtRecord"] = txtRecordDict
         }
+    }
+
+    @objc public func stopServer() {
+        // Limpiar todas las conexiones activas
+        activeConnections.forEach { $0.cancel() }
+        activeConnections.removeAll()
         
-        delegate?.serviceFound(serviceData: serviceData)
+        listener?.cancel()
+        listener = nil
+        print("NSD_LOG: iOS Servidor detenido")
     }
     
-    public func netService(_ sender: NetService, didNotResolve errorDict: [String : NSNumber]) {
-        print("Service did not resolve: \(errorDict)")
+    @objc public func stopDiscovery() {
+        browser?.cancel()
+        browser = nil
     }
-}
-
-// MARK: - Delegate Protocol
-@objc public protocol NetworkDiscoveryDelegate: AnyObject {
-    func advertisingDidStart()
-    func advertisingDidFail(error: String)
-    func serviceFound(serviceData: [String: Any])
-    func serviceLost(serviceData: [String: Any])
-    func discoveryDidFail(error: String)
 }

package/ios/Sources/NetworkDiscoveryPlugin/NetworkDiscoveryPlugin.swift

@@ -1,104 +1,43 @@
-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
-    private var implementation: NetworkDiscovery?
-    
-    // MARK: - Lifecycle
-    public override func load() {
-        print("✅ NetworkDiscoveryPlugin: Plugin loaded")
-        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 {
-            call.reject("Missing required parameters")
-            return
-        }
-        
-        let txtRecord = call.getObject("txtRecord") as? [String: String]
-        
-        print("📡 NetworkDiscoveryPlugin: Starting advertising - \(serviceName)")
-        
-        implementation?.startAdvertising(
-            serviceName: serviceName,
-            serviceType: serviceType,
-            port: port,
-            txtRecord: txtRecord
-        )
-        
-        call.resolve(["success": true])
-    }
-    
-    @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
-        }
-        
-        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")
-    }
-    
-    public func advertisingDidFail(error: String) {
-        print("❌ NetworkDiscoveryPlugin: 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)")
-    }
+import Foundation
+import Capacitor
+
+@objc(NetworkDiscoveryPlugin)
+public class NetworkDiscoveryPlugin: CAPPlugin, CAPBridgedPlugin {
+    public let identifier = "NetworkDiscoveryPlugin"
+    public let jsName = "NetworkDiscovery"
+    public let pluginMethods: [CAPPluginMethod] = [
+        CAPPluginMethod(name: "startServer", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "stopServer", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "findServer", returnType: CAPPluginReturnPromise)
+    ]
+
+    private let implementation = NetworkDiscovery()
+
+    @objc func startServer(_ call: CAPPluginCall) {
+        guard let name = call.getString("serviceName"),
+              let type = call.getString("serviceType"),
+              let port = call.getInt("port") else { return call.reject("Faltan parámetros") }
+        
+        let metadata = call.getObject("metadata") as? [String: String] ?? [:]
+        do {
+            try implementation.startPublishing(name: name, type: type, port: port, metadata: metadata)
+            call.resolve()
+        } catch { call.reject(error.localizedDescription) }
+    }
+
+    @objc func stopServer(_ call: CAPPluginCall) {
+        implementation.stopServer()
+        call.resolve()
+    }
+
+    @objc func findServer(_ call: CAPPluginCall) {
+        guard let name = call.getString("serviceName"),
+              let type = call.getString("serviceType") else { return call.reject("Faltan parámetros") }
+        
+        let timeout = Double(call.getInt("timeout") ?? 10000) / 1000.0
+        implementation.findService(name: name, type: type, timeout: timeout) { result in
+            if let data = result { call.resolve(data) } 
+            else { call.reject("TIMEOUT_ERROR") }
+        }
+    }
 }

package/package.json

@@ -1,86 +1,86 @@
-{
-  "name": "@cappitolian/network-discovery",
-  "version": "0.0.12",
-  "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",
-  "types": "dist/esm/index.d.ts",
-  "unpkg": "dist/plugin.js",
-  "files": [
-    "android/src/main/",
-    "android/build.gradle",
-    "dist/",
-    "ios/Sources",
-    "ios/Tests",
-    "Package.swift",
-    "CappitolianNetworkDiscovery.podspec"
-  ],
-  "author": "Cappitolian",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/alessandrycruz1987/network-discovery.git"
-  },
-  "bugs": {
-    "url": "https://github.com/alessandrycruz1987/network-discovery.git/issues"
-  },
-  "keywords": [
-    "capacitor",
-    "plugin",
-    "native",
-    "network",
-    "discovery",
-    "mdns",
-    "bonjour",
-    "nsd",
-    "zeroconf"
-  ],
-  "scripts": {
-    "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "xcodebuild -scheme CappitolianNetworkDiscovery -destination generic/platform=iOS",
-    "verify:android": "cd android && ./gradlew clean build test && cd ..",
-    "verify:web": "npm run build",
-    "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
-    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
-    "eslint": "eslint . --ext ts",
-    "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
-    "swiftlint": "node-swiftlint",
-    "docgen": "docgen --api NetworkDiscoveryPlugin --output-readme README.md --output-json dist/docs.json",
-    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
-    "clean": "rimraf ./dist",
-    "watch": "tsc --watch",
-    "prepublishOnly": "npm run build"
-  },
-  "devDependencies": {
-    "@capacitor/android": "^7.4.5",
-    "@capacitor/core": "^7.4.5",
-    "@capacitor/docgen": "^0.3.1",
-    "@capacitor/ios": "^7.4.5",
-    "@ionic/eslint-config": "^0.4.0",
-    "@ionic/prettier-config": "^4.0.0",
-    "@ionic/swiftlint-config": "^2.0.0",
-    "eslint": "^8.57.1",
-    "prettier": "^3.6.2",
-    "prettier-plugin-java": "^2.7.7",
-    "rimraf": "^6.1.0",
-    "rollup": "^4.53.2",
-    "swiftlint": "^2.0.0",
-    "typescript": "^5.9.3"
-  },
-  "peerDependencies": {
-    "@capacitor/core": ">=7.0.0"
-  },
-  "prettier": "@ionic/prettier-config",
-  "swiftlint": "@ionic/swiftlint-config",
-  "eslintConfig": {
-    "extends": "@ionic/eslint-config/recommended"
-  },
-  "capacitor": {
-    "ios": {
-      "src": "ios"
-    },
-    "android": {
-      "src": "android"
-    }
-  }
+{
+  "name": "@cappitolian/network-discovery",
+  "version": "0.0.14",
+  "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",
+  "types": "dist/esm/index.d.ts",
+  "unpkg": "dist/plugin.js",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Sources",
+    "ios/Tests",
+    "Package.swift",
+    "CappitolianNetworkDiscovery.podspec"
+  ],
+  "author": "Cappitolian",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/alessandrycruz1987/network-discovery.git"
+  },
+  "bugs": {
+    "url": "https://github.com/alessandrycruz1987/network-discovery.git/issues"
+  },
+  "keywords": [
+    "capacitor",
+    "plugin",
+    "native",
+    "network",
+    "discovery",
+    "mdns",
+    "bonjour",
+    "nsd",
+    "zeroconf"
+  ],
+  "scripts": {
+    "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
+    "verify:ios": "xcodebuild -scheme CappitolianNetworkDiscovery -destination generic/platform=iOS",
+    "verify:android": "cd android && ./gradlew clean build test && cd ..",
+    "verify:web": "npm run build",
+    "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
+    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
+    "eslint": "eslint . --ext ts",
+    "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
+    "swiftlint": "node-swiftlint",
+    "docgen": "docgen --api NetworkDiscoveryPlugin --output-readme README.md --output-json dist/docs.json",
+    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
+    "clean": "rimraf ./dist",
+    "watch": "tsc --watch",
+    "prepublishOnly": "npm run build"
+  },
+  "devDependencies": {
+    "@capacitor/android": "^7.4.5",
+    "@capacitor/core": "^7.4.5",
+    "@capacitor/docgen": "^0.3.1",
+    "@capacitor/ios": "^7.4.5",
+    "@ionic/eslint-config": "^0.4.0",
+    "@ionic/prettier-config": "^4.0.0",
+    "@ionic/swiftlint-config": "^2.0.0",
+    "eslint": "^8.57.1",
+    "prettier": "^3.6.2",
+    "prettier-plugin-java": "^2.7.7",
+    "rimraf": "^6.1.0",
+    "rollup": "^4.53.2",
+    "swiftlint": "^2.0.0",
+    "typescript": "^5.9.3"
+  },
+  "peerDependencies": {
+    "@capacitor/core": ">=7.0.0"
+  },
+  "prettier": "@ionic/prettier-config",
+  "swiftlint": "@ionic/swiftlint-config",
+  "eslintConfig": {
+    "extends": "@ionic/eslint-config/recommended"
+  },
+  "capacitor": {
+    "ios": {
+      "src": "ios"
+    },
+    "android": {
+      "src": "android"
+    }
+  }
 }