merge master

Socket.IO-Client-Swift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Socket.IO-Client-Swift"
-  s.version      = "1.4.3"
+  s.version      = "1.4.4"
   s.summary      = "Socket.IO-client for Swift"
   s.description  = <<-DESC
                    Socket.IO-client for Swift.
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.author       = { "Erik" => "nuclear.ace@gmail.com" }
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.10'
-  s.source       = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v1.4.3' }
+  s.source       = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v1.4.4' }
   s.source_files  = "SwiftIO/**/*.swift"
   s.requires_arc = true
   # s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files

SwiftIO/SocketAnyEvent.swift

@@ -0,0 +1,35 @@
+//
+//  SocketAnyEvent.swift
+//  Socket.IO-Swift
+//
+//  Created by Erik Little on 3/28/15.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+
+import Foundation
+
+@objc public class SocketAnyEvent {
+    public let event:String!
+    public var items:[AnyObject]?
+    
+    init(event:String, items:[AnyObject]?) {
+        self.event = event
+        self.items = items
+    }
+}

SwiftIO/SocketEngine.swift

@@ -184,16 +184,19 @@ public class SocketEngine: NSObject, WebSocketDelegate {
         }
 
         self.waitingForPoll = true
-        let req = NSURLRequest(URL: NSURL(string: self.urlPolling! + "&sid=\(self.sid)&b64=1")!)
+        let req = NSMutableURLRequest(URL: NSURL(string: self.urlPolling! + "&sid=\(self.sid)&b64=1")!)
 
         self.doRequest(req)
     }
 
-    private func doRequest(req:NSURLRequest) {
+    private func doRequest(req:NSMutableURLRequest) {
         if !self.polling {
             return
         }
 
+        req.cachePolicy = NSURLRequestCachePolicy.ReloadIgnoringLocalAndRemoteCacheData
+
+        // NSLog("Doing request: \(req)")
         self.session.dataTaskWithRequest(req) {[weak self] data, res, err in
             if self == nil {
                 return
@@ -205,8 +208,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
                 return
             }
 
-            // println(data)
-
+            // NSLog("Got response: \(res)")
 
             if let str = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
                 dispatch_async(self!.parseQueue) {
@@ -220,7 +222,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
             if self!.fastUpgrade {
                 self?.doFastUpgrade()
                 return
-            } else if !self!.closed {
+            } else if !self!.closed && !self!.websocket {
                 self?.doPoll()
             }
             }.resume()
@@ -371,6 +373,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
                 length += chr
             } else {
                 if length == "" || testLength(length, &n) {
+                    NSLog("parsing error: \(str)")
                     self.handlePollingFailed("Error parsing XHR message")
                     return
                 }
@@ -379,7 +382,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
 
                 if let lengthInt = length.toInt() {
                     if lengthInt != msg.length {
-                        println("parsing error")
+                        NSLog("parsing error: \(str)")
                         return
                     }
                 }

SwiftIO/SocketEventHandler.swift

@@ -25,7 +25,6 @@
 import Foundation
 
 public typealias NormalCallback = (NSArray?, AckEmitter?) -> Void
-public typealias AnyHandler = (event:String, items:AnyObject?)
 public typealias AckEmitter = (AnyObject...) -> Void
 
 private func emitAckCallback(socket:SocketIOClient, num:Int)

SwiftIO/SocketIOClient.swift

@@ -28,7 +28,7 @@ public class SocketIOClient: NSObject, SocketEngineClient {
     let reconnectAttempts:Int!
     private lazy var params = [String: AnyObject]()
     private var ackHandlers = ContiguousArray<SocketAckHandler>()
-    private var anyHandler:((AnyHandler) -> Void)?
+    private var anyHandler:((SocketAnyEvent) -> Void)?
     private var _closed = false
     private var _connected = false
     private var _connecting = false
@@ -360,7 +360,7 @@ public class SocketIOClient: NSObject, SocketEngineClient {
             
             if self.anyHandler != nil {
                 dispatch_async(dispatch_get_main_queue()) {[weak self] in
-                    self?.anyHandler?((event, data))
+                    self?.anyHandler?(SocketAnyEvent(event: event, items: data))
                     return
                 }
             }
@@ -400,7 +400,7 @@ public class SocketIOClient: NSObject, SocketEngineClient {
     /**
     Adds a handler that will be called on every event.
     */
-    public func onAny(handler:(AnyHandler) -> Void) {
+    public func onAny(handler:(SocketAnyEvent) -> Void) {
         self.anyHandler = handler
     }