react-native-zeroconf 0.15.2 → 0.16.0

package/dist/index.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ImplType = void 0;
+exports.useZeroconf = useZeroconf;
+var _react = require("react");
 var _reactNative = require("react-native");
 var _events = require("events");
 const RNZeroconf = _reactNative.NativeModules.RNZeroconf;
@@ -11,6 +13,70 @@ const ImplType = exports.ImplType = {
   NSD: 'NSD',
   DNSSD: 'DNSSD'
 };
+const SCAN_DEFAULTS = {
+  type: 'http',
+  protocol: 'tcp',
+  domain: 'local.',
+  implType: ImplType.NSD,
+  resolveTimeout: 5
+};
+const PUBLISH_DEFAULTS = {
+  domain: 'local.',
+  txt: {},
+  implType: ImplType.NSD
+};
+
+/**
+ * Merge options over defaults, ignoring undefined values
+ */
+const withDefaults = (defaults, options) => {
+  const merged = {
+    ...defaults
+  };
+  Object.entries(options).forEach(([key, value]) => {
+    if (value !== undefined) {
+      merged[key] = value;
+    }
+  });
+  return merged;
+};
+const isOptionsObject = value => value !== null && typeof value === 'object';
+
+// Each instance runs its own scan, identified by this id in native events
+let instanceCount = 0;
+
+/**
+ * Error from a native { message, code, domain, serviceName } payload
+ */
+const toError = payload => {
+  if (!payload || typeof payload !== 'object') {
+    return new Error(payload);
+  }
+  const error = new Error(payload.message);
+  error.code = payload.code;
+  error.domain = payload.domain;
+  if (payload.serviceName) {
+    error.serviceName = payload.serviceName;
+  }
+  return error;
+};
+
+/**
+ * Promise rejections carry the same payload as error events in userInfo
+ */
+const toRejection = error => error && error.userInfo && error.userInfo.domain ? toError(error.userInfo) : error;
+
+/**
+ * Normalizes rejections, and marks the promise handled so callers that don't await it
+ * don't get unhandled rejection warnings (errors are also emitted as error events)
+ */
+const asPromise = nativePromise => {
+  const promise = Promise.resolve(nativePromise).catch(error => {
+    throw toRejection(error);
+  });
+  promise.catch(() => {});
+  return promise;
+};
 const isIPv6 = address => address.includes(':');
 
 /**
@@ -45,6 +111,8 @@ class Zeroconf extends _events.EventEmitter {
     this._publishedServices = {};
     this._publishedImplTypes = {};
     this._scanImplType = null;
+    this._scanId = `zeroconf-${++instanceCount}`;
+    this._hasScanned = false;
     this._dListeners = {};
     this.addDeviceListeners();
   }
@@ -56,26 +124,36 @@ class Zeroconf extends _events.EventEmitter {
     if (Object.keys(this._dListeners).length) {
       return this.emit('error', new Error('RNZeroconf listeners already in place.'));
     }
-    this._dListeners.start = _reactNative.DeviceEventEmitter.addListener('RNZeroconfStart', () => this.emit('start'));
-    this._dListeners.stop = _reactNative.DeviceEventEmitter.addListener('RNZeroconfStop', () => this.emit('stop'));
+    this._dListeners.start = _reactNative.DeviceEventEmitter.addListener('RNZeroconfStart', payload => {
+      if (this._isOwnEvent(payload)) {
+        this.emit('start');
+      }
+    });
+    this._dListeners.stop = _reactNative.DeviceEventEmitter.addListener('RNZeroconfStop', payload => {
+      if (this._isOwnEvent(payload)) {
+        this.emit('stop');
+      }
+    });
     this._dListeners.error = _reactNative.DeviceEventEmitter.addListener('RNZeroconfError', err => {
-      if (this.listenerCount('error') > 0) {
-        this.emit('error', new Error(err));
+      if (this._isOwnEvent(err) && this.listenerCount('error') > 0) {
+        this.emit('error', toError(err));
       }
     });
     this._dListeners.found = _reactNative.DeviceEventEmitter.addListener('RNZeroconfFound', service => {
-      if (!service || !service.name) {
+      if (!service || !service.name || !this._isOwnEvent(service)) {
         return;
       }
       const {
         name
       } = service;
-      this._services[name] = service;
+      this._services[name] = {
+        name
+      };
       this.emit('found', name);
       this.emit('update');
     });
     this._dListeners.remove = _reactNative.DeviceEventEmitter.addListener('RNZeroconfRemove', service => {
-      if (!service || !service.name) {
+      if (!service || !service.name || !this._isOwnEvent(service)) {
         return;
       }
       const {
@@ -86,10 +164,14 @@ class Zeroconf extends _events.EventEmitter {
       this.emit('update');
     });
     this._dListeners.resolved = _reactNative.DeviceEventEmitter.addListener('RNZeroconfResolved', data => {
-      if (!data || !data.name) {
+      if (!data || !data.name || !this._isOwnEvent(data)) {
         return;
       }
-      const service = withAddressFamilies(data);
+      const resolved = {
+        ...data
+      };
+      delete resolved.scanId;
+      const service = withAddressFamilies(resolved);
       this._services[service.name] = service;
       this.emit('resolved', service);
       this.emit('update');
@@ -110,6 +192,25 @@ class Zeroconf extends _events.EventEmitter {
     });
   }
 
+  /**
+   * Add a listener and get a function that removes it, handy in useEffect cleanups
+   */
+  subscribe(event, listener) {
+    this.on(event, listener);
+    return () => this.removeListener(event, listener);
+  }
+
+  /**
+   * Scan events belong to the instance that started the scan. Instances that never scanned still receive
+   * every scan's events, as before multiple scans, and events without a scan id (publishing) go to everyone.
+   */
+  _isOwnEvent(payload) {
+    if (!payload || typeof payload !== 'object' || payload.scanId == null || !this._hasScanned) {
+      return true;
+    }
+    return payload.scanId === this._scanId;
+  }
+
   /**
    * Remove all event listeners and clean map
    */
@@ -126,21 +227,36 @@ class Zeroconf extends _events.EventEmitter {
   }
 
   /**
-   * Scan for Zeroconf services,
-   * Defaults to _http._tcp. on local domain
+   * Scan for Zeroconf services, defaults to _http._tcp. on the local. domain
+   *
+   * scan({ type, protocol, domain, implType, resolveTimeout })
+   * scan(type, protocol, domain, implType) is deprecated
    */
-  scan(type = 'http', protocol = 'tcp', domain = 'local.', implType = ImplType.NSD) {
+  scan(options, protocolArg, domainArg, implTypeArg) {
+    const {
+      type,
+      protocol,
+      domain,
+      implType,
+      resolveTimeout
+    } = withDefaults(SCAN_DEFAULTS, isOptionsObject(options) ? options : {
+      type: options,
+      protocol: protocolArg,
+      domain: domainArg,
+      implType: implTypeArg
+    });
     this._services = {};
+    this._hasScanned = true;
     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 instance's scan moves to the other implementation
+        RNZeroconf.stop(this._scanId, this._scanImplType);
       }
       this._scanImplType = implType;
-      RNZeroconf.scan(type, protocol, domain, implType);
+      RNZeroconf.scan(this._scanId, type, protocol, domain, implType);
     } else {
-      RNZeroconf.scan(type, protocol, domain);
+      RNZeroconf.scan(this._scanId, type, protocol, domain, resolveTimeout);
     }
   }
 
@@ -150,36 +266,137 @@ class Zeroconf extends _events.EventEmitter {
    */
   stop(implType = this._scanImplType || ImplType.NSD) {
     if (_reactNative.Platform.OS === 'android') {
-      RNZeroconf.stop(implType);
+      RNZeroconf.stop(this._scanId, implType);
     } else {
-      RNZeroconf.stop();
+      RNZeroconf.stop(this._scanId);
+    }
+  }
+
+  /**
+   * Checks the iOS Local Network permission, resolves 'granted', 'denied' or 'unknown'.
+   * Uses a service type from NSBonjourServices (the first one by default) and can show the permission prompt.
+   * Android has no equivalent permission to check and resolves 'unknown'.
+   */
+  checkLocalNetworkAccess({
+    type,
+    protocol = 'tcp',
+    timeout = 5
+  } = {}) {
+    if (_reactNative.Platform.OS === 'android') {
+      return Promise.resolve('unknown');
     }
+    const serviceType = type ? `_${type}._${protocol}` : null;
+    return asPromise(RNZeroconf.checkLocalNetworkAccess(serviceType, timeout));
   }
 
   /**
-   * Publish a service
+   * Publish a service, resolves with the published service once it is advertised.
+   * Its name can differ from the requested one when that name is already taken.
+   *
+   * publishService({ type, protocol, domain, name, port, txt, implType })
+   * publishService(type, protocol, domain, name, port, txt, implType) is deprecated
    */
-  publishService(type, protocol, domain = 'local.', name, port, txt = {}, implType = ImplType.NSD) {
+  publishService(options, protocolArg, domainArg, nameArg, portArg, txtArg, implTypeArg) {
+    const {
+      type,
+      protocol,
+      domain,
+      name,
+      port,
+      txt,
+      implType
+    } = withDefaults(PUBLISH_DEFAULTS, isOptionsObject(options) ? options : {
+      type: options,
+      protocol: protocolArg,
+      domain: domainArg,
+      name: nameArg,
+      port: portArg,
+      txt: txtArg,
+      implType: implTypeArg
+    });
     const txtRecord = toTxtPairs(txt);
     if (_reactNative.Platform.OS === 'android') {
       this._publishedImplTypes[name] = implType;
-      RNZeroconf.registerService(type, protocol, domain, name, port, txtRecord, implType);
-    } else {
-      RNZeroconf.registerService(type, protocol, domain, name, port, txtRecord);
+      return asPromise(RNZeroconf.registerService(type, protocol, domain, name, port, txtRecord, implType));
     }
+    return asPromise(RNZeroconf.registerService(type, protocol, domain, name, port, txtRecord));
   }
 
   /**
-   * Unpublish a service,
+   * Unpublish a service, resolves once it is no longer advertised.
    * Defaults to the implementation the service was published with
    */
   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);
+      return asPromise(RNZeroconf.unregisterService(name, implType));
     }
+    return asPromise(RNZeroconf.unregisterService(name));
   }
 }
+
+/**
+ * Scans while mounted and returns the resolved services.
+ * Scans again when the options change, stops and cleans up on unmount.
+ * Each hook runs its own scan, several can run at once.
+ *
+ * const { services, isScanning, error, stop, restart } = useZeroconf({ type: 'http' })
+ */
 exports.default = Zeroconf;
+function useZeroconf(options = {}) {
+  const {
+    type,
+    protocol,
+    domain,
+    implType,
+    resolveTimeout,
+    enabled = true
+  } = options;
+  const zeroconfRef = (0, _react.useRef)(null);
+  const [services, setServices] = (0, _react.useState)([]);
+  const [isScanning, setIsScanning] = (0, _react.useState)(false);
+  const [error, setError] = (0, _react.useState)(null);
+  const [scanCount, setScanCount] = (0, _react.useState)(0);
+  (0, _react.useEffect)(() => {
+    const zeroconf = new Zeroconf();
+    zeroconfRef.current = zeroconf;
+    // Found services only have a name until they are resolved
+    const updateServices = () => setServices(Object.values(zeroconf.getServices()).filter(service => service.addresses));
+    const unsubscribes = [zeroconf.subscribe('start', () => setIsScanning(true)), zeroconf.subscribe('stop', () => setIsScanning(false)), zeroconf.subscribe('update', updateServices), zeroconf.subscribe('error', setError)];
+    return () => {
+      unsubscribes.forEach(unsubscribe => unsubscribe());
+      zeroconf.stop();
+      zeroconf.removeDeviceListeners();
+      zeroconfRef.current = null;
+    };
+  }, []);
+  (0, _react.useEffect)(() => {
+    const zeroconf = zeroconfRef.current;
+    if (!zeroconf || !enabled) {
+      return undefined;
+    }
+    setServices([]);
+    setError(null);
+    zeroconf.scan({
+      type,
+      protocol,
+      domain,
+      implType,
+      resolveTimeout
+    });
+    return () => zeroconf.stop();
+  }, [enabled, type, protocol, domain, implType, resolveTimeout, scanCount]);
+  const stop = (0, _react.useCallback)(() => {
+    if (zeroconfRef.current) {
+      zeroconfRef.current.stop();
+    }
+  }, []);
+  const restart = (0, _react.useCallback)(() => setScanCount(count => count + 1), []);
+  return {
+    services,
+    isScanning,
+    error,
+    stop,
+    restart
+  };
+}

package/index.d.ts

@@ -27,6 +27,58 @@ 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]>
 
+export interface ScanOptions {
+  /** Service type without underscore, e.g. `'http'`. Defaults to `'http'` */
+  type?: string
+  /** `'tcp'` or `'udp'`. Defaults to `'tcp'` */
+  protocol?: string
+  /** Defaults to `'local.'` */
+  domain?: string
+  /** Android only, defaults to `NSD` */
+  implType?: ImplType
+  /** iOS only, seconds to try resolving a service before retrying once and giving up. Defaults to `5` */
+  resolveTimeout?: number
+}
+
+export interface PublishOptions {
+  /** Service type without underscore, e.g. `'http'` */
+  type: string
+  /** `'tcp'` or `'udp'` */
+  protocol: string
+  /** Defaults to `'local.'` */
+  domain?: string
+  /** Service name, should be unique on the network */
+  name: string
+  port: number
+  txt?: TxtRecord
+  /** Android only, defaults to `NSD` */
+  implType?: ImplType
+}
+
+/**
+ * Errors emitted by the `error` event
+ *
+ * - `DNSSD`: DNSServiceErrorType, on iOS and from Android's embedded mDNSResponder,
+ *   e.g. `-65555` type missing from NSBonjourServices, `-65570` Local Network access denied
+ * - `NsdManager`: Android NsdManager failure code
+ * - `RNZeroconf`: the library's own errors, e.g. `'EXCEPTION'`
+ */
+export interface ZeroconfError extends Error {
+  code: number | string
+  domain: 'DNSSD' | 'NsdManager' | 'RNZeroconf'
+  /** The service the error is about, when there is one */
+  serviceName?: string
+}
+
+export interface LocalNetworkAccessOptions {
+  /** Service type without underscore, must be listed in `NSBonjourServices`. Defaults to the first one listed */
+  type?: string
+  /** Defaults to `'tcp'` */
+  protocol?: string
+  /** Seconds to wait for an answer, defaults to `5` */
+  timeout?: number
+}
+
 /** Published services don't carry the address family fields */
 export type PublishedService = Omit<Service, 'ipv4' | 'ipv6'>
 
@@ -41,7 +93,7 @@ export interface ZeroconfEvents {
   remove: (name: string) => void
   /** Services list changed */
   update: () => void
-  error: (error: Error) => void
+  error: (error: ZeroconfError) => void
   published: (service: PublishedService) => void
   unpublished: (service: PublishedService) => void
 }
@@ -56,6 +108,8 @@ export default class Zeroconf {
   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
+  /** Adds a listener and returns a function that removes it */
+  subscribe<E extends keyof ZeroconfEvents>(event: E, listener: ZeroconfEvents[E]): () => void
   listenerCount(event: keyof ZeroconfEvents): number
 
   /** Add the native event listeners (called automatically in the constructor) */
@@ -67,11 +121,18 @@ export default class Zeroconf {
   /** All the services found so far, keyed by name */
   getServices(): Record<string, Service>
 
+  /** Scan for services, defaults to `_http._tcp.` on the `local.` domain */
+  scan(options?: ScanOptions): void
+  /** @deprecated Use `scan({ type, protocol, domain, implType })` */
+  scan(type?: string, protocol?: string, domain?: string, implType?: ImplType): void
+
   /**
-   * Scan for services, defaults to `_http._tcp.` on the `local.` domain
-   * @param implType Android only, defaults to `NSD`
+   * Checks the iOS Local Network permission. Can show the permission prompt when it hasn't been answered yet.
+   * Resolves `'unknown'` on Android, which has no equivalent permission to check.
    */
-  scan(type?: string, protocol?: string, domain?: string, implType?: ImplType): void
+  checkLocalNetworkAccess(
+    options?: LocalNetworkAccessOptions,
+  ): Promise<'granted' | 'denied' | 'unknown'>
 
   /**
    * Stop the current scan
@@ -80,9 +141,11 @@ export default class Zeroconf {
   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`
+   * Publish a service. Resolves with the published service once it is advertised, its name can differ
+   * from the requested one when that name is already taken. Rejects with a `ZeroconfError`.
    */
+  publishService(options: PublishOptions): Promise<PublishedService>
+  /** @deprecated Use `publishService({ type, protocol, domain, name, port, txt, implType })` */
   publishService(
     type: string,
     protocol: string,
@@ -91,11 +154,34 @@ export default class Zeroconf {
     port: number,
     txt?: TxtRecord,
     implType?: ImplType,
-  ): void
+  ): Promise<PublishedService>
 
   /**
-   * Unpublish a service
+   * Unpublish a service. Resolves once it is no longer advertised, rejects with a `ZeroconfError`
+   * (e.g. code `'NOT_PUBLISHED'`).
    * @param implType Android only, defaults to the implementation the service was published with
    */
-  unpublishService(name: string, implType?: ImplType): void
+  unpublishService(name: string, implType?: ImplType): Promise<PublishedService | null>
 }
+
+export interface UseZeroconfOptions extends ScanOptions {
+  /** Scan only while true, defaults to `true` */
+  enabled?: boolean
+}
+
+export interface UseZeroconfResult {
+  /** Resolved services, updated as they are found, resolved and removed */
+  services: Service[]
+  isScanning: boolean
+  /** Last error, reset when a new scan starts */
+  error: ZeroconfError | null
+  stop(): void
+  /** Clears the services and scans again */
+  restart(): void
+}
+
+/**
+ * Scans while mounted and returns the resolved services. Scans again when the options change,
+ * stops and cleans up on unmount. Each hook runs its own scan, several can run at once.
+ */
+export function useZeroconf(options?: UseZeroconfOptions): UseZeroconfResult

package/ios/RNZeroconf/RNNetServiceSerializer.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#include <sys/socket.h>
 
 FOUNDATION_EXPORT const NSString *kRNServiceKeysName;
 FOUNDATION_EXPORT const NSString *kRNServiceKeysFullName;
@@ -15,9 +16,16 @@ FOUNDATION_EXPORT const NSString *kRNServiceKeysHost;
 FOUNDATION_EXPORT const NSString *kRNServiceKeysPort;
 FOUNDATION_EXPORT const NSString *kRNServiceTxtRecords;
 
+// Converts dns_sd results to the service dictionaries sent to JS
 @interface RNNetServiceSerializer : NSObject
 
-+ (NSDictionary *) serializeServiceToDictionary:(NSNetService *)service
-                                       resolved:(BOOL)resolved;
+// "192.168.1.2" or "fe80::1", nil for other address families
++ (NSString *) stringFromAddress:(const struct sockaddr *)address;
+
+// TXT record bytes to { key: value }, values decoded as UTF-8 (Latin-1 when not valid UTF-8)
++ (NSDictionary<NSString *, NSString *> *) dictionaryFromTXTRecord:(const void *)record length:(uint16_t)length;
+
+// Ordered [key, value] pairs to TXT record bytes, keys of entries longer than 255 bytes are skipped and added to tooLong
++ (NSData *) TXTRecordFromPairs:(NSArray<NSArray<NSString *> *> *)pairs tooLong:(NSMutableArray<NSString *> *)tooLong;
 
 @end

package/ios/RNZeroconf/RNNetServiceSerializer.m

@@ -8,6 +8,7 @@
 
 #import "RNNetServiceSerializer.h"
 #include <arpa/inet.h>
+#include <dns_sd.h>
 
 const NSString *kRNServiceKeysName = @"name";
 const NSString *kRNServiceKeysFullName = @"fullName";
@@ -18,75 +19,66 @@ const NSString *kRNServiceTxtRecords = @"txt";
 
 @implementation RNNetServiceSerializer
 
-+ (NSDictionary *) serializeServiceToDictionary:(NSNetService *)service
-                                       resolved:(BOOL)resolved
++ (NSString *) stringFromAddress:(const struct sockaddr *)address
 {
-    NSMutableDictionary *serviceInfo = [[NSMutableDictionary alloc] init];
-    serviceInfo[kRNServiceKeysName] = service.name;
-
-    if (resolved) {
-        serviceInfo[kRNServiceKeysFullName] = [NSString stringWithFormat:@"%@%@", service.hostName, service.type];
-        serviceInfo[kRNServiceKeysAddresses] = [self addressesFromService:service];
-        serviceInfo[kRNServiceKeysHost] = service.hostName;
-        serviceInfo[kRNServiceKeysPort] = @(service.port);
-        
-        NSDictionary<NSString *, NSData *> *txtRecordDict = [NSNetService dictionaryFromTXTRecordData:service.TXTRecordData];
-        
-        NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
-        for (NSString *key in txtRecordDict) {
-            @try{
-                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);
-            }
-        }
-        serviceInfo[kRNServiceTxtRecords] = dict;
+    if (address == NULL) {
+        return nil;
     }
 
-    return [NSDictionary dictionaryWithDictionary:serviceInfo];
+    char buffer[INET6_ADDRSTRLEN];
+    const char *result = NULL;
+    if (address->sa_family == AF_INET) {
+        result = inet_ntop(AF_INET, &((const struct sockaddr_in *)address)->sin_addr, buffer, sizeof(buffer));
+    } else if (address->sa_family == AF_INET6) {
+        result = inet_ntop(AF_INET6, &((const struct sockaddr_in6 *)address)->sin6_addr, buffer, sizeof(buffer));
+    }
+    return result ? [NSString stringWithUTF8String:result] : nil;
 }
 
-+ (NSArray<NSString *> *) addressesFromService:(NSNetService *)service
++ (NSDictionary<NSString *, NSString *> *) dictionaryFromTXTRecord:(const void *)record length:(uint16_t)length
 {
-    NSMutableArray<NSString *> *addresses = [[NSMutableArray alloc] init];
-
-    // source: http://stackoverflow.com/a/4976808/2715
-    char addressBuffer[INET6_ADDRSTRLEN];
-
-    for (NSData *data in service.addresses) {
-        memset(addressBuffer, 0, INET6_ADDRSTRLEN);
-
-        typedef union {
-            struct sockaddr sa;
-            struct sockaddr_in ipv4;
-            struct sockaddr_in6 ipv6;
-        } ip_socket_address;
-
-        ip_socket_address *socketAddress = (ip_socket_address *)[data bytes];
-
-        if (socketAddress && (socketAddress->sa.sa_family == AF_INET || socketAddress->sa.sa_family == AF_INET6)) {
-            const char *addressStr = inet_ntop(
-                socketAddress->sa.sa_family,
-                (socketAddress->sa.sa_family == AF_INET ? (void *)&(socketAddress->ipv4.sin_addr) : (void *)&(socketAddress->ipv6.sin6_addr)),
-                addressBuffer,
-                sizeof(addressBuffer)
-            );
+    NSMutableDictionary *txt = [[NSMutableDictionary alloc] init];
+    uint16_t count = TXTRecordGetCount(length, record);
+    for (uint16_t i = 0; i < count; i++) {
+        char key[256];
+        uint8_t valueLength = 0;
+        const void *value = NULL;
+        if (TXTRecordGetItemAtIndex(length, record, i, sizeof(key), key, &valueLength, &value) != kDNSServiceErr_NoError || key[0] == '\0') {
+            continue;
+        }
 
-            if (addressStr) {
-                NSString *address = [NSString stringWithUTF8String:addressStr];
-                [addresses addObject:address];
-            }
+        NSString *string = @"";
+        if (value != NULL && valueLength > 0) {
+            NSData *data = [NSData dataWithBytes:value length:valueLength];
+            string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]
+                ?: [[NSString alloc] initWithData:data encoding:NSISOLatin1StringEncoding]
+                ?: @"";
+        }
+        NSString *keyString = [NSString stringWithUTF8String:key];
+        if (keyString) {
+            txt[keyString] = string;
         }
     }
+    return txt;
+}
 
-    return [NSArray arrayWithArray:addresses];
++ (NSData *) TXTRecordFromPairs:(NSArray<NSArray<NSString *> *> *)pairs tooLong:(NSMutableArray<NSString *> *)tooLong
+{
+    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) {
+            [tooLong addObject:pair[0]];
+            continue;
+        }
+        uint8_t entryLength = (uint8_t)entry.length;
+        [data appendBytes:&entryLength length:1];
+        [data appendData:entry];
+    }
+    return data;
 }
 
 @end

package/ios/RNZeroconf/RNZeroconf.h

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