Merge pull request #61 from Boltmade/more_reliable_reconnect

More reliable reconnect

Author: hamchapman

Source/PusherConnection.swift

@@ -17,15 +17,18 @@ public class PusherConnection {
     public var socket: WebSocket!
     public var URLSession: NSURLSession
     public weak var stateChangeDelegate: ConnectionStateChangeDelegate?
+    internal var reconnectOperation: NSOperation?
 
     public lazy var reachability: Reachability? = {
         let reachability = try? Reachability.reachabilityForInternetConnection()
         reachability?.whenReachable = { [unowned self] reachability in
+            self.reconnectOperation?.cancel()
             if self.connectionState == .Disconnected {
                 self.socket.connect()
             }
         }
         reachability?.whenUnreachable = { [unowned self] reachability in
+            self.reconnectOperation?.cancel()
             print("Network unreachable")
         }
         return reachability

Source/PusherWebsocketDelegate.swift

@@ -39,6 +39,21 @@ extension PusherConnection: WebSocketDelegate {
         for (_, channel) in self.channels.channels {
             channel.subscribed = false
         }
+
+        if let reconnect = self.options.autoReconnect where reconnect {
+            if let reachability = self.reachability where reachability.isReachable() {
+                let operation = NSBlockOperation {
+                    self.socket.connect()
+                }
+
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(NSEC_PER_SEC)), dispatch_get_main_queue()) {
+                    NSOperationQueue.mainQueue().addOperation(operation)
+                }
+
+                self.reconnectOperation?.cancel()
+                self.reconnectOperation = operation
+            }
+        }
     }
 
     public func websocketDidConnect(ws: WebSocket) {}