react-native-zeroconf 0.14.0 → 0.15.1

package/README.md

@@ -11,6 +11,7 @@ Discover and publish network services using Zeroconf protocols (Bonjour, Avahi,
 - **Cross-Platform**: Works on iOS and Android
 - **Dual Android Implementation**: Choose between NSD (Android native) or DNSSD (embedded mDNSResponder)
 - **Android 15+ Compatible**: Includes 16KB page size alignment (Google Play requirement starting November 1, 2025)
+- **TypeScript**: Type definitions included
 
 ## Installation
 
@@ -34,7 +35,7 @@ For manual installation, see the [wiki](https://github.com/balthazar/react-nativ
 
 ### Android Permissions
 
-Add the following permissions to your `AndroidManifest.xml`:
+The library declares the following permissions in its own manifest, so they are merged into your app automatically:
 
 ```xml
 <uses-permission android:name="android.permission.INTERNET" />
@@ -82,6 +83,23 @@ setTimeout(() => {
 }, 10000)
 ```
 
+## TypeScript
+
+Type definitions ship with the package, so `@types/react-native-zeroconf` is no longer needed (uninstall it to avoid conflicting types). Event listeners are typed by event name:
+
+```typescript
+import Zeroconf, { ImplType, Service } from 'react-native-zeroconf'
+
+const zeroconf = new Zeroconf()
+
+zeroconf.on('resolved', (service: Service) => {
+  console.log(service.name, service.addresses, service.txt)
+})
+zeroconf.on('remove', name => console.log(`${name} left`))
+
+zeroconf.scan('http', 'tcp', 'local.', ImplType.DNSSD)
+```
+
 ## API Reference
 
 ### Constructor
@@ -118,12 +136,10 @@ Stop the current scan.
 
 | Parameter  | Type   | Default | Description                                    |
 | ---------- | ------ | ------- | ---------------------------------------------- |
-| `implType` | string | `'NSD'` | **Android only**: Which implementation to stop |
+| `implType` | string | last scan's | **Android only**: Which implementation to stop. Defaults to the one used by the last `scan()` |
 
 ```javascript
 zeroconf.stop()
-// or on Android with DNSSD:
-zeroconf.stop('DNSSD')
 ```
 
 #### `getServices()`
@@ -146,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
@@ -154,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.
@@ -163,7 +189,7 @@ Remove a published service.
 | Parameter  | Type   | Default  | Description                            |
 | ---------- | ------ | -------- | -------------------------------------- |
 | `name`     | string | required | Name of the service to unpublish       |
-| `implType` | string | `'NSD'`  | **Android only**: Which implementation |
+| `implType` | string | publish's | **Android only**: Which implementation. Defaults to the one the service was published with |
 
 ```javascript
 zeroconf.unpublishService('MyWebServer')
@@ -219,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'
@@ -230,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/build.gradle

@@ -18,11 +18,6 @@ android {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
         }
 
-        externalNativeBuild {
-            ndkBuild {
-                arguments "NDK_APPLICATION_MK:=src/main/jni/Application.mk"
-            }
-        }
     }
 
     externalNativeBuild {
@@ -50,6 +45,4 @@ dependencies {
     // RxJava2 for Rx2Dnssd (bundled from Discord's RxDNSSD fork)
     api 'io.reactivex.rxjava2:rxjava:2.2.21'
     api 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    // https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
-    api group: 'org.apache.commons', name: 'commons-lang3', version: '3.11'
 }

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
 </manifest>

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

@@ -5,9 +5,9 @@ import com.balthazargronon.RCTZeroconf.rx2dnssd.DnssdImpl;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 
-import org.apache.commons.lang3.StringUtils;
-
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class ZeroConfImplFactory {
@@ -25,7 +25,7 @@ public class ZeroConfImplFactory {
     }
 
     public Zeroconf getZeroconf(String implType) {
-        if (StringUtils.isBlank(implType)) implType = ZeroConfImplFactory.NSD_IMPL;
+        if (implType == null || implType.trim().isEmpty()) implType = ZeroConfImplFactory.NSD_IMPL;
         return getOrCreateImpl(implType);
     }
 
@@ -46,4 +46,11 @@ public class ZeroConfImplFactory {
         return zeroconfMap.get(implType);
     }
 
+    /**
+     * Implementations that have already been created, without instantiating new ones
+     */
+    public List<Zeroconf> getCreatedImpls() {
+        return new ArrayList<>(zeroconfMap.values());
+    }
+
 }

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,20 +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 {
-            stop(ZeroConfImplFactory.NSD_IMPL);
-            stop(ZeroConfImplFactory.DNSSD_IMPL);
+            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

@@ -6,25 +6,34 @@ import android.net.nsd.NsdManager;
 import android.net.nsd.NsdServiceInfo;
 import android.net.wifi.WifiManager;
 import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
+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;
 import com.facebook.react.bridge.WritableNativeMap;
 
-import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
-import java.util.HashMap;
+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;
 
 public class NsdServiceImpl implements Zeroconf {
+    private static final String TAG = "NsdServiceImpl";
+    private static final long RESOLVE_RETRY_DELAY_MS = 100;
+
     private NsdManager mNsdManager;
     private NsdManager.DiscoveryListener mDiscoveryListener;
     private WifiManager.MulticastLock multicastLock;
@@ -32,10 +41,15 @@ public class NsdServiceImpl implements Zeroconf {
     private ZeroconfModule zeroconfModule;
     private ReactApplicationContext reactApplicationContext;
 
+    // NsdManager can only resolve one service at a time before API 34, so resolves are queued
+    private final ArrayDeque<NsdServiceInfo> mResolveQueue = new ArrayDeque<>();
+    private boolean mIsResolving = false;
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+
     public NsdServiceImpl(ZeroconfModule zeroconfModule, ReactApplicationContext reactApplicationContext) {
         this.zeroconfModule = zeroconfModule;
         this.reactApplicationContext = reactApplicationContext;
-        mPublishedServices = new HashMap<String, NsdManager.RegistrationListener>();
+        mPublishedServices = new ConcurrentHashMap<String, NsdManager.RegistrationListener>();
     }
 
     @Override
@@ -68,29 +82,29 @@ public class NsdServiceImpl implements Zeroconf {
 
             @Override
             public void onDiscoveryStarted(String serviceType) {
-                System.out.println("On Discovery Started");
+                Log.d(TAG, "Discovery started");
                 zeroconfModule.sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_START, null);
             }
 
             @Override
             public void onDiscoveryStopped(String serviceType) {
-                System.out.println("On Discovery Stopped");
+                Log.d(TAG, "Discovery stopped");
                 zeroconfModule.sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_STOP, null);
             }
 
             @Override
             public void onServiceFound(NsdServiceInfo serviceInfo) {
-                System.out.println("On Service Found");
+                Log.d(TAG, "Service found");
                 WritableMap service = new WritableNativeMap();
                 service.putString(ZeroconfModule.KEY_SERVICE_NAME, serviceInfo.getServiceName());
 
                 zeroconfModule.sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_FOUND, service);
-                mNsdManager.resolveService(serviceInfo, new NsdServiceImpl.ZeroResolveListener());
+                enqueueResolve(serviceInfo);
             }
 
             @Override
             public void onServiceLost(NsdServiceInfo serviceInfo) {
-                System.out.println("On Service Lost");
+                Log.d(TAG, "Service lost");
                 WritableMap service = new WritableNativeMap();
                 service.putString(ZeroconfModule.KEY_SERVICE_NAME, serviceInfo.getServiceName());
                 zeroconfModule.sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_REMOVE, service);
@@ -103,8 +117,19 @@ public class NsdServiceImpl implements Zeroconf {
 
     @Override
     public void stop() {
-        if (mDiscoveryListener != null) {
-            mNsdManager.stopServiceDiscovery(mDiscoveryListener);
+        if (mDiscoveryListener != null && mNsdManager != null) {
+            try {
+                mNsdManager.stopServiceDiscovery(mDiscoveryListener);
+            } catch (IllegalArgumentException e) {
+                // Listener was never registered or already unregistered (e.g. discovery failed to start)
+                Log.w(TAG, "stopServiceDiscovery failed", e);
+            }
+        }
+
+        mHandler.removeCallbacksAndMessages(null);
+        synchronized (mResolveQueue) {
+            mResolveQueue.clear();
+            mIsResolving = false;
         }
 
         if (multicastLock != null) {
@@ -116,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();
@@ -125,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(
@@ -148,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);
@@ -159,21 +190,60 @@ public class NsdServiceImpl implements Zeroconf {
         return reactApplicationContext;
     }
 
+    private void enqueueResolve(NsdServiceInfo serviceInfo) {
+        synchronized (mResolveQueue) {
+            mResolveQueue.add(serviceInfo);
+        }
+        resolveNext();
+    }
+
+    private void resolveNext() {
+        NsdServiceInfo next;
+        synchronized (mResolveQueue) {
+            if (mIsResolving || mResolveQueue.isEmpty()) {
+                return;
+            }
+            next = mResolveQueue.poll();
+            mIsResolving = true;
+        }
+        try {
+            getNsdManager().resolveService(next, new ZeroResolveListener());
+        } catch (Throwable e) {
+            Log.e(TAG, "resolveService failed", e);
+            zeroconfModule.sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_ERROR, "Resolving service failed: " + e.getMessage());
+            onResolveDone();
+        }
+    }
+
+    private void onResolveDone() {
+        synchronized (mResolveQueue) {
+            mIsResolving = false;
+        }
+        resolveNext();
+    }
+
     private class ZeroResolveListener implements NsdManager.ResolveListener {
         @Override
         public void onResolveFailed(NsdServiceInfo serviceInfo, int errorCode) {
             if (errorCode == NsdManager.FAILURE_ALREADY_ACTIVE) {
-                mNsdManager.resolveService(serviceInfo, this);
-            } else {
-                String error = "Resolving service failed with code: " + errorCode;
-                zeroconfModule.sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_ERROR, error);
+                // Another resolve (possibly from another app or listener) is in flight: retry shortly
+                synchronized (mResolveQueue) {
+                    mResolveQueue.addFirst(serviceInfo);
+                    mIsResolving = false;
+                }
+                mHandler.postDelayed(NsdServiceImpl.this::resolveNext, RESOLVE_RETRY_DELAY_MS);
+                return;
             }
+            String error = "Resolving service failed with code: " + errorCode;
+            zeroconfModule.sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_ERROR, error);
+            onResolveDone();
         }
 
         @Override
         public void onServiceResolved(NsdServiceInfo serviceInfo) {
             WritableMap service = serviceInfoToMap(serviceInfo);
             zeroconfModule.sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_RESOLVE, service);
+            onResolveDone();
         }
     }
 
@@ -194,7 +264,8 @@ public class NsdServiceImpl implements Zeroconf {
 
         @Override
         public void onRegistrationFailed(NsdServiceInfo serviceInfo, int errorCode) {
-            // Registration failed!  Put debugging code here to determine why.
+            String error = "Registering service " + serviceInfo.getServiceName() + " failed with code: " + errorCode;
+            zeroconfModule.sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_ERROR, error);
         }
 
         @Override
@@ -207,23 +278,60 @@ public class NsdServiceImpl implements Zeroconf {
 
         @Override
         public void onUnregistrationFailed(NsdServiceInfo serviceInfo, int errorCode) {
-            // Unregistration failed.  Put debugging code here to determine why.
+            String error = "Unregistering service " + serviceInfo.getServiceName() + " failed with code: " + errorCode;
+            zeroconfModule.sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_ERROR, error);
         }
     }
 
+    /**
+     * 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);
         }
@@ -234,13 +342,10 @@ public class NsdServiceImpl implements Zeroconf {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             Map<String, byte[]> attributes = serviceInfo.getAttributes();
-            for (String key : attributes.keySet()) {
-                try {
+            if (attributes != null) {
+                for (String key : attributes.keySet()) {
                     byte[] recordValue = attributes.get(key);
-                    txtRecords.putString(String.format(Locale.getDefault(), "%s", key), String.format(Locale.getDefault(), "%s", recordValue != null ? new String(recordValue, "UTF_8") : ""));
-                } catch (UnsupportedEncodingException e) {
-                    String error = "Failed to encode txtRecord: " + e;
-                    zeroconfModule.sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_ERROR, error);
+                    txtRecords.putString(String.format(Locale.getDefault(), "%s", key), recordValue != null ? new String(recordValue, StandardCharsets.UTF_8) : "");
                 }
             }
         }

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,18 +18,23 @@ 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;
 
 import javax.annotation.Nullable;
 
+import io.reactivex.Flowable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
 public class DnssdImpl implements Zeroconf {
+    private static final String TAG = "DnssdImpl";
+
     private Rx2Dnssd rxDnssd;
 
     @Nullable
@@ -74,26 +78,49 @@ public class DnssdImpl implements Zeroconf {
         }
 
         String serviceType = getServiceType(type, protocol);
-        Log.d("DnssdImpl", "Starting DNSSD scan for: " + serviceType);
+        Log.d(TAG, "Starting DNSSD scan for: " + serviceType);
 
         // Emit start event
         zeroconfModule.sendEvent(reactApplicationContext, ZeroconfModule.EVENT_START, null);
 
         browseDisposable = rxDnssd.browse(serviceType, "local.")
-                .compose(rxDnssd.resolve())
-                .compose(rxDnssd.queryRecords())
+                .doOnNext(bonjourService -> {
+                    if (!bonjourService.isLost()) {
+                        zeroconfModule.sendEvent(reactApplicationContext, ZeroconfModule.EVENT_FOUND, serviceNameToMap(bonjourService));
+                    }
+                })
+                // Resolve each service independently so a single failure doesn't end the whole browse
+                .flatMap(bonjourService -> bonjourService.isLost()
+                        ? Flowable.just(bonjourService)
+                        : Flowable.just(bonjourService)
+                                .compose(rxDnssd.resolve())
+                                .compose(rxDnssd.queryRecords())
+                                .onErrorResumeNext((Throwable throwable) -> {
+                                    Log.e(TAG, "Error resolving service: ", throwable);
+                                    zeroconfModule.sendEvent(reactApplicationContext, ZeroconfModule.EVENT_ERROR, "Resolving service failed: " + throwable.getMessage());
+                                    return Flowable.empty();
+                                }))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(bonjourService -> {
-                    WritableMap service = serviceInfoToMap(bonjourService);
-                    Log.d(getClass().getName(), service.toString());
-                    zeroconfModule.sendEvent(reactApplicationContext, ZeroconfModule.EVENT_RESOLVE, service);
+                    if (bonjourService.isLost()) {
+                        zeroconfModule.sendEvent(reactApplicationContext, ZeroconfModule.EVENT_REMOVE, serviceNameToMap(bonjourService));
+                        return;
+                    }
+                    zeroconfModule.sendEvent(reactApplicationContext, ZeroconfModule.EVENT_RESOLVE, serviceInfoToMap(bonjourService));
                 }, throwable -> {
-                    Log.e(getClass().getName(), "Error resolving service: ", throwable);
-                    zeroconfModule.sendEvent(reactApplicationContext, ZeroconfModule.EVENT_ERROR, throwable.getMessage());
+                    Log.e(TAG, "Error browsing services: ", throwable);
+                    zeroconfModule.sendEvent(reactApplicationContext, ZeroconfModule.EVENT_ERROR, "Browsing services failed: " + throwable.getMessage());
+                    zeroconfModule.sendEvent(reactApplicationContext, ZeroconfModule.EVENT_STOP, null);
                 });
     }
 
+    private WritableMap serviceNameToMap(BonjourService serviceInfo) {
+        WritableMap service = new WritableNativeMap();
+        service.putString(ZeroconfModule.KEY_SERVICE_NAME, serviceInfo.getServiceName());
+        return service;
+    }
+
     private String getServiceType(String type, String protocol) {
         return String.format("_%s._%s", type, protocol);
     }
@@ -102,10 +129,11 @@ public class DnssdImpl implements Zeroconf {
         WritableMap service = new WritableNativeMap();
         service.putString(ZeroconfModule.KEY_SERVICE_NAME, serviceInfo.getServiceName());
         final List<InetAddress> hostList = serviceInfo.getInetAddresses();
-        final String fullServiceName;
-        Log.d("TAG", serviceInfo.getServiceName());
-        fullServiceName = serviceInfo.getServiceName();
-        service.putString(ZeroconfModule.KEY_SERVICE_HOST, fullServiceName);
+        final String hostname = serviceInfo.getHostname();
+        final String fullServiceName = hostname != null
+                ? hostname + serviceInfo.getRegType()
+                : serviceInfo.getServiceName();
+        service.putString(ZeroconfModule.KEY_SERVICE_HOST, hostname != null ? hostname : serviceInfo.getServiceName());
 
         WritableArray addresses = new WritableNativeArray();
         for (InetAddress host : hostList) {
@@ -160,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))
@@ -170,23 +198,32 @@ public class DnssdImpl implements Zeroconf {
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(bonjourService -> {
-                    Log.i("TAG", "Register successfully " + bonjourService.toString());
+                    Log.i(TAG, "Registered service " + bonjourService.toString());
 
                     mPublishedServices.put(bs.getServiceName(), bs);
                     zeroconfModule.sendEvent(reactApplicationContext, ZeroconfModule.EVENT_PUBLISHED, serviceInfoToMap(bonjourService));
                 }, throwable -> {
-                    Log.e("TAG", "error", throwable);
+                    Log.e(TAG, "Error registering service: ", throwable);
+                    zeroconfModule.sendEvent(reactApplicationContext, ZeroconfModule.EVENT_ERROR, "Registering service failed: " + throwable.getMessage());
+                    mRegisteredDisposables.remove(name);
                 });
 
         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,11 +11,40 @@ 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);
+    if (!RNZeroconf) {
+      throw new Error('react-native-zeroconf: native module not found. Make sure the library is linked and the app rebuilt. Expo Go is not supported, use a development build instead.');
+    }
     this._services = {};
     this._publishedServices = {};
+    this._publishedImplTypes = {};
+    this._scanImplType = null;
     this._dListeners = {};
     this.addDeviceListeners();
   }
@@ -56,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');
@@ -103,6 +133,11 @@ class Zeroconf extends _events.EventEmitter {
     this._services = {};
     this.emit('update');
     if (_reactNative.Platform.OS === 'android') {
+      if (this._scanImplType && implType !== this._scanImplType) {
+        // Only one scan runs at a time, stop the one running on the other implementation
+        RNZeroconf.stop(this._scanImplType);
+      }
+      this._scanImplType = implType;
       RNZeroconf.scan(type, protocol, domain, implType);
     } else {
       RNZeroconf.scan(type, protocol, domain);
@@ -110,9 +145,10 @@ class Zeroconf extends _events.EventEmitter {
   }
 
   /**
-   * Stop current scan if any
+   * Stop current scan if any,
+   * Defaults to the implementation used by the last scan
    */
-  stop(implType = ImplType.NSD) {
+  stop(implType = this._scanImplType || ImplType.NSD) {
     if (_reactNative.Platform.OS === 'android') {
       RNZeroconf.stop(implType);
     } else {
@@ -124,21 +160,22 @@ class Zeroconf extends _events.EventEmitter {
    * Publish a service
    */
   publishService(type, protocol, domain = 'local.', name, port, txt = {}, implType = ImplType.NSD) {
-    if (Object.keys(txt).length !== 0) {
-      Object.entries(txt).map(([key, value]) => txt[key] = value.toString());
-    }
+    const txtRecord = toTxtPairs(txt);
     if (_reactNative.Platform.OS === 'android') {
-      RNZeroconf.registerService(type, protocol, domain, name, port, txt, implType);
+      this._publishedImplTypes[name] = implType;
+      RNZeroconf.registerService(type, protocol, domain, name, port, txtRecord, implType);
     } else {
-      RNZeroconf.registerService(type, protocol, domain, name, port, txt);
+      RNZeroconf.registerService(type, protocol, domain, name, port, txtRecord);
     }
   }
 
   /**
-   * Unpublish a service
+   * Unpublish a service,
+   * Defaults to the implementation the service was published with
    */
-  unpublishService(name, implType = ImplType.NSD) {
+  unpublishService(name, implType = this._publishedImplTypes[name] || ImplType.NSD) {
     if (_reactNative.Platform.OS === 'android') {
+      delete this._publishedImplTypes[name];
       RNZeroconf.unregisterService(name, implType);
     } else {
       RNZeroconf.unregisterService(name);

package/index.d.ts

@@ -0,0 +1,101 @@
+export declare const ImplType: {
+  readonly NSD: 'NSD'
+  readonly DNSSD: 'DNSSD'
+}
+
+/** Android only: which discovery implementation to use */
+export type ImplType = (typeof ImplType)[keyof typeof ImplType]
+
+export interface Service {
+  /** Human-readable service name */
+  name: string
+  /** Full service name, e.g. `XeroxPrinter.local._http._tcp.` */
+  fullName: string
+  /** Hostname, e.g. `XeroxPrinter.local.` */
+  host: string
+  port: number
+  /** 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
+  /** Service found, before resolution */
+  found: (name: string) => void
+  /** Service fully resolved with network info */
+  resolved: (service: Service) => void
+  /** Service removed from the network */
+  remove: (name: string) => void
+  /** Services list changed */
+  update: () => void
+  error: (error: Error) => void
+  published: (service: PublishedService) => void
+  unpublished: (service: PublishedService) => void
+}
+
+/** Extends the `events` package EventEmitter */
+export default class Zeroconf {
+  constructor()
+
+  on<E extends keyof ZeroconfEvents>(event: E, listener: ZeroconfEvents[E]): this
+  once<E extends keyof ZeroconfEvents>(event: E, listener: ZeroconfEvents[E]): this
+  addListener<E extends keyof ZeroconfEvents>(event: E, listener: ZeroconfEvents[E]): this
+  removeListener<E extends keyof ZeroconfEvents>(event: E, listener: ZeroconfEvents[E]): this
+  off<E extends keyof ZeroconfEvents>(event: E, listener: ZeroconfEvents[E]): this
+  removeAllListeners(event?: keyof ZeroconfEvents): this
+  listenerCount(event: keyof ZeroconfEvents): number
+
+  /** Add the native event listeners (called automatically in the constructor) */
+  addDeviceListeners(): void
+
+  /** Remove the native event listeners, call it when you are done with the instance */
+  removeDeviceListeners(): void
+
+  /** All the services found so far, keyed by name */
+  getServices(): Record<string, Service>
+
+  /**
+   * Scan for services, defaults to `_http._tcp.` on the `local.` domain
+   * @param implType Android only, defaults to `NSD`
+   */
+  scan(type?: string, protocol?: string, domain?: string, implType?: ImplType): void
+
+  /**
+   * Stop the current scan
+   * @param implType Android only, defaults to the implementation used by the last scan
+   */
+  stop(implType?: ImplType): void
+
+  /**
+   * Publish a service. Type and protocol are passed without underscores, e.g. `('http', 'tcp', ...)`
+   * @param implType Android only, defaults to `NSD`
+   */
+  publishService(
+    type: string,
+    protocol: string,
+    domain: string | undefined,
+    name: string,
+    port: number,
+    txt?: TxtRecord,
+    implType?: ImplType,
+  ): void
+
+  /**
+   * Unpublish a service
+   * @param implType Android only, defaults to the implementation the service was published with
+   */
+  unpublishService(name: string, implType?: ImplType): void
+}

package/ios/RNZeroconf/RNNetServiceSerializer.m

@@ -35,9 +35,13 @@ const NSString *kRNServiceTxtRecords = @"txt";
         NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
         for (NSString *key in txtRecordDict) {
             @try{
-                dict[key] = [[NSString alloc]
-                            initWithData:txtRecordDict[key]
-                            encoding:NSASCIIStringEncoding];
+                NSData *value = txtRecordDict[key];
+                NSString *string = [[NSString alloc] initWithData:value encoding:NSUTF8StringEncoding];
+                if (string == nil) {
+                    // Not valid UTF-8, fall back to a lossless 8-bit decoding
+                    string = [[NSString alloc] initWithData:value encoding:NSISOLatin1StringEncoding];
+                }
+                dict[key] = string;
             }
             @catch(NSException *exception){
                 NSLog(@"%@", exception);

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

@@ -49,15 +49,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];
@@ -106,6 +105,14 @@ RCT_EXPORT_METHOD(unregisterService:(NSString *) serviceName)
       return;
     }
 
+    // Stop any pending resolve for the removed service
+    NSNetService *resolving = self.resolvingServices[service.name];
+    if (resolving) {
+        resolving.delegate = nil;
+        [resolving stop];
+        [self.resolvingServices removeObjectForKey:service.name];
+    }
+
     NSDictionary *serviceInfo = [RNNetServiceSerializer serializeServiceToDictionary:service resolved:NO];
     [self.bridge.eventDispatcher sendDeviceEventWithName:@"RNZeroconfRemove" body:serviceInfo];
 }
@@ -205,6 +212,42 @@ RCT_EXPORT_METHOD(unregisterService:(NSString *) serviceName)
     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.browser stop];
+    for (NSNetService *service in self.resolvingServices.allValues) {
+        service.delegate = nil;
+        [service stop];
+    }
+    [self.resolvingServices removeAllObjects];
+    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,8 +1,9 @@
 {
   "name": "react-native-zeroconf",
-  "version": "0.14.0",
+  "version": "0.15.1",
   "description": "A Zeroconf discovery utility for react-native",
   "main": "dist",
+  "types": "index.d.ts",
   "scripts": {
     "lint": "eslint src/*.js",
     "format": "prettier --write src/*.js",
@@ -15,6 +16,7 @@
   "files": [
     "src",
     "dist",
+    "index.d.ts",
     "android",
     "ios",
     "react-native-zeroconf.podspec",

package/src/index.js

@@ -8,12 +8,40 @@ 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)
 
+    if (!RNZeroconf) {
+      throw new Error(
+        'react-native-zeroconf: native module not found. Make sure the library is linked and the app rebuilt. Expo Go is not supported, use a development build instead.',
+      )
+    }
+
     this._services = {}
     this._publishedServices = {}
+    this._publishedImplTypes = {}
+    this._scanImplType = null
     this._dListeners = {}
 
     this.addDeviceListeners()
@@ -64,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')
@@ -122,6 +151,11 @@ export default class Zeroconf extends EventEmitter {
     this._services = {}
     this.emit('update')
     if (Platform.OS === 'android') {
+      if (this._scanImplType && implType !== this._scanImplType) {
+        // Only one scan runs at a time, stop the one running on the other implementation
+        RNZeroconf.stop(this._scanImplType)
+      }
+      this._scanImplType = implType
       RNZeroconf.scan(type, protocol, domain, implType)
     } else {
       RNZeroconf.scan(type, protocol, domain)
@@ -129,9 +163,10 @@ export default class Zeroconf extends EventEmitter {
   }
 
   /**
-   * Stop current scan if any
+   * Stop current scan if any,
+   * Defaults to the implementation used by the last scan
    */
-  stop(implType = ImplType.NSD) {
+  stop(implType = this._scanImplType || ImplType.NSD) {
     if (Platform.OS === 'android') {
       RNZeroconf.stop(implType)
     } else {
@@ -143,21 +178,22 @@ export default class Zeroconf extends EventEmitter {
    * Publish a service
    */
   publishService(type, protocol, domain = 'local.', name, port, txt = {}, implType = ImplType.NSD) {
-    if (Object.keys(txt).length !== 0) {
-      Object.entries(txt).map(([key, value]) => (txt[key] = value.toString()))
-    }
+    const txtRecord = toTxtPairs(txt)
     if (Platform.OS === 'android') {
-      RNZeroconf.registerService(type, protocol, domain, name, port, txt, implType)
+      this._publishedImplTypes[name] = implType
+      RNZeroconf.registerService(type, protocol, domain, name, port, txtRecord, implType)
     } else {
-      RNZeroconf.registerService(type, protocol, domain, name, port, txt)
+      RNZeroconf.registerService(type, protocol, domain, name, port, txtRecord)
     }
   }
 
   /**
-   * Unpublish a service
+   * Unpublish a service,
+   * Defaults to the implementation the service was published with
    */
-  unpublishService(name, implType = ImplType.NSD) {
+  unpublishService(name, implType = this._publishedImplTypes[name] || ImplType.NSD) {
     if (Platform.OS === 'android') {
+      delete this._publishedImplTypes[name]
       RNZeroconf.unregisterService(name, implType)
     } else {
       RNZeroconf.unregisterService(name)