@dawidzawada/bonjour-zeroconf 1.2.0 → 2.0.0

package/README.md

@@ -17,6 +17,7 @@ Discover devices and services on your local network using native Bonjour (iOS) a
 - 📡 **Cross-platform** – iOS (Bonjour) and Android (NSD)
 - 📱 **Managing iOS permissions** - no need for extra libraries or custom code, just use `requestLocalNetworkPermission` or `useLocalNetworkPermission` before scanning!
 - 🔄 **Real-time updates** – listen to scan results, state changes, and errors
+- 🔭 **Multiple scanners** – run several independent scanners simultaneously for different service types
 - 🧩 **Expo compatible** - (config plugin coming soon)
 
 ## 📦 Installation
@@ -125,10 +126,33 @@ function App() {
 
 ---
 
+## 🔭 Multiple Scanners
+
+For convenience, the library exports a `Scanner` singleton that covers most use cases. Each scanner can only scan one service type at a time, so if you need to discover multiple service types simultaneously, use the `BonjourScanner` class to create as many independent scanners as you need.
+
+```tsx
+import { BonjourScanner } from '@dawidzawada/bonjour-zeroconf';
+
+const printerScanner = new BonjourScanner({ id: 'printers' });
+const httpScanner = new BonjourScanner({ id: 'http' });
+
+// Both run in parallel, scanning different service types
+printerScanner.scan('_printer._tcp', 'local');
+httpScanner.scan('_http._tcp', 'local');
+```
+
+The optional `id` is appended to log messages, making it easy to distinguish between scanners during debugging.
+
+---
+
 ## 📖 API Reference
 
 ### **Scanner**
 
+A pre-created `BonjourScanner` singleton exported for convenience. Use it when you only need to scan one service type at a time.
+
+### **BonjourScanner**
+
 #### `scan(type: string, domain: string, options?: ScanOptions)`
 
 Start scanning for services.
@@ -273,6 +297,7 @@ interface ScanOptions {
 enum BonjourFail {
   DISCOVERY_FAILED = 'DISCOVERY_FAILED',
   RESOLVE_FAILED = 'RESOLVE_FAILED',
+  EXTRACTION_FAILED = 'EXTRACTION_FAILED',
 }
 ```
 

package/android/src/main/java/com/margelo/nitro/dawidzawada/bonjourzeroconf/BonjourZeroconf+AddressResolver.kt

@@ -2,12 +2,14 @@ package com.margelo.nitro.dawidzawada.bonjourzeroconf
 
 import android.net.nsd.NsdManager
 import android.net.nsd.NsdServiceInfo
-import android.util.Log
 import androidx.annotation.RequiresApi
-import com.margelo.nitro.dawidzawada.bonjourzeroconf.BonjourZeroconf.Companion.TAG
+import com.margelo.nitro.dawidzawada.bonjourzeroconf.BonjourZeroconf.Companion.legacyResolveMutex
+import com.margelo.nitro.dawidzawada.bonjourzeroconf.BonjourZeroconf.Companion.loggy
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withTimeoutOrNull
+import java.net.Inet6Address
+import java.net.NetworkInterface
 import java.util.concurrent.Executors
 
 suspend fun BonjourZeroconf.resolveService(service: NsdServiceInfo, serviceKey: String, timeout: Long) {
@@ -40,19 +42,19 @@ suspend fun BonjourZeroconf.resolveServiceNew(service: NsdServiceInfo, serviceKe
             try {
               manager.unregisterServiceInfoCallback(this)
             } catch (e: Exception) {
-              Log.e(TAG, "Error unregistering", e)
+              loggy.e("Error unregistering", id, e)
             }
           }
 
           override fun onServiceInfoCallbackRegistrationFailed(errorCode: Int) {
-            Log.e(TAG, "Registration failed: ${service.serviceName}, error: $errorCode")
+            loggy.e("Registration failed: ${service.serviceName}, error: $errorCode", id)
             notifyScanFailListeners(BonjourFail.RESOLVE_FAILED)
             unregisterCallback()
             continuation.resume(null) {}
           }
 
           override fun onServiceUpdated(serviceInfo: NsdServiceInfo) {
-            Log.d(TAG, "Service updated: ${serviceInfo.serviceName}")
+            loggy.d("Service updated: ${serviceInfo.serviceName}", id)
             unregisterCallback()
 
             if (!_isScanning) {
@@ -64,11 +66,11 @@ suspend fun BonjourZeroconf.resolveServiceNew(service: NsdServiceInfo, serviceKe
           }
 
           override fun onServiceLost() {
-            Log.d(TAG, "Service lost during resolution: ${service.serviceName}")
+            loggy.d("Service lost during resolution: ${service.serviceName}", id)
           }
 
           override fun onServiceInfoCallbackUnregistered() {
-            Log.d(TAG, "Callback unregistered: ${service.serviceName}")
+            loggy.d("Callback unregistered: ${service.serviceName}", id)
             executor.shutdown()
           }
         }
@@ -80,13 +82,13 @@ suspend fun BonjourZeroconf.resolveServiceNew(service: NsdServiceInfo, serviceKe
             try {
               manager.unregisterServiceInfoCallback(callback)
             } catch (e: Exception) {
-              Log.e(TAG, "Error unregistering on cancellation", e)
+              loggy.e("Error unregistering on cancellation", id, e)
               executor.shutdown()
             }
           }
         } catch (e: Exception) {
           notifyScanFailListeners(BonjourFail.RESOLVE_FAILED)
-          Log.e(TAG, "Exception registering callback", e)
+          loggy.e("Exception registering callback", id, e)
           executor.shutdown()
           continuation.resume(null) {}
         }
@@ -98,11 +100,11 @@ suspend fun BonjourZeroconf.resolveServiceNew(service: NsdServiceInfo, serviceKe
         serviceCache[serviceKey] = scanResult
         notifyScanResultsListeners()
       }
-    } ?: Log.w(TAG, "Failed to resolve service: $serviceKey")
+    } ?: loggy.w("Failed to resolve service: $serviceKey", id)
 
   } catch (e: Exception) {
     notifyScanFailListeners(BonjourFail.RESOLVE_FAILED)
-    Log.e(TAG, "Error during service resolution", e)
+    loggy.e("Error during service resolution", id, e)
   }
 }
 
@@ -114,14 +116,14 @@ suspend fun BonjourZeroconf.resolveServiceLegacy(service: NsdServiceInfo, servic
         suspendCancellableCoroutine { continuation ->
           val resolveListener = object : NsdManager.ResolveListener {
             override fun onResolveFailed(serviceInfo: NsdServiceInfo, errorCode: Int) {
-              Log.e(TAG, "Resolve failed: ${serviceInfo.serviceName}, error: $errorCode")
+              loggy.e("Resolve failed: ${serviceInfo.serviceName}, error: $errorCode", id)
 
               notifyScanFailListeners(BonjourFail.RESOLVE_FAILED)
               continuation.resume(null) {}
             }
 
             override fun onServiceResolved(serviceInfo: NsdServiceInfo) {
-              Log.d(TAG, "Service resolved: ${serviceInfo.serviceName}")
+              loggy.d("Service resolved: ${serviceInfo.serviceName}", id)
 
               if (!_isScanning) {
                 continuation.resume(null) {}
@@ -142,7 +144,7 @@ suspend fun BonjourZeroconf.resolveServiceLegacy(service: NsdServiceInfo, servic
             manager.resolveService(service, resolveListener)
           } catch (e: Exception) {
             notifyScanFailListeners(BonjourFail.RESOLVE_FAILED)
-            Log.e(TAG, "Exception resolving service", e)
+            loggy.e("Exception resolving service", id, e)
             continuation.resume(null) {}
           }
         }
@@ -154,10 +156,10 @@ suspend fun BonjourZeroconf.resolveServiceLegacy(service: NsdServiceInfo, servic
         serviceCache[serviceKey] = scanResult
         notifyScanResultsListeners()
       }
-    } ?: Log.w(TAG, "Failed to resolve service: $serviceKey")
+    } ?: loggy.w("Failed to resolve service: $serviceKey", id)
 
   } catch (e: Exception) {
-    Log.e(TAG, "Error during service resolution", e)
+    loggy.e("Error during service resolution", id, e)
   }
 }
 
@@ -168,7 +170,7 @@ private fun BonjourZeroconf.extractScanResult(serviceInfo: NsdServiceInfo): Scan
 
     val (ipv4, ipv6) = when {
       host.address.size == 4 -> host.hostAddress to null
-      host.address.size == 16 -> null to formatIPv6Address(host.address)
+      host.address.size == 16 -> null to formatIPv6Address(host.address, host as? Inet6Address)
       else -> null to null
     }
 
@@ -181,16 +183,26 @@ private fun BonjourZeroconf.extractScanResult(serviceInfo: NsdServiceInfo): Scan
     )
   } catch (e: Exception) {
     notifyScanFailListeners(BonjourFail.EXTRACTION_FAILED)
-    Log.e(TAG, "Failed to extract scan result", e)
+    loggy.e("Failed to extract scan result", id, e)
     null
   }
 }
 
-private fun formatIPv6Address(bytes: ByteArray): String {
+private fun formatIPv6Address(bytes: ByteArray, inet6Address: Inet6Address? = null): String {
   require(bytes.size == 16) { "IPv6 address must be 16 bytes" }
 
-  return (0 until 16 step 2).joinToString(":") { i ->
+  val formatted = (0 until 16 step 2).joinToString(":") { i ->
     val segment = ((bytes[i].toInt() and 0xFF) shl 8) or (bytes[i + 1].toInt() and 0xFF)
     segment.toString(16)
   }
+
+  if (formatted.startsWith("fe80:") && inet6Address != null) {
+    val interfaceName = inet6Address.scopedInterface?.name
+      ?: NetworkInterface.getByIndex(inet6Address.scopeId)?.name
+    if (interfaceName != null) {
+      return "$formatted%$interfaceName"
+    }
+  }
+
+  return formatted
 }

package/android/src/main/java/com/margelo/nitro/dawidzawada/bonjourzeroconf/BonjourZeroconf+Listeners.kt

@@ -1,7 +1,6 @@
 package com.margelo.nitro.dawidzawada.bonjourzeroconf
 
-import android.util.Log
-import com.margelo.nitro.dawidzawada.bonjourzeroconf.BonjourZeroconf.Companion.TAG
+import com.margelo.nitro.dawidzawada.bonjourzeroconf.BonjourZeroconf.Companion.loggy
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -12,7 +11,7 @@ fun BonjourZeroconf.notifyScanResultsListeners() {
       try {
         listener(results)
       } catch (e: Exception) {
-        Log.e(TAG, "Error notifying scan results listener", e)
+        loggy.e("Error notifying scan results listener", id, e)
       }
     }
   }
@@ -25,7 +24,7 @@ fun BonjourZeroconf.updateScanningState(newState: Boolean) {
       try {
         listener(newState)
       } catch (e: Exception) {
-        Log.e(TAG, "Error notifying scan state listener", e)
+        loggy.e("Error notifying scan state listener", id, e)
       }
     }
   }
@@ -38,7 +37,7 @@ fun BonjourZeroconf.notifyScanFailListeners(fail: BonjourFail) {
       try {
         listener(fail)
       } catch (e: Exception) {
-        Log.e(TAG, "Error notifying scan fail listener", e)
+        loggy.e("Error notifying scan fail listener", id, e)
       }
     }
   }

package/android/src/main/java/com/margelo/nitro/dawidzawada/bonjourzeroconf/BonjourZeroconf.kt

@@ -3,7 +3,6 @@ package com.margelo.nitro.dawidzawada.bonjourzeroconf
 import android.content.Context
 import android.net.nsd.NsdManager
 import android.net.nsd.NsdServiceInfo
-import android.util.Log
 import com.facebook.proguard.annotations.DoNotStrip
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
@@ -20,10 +19,13 @@ import kotlinx.coroutines.sync.Mutex
 class BonjourZeroconf : HybridBonjourZeroconfSpec() {
 
   companion object {
-    internal const val TAG = "BonjourZeroconf"
     internal const val DEFAULT_RESOLVE_TIMEOUT_MS = 10_000L
+    internal val legacyResolveMutex = Mutex()
+    internal val loggy = Loggy(BonjourZeroconf::class)
   }
 
+  override var id: String? = null
+
   @Volatile
   internal var _isScanning = false
 
@@ -36,7 +38,6 @@ class BonjourZeroconf : HybridBonjourZeroconfSpec() {
   internal val serviceCache = ConcurrentHashMap<String, ScanResult>()
   internal val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
   internal val resolveScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
-  internal val legacyResolveMutex = Mutex()
 
   override val isScanning: Boolean
     get() = _isScanning
@@ -59,12 +60,12 @@ class BonjourZeroconf : HybridBonjourZeroconfSpec() {
 
     currentDiscoveryListener = createDiscoveryListener(resolveTimeout).also { listener ->
       try {
-        Log.i(TAG, "Starting scan for type: $type")
+        loggy.i("Starting scan for type: $type", id)
         updateScanningState(true)
         nsdManager?.discoverServices(type, NsdManager.PROTOCOL_DNS_SD, listener)
           ?: throw IllegalStateException("NsdManager is not initialized")
       } catch (e: Exception) {
-        Log.e(TAG, "Failed to start discovery", e)
+        loggy.e("Failed to start discovery", id, e)
         updateScanningState(false)
         throw RuntimeException("Failed to start service discovery: ${e.message}", e)
       }
@@ -96,9 +97,9 @@ class BonjourZeroconf : HybridBonjourZeroconfSpec() {
     currentDiscoveryListener?.let { listener ->
       try {
         nsdManager?.stopServiceDiscovery(listener)
-        Log.i(TAG, "Stopped service discovery")
+        loggy.i("Stopped service discovery", id)
       } catch (e: Exception) {
-        Log.e(TAG, "Error stopping discovery", e)
+        loggy.e("Error stopping discovery", id, e)
       }
     }
 
@@ -116,7 +117,7 @@ class BonjourZeroconf : HybridBonjourZeroconfSpec() {
         try {
           onResult(currentResults)
         } catch (e: Exception) {
-          Log.e(TAG, "Scan results listener error", e)
+          loggy.e("Scan results listener error", throwable = e)
         }
       }
     }
@@ -134,7 +135,7 @@ class BonjourZeroconf : HybridBonjourZeroconfSpec() {
       try {
         onChange(_isScanning)
       } catch (e: Exception) {
-        Log.e(TAG, "Scan state listener error", e)
+        loggy.e("Scan state listener error", throwable = e)
       }
     }
 
@@ -155,12 +156,12 @@ class BonjourZeroconf : HybridBonjourZeroconfSpec() {
   private fun createDiscoveryListener(resolveTimeout: Long) = object : NsdManager.DiscoveryListener {
 
     override fun onDiscoveryStarted(serviceType: String) {
-      Log.d(TAG, "Discovery started: $serviceType")
+      loggy.d("Discovery started: $serviceType", id)
     }
 
     override fun onServiceFound(service: NsdServiceInfo) {
       val serviceKey = createServiceKey(service)
-      Log.d(TAG, "Service found: ${service.serviceName} (key: $serviceKey)")
+      loggy.d("Service found: ${service.serviceName} (key: $serviceKey)", id)
 
       if (serviceCache.containsKey(serviceKey)) {
         return
@@ -170,14 +171,14 @@ class BonjourZeroconf : HybridBonjourZeroconfSpec() {
         try {
           resolveService(service, serviceKey, resolveTimeout)
         } catch (e: Exception) {
-          Log.e(TAG, "Error resolving service: $serviceKey", e)
+          loggy.e("Error resolving service: $serviceKey", id, e)
         }
       }
     }
 
     override fun onServiceLost(service: NsdServiceInfo) {
       val serviceKey = createServiceKey(service)
-      Log.d(TAG, "Service lost: ${service.serviceName} (key: $serviceKey)")
+      loggy.d("Service lost: ${service.serviceName} (key: $serviceKey)", id)
 
       serviceCache.remove(serviceKey)?.let {
         notifyScanResultsListeners()
@@ -185,19 +186,19 @@ class BonjourZeroconf : HybridBonjourZeroconfSpec() {
     }
 
     override fun onDiscoveryStopped(serviceType: String) {
-      Log.d(TAG, "Discovery stopped: $serviceType")
+      loggy.d("Discovery stopped: $serviceType", id)
       updateScanningState(false)
     }
 
     override fun onStartDiscoveryFailed(serviceType: String, errorCode: Int) {
-      Log.e(TAG, "Start discovery failed: $serviceType, error: $errorCode")
+      loggy.e("Start discovery failed: $serviceType, error: $errorCode", id)
       notifyScanFailListeners(BonjourFail.DISCOVERY_FAILED)
       updateScanningState(false)
     }
 
     override fun onStopDiscoveryFailed(serviceType: String, errorCode: Int) {
       notifyScanFailListeners(BonjourFail.DISCOVERY_FAILED)
-      Log.e(TAG, "Stop discovery failed: $serviceType, error: $errorCode")
+      loggy.e("Stop discovery failed: $serviceType, error: $errorCode", id)
     }
   }
 
@@ -205,3 +206,4 @@ class BonjourZeroconf : HybridBonjourZeroconfSpec() {
     return "${service.serviceName}.${service.serviceType}"
   }
 }
+

package/android/src/main/java/com/margelo/nitro/dawidzawada/bonjourzeroconf/Loggy.kt

@@ -0,0 +1,16 @@
+package com.margelo.nitro.dawidzawada.bonjourzeroconf
+
+import android.util.Log
+import kotlin.reflect.KClass
+
+internal class Loggy(clazz: KClass<*>) {
+  private val tag = clazz.simpleName ?: "Unknown"
+
+  private fun format(message: String, id: String?): String =
+    if (id != null) "($id) $message" else message
+
+  fun d(message: String, id: String? = null) = Log.d(tag, format(message, id))
+  fun i(message: String, id: String? = null) = Log.i(tag, format(message, id))
+  fun w(message: String, id: String? = null) = Log.w(tag, format(message, id))
+  fun e(message: String, id: String? = null, throwable: Throwable? = null) = Log.e(tag, format(message, id), throwable)
+}

package/ios/BonjourZeroconf+AddressResolver.swift

@@ -10,11 +10,11 @@ extension BonjourZeroconf {
   /// Resolve a service to get its IP address and port using async/await
   internal func resolveService(result: NWBrowser.Result, name: String, timeout: TimeInterval) async -> ScanResult? {
       let taskId = UUID()
-      
+
       do {
           return try await withCheckedThrowingContinuation { continuation in
               let connection = NWConnection(to: result.endpoint, using: .tcp)
-              
+
               resolveLock.lock()
               guard _isScanning else {
                   resolveLock.unlock()
@@ -23,25 +23,25 @@ extension BonjourZeroconf {
               }
               activeConnections[taskId] = connection
               resolveLock.unlock()
-              
+
               final class ResumeBox { var hasResumed = false }
               let box = ResumeBox()
-              
+
               let timeoutTask = DispatchWorkItem { [weak self] in
                   guard let self = self else { return }
                   guard !box.hasResumed else { return }
                   box.hasResumed = true
-                  Loggy.log(.debug, message: "Timeout resolving \(name)")
+                  Loggy.log(.debug, id: self.id, message: "Timeout resolving \(name)")
                   continuation.resume(throwing: AddressResolverError.timeout)
                   self.cleanupResolve(connection: connection, taskId: taskId)
               }
-              
+
               resolveLock.lock()
               activeTimeouts[taskId] = timeoutTask
               resolveLock.unlock()
-              
+
               networkQueue.asyncAfter(deadline: .now() + timeout, execute: timeoutTask)
-              
+
               connection.stateUpdateHandler = { [weak self] state in
                   guard let self = self else { return }
                   switch state {
@@ -49,7 +49,7 @@ extension BonjourZeroconf {
                       timeoutTask.cancel()
                       guard !box.hasResumed else { return }
                       box.hasResumed = true
-                      
+
                       if let remoteEndpoint = connection.currentPath?.remoteEndpoint,
                          let scanResult = self.extractIPAndPort(from: remoteEndpoint, serviceName: name) {
                           continuation.resume(returning: scanResult)
@@ -57,26 +57,26 @@ extension BonjourZeroconf {
                           continuation.resume(throwing: AddressResolverError.extractionFailed)
                       }
                       self.cleanupResolve(connection: connection, taskId: taskId)
-                      
+
                   case .failed(let error):
                       timeoutTask.cancel()
                       guard !box.hasResumed else { return }
                       box.hasResumed = true
-                      Loggy.log(.error, message: "Failed to resolve service \(name): \(error.localizedDescription)")
+                      Loggy.log(.error, id: self.id, message: "Failed to resolve service \(name): \(error.localizedDescription)")
                       continuation.resume(throwing: error)
                       self.cleanupResolve(connection: connection, taskId: taskId)
-                      
+
                   case .waiting(let error):
-                      Loggy.log(.debug, message: "Connection waiting for \(name): \(error.localizedDescription)")
-                      
+                      Loggy.log(.debug, id: self.id, message: "Connection waiting for \(name): \(error.localizedDescription)")
+
                   case .cancelled:
                       break
-                      
+
                   default:
                       break
                   }
               }
-              
+
               connection.start(queue: networkQueue)
           }
       } catch let error as AddressResolverError {
@@ -86,7 +86,7 @@ extension BonjourZeroconf {
           case .extractionFailed:
               notifyScanFailListeners(with: BonjourFail.extractionFailed)
           case .cancelled:
-              Loggy.log(.debug, message: "Scanning stopped, cancelling address resolution")
+              Loggy.log(.debug, id: self.id, message: "Scanning stopped, cancelling address resolution")
               break
           }
           return nil
@@ -94,10 +94,10 @@ extension BonjourZeroconf {
           return nil
       }
   }
-  
+
   /// Cancels ongoing address resolve process
   internal func cancelAddressResolving() {
-      Loggy.log(.debug, message: "Cancelling Address Resolving")
+      Loggy.log(.debug, id: id, message: "Cancelling Address Resolving")
       resolveLock.lock()
       activeTimeouts.values.forEach { $0.cancel() }
       activeTimeouts.removeAll()
@@ -114,7 +114,7 @@ extension BonjourZeroconf {
       activeTimeouts.removeValue(forKey: taskId)
       resolveLock.unlock()
   }
-  
+
   /// Extract IP address and port from an endpoint
   private func extractIPAndPort(from endpoint: NWEndpoint, serviceName: String) -> ScanResult? {
       switch endpoint {
@@ -123,17 +123,17 @@ extension BonjourZeroconf {
           var ipv6: String?
           var hostname: String?
           let portNumber = Int(port.rawValue)
-          
+
           switch host {
           case .ipv4(let address):
               ipv4 = address.rawValue.map(String.init).joined(separator: ".")
-              Loggy.log(.debug, message: "Resolved \(serviceName) -> IPv4: \(ipv4!), Port: \(portNumber)")
-              
+              Loggy.log(.debug, id: id, message: "Resolved \(serviceName) -> IPv4: \(ipv4!), Port: \(portNumber)")
+
           case .ipv6(let address):
               let formatted = stride(from: 0, to: address.rawValue.count, by: 2).map { i in
                   String(format: "%02x%02x", address.rawValue[i], address.rawValue[i + 1])
               }.joined(separator: ":")
-              
+
               if formatted.hasPrefix("fe80:") {
                 if let interface = endpoint.interface?.name {
                       ipv6 = "\(formatted)%\(interface)"
@@ -143,17 +143,17 @@ extension BonjourZeroconf {
               } else {
                   ipv6 = formatted
               }
-              Loggy.log(.debug, message: "Resolved \(serviceName) -> IPv6: \(ipv6!), Port: \(portNumber)")
-              
+              Loggy.log(.debug, id: id, message: "Resolved \(serviceName) -> IPv6: \(ipv6!), Port: \(portNumber)")
+
           case .name(let name, _):
               hostname = name
-              Loggy.log(.debug, message: "Resolved \(serviceName) -> Hostname: \(hostname ?? "nil"), Port: \(portNumber)")
-              
+              Loggy.log(.debug, id: id, message: "Resolved \(serviceName) -> Hostname: \(hostname ?? "nil"), Port: \(portNumber)")
+
           @unknown default:
-              Loggy.log(.debug, message: "Unknown host type for \(serviceName)")
+              Loggy.log(.debug, id: id, message: "Unknown host type for \(serviceName)")
               return nil
           }
-          
+
           return ScanResult(
               name: serviceName,
               ipv4: ipv4,
@@ -161,9 +161,9 @@ extension BonjourZeroconf {
               hostname: hostname,
               port: Double(portNumber)
           )
-          
+
       default:
-          Loggy.log(.warning, message: "Unexpected endpoint format for \(serviceName)")
+          Loggy.log(.warning, id: id, message: "Unexpected endpoint format for \(serviceName)")
           return nil
       }
   }

package/ios/BonjourZeroconf+Listeners.swift

@@ -7,20 +7,14 @@
 
 extension BonjourZeroconf {
   internal func notifyScanResultsListeners(with results: [ScanResult]) {
-    for listener in scanResultsListeners.values {
-      listener(results)
-    }
+    Task { await listenerStore.notifyScanResults(with: results) }
   }
-  
+
   internal func notifyScanStateListeners(with isScanningState: Bool) {
-    for listener in scanStateListeners.values {
-      listener(isScanningState)
-    }
+    Task { await listenerStore.notifyScanState(with: isScanningState) }
   }
-  
+
   internal func notifyScanFailListeners(with fail: BonjourFail) {
-    for listener in scanFailListeners.values {
-      listener(fail)
-    }
+    Task { await listenerStore.notifyScanFail(with: fail) }
   }
 }