From 16eefa4abfa0bdc097ca3a649f3c208ab3ab7d21 Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Fri, 2 Sep 2016 18:03:15 -0400
Subject: [PATCH] Don't parse twice for errors

---
 SocketIO-MacTests/SocketParserTest.swift | 10 ++++++++--
 Source/SocketParsable.swift              | 16 +++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/SocketIO-MacTests/SocketParserTest.swift b/SocketIO-MacTests/SocketParserTest.swift
index a43fdaf..319c931 100644
--- a/SocketIO-MacTests/SocketParserTest.swift
+++ b/SocketIO-MacTests/SocketParserTest.swift
@@ -27,7 +27,8 @@ class SocketParserTest: XCTestCase {
         "1/swift": ("/swift", [], [], -1),
         "4\"ERROR\"": ("/", ["ERROR"], [], -1),
         "4{\"test\":2}": ("/", [["test": 2]], [], -1),
-        "41": ("/", [1], [], -1)]
+        "41": ("/", [1], [], -1),
+        "4[1, \"hello\"]": ("/", [1, "hello"], [], -1)]
     
     func testDisconnect() {
         let message = "1"
@@ -99,6 +100,11 @@ class SocketParserTest: XCTestCase {
         validateParseResult(message)
     }
     
+    func testErrorTypeArray() {
+        let message = "4[1, \"hello\"]"
+        validateParseResult(message)
+    }
+    
     func testInvalidInput() {
         let message = "8"
         switch testSocket.parseString(message) {
@@ -120,7 +126,7 @@ class SocketParserTest: XCTestCase {
     func validateParseResult(message: String) {
         let validValues = SocketParserTest.packetTypes[message]!
         let packet = testSocket.parseString(message)
-        let type = message.substringWithRange(Range<String.Index>(message.startIndex..<message.startIndex.advancedBy(1)))
+        let type = String(message.characters.prefixUpTo(message.startIndex.advancedBy(1)))
         if case let .Right(packet) = packet {
             XCTAssertEqual(packet.type, SocketPacket.PacketType(rawValue: Int(type) ?? -1)!)
             XCTAssertEqual(packet.nsp, validValues.0)
diff --git a/Source/SocketParsable.swift b/Source/SocketParsable.swift
index b12ba30..50bf6c9 100644
--- a/Source/SocketParsable.swift
+++ b/Source/SocketParsable.swift
@@ -107,17 +107,15 @@ extension SocketParsable {
             }
         }
         
-        let d = message[reader.currentIndex.advancedBy(1)..<message.endIndex]
+        var dataArray = message[reader.currentIndex.advancedBy(1)..<message.endIndex]
         
-        switch parseData(d) {
+        if type == .Error && !dataArray.hasPrefix("[") && !dataArray.hasSuffix("]") {
+            dataArray = "[" + dataArray + "]"
+        }
+        
+        switch parseData(dataArray) {
         case let .Left(err):
-            // Errors aren't always enclosed in an array
-            if case let .Right(data) = parseData("\([d as AnyObject])") {
-                return .Right(SocketPacket(type: type, data: data, id: Int(idString) ?? -1,
-                    nsp: namespace, placeholders: placeholders))
-            } else {
-                return .Left(err)
-            }
+            return .Left(err)
         case let .Right(data):
             return .Right(SocketPacket(type: type, data: data, id: Int(idString) ?? -1,
                 nsp: namespace, placeholders: placeholders))