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

better swift style

Browse Source
This commit is contained in:
Erik 2015-08-03 10:07:59 -04:00
parent 137fd1229b
commit 2579c04f67
11 changed files with 145 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SocketIOClientSwift/SocketIOClient.swift
View File

@ -42,7 +42,6 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
var currentAck = -1 var currentAck = -1
var log = false var log = false
var waitingData = [SocketPacket]() var waitingData = [SocketPacket]()
var sessionDelegate:NSURLSessionDelegate?
public let socketURL: String public let socketURL: String
public let handleAckQueue = dispatch_queue_create("handleAckQueue", DISPATCH_QUEUE_SERIAL) public let handleAckQueue = dispatch_queue_create("handleAckQueue", DISPATCH_QUEUE_SERIAL)
@ -86,11 +85,6 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
self.socketURL = socketURL self.socketURL = socketURL
self.opts = opts self.opts = opts
// Set options
if let sessionDelegate = opts?["sessionDelegate"] as? NSURLSessionDelegate {
self.sessionDelegate = sessionDelegate
}
if let connectParams = opts?["connectParams"] as? [String: AnyObject] { if let connectParams = opts?["connectParams"] as? [String: AnyObject] {
self.connectParams = connectParams self.connectParams = connectParams
} }
@ -475,7 +469,6 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
tryReconnect() tryReconnect()
} }
// We lost connection and should attempt to reestablish
@objc private func tryReconnect() { @objc private func tryReconnect() {
if reconnectAttempts != -1 && currentReconnectAttempt + 1 > reconnectAttempts || !reconnects { if reconnectAttempts != -1 && currentReconnectAttempt + 1 > reconnectAttempts || !reconnects {
clearReconnectTimer() clearReconnectTimer()

4
SocketIOClientSwift/SocketPacket.swift
View File

@ -89,7 +89,7 @@ struct SocketPacket {
} }
} }
private func completeMessage(var message:String, ack:Bool = false) -> String { private func completeMessage(var message: String, ack: Bool) -> String {
if data.count == 0 { if data.count == 0 {
return message + "]" return message + "]"
} else if !ack { } else if !ack {
@ -180,7 +180,7 @@ struct SocketPacket {
} }
} }
return completeMessage(message) return completeMessage(message, ack: false)
} }
mutating func fillInPlaceholders() { mutating func fillInPlaceholders() {

3
SocketIOClientSwift/SocketParser.swift
View File

@ -79,7 +79,7 @@ class SocketParser {
return SocketPacket(type: SocketPacket.PacketType(str: type)!, nsp: "/") return SocketPacket(type: SocketPacket.PacketType(str: type)!, nsp: "/")
} }
var id = nil as Int? var id: Int?
var nsp:String? var nsp:String?
var i = 0 var i = 0
var placeholders = -1 var placeholders = -1
@ -154,6 +154,7 @@ class SocketParser {
var err: NSError? var err: NSError?
let stringData = data.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) let stringData = data.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
let parsed: AnyObject? let parsed: AnyObject?
do { do {
parsed = try NSJSONSerialization.JSONObjectWithData(stringData!, parsed = try NSJSONSerialization.JSONObjectWithData(stringData!,
options: NSJSONReadingOptions.MutableContainers) options: NSJSONReadingOptions.MutableContainers)