react-native-zeroconf 0.15.1 → 0.15.2

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
@@ -93,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.
@@ -127,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.
@@ -146,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;
@@ -205,8 +244,9 @@ 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;
@@ -235,12 +275,11 @@ RCT_EXPORT_METHOD(unregisterService:(NSString *) serviceName)
 // 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 stop];
+    // Delegates are unretained, detach them so stopping browsers never call a released module
+    for (NSNetServiceBrowser *browser in self.stoppingBrowsers) {
+        browser.delegate = nil;
     }
-    [self.resolvingServices removeAllObjects];
     for (NSNetService *service in self.publishedServices.allValues) {
         service.delegate = nil;
         [service stop];

package/package.json

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