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

clean up using guard

Browse Source
This commit is contained in:
Lukas Schmidt 2015-09-07 19:28:19 +02:00
parent 70cacb025f
commit 568b2ae1bc
1 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
SocketIOClientSwift/SocketParser.swift
View File

@ -32,26 +32,20 @@ class SocketParser {
return nsp == socket.nsp return nsp == socket.nsp
} }
private static func handleAck(p: SocketPacket, socket: SocketIOClient) { private static func handleEvent(p: SocketPacket, socket: SocketIOClient) {
if !isCorrectNamespace(p.nsp, socket) { guard isCorrectNamespace(p.nsp, socket) else { return }
return socket.handleEvent(p.event, data: p.args,
isInternalMessage: false, wantsAck: p.id)
} }
private static func handleAck(p: SocketPacket, socket: SocketIOClient) {
guard isCorrectNamespace(p.nsp, socket) else { return }
socket.handleAck(p.id, data: p.data) socket.handleAck(p.id, data: p.data)
} }
private static func handleBinaryAck(p: SocketPacket, socket: SocketIOClient) { private static func handleBinary(p: SocketPacket, socket: SocketIOClient) {
if !isCorrectNamespace(p.nsp, socket) { guard isCorrectNamespace(p.nsp, socket) else { return }
return
}
socket.waitingData.append(p)
}
private static func handleBinaryEvent(p: SocketPacket, socket: SocketIOClient) {
if !isCorrectNamespace(p.nsp, socket) {
return
}
socket.waitingData.append(p) socket.waitingData.append(p)
} }
@ -66,24 +60,14 @@ class SocketParser {
} }
} }
private static func handleEvent(p: SocketPacket, socket: SocketIOClient) {
if !isCorrectNamespace(p.nsp, socket) {
return
}
socket.handleEvent(p.event, data: p.args,
isInternalMessage: false, wantsAck: p.id)
}
// Translation of socket.io-client#decodeString // Translation of socket.io-client#decodeString
static func parseString(str: String) throws -> SocketPacket { static func parseString(str: String) throws -> SocketPacket {
var parser = GenericParser(message: str, currentIndex: 0) var parser = GenericParser(message: str, currentIndex: 0)
let messageCharacters = Array(str.characters)
guard let typeString = parser.read(1), let type = SocketPacket.PacketType(str: typeString) else { guard let typeString = parser.read(1), let type = SocketPacket.PacketType(str: typeString) else {
throw SocketParserError.InvalidMessageType throw SocketParserError.InvalidMessageType
} }
if messageCharacters.count == 1 { if parser.messageCharacters.count == 1 {
return SocketPacket(type: type, nsp: "/") return SocketPacket(type: type, nsp: "/")
} }
@ -107,9 +91,8 @@ class SocketParser {
nsp: nsp ?? "/", placeholders: placeholders) nsp: nsp ?? "/", placeholders: placeholders)
} }
var idString = "" var idString = ""
while parser.currentIndex < messageCharacters.count { while parser.currentIndex < parser.messageCharacters.count {
if let next = parser.read(1), let int = Int(next) { if let next = parser.read(1), let int = Int(next) {
idString += String(int) idString += String(int)
} else { } else {
@ -132,8 +115,8 @@ class SocketParser {
do { do {
return try NSJSONSerialization.JSONObjectWithData(stringData!, return try NSJSONSerialization.JSONObjectWithData(stringData!,
options: NSJSONReadingOptions.MutableContainers) options: NSJSONReadingOptions.MutableContainers)
} catch let error as NSError { } catch {
//TODO Log error Logger.error("Parsing JSON: %@", type: "SocketParser", args: data)
return nil return nil
} }
} }
@ -154,9 +137,9 @@ class SocketParser {
case .Ack: case .Ack:
handleAck(pack, socket: socket) handleAck(pack, socket: socket)
case .BinaryEvent: case .BinaryEvent:
handleBinaryEvent(pack, socket: socket) handleBinary(pack, socket: socket)
case .BinaryAck: case .BinaryAck:
handleBinaryAck(pack, socket: socket) handleBinary(pack, socket: socket)
case .Connect: case .Connect:
handleConnect(pack, socket: socket) handleConnect(pack, socket: socket)
case .Disconnect: case .Disconnect:
@ -184,15 +167,12 @@ class SocketParser {
} }
let shouldExecute = socket.waitingData[0].addData(data) let shouldExecute = socket.waitingData[0].addData(data)
guard shouldExecute else { return }
if !shouldExecute {
return
}
var packet = socket.waitingData.removeAtIndex(0) var packet = socket.waitingData.removeAtIndex(0)
packet.fillInPlaceholders() packet.fillInPlaceholders()
if packet.type != SocketPacket.PacketType.BinaryAck { if packet.type != .BinaryAck {
socket.handleEvent(packet.event, data: packet.args, socket.handleEvent(packet.event, data: packet.args,
isInternalMessage: false, wantsAck: packet.id) isInternalMessage: false, wantsAck: packet.id)
} else { } else {