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

clean up enums

Browse Source
This commit is contained in:
Erik 2015-08-11 08:31:23 -04:00
parent 42aced5e9c
commit 848f7e5da7
4 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
SocketIOClientSwift/SocketEngine.swift
View File

@ -80,13 +80,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
var ws:WebSocket? var ws:WebSocket?
public enum PacketType: Int { public enum PacketType: Int {
case OPEN = 0 case Open, Close, Ping, Pong, Message, Upgrade, Noop
case CLOSE = 1
case PING = 2
case PONG = 3
case MESSAGE = 4
case UPGRADE = 5
case NOOP = 6
init?(str: String?) { init?(str: String?) {
if let value = Int(str ?? ""), raw = PacketType(rawValue: value) { if let value = Int(str ?? ""), raw = PacketType(rawValue: value) {
@ -126,7 +120,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
ws?.disconnect() ws?.disconnect()
if fast || polling { if fast || polling {
write("", withType: PacketType.CLOSE, withData: nil) write("", withType: PacketType.Close, withData: nil)
client?.engineDidClose("Disconnect") client?.engineDidClose("Disconnect")
} }
@ -219,7 +213,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
"we'll probably disconnect soon. You should report this.", client: self) "we'll probably disconnect soon. You should report this.", client: self)
} }
sendWebSocketMessage("", withType: PacketType.UPGRADE, datas: nil) sendWebSocketMessage("", withType: PacketType.Upgrade, datas: nil)
_websocket = true _websocket = true
_polling = false _polling = false
fastUpgrade = false fastUpgrade = false
@ -573,21 +567,21 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
let type = PacketType(str: (message["^(\\d)"].groups()?[1])) ?? { let type = PacketType(str: (message["^(\\d)"].groups()?[1])) ?? {
self.checkIfMessageIsBase64Binary(message) self.checkIfMessageIsBase64Binary(message)
return PacketType.NOOP return PacketType.Noop
}() }()
switch type { switch type {
case PacketType.MESSAGE: case PacketType.Message:
message.removeAtIndex(message.startIndex) message.removeAtIndex(message.startIndex)
handleMessage(message) handleMessage(message)
case PacketType.NOOP: case PacketType.Noop:
handleNOOP() handleNOOP()
case PacketType.PONG: case PacketType.Pong:
handlePong(message) handlePong(message)
case PacketType.OPEN: case PacketType.Open:
message.removeAtIndex(message.startIndex) message.removeAtIndex(message.startIndex)
handleOpen(message) handleOpen(message)
case PacketType.CLOSE: case PacketType.Close:
handleClose() handleClose()
default: default:
SocketLogger.log("Got unknown packet type", client: self) SocketLogger.log("Got unknown packet type", client: self)
@ -596,16 +590,16 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
private func probeWebSocket() { private func probeWebSocket() {
if websocketConnected { if websocketConnected {
sendWebSocketMessage("probe", withType: PacketType.PING) sendWebSocketMessage("probe", withType: PacketType.Ping)
} }
} }
/// Send an engine message (4) /// Send an engine message (4)
public func send(msg: String, withData datas: [NSData]?) { public func send(msg: String, withData datas: [NSData]?) {
if probing { if probing {
probeWait.append((msg, PacketType.MESSAGE, datas)) probeWait.append((msg, PacketType.Message, datas))
} else { } else {
write(msg, withType: PacketType.MESSAGE, withData: datas) write(msg, withType: PacketType.Message, withData: datas)
} }
} }
@ -618,7 +612,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
} }
++pongsMissed ++pongsMissed
write("", withType: PacketType.PING, withData: nil) write("", withType: PacketType.Ping, withData: nil)
} }
/// Send polling message. /// Send polling message.
@ -687,7 +681,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
SocketLogger.log("Upgrading transport to WebSockets", client: self) SocketLogger.log("Upgrading transport to WebSockets", client: self)
fastUpgrade = true fastUpgrade = true
sendPollMessage("", withType: PacketType.NOOP) sendPollMessage("", withType: PacketType.Noop)
// After this point, we should not send anymore polling messages // After this point, we should not send anymore polling messages
} }
} }

4
SocketIOClientSwift/SocketIOClient.swift
View File

@ -278,7 +278,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
SocketLogger.log("Emitting: %@", client: self, args: str) SocketLogger.log("Emitting: %@", client: self, args: str)
if packet.type == SocketPacket.PacketType.BINARY_EVENT { if packet.type == SocketPacket.PacketType.BinaryEvent {
engine?.send(str, withData: packet.binary) engine?.send(str, withData: packet.binary)
} else { } else {
engine?.send(str, withData: nil) engine?.send(str, withData: nil)
@ -294,7 +294,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
SocketLogger.log("Emitting Ack: %@", client: this, args: str) SocketLogger.log("Emitting Ack: %@", client: this, args: str)
if packet.type == SocketPacket.PacketType.BINARY_ACK { if packet.type == SocketPacket.PacketType.BinaryAck {
this.engine?.send(str, withData: packet.binary) this.engine?.send(str, withData: packet.binary)
} else { } else {
this.engine?.send(str, withData: nil) this.engine?.send(str, withData: nil)

30
SocketIOClientSwift/SocketPacket.swift
View File

@ -31,13 +31,13 @@ struct SocketPacket {
let type: PacketType let type: PacketType
enum PacketType: Int { enum PacketType: Int {
case CONNECT = 0 case Connect = 0
case DISCONNECT = 1 case Disconnect = 1
case EVENT = 2 case Event = 2
case ACK = 3 case Ack = 3
case ERROR = 4 case Error = 4
case BINARY_EVENT = 5 case BinaryEvent = 5
case BINARY_ACK = 6 case BinaryAck = 6
init?(str: String) { init?(str: String) {
if let int = Int(str), raw = PacketType(rawValue: int) { if let int = Int(str), raw = PacketType(rawValue: int) {
@ -129,7 +129,7 @@ struct SocketPacket {
func createAck() -> String { func createAck() -> String {
let msg: String let msg: String
if type == PacketType.ACK { if type == PacketType.Ack {
if nsp == "/" { if nsp == "/" {
msg = "3\(id)[" msg = "3\(id)["
} else { } else {
@ -150,7 +150,7 @@ struct SocketPacket {
func createMessageForEvent(event: String) -> String { func createMessageForEvent(event: String) -> String {
let message: String let message: String
if type == PacketType.EVENT { if type == PacketType.Event {
if nsp == "/" { if nsp == "/" {
if id == -1 { if id == -1 {
message = "2[\"\(event)\"" message = "2[\"\(event)\""
@ -235,7 +235,7 @@ struct SocketPacket {
if data.count == 0 { if data.count == 0 {
return nil return nil
} else { } else {
if type == PacketType.EVENT || type == PacketType.BINARY_EVENT { if type == PacketType.Event || type == PacketType.BinaryEvent {
arr.removeAtIndex(0) arr.removeAtIndex(0)
return arr return arr
} else { } else {
@ -249,15 +249,15 @@ extension SocketPacket {
private static func findType(binCount: Int, ack: Bool) -> PacketType { private static func findType(binCount: Int, ack: Bool) -> PacketType {
switch binCount { switch binCount {
case 0 where !ack: case 0 where !ack:
return PacketType.EVENT return PacketType.Event
case 0 where ack: case 0 where ack:
return PacketType.ACK return PacketType.Ack
case _ where !ack: case _ where !ack:
return PacketType.BINARY_EVENT return PacketType.BinaryEvent
case _ where ack: case _ where ack:
return PacketType.BINARY_ACK return PacketType.BinaryAck
default: default:
return PacketType.ERROR return PacketType.Error
} }
} }

16
SocketIOClientSwift/SocketParser.swift
View File

@ -191,19 +191,19 @@ class SocketParser {
SocketLogger.log("Decoded packet as: %@", client: socket, altType: "SocketParser", args: p.description) SocketLogger.log("Decoded packet as: %@", client: socket, altType: "SocketParser", args: p.description)
switch p.type { switch p.type {
case SocketPacket.PacketType.EVENT: case SocketPacket.PacketType.Event:
handleEvent(p, socket: socket) handleEvent(p, socket: socket)
case SocketPacket.PacketType.ACK: case SocketPacket.PacketType.Ack:
handleAck(p, socket: socket) handleAck(p, socket: socket)
case SocketPacket.PacketType.BINARY_EVENT: case SocketPacket.PacketType.BinaryEvent:
handleBinaryEvent(p, socket: socket) handleBinaryEvent(p, socket: socket)
case SocketPacket.PacketType.BINARY_ACK: case SocketPacket.PacketType.BinaryAck:
handleBinaryAck(p, socket: socket) handleBinaryAck(p, socket: socket)
case SocketPacket.PacketType.CONNECT: case SocketPacket.PacketType.Connect:
handleConnect(p, socket: socket) handleConnect(p, socket: socket)
case SocketPacket.PacketType.DISCONNECT: case SocketPacket.PacketType.Disconnect:
socket.didDisconnect("Got Disconnect") socket.didDisconnect("Got Disconnect")
case SocketPacket.PacketType.ERROR: case SocketPacket.PacketType.Error:
socket.didError("Error: \(p.data)") socket.didError("Error: \(p.data)")
} }
} }
@ -223,7 +223,7 @@ class SocketParser {
var packet = socket.waitingData.removeAtIndex(0) var packet = socket.waitingData.removeAtIndex(0)
packet.fillInPlaceholders() packet.fillInPlaceholders()
if packet.type != SocketPacket.PacketType.BINARY_ACK { if packet.type != SocketPacket.PacketType.BinaryAck {
socket.handleEvent(packet.getEvent(), data: packet.getArgs(), socket.handleEvent(packet.getEvent(), data: packet.getArgs(),
wantsAck: packet.id) wantsAck: packet.id)
} else { } else {