cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
* development:
  Refactor engine. Fix infinite recursion in configuration
  Don't send whole packet to handleConnect
This commit is contained in:
Erik 2016-08-27 13:07:26 -04:00
commit 89ab458a5f
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D
3 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/SocketEngine.swift
View File

@ -359,8 +359,11 @@ public final class SocketEngine : NSObject, NSURLSessionDelegate, SocketEnginePo
private func handleOpen(openData: String) { private func handleOpen(openData: String) {
do { do {
let json = try openData.toNSDictionary() 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 let upgradeWs: Bool
self.sid = sid self.sid = sid
@ -388,7 +391,6 @@ public final class SocketEngine : NSObject, NSURLSessionDelegate, SocketEnginePo
} }
client?.engineDidOpen("Connect") client?.engineDidOpen("Connect")
}
} catch { } catch {
didError("Error parsing open packet") didError("Error parsing open packet")
} }

2
Source/SocketIOClientConfiguration.swift
View File

@ -97,7 +97,7 @@ public struct SocketIOClientConfiguration : ArrayLiteralConvertible, CollectionT
@warn_unused_result @warn_unused_result
public func prefixThrough(position: Index) -> SubSequence { public func prefixThrough(position: Index) -> SubSequence {
return prefixThrough(position) return backingArray.prefixThrough(position)
} }
@warn_unused_result @warn_unused_result

6
Source/SocketParsable.swift
View File

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