rename socketackmap, code style changes for #55
This commit is contained in:
parent
f38cf9ed3a
commit
8b05f922a6
@ -1,5 +1,5 @@
|
||||
//
|
||||
// SocketAckMap.swift
|
||||
// SocketAckManager.swift
|
||||
// SocketIO-Swift
|
||||
//
|
||||
// Created by Erik Little on 4/3/15.
|
||||
@ -49,7 +49,7 @@ private func ==(lhs:SocketAck, rhs:SocketAck) -> Bool {
|
||||
return lhs.ack == rhs.ack
|
||||
}
|
||||
|
||||
struct SocketAckMap {
|
||||
struct SocketAckManager {
|
||||
private var acks = Set<SocketAck>(minimumCapacity: 1)
|
||||
|
||||
mutating func addAck(ack:Int, callback:AckCallback) {
|
||||
4
SocketIOClientSwift/SocketEngine.swift
Executable file → Normal file
4
SocketIOClientSwift/SocketEngine.swift
Executable file → Normal file
@ -23,6 +23,7 @@
|
||||
// THE SOFTWARE.
|
||||
|
||||
import Foundation
|
||||
|
||||
extension String {
|
||||
private var length:Int {
|
||||
return count(self)
|
||||
@ -92,7 +93,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
|
||||
}
|
||||
|
||||
public init(client:SocketEngineClient, forcePolling:Bool,
|
||||
forceWebsockets:Bool, withCookies cookies:[NSHTTPCookie]?, logging:Bool, withSessionDelegate sessionDelegate : NSURLSessionDelegate?) {
|
||||
forceWebsockets:Bool, withCookies cookies:[NSHTTPCookie]?, logging:Bool,
|
||||
withSessionDelegate sessionDelegate:NSURLSessionDelegate?) {
|
||||
self.client = client
|
||||
self.forcePolling = forcePolling
|
||||
self.forceWebsockets = forceWebsockets
|
||||
|
||||
3
SocketIOClientSwift/SocketIOClient.swift
Executable file → Normal file
3
SocketIOClientSwift/SocketIOClient.swift
Executable file → Normal file
@ -43,11 +43,10 @@ public final class SocketIOClient: NSObject, NSURLSessionDelegate, SocketEngineC
|
||||
|
||||
let reconnectAttempts:Int!
|
||||
let logType = "SocketClient"
|
||||
var ackHandlers = SocketAckMap()
|
||||
var ackHandlers = SocketAckManager()
|
||||
var currentAck = -1
|
||||
var log = false
|
||||
var waitingData = ContiguousArray<SocketPacket>()
|
||||
|
||||
var sessionDelegate:NSURLSessionDelegate?
|
||||
|
||||
public let socketURL:String
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user