Merge branch 'development' into swift3

* development:
  Don't parse twice for errors
  use guarded try
  change spm name
  Modify mac version base mac os 10.9

Package.swift

@@ -1,5 +1,5 @@
 import PackageDescription
 
 let package = Package(
-    name: "SocketIOClientSwift"
+    name: "SocketIO"
 )

Socket.IO-Client-Swift.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.license      = { :type => 'MIT' }
   s.author       = { "Erik" => "nuclear.ace@gmail.com" }
   s.ios.deployment_target = '8.0'
-  s.osx.deployment_target = '10.10'
+  s.osx.deployment_target = '10.9'
   s.tvos.deployment_target = '9.0'
   s.source       = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v7.0.3' }
   s.source_files  = "Source/**/*.swift"

SocketIO-MacTests/SocketParserTest.swift

@@ -26,8 +26,9 @@ class SocketParserTest: XCTestCase {
         "0/swift": ("/swift", [], [], -1),
         "1/swift": ("/swift", [], [], -1),
         "4\"ERROR\"": ("/", ["ERROR"], [], -1),
-        "4{\"test\":2}": ("/", [["test": 2] as NSDictionary], [], -1),
-        "41": ("/", [1], [], -1)]
+        "4{\"test\":2}": ("/", [["test": 2]], [], -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) {

Source/SocketEngine.swift

@@ -354,10 +354,11 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
     private func handleNOOP() {
         doPoll()
     }
-
+    
     private func handleOpen(openData: String) {
         guard let json = try? openData.toNSDictionary() else {
             didError(reason: "Error parsing open packet")
+            
             return
         }
         

Source/SocketParsable.swift

@@ -107,17 +107,17 @@ extension SocketParsable {
             }
         }
         
-        let d = message[reader.advance(by: 1)..<message.endIndex]
         
-        switch parseData(d) {
+        
+        var dataArray = message[message.characters.index(reader.currentIndex, offsetBy: 1)..<message.endIndex]
+        
+        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)]") {
-                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))