Merge branch 'development'

* development: Refactor engine. Fix infinite recursion in configuration Don't send whole packet to handleConnect
socketio · Aug 27, 2016 · 89ab458 · 89ab458
2 parents e3c8cc7 + bd7f943
commit 89ab458
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 32 deletions.
diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift
@@ -359,36 +359,38 @@ public final class SocketEngine : NSObject, NSURLSessionDelegate, SocketEnginePo
     private func handleOpen(openData: String) {
         do {
             let json = try openData.toNSDictionary()
+            guard let sid = json[sid] as? String else {
+                client?.engineDidError("Open packet contained no sid")
+                return
+            }
 
-            if let sid = json["sid"] as? String {
-                let upgradeWs: Bool
-
-                self.sid = sid
-                connected = true
-
-                if let upgrades = json["upgrades"] as? [String] {
-                    upgradeWs = upgrades.contains("websocket")
-                } else {
-                    upgradeWs = false
-                }
-
-                if let pingInterval = json["pingInterval"] as? Double, pingTimeout = json["pingTimeout"] as? Double {
-                    self.pingInterval = pingInterval / 1000.0
-                    self.pingTimeout = pingTimeout / 1000.0
-                }
-
-                if !forcePolling && !forceWebsockets && upgradeWs {
-                    createWebsocketAndConnect()
-                }
-
-                sendPing()
-
-                if !forceWebsockets {
-                    doPoll()
-                }
-
-                client?.engineDidOpen("Connect")
+            let upgradeWs: Bool
+
+            self.sid = sid
+            connected = true
+
+            if let upgrades = json["upgrades"] as? [String] {
+                upgradeWs = upgrades.contains("websocket")
+            } else {
+                upgradeWs = false
+            }
+
+            if let pingInterval = json["pingInterval"] as? Double, pingTimeout = json["pingTimeout"] as? Double {
+                self.pingInterval = pingInterval / 1000.0
+                self.pingTimeout = pingTimeout / 1000.0
             }
+
+            if !forcePolling && !forceWebsockets && upgradeWs {
+                createWebsocketAndConnect()
+            }
+
+            sendPing()
+
+            if !forceWebsockets {
+                doPoll()
+            }
+
+            client?.engineDidOpen("Connect")
         } catch {
             didError("Error parsing open packet")
         }

diff --git a/Source/SocketIOClientConfiguration.swift b/Source/SocketIOClientConfiguration.swift
@@ -97,7 +97,7 @@ public struct SocketIOClientConfiguration : ArrayLiteralConvertible, CollectionT
 
     @warn_unused_result
     public func prefixThrough(position: Index) -> SubSequence {
-        return prefixThrough(position)
+        return backingArray.prefixThrough(position)
     }
 
     @warn_unused_result

diff --git a/Source/SocketParsable.swift b/Source/SocketParsable.swift
@@ -32,8 +32,8 @@ extension SocketParsable {
         return nsp == self.nsp
     }
 
-    private func handleConnect(p: SocketPacket) {
-        if p.nsp == "/" && nsp != "/" {
+    private func handleConnect(packetNamespace: String) {
+        if packetNamespace == "/" && nsp != "/" {
             joinNamespace(nsp)
         } else {
             didConnect()
@@ -51,7 +51,7 @@ extension SocketParsable {
         case .BinaryAck where isCorrectNamespace(pack.nsp):
             waitingPackets.append(pack)
         case .Connect:
-            handleConnect(pack)
+            handleConnect(pack.nsp)
         case .Disconnect:
             didDisconnect("Got Disconnect")
         case .Error: