handle error message. Fix socketio/socket.io-client-swift#45

SwiftIO/SocketEngine.swift

@@ -349,7 +349,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
     
     public func open(opts:[String: AnyObject]? = nil) {
         if self.connected {
-            self.client?.engineDidError("Engine tried to open while connected")
+            self.client?.didError("Engine tried to open while connected")
             return
         }
         
@@ -478,9 +478,8 @@ public class SocketEngine: NSObject, WebSocketDelegate {
             message.removeAtIndex(message.startIndex)
             let mesData = message.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
             
-            if let json = NSJSONSerialization.JSONObjectWithData(mesData,
+            if let json = NSJSONSerialization.JSONObjectWithData(mesData, options: NSJSONReadingOptions.AllowFragments,
-                options: NSJSONReadingOptions.AllowFragments, error: &err) as? NSDictionary,
+                error: &err) as? NSDictionary, let sid = json["sid"] as? String {
-                let sid = json["sid"] as? String {
                     self.sid = sid
                     self._connected = true
                     
@@ -492,7 +491,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
                         self.pingInterval = pingInterval / 1000
                     }
             } else {
-                self.client?.engineDidError("Engine failed to handshake")
+                self.client?.didError("Engine failed to handshake")
                 return
             }
             

SwiftIO/SocketEngineClient.swift

@@ -32,7 +32,7 @@ import Foundation
     var socketURL:String {get}
     var secure:Bool {get}
     
-    func engineDidError(reason:String)
+    func didError(reason:AnyObject)
     func engineDidForceClose(reason:String)
     func parseSocketMessage(msg:String)
     func parseBinaryData(data:NSData)

SwiftIO/SocketIOClient.swift

@@ -226,6 +226,15 @@ public class SocketIOClient: NSObject, SocketEngineClient {
         self.handleEvent("connect", data: nil, isInternalMessage: false)
     }
     
+    /// error
+    public func didError(reason:AnyObject) {
+        if !(reason is [AnyObject]) {
+            self.handleEvent("error", data: [reason], isInternalMessage: true)
+        } else {
+            self.handleEvent("error", data: reason as? [AnyObject], isInternalMessage: true)
+        }
+    }
+    
     /**
     Same as close
     */
@@ -321,11 +330,6 @@ public class SocketIOClient: NSObject, SocketEngineClient {
         }
     }
     
-    /// Engine error
-    public func engineDidError(reason:String) {
-        self.handleEvent("error", data: [reason], isInternalMessage: true)
-    }
-    
     /// Server wants us to die
     public func engineDidForceClose(reason:String) {
         if self.closed {

SwiftIO/SocketParser.swift

@@ -24,46 +24,46 @@ import Foundation
 
 class SocketParser {
     private static let shredder = SocketParser.PacketShredder()
-
+    
     // Translation of socket.io-parser#deconstructPacket
     private class PacketShredder {
         var buf = ContiguousArray<NSData>()
-
+        
         func shred(data:AnyObject) -> AnyObject {
             if let bin = data as? NSData {
                 let placeholder = ["_placeholder" :true, "num": buf.count]
-
+                
                 buf.append(bin)
-
+                
                 return placeholder
             } else if let arr = data as? NSArray {
                 var newArr = NSMutableArray(array: arr)
-
+                
                 for i in 0..<arr.count {
                     newArr[i] = shred(arr[i])
                 }
-
+                
                 return newArr
             } else if let dict = data as? NSDictionary {
                 var newDict = NSMutableDictionary(dictionary: dict)
-
+                
                 for (key, value) in newDict {
                     newDict[key as! NSCopying] = shred(value)
                 }
-
+                
                 return newDict
             } else {
                 return data
             }
         }
-
+        
         func deconstructPacket(packet:SocketPacket) {
             if packet.data == nil {
                 return
             }
-
+            
             var data = packet.data!
-
+            
             for i in 0..<data.count {
                 if data[i] is NSArray || data[i] is NSDictionary {
                     data[i] = shred(data[i])
@@ -72,37 +72,37 @@ class SocketParser {
                     buf.append(bin)
                 }
             }
-
+            
             packet.data = data
             packet.binary = buf
             buf.removeAll(keepCapacity: true)
         }
     }
-
+    
     // Translation of socket.io-client#decodeString
     static func parseString(str:String) -> SocketPacket? {
         let arr = Array(str)
         let type = String(arr[0])
-
+        
         if arr.count == 1 {
             return SocketPacket(type: SocketPacketType(str: type))
         }
-
+        
         var id = nil as Int?
         var nsp = ""
         var i = 0
         var placeholders = -1
-
+        
         if type == "5" || type == "6" {
             var buf = ""
-
+            
             while arr[++i] != "-" {
                 buf += String(arr[i])
                 if i == arr.count {
                     break
                 }
             }
-
+            
             if buf.toInt() == nil || arr[i] != "-" {
                 NSLog("Error parsing \(str)")
                 return nil
@@ -110,26 +110,26 @@ class SocketParser {
                 placeholders = buf.toInt()!
             }
         }
-
+        
         if arr[i + 1] == "/" {
             while ++i < arr.count {
                 let c = arr[i]
-
+                
                 if c == "," {
                     break
                 }
-
+                
                 nsp += String(c)
             }
         }
-
+        
         if i + 1 >= arr.count {
             return SocketPacket(type: SocketPacketType(str: type),
                 nsp: nsp, placeholders: placeholders, id: id)
         }
-
+        
         let next = String(arr[i + 1])
-
+        
         if next.toInt() != nil {
             var c = ""
             while ++i < arr.count {
@@ -140,78 +140,83 @@ class SocketParser {
                     break
                 }
             }
-
+            
             id = c.toInt()
         }
-
+        
-        if i + 1 < arr.count {
+        if ++i < arr.count {
-            let d = String(arr[++i...arr.count-1])
+            let d = String(arr[i...arr.count-1])
             let noPlaceholders = d["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\""
-
+            let data:[AnyObject]
-            let data = SocketParser.parseData(noPlaceholders) as! [AnyObject]
+            
-
+            if let isArr = SocketParser.parseData(noPlaceholders) as? [AnyObject] {
+                data = isArr
+            } else {
+                data = [noPlaceholders]
+            }
+            
             return SocketPacket(type: SocketPacketType(str: type), data: data,
                 nsp: nsp, placeholders: placeholders, id: id)
         }
-
+        
         return nil
     }
-
+    
     // Parses data for events
     static func parseData(data:String) -> AnyObject? {
         var err:NSError?
         let stringData = data.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
         let parsed:AnyObject? = NSJSONSerialization.JSONObjectWithData(stringData!,
             options: NSJSONReadingOptions.AllowFragments, error: &err)
-
+        
         if err != nil {
             // println(err)
             return nil
         }
-
+        
         return parsed
     }
-
+    
     static func parseForEmit(packet:SocketPacket) {
         shredder.deconstructPacket(packet)
     }
-
+    
     // Parses messages recieved
     static func parseSocketMessage(stringMessage:String, socket:SocketIOClient) {
         if stringMessage == "" {
             return
         }
-
+        
         func checkNSP(nsp:String) -> Bool {
             return nsp == "" && socket.nsp != "/"
         }
-
+        
         let p = parseString(stringMessage) as SocketPacket!
-
+        
         if p.type == SocketPacketType.EVENT {
             if checkNSP(p.nsp) {
                 return
             }
-
+            
             socket.handleEvent(p.getEvent(), data: p.data,
                 isInternalMessage: false, wantsAck: p.id)
         } else if p.type == SocketPacketType.ACK {
             if checkNSP(p.nsp) {
                 return
             }
-
+            
             socket.handleAck(p.id!, data: p.data)
         } else if p.type == SocketPacketType.BINARY_EVENT {
             if checkNSP(p.nsp) {
                 return
             }
-
+            
             socket.waitingData.append(p)
         } else if p.type == SocketPacketType.BINARY_ACK {
             if checkNSP(p.nsp) {
                 return
             }
-
+            
             p.justAck = true
             socket.waitingData.append(p)
         } else if p.type == SocketPacketType.CONNECT {
@@ -224,27 +229,29 @@ class SocketParser {
             }
         } else if p.type == SocketPacketType.DISCONNECT {
             socket.engineDidForceClose("Got Disconnect")
+        } else if p.type == SocketPacketType.ERROR {
+            socket.didError(p.data == nil ? "Error" : p.data!)
         }
     }
-
+    
     // Handles binary data
     static func parseBinaryData(data:NSData, socket:SocketIOClient) {
         // NSLog(data.base64EncodedStringWithOptions(NSDataBase64EncodingOptions.allZeros))
-
+        
         if socket.waitingData.count == 0 {
             NSLog("Got data when not remaking packet")
             return
         }
-
+        
         let shouldExecute = socket.waitingData[0].addData(data)
-
+        
         if !shouldExecute {
             return
         }
-
+        
         let packet = socket.waitingData.removeAtIndex(0)
         packet.fillInPlaceholders()
-
+        
         if !packet.justAck {
             socket.handleEvent(packet.getEvent(), data: packet.data,
                 wantsAck: packet.id)