react-native-zeroconf 0.17.1 → 0.17.2

package/README.md

@@ -2,6 +2,14 @@
   <a href="https://zeroconf.balthazar.dev"><img src=".github/banner.png" alt="react-native-zeroconf: Bonjour / mDNS discovery and publishing for React Native, on iOS, Android, Windows, macOS, tvOS and Expo" width="100%"></a>
 </p>
 
+<p align="center">
+  <a href="https://www.npmjs.com/package/react-native-zeroconf"><img src="https://img.shields.io/npm/v/react-native-zeroconf?style=flat" alt="npm version"></a>
+  <a href="https://www.npmjs.com/package/react-native-zeroconf"><img src="https://img.shields.io/npm/dm/react-native-zeroconf?style=flat" alt="npm downloads"></a>
+  <a href="https://github.com/balthazar/react-native-zeroconf/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/balthazar/react-native-zeroconf/ci.yml?branch=master&label=tests&style=flat" alt="tests"></a>
+  <a href="https://github.com/balthazar/react-native-zeroconf/actions/workflows/windows.yml"><img src="https://img.shields.io/github/actions/workflow/status/balthazar/react-native-zeroconf/windows.yml?branch=master&label=windows&style=flat" alt="windows"></a>
+  <a href="LICENSE"><img src="https://img.shields.io/npm/l/react-native-zeroconf?style=flat" alt="license"></a>
+</p>
+
 Find the services other devices advertise on the local network (printers, speakers, cameras, your own servers) and advertise your own, on iOS, Android, macOS, tvOS and Windows.
 
 **[Read the documentation](https://zeroconf.balthazar.dev)**

package/android/src/main/java/com/balthazargronon/RCTZeroconf/nsd/NsdServiceImpl.java

@@ -532,6 +532,21 @@ public class NsdServiceImpl implements Zeroconf {
         return mNsdManager;
     }
 
+    // Before Android 14 each NsdManager client resolves one service at a time and a resolve can't be cancelled:
+    // a service that never answers would block every later resolve. After a timeout the queue moves on to a
+    // client of its own, an NsdManager from a new Context (system services are cached per Context)
+    @Nullable private volatile NsdManager mResolveManager;
+
+    private NsdManager getResolveManager() {
+        return mResolveManager != null ? mResolveManager : getNsdManager();
+    }
+
+    private void replaceResolveManager() {
+        Context context = getReactApplicationContext();
+        Context fresh = context.createConfigurationContext(context.getResources().getConfiguration());
+        mResolveManager = (NsdManager) fresh.getSystemService(Context.NSD_SERVICE);
+    }
+
     private ReactApplicationContext getReactApplicationContext() {
         return reactApplicationContext;
     }
@@ -560,8 +575,8 @@ public class NsdServiceImpl implements Zeroconf {
         }
         final ZeroResolveListener listener = new ZeroResolveListener(next);
         try {
-            getNsdManager().resolveService(next.serviceInfo, listener);
-            // The system keeps the resolve until it answers or fails, the queue waits for it
+            getResolveManager().resolveService(next.serviceInfo, listener);
+            // The queue waits for the answer, or moves on to another client after the timeout
             mHandler.postDelayed(listener::timedOut, (long) (next.timeoutSeconds * 1000));
         } catch (Throwable e) {
             Log.e(TAG, "resolveService failed", e);
@@ -582,7 +597,7 @@ public class NsdServiceImpl implements Zeroconf {
         private final PendingResolve pending;
         @Nullable private final String scanId;
         @Nullable private final Promise promise;
-        // Settled: answered, failed or timed out. A late answer after the timeout only frees the queue
+        // Settled: answered, failed or timed out. A late answer after the timeout is ignored
         private boolean settled = false;
 
         ZeroResolveListener(PendingResolve pending) {
@@ -609,6 +624,8 @@ public class NsdServiceImpl implements Zeroconf {
             } else if (mScans.containsKey(scanId)) {
                 sendResolveTimeout(serviceName, scanId);
             }
+            replaceResolveManager();
+            onResolveDone();
         }
 
         @Override
@@ -616,7 +633,6 @@ public class NsdServiceImpl implements Zeroconf {
             if (errorCode == NsdManager.FAILURE_ALREADY_ACTIVE) {
                 // Another resolve (possibly from another app or listener) is in flight: retry shortly
                 if (!settle()) {
-                    onResolveDone();
                     return;
                 }
                 synchronized (mResolveQueue) {
@@ -627,7 +643,7 @@ public class NsdServiceImpl implements Zeroconf {
                 return;
             }
             if (!settle()) {
-                onResolveDone();
+                // Timed out: the queue already moved on to another client
                 return;
             }
             String message = "Resolving service " + serviceInfo.getServiceName() + " failed: " + ZeroconfModule.describeNsdError(errorCode);
@@ -642,7 +658,7 @@ public class NsdServiceImpl implements Zeroconf {
         @Override
         public void onServiceResolved(NsdServiceInfo serviceInfo) {
             if (!settle()) {
-                onResolveDone();
+                // Timed out: the queue already moved on to another client
                 return;
             }
             if (promise != null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-zeroconf",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "description": "A Zeroconf discovery utility for react-native",
   "main": "dist",
   "types": "index.d.ts",