@dawidzawada/bonjour-zeroconf 1.0.1 → 1.2.0-alpha.0

package/README.md

@@ -1,3 +1,9 @@
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="./docs/banner-dark.png" />
+  <source media="(prefers-color-scheme: light)" srcset="./docs/banner-light.png" />
+  <img alt="BonjourZeroconf" src="./docs/banner-light.png" />
+</picture>
+
 # Bonjour Zeroconf 🇫🇷🥖
 
 ⚡ **High-performance Zeroconf/mDNS service discovery for React Native**
@@ -144,6 +150,30 @@ Scanner.scan('_printer._tcp', 'local', {
 - `_airplay._tcp` – AirPlay devices
 - `_printer._tcp` – Network printers
 
+#### `scanFor(time: number, type: string, domain: string, options?: ScanOptions)`
+
+Scan for services for a specified duration and return results as a Promise.
+
+```ts
+const devices = await Scanner.scanFor(15, '_http._tcp', 'local');
+console.log('Found devices:', devices);
+```
+
+```ts
+const devices = await Scanner.scanFor(25, '_printer._tcp', 'local', {
+  addressResolveTimeout: 10000, // ms
+});
+```
+
+**Parameters:**
+
+- `time` – Duration in seconds to scan before stopping
+- `type` – Service type to discover
+- `domain` – Domain to scan (typically `'local'`)
+- `options` – Optional scan configuration
+
+**Returns:** `Promise<ScanResult[]>` – Array of discovered services
+
 #### `stop()`
 
 Stop scanning and clear cached results.

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

@@ -11,6 +11,8 @@ import kotlinx.coroutines.withTimeoutOrNull
 import java.util.concurrent.Executors
 
 suspend fun BonjourZeroconf.resolveService(service: NsdServiceInfo, serviceKey: String, timeout: Long) {
+  if (!_isScanning) return
+
   if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
     // New API (Android 14+)
     resolveServiceNew(service, serviceKey, timeout)
@@ -52,6 +54,12 @@ suspend fun BonjourZeroconf.resolveServiceNew(service: NsdServiceInfo, serviceKe
           override fun onServiceUpdated(serviceInfo: NsdServiceInfo) {
             Log.d(TAG, "Service updated: ${serviceInfo.serviceName}")
             unregisterCallback()
+
+            if (!_isScanning) {
+              continuation.resume(null) {}
+              return
+            }
+
             continuation.resume(serviceInfo) {}
           }
 
@@ -114,6 +122,12 @@ suspend fun BonjourZeroconf.resolveServiceLegacy(service: NsdServiceInfo, servic
 
             override fun onServiceResolved(serviceInfo: NsdServiceInfo) {
               Log.d(TAG, "Service resolved: ${serviceInfo.serviceName}")
+
+              if (!_isScanning) {
+                continuation.resume(null) {}
+                return
+              }
+
               continuation.resume(serviceInfo) {}
             }
           }

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

@@ -8,9 +8,11 @@ import com.facebook.proguard.annotations.DoNotStrip
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import com.margelo.nitro.NitroModules
+import com.margelo.nitro.core.Promise
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 
@@ -33,6 +35,7 @@ class BonjourZeroconf : HybridBonjourZeroconfSpec() {
   internal var currentDiscoveryListener: NsdManager.DiscoveryListener? = null
   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
@@ -68,7 +71,28 @@ class BonjourZeroconf : HybridBonjourZeroconfSpec() {
     }
   }
 
+  override fun scanFor(
+    time: Double,
+    type: String,
+    domain: String,
+    options: ScanOptions?
+  ): Promise<Array<ScanResult>> {
+    return Promise.async {
+      scan(type, domain, options)
+
+      kotlinx.coroutines.delay((time * 1000).toLong())
+
+      val results = serviceCache.values.toTypedArray()
+
+      stop()
+
+      results
+    }
+  }
+
   override fun stop() {
+    resolveScope.coroutineContext.cancelChildren()
+
     currentDiscoveryListener?.let { listener ->
       try {
         nsdManager?.stopServiceDiscovery(listener)
@@ -142,7 +166,7 @@ class BonjourZeroconf : HybridBonjourZeroconfSpec() {
         return
       }
 
-      scope.launch {
+      resolveScope.launch {
         try {
           resolveService(service, serviceKey, resolveTimeout)
         } catch (e: Exception) {

package/ios/AddressResolverError.swift

@@ -6,15 +6,18 @@
 //
 
 enum AddressResolverError: Error {
-    case timeout
-    case extractionFailed
-    
-    var localizedDescription: String {
-      switch self {
-      case .timeout:
-        return "Connection timed out"
-      case .extractionFailed:
-        return "Failed to extract IP and port information"
-      }
+  case timeout
+  case extractionFailed
+  case cancelled
+  
+  var localizedDescription: String {
+    switch self {
+    case .timeout:
+      return "Connection timed out"
+    case .extractionFailed:
+      return "Failed to extract IP and port information"
+    case .cancelled:
+      return "Cancelled resolve process"
     }
+  }
 }

package/ios/BonjourZeroconf+AddressResolver.swift

@@ -9,25 +9,41 @@ import Network
 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)
               
-              final class ResumeBox {
-                  var hasResumed = false
+              resolveLock.lock()
+              guard _isScanning else {
+                  resolveLock.unlock()
+                  continuation.resume(throwing: AddressResolverError.cancelled)
+                  return
               }
+              activeConnections[taskId] = connection
+              resolveLock.unlock()
+              
+              final class ResumeBox { var hasResumed = false }
               let box = ResumeBox()
               
-              let timeoutTask = DispatchWorkItem {
+              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)")
                   continuation.resume(throwing: AddressResolverError.timeout)
-                  connection.cancel()
+                  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 {
                   case .ready:
                       timeoutTask.cancel()
@@ -35,12 +51,12 @@ extension BonjourZeroconf {
                       box.hasResumed = true
                       
                       if let remoteEndpoint = connection.currentPath?.remoteEndpoint,
-                         let scanResult = self?.extractIPAndPort(from: remoteEndpoint, serviceName: name) {
+                         let scanResult = self.extractIPAndPort(from: remoteEndpoint, serviceName: name) {
                           continuation.resume(returning: scanResult)
                       } else {
                           continuation.resume(throwing: AddressResolverError.extractionFailed)
                       }
-                      connection.cancel()
+                      self.cleanupResolve(connection: connection, taskId: taskId)
                       
                   case .failed(let error):
                       timeoutTask.cancel()
@@ -48,7 +64,7 @@ extension BonjourZeroconf {
                       box.hasResumed = true
                       Loggy.log(.error, message: "Failed to resolve service \(name): \(error.localizedDescription)")
                       continuation.resume(throwing: error)
-                      connection.cancel()
+                      self.cleanupResolve(connection: connection, taskId: taskId)
                       
                   case .waiting(let error):
                       Loggy.log(.debug, message: "Connection waiting for \(name): \(error.localizedDescription)")
@@ -61,25 +77,46 @@ extension BonjourZeroconf {
                   }
               }
               
-            connection.start(queue: networkQueue)
+              connection.start(queue: networkQueue)
           }
       } catch let error as AddressResolverError {
-        switch error {
-        case .timeout:
-            notifyScanFailListeners(with: BonjourFail.resolveFailed)
-          break;
-        case .extractionFailed:
-            notifyScanFailListeners(with: BonjourFail.extractionFailed)
-          break;
-        }
-        return nil
-    } catch {
-        return nil
-    }
+          switch error {
+          case .timeout:
+              notifyScanFailListeners(with: BonjourFail.resolveFailed)
+          case .extractionFailed:
+              notifyScanFailListeners(with: BonjourFail.extractionFailed)
+          case .cancelled:
+              Loggy.log(.debug, message: "Scanning stopped, cancelling address resolution")
+              break
+          }
+          return nil
+      } catch {
+          return nil
+      }
+  }
+  
+  /// Cancels ongoing address resolve process
+  internal func cancelAddressResolving() {
+      Loggy.log(.debug, message: "Cancelling Address Resolving")
+      resolveLock.lock()
+      activeTimeouts.values.forEach { $0.cancel() }
+      activeTimeouts.removeAll()
+      activeConnections.values.forEach { $0.cancel() }
+      activeConnections.removeAll()
+      resolveLock.unlock()
+  }
+
+  /// Cleans up after single resolve process
+  private func cleanupResolve(connection: NWConnection, taskId: UUID) {
+      connection.cancel()
+      resolveLock.lock()
+      activeConnections.removeValue(forKey: taskId)
+      activeTimeouts.removeValue(forKey: taskId)
+      resolveLock.unlock()
   }
   
   /// Extract IP address and port from an endpoint
-  internal func extractIPAndPort(from endpoint: NWEndpoint, serviceName: String) -> ScanResult? {
+  private func extractIPAndPort(from endpoint: NWEndpoint, serviceName: String) -> ScanResult? {
       switch endpoint {
       case .hostPort(let host, let port):
           var ipv4: String?

package/ios/BonjourZeroconf.swift

@@ -12,6 +12,11 @@ class BonjourZeroconf: HybridBonjourZeroconfSpec {
   internal var scanStateListeners: [UUID: (Bool) -> Void] = [:]
   internal var scanFailListeners: [UUID: (BonjourFail) -> Void] = [:]
   internal let networkQueue = DispatchQueue(label: "com.bonjour-zeroconf.network", qos: .userInitiated)
+  internal let timeoutScanQueue = DispatchQueue(label: "com.bonjour-zeroconf.scan", qos: .userInitiated)
+  
+  internal var activeConnections: [UUID: NWConnection] = [:]
+  internal var activeTimeouts: [UUID: DispatchWorkItem] = [:]
+  internal let resolveLock = NSLock()
   
   var isScanning: Bool {
     return _isScanning
@@ -72,6 +77,20 @@ class BonjourZeroconf: HybridBonjourZeroconfSpec {
       browser.start(queue: networkQueue)
   }
   
+  func scanFor(time: Double, type: String, domain: String, options: ScanOptions?) throws -> Promise<[ScanResult]> {
+    return Promise.async {
+      self.scan(type: type, domain: domain, options: options)
+      
+      try await Task.sleep(nanoseconds: UInt64(time * 1_000_000_000))
+      
+      let results = await self.serviceCache.getAll()
+      
+      self.stop()
+      
+      return results
+    }
+  }
+  
   func listenForScanResults(onResult: @escaping ([ScanResult]) -> Void) -> BonjourListener {
     let listenerId = UUID()
     self.scanResultsListeners[listenerId] = onResult
@@ -111,6 +130,8 @@ class BonjourZeroconf: HybridBonjourZeroconfSpec {
       if let browser = self._browser {
           browser.cancel()
       }
+    
+      cancelAddressResolving()
       
       self._isScanning = false
       Task {

package/ios/LocalNetworkAuthorization.swift

@@ -49,7 +49,6 @@ public class LocalNetworkAuthorization: NSObject {
     }
     
     private func reset() {
-        print("resetting")
         self.browser?.cancel()
         self.browser = nil
         self.netService?.stop()

package/lib/typescript/src/specs/BonjourZeroconf.nitro.d.ts

@@ -11,6 +11,7 @@ export interface BonjourZeroconf extends HybridObject<{
 }> {
     readonly isScanning: boolean;
     scan(type: string, domain: string, options?: ScanOptions): void;
+    scanFor(time: number, type: string, domain: string, options?: ScanOptions): Promise<ScanResult[]>;
     stop(): void;
     listenForScanResults(onResult: (results: ScanResult[]) => void): BonjourListener;
     listenForScanState(onChange: (isScanning: boolean) => void): BonjourListener;

package/lib/typescript/src/specs/BonjourZeroconf.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BonjourZeroconf.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/BonjourZeroconf.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,WAAW;IAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,eACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IACzD,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAChE,IAAI,IAAI,IAAI,CAAC;IACb,oBAAoB,CAClB,QAAQ,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,IAAI,GACxC,eAAe,CAAC;IACnB,kBAAkB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,GAAG,eAAe,CAAC;IAC7E,iBAAiB,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,GAAG,eAAe,CAAC;CACzE"}
+{"version":3,"file":"BonjourZeroconf.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/BonjourZeroconf.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,WAAW;IAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,eACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IACzD,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAE7B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAChE,OAAO,CACL,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IACzB,IAAI,IAAI,IAAI,CAAC;IACb,oBAAoB,CAClB,QAAQ,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,IAAI,GACxC,eAAe,CAAC;IACnB,kBAAkB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,GAAG,eAAe,CAAC;IAC7E,iBAAiB,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,GAAG,eAAe,CAAC;CACzE"}

package/nitrogen/generated/android/c++/JBonjourFail.hpp

@@ -2,7 +2,7 @@
 /// JBonjourFail.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,16 +41,15 @@ namespace margelo::nitro::dawidzawada_bonjourzeroconf {
     [[maybe_unused]]
     static jni::alias_ref<JBonjourFail> fromCpp(BonjourFail value) {
       static const auto clazz = javaClassStatic();
-      static const auto fieldRESOLVE_FAILED = clazz->getStaticField<JBonjourFail>("RESOLVE_FAILED");
-      static const auto fieldEXTRACTION_FAILED = clazz->getStaticField<JBonjourFail>("EXTRACTION_FAILED");
-      static const auto fieldDISCOVERY_FAILED = clazz->getStaticField<JBonjourFail>("DISCOVERY_FAILED");
-      
       switch (value) {
         case BonjourFail::RESOLVE_FAILED:
+          static const auto fieldRESOLVE_FAILED = clazz->getStaticField<JBonjourFail>("RESOLVE_FAILED");
           return clazz->getStaticFieldValue(fieldRESOLVE_FAILED);
         case BonjourFail::EXTRACTION_FAILED:
+          static const auto fieldEXTRACTION_FAILED = clazz->getStaticField<JBonjourFail>("EXTRACTION_FAILED");
           return clazz->getStaticFieldValue(fieldEXTRACTION_FAILED);
         case BonjourFail::DISCOVERY_FAILED:
+          static const auto fieldDISCOVERY_FAILED = clazz->getStaticField<JBonjourFail>("DISCOVERY_FAILED");
           return clazz->getStaticFieldValue(fieldDISCOVERY_FAILED);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));

package/nitrogen/generated/android/c++/JBonjourListener.hpp

@@ -2,7 +2,7 @@
 /// JBonjourListener.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -11,6 +11,7 @@
 #include "BonjourListener.hpp"
 
 #include "JFunc_void.hpp"
+#include <NitroModules/JNICallable.hpp>
 #include <functional>
 
 namespace margelo::nitro::dawidzawada_bonjourzeroconf {
@@ -41,9 +42,7 @@ namespace margelo::nitro::dawidzawada_bonjourzeroconf {
             return downcast->cthis()->getFunction();
           } else {
             auto removeRef = jni::make_global(remove);
-            return [removeRef]() -> void {
-              return removeRef->invoke();
-            };
+            return JNICallable<JFunc_void, void()>(std::move(removeRef));
           }
         }()
       );

package/nitrogen/generated/android/c++/JFunc_void.hpp

@@ -2,7 +2,7 @@
 /// JFunc_void.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -11,6 +11,7 @@
 #include <functional>
 
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 
 namespace margelo::nitro::dawidzawada_bonjourzeroconf {
 
@@ -37,7 +38,7 @@ namespace margelo::nitro::dawidzawada_bonjourzeroconf {
   /**
    * An implementation of Func_void that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_cxx final: public jni::HybridClass<JFunc_void_cxx, JFunc_void> {
+  class JFunc_void_cxx final: public jni::HybridClass<JFunc_void_cxx, JFunc_void> {
   public:
     static jni::local_ref<JFunc_void::javaobject> fromCpp(const std::function<void()>& func) {
       return JFunc_void_cxx::newObjectCxxArgs(func);

package/nitrogen/generated/android/c++/JFunc_void_BonjourFail.hpp

@@ -2,7 +2,7 @@
 /// JFunc_void_BonjourFail.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -12,6 +12,7 @@
 
 #include "BonjourFail.hpp"
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 #include "JBonjourFail.hpp"
 
 namespace margelo::nitro::dawidzawada_bonjourzeroconf {
@@ -39,7 +40,7 @@ namespace margelo::nitro::dawidzawada_bonjourzeroconf {
   /**
    * An implementation of Func_void_BonjourFail that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_BonjourFail_cxx final: public jni::HybridClass<JFunc_void_BonjourFail_cxx, JFunc_void_BonjourFail> {
+  class JFunc_void_BonjourFail_cxx final: public jni::HybridClass<JFunc_void_BonjourFail_cxx, JFunc_void_BonjourFail> {
   public:
     static jni::local_ref<JFunc_void_BonjourFail::javaobject> fromCpp(const std::function<void(BonjourFail /* fail */)>& func) {
       return JFunc_void_BonjourFail_cxx::newObjectCxxArgs(func);

package/nitrogen/generated/android/c++/JFunc_void_bool.hpp

@@ -2,7 +2,7 @@
 /// JFunc_void_bool.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -11,6 +11,7 @@
 #include <functional>
 
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 
 namespace margelo::nitro::dawidzawada_bonjourzeroconf {
 
@@ -37,7 +38,7 @@ namespace margelo::nitro::dawidzawada_bonjourzeroconf {
   /**
    * An implementation of Func_void_bool that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_bool_cxx final: public jni::HybridClass<JFunc_void_bool_cxx, JFunc_void_bool> {
+  class JFunc_void_bool_cxx final: public jni::HybridClass<JFunc_void_bool_cxx, JFunc_void_bool> {
   public:
     static jni::local_ref<JFunc_void_bool::javaobject> fromCpp(const std::function<void(bool /* isScanning */)>& func) {
       return JFunc_void_bool_cxx::newObjectCxxArgs(func);

package/nitrogen/generated/android/c++/JFunc_void_std__vector_ScanResult_.hpp

@@ -2,7 +2,7 @@
 /// JFunc_void_std__vector_ScanResult_.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -13,6 +13,7 @@
 #include "ScanResult.hpp"
 #include <vector>
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 #include "JScanResult.hpp"
 #include <string>
 #include <optional>
@@ -51,7 +52,7 @@ namespace margelo::nitro::dawidzawada_bonjourzeroconf {
   /**
    * An implementation of Func_void_std__vector_ScanResult_ that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_std__vector_ScanResult__cxx final: public jni::HybridClass<JFunc_void_std__vector_ScanResult__cxx, JFunc_void_std__vector_ScanResult_> {
+  class JFunc_void_std__vector_ScanResult__cxx final: public jni::HybridClass<JFunc_void_std__vector_ScanResult__cxx, JFunc_void_std__vector_ScanResult_> {
   public:
     static jni::local_ref<JFunc_void_std__vector_ScanResult_::javaobject> fromCpp(const std::function<void(const std::vector<ScanResult>& /* results */)>& func) {
       return JFunc_void_std__vector_ScanResult__cxx::newObjectCxxArgs(func);

package/nitrogen/generated/android/c++/JHybridBonjourZeroconfSpec.cpp

@@ -2,32 +2,35 @@
 /// JHybridBonjourZeroconfSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridBonjourZeroconfSpec.hpp"
 
+// Forward declaration of `ScanResult` to properly resolve imports.
+namespace margelo::nitro::dawidzawada_bonjourzeroconf { struct ScanResult; }
 // Forward declaration of `BonjourListener` to properly resolve imports.
 namespace margelo::nitro::dawidzawada_bonjourzeroconf { struct BonjourListener; }
 // Forward declaration of `ScanOptions` to properly resolve imports.
 namespace margelo::nitro::dawidzawada_bonjourzeroconf { struct ScanOptions; }
-// Forward declaration of `ScanResult` to properly resolve imports.
-namespace margelo::nitro::dawidzawada_bonjourzeroconf { struct ScanResult; }
 // Forward declaration of `BonjourFail` to properly resolve imports.
 namespace margelo::nitro::dawidzawada_bonjourzeroconf { enum class BonjourFail; }
 
+#include "ScanResult.hpp"
+#include <vector>
+#include <NitroModules/Promise.hpp>
+#include <NitroModules/JPromise.hpp>
+#include "JScanResult.hpp"
+#include <string>
+#include <optional>
 #include "BonjourListener.hpp"
 #include "JBonjourListener.hpp"
 #include <functional>
 #include "JFunc_void.hpp"
-#include <string>
+#include <NitroModules/JNICallable.hpp>
 #include "ScanOptions.hpp"
-#include <optional>
 #include "JScanOptions.hpp"
-#include "ScanResult.hpp"
-#include <vector>
 #include "JFunc_void_std__vector_ScanResult_.hpp"
-#include "JScanResult.hpp"
 #include "JFunc_void_bool.hpp"
 #include "BonjourFail.hpp"
 #include "JFunc_void_BonjourFail.hpp"
@@ -50,6 +53,13 @@ namespace margelo::nitro::dawidzawada_bonjourzeroconf {
     return method(_javaPart);
   }
 
+  bool JHybridBonjourZeroconfSpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridBonjourZeroconfSpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridBonjourZeroconfSpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
@@ -73,6 +83,31 @@ namespace margelo::nitro::dawidzawada_bonjourzeroconf {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* type */, jni::alias_ref<jni::JString> /* domain */, jni::alias_ref<JScanOptions> /* options */)>("scan");
     method(_javaPart, jni::make_jstring(type), jni::make_jstring(domain), options.has_value() ? JScanOptions::fromCpp(options.value()) : nullptr);
   }
+  std::shared_ptr<Promise<std::vector<ScanResult>>> JHybridBonjourZeroconfSpec::scanFor(double time, const std::string& type, const std::string& domain, const std::optional<ScanOptions>& options) {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(double /* time */, jni::alias_ref<jni::JString> /* type */, jni::alias_ref<jni::JString> /* domain */, jni::alias_ref<JScanOptions> /* options */)>("scanFor");
+    auto __result = method(_javaPart, time, jni::make_jstring(type), jni::make_jstring(domain), options.has_value() ? JScanOptions::fromCpp(options.value()) : nullptr);
+    return [&]() {
+      auto __promise = Promise<std::vector<ScanResult>>::create();
+      __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
+        auto __result = jni::static_ref_cast<jni::JArrayClass<JScanResult>>(__boxedResult);
+        __promise->resolve([&]() {
+          size_t __size = __result->size();
+          std::vector<ScanResult> __vector;
+          __vector.reserve(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            auto __element = __result->getElement(__i);
+            __vector.push_back(__element->toCpp());
+          }
+          return __vector;
+        }());
+      });
+      __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
+        jni::JniException __jniError(__throwable);
+        __promise->reject(std::make_exception_ptr(__jniError));
+      });
+      return __promise;
+    }();
+  }
   void JHybridBonjourZeroconfSpec::stop() {
     static const auto method = javaClassStatic()->getMethod<void()>("stop");
     method(_javaPart);

package/nitrogen/generated/android/c++/JHybridBonjourZeroconfSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridBonjourZeroconfSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -40,6 +40,7 @@ namespace margelo::nitro::dawidzawada_bonjourzeroconf {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
@@ -55,6 +56,7 @@ namespace margelo::nitro::dawidzawada_bonjourzeroconf {
   public:
     // Methods
     void scan(const std::string& type, const std::string& domain, const std::optional<ScanOptions>& options) override;
+    std::shared_ptr<Promise<std::vector<ScanResult>>> scanFor(double time, const std::string& type, const std::string& domain, const std::optional<ScanOptions>& options) override;
     void stop() override;
     BonjourListener listenForScanResults(const std::function<void(const std::vector<ScanResult>& /* results */)>& onResult) override;
     BonjourListener listenForScanState(const std::function<void(bool /* isScanning */)>& onChange) override;

package/nitrogen/generated/android/c++/JScanOptions.hpp

@@ -2,7 +2,7 @@
 /// JScanOptions.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/android/c++/JScanResult.hpp

@@ -2,7 +2,7 @@
 /// JScanResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once