This commit is contained in:
parent
18a227e591
commit
7ff1d327de
@ -530,14 +530,15 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
|
|||||||
private func parseEngineMessage(var message: String, fromPolling: Bool) {
|
private func parseEngineMessage(var message: String, fromPolling: Bool) {
|
||||||
Logger.log("Got message: %@", type: logType, args: message)
|
Logger.log("Got message: %@", type: logType, args: message)
|
||||||
|
|
||||||
if fromPolling {
|
|
||||||
fixDoubleUTF8(&message)
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
|
||||||
|
if fromPolling && type != .Noop {
|
||||||
|
fixDoubleUTF8(&message)
|
||||||
|
}
|
||||||
|
|
||||||
switch type {
|
switch type {
|
||||||
case PacketType.Message:
|
case PacketType.Message:
|
||||||
|
|||||||
@ -26,6 +26,7 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
func fixDoubleUTF8(inout name: String) {
|
func fixDoubleUTF8(inout name: String) {
|
||||||
|
print(name)
|
||||||
let utf8 = name.dataUsingEncoding(NSISOLatin1StringEncoding)!
|
let utf8 = name.dataUsingEncoding(NSISOLatin1StringEncoding)!
|
||||||
let latin1 = NSString(data: utf8, encoding: NSUTF8StringEncoding)!
|
let latin1 = NSString(data: utf8, encoding: NSUTF8StringEncoding)!
|
||||||
name = latin1 as String
|
name = latin1 as String
|
||||||
|
|||||||
@ -116,7 +116,7 @@ struct SocketPacket {
|
|||||||
|
|
||||||
message += jsonString! as String + ","
|
message += jsonString! as String + ","
|
||||||
} catch {
|
} catch {
|
||||||
Logger.error("Error creating JSON object in SocketPacket.completeMessage", type: SocketPacket.logType)
|
Logger.error("Error creating JSON object in SocketPacket.completeMessage", type: SocketPacket.logType)
|
||||||
}
|
}
|
||||||
} else if var str = arg as? String {
|
} else if var str = arg as? String {
|
||||||
str = str["\n"] ~= "\\\\n"
|
str = str["\n"] ~= "\\\\n"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user