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

Fixed indentation

Browse Source
This commit is contained in:
NachoSoto 2015-09-11 05:52:17 +00:00
parent e955699b21
commit c6997f32dd
4 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
SocketIOClientSwift/SocketEngine.swift
View File

@ -350,11 +350,11 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
// We had packets waiting for send when we upgraded // We had packets waiting for send when we upgraded
// Send them raw // Send them raw
private func flushWaitingForPostToWebSocket() { private func flushWaitingForPostToWebSocket() {
if let ws = ws { if let ws = ws {
for msg in postWait { for msg in postWait {
ws.writeString(msg) ws.writeString(msg)
} }
} }
postWait.removeAll(keepCapacity: true) postWait.removeAll(keepCapacity: true)
} }
@ -527,7 +527,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
if msg.characters.count != 0 { if msg.characters.count != 0 {
// Be sure to capture the value of the msg // Be sure to capture the value of the msg
dispatch_async(handleQueue) { dispatch_async(handleQueue) {
self.parseEngineMessage(msg, fromPolling: true) self.parseEngineMessage(msg, fromPolling: true)
} }
} }
@ -552,7 +552,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
let type = PacketType(str: (message["^(\\d)"].groups()?[1]) ?? "") ?? { let type = PacketType(str: (message["^(\\d)"].groups()?[1]) ?? "") ?? {
self.checkIfMessageIsBase64Binary(message) self.checkIfMessageIsBase64Binary(message)
return .Noop return .Noop
}() }()
switch type { switch type {
case PacketType.Message: case PacketType.Message:
@ -610,11 +610,11 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
postWait.append(strMsg) postWait.append(strMsg)
for data in datas ?? [] { for data in datas ?? [] {
let (_, b64Data) = createBinaryDataForSend(data) let (_, b64Data) = createBinaryDataForSend(data)
postWait.append(b64Data!) postWait.append(b64Data!)
} }
if !waitingForPost { if !waitingForPost {
flushWaitingForPost() flushWaitingForPost()
@ -629,26 +629,26 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
ws?.writeString("\(type.rawValue)\(str)") ws?.writeString("\(type.rawValue)\(str)")
for data in datas ?? [] { for data in datas ?? [] {
let (data, _) = createBinaryDataForSend(data) let (data, _) = createBinaryDataForSend(data)
if data != nil { if data != nil {
ws?.writeData(data!) ws?.writeData(data!)
} }
} }
} }
// Starts the ping timer // Starts the ping timer
private func startPingTimer() { private func startPingTimer() {
if let pingInterval = pingInterval { if let pingInterval = pingInterval {
pingTimer?.invalidate() pingTimer?.invalidate()
pingTimer = nil pingTimer = nil
dispatch_async(dispatch_get_main_queue()) { dispatch_async(dispatch_get_main_queue()) {
self.pingTimer = NSTimer.scheduledTimerWithTimeInterval(pingInterval, target: self, self.pingTimer = NSTimer.scheduledTimerWithTimeInterval(pingInterval, target: self,
selector: Selector("sendPing"), userInfo: nil, repeats: true) selector: Selector("sendPing"), userInfo: nil, repeats: true)
} }
} }
} }
func stopPolling() { func stopPolling() {
session.invalidateAndCancel() session.invalidateAndCancel()
@ -668,7 +668,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
Write a message, independent of transport. Write a message, independent of transport.
*/ */
public func write(msg: String, withType type: PacketType, withData data: [NSData]?) { public func write(msg: String, withType type: PacketType, withData data: [NSData]?) {
dispatch_async(emitQueue) { dispatch_async(emitQueue) {
if self.connected { if self.connected {
if self.websocket { if self.websocket {
Logger.log("Writing ws: %@ has data: %@", type: self.logType, args: msg, Logger.log("Writing ws: %@ has data: %@", type: self.logType, args: msg,

26
SocketIOClientSwift/SocketIOClient.swift
View File

@ -28,7 +28,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
private let emitQueue = dispatch_queue_create("emitQueue", DISPATCH_QUEUE_SERIAL) private let emitQueue = dispatch_queue_create("emitQueue", DISPATCH_QUEUE_SERIAL)
private let handleQueue: dispatch_queue_t! private let handleQueue: dispatch_queue_t!
public let socketURL: String public let socketURL: String
public private(set) var engine: SocketEngine? public private(set) var engine: SocketEngine?
public private(set) var secure = false public private(set) var secure = false
@ -117,10 +117,10 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
private func addEngine() -> SocketEngine { private func addEngine() -> SocketEngine {
Logger.log("Adding engine", type: logType) Logger.log("Adding engine", type: logType)
let newEngine = SocketEngine(client: self, opts: opts) let newEngine = SocketEngine(client: self, opts: opts)
engine = newEngine engine = newEngine
return newEngine return newEngine
} }
private func clearReconnectTimer() { private func clearReconnectTimer() {
@ -153,7 +153,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
*/ */
public func connect(timeoutAfter timeoutAfter:Int, public func connect(timeoutAfter timeoutAfter:Int,
withTimeoutHandler handler:(() -> Void)?) { withTimeoutHandler handler:(() -> Void)?) {
assert(timeoutAfter >= 0, "Invalid timeout: \(timeoutAfter)") assert(timeoutAfter >= 0, "Invalid timeout: \(timeoutAfter)")
guard status != .Connected else { guard status != .Connected else {
return return
@ -173,8 +173,8 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
let time = dispatch_time(DISPATCH_TIME_NOW, Int64(timeoutAfter) * Int64(NSEC_PER_SEC)) let time = dispatch_time(DISPATCH_TIME_NOW, Int64(timeoutAfter) * Int64(NSEC_PER_SEC))
dispatch_after(time, dispatch_get_main_queue()) { dispatch_after(time, dispatch_get_main_queue()) {
if self.status != .Connected { if self.status != .Connected {
self.status = .Closed self.status = .Closed
self.engine?.close(fast: true) self.engine?.close(fast: true)
@ -260,7 +260,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
return return
} }
dispatch_async(emitQueue) { dispatch_async(emitQueue) {
self._emit([event] + items) self._emit([event] + items)
} }
} }
@ -300,7 +300,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
// If the server wants to know that the client received data // If the server wants to know that the client received data
func emitAck(ack: Int, withItems items: [AnyObject]) { func emitAck(ack: Int, withItems items: [AnyObject]) {
dispatch_async(emitQueue) { dispatch_async(emitQueue) {
if self.status == .Connected { if self.status == .Connected {
let packet = SocketPacket.packetFromEmit(items, id: ack ?? -1, nsp: self.nsp, ack: true) let packet = SocketPacket.packetFromEmit(items, id: ack ?? -1, nsp: self.nsp, ack: true)
let str = packet.packetString let str = packet.packetString
@ -448,13 +448,13 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
public func parseSocketMessage(msg: String) { public func parseSocketMessage(msg: String) {
dispatch_async(handleQueue) { dispatch_async(handleQueue) {
SocketParser.parseSocketMessage(msg, socket: self) SocketParser.parseSocketMessage(msg, socket: self)
} }
} }
public func parseBinaryData(data: NSData) { public func parseBinaryData(data: NSData) {
dispatch_async(handleQueue) { dispatch_async(handleQueue) {
SocketParser.parseBinaryData(data, socket: self) SocketParser.parseBinaryData(data, socket: self)
} }
} }
@ -472,9 +472,9 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
status = .Reconnecting status = .Reconnecting
dispatch_async(dispatch_get_main_queue()) { dispatch_async(dispatch_get_main_queue()) {
self.reconnectTimer = NSTimer.scheduledTimerWithTimeInterval(Double(self.reconnectWait), self.reconnectTimer = NSTimer.scheduledTimerWithTimeInterval(Double(self.reconnectWait),
target: self, selector: "_tryReconnect", userInfo: nil, repeats: true) target: self, selector: "_tryReconnect", userInfo: nil, repeats: true)
} }
} }
} }

6
SocketIOClientSwift/SwiftRegex.swift
View File

@ -37,9 +37,9 @@ internal class SwiftRegex: NSObject, BooleanType {
super.init() super.init()
} }
private static func failure(message: String) { private static func failure(message: String) {
fatalError("SwiftRegex: \(message)") fatalError("SwiftRegex: \(message)")
} }
private final var targetRange: NSRange { private final var targetRange: NSRange {
return NSRange(location: 0,length: target.utf16.count) return NSRange(location: 0,length: target.utf16.count)

34
SocketIOClientSwift/WebSocket.swift
View File

@ -378,7 +378,7 @@ public class WebSocket : NSObject, NSStreamDelegate {
} }
if totalSize > 0 { if totalSize > 0 {
if validateResponse(buffer, bufferLen: totalSize) { if validateResponse(buffer, bufferLen: totalSize) {
dispatch_async(queue, { dispatch_async(queue, {
self.connected = true self.connected = true
if let connectBlock = self.onConnect { if let connectBlock = self.onConnect {
connectBlock() connectBlock()
@ -522,7 +522,7 @@ public class WebSocket : NSObject, NSStreamDelegate {
} }
if receivedOpcode == OpCode.Pong.rawValue { if receivedOpcode == OpCode.Pong.rawValue {
dispatch_async(queue, { dispatch_async(queue, {
self.onPong?() self.onPong?()
self.pongDelegate?.websocketDidReceivePong(self) self.pongDelegate?.websocketDidReceivePong(self)
}) })
@ -609,20 +609,20 @@ public class WebSocket : NSObject, NSStreamDelegate {
} else if response.code == .TextFrame { } else if response.code == .TextFrame {
let str: NSString? = NSString(data: response.buffer!, encoding: NSUTF8StringEncoding) let str: NSString? = NSString(data: response.buffer!, encoding: NSUTF8StringEncoding)
if let str = str as String? { if let str = str as String? {
dispatch_async(queue, { dispatch_async(queue, {
self.onText?(str) self.onText?(str)
self.delegate?.websocketDidReceiveMessage(self, text: str) self.delegate?.websocketDidReceiveMessage(self, text: str)
}) })
} else { } else {
writeError(CloseCode.Encoding.rawValue) writeError(CloseCode.Encoding.rawValue)
return false return false
} }
} else if response.code == .BinaryFrame { } else if response.code == .BinaryFrame {
let data = response.buffer! //local copy so it is perverse for writing let data = response.buffer! //local copy so it is perverse for writing
dispatch_async(queue) { dispatch_async(queue) {
self.onData?(data) self.onData?(data)
self.delegate?.websocketDidReceiveData(self, data: data) self.delegate?.websocketDidReceiveData(self, data: data)
} }
} }
@ -726,11 +726,11 @@ public class WebSocket : NSObject, NSStreamDelegate {
///used to preform the disconnect delegate ///used to preform the disconnect delegate
private func doDisconnect(error: NSError?) { private func doDisconnect(error: NSError?) {
if !self.didDisconnect { if !self.didDisconnect {
dispatch_async(queue) { dispatch_async(queue) {
self.didDisconnect = true self.didDisconnect = true
self.onDisconnect?(error) self.onDisconnect?(error)
self.delegate?.websocketDidDisconnect(self, error: error) self.delegate?.websocketDidDisconnect(self, error: error)
} }
} }
} }