diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index 183bcc3..5d36444 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -223,17 +223,13 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable _emit([event] + items) } - /** - Sends a message to the server, requesting an ack. Use the onAck method of SocketAckHandler to add - an ack. - */ + /// Sends a message to the server, requesting an ack. Use the onAck method of SocketAckHandler to add + /// an ack. public func emitWithAck(event: String, _ items: AnyObject...) -> OnAckCallback { return emitWithAck(event, withItems: items) } - /** - Same as emitWithAck, but for Objective-C - */ + /// Same as emitWithAck, but for Objective-C public func emitWithAck(event: String, withItems items: [AnyObject]) -> OnAckCallback { return createOnAck([event] + items) } diff --git a/Source/SocketParsable.swift b/Source/SocketParsable.swift index 537a614..cd539a1 100644 --- a/Source/SocketParsable.swift +++ b/Source/SocketParsable.swift @@ -76,7 +76,7 @@ extension SocketParsable { return .Right(SocketPacket(type: type, nsp: "/")) } - var namespace: String? + var namespace = "/" var placeholders = -1 if type == .BinaryEvent || type == .BinaryAck { @@ -119,23 +119,24 @@ extension SocketParsable { // If first you don't succeed, try again if case let .Right(data) = parseData("\([noPlaceholders as AnyObject])") { return .Right(SocketPacket(type: type, data: data, id: Int(idString) ?? -1, - nsp: namespace ?? "/", placeholders: placeholders)) + nsp: namespace, placeholders: placeholders)) } else { return .Left(err) } case let .Right(data): return .Right(SocketPacket(type: type, data: data, id: Int(idString) ?? -1, - nsp: namespace ?? "/", placeholders: placeholders)) + nsp: namespace, placeholders: placeholders)) } } // Parses data for events private func parseData(data: String) -> Either { let stringData = data.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) + do { if let arr = try NSJSONSerialization.JSONObjectWithData(stringData!, - options: NSJSONReadingOptions.MutableContainers) as? [AnyObject] { - return .Right(arr) + options: NSJSONReadingOptions.MutableContainers) as? [AnyObject] { + return .Right(arr) } else { return .Left("Expected data array") }