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

fixes

Browse Source
This commit is contained in:
Erik 2015-03-19 08:23:43 -04:00
parent 911cac9c23
commit fd3dbee71c
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SwiftIO/SocketEngine.swift
View File

@ -409,7 +409,10 @@ public class SocketEngine: NSObject, WebSocketDelegate {
} }
private func parseEngineData(data:NSData) { private func parseEngineData(data:NSData) {
self.client.parseBinaryData(data.subdataWithRange(NSMakeRange(1, data.length - 1))) dispatch_async(self.client.handleQueue) {[weak self] in
self?.client.parseBinaryData(data.subdataWithRange(NSMakeRange(1, data.length - 1)))
return
}
} }
private func parseEngineMessage(var message:String) { private func parseEngineMessage(var message:String) {
@ -447,6 +450,8 @@ public class SocketEngine: NSObject, WebSocketDelegate {
} else if type == PacketType.NOOP.rawValue { } else if type == PacketType.NOOP.rawValue {
self.doPoll() self.doPoll()
return return
} else if type == PacketType.PONG.rawValue {
return
} }
if message == PacketType.CLOSE.rawValue { if message == PacketType.CLOSE.rawValue {

3
SwiftIO/SocketParser.swift
View File

@ -346,7 +346,6 @@ class SocketParser {
// Tries to parse a message that contains binary // Tries to parse a message that contains binary
class func parseBinaryMessage(var message:String, socket:SocketIOClient) { class func parseBinaryMessage(var message:String, socket:SocketIOClient) {
// NSLog(message) // NSLog(message)
var binaryGroup:[String]? var binaryGroup:[String]?
let type = message.removeAtIndex(message.startIndex) let type = message.removeAtIndex(message.startIndex)
@ -413,7 +412,7 @@ class SocketParser {
if nsp == "" && socket.nsp != nil { if nsp == "" && socket.nsp != nil {
return return
} }
var mutMessageObject = binaryGroup![5] var mutMessageObject = binaryGroup![4]
let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"]
~= "\"~~$2\"" ~= "\"~~$2\""

2
SwiftIO/SwiftRegex.swift
View File

@ -43,7 +43,7 @@ public class SwiftRegex: NSObject, BooleanType {
} }
final var targetRange: NSRange { final var targetRange: NSRange {
return NSRange(location: 0,length: target.utf16Count) return NSRange(location: 0,length: countElements(target.utf16))
} }
final func substring(range: NSRange) -> String? { final func substring(range: NSRange) -> String? {