Provide Error on failure, not some errorDict (API change)

Bouke · Apr 5, 2017 · a639dea · a639dea
1 parent b15a0ba
commit a639dea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/Sources/NetService/NetService.swift b/Sources/NetService/NetService.swift
@@ -198,15 +198,7 @@ public class NetService: Listener {
             timer.invalidate()
         }
         publishState = .didNotPublish(error)
-        switch error {
-        case let error as NSError:
-            delegate?.netService(self, didNotPublish: [error.description: NSNumber(integerLiteral: error.code)])
-        case let error as POSIXError:
-            delegate?.netService(self, didNotPublish: ["\(error.code.rawValue)": NSNumber(integerLiteral: Int(error.code.rawValue))])
-        default:
-            delegate?.netService(self, didNotPublish: [String(describing: error): -1])
-        }
-
+        delegate?.netService(self, didNotPublish: error)
     }
 
     func received(message: Message) {
@@ -236,8 +228,16 @@ public class NetService: Listener {
     public internal(set) var port: Int = -1
 
     public func stop() {
-        precondition(publishState == .published)
-        try! responder!.unpublish(self)
+        switch publishState {
+        case .stopped:
+            break
+        case .lookingForDuplicates(let (_, timer)):
+            timer.invalidate()
+        case .published:
+            try! responder!.unpublish(self)
+        case .didNotPublish:
+            break
+        }
         publishState = .stopped
         delegate?.netServiceDidStop(self)
     }
@@ -263,7 +263,7 @@ public protocol NetServiceDelegate: class {
     func netServiceDidPublish(_ sender: NetService)
 
     func netService(_ sender: NetService,
-                    didNotPublish errorDict: [String : NSNumber])
+                    didNotPublish error: Error)
 
     func netServiceDidStop(_ sender: NetService)
 

diff --git a/Sources/NetService/NetServiceBrowser.swift b/Sources/NetService/NetServiceBrowser.swift
@@ -42,7 +42,7 @@ public class NetServiceBrowser: Listener {
         do {
             try responder.multicast(message: query)
         } catch {
-            delegate?.netServiceBrowser(self, didNotSearch: [String(describing: error): -1])
+            delegate?.netServiceBrowser(self, didNotSearch: error)
         }
     }
 
@@ -96,7 +96,7 @@ public protocol NetServiceBrowserDelegate: class {
     func netServiceBrowserWillSearch(_ browser: NetServiceBrowser)
 
     func netServiceBrowser(_ browser: NetServiceBrowser,
-                           didNotSearch errorDict: [String : NSNumber])
+                           didNotSearch error: Error)
 
     func netServiceBrowser(_ browser: NetServiceBrowser,
                            didFind service: NetService,