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

change access levels

Browse Source
This commit is contained in:
Erik 2015-10-16 12:28:42 -04:00
parent e07ed93c0b
commit 28ae7a8240
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
SocketIOClientSwift/SocketEngine.swift
View File

@ -131,8 +131,7 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
return .Left(mutData) return .Left(mutData)
} else { } else {
let str = "b4" + data.base64EncodedStringWithOptions( let str = "b4" + data.base64EncodedStringWithOptions(.Encoding64CharacterLineLength)
NSDataBase64EncodingOptions.Encoding64CharacterLineLength)
return .Right(str) return .Right(str)
} }
@ -456,7 +455,7 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
// Polling methods // Polling methods
extension SocketEngine { extension SocketEngine {
func doPoll() { private func doPoll() {
if websocket || waitingForPoll || !connected || closed { if websocket || waitingForPoll || !connected || closed {
return return
} }
@ -478,7 +477,7 @@ extension SocketEngine {
doLongPoll(req) doLongPoll(req)
} }
func doRequest(req: NSMutableURLRequest, private func doRequest(req: NSMutableURLRequest,
withCallback callback: (NSData?, NSURLResponse?, NSError?) -> Void) { withCallback callback: (NSData?, NSURLResponse?, NSError?) -> Void) {
if !polling || closed || invalidated { if !polling || closed || invalidated {
return return
@ -490,7 +489,7 @@ extension SocketEngine {
session.dataTaskWithRequest(req, completionHandler: callback).resume() session.dataTaskWithRequest(req, completionHandler: callback).resume()
} }
func doLongPoll(req: NSMutableURLRequest) { private func doLongPoll(req: NSMutableURLRequest) {
doRequest(req) {[weak self] data, res, err in doRequest(req) {[weak self] data, res, err in
if let this = self { if let this = self {
if err != nil || data == nil { if err != nil || data == nil {
@ -521,7 +520,7 @@ extension SocketEngine {
} }
} }
func flushWaitingForPost() { private func flushWaitingForPost() {
if postWait.count == 0 || !connected { if postWait.count == 0 || !connected {
return return
} else if websocket { } else if websocket {
@ -583,7 +582,7 @@ extension SocketEngine {
// We had packets waiting for send when we upgraded // We had packets waiting for send when we upgraded
// Send them raw // Send them raw
func flushWaitingForPostToWebSocket() { private func flushWaitingForPostToWebSocket() {
guard let ws = self.ws else {return} guard let ws = self.ws else {return}
for msg in postWait { for msg in postWait {
@ -618,7 +617,7 @@ extension SocketEngine {
/// Send polling message. /// Send polling message.
/// Only call on emitQueue /// Only call on emitQueue
func sendPollMessage(var msg: String, withType type: SocketEnginePacketType, private func sendPollMessage(var msg: String, withType type: SocketEnginePacketType,
datas:[NSData]? = nil) { datas:[NSData]? = nil) {
Logger.log("Sending poll: %@ as type: %@", type: logType, args: msg, type.rawValue) Logger.log("Sending poll: %@ as type: %@", type: logType, args: msg, type.rawValue)
@ -638,7 +637,7 @@ extension SocketEngine {
} }
} }
func stopPolling() { private func stopPolling() {
invalidated = true invalidated = true
session.finishTasksAndInvalidate() session.finishTasksAndInvalidate()
} }