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

work on parser

Browse Source
This commit is contained in:
Erik 2015-03-18 19:54:51 -04:00
parent d13d185011
commit 911cac9c23
1 changed files with 78 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
SwiftIO/SocketParser.swift
View File

@ -220,9 +220,6 @@ class SocketParser {
return return
} }
/**
Begin check for message
**/
var messageGroups:[String]? var messageGroups:[String]?
let type = stringMessage.removeAtIndex(stringMessage.startIndex) let type = stringMessage.removeAtIndex(stringMessage.startIndex)
@ -264,10 +261,7 @@ class SocketParser {
socket.handleEvent(event, data: parsed, isInternalMessage: false, socket.handleEvent(event, data: parsed, isInternalMessage: false,
wantsAck: ackNum.toInt(), withAckType: 3) wantsAck: ackNum.toInt(), withAckType: 3)
} }
return
} }
} }
} else if type == "3" { } else if type == "3" {
if let ackGroup = stringMessage["(\\d*)\\/?(\\w*)?,?(\\d*)?\\[(.*?)?\\]$", if let ackGroup = stringMessage["(\\d*)\\/?(\\w*)?,?(\\d*)?\\[(.*?)?\\]$",
@ -290,14 +284,12 @@ class SocketParser {
let ackData:AnyObject? = self.parseData("[\(messageGroups![4])]") let ackData:AnyObject? = self.parseData("[\(messageGroups![4])]")
socket.handleAck(ackNum.toInt()!, data: ackData) socket.handleAck(ackNum.toInt()!, data: ackData)
}
} else {
NSLog("Error in parsing message: %s", stringMessage)
return return
} }
} }
/**
End Check for message
**/
}
// Handles binary data // Handles binary data
class func parseBinaryData(data:NSData, socket:SocketIOClient) { class func parseBinaryData(data:NSData, socket:SocketIOClient) {
@ -352,34 +344,23 @@ class SocketParser {
} }
// Tries to parse a message that contains binary // Tries to parse a message that contains binary
class func parseBinaryMessage(message:String, socket:SocketIOClient) { class func parseBinaryMessage(var message:String, socket:SocketIOClient) {
// NSLog(message) // NSLog(message)
/**
Begin check for binary placeholders
**/
var binaryGroup:[String]? var binaryGroup:[String]?
let type = message.removeAtIndex(message.startIndex)
if type == "5" {
if let groups = message["^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(\".*?\")?,?(.*)?\\]$", if let groups = message["^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(\".*?\")?,?(.*)?\\]$",
NSRegularExpressionOptions.DotMatchesLineSeparators].groups() { NSRegularExpressionOptions.DotMatchesLineSeparators].groups() {
binaryGroup = groups binaryGroup = groups
} else if let groups = message["^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(.*?)?\\]$",
NSRegularExpressionOptions.DotMatchesLineSeparators].groups() {
binaryGroup = groups
} else {
NSLog("Error in parsing binary message: %s", message)
return
}
if binaryGroup![1].hasPrefix("5") {
// println(binaryGroup)
var ackNum:String var ackNum:String
var event:String var event:String
var mutMessageObject:String var mutMessageObject:String
var namespace:String? var namespace:String?
var numberOfPlaceholders:String let numberOfPlaceholders = binaryGroup![1]
let messageType = binaryGroup![1]
namespace = binaryGroup![2] namespace = binaryGroup![2]
if binaryGroup![3] != "" { if binaryGroup![3] != "" {
@ -390,7 +371,6 @@ class SocketParser {
ackNum = "" ackNum = ""
} }
numberOfPlaceholders = (messageType["5"] ~= "") as String
event = (binaryGroup![4]["\""] ~= "") as String event = (binaryGroup![4]["\""] ~= "") as String
mutMessageObject = binaryGroup![5] mutMessageObject = binaryGroup![5]
@ -412,9 +392,13 @@ class SocketParser {
} }
socket.waitingData.append(mes) socket.waitingData.append(mes)
} else if binaryGroup![1].hasPrefix("6") { }
let messageType = binaryGroup![1] } else if type == "6" {
let numberOfPlaceholders = (messageType["6"] ~= "") as String if let groups = message["^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(.*?)?\\]$",
NSRegularExpressionOptions.DotMatchesLineSeparators].groups() {
binaryGroup = groups
let numberOfPlaceholders = binaryGroup![1]
var ackNum:String var ackNum:String
var nsp:String var nsp:String
@ -438,8 +422,9 @@ class SocketParser {
socket.waitingData.append(event) socket.waitingData.append(event)
} }
/** } else {
End check for binary placeholders NSLog("Error in parsing binary message: %s", message)
**/ return
}
} }
} }