From c7e5d27b135d31e4ce81f066176b1719659c0e14 Mon Sep 17 00:00:00 2001
From: Philipp Kyeck <philipp@beta-interactive.de>
Date: Sun, 23 Mar 2014 12:40:23 +0100
Subject: [PATCH 01/21] update changelog to v0.5.2

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ea27ee..d8e6d68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.5.2 (2014-03-23)
+
+  - check HTTP status code of NSURLConnection responses during xhr polling transport
+
+
 ## 0.5.1 (2014-03-14)
 
   - add method to pass cookies on handshake

From 883b99aa87155365ad40787e7d954beb22ce4bbc Mon Sep 17 00:00:00 2001
From: Philipp Kyeck <philipp@beta-interactive.de>
Date: Wed, 18 Jun 2014 20:55:19 +0200
Subject: [PATCH 02/21] add note about v1.0

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 2e8fca9..acfa5f9 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,9 @@
+---
+**The current version of this library does not yet support socket.io v1.0.  
+So if you want to use socket.io-objc, please fall back to v0.9.x.**
+
+---
+
 # Socket.IO / Objective C Library
 
   Interface to communicate between Objective C and [Socket.IO](http://socket.io/)

From 7ccd121acfb350ade2389718ea3929f40ffeb578 Mon Sep 17 00:00:00 2001
From: Philipp Kyeck <philipp@beta-interactive.de>
Date: Wed, 18 Jun 2014 20:55:59 +0200
Subject: [PATCH 03/21] add note about v1.0

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index acfa5f9..cff7233 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 ---
+
 **The current version of this library does not yet support socket.io v1.0.  
 So if you want to use socket.io-objc, please fall back to v0.9.x.**
 

From 349584e72712fc6d7edaa3b125d3b89e3b2c5cea Mon Sep 17 00:00:00 2001
From: Philipp Kyeck <philipp@beta-interactive.de>
Date: Wed, 18 Jun 2014 21:02:43 +0200
Subject: [PATCH 04/21] Update README.md

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index cff7233..ef65765 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
----
-
 **The current version of this library does not yet support socket.io v1.0.  
 So if you want to use socket.io-objc, please fall back to v0.9.x.**
 

From 1abdd750493ab725ed41159c4161128653fd4af3 Mon Sep 17 00:00:00 2001
From: temasys support <temasyssupport@temasys-macmini.temasys>
Date: Fri, 27 Jun 2014 17:17:21 +0800
Subject: [PATCH 05/21] [ENH]Support for socket.io 1.0.x Support is only for
 send message/send JSON/send event without ack. Binary are not supported.

---
 SocketIO.h                   |   6 +
 SocketIO.m                   | 714 ++++++++++++++++++++++++-----------
 SocketIOJSONSerialization.m  |   3 +-
 SocketIOPacket.h             |   8 +
 SocketIOPacket.m             | 138 ++++++-
 SocketIOTransport.h          |   8 +
 SocketIOTransportWebsocket.m |  23 +-
 SocketIOTransportXHR.m       |   6 +
 submodules/socket-rocket     |   2 +-
 9 files changed, 658 insertions(+), 250 deletions(-)

diff --git a/SocketIO.h b/SocketIO.h
index 2fbb12e..67ceb23 100755
--- a/SocketIO.h
+++ b/SocketIO.h
@@ -21,6 +21,7 @@
 #import <Foundation/Foundation.h>
 
 #import "SocketIOTransport.h"
+#import "SocketIOPacket.h"
 
 @class SocketIO;
 @class SocketIOPacket;
@@ -41,6 +42,7 @@ typedef enum {
 } SocketIOErrorCodes;
 
 
+
 @protocol SocketIODelegate <NSObject>
 @optional
 - (void) socketIODidConnect:(SocketIO *)socket;
@@ -61,6 +63,8 @@ typedef enum {
     NSString *_endpoint;
     NSDictionary *_params;
     
+    SocketIOVersion _version;    
+    
     __weak id<SocketIODelegate> _delegate;
     
     NSObject <SocketIOTransport> *_transport;
@@ -75,7 +79,9 @@ typedef enum {
     
     // heartbeat
     NSTimeInterval _heartbeatTimeout;
+    NSTimeInterval _connectionTimeout;
     dispatch_source_t _timeout;
+    dispatch_source_t _heartbeat;
     
     NSMutableArray *_queue;
     
diff --git a/SocketIO.m b/SocketIO.m
index 61ff67a..63b9dc5 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -37,7 +37,9 @@
 #endif
 
 static NSString* kResourceName = @"socket.io";
-static NSString* kHandshakeURL = @"%@://%@%@/%@/1/?t=%.0f%@";
+static NSString* kTransportPolling = @"polling";
+static NSString* kTransportWebsocket = @"websocket";
+static NSString* kHandshakeURL = @"%@://%@%@/%@/1/?EIO=2&transport=%@&t=%.0f%@";
 static NSString* kForceDisconnectURL = @"%@://%@%@/%@/1/xhr-polling/%@?disconnect";
 
 float const defaultConnectionTimeout = 10.0f;
@@ -55,11 +57,10 @@ - (NSArray*) arrayOfCaptureComponentsMatchedByRegex:(NSString*)regex;
 - (void) setTimeout;
 - (void) onTimeout;
 
+- (void) sendHeartbeat;
 - (void) onConnect:(SocketIOPacket *)packet;
 - (void) onDisconnect:(NSError *)error;
-
 - (void) sendDisconnect;
-- (void) sendHearbeat;
 - (void) send:(SocketIOPacket *)packet;
 
 - (NSString *) addAcknowledge:(SocketIOCallback)function;
@@ -136,7 +137,9 @@ - (void) connectToHost:(NSString *)host
         NSString *protocol = _useSecure ? @"https" : @"http";
         NSString *port = _port ? [NSString stringWithFormat:@":%d", _port] : @"";
         NSTimeInterval time = [[NSDate date] timeIntervalSince1970] * 1000;
-        NSString *handshakeUrl = [NSString stringWithFormat:kHandshakeURL, protocol, _host, port, kResourceName, time, query];
+        NSString *handshakeUrl = [NSString stringWithFormat:kHandshakeURL, protocol, _host, port, kResourceName,kTransportPolling, time, query];
+        //@"%@://%@%@/%@/1/?t=%.0f%@";
+        //http://<host><port>/socket.io/1/?t=<time>f<query>
         
         DEBUGLOG(@"Connecting to socket with URL: %@", handshakeUrl);
         query = nil;
@@ -207,10 +210,20 @@ - (void) sendMessage:(NSString *)data
 
 - (void) sendMessage:(NSString *)data withAcknowledge:(SocketIOCallback)function
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"message"];
-    packet.data = data;
-    packet.pId = [self addAcknowledge:function];
-    [self send:packet];
+    switch (_version)
+    {
+        case V09x:
+        {
+            SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"message"];
+            packet.data = data;
+            packet.pId = [self addAcknowledge:function];
+            [self send:packet];
+        }break;
+        case V10x:
+        {
+            [self sendEvent:@"message" withData:data];
+        }break;
+    }
 }
 
 - (void) sendJSON:(NSDictionary *)data
@@ -220,10 +233,20 @@ - (void) sendJSON:(NSDictionary *)data
 
 - (void) sendJSON:(NSDictionary *)data withAcknowledge:(SocketIOCallback)function
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"json"];
-    packet.data = [SocketIOJSONSerialization JSONStringFromObject:data error:nil];
-    packet.pId = [self addAcknowledge:function];
-    [self send:packet];
+    switch (_version)
+    {
+        case V09x:
+        {
+            SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"json"];
+            packet.data = [SocketIOJSONSerialization JSONStringFromObject:data error:nil];
+            packet.pId = [self addAcknowledge:function];
+            [self send:packet];
+        }break;
+        case V10x:
+        {
+            [self sendEvent:@"message" withData:data andAcknowledge:function];
+        }break;
+    }
 }
 
 - (void) sendEvent:(NSString *)eventName withData:(id)data
@@ -233,15 +256,35 @@ - (void) sendEvent:(NSString *)eventName withData:(id)data
 
 - (void) sendEvent:(NSString *)eventName withData:(id)data andAcknowledge:(SocketIOCallback)function
 {
-    NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObject:eventName forKey:@"name"];
-
-    // do not require arguments
-    if (data != nil) {
-        [dict setObject:[NSArray arrayWithObject:data] forKey:@"args"];
+    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"event" using:_version];
+    switch (_version) {
+        case V10x:
+        {
+            NSMutableArray *array = [NSMutableArray arrayWithObjects:eventName, nil];
+            
+            // do not require arguments
+            if (data != nil)
+            {
+                [array addObject:data];
+            }
+            packet.data = [SocketIOJSONSerialization JSONStringFromObject:array error:nil];
+            //packet.data = [packet.data stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
+        }break;
+            
+        case V09x:
+        {
+            NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObject:eventName forKey:@"name"];
+            
+            // do not require arguments
+            if (data != nil)
+            {
+                [dict setObject:[NSArray arrayWithObject:data] forKey:@"args"];
+            }
+            packet.data = [SocketIOJSONSerialization JSONStringFromObject:dict error:nil];
+        }break;
     }
     
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"event"];
-    packet.data = [SocketIOJSONSerialization JSONStringFromObject:dict error:nil];
+    packet.name =eventName;
     packet.pId = [self addAcknowledge:function];
     if (function) {
         packet.ack = @"data";
@@ -269,20 +312,20 @@ - (void) setResourceName:(NSString *)name
 
 - (void) sendDisconnect
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"disconnect"];
+    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"disconnect" using:_version];
     [self send:packet];
     [self onDisconnect:nil];
 }
 
 - (void) sendConnect
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"connect"];
+    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"connect" using:_version];
     [self send:packet];
 }
 
 - (void) sendHeartbeat
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"heartbeat"];
+    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"heartbeat" using:_version];
     [self send:packet];
 }
 
@@ -292,39 +335,10 @@ - (void) send:(SocketIOPacket *)packet
         DEBUGLOG(@"Already disconnected!");
         return;
     }
-    DEBUGLOG(@"send()");
-    NSNumber *type = [packet typeAsNumber];
-    NSMutableArray *encoded = [NSMutableArray arrayWithObject:type];
+    DEBUGLOG(@"Prepare to send()");
     
-    NSString *pId = packet.pId != nil ? packet.pId : @"";
-    if ([packet.ack isEqualToString:@"data"]) {
-        pId = [pId stringByAppendingString:@"+"];
-    }
     
-    // Do not write pid for acknowledgements
-    if ([type intValue] != 6) {
-        [encoded addObject:pId];
-    }
-    
-    // Add the end point for the namespace to be used, as long as it is not
-    // an ACK, heartbeat, or disconnect packet
-    if ([type intValue] != 6 && [type intValue] != 2 && [type intValue] != 0) {
-        [encoded addObject:_endpoint];
-    } 
-    else {
-        [encoded addObject:@""];
-    }
-    
-    if (packet.data != nil) {
-        NSString *ackpId = @"";
-        // This is an acknowledgement packet, so, prepend the ack pid to the data
-        if ([type intValue] == 6) {
-            ackpId = [NSString stringWithFormat:@":%@%@", packet.pId, @"+"];
-        }
-        [encoded addObject:[NSString stringWithFormat:@"%@%@", ackpId, packet.data]];
-    }
-    
-    NSString *req = [encoded componentsJoinedByString:@":"];
+    NSString *req = [packet toString:_version];
     if (![_transport isReady]) {
         DEBUGLOG(@"queue >>> %@", req);
         [_queue addObject:packet];
@@ -376,7 +390,6 @@ - (void) onConnect:(SocketIOPacket *)packet
     
     // send any queued packets
     [self doQueue];
-    
     [self setTimeout];
 }
 
@@ -417,7 +430,7 @@ - (void) onTimeout
 
 - (void) setTimeout 
 {
-    DEBUGLOG(@"start/reset timeout");
+    //DEBUGLOG(@"start/reset timeout");
     if (_timeout) {
         dispatch_source_cancel(_timeout);
         _timeout = NULL;
@@ -429,7 +442,7 @@ - (void) setTimeout
                                       dispatch_get_main_queue());
     
     dispatch_source_set_timer(_timeout,
-                              dispatch_time(DISPATCH_TIME_NOW, _heartbeatTimeout * NSEC_PER_SEC),
+                              dispatch_time(DISPATCH_TIME_NOW, _connectionTimeout * NSEC_PER_SEC),
                               0,
                               0);
     
@@ -439,8 +452,40 @@ - (void) setTimeout
         [weakSelf onTimeout];
     });
     
-    dispatch_resume(_timeout);
+    dispatch_resume(_timeout);    
+}
+
+- (void) onHeartBeat
+{
+    [self sendHeartbeat];
+}
+
+- (void) setHeartBeat
+{
+    DEBUGLOG(@"start/reset Heartbeat");
+    if (_heartbeat)
+    {
+        dispatch_source_cancel(_heartbeat);
+        _heartbeat = NULL;
+    }
+    
+    _heartbeat = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER,
+                                      0,
+                                      0,
+                                      dispatch_get_main_queue());
+    
+    dispatch_source_set_timer(_heartbeat,
+                              dispatch_time(DISPATCH_TIME_NOW, DISPATCH_TIME_NOW),
+                              _heartbeatTimeout * NSEC_PER_SEC,
+                              0);
+    
+    __weak SocketIO *weakSelf = self;
+    
+    dispatch_source_set_event_handler(_heartbeat, ^{
+        [weakSelf onHeartBeat];
+    });
     
+    dispatch_resume(_heartbeat);
 }
 
 
@@ -483,128 +528,263 @@ - (void) onData:(NSString *)data
     [self setTimeout];
     
     // check if data is valid (from socket.io.js)
-    NSString *regex = @"^([^:]+):([0-9]+)?(\\+)?:([^:]+)?:?(.*)?$";
-    NSString *regexPieces = @"^([0-9]+)(\\+)?(.*)";
-    
-    // create regex result
-    NSMutableArray *test = [self getMatchesFrom:data with:regex];
-    
-    // valid data-string arrived
-    if ([test count] > 0) {
-        NSArray *result = [test objectAtIndex:0];
-        
-        int idx = [[result objectAtIndex:1] intValue];
-        SocketIOPacket *packet = [[SocketIOPacket alloc] initWithTypeIndex:idx];
-        
-        packet.pId = [result objectAtIndex:2];
-        
-        packet.ack = [result objectAtIndex:3];
-        packet.endpoint = [result objectAtIndex:4];
-        packet.data = [result objectAtIndex:5];
-        
-        //
-        switch (idx) {
-            case 0: {
-                DEBUGLOG(@"disconnect");
-                [self onDisconnect:[NSError errorWithDomain:SocketIOError
-                                                       code:SocketIOServerRespondedWithDisconnect
-                                                   userInfo:nil]];
-                break;
-            }
-            case 1: {
-                DEBUGLOG(@"connected");
-                // from socket.io.js ... not sure when data will contain sth?!
-                // packet.qs = data || '';
-                [self onConnect:packet];
-                break;
-            }
-            case 2: {
-                DEBUGLOG(@"heartbeat");
-                [self sendHeartbeat];
-                break;
-            }
-            case 3: {
-                DEBUGLOG(@"message");
-                if (packet.data && ![packet.data isEqualToString:@""]) {
-                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveMessage:)]) {
-                        [_delegate socketIO:self didReceiveMessage:packet];
+    switch(_version)
+    {
+        case V09x:
+        {
+            NSString *regex = @"^([^:]+):([0-9]+)?(\\+)?:([^:]+)?:?(.*)?$";
+            NSString *regexPieces = @"^([0-9]+)(\\+)?(.*)";
+            
+            // create regex result
+            NSMutableArray *test = [self getMatchesFrom:data with:regex];
+            
+            // valid data-string arrived
+            if ([test count] > 0) {
+                NSArray *result = [test objectAtIndex:0];
+                
+                int idx = [[result objectAtIndex:1] intValue];
+                SocketIOPacket *packet = [[SocketIOPacket alloc] initWithTypeIndex:idx using:_version];
+                
+                packet.pId = [result objectAtIndex:2];
+                
+                packet.ack = [result objectAtIndex:3];
+                packet.endpoint = [result objectAtIndex:4];
+                packet.data = [result objectAtIndex:5];
+                
+                //
+                switch (idx)
+                {
+                    case 0: {
+                        DEBUGLOG(@"disconnect");
+                        [self onDisconnect:[NSError errorWithDomain:SocketIOError
+                                                               code:SocketIOServerRespondedWithDisconnect
+                                                           userInfo:nil]];
+                        break;
                     }
-                }
-                break;
-            }
-            case 4: {
-                DEBUGLOG(@"json");
-                if (packet.data && ![packet.data isEqualToString:@""]) {
-                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveJSON:)]) {
-                        [_delegate socketIO:self didReceiveJSON:packet];
+                    case 1: {
+                        DEBUGLOG(@"connected");
+                        // from socket.io.js ... not sure when data will contain sth?!
+                        // packet.qs = data || '';
+                        [self onConnect:packet];
+                        break;
                     }
-                }
-                break;
-            }
-            case 5: {
-                DEBUGLOG(@"event");
-                if (packet.data && ![packet.data isEqualToString:@""]) {
-                    NSDictionary *json = [packet dataAsJSON];
-                    packet.name = [json objectForKey:@"name"];
-                    packet.args = [json objectForKey:@"args"];
-                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveEvent:)]) {
-                        [_delegate socketIO:self didReceiveEvent:packet];
+                    case 2: {
+                        DEBUGLOG(@"heartbeat");
+                        [self sendHeartbeat];
+                        break;
                     }
-                }
-                break;
-            }
-            case 6: {
-                DEBUGLOG(@"ack");
-                
-                // create regex result
-                NSMutableArray *pieces = [self getMatchesFrom:packet.data with:regexPieces];
-                
-                if ([pieces count] > 0) {
-                    NSArray *piece = [pieces objectAtIndex:0];
-                    int ackId = [[piece objectAtIndex:1] intValue];
-                    DEBUGLOG(@"ack id found: %d", ackId);
-                    
-                    NSString *argsStr = [piece objectAtIndex:3];
-                    id argsData = nil;
-                    if (argsStr && ![argsStr isEqualToString:@""]) {
-                        argsData = [SocketIOJSONSerialization objectFromJSONData:[argsStr dataUsingEncoding:NSUTF8StringEncoding] error:nil];
-                        // either send complete response or only the first arg to callback
-                        if (!_returnAllDataFromAck && [argsData count] > 0) {
-                            argsData = [argsData objectAtIndex:0];
+                    case 3: {
+                        DEBUGLOG(@"message");
+                        if (packet.data && ![packet.data isEqualToString:@""]) {
+                            if ([_delegate respondsToSelector:@selector(socketIO:didReceiveMessage:)]) {
+                                [_delegate socketIO:self didReceiveMessage:packet];
+                            }
                         }
+                        break;
                     }
-                    
-                    // get selector for ackId
-                    NSString *key = [NSString stringWithFormat:@"%d", ackId];
-                    SocketIOCallback callbackFunction = [_acks objectForKey:key];
-                    if (callbackFunction != nil) {
-                        callbackFunction(argsData);
-                        [self removeAcknowledgeForKey:key];
+                    case 4: {
+                        DEBUGLOG(@"json");
+                        if (packet.data && ![packet.data isEqualToString:@""]) {
+                            if ([_delegate respondsToSelector:@selector(socketIO:didReceiveJSON:)]) {
+                                [_delegate socketIO:self didReceiveJSON:packet];
+                            }
+                        }
+                        break;
+                    }
+                    case 5: {
+                        DEBUGLOG(@"event");
+                        if (packet.data && ![packet.data isEqualToString:@""]) {
+                            NSDictionary *json = [packet dataAsJSON];
+                            packet.name = [json objectForKey:@"name"];
+                            packet.args = [json objectForKey:@"args"];
+                            if ([_delegate respondsToSelector:@selector(socketIO:didReceiveEvent:)]) {
+                                [_delegate socketIO:self didReceiveEvent:packet];
+                            }
+                        }
+                        break;
+                    }
+                    case 6: {
+                        DEBUGLOG(@"ack");
+                        
+                        // create regex result
+                        NSMutableArray *pieces = [self getMatchesFrom:packet.data with:regexPieces];
+                        
+                        if ([pieces count] > 0) {
+                            NSArray *piece = [pieces objectAtIndex:0];
+                            int ackId = [[piece objectAtIndex:1] intValue];
+                            DEBUGLOG(@"ack id found: %d", ackId);
+                            
+                            NSString *argsStr = [piece objectAtIndex:3];
+                            id argsData = nil;
+                            if (argsStr && ![argsStr isEqualToString:@""]) {
+                                argsData = [SocketIOJSONSerialization objectFromJSONData:[argsStr dataUsingEncoding:NSUTF8StringEncoding] error:nil];
+                                // either send complete response or only the first arg to callback
+                                if (!_returnAllDataFromAck && [argsData count] > 0) {
+                                    argsData = [argsData objectAtIndex:0];
+                                }
+                            }
+                            
+                            // get selector for ackId
+                            NSString *key = [NSString stringWithFormat:@"%d", ackId];
+                            SocketIOCallback callbackFunction = [_acks objectForKey:key];
+                            if (callbackFunction != nil) {
+                                callbackFunction(argsData);
+                                [self removeAcknowledgeForKey:key];
+                            }
+                        }
+                        
+                        break;
+                    }
+                    case 7: {
+                        DEBUGLOG(@"error");
+                        break;
+                    }
+                    case 8: {
+                        DEBUGLOG(@"noop");
+                        break;
+                    }
+                    default: {
+                        DEBUGLOG(@"command not found or not yet supported");
+                        break;
                     }
                 }
                 
-                break;
-            }
-            case 7: {
-                DEBUGLOG(@"error");
-                break;
+                packet = nil;
             }
-            case 8: {
-                DEBUGLOG(@"noop");
-                break;
+            else {
+                DEBUGLOG(@"ERROR: data that has arrived wasn't valid");
             }
-            default: {
-                DEBUGLOG(@"command not found or not yet supported");
-                break;
+        }break;
+        case V10x:
+        {
+            //42<NAMESPACE>["<event>","{}"]
+            //GET VERSION
+            NSUInteger control = [[NSNumber numberWithUnsignedChar:[data characterAtIndex:0]] integerValue]
+                                    -[[NSNumber numberWithUnsignedChar:'0'] integerValue];
+            SocketIOPacket *packet = [[SocketIOPacket alloc] initWithTypeIndex:control using:_version];
+            
+            
+            //dont care about the endpoint here
+            packet.endpoint = @"";
+            
+            //GET GETDATA
+            if(data.length>1)
+                packet.data = [data substringFromIndex:1];
+            else
+                packet.data = @"";
+            
+            switch (control)
+            {
+                case 0:
+                    //??
+                    break;
+                case 1:
+                    //??
+                    break;
+                case 2:
+                {
+                    //Ping->Pong
+                    [self sendMessage:[NSString stringWithFormat:@"3:%@", data]];
+                }    break;
+                case 3:
+                    //Pong
+                    if([data isEqualToString:@"probe"])
+                        [self sendMessage:@"5"];
+                    break;
+                case 4:
+                {
+                    //Message
+                    control = [[NSNumber numberWithUnsignedChar:[packet.data characterAtIndex:0]] integerValue]
+                                                    -[[NSNumber numberWithUnsignedChar:'0'] integerValue];
+                    //GET ENDPOINT
+                    NSUInteger rendpoint = [packet.data rangeOfString:@"["].location;
+                    if(rendpoint == NSNotFound)
+                        packet.endpoint = @"";
+                    else
+                        packet.endpoint = [packet.data substringToIndex:rendpoint];
+                    
+                    //GET GETDATA
+                    if(rendpoint == NSNotFound)
+                        packet.data = @"";
+                    else
+                        packet.data = [packet.data substringFromIndex:rendpoint];
+                    
+                    switch (control) {
+                        case 0:
+                            //Connected
+                            [self onConnect:packet];
+                            break;
+                        case 1:
+                            //Disconnected
+                            [self onDisconnect:[NSError errorWithDomain:SocketIOError
+                                                                   code:SocketIOServerRespondedWithDisconnect
+                                                               userInfo:nil]];
+                            break;
+                        case 2:
+                        {
+                            //Event
+                            if([packet.data characterAtIndex:0] == '[' && [packet.data characterAtIndex:packet.data.length-1] == ']')
+                            {
+                                NSString *prepArray = [packet.data substringWithRange:NSMakeRange(1, packet.data.length-2)];
+                                prepArray = [prepArray stringByReplacingOccurrencesOfString:@"\",\"" withString:@","]; //replace "," by ,
+                                prepArray = [prepArray stringByReplacingOccurrencesOfString:@"\\\"" withString:@"\""]; //replace \" by "
+                                prepArray = [prepArray substringWithRange:NSMakeRange(1, prepArray.length-2)];//remove first and last "
+                                DEBUGLOG(@"Parse this:%@ (%@)",packet.data,prepArray);
+                                NSArray *arrayResponse = [prepArray componentsSeparatedByString:@","];
+                                
+                                packet.name = arrayResponse[0];
+                                packet.args = [arrayResponse subarrayWithRange:NSMakeRange(1, arrayResponse.count-1)];
+                                if([packet.name isEqualToString:@"message"])
+                                {
+                                    packet.data = packet.args[0];
+                                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveMessage:)]) {
+                                        [_delegate socketIO:self didReceiveMessage:packet];
+                                    }
+                                }
+                                else
+                                {
+                                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveEvent:)]) {
+                                        [_delegate socketIO:self didReceiveEvent:packet];
+                                    }
+                                }
+                                
+                            }
+                            
+                            
+                            
+                        }    break;
+                        case 3:
+                            //Ack
+                            break;
+                        case 4:
+                            //Error
+                            break;
+                        case 5:
+                            //Binary Event
+                            break;
+                        case 6:
+                            //Binary Ack
+                            break;
+                            
+                        default:
+                            break;
+                    }
+                    
+                }    break;
+                case 5:
+                    //Upgrade Required
+                    break;
+                case 6:
+                    //Noop
+                    break;
+                    
+                default:
+                    break;
             }
-        }
-        
-        packet = nil;
+            
+        }break;
     }
-    else {
-        DEBUGLOG(@"ERROR: data that has arrived wasn't valid");
     }
-}
 
 - (void) onDisconnect:(NSError *)error
 {
@@ -619,6 +799,10 @@ - (void) onDisconnect:(NSError *)error
     [_queue removeAllObjects];
     
     // Kill the heartbeat timer
+    if (_heartbeat) {
+        dispatch_source_cancel(_heartbeat);
+        _heartbeat = NULL;
+    }
     if (_timeout) {
         dispatch_source_cancel(_timeout);
         _timeout = NULL;
@@ -702,77 +886,150 @@ - (void) connectionDidFinishLoading:(NSURLConnection *)connection
 { 	
  	NSString *responseString = [[NSString alloc] initWithData:_httpRequestData encoding:NSASCIIStringEncoding];
 
-    DEBUGLOG(@"connectionDidFinishLoading() %@", responseString);
-    NSArray *data = [responseString componentsSeparatedByString:@":"];
-    // should be SID : heartbeat timeout : connection timeout : supported transports
-    
-    // check each returned value (thanks for the input https://github.com/taiyangc)
+    DEBUGLOG(@"connectionDidFinishLoading()");
+    NSString *responseV09Regex = @"([^:]+):([^:]+):([^:]+):([^:]+)";
+    NSPredicate *version09predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", responseV09Regex];
+
     BOOL connectionFailed = false;
     NSError* error;
     
-    _sid = [data objectAtIndex:0];
-    if ([_sid length] < 1 || [data count] < 4) {
-        // did not receive valid data, possibly missing a useSecure?
-        connectionFailed = true;
-    }
-    else {
-        // check SID
-        DEBUGLOG(@"sid: %@", _sid);
-        NSString *regex = @"[^0-9]";
-        NSPredicate *regexTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", regex];
-        if ([_sid rangeOfString:@"error"].location != NSNotFound || [regexTest evaluateWithObject:_sid]) {
-            [self connectToHost:_host onPort:_port withParams:_params withNamespace:_endpoint];
-            return;
-        }
-        
-        // check heartbeat timeout
-        _heartbeatTimeout = [[data objectAtIndex:1] floatValue];
-        if (_heartbeatTimeout == 0.0) {
-            // couldn't find float value -> fail
-            connectionFailed = true;
-        }
-        else {
-            // add small buffer of 7sec (magic xD) otherwise heartbeat will be too late and connection is closed
-            _heartbeatTimeout += 7.0;
-        }
-        DEBUGLOG(@"heartbeatTimeout: %f", _heartbeatTimeout);
-        
-        // index 2 => connection timeout
+    if([version09predicate evaluateWithObject:responseString])
+    {
+        DEBUGLOG(@"Response %@", responseString);
+        //version 09x
+        _version = V09x;
+        NSArray *data = [responseString componentsSeparatedByString:@":"];
+        // should be SID : heartbeat timeout : connection timeout : supported transports in V09x
+        // should be ...0{"sid":"<sid>","upgrades":[<transports>,...],"pingInterval":<timeHeartbeat>,"pingTimeout":<timeOut>} in V10x
         
-        // get transports
-        NSString *t = [data objectAtIndex:3];
-        NSArray *transports = [t componentsSeparatedByString:@","];
-        DEBUGLOG(@"transports: %@", transports);
+        // check each returned value (thanks for the input https://github.com/taiyangc)
         
-        static Class webSocketTransportClass;
-        static Class xhrTransportClass;
-        
-        if (webSocketTransportClass == nil) {
-            webSocketTransportClass = NSClassFromString(@"SocketIOTransportWebsocket");
-        }
-        if (xhrTransportClass == nil) {
-            xhrTransportClass = NSClassFromString(@"SocketIOTransportXHR");
-        }
-        
-        if (webSocketTransportClass != nil && [transports indexOfObject:@"websocket"] != NSNotFound) {
-            DEBUGLOG(@"websocket supported -> using it now");
-            _transport = [[webSocketTransportClass alloc] initWithDelegate:self];
+        _sid = [data objectAtIndex:0];
+        if ([_sid length] < 1 || [data count] < 4) {
+            // did not receive valid data, possibly missing a useSecure?
+            connectionFailed = true;
         }
-        else if (xhrTransportClass != nil && [transports indexOfObject:@"xhr-polling"] != NSNotFound) {
-            DEBUGLOG(@"xhr polling supported -> using it now");
-            _transport = [[xhrTransportClass alloc] initWithDelegate:self];
+        else
+        {
+            // check SID
+            DEBUGLOG(@"sid: %@", _sid);
+            NSString *regex = @"[^0-9]";
+            NSPredicate *regexTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", regex];
+            if ([_sid rangeOfString:@"error"].location != NSNotFound || [regexTest evaluateWithObject:_sid])
+            {
+                [self connectToHost:_host onPort:_port withParams:_params withNamespace:_endpoint];
+                return;
+            }
+            
+            // check heartbeat timeout
+            _heartbeatTimeout = [[data objectAtIndex:1] floatValue];
+            if (_heartbeatTimeout == 0.0) {
+                // couldn't find float value -> fail
+                connectionFailed = true;
+            }
+            else {
+                // add small buffer of 7sec (magic xD) otherwise heartbeat will be too late and connection is closed
+                _heartbeatTimeout += 7.0;
+            }
+            
+            _connectionTimeout = [[data objectAtIndex:2] floatValue];
+            if (_connectionTimeout == 0.0) {
+                // couldn't find float value -> fail
+                connectionFailed = true;
+            }
+            else {
+                // add small buffer of 7sec (magic xD) otherwise connection will be too late and connection is closed
+                _connectionTimeout += 7.0;
+            }
+            DEBUGLOG(@"heartbeatTimeout: %f", _heartbeatTimeout);
+            
+            // index 2 => connection timeout
+            
+            // get transports
+            NSString *t = [data objectAtIndex:3];
+            NSArray *transports = [t componentsSeparatedByString:@","];
+            DEBUGLOG(@"transports: %@", transports);
+            
+            static Class webSocketTransportClass;
+            static Class xhrTransportClass;
+            
+            if (webSocketTransportClass == nil) {
+                webSocketTransportClass = NSClassFromString(@"SocketIOTransportWebsocket");
+            }
+            if (xhrTransportClass == nil) {
+                xhrTransportClass = NSClassFromString(@"SocketIOTransportXHR");
+            }
+            
+            if (webSocketTransportClass != nil && [transports indexOfObject:@"websocket"] != NSNotFound) {
+                DEBUGLOG(@"websocket supported -> using it now");
+                _transport = [[webSocketTransportClass alloc] initWithDelegate:self];
+            }
+            else if (xhrTransportClass != nil && [transports indexOfObject:@"xhr-polling"] != NSNotFound) {
+                DEBUGLOG(@"xhr polling supported -> using it now");
+                _transport = [[xhrTransportClass alloc] initWithDelegate:self];
+            }
+            else {
+                DEBUGLOG(@"no transport found that is supported :( -> fail");
+                connectionFailed = true;
+                error = [NSError errorWithDomain:SocketIOError
+                                            code:SocketIOTransportsNotSupported
+                                        userInfo:nil];
+            }
         }
-        else {
-            DEBUGLOG(@"no transport found that is supported :( -> fail");
-            connectionFailed = true;
-            error = [NSError errorWithDomain:SocketIOError
-                                        code:SocketIOTransportsNotSupported
-                                    userInfo:nil];
+    }
+    else
+    {
+        DEBUGLOG(@"VERSION 10x");
+        _version = V10x;
+        //...0{"sid":"<sid>","upgrades":[<transports>,...],"pingInterval":<timeHeartbeat>,"pingTimeout":<timeOut>}
+        responseString = [responseString substringFromIndex:[responseString rangeOfString:@"{"].location];
+        DEBUGLOG(@"Response %@", responseString);
+        connectionFailed = true;
+        NSData *utf8Data = [responseString dataUsingEncoding:NSUTF8StringEncoding];
+        NSDictionary *json = [SocketIOJSONSerialization objectFromJSONData:utf8Data error:nil];
+        if([json valueForKey:@"sid"] != nil
+           && [json valueForKey:@"upgrades"] != nil
+           && [json valueForKey:@"pingInterval"] != nil
+           && [json valueForKey:@"pingTimeout"] != nil)
+        {
+            connectionFailed = false;
+            _sid = [json objectForKey:@"sid"];
+            _heartbeatTimeout = [[json objectForKey:@"pingInterval"] floatValue] / 1000;
+            _connectionTimeout = [[json objectForKey:@"pingTimeout"] floatValue] / 1000;
+
+            
+            NSArray *transports = [json objectForKey:@"upgrades"];
+            static Class webSocketTransportClass;
+            static Class xhrTransportClass;
+            
+            if (webSocketTransportClass == nil) {
+                webSocketTransportClass = NSClassFromString(@"SocketIOTransportWebsocket");
+            }
+            if (xhrTransportClass == nil) {
+                xhrTransportClass = NSClassFromString(@"SocketIOTransportXHR");
+            }
+            
+            if (webSocketTransportClass != nil && [transports indexOfObject:@"websocket"] != NSNotFound) {
+                DEBUGLOG(@"websocket supported -> using it now");
+                _transport = [[webSocketTransportClass alloc] initWithDelegate:self];
+            }
+            else if (xhrTransportClass != nil && [transports indexOfObject:@"xhr-polling"] != NSNotFound) {
+                DEBUGLOG(@"xhr polling supported -> using it now");
+                _transport = [[xhrTransportClass alloc] initWithDelegate:self];
+            }
+            else {
+                DEBUGLOG(@"no transport found that is supported :( -> fail");
+                connectionFailed = true;
+                error = [NSError errorWithDomain:SocketIOError
+                                            code:SocketIOTransportsNotSupported
+                                        userInfo:nil];
+            }
         }
     }
     
     // if connection didn't return the values we need -> fail
-    if (connectionFailed) {
+    if (connectionFailed)
+    {
         // error already set!?
         if (error == nil) {
             error = [NSError errorWithDomain:SocketIOError
@@ -790,7 +1047,10 @@ - (void) connectionDidFinishLoading:(NSURLConnection *)connection
         return;
     }
     
-    [_transport open];
+    DEBUGLOG(@"Received All information:\n\tsid: %@\n\theartbeat: %f\n\tTransport: %@",_sid,_heartbeatTimeout,_transport);
+    
+    [_transport openUsing:_version];
+    [self setHeartBeat];
 }
 
 #if DEBUG_CERTIFICATE
diff --git a/SocketIOJSONSerialization.m b/SocketIOJSONSerialization.m
index 45eb448..705ea5d 100644
--- a/SocketIOJSONSerialization.m
+++ b/SocketIOJSONSerialization.m
@@ -26,7 +26,8 @@ + (id) objectFromJSONData:(NSData *)data error:(NSError **)error {
     return [NSJSONSerialization JSONObjectWithData:data options:0 error:error];    
 }
 
-+ (NSString *) JSONStringFromObject:(id)object error:(NSError **)error {
++ (NSString *) JSONStringFromObject:(id)object error:(NSError **)error
+{
     NSData *data = [NSJSONSerialization dataWithJSONObject:object options:0 error:error];
     return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];    
 }
diff --git a/SocketIOPacket.h b/SocketIOPacket.h
index ea1f30f..5425104 100644
--- a/SocketIOPacket.h
+++ b/SocketIOPacket.h
@@ -19,6 +19,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "SocketIOTransport.h"
 
 @interface SocketIOPacket : NSObject
 {
@@ -30,6 +31,7 @@
     NSArray *args;
     NSString *endpoint;
     NSArray *_types;
+    NSArray *_typesMessage;
 }
 
 @property (nonatomic, copy) NSString *type;
@@ -41,8 +43,14 @@
 @property (nonatomic, copy) NSArray *args;
 
 - (id) initWithType:(NSString *)packetType;
+- (id) initWithType:(NSString *)packetType
+                   using:(SocketIOVersion) version;
 - (id) initWithTypeIndex:(int)index;
+- (id) initWithTypeIndex:(int)index
+                   using:(SocketIOVersion) version;
 - (id) dataAsJSON;
+- (NSString *) toString;
+- (NSString *) toString:(SocketIOVersion) version;
 - (NSNumber *) typeAsNumber;
 - (NSString *) typeForIndex:(int)index;
 
diff --git a/SocketIOPacket.m b/SocketIOPacket.m
index d5c422b..129104c 100644
--- a/SocketIOPacket.m
+++ b/SocketIOPacket.m
@@ -26,26 +26,68 @@ @implementation SocketIOPacket
 @synthesize type, pId, name, ack, data, args, endpoint;
 
 - (id) init
+{
+    return [self init:V09x];
+}
+
+- (id) init:(SocketIOVersion) version
 {
     self = [super init];
-    if (self) {
-        _types = [NSArray arrayWithObjects: @"disconnect",
-                  @"connect",
-                  @"heartbeat",
-                  @"message",
-                  @"json",
-                  @"event",
-                  @"ack",
-                  @"error",
-                  @"noop",
-                  nil];
+    if (self)
+    {
+        switch (version) {
+            case V09x:
+                _types = [NSArray arrayWithObjects: @"disconnect",
+                          @"connect",
+                          @"heartbeat",
+                          @"message",
+                          @"json",
+                          @"event",
+                          @"ack",
+                          @"error",
+                          @"noop",
+                          nil];
+                _typesMessage = nil;
+                break;
+                
+            case V10x:
+            {
+                _types = [NSArray arrayWithObjects: @"disconnected",
+                          @"connected",
+                          @"heartbeat",
+                          @"pong",
+                          @"message",
+                          @"upgrade",
+                          @"noop",
+                          nil];
+                _typesMessage = [NSArray arrayWithObjects: @"connect",
+                          @"disconnect",
+                          @"event",
+                          @"ack",
+                          @"error",
+                          @"binarevent",
+                          @"binaryack",
+                          nil];
+            }   break;
+        }
     }
     return self;
 }
 
 - (id) initWithType:(NSString *)packetType
 {
-    self = [self init];
+    return [self initWithType:packetType using:V09x];
+}
+
+- (id) initWithTypeIndex:(int)index
+{
+    return [self initWithTypeIndex:index using:V09x];
+}
+
+- (id) initWithType:(NSString *)packetType
+              using:(SocketIOVersion) version
+{
+    self = [self init:version];
     if (self) {
         self.type = packetType;
     }
@@ -53,8 +95,9 @@ - (id) initWithType:(NSString *)packetType
 }
 
 - (id) initWithTypeIndex:(int)index
+                   using:(SocketIOVersion) version
 {
-    self = [self init];
+    self = [self init:version];
     if (self) {
         self.type = [self typeForIndex:index];
     }
@@ -72,10 +115,75 @@ - (id) dataAsJSON
     }
 }
 
+
+- (NSString *) toString
+{
+    return [self toString:V09x];
+}
+
+- (NSString *) toString:(SocketIOVersion) version
+{
+    NSMutableArray *encoded = [NSMutableArray arrayWithObject:[self typeAsNumber]];
+    //if([type isEqualToString:@"event"] && version == V10x)
+    //    [encoded addObject:@"2"];
+    
+    NSString *pIdL = self.pId != nil ? self.pId : @"";
+    if ([self.ack isEqualToString:@"data"])
+    {
+        pIdL = [pIdL stringByAppendingString:@"+"];
+    }
+    
+    // Do not write pid for acknowledgements
+    if ([type intValue] != 6) {
+        [encoded addObject:pIdL];
+    }
+    
+    // Add the end point for the namespace to be used, as long as it is not
+    // an ACK, heartbeat, or disconnect packet
+    if ([type intValue] != 6 && [type intValue] != 2 && [type intValue] != 0) {
+        [encoded addObject:endpoint];
+    }
+    else {
+        [encoded addObject:@""];
+    }
+    
+    if (data != nil)
+    {
+        NSString *ackpId = @"";
+        // This is an acknowledgement packet, so, prepend the ack pid to the data
+        if ([type intValue] == 6)
+        {
+            ackpId = [NSString stringWithFormat:@":%@%@", pIdL, @"+"];
+        }
+        
+        if(version ==V10x)
+        {
+            
+        }
+        [encoded addObject:[NSString stringWithFormat:@"%@%@", ackpId, data]];
+    }
+    NSString *separator = @"";
+    if(version == V09x)
+        separator = @":";
+    return [encoded componentsJoinedByString:separator];
+}
+
 - (NSNumber *) typeAsNumber
 {
-    NSUInteger index = [_types indexOfObject:self.type];
-    NSNumber *num = [NSNumber numberWithUnsignedInteger:index];
+    NSNumber *num = 0;
+    NSUInteger index;
+    if(_typesMessage != nil && (index = [_typesMessage indexOfObject:self.type]) != NSNotFound)
+    {
+        //it's a message type
+        index = [_typesMessage indexOfObject:self.type];
+        num = @([num integerValue] + 40);
+    }
+    else
+    {
+        index = [_types indexOfObject:self.type];
+        num = [NSNumber numberWithUnsignedInteger:index];
+    }
+    num = @([num integerValue] + [[NSNumber numberWithUnsignedInteger:index] integerValue]);    
     return num;
 }
 
diff --git a/SocketIOTransport.h b/SocketIOTransport.h
index 9f8f7be..241ddfc 100644
--- a/SocketIOTransport.h
+++ b/SocketIOTransport.h
@@ -20,6 +20,13 @@
 
 #import <Foundation/Foundation.h>
 
+typedef enum SocketIOVersion
+{
+    V09x,
+    V10x
+} SocketIOVersion;
+
+
 @protocol SocketIOTransportDelegate <NSObject>
 
 - (void) onData:(id)message;
@@ -38,6 +45,7 @@
 
 - (id) initWithDelegate:(id <SocketIOTransportDelegate>)delegate;
 - (void) open;
+- (void) openUsing:(SocketIOVersion)version;
 - (void) close;
 - (BOOL) isReady;
 - (void) send:(NSString *)request;
diff --git a/SocketIOTransportWebsocket.m b/SocketIOTransportWebsocket.m
index 5b1579b..25c63d8 100644
--- a/SocketIOTransportWebsocket.m
+++ b/SocketIOTransportWebsocket.m
@@ -29,10 +29,10 @@
 #define DEBUGLOG(...)
 #endif
 
-static NSString* kInsecureSocketURL = @"ws://%@/socket.io/1/websocket/%@";
-static NSString* kSecureSocketURL = @"wss://%@/socket.io/1/websocket/%@";
-static NSString* kInsecureSocketPortURL = @"ws://%@:%d/socket.io/1/websocket/%@";
-static NSString* kSecureSocketPortURL = @"wss://%@:%d/socket.io/1/websocket/%@";
+static NSString* kInsecureSocketURL = @"ws://%@/socket.io/1/websocket/%@%@";
+static NSString* kSecureSocketURL = @"wss://%@/socket.io/1/websocket/%@%@";
+static NSString* kInsecureSocketPortURL = @"ws://%@:%d/socket.io/1/websocket/%@%@";
+static NSString* kSecureSocketPortURL = @"wss://%@:%d/socket.io/1/websocket/%@%@";
 
 @implementation SocketIOTransportWebsocket
 
@@ -53,16 +53,26 @@ - (BOOL) isReady
 }
 
 - (void) open
+{
+    [self openUsing:V09x];
+}
+
+
+- (void) openUsing:(SocketIOVersion)version
 {
     NSString *urlStr;
     NSString *format;
+    NSString *addOnVersion = @"";
+    if(version == V10x)
+        addOnVersion = @"?EIO=2&transport=websocket&sid";
+    
     if (delegate.port) {
         format = delegate.useSecure ? kSecureSocketPortURL : kInsecureSocketPortURL;
-        urlStr = [NSString stringWithFormat:format, delegate.host, delegate.port, delegate.sid];
+        urlStr = [NSString stringWithFormat:format, delegate.host, delegate.port, addOnVersion, delegate.sid];
     }
     else {
         format = delegate.useSecure ? kSecureSocketURL : kInsecureSocketURL;
-        urlStr = [NSString stringWithFormat:format, delegate.host, delegate.sid];
+        urlStr = [NSString stringWithFormat:format, delegate.host,addOnVersion, delegate.sid];
     }
     NSURL *url = [NSURL URLWithString:urlStr];
     
@@ -104,6 +114,7 @@ - (void) webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message
 - (void) webSocketDidOpen:(SRWebSocket *)webSocket
 {
     DEBUGLOG(@"Socket opened.");
+    [_webSocket send:@"5"];
 }
 
 - (void) webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error
diff --git a/SocketIOTransportXHR.m b/SocketIOTransportXHR.m
index 771aef5..6e610ff 100644
--- a/SocketIOTransportXHR.m
+++ b/SocketIOTransportXHR.m
@@ -57,6 +57,12 @@ - (id) initWithDelegate:(id<SocketIOTransportDelegate>)delegate_
 }
 
 - (void) open
+{
+    [self openUsing:V09x];
+}
+
+
+- (void) openUsing:(SocketIOVersion)version
 {
     NSString *format;
     if (delegate.port) {
diff --git a/submodules/socket-rocket b/submodules/socket-rocket
index ce02374..8275ef3 160000
--- a/submodules/socket-rocket
+++ b/submodules/socket-rocket
@@ -1 +1 @@
-Subproject commit ce02374210f6e158d44a90eaaaf43fa7373eff21
+Subproject commit 8275ef3b15cebd99b1815840c55f4e07f96bf862

From fc62823f62db2fef01ec77c56f1cbbde2adf27df Mon Sep 17 00:00:00 2001
From: temasys support <temasyssupport@temasys-macmini.temasys>
Date: Mon, 30 Jun 2014 17:51:46 +0800
Subject: [PATCH 06/21] [FIX]Improve design packet + parse message better
 Message are parsed more correctly (still not really full proof)

---
 SocketIO.m       |  54 +++++++++++-----
 SocketIOPacket.h |  23 +++++--
 SocketIOPacket.m | 159 ++++++++++++++++++++++++++---------------------
 3 files changed, 144 insertions(+), 92 deletions(-)

diff --git a/SocketIO.m b/SocketIO.m
index 63b9dc5..2d07d24 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -256,10 +256,11 @@ - (void) sendEvent:(NSString *)eventName withData:(id)data
 
 - (void) sendEvent:(NSString *)eventName withData:(id)data andAcknowledge:(SocketIOCallback)function
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"event" using:_version];
+    SocketIOPacket *packet ;
     switch (_version) {
         case V10x:
         {
+            packet = [[SocketIOPacketV10x alloc] initWithType:@"event"];
             NSMutableArray *array = [NSMutableArray arrayWithObjects:eventName, nil];
             
             // do not require arguments
@@ -273,6 +274,7 @@ - (void) sendEvent:(NSString *)eventName withData:(id)data andAcknowledge:(Socke
             
         case V09x:
         {
+            packet = [[SocketIOPacket alloc] initWithType:@"event"];
             NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObject:eventName forKey:@"name"];
             
             // do not require arguments
@@ -312,20 +314,20 @@ - (void) setResourceName:(NSString *)name
 
 - (void) sendDisconnect
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"disconnect" using:_version];
+    SocketIOPacket *packet = [SocketIOPacket createPacketWithType:@"disconnect" version:_version];
     [self send:packet];
     [self onDisconnect:nil];
 }
 
 - (void) sendConnect
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"connect" using:_version];
+    SocketIOPacket *packet = [SocketIOPacket createPacketWithType:@"connect" version:_version];
     [self send:packet];
 }
 
 - (void) sendHeartbeat
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"heartbeat" using:_version];
+    SocketIOPacket *packet = [SocketIOPacket createPacketWithType:@"heartbeat" version:_version];
     [self send:packet];
 }
 
@@ -338,7 +340,7 @@ - (void) send:(SocketIOPacket *)packet
     DEBUGLOG(@"Prepare to send()");
     
     
-    NSString *req = [packet toString:_version];
+    NSString *req = [packet toString];
     if (![_transport isReady]) {
         DEBUGLOG(@"queue >>> %@", req);
         [_queue addObject:packet];
@@ -543,7 +545,7 @@ - (void) onData:(NSString *)data
                 NSArray *result = [test objectAtIndex:0];
                 
                 int idx = [[result objectAtIndex:1] intValue];
-                SocketIOPacket *packet = [[SocketIOPacket alloc] initWithTypeIndex:idx using:_version];
+                SocketIOPacket *packet = [[SocketIOPacket alloc] initWithTypeIndex:idx];
                 
                 packet.pId = [result objectAtIndex:2];
                 
@@ -661,8 +663,7 @@ - (void) onData:(NSString *)data
             //GET VERSION
             NSUInteger control = [[NSNumber numberWithUnsignedChar:[data characterAtIndex:0]] integerValue]
                                     -[[NSNumber numberWithUnsignedChar:'0'] integerValue];
-            SocketIOPacket *packet = [[SocketIOPacket alloc] initWithTypeIndex:control using:_version];
-            
+            SocketIOPacket *packet = [[SocketIOPacketV10x alloc] initWithTypeIndex:control];            
             
             //dont care about the endpoint here
             packet.endpoint = @"";
@@ -725,15 +726,36 @@ - (void) onData:(NSString *)data
                             //Event
                             if([packet.data characterAtIndex:0] == '[' && [packet.data characterAtIndex:packet.data.length-1] == ']')
                             {
-                                NSString *prepArray = [packet.data substringWithRange:NSMakeRange(1, packet.data.length-2)];
-                                prepArray = [prepArray stringByReplacingOccurrencesOfString:@"\",\"" withString:@","]; //replace "," by ,
-                                prepArray = [prepArray stringByReplacingOccurrencesOfString:@"\\\"" withString:@"\""]; //replace \" by "
-                                prepArray = [prepArray substringWithRange:NSMakeRange(1, prepArray.length-2)];//remove first and last "
-                                DEBUGLOG(@"Parse this:%@ (%@)",packet.data,prepArray);
-                                NSArray *arrayResponse = [prepArray componentsSeparatedByString:@","];
+                                //We have data = ["<event>",DATA,DATA] (Data can be "BLABLA" or {"bla":"bla","to":"to"})
+                                NSString *prepData = [packet.data substringWithRange:NSMakeRange(1, packet.data.length-2)]; //remove first and last []
+                                //We have data = "<event>",DATA,DATA (Data can be "BLABLA" or {"bla":"bla","to":"to"})
+                                NSUInteger commalocation = [prepData rangeOfString:@"\"," ].location;
+                                NSString *eventName = [prepData substringWithRange:NSMakeRange(1, commalocation-1)];//we get the event
+                                prepData = [prepData substringWithRange:NSMakeRange(commalocation+2, prepData.length-commalocation-2)];
+                                NSUInteger from = 0,to,rootcount = 0;
+                                DEBUGLOG(@"Parse this:%@ (%@)",packet.data,prepData);
+                                NSMutableArray *arrayResponse = [[NSMutableArray alloc] init];
+                                for (to = 0;to<prepData.length;++to)
+                                {
+                                    unichar c = [prepData characterAtIndex:to];
+                                    if(c == '{')
+                                        ++rootcount;
+                                    else if(c == '}')
+                                        --rootcount;
+                                    else if(c == ','
+                                            && ([prepData characterAtIndex:to-1] == '\"' || [prepData characterAtIndex:to-1] == '}')
+                                            && ([prepData characterAtIndex:to+1] == '\"' || [prepData characterAtIndex:to+1] == '{')
+                                            && rootcount == 0)
+                                    {
+                                        //we can cut here
+                                        [arrayResponse addObject:[prepData substringWithRange:NSMakeRange(from,to-from)]];
+                                        from = to+1;
+                                    }
+                                }
+                                [arrayResponse addObject:[prepData substringWithRange:NSMakeRange(from,to-from)]];
                                 
-                                packet.name = arrayResponse[0];
-                                packet.args = [arrayResponse subarrayWithRange:NSMakeRange(1, arrayResponse.count-1)];
+                                packet.name = eventName;
+                                packet.args = arrayResponse;
                                 if([packet.name isEqualToString:@"message"])
                                 {
                                     packet.data = packet.args[0];
diff --git a/SocketIOPacket.h b/SocketIOPacket.h
index 5425104..8fcfafe 100644
--- a/SocketIOPacket.h
+++ b/SocketIOPacket.h
@@ -21,9 +21,12 @@
 #import <Foundation/Foundation.h>
 #import "SocketIOTransport.h"
 
+@class SocketIOPacketV10x;
+
 @interface SocketIOPacket : NSObject
 {
     NSString *type;
+    NSString *_separator;
     NSString *pId;
     NSString *ack;
     NSString *name;
@@ -31,7 +34,6 @@
     NSArray *args;
     NSString *endpoint;
     NSArray *_types;
-    NSArray *_typesMessage;
 }
 
 @property (nonatomic, copy) NSString *type;
@@ -43,15 +45,24 @@
 @property (nonatomic, copy) NSArray *args;
 
 - (id) initWithType:(NSString *)packetType;
-- (id) initWithType:(NSString *)packetType
-                   using:(SocketIOVersion) version;
 - (id) initWithTypeIndex:(int)index;
-- (id) initWithTypeIndex:(int)index
-                   using:(SocketIOVersion) version;
 - (id) dataAsJSON;
 - (NSString *) toString;
-- (NSString *) toString:(SocketIOVersion) version;
 - (NSNumber *) typeAsNumber;
 - (NSString *) typeForIndex:(int)index;
 
++ (SocketIOPacket *) createPacketWithType:(NSString *)type
+                              version:(SocketIOVersion) version;
++ (SocketIOPacket *) createPacketWithTypeIndex:(int) type
+                              version:(SocketIOVersion) version;
+@end
+
+@interface SocketIOPacketV10x : SocketIOPacket
+{    
+    NSArray *_typesMessage;
+}
+
 @end
+
+
+
diff --git a/SocketIOPacket.m b/SocketIOPacket.m
index 129104c..52482d1 100644
--- a/SocketIOPacket.m
+++ b/SocketIOPacket.m
@@ -26,19 +26,13 @@ @implementation SocketIOPacket
 @synthesize type, pId, name, ack, data, args, endpoint;
 
 - (id) init
-{
-    return [self init:V09x];
-}
-
-- (id) init:(SocketIOVersion) version
 {
     self = [super init];
     if (self)
     {
-        switch (version) {
-            case V09x:
-                _types = [NSArray arrayWithObjects: @"disconnect",
-                          @"connect",
+        _separator = @":";
+        _types = [NSArray arrayWithObjects: @"disconnect",
+                            @"connect",
                           @"heartbeat",
                           @"message",
                           @"json",
@@ -47,47 +41,13 @@ - (id) init:(SocketIOVersion) version
                           @"error",
                           @"noop",
                           nil];
-                _typesMessage = nil;
-                break;
-                
-            case V10x:
-            {
-                _types = [NSArray arrayWithObjects: @"disconnected",
-                          @"connected",
-                          @"heartbeat",
-                          @"pong",
-                          @"message",
-                          @"upgrade",
-                          @"noop",
-                          nil];
-                _typesMessage = [NSArray arrayWithObjects: @"connect",
-                          @"disconnect",
-                          @"event",
-                          @"ack",
-                          @"error",
-                          @"binarevent",
-                          @"binaryack",
-                          nil];
-            }   break;
-        }
     }
     return self;
 }
 
 - (id) initWithType:(NSString *)packetType
 {
-    return [self initWithType:packetType using:V09x];
-}
-
-- (id) initWithTypeIndex:(int)index
-{
-    return [self initWithTypeIndex:index using:V09x];
-}
-
-- (id) initWithType:(NSString *)packetType
-              using:(SocketIOVersion) version
-{
-    self = [self init:version];
+    self = [self init];
     if (self) {
         self.type = packetType;
     }
@@ -95,9 +55,8 @@ - (id) initWithType:(NSString *)packetType
 }
 
 - (id) initWithTypeIndex:(int)index
-                   using:(SocketIOVersion) version
 {
-    self = [self init:version];
+    self = [self init];
     if (self) {
         self.type = [self typeForIndex:index];
     }
@@ -117,15 +76,8 @@ - (id) dataAsJSON
 
 
 - (NSString *) toString
-{
-    return [self toString:V09x];
-}
-
-- (NSString *) toString:(SocketIOVersion) version
 {
     NSMutableArray *encoded = [NSMutableArray arrayWithObject:[self typeAsNumber]];
-    //if([type isEqualToString:@"event"] && version == V10x)
-    //    [encoded addObject:@"2"];
     
     NSString *pIdL = self.pId != nil ? self.pId : @"";
     if ([self.ack isEqualToString:@"data"])
@@ -155,17 +107,89 @@ - (NSString *) toString:(SocketIOVersion) version
         {
             ackpId = [NSString stringWithFormat:@":%@%@", pIdL, @"+"];
         }
-        
-        if(version ==V10x)
-        {
-            
-        }
         [encoded addObject:[NSString stringWithFormat:@"%@%@", ackpId, data]];
     }
-    NSString *separator = @"";
-    if(version == V09x)
-        separator = @":";
-    return [encoded componentsJoinedByString:separator];
+    
+    return [encoded componentsJoinedByString:_separator];
+}
+
+- (NSNumber *) typeAsNumber
+{    
+    NSUInteger index = [_types indexOfObject:self.type];
+    NSNumber *num = [NSNumber numberWithUnsignedInteger:index];
+    return num;
+}
+
+- (NSString *) typeForIndex:(int)index
+{
+    return [_types objectAtIndex:index];
+}
+
++ (SocketIOPacket *) createPacketWithType:(NSString *)type
+                              version:(SocketIOVersion) version
+{
+    switch (version) {
+        case V09x:
+            return [[SocketIOPacket alloc] initWithType:type];
+            break;
+        case V10x:
+            return [[SocketIOPacketV10x alloc] initWithType:type];
+            break;
+    }
+}
+
++ (SocketIOPacket *) createPacketWithTypeIndex:(int) type
+                              version:(SocketIOVersion) version
+{
+    switch (version) {
+        case V09x:
+            return [[SocketIOPacket alloc] initWithTypeIndex:type];
+            break;
+        case V10x:
+            return [[SocketIOPacketV10x alloc] initWithTypeIndex:type];
+            break;
+    }
+}
+
+- (void) dealloc
+{
+    _types = nil;
+    
+    type = nil;
+    pId = nil;
+    name = nil;
+    ack = nil;
+    data = nil;
+    args = nil;
+    endpoint = nil;
+}
+
+@end
+
+@implementation SocketIOPacketV10x
+
+- (id) init
+{
+    self = [super init];
+    
+    _separator = @"";
+    _types = [NSArray arrayWithObjects: @"disconnected",
+              @"connected",
+              @"heartbeat",
+              @"pong",
+              @"message",
+              @"upgrade",
+              @"noop",
+              nil];
+    _typesMessage = [NSArray arrayWithObjects: @"connect",
+                     @"disconnect",
+                     @"event",
+                     @"ack",
+                     @"error",
+                     @"binarevent",
+                     @"binaryack",
+                     nil];
+    return self;
 }
 
 - (NSNumber *) typeAsNumber
@@ -181,21 +205,16 @@ - (NSNumber *) typeAsNumber
     else
     {
         index = [_types indexOfObject:self.type];
-        num = [NSNumber numberWithUnsignedInteger:index];
     }
-    num = @([num integerValue] + [[NSNumber numberWithUnsignedInteger:index] integerValue]);    
+    num = @([num integerValue] + [[NSNumber numberWithUnsignedInteger:index] integerValue]);
     return num;
 }
 
-- (NSString *) typeForIndex:(int)index
-{
-    return [_types objectAtIndex:index];
-}
-
 - (void) dealloc
 {
-    _types = nil;
+    _typesMessage = nil;
     
+    _types = nil;
     type = nil;
     pId = nil;
     name = nil;

From c1abc0dc122e31e4cd24891880c051d4b339c9b5 Mon Sep 17 00:00:00 2001
From: francoisTemasys <regnoult@temasys.com.sg>
Date: Tue, 1 Jul 2014 10:12:27 +0800
Subject: [PATCH 07/21] [PERF]Improve parser for data coming Using
 JsonStringify object

---
 SocketIO.m | 38 +++++---------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/SocketIO.m b/SocketIO.m
index 2d07d24..98e5e9a 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -726,36 +726,11 @@ - (void) onData:(NSString *)data
                             //Event
                             if([packet.data characterAtIndex:0] == '[' && [packet.data characterAtIndex:packet.data.length-1] == ']')
                             {
-                                //We have data = ["<event>",DATA,DATA] (Data can be "BLABLA" or {"bla":"bla","to":"to"})
-                                NSString *prepData = [packet.data substringWithRange:NSMakeRange(1, packet.data.length-2)]; //remove first and last []
-                                //We have data = "<event>",DATA,DATA (Data can be "BLABLA" or {"bla":"bla","to":"to"})
-                                NSUInteger commalocation = [prepData rangeOfString:@"\"," ].location;
-                                NSString *eventName = [prepData substringWithRange:NSMakeRange(1, commalocation-1)];//we get the event
-                                prepData = [prepData substringWithRange:NSMakeRange(commalocation+2, prepData.length-commalocation-2)];
-                                NSUInteger from = 0,to,rootcount = 0;
-                                DEBUGLOG(@"Parse this:%@ (%@)",packet.data,prepData);
-                                NSMutableArray *arrayResponse = [[NSMutableArray alloc] init];
-                                for (to = 0;to<prepData.length;++to)
-                                {
-                                    unichar c = [prepData characterAtIndex:to];
-                                    if(c == '{')
-                                        ++rootcount;
-                                    else if(c == '}')
-                                        --rootcount;
-                                    else if(c == ','
-                                            && ([prepData characterAtIndex:to-1] == '\"' || [prepData characterAtIndex:to-1] == '}')
-                                            && ([prepData characterAtIndex:to+1] == '\"' || [prepData characterAtIndex:to+1] == '{')
-                                            && rootcount == 0)
-                                    {
-                                        //we can cut here
-                                        [arrayResponse addObject:[prepData substringWithRange:NSMakeRange(from,to-from)]];
-                                        from = to+1;
-                                    }
-                                }
-                                [arrayResponse addObject:[prepData substringWithRange:NSMakeRange(from,to-from)]];
-                                
-                                packet.name = eventName;
-                                packet.args = arrayResponse;
+                                NSData *utf8Data = [packet.data dataUsingEncoding:NSUTF8StringEncoding];
+                                NSArray *parsedData = [SocketIOJSONSerialization objectFromJSONData:utf8Data error:nil];
+                                DEBUGLOG(@"Event Type:%@",parsedData[0]);
+                                packet.name = parsedData[0];
+                                packet.args = [parsedData subarrayWithRange:NSMakeRange(1, parsedData.count-1)];
                                 if([packet.name isEqualToString:@"message"])
                                 {
                                     packet.data = packet.args[0];
@@ -771,9 +746,6 @@ - (void) onData:(NSString *)data
                                 }
                                 
                             }
-                            
-                            
-                            
                         }    break;
                         case 3:
                             //Ack

From 8965fadf0f19af3b547134a60ad67a6d98f2aac5 Mon Sep 17 00:00:00 2001
From: Francois Regnoult <regnoult@temasys.com.sg>
Date: Mon, 15 Sep 2014 09:56:35 +0800
Subject: [PATCH 08/21] Add the missing '='

Thanks to the suggestion of @ploddi
---
 SocketIOTransportWebsocket.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SocketIOTransportWebsocket.m b/SocketIOTransportWebsocket.m
index 25c63d8..c88c2b9 100644
--- a/SocketIOTransportWebsocket.m
+++ b/SocketIOTransportWebsocket.m
@@ -64,7 +64,7 @@ - (void) openUsing:(SocketIOVersion)version
     NSString *format;
     NSString *addOnVersion = @"";
     if(version == V10x)
-        addOnVersion = @"?EIO=2&transport=websocket&sid";
+        addOnVersion = @"?EIO=2&transport=websocket&sid=";
     
     if (delegate.port) {
         format = delegate.useSecure ? kSecureSocketPortURL : kInsecureSocketPortURL;

From b0096e901252f19904500eb1c0692178a3c18f10 Mon Sep 17 00:00:00 2001
From: Francois Payette <francoisp@netmosphere.net>
Date: Mon, 22 Sep 2014 18:48:10 -0400
Subject: [PATCH 09/21] crude hack to get ack callback on with socketio 1.0

---
 SocketIO.m       | 36 ++++++++++++++++++++++++++++++++++--
 SocketIOPacket.m | 12 ++++++++----
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/SocketIO.m b/SocketIO.m
index 98e5e9a..58a69bc 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -663,6 +663,9 @@ - (void) onData:(NSString *)data
             //GET VERSION
             NSUInteger control = [[NSNumber numberWithUnsignedChar:[data characterAtIndex:0]] integerValue]
                                     -[[NSNumber numberWithUnsignedChar:'0'] integerValue];
+            
+            NSUInteger ack = 0;
+            
             SocketIOPacket *packet = [[SocketIOPacketV10x alloc] initWithTypeIndex:control];            
             
             //dont care about the endpoint here
@@ -697,6 +700,10 @@ - (void) onData:(NSString *)data
                     //Message
                     control = [[NSNumber numberWithUnsignedChar:[packet.data characterAtIndex:0]] integerValue]
                                                     -[[NSNumber numberWithUnsignedChar:'0'] integerValue];
+                    if([packet.data length] > 1){
+                        ack = [[NSNumber numberWithUnsignedChar:[packet.data characterAtIndex:1]] integerValue]
+                                                    -[[NSNumber numberWithUnsignedChar:'0'] integerValue];
+                    }
                     //GET ENDPOINT
                     NSUInteger rendpoint = [packet.data rangeOfString:@"["].location;
                     if(rendpoint == NSNotFound)
@@ -748,8 +755,33 @@ - (void) onData:(NSString *)data
                             }
                         }    break;
                         case 3:
-                            //Ack
-                            break;
+                        {
+                            
+                            if (ack > 0) {
+                                int ackId = ack;
+                                DEBUGLOG(@"ack id found: %d", ackId);
+                                
+                                NSString *argsStr = [packet.data substringFromIndex:1 ];
+                                argsStr = [argsStr substringToIndex:argsStr.length-1];
+                                id argsData = nil;
+                                if (argsStr && ![argsStr isEqualToString:@""]) {
+                                    argsData = [SocketIOJSONSerialization objectFromJSONData:[argsStr dataUsingEncoding:NSUTF8StringEncoding] error:nil];
+                                    // either send complete response or only the first arg to callback
+//                                    if (!_returnAllDataFromAck && [argsData count] > 0) {
+//                                        argsData = [argsData objectAtIndex:0];
+//                                    }
+                                }
+                                
+                                // get selector for ackId
+                                NSString *key = [NSString stringWithFormat:@"%d", ackId];
+                                SocketIOCallback callbackFunction = [_acks objectForKey:key];
+                                if (callbackFunction != nil) {
+                                    callbackFunction(argsData);
+                                    [self removeAcknowledgeForKey:key];
+                                }
+                            }
+
+                        }    break;
                         case 4:
                             //Error
                             break;
diff --git a/SocketIOPacket.m b/SocketIOPacket.m
index 52482d1..45841d2 100644
--- a/SocketIOPacket.m
+++ b/SocketIOPacket.m
@@ -80,10 +80,13 @@ - (NSString *) toString
     NSMutableArray *encoded = [NSMutableArray arrayWithObject:[self typeAsNumber]];
     
     NSString *pIdL = self.pId != nil ? self.pId : @"";
-    if ([self.ack isEqualToString:@"data"])
-    {
-        pIdL = [pIdL stringByAppendingString:@"+"];
-    }
+
+// should be conditional to V09x
+//    if(SocketIO._version == V09x)
+//    if ([self.ack isEqualToString:@"data"])
+//    {
+//        pIdL = [pIdL stringByAppendingString:@"+"];
+//    }
     
     // Do not write pid for acknowledgements
     if ([type intValue] != 6) {
@@ -105,6 +108,7 @@ - (NSString *) toString
         // This is an acknowledgement packet, so, prepend the ack pid to the data
         if ([type intValue] == 6)
         {
+            // should be conditional to V09x
             ackpId = [NSString stringWithFormat:@":%@%@", pIdL, @"+"];
         }
         [encoded addObject:[NSString stringWithFormat:@"%@%@", ackpId, data]];

From e7811450130ebebf13643a253d10f30e1bdb9985 Mon Sep 17 00:00:00 2001
From: Francois Payette <francoisp@netmosphere.net>
Date: Tue, 23 Sep 2014 10:30:58 -0400
Subject: [PATCH 10/21] fixed packet encoding to keep backward compatibility
 with 0.9

---
 SocketIOPacket.m | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/SocketIOPacket.m b/SocketIOPacket.m
index 45841d2..2569fdc 100644
--- a/SocketIOPacket.m
+++ b/SocketIOPacket.m
@@ -20,6 +20,7 @@
 
 #import "SocketIOPacket.h"
 #import "SocketIOJSONSerialization.h"
+#import "SocketIO.h"
 
 @implementation SocketIOPacket
 
@@ -81,12 +82,13 @@ - (NSString *) toString
     
     NSString *pIdL = self.pId != nil ? self.pId : @"";
 
-// should be conditional to V09x
-//    if(SocketIO._version == V09x)
-//    if ([self.ack isEqualToString:@"data"])
-//    {
-//        pIdL = [pIdL stringByAppendingString:@"+"];
-//    }
+
+    if(SocketIO.version == V09x){
+        if ([self.ack isEqualToString:@"data"])
+        {
+            pIdL = [pIdL stringByAppendingString:@"+"];
+        }
+    }
     
     // Do not write pid for acknowledgements
     if ([type intValue] != 6) {
@@ -108,8 +110,8 @@ - (NSString *) toString
         // This is an acknowledgement packet, so, prepend the ack pid to the data
         if ([type intValue] == 6)
         {
-            // should be conditional to V09x
-            ackpId = [NSString stringWithFormat:@":%@%@", pIdL, @"+"];
+            if(SocketIO.version == V09x)
+                ackpId = [NSString stringWithFormat:@":%@%@", pIdL, @"+"];
         }
         [encoded addObject:[NSString stringWithFormat:@"%@%@", ackpId, data]];
     }

From ddd3c9e88bae423fd56d8c7f9835c613a472701f Mon Sep 17 00:00:00 2001
From: Francois Payette <francoisp@netmosphere.net>
Date: Tue, 23 Sep 2014 10:40:08 -0400
Subject: [PATCH 11/21] updated readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ef65765..20b9785 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-**The current version of this library does not yet support socket.io v1.0.  
-So if you want to use socket.io-objc, please fall back to v0.9.x.**
+**This fork supports some socket.io v1.0 features, (no binary support yet). Many thanks to francoisTemasys who did most of the heavy lifting; this is a fork of a fork. v0.9.x compatibility is generally maintained.
+
 
 ---
 

From 2c39a957e1e032bdc9b84c6264ef8ea10a74fa1a Mon Sep 17 00:00:00 2001
From: Francois Payette <francoisp@netmosphere.net>
Date: Tue, 23 Sep 2014 10:56:03 -0400
Subject: [PATCH 12/21] cleaner fix for ack 0.9 and 1.0 cb

---
 SocketIOPacket.m | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SocketIOPacket.m b/SocketIOPacket.m
index 2569fdc..cdac17c 100644
--- a/SocketIOPacket.m
+++ b/SocketIOPacket.m
@@ -20,7 +20,7 @@
 
 #import "SocketIOPacket.h"
 #import "SocketIOJSONSerialization.h"
-#import "SocketIO.h"
+
 
 @implementation SocketIOPacket
 
@@ -83,7 +83,7 @@ - (NSString *) toString
     NSString *pIdL = self.pId != nil ? self.pId : @"";
 
 
-    if(SocketIO.version == V09x){
+    if( !([self isKindOfClass:[SocketIOPacketV10x class]]) ){
         if ([self.ack isEqualToString:@"data"])
         {
             pIdL = [pIdL stringByAppendingString:@"+"];
@@ -110,7 +110,7 @@ - (NSString *) toString
         // This is an acknowledgement packet, so, prepend the ack pid to the data
         if ([type intValue] == 6)
         {
-            if(SocketIO.version == V09x)
+            if( !([self isKindOfClass:[SocketIOPacketV10x class]]) )
                 ackpId = [NSString stringWithFormat:@":%@%@", pIdL, @"+"];
         }
         [encoded addObject:[NSString stringWithFormat:@"%@%@", ackpId, data]];

From a0b2252fac5c968c8301d46704502583d8c3e937 Mon Sep 17 00:00:00 2001
From: hearther <hearther@vot.url.com.tw>
Date: Sun, 26 Oct 2014 22:39:57 +0800
Subject: [PATCH 13/21] fix when ack number more than 1 digit

fix when ack number more than 1 digit
---
 SocketIO.m | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SocketIO.m b/SocketIO.m
index 58a69bc..6cfc636 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -701,8 +701,9 @@ - (void) onData:(NSString *)data
                     control = [[NSNumber numberWithUnsignedChar:[packet.data characterAtIndex:0]] integerValue]
                                                     -[[NSNumber numberWithUnsignedChar:'0'] integerValue];
                     if([packet.data length] > 1){
-                        ack = [[NSNumber numberWithUnsignedChar:[packet.data characterAtIndex:1]] integerValue]
-                                                    -[[NSNumber numberWithUnsignedChar:'0'] integerValue];
+                        NSRange range = NSMakeRange(1, [packet.data rangeOfString:@"["].location-1);
+                        NSString *ackStr = [packet.data substringWithRange:range];
+                        ack = [ackStr integerValue];
                     }
                     //GET ENDPOINT
                     NSUInteger rendpoint = [packet.data rangeOfString:@"["].location;

From 81b4c203cdf3d4662ef6deeb6b5fb8f3fc959c08 Mon Sep 17 00:00:00 2001
From: Bilal Demirci <bilal.demirci@sabah.com.tr>
Date: Tue, 16 Dec 2014 15:50:17 +0200
Subject: [PATCH 14/21] if response has not "{" character, code was crashed.

---
 SocketIO.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SocketIO.m b/SocketIO.m
index 6cfc636..a2497f8 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -1009,7 +1009,8 @@ - (void) connectionDidFinishLoading:(NSURLConnection *)connection
         DEBUGLOG(@"VERSION 10x");
         _version = V10x;
         //...0{"sid":"<sid>","upgrades":[<transports>,...],"pingInterval":<timeHeartbeat>,"pingTimeout":<timeOut>}
-        responseString = [responseString substringFromIndex:[responseString rangeOfString:@"{"].location];
+        if([responseString rangeOfString:@"{"].location != NSNotFound)
+            responseString = [responseString substringFromIndex:[responseString rangeOfString:@"{"].location];
         DEBUGLOG(@"Response %@", responseString);
         connectionFailed = true;
         NSData *utf8Data = [responseString dataUsingEncoding:NSUTF8StringEncoding];

From 1f0bdff84384bed7e41fcd5c1c8118e68f6927cc Mon Sep 17 00:00:00 2001
From: Pascal Bihler <pascal.bihler@qeevee.com>
Date: Wed, 11 Feb 2015 17:06:55 +0100
Subject: [PATCH 15/21] Added payload to ping packet as required by engine.io

---
 SocketIOPacket.m | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/SocketIOPacket.m b/SocketIOPacket.m
index cdac17c..c31cce8 100644
--- a/SocketIOPacket.m
+++ b/SocketIOPacket.m
@@ -78,7 +78,8 @@ - (id) dataAsJSON
 
 - (NSString *) toString
 {
-    NSMutableArray *encoded = [NSMutableArray arrayWithObject:[self typeAsNumber]];
+    NSNumber *typeAsNumber = [self typeAsNumber];
+    NSMutableArray *encoded = [NSMutableArray arrayWithObject:typeAsNumber];
     
     NSString *pIdL = self.pId != nil ? self.pId : @"";
 
@@ -88,6 +89,11 @@ - (NSString *) toString
         {
             pIdL = [pIdL stringByAppendingString:@"+"];
         }
+    } else {
+        // Engine.IO 1.0 expects payload with the ping packet
+        if ([typeAsNumber intValue] == 2) {
+            [encoded addObject:@"probe"];
+        }
     }
     
     // Do not write pid for acknowledgements

From 22baa68a0b9eb2b92e875f991b6b82a5b92890d3 Mon Sep 17 00:00:00 2001
From: Francois Payette <francoisp@netmosphere.net>
Date: Mon, 23 Feb 2015 09:23:08 -0500
Subject: [PATCH 16/21] Update README.md

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 20b9785..16b34b2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-**This fork supports some socket.io v1.0 features, (no binary support yet). Many thanks to francoisTemasys who did most of the heavy lifting; this is a fork of a fork. v0.9.x compatibility is generally maintained.
+**This fork supports some socket.io v1.x features, (no binary support yet). Many thanks to francoisTemasys who did most of the heavy lifting; this is a fork of a fork. v0.9.x compatibility is generally maintained.
 
 
 ---
@@ -15,8 +15,7 @@
 
 ## Requirements
 
-As of version 0.4, this library requires at least OS X 10.7 or iOS 5.0.
-Because of this, we were able to remove the external JSON frameworks in v0.5 and only rely on iOS' own `NSJSONSerialization`.
+This library requires at least OS X 10.7 or iOS 5.0.
 
 
 ## Usage

From 90cbfcfaa88e3459468223d0b496b434f0a5c933 Mon Sep 17 00:00:00 2001
From: Francois Payette <francoisp@netmosphere.net>
Date: Thu, 26 Feb 2015 16:29:07 -0500
Subject: [PATCH 17/21] add podspec, thanks to toblerpwn for sample

---
 SocketTesterARC.xcodeproj/project.pbxproj |  4 ++++
 socket.io-objc.podspec                    | 15 +++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 socket.io-objc.podspec

diff --git a/SocketTesterARC.xcodeproj/project.pbxproj b/SocketTesterARC.xcodeproj/project.pbxproj
index e8e4616..9bb00cd 100644
--- a/SocketTesterARC.xcodeproj/project.pbxproj
+++ b/SocketTesterARC.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		00DC61D01A9FC62100136DE1 /* socket.io-objc.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 00DC61CF1A9FC62100136DE1 /* socket.io-objc.podspec */; };
 		4A444FA11589E28800B44ABB /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A444FA01589E28800B44ABB /* libicucore.dylib */; };
 		4A444FA31589E29500B44ABB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A444FA21589E29500B44ABB /* Security.framework */; };
 		4A4453811589EE9100B44ABB /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A44537A1589EE9100B44ABB /* base64.c */; };
@@ -31,6 +32,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		00DC61CF1A9FC62100136DE1 /* socket.io-objc.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "socket.io-objc.podspec"; sourceTree = SOURCE_ROOT; };
 		4A444FA01589E28800B44ABB /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
 		4A444FA21589E29500B44ABB /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		4A44537A1589EE9100B44ABB /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = base64.c; path = "submodules/socket-rocket/SocketRocket/base64.c"; sourceTree = SOURCE_ROOT; };
@@ -146,6 +148,7 @@
 				4ADCCBC615790DEC0022990C /* SocketIO.h */,
 				4ADCCBC715790DEC0022990C /* SocketIO.m */,
 				4AD96DF21680853E00D9E42D /* SocketIOPacket.h */,
+				00DC61CF1A9FC62100136DE1 /* socket.io-objc.podspec */,
 				4AD96DF31680853E00D9E42D /* SocketIOPacket.m */,
 				C9E391A015E2A1B00004693A /* SocketIOJSONSerialization.h */,
 				C9E391A115E2A1B00004693A /* SocketIOJSONSerialization.m */,
@@ -221,6 +224,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				00DC61D01A9FC62100136DE1 /* socket.io-objc.podspec in Resources */,
 				4ADCCBAC15790D760022990C /* InfoPlist.strings in Resources */,
 				4ADCCBB815790D760022990C /* ViewController.xib in Resources */,
 			);
diff --git a/socket.io-objc.podspec b/socket.io-objc.podspec
new file mode 100644
index 0000000..a6d11ea
--- /dev/null
+++ b/socket.io-objc.podspec
@@ -0,0 +1,15 @@
+Pod::Spec.new do |spec|
+spec.name             = 'socket.io-objc'
+spec.version          = '0.6.4'
+spec.license          = 'MIT'
+spec.homepage         = 'https://github.com/francoisp/socket.IO-objc/'
+spec.authors          = { 'Francois Payette'  => 'francoisp@netmosphere.net' }
+spec.summary          = 'Socket.io 1.x client for Objective-C projects., with backward 0.9 compatibility'
+spec.description      = "Interface to communicate between Objective C and Socket.IO with the help of websockets. Originally based on fpotter's socketio-cocoa and uses square's SocketRocket.\n"
+spec.source           = { :git => 'https://github.com/francoisp/socket.IO-objc.git' }
+spec.source_files     = '*.{h,m}'
+spec.requires_arc     = true
+spec.dependency 'SocketRocket'
+spec.platforms        = { "ios" => "6.0",
+"osx" => "10.8" }
+end
\ No newline at end of file

From 9d5339af2719790c35187474ffa9e6a77a9042e6 Mon Sep 17 00:00:00 2001
From: Pascal Bihler <pascal.bihler@qeevee.com>
Date: Thu, 12 Feb 2015 00:23:08 +0100
Subject: [PATCH 18/21] Small fixes for 64bit

---
 SocketIO.m | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/SocketIO.m b/SocketIO.m
index a2497f8..d6d9e94 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -135,7 +135,7 @@ - (void) connectToHost:(NSString *)host
         
         // do handshake via HTTP request
         NSString *protocol = _useSecure ? @"https" : @"http";
-        NSString *port = _port ? [NSString stringWithFormat:@":%d", _port] : @"";
+        NSString *port = _port ? [NSString stringWithFormat:@":%ld", (long)_port] : @"";
         NSTimeInterval time = [[NSDate date] timeIntervalSince1970] * 1000;
         NSString *handshakeUrl = [NSString stringWithFormat:kHandshakeURL, protocol, _host, port, kResourceName,kTransportPolling, time, query];
         //@"%@://%@%@/%@/1/?t=%.0f%@";
@@ -185,7 +185,7 @@ - (void) disconnect
 - (void) disconnectForced
 {
     NSString *protocol = [self useSecure] ? @"https" : @"http";
-    NSString *port = _port ? [NSString stringWithFormat:@":%d", _port] : @"";
+    NSString *port = _port ? [NSString stringWithFormat:@":%ld", (long)_port] : @"";
     NSString *urlString = [NSString stringWithFormat:kForceDisconnectURL, protocol, _host, port, kResourceName, _sid];
     NSURL *url = [NSURL URLWithString:urlString];
     DEBUGLOG(@"Force disconnect at: %@", urlString);
@@ -741,7 +741,8 @@ - (void) onData:(NSString *)data
                                 packet.args = [parsedData subarrayWithRange:NSMakeRange(1, parsedData.count-1)];
                                 if([packet.name isEqualToString:@"message"])
                                 {
-                                    packet.data = packet.args[0];
+                                    // data is specified as NSString, so rewrap it...
+                                    packet.data = [SocketIOJSONSerialization JSONStringFromObject:packet.args[0] error:nil];
                                     if ([_delegate respondsToSelector:@selector(socketIO:didReceiveMessage:)]) {
                                         [_delegate socketIO:self didReceiveMessage:packet];
                                     }

From 405cbdbcc47bb92613956b4417d977f44c415e6b Mon Sep 17 00:00:00 2001
From: Pascal Bihler <pascal.bihler@qeevee.com>
Date: Wed, 18 Mar 2015 13:47:45 +0100
Subject: [PATCH 19/21] Updated SocketRocket submodule commit

---
 submodules/socket-rocket | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/socket-rocket b/submodules/socket-rocket
index 8275ef3..a2dd92a 160000
--- a/submodules/socket-rocket
+++ b/submodules/socket-rocket
@@ -1 +1 @@
-Subproject commit 8275ef3b15cebd99b1815840c55f4e07f96bf862
+Subproject commit a2dd92a13b42e14fee0c93253e464121c1de67d5

From 2f13a44ae18135a80bdc70a434a208ddc47e83ce Mon Sep 17 00:00:00 2001
From: Pascal Bihler <pascal.bihler@qeevee.com>
Date: Wed, 18 Mar 2015 14:10:39 +0100
Subject: [PATCH 20/21] More fixes to remove warnings when building with 64bit

---
 SocketIO.m       | 8 ++++----
 SocketIOPacket.h | 6 +++---
 SocketIOPacket.m | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/SocketIO.m b/SocketIO.m
index d6d9e94..d9ea707 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -760,8 +760,8 @@ - (void) onData:(NSString *)data
                         {
                             
                             if (ack > 0) {
-                                int ackId = ack;
-                                DEBUGLOG(@"ack id found: %d", ackId);
+                                NSUInteger ackId = ack;
+                                DEBUGLOG(@"ack id found: %d", (unsigned int)ackId);
                                 
                                 NSString *argsStr = [packet.data substringFromIndex:1 ];
                                 argsStr = [argsStr substringToIndex:argsStr.length-1];
@@ -775,7 +775,7 @@ - (void) onData:(NSString *)data
                                 }
                                 
                                 // get selector for ackId
-                                NSString *key = [NSString stringWithFormat:@"%d", ackId];
+                                NSString *key = [NSString stringWithFormat:@"%d", (unsigned int)ackId];
                                 SocketIOCallback callbackFunction = [_acks objectForKey:key];
                                 if (callbackFunction != nil) {
                                     callbackFunction(argsData);
@@ -865,7 +865,7 @@ - (void) connection:(NSURLConnection *)connection didReceiveResponse:(NSURLRespo
     // check for server status code (http://gigliwood.com/weblog/Cocoa/Q__When_is_an_conne.html)
     if ([response respondsToSelector:@selector(statusCode)]) {
         NSInteger statusCode = [((NSHTTPURLResponse *)response) statusCode];
-        DEBUGLOG(@"didReceiveResponse() %i", statusCode);
+        DEBUGLOG(@"didReceiveResponse() %i", (int)statusCode);
         
         if (statusCode >= 400) {
             // stop connecting; no more delegate messages
diff --git a/SocketIOPacket.h b/SocketIOPacket.h
index 8fcfafe..b13be07 100644
--- a/SocketIOPacket.h
+++ b/SocketIOPacket.h
@@ -45,15 +45,15 @@
 @property (nonatomic, copy) NSArray *args;
 
 - (id) initWithType:(NSString *)packetType;
-- (id) initWithTypeIndex:(int)index;
+- (id) initWithTypeIndex:(NSUInteger)index;
 - (id) dataAsJSON;
 - (NSString *) toString;
 - (NSNumber *) typeAsNumber;
-- (NSString *) typeForIndex:(int)index;
+- (NSString *) typeForIndex:(NSUInteger)index;
 
 + (SocketIOPacket *) createPacketWithType:(NSString *)type
                               version:(SocketIOVersion) version;
-+ (SocketIOPacket *) createPacketWithTypeIndex:(int) type
++ (SocketIOPacket *) createPacketWithTypeIndex:(NSUInteger) type
                               version:(SocketIOVersion) version;
 @end
 
diff --git a/SocketIOPacket.m b/SocketIOPacket.m
index c31cce8..eece271 100644
--- a/SocketIOPacket.m
+++ b/SocketIOPacket.m
@@ -55,7 +55,7 @@ - (id) initWithType:(NSString *)packetType
     return self;
 }
 
-- (id) initWithTypeIndex:(int)index
+- (id) initWithTypeIndex:(NSUInteger)index
 {
     self = [self init];
     if (self) {
@@ -132,7 +132,7 @@ - (NSNumber *) typeAsNumber
     return num;
 }
 
-- (NSString *) typeForIndex:(int)index
+- (NSString *) typeForIndex:(NSUInteger)index
 {
     return [_types objectAtIndex:index];
 }
@@ -150,7 +150,7 @@ + (SocketIOPacket *) createPacketWithType:(NSString *)type
     }
 }
 
-+ (SocketIOPacket *) createPacketWithTypeIndex:(int) type
++ (SocketIOPacket *) createPacketWithTypeIndex:(NSUInteger) type
                               version:(SocketIOVersion) version
 {
     switch (version) {

From 102b36bcb4f381bb490ea963d0648b193c15ec09 Mon Sep 17 00:00:00 2001
From: Francois Payette <francoisp@netmosphere.net>
Date: Tue, 24 Mar 2015 17:46:55 -0400
Subject: [PATCH 21/21] changes suggested by louis49 to support  namespace

---
 SocketIO.m                   |  9 +++++----
 SocketIOPacket.m             | 16 +++++++++++-----
 SocketIOTransportWebsocket.m | 16 ++++++++--------
 socket.io-objc.podspec       |  2 +-
 submodules/.gitignore        | 30 ------------------------------
 submodules/socket-rocket     |  1 -
 6 files changed, 25 insertions(+), 49 deletions(-)
 delete mode 100644 submodules/.gitignore
 delete mode 160000 submodules/socket-rocket

diff --git a/SocketIO.m b/SocketIO.m
index d9ea707..0b2c455 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -291,6 +291,7 @@ - (void) sendEvent:(NSString *)eventName withData:(id)data andAcknowledge:(Socke
     if (function) {
         packet.ack = @"data";
     }
+    NSLog(@"%@", packet.data);
     [self send:packet];
 }
 
@@ -338,7 +339,7 @@ - (void) send:(SocketIOPacket *)packet
         return;
     }
     DEBUGLOG(@"Prepare to send()");
-    
+    packet.endpoint = _endpoint;
     
     NSString *req = [packet toString];
     if (![_transport isReady]) {
@@ -686,10 +687,10 @@ - (void) onData:(NSString *)data
                     //??
                     break;
                 case 2:
-                {
+                
                     //Ping->Pong
                     [self sendMessage:[NSString stringWithFormat:@"3:%@", data]];
-                }    break;
+                    break;
                 case 3:
                     //Pong
                     if([data isEqualToString:@"probe"])
@@ -708,7 +709,7 @@ - (void) onData:(NSString *)data
                     //GET ENDPOINT
                     NSUInteger rendpoint = [packet.data rangeOfString:@"["].location;
                     if(rendpoint == NSNotFound)
-                        packet.endpoint = @"";
+                        packet.endpoint = packet.data;
                     else
                         packet.endpoint = [packet.data substringToIndex:rendpoint];
                     
diff --git a/SocketIOPacket.m b/SocketIOPacket.m
index eece271..5e5be67 100644
--- a/SocketIOPacket.m
+++ b/SocketIOPacket.m
@@ -81,13 +81,19 @@ - (NSString *) toString
     NSNumber *typeAsNumber = [self typeAsNumber];
     NSMutableArray *encoded = [NSMutableArray arrayWithObject:typeAsNumber];
     
+    NSNumber *typeNumber = [self typeAsNumber];
+    if (!(self.endpoint == nil || [@"/" isEqualToString:self.endpoint]) && [typeNumber intValue] != 6 && [typeNumber intValue] != 2)
+    {
+        [encoded addObject:[self.endpoint stringByAppendingString:@","]];
+    } 
+
     NSString *pIdL = self.pId != nil ? self.pId : @"";
 
 
     if( !([self isKindOfClass:[SocketIOPacketV10x class]]) ){
         if ([self.ack isEqualToString:@"data"])
         {
-            pIdL = [pIdL stringByAppendingString:@"+"];
+            //pIdL = [pIdL stringByAppendingString:@"+"];
         }
     } else {
         // Engine.IO 1.0 expects payload with the ping packet
@@ -97,24 +103,24 @@ - (NSString *) toString
     }
     
     // Do not write pid for acknowledgements
-    if ([type intValue] != 6) {
+    if ([typeNumber intValue] != 6) {
         [encoded addObject:pIdL];
     }
     
     // Add the end point for the namespace to be used, as long as it is not
     // an ACK, heartbeat, or disconnect packet
-    if ([type intValue] != 6 && [type intValue] != 2 && [type intValue] != 0) {
+    /*if ([type intValue] != 6 && [type intValue] != 2 && [type intValue] != 0) {
         [encoded addObject:endpoint];
     }
     else {
         [encoded addObject:@""];
-    }
+    }*/
     
     if (data != nil)
     {
         NSString *ackpId = @"";
         // This is an acknowledgement packet, so, prepend the ack pid to the data
-        if ([type intValue] == 6)
+        if ([typeNumber intValue] == 6)
         {
             if( !([self isKindOfClass:[SocketIOPacketV10x class]]) )
                 ackpId = [NSString stringWithFormat:@":%@%@", pIdL, @"+"];
diff --git a/SocketIOTransportWebsocket.m b/SocketIOTransportWebsocket.m
index c88c2b9..afd0f11 100644
--- a/SocketIOTransportWebsocket.m
+++ b/SocketIOTransportWebsocket.m
@@ -29,10 +29,10 @@
 #define DEBUGLOG(...)
 #endif
 
-static NSString* kInsecureSocketURL = @"ws://%@/socket.io/1/websocket/%@%@";
-static NSString* kSecureSocketURL = @"wss://%@/socket.io/1/websocket/%@%@";
-static NSString* kInsecureSocketPortURL = @"ws://%@:%d/socket.io/1/websocket/%@%@";
-static NSString* kSecureSocketPortURL = @"wss://%@:%d/socket.io/1/websocket/%@%@";
+static NSString* kInsecureSocketURL = @"ws://%@/socket.io/1/websocket/%@";
+static NSString* kSecureSocketURL = @"wss://%@/socket.io/1/websocket/%@";
+static NSString* kInsecureSocketPortURL = @"ws://%@:%d/socket.io/1/websocket/%@";
+static NSString* kSecureSocketPortURL = @"wss://%@:%d/socket.io/1/websocket/%@";
 
 @implementation SocketIOTransportWebsocket
 
@@ -62,17 +62,17 @@ - (void) openUsing:(SocketIOVersion)version
 {
     NSString *urlStr;
     NSString *format;
-    NSString *addOnVersion = @"";
+    NSString *addOnVersion = delegate.sid;;
     if(version == V10x)
-        addOnVersion = @"?EIO=2&transport=websocket&sid=";
+        addOnVersion = [NSString stringWithFormat:@"?EIO=2&transport=websocket&sid=%@", delegate.sid];
     
     if (delegate.port) {
         format = delegate.useSecure ? kSecureSocketPortURL : kInsecureSocketPortURL;
-        urlStr = [NSString stringWithFormat:format, delegate.host, delegate.port, addOnVersion, delegate.sid];
+        urlStr = [NSString stringWithFormat:format, delegate.host, delegate.port, addOnVersion, delegate.sid, addOnVersion];
     }
     else {
         format = delegate.useSecure ? kSecureSocketURL : kInsecureSocketURL;
-        urlStr = [NSString stringWithFormat:format, delegate.host,addOnVersion, delegate.sid];
+        urlStr = [NSString stringWithFormat:format, delegate.host,addOnVersion, delegate.sid, addOnVersion];
     }
     NSURL *url = [NSURL URLWithString:urlStr];
     
diff --git a/socket.io-objc.podspec b/socket.io-objc.podspec
index a6d11ea..abcf9e3 100644
--- a/socket.io-objc.podspec
+++ b/socket.io-objc.podspec
@@ -3,7 +3,7 @@ spec.name             = 'socket.io-objc'
 spec.version          = '0.6.4'
 spec.license          = 'MIT'
 spec.homepage         = 'https://github.com/francoisp/socket.IO-objc/'
-spec.authors          = { 'Francois Payette'  => 'francoisp@netmosphere.net' }
+spec.authors          = { 'Philipp Kyeck' => 'philipp@beta-interactive.de' }
 spec.summary          = 'Socket.io 1.x client for Objective-C projects., with backward 0.9 compatibility'
 spec.description      = "Interface to communicate between Objective C and Socket.IO with the help of websockets. Originally based on fpotter's socketio-cocoa and uses square's SocketRocket.\n"
 spec.source           = { :git => 'https://github.com/francoisp/socket.IO-objc.git' }
diff --git a/submodules/.gitignore b/submodules/.gitignore
deleted file mode 100644
index 08b418a..0000000
--- a/submodules/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-# xcode noise
-build/*
-build
-*.pbxuser
-*.mode1v3
-*.mode2v3
-*.perspectivev3
-*.tmproj
-*/*.pbxuser
-*/*.mode1v3
-*/*.mode2v3
-*/*.perspectivev3
-*/*.tmproj
-Build
-Products
-xcuserdata
-xcuserdata/*
-project.xcworkspace
-project.xcworkspace/*
-*/project.xcworkspace
-*/project.xcworkspace/*
-*/xcuserdata
-DerivedData
-
-# osx noise
-.DS_Store
-profile
-
-# vim noise
-*.swp
diff --git a/submodules/socket-rocket b/submodules/socket-rocket
deleted file mode 160000
index a2dd92a..0000000
--- a/submodules/socket-rocket
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a2dd92a13b42e14fee0c93253e464121c1de67d5