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

tweaks

Browse Source
This commit is contained in:
Erik 2015-09-24 14:48:33 -04:00
parent bb518ac1a4
commit 12b312de57
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SocketIOClientSwift/SocketEngine.swift
View File

@ -137,13 +137,13 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
mutData.appendData(data) mutData.appendData(data)
return Either.Left(mutData) return .Left(mutData)
} else { } else {
var str = "b4" var str = "b4"
str += data.base64EncodedStringWithOptions( str += data.base64EncodedStringWithOptions(
NSDataBase64EncodingOptions.Encoding64CharacterLineLength) NSDataBase64EncodingOptions.Encoding64CharacterLineLength)
return Either.Right(str) return .Right(str)
} }
} }
@ -581,7 +581,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
postWait.append(strMsg) postWait.append(strMsg)
for data in datas ?? [] { for data in datas ?? [] {
if case let Either.Right(bin) = createBinaryDataForSend(data) { if case let .Right(bin) = createBinaryDataForSend(data) {
postWait.append(bin) postWait.append(bin)
} }
} }

9
SocketIOClientSwift/SocketParser.swift
View File

@ -63,8 +63,9 @@ class SocketParser {
static func parseString(message: String) -> Either<String, SocketPacket> { static func parseString(message: String) -> Either<String, SocketPacket> {
var parser = SocketStringReader(message: message) var parser = SocketStringReader(message: message)
guard let type = SocketPacket.PacketType(str: parser.read(1)) guard let type = SocketPacket.PacketType(str: parser.read(1)) else {
else {return .Left("Invalid packet type \(message)")} return .Left("Invalid packet type")
}
if !parser.hasNext { if !parser.hasNext {
return .Right(SocketPacket(type: type, nsp: "/")) return .Right(SocketPacket(type: type, nsp: "/"))
@ -77,7 +78,7 @@ class SocketParser {
if let holders = Int(parser.readUntilStringOccurence("-")) { if let holders = Int(parser.readUntilStringOccurence("-")) {
placeholders = holders placeholders = holders
} else { } else {
return .Left("Invalid packet: \(message)") return .Left("Invalid packet")
} }
} }
@ -114,7 +115,7 @@ class SocketParser {
} }
// Parses data for events // Parses data for events
static func parseData(data: String) -> Either<String, [AnyObject]> { private static func parseData(data: String) -> Either<String, [AnyObject]> {
let stringData = data.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) let stringData = data.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
do { do {
if let arr = try NSJSONSerialization.JSONObjectWithData(stringData!, if let arr = try NSJSONSerialization.JSONObjectWithData(stringData!,