react-native-zeroconf 0.15.0 → 0.15.2

package/README.md

@@ -162,7 +162,7 @@ Publish a service on the network.
 | `domain`   | string | `'local.'` | Domain                                 |
 | `name`     | string | required   | Service name (should be unique)        |
 | `port`     | number | required   | Port number                            |
-| `txt`      | object | `{}`       | TXT record key-value pairs             |
+| `txt`      | object \| array | `{}` | TXT record key-value pairs, or `[key, value]` pairs to control the order |
 | `implType` | string | `'NSD'`    | **Android only**: `'NSD'` or `'DNSSD'` |
 
 ```javascript
@@ -170,8 +170,18 @@ zeroconf.publishService('http', 'tcp', 'local.', 'MyWebServer', 8080, {
   path: '/api',
   version: '1.0',
 })
+
+// TXT records are published in the order given. Use pairs when order matters and keys look like numbers
+zeroconf.publishService('http', 'tcp', 'local.', 'MyWebServer', 8080, [
+  ['txtvers', '1'],
+  ['path', '/api'],
+])
 ```
 
+TXT order is preserved on iOS and with `DNSSD` on Android. With `NSD`, the order depends on the Android system.
+
+Published services are unpublished when the React Native instance is torn down (e.g. on reload). If the app process is killed, it can't announce anything: other devices only drop the service once its mDNS records expire.
+
 #### `unpublishService(name, implType)`
 
 Remove a published service.
@@ -235,10 +245,12 @@ useEffect(() => {
   fullName: 'XeroxPrinter._http._tcp.local.', // Full service name
   host: 'XeroxPrinter.local.',              // Hostname
   port: 8080,                               // Port number
-  addresses: [                              // IP addresses (IPv4 and/or IPv6)
+  addresses: [                              // IP addresses, IPv4 first
     '192.168.1.23',
     'fe80::aebc:123:ffff:abcd'
   ],
+  ipv4: ['192.168.1.23'],                   // IPv4 addresses only
+  ipv6: ['fe80::aebc:123:ffff:abcd'],       // IPv6 addresses only
   txt: {                                    // TXT record attributes
     path: '/status',
     color: 'yes'
@@ -246,6 +258,8 @@ useEffect(() => {
 }
 ```
 
+On Android with `NSD`, `host` is the mDNS hostname on Android 16+. Older versions don't expose it, so `host` is usually the IP address (use `DNSSD` if you need the hostname there). `NSD` returns all addresses on Android 14+, and a single one before.
+
 ## Android Implementation Types
 
 This library supports two implementations on Android:

package/android/src/main/java/com/balthazargronon/RCTZeroconf/Zeroconf.java

@@ -1,6 +1,6 @@
 package com.balthazargronon.RCTZeroconf;
 
-import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableArray;
 
 public interface Zeroconf {
 
@@ -10,5 +10,13 @@ public interface Zeroconf {
 
     public void unregisterService(String serviceName);
 
-    public void registerService(String type, String protocol, String domain, String name, int port, ReadableMap txt);
+    /**
+     * @param txt TXT records as ordered [key, value] pairs
+     */
+    public void registerService(String type, String protocol, String domain, String name, int port, ReadableArray txt);
+
+    /**
+     * Unregister every service published through this implementation
+     */
+    void unregisterAllServices();
 }

package/android/src/main/java/com/balthazargronon/RCTZeroconf/ZeroconfModule.java

@@ -7,7 +7,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import javax.annotation.Nullable;
@@ -73,7 +73,7 @@ public class ZeroconfModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void registerService(String type, String protocol, String domain, String name, int port, ReadableMap txt, String implType) {
+    public void registerService(String type, String protocol, String domain, String name, int port, ReadableArray txt, String implType) {
         try {
             getZeroconfImpl(implType).registerService(type, protocol, domain, name, port, txt);
         } catch (Throwable e) {
@@ -95,21 +95,36 @@ public class ZeroconfModule extends ReactContextBaseJavaModule {
     public void sendEvent(ReactContext reactContext,
                           String eventName,
                           @Nullable Object params) {
-        reactContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit(eventName, params);
+        try {
+            reactContext
+                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                    .emit(eventName, params);
+        } catch (Throwable e) {
+            // The JS side may already be gone, e.g. callbacks arriving during teardown
+            Log.w(getClass().getName(), "Could not send " + eventName + ": " + e.getMessage());
+        }
     }
 
-    @Override
+    // Called on teardown by current React Native versions.
+    // No @Override so it still compiles against versions that don't declare it.
+    public void invalidate() {
+        teardown();
+    }
+
+    // Called on teardown by older React Native versions, deprecated in favor of invalidate().
+    // No @Override so it still compiles once it is removed.
     public void onCatalystInstanceDestroy() {
-        super.onCatalystInstanceDestroy();
+        teardown();
+    }
+
+    private void teardown() {
         try {
             for (Zeroconf impl : zeroConfFactory.getCreatedImpls()) {
                 impl.stop();
+                impl.unregisterAllServices();
             }
         } catch (Throwable e) {
             Log.e(getClass().getName(), e.getMessage(), e);
-            sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_ERROR, "Exception During Catalyst Destroy: " + e.getMessage());
         }
     }
 }

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

@@ -14,8 +14,7 @@ import com.balthazargronon.RCTZeroconf.Zeroconf;
 import com.balthazargronon.RCTZeroconf.ZeroconfModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
@@ -24,6 +23,9 @@ import com.facebook.react.bridge.WritableNativeMap;
 import java.net.InetAddress;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -139,7 +141,7 @@ public class NsdServiceImpl implements Zeroconf {
     }
 
     @Override
-    public void registerService(String type, String protocol, String domain, String name, int port, ReadableMap txt) {
+    public void registerService(String type, String protocol, String domain, String name, int port, ReadableArray txt) {
         String serviceType = String.format("_%s._%s.", type, protocol);
 
         final NsdManager nsdManager = this.getNsdManager();
@@ -148,10 +150,9 @@ public class NsdServiceImpl implements Zeroconf {
         serviceInfo.setServiceType(serviceType);
         serviceInfo.setPort(port);
 
-        ReadableMapKeySetIterator iterator = txt.keySetIterator();
-        while (iterator.hasNextKey()) {
-            String key = iterator.nextKey();
-            serviceInfo.setAttribute(key, txt.getString(key));
+        for (int i = 0; i < txt.size(); i++) {
+            ReadableArray pair = txt.getArray(i);
+            serviceInfo.setAttribute(pair.getString(0), pair.getString(1));
         }
 
         nsdManager.registerService(
@@ -171,6 +172,13 @@ public class NsdServiceImpl implements Zeroconf {
         }
     }
 
+    @Override
+    public void unregisterAllServices() {
+        for (String serviceName : new ArrayList<>(mPublishedServices.keySet())) {
+            unregisterService(serviceName);
+        }
+    }
+
     private NsdManager getNsdManager() {
         if (mNsdManager == null) {
             mNsdManager = (NsdManager) getReactApplicationContext().getSystemService(Context.NSD_SERVICE);
@@ -275,19 +283,55 @@ public class NsdServiceImpl implements Zeroconf {
         }
     }
 
+    /**
+     * All the addresses of the service on Android 14+, only one before
+     */
+    @SuppressWarnings("deprecation")
+    private static List<InetAddress> getHostAddresses(NsdServiceInfo serviceInfo) {
+        if (Build.VERSION.SDK_INT >= 34) {
+            return serviceInfo.getHostAddresses();
+        }
+        InetAddress host = serviceInfo.getHost();
+        return host == null ? Collections.<InetAddress>emptyList() : Collections.singletonList(host);
+    }
+
+    /**
+     * The mDNS hostname (e.g. "MyHost.local.") when available.
+     * NsdServiceInfo.getHostname() is API 36 (or backported through the Connectivity module),
+     * it is called through reflection so the library still compiles against older SDKs.
+     */
+    private static String getMdnsHostname(NsdServiceInfo serviceInfo) {
+        try {
+            Object hostname = NsdServiceInfo.class.getMethod("getHostname").invoke(serviceInfo);
+            if (hostname instanceof String && !((String) hostname).isEmpty()) {
+                return hostname + ".local.";
+            }
+        } catch (Exception e) {
+            // Not available on this device
+        }
+        return null;
+    }
+
     private WritableMap serviceInfoToMap(NsdServiceInfo serviceInfo) {
         WritableMap service = new WritableNativeMap();
         service.putString(ZeroconfModule.KEY_SERVICE_NAME, serviceInfo.getServiceName());
-        final InetAddress host = serviceInfo.getHost();
+        final List<InetAddress> hostAddresses = getHostAddresses(serviceInfo);
         final String fullServiceName;
-        if (host == null) {
+        if (hostAddresses.isEmpty()) {
             fullServiceName = serviceInfo.getServiceName();
         } else {
-            fullServiceName = host.getHostName() + serviceInfo.getServiceType();
-            service.putString(ZeroconfModule.KEY_SERVICE_HOST, host.getHostName());
+            String hostname = getMdnsHostname(serviceInfo);
+            if (hostname == null) {
+                // No hostname API before Android 16, falls back to a reverse lookup (often the IP)
+                hostname = hostAddresses.get(0).getHostName();
+            }
+            fullServiceName = hostname + serviceInfo.getServiceType();
+            service.putString(ZeroconfModule.KEY_SERVICE_HOST, hostname);
 
             WritableArray addresses = new WritableNativeArray();
-            addresses.pushString(host.getHostAddress());
+            for (InetAddress address : hostAddresses) {
+                addresses.pushString(address.getHostAddress());
+            }
 
             service.putArray(ZeroconfModule.KEY_SERVICE_ADDRESSES, addresses);
         }

package/android/src/main/java/com/balthazargronon/RCTZeroconf/rx2dnssd/DnssdImpl.java

@@ -8,8 +8,7 @@ import android.util.Log;
 import com.balthazargronon.RCTZeroconf.Zeroconf;
 import com.balthazargronon.RCTZeroconf.ZeroconfModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
@@ -19,7 +18,9 @@ import com.github.druk.rx2dnssd.Rx2Dnssd;
 import com.github.druk.rx2dnssd.Rx2DnssdEmbedded;
 
 import java.net.InetAddress;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.List;
@@ -187,7 +188,7 @@ public class DnssdImpl implements Zeroconf {
     }
 
     @Override
-    public void registerService(String type, String protocol, String domain, String name, int port, ReadableMap txt) {
+    public void registerService(String type, String protocol, String domain, String name, int port, ReadableArray txt) {
         BonjourService bs = new BonjourService.Builder(0, 0, name, getServiceType(type, protocol), null)
                 .port(port)
                 .dnsRecords(getTxtRecordMap(txt))
@@ -210,12 +211,19 @@ public class DnssdImpl implements Zeroconf {
         mRegisteredDisposables.put(name, registerDisposable);
     }
 
-    private Map<String, String> getTxtRecordMap(ReadableMap txt) {
-        Map<String, String> txtMap = new HashMap<>();
-        ReadableMapKeySetIterator iterator = txt.keySetIterator();
-        while (iterator.hasNextKey()) {
-            String key = iterator.nextKey();
-            txtMap.put(key, txt.getString(key));
+    @Override
+    public void unregisterAllServices() {
+        for (String serviceName : new ArrayList<>(mRegisteredDisposables.keySet())) {
+            unregisterService(serviceName);
+        }
+    }
+
+    private Map<String, String> getTxtRecordMap(ReadableArray txt) {
+        // LinkedHashMap keeps the TXT record order
+        Map<String, String> txtMap = new LinkedHashMap<>();
+        for (int i = 0; i < txt.size(); i++) {
+            ReadableArray pair = txt.getArray(i);
+            txtMap.put(pair.getString(0), pair.getString(1));
         }
         return txtMap;
     }

package/dist/index.js

@@ -11,6 +11,30 @@ const ImplType = exports.ImplType = {
   NSD: 'NSD',
   DNSSD: 'DNSSD'
 };
+const isIPv6 = address => address.includes(':');
+
+/**
+ * Sort addresses IPv4 first and expose them by family
+ */
+const withAddressFamilies = service => {
+  const addresses = Array.isArray(service.addresses) ? service.addresses : [];
+  const ipv4 = addresses.filter(address => !isIPv6(address));
+  const ipv6 = addresses.filter(isIPv6);
+  return {
+    ...service,
+    addresses: [...ipv4, ...ipv6],
+    ipv4,
+    ipv6
+  };
+};
+
+/**
+ * TXT records as ordered [key, value] pairs, from an object or an array of pairs
+ */
+const toTxtPairs = txt => {
+  const entries = Array.isArray(txt) ? txt : Object.entries(txt || {});
+  return entries.map(([key, value]) => [String(key), String(value)]);
+};
 class Zeroconf extends _events.EventEmitter {
   constructor(props) {
     super(props);
@@ -61,10 +85,11 @@ class Zeroconf extends _events.EventEmitter {
       this.emit('remove', name);
       this.emit('update');
     });
-    this._dListeners.resolved = _reactNative.DeviceEventEmitter.addListener('RNZeroconfResolved', service => {
-      if (!service || !service.name) {
+    this._dListeners.resolved = _reactNative.DeviceEventEmitter.addListener('RNZeroconfResolved', data => {
+      if (!data || !data.name) {
         return;
       }
+      const service = withAddressFamilies(data);
       this._services[service.name] = service;
       this.emit('resolved', service);
       this.emit('update');
@@ -135,7 +160,7 @@ class Zeroconf extends _events.EventEmitter {
    * Publish a service
    */
   publishService(type, protocol, domain = 'local.', name, port, txt = {}, implType = ImplType.NSD) {
-    const txtRecord = Object.fromEntries(Object.entries(txt || {}).map(([key, value]) => [key, String(value)]));
+    const txtRecord = toTxtPairs(txt);
     if (_reactNative.Platform.OS === 'android') {
       this._publishedImplTypes[name] = implType;
       RNZeroconf.registerService(type, protocol, domain, name, port, txtRecord, implType);

package/index.d.ts

@@ -14,12 +14,22 @@ export interface Service {
   /** Hostname, e.g. `XeroxPrinter.local.` */
   host: string
   port: number
-  /** IPv4 and/or IPv6 addresses */
+  /** IPv4 and IPv6 addresses, IPv4 first */
   addresses: string[]
+  ipv4: string[]
+  ipv6: string[]
   /** TXT record attributes */
   txt: Record<string, string>
 }
 
+type TxtValue = string | number | boolean
+
+/** TXT records as an object, or as [key, value] pairs to control the order */
+export type TxtRecord = Record<string, TxtValue> | Array<[string, TxtValue]>
+
+/** Published services don't carry the address family fields */
+export type PublishedService = Omit<Service, 'ipv4' | 'ipv6'>
+
 export interface ZeroconfEvents {
   start: () => void
   stop: () => void
@@ -32,8 +42,8 @@ export interface ZeroconfEvents {
   /** Services list changed */
   update: () => void
   error: (error: Error) => void
-  published: (service: Service) => void
-  unpublished: (service: Service) => void
+  published: (service: PublishedService) => void
+  unpublished: (service: PublishedService) => void
 }
 
 /** Extends the `events` package EventEmitter */
@@ -79,7 +89,7 @@ export default class Zeroconf {
     domain: string | undefined,
     name: string,
     port: number,
-    txt?: Record<string, string | number | boolean>,
+    txt?: TxtRecord,
     implType?: ImplType,
   ): void
 

package/ios/RNZeroconf/RNZeroconf.h

@@ -10,8 +10,9 @@
 #import <React/RCTBridge.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventDispatcher.h>
+#import <React/RCTInvalidating.h>
 
-@interface RNZeroconf : NSObject <RCTBridgeModule, NSNetServiceBrowserDelegate, NSNetServiceDelegate>
+@interface RNZeroconf : NSObject <RCTBridgeModule, RCTInvalidating, NSNetServiceBrowserDelegate, NSNetServiceDelegate>
 
 @property (nonatomic, strong) NSNetServiceBrowser *browser;
 

package/ios/RNZeroconf/RNZeroconf.m

@@ -13,6 +13,11 @@
 
 @property (nonatomic, strong, readonly) NSMutableDictionary *resolvingServices;
 @property (nonatomic, strong, readonly) NSMutableDictionary *publishedServices;
+// Services already retried after a resolve timeout
+@property (nonatomic, strong, readonly) NSMutableSet<NSString *> *retriedServices;
+// Stopped browsers, kept alive until their asynchronous stop has been processed
+@property (nonatomic, strong, readonly) NSMutableSet<NSNetServiceBrowser *> *stoppingBrowsers;
+@property (nonatomic, assign) NSTimeInterval resolveTimeoutSeconds;
 
 @end
 
@@ -25,13 +30,34 @@ RCT_EXPORT_MODULE()
 RCT_EXPORT_METHOD(scan:(NSString *)type protocol:(NSString *)protocol domain:(NSString *)domain)
 {
     [self stop];
+
+    // A fresh browser for each scan, restarting a search on a browser that is still stopping can crash (#154)
+    self.browser = [[NSNetServiceBrowser alloc] init];
+    [self.browser setDelegate:self];
     [self.browser searchForServicesOfType:[NSString stringWithFormat:@"_%@._%@.", type, protocol] inDomain:domain];
 }
 
 RCT_EXPORT_METHOD(stop)
 {
-    [self.browser stop];
+    NSNetServiceBrowser *browser = self.browser;
+    if (browser) {
+        self.browser = nil;
+        [self.stoppingBrowsers addObject:browser];
+        [browser stop];
+
+        // The stop completes asynchronously on the run loop, release the browser well after it
+        __weak RNZeroconf *weakSelf = self;
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(10 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            browser.delegate = nil;
+            [weakSelf.stoppingBrowsers removeObject:browser];
+        });
+    }
+    for (NSNetService *service in self.resolvingServices.allValues) {
+        service.delegate = nil;
+        [service stop];
+    }
     [self.resolvingServices removeAllObjects];
+    [self.retriedServices removeAllObjects];
 }
 
 - (dispatch_queue_t)methodQueue
@@ -49,15 +75,14 @@ RCT_EXPORT_METHOD(registerService:(NSString *)type
                   domain:(NSString *)domain
                   name:(NSString *)name
                   port:(int)port
-                  txt:(NSDictionary *)txt)
+                  txt:(NSArray<NSArray<NSString *> *> *)txt)
 {
     const NSNetService *svc = [[NSNetService alloc] initWithDomain:domain type:[NSString stringWithFormat:@"_%@._%@.", type, protocol] name:name port:port];
     [svc setDelegate:self];
     [svc scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
 
-    if (txt) {
-      NSData *txtData = [NSNetService dataFromTXTRecordDictionary:txt];
-      [svc setTXTRecordData:txtData];
+    if (txt.count > 0) {
+      [svc setTXTRecordData:[self TXTRecordDataFromPairs:txt]];
     }
 
     [svc publish];
@@ -94,7 +119,7 @@ RCT_EXPORT_METHOD(unregisterService:(NSString *) serviceName)
     self.resolvingServices[service.name] = service;
 
     service.delegate = self;
-    [service resolveWithTimeout:5.0];
+    [service resolveWithTimeout:self.resolveTimeoutSeconds];
 }
 
 // When a service is removed.
@@ -128,7 +153,10 @@ RCT_EXPORT_METHOD(unregisterService:(NSString *) serviceName)
 // When the search stops.
 - (void) netServiceBrowserDidStopSearch:(NSNetServiceBrowser *)browser
 {
-    [self.bridge.eventDispatcher sendDeviceEventWithName:@"RNZeroconfStop" body:nil];
+    // A browser replaced by a newer scan stopping late shouldn't report the new scan as stopped
+    if (self.browser == nil || self.browser == browser) {
+        [self.bridge.eventDispatcher sendDeviceEventWithName:@"RNZeroconfStop" body:nil];
+    }
 }
 
 // When the search starts.
@@ -147,12 +175,22 @@ RCT_EXPORT_METHOD(unregisterService:(NSString *) serviceName)
 
     sender.delegate = nil;
     [self.resolvingServices removeObjectForKey:sender.name];
+    [self.retriedServices removeObject:sender.name];
 }
 
 // When the service has failed to resolve it's network data (IP addresses, etc)
 - (void) netService:(NSNetService *)sender
       didNotResolve:(NSDictionary *)errorDict
 {
+    // Slow devices can time out, retry once before reporting the error (#186)
+    NSNumber *code = errorDict[NSNetServicesErrorCode];
+    if (code.integerValue == NSNetServicesTimeoutError && ![self.retriedServices containsObject:sender.name]) {
+        [self.retriedServices addObject:sender.name];
+        [sender resolveWithTimeout:self.resolveTimeoutSeconds];
+        return;
+    }
+    [self.retriedServices removeObject:sender.name];
+
     [self reportError:errorDict];
 
     sender.delegate = nil;
@@ -206,13 +244,49 @@ RCT_EXPORT_METHOD(unregisterService:(NSString *) serviceName)
     if (self) {
         _resolvingServices = [[NSMutableDictionary alloc] init];
         _publishedServices = [[NSMutableDictionary alloc] init];
-        _browser = [[NSNetServiceBrowser alloc] init];
-        [_browser setDelegate:self];
+        _retriedServices = [[NSMutableSet alloc] init];
+        _stoppingBrowsers = [[NSMutableSet alloc] init];
+        _resolveTimeoutSeconds = 5.0;
     }
 
     return self;
 }
 
+// Builds the TXT record in the given order, unlike dataFromTXTRecordDictionary
+- (NSData *) TXTRecordDataFromPairs:(NSArray<NSArray<NSString *> *> *)pairs
+{
+    NSMutableData *data = [NSMutableData data];
+    for (NSArray<NSString *> *pair in pairs) {
+        if (pair.count != 2) {
+            continue;
+        }
+        NSData *entry = [[NSString stringWithFormat:@"%@=%@", pair[0], pair[1]] dataUsingEncoding:NSUTF8StringEncoding];
+        if (entry.length > 255) {
+            [self.bridge.eventDispatcher sendDeviceEventWithName:@"RNZeroconfError" body:[NSString stringWithFormat:@"TXT record entry %@ is longer than 255 bytes", pair[0]]];
+            continue;
+        }
+        uint8_t length = (uint8_t)entry.length;
+        [data appendBytes:&length length:1];
+        [data appendData:entry];
+    }
+    return data;
+}
+
+// Called when the bridge is torn down (e.g. reload): stop scanning and unpublish services
+- (void) invalidate
+{
+    [self stop];
+    // Delegates are unretained, detach them so stopping browsers never call a released module
+    for (NSNetServiceBrowser *browser in self.stoppingBrowsers) {
+        browser.delegate = nil;
+    }
+    for (NSNetService *service in self.publishedServices.allValues) {
+        service.delegate = nil;
+        [service stop];
+    }
+    [self.publishedServices removeAllObjects];
+}
+
 - (void) reportError:(NSDictionary *)errorDict
 {
     [self.bridge.eventDispatcher sendDeviceEventWithName:@"RNZeroconfError" body:[NSString stringWithFormat:@"%@",errorDict]];

package/package.json

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

package/src/index.js

@@ -8,6 +8,26 @@ export const ImplType = {
   DNSSD: 'DNSSD',
 }
 
+const isIPv6 = address => address.includes(':')
+
+/**
+ * Sort addresses IPv4 first and expose them by family
+ */
+const withAddressFamilies = service => {
+  const addresses = Array.isArray(service.addresses) ? service.addresses : []
+  const ipv4 = addresses.filter(address => !isIPv6(address))
+  const ipv6 = addresses.filter(isIPv6)
+  return { ...service, addresses: [...ipv4, ...ipv6], ipv4, ipv6 }
+}
+
+/**
+ * TXT records as ordered [key, value] pairs, from an object or an array of pairs
+ */
+const toTxtPairs = txt => {
+  const entries = Array.isArray(txt) ? txt : Object.entries(txt || {})
+  return entries.map(([key, value]) => [String(key), String(value)])
+}
+
 export default class Zeroconf extends EventEmitter {
   constructor(props) {
     super(props)
@@ -72,11 +92,12 @@ export default class Zeroconf extends EventEmitter {
       this.emit('update')
     })
 
-    this._dListeners.resolved = DeviceEventEmitter.addListener('RNZeroconfResolved', service => {
-      if (!service || !service.name) {
+    this._dListeners.resolved = DeviceEventEmitter.addListener('RNZeroconfResolved', data => {
+      if (!data || !data.name) {
         return
       }
 
+      const service = withAddressFamilies(data)
       this._services[service.name] = service
       this.emit('resolved', service)
       this.emit('update')
@@ -157,9 +178,7 @@ export default class Zeroconf extends EventEmitter {
    * Publish a service
    */
   publishService(type, protocol, domain = 'local.', name, port, txt = {}, implType = ImplType.NSD) {
-    const txtRecord = Object.fromEntries(
-      Object.entries(txt || {}).map(([key, value]) => [key, String(value)]),
-    )
+    const txtRecord = toTxtPairs(txt)
     if (Platform.OS === 'android') {
       this._publishedImplTypes[name] = implType
       RNZeroconf.registerService(type, protocol, domain, name, port, txtRecord, implType)