bump to 0.3.3 + fixes pkyeck#85

graouts · Apr 25, 2013 · 79fac8e · 79fac8e
1 parent 9f5f39e
commit 79fac8e
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 14 deletions.
diff --git a/SocketIO.h b/SocketIO.h
@@ -1,6 +1,6 @@
 //
 //  SocketIO.h
-//  v0.3.2 ARC
+//  v0.3.3 ARC
 //
 //  based on 
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
@@ -89,6 +89,9 @@ typedef enum {
 
     // http request
     NSMutableData *_httpRequestData;
+
+    // get all arguments from ack? (https://github.com/pkyeck/socket.IO-objc/pull/85)
+    BOOL _returnAllDataFromAck;
 }
 
 @property (nonatomic, readonly) NSString *host;
@@ -98,6 +101,7 @@ typedef enum {
 @property (nonatomic) BOOL useSecure;
 @property (nonatomic, readonly) BOOL isConnected, isConnecting;
 @property (nonatomic, unsafe_unretained) id<SocketIODelegate> delegate;
+@property (nonatomic) BOOL returnAllDataFromAck;
 
 - (id) initWithDelegate:(id<SocketIODelegate>)delegate;
 - (void) connectToHost:(NSString *)host onPort:(NSInteger)port;

diff --git a/SocketIO.m b/SocketIO.m
@@ -1,6 +1,6 @@
 //
 //  SocketIO.m
-//  v0.3.2 ARC
+//  v0.3.3 ARC
 //
 //  based on 
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
@@ -77,7 +77,8 @@ @implementation SocketIO
             isConnecting = _isConnecting, 
             useSecure = _useSecure, 
             delegate = _delegate,
-            heartbeatTimeout = _heartbeatTimeout;
+            heartbeatTimeout = _heartbeatTimeout,
+            returnAllDataFromAck = _returnAllDataFromAck;
 
 - (id) initWithDelegate:(id<SocketIODelegate>)delegate
 {
@@ -87,6 +88,7 @@ - (id) initWithDelegate:(id<SocketIODelegate>)delegate
         _queue = [[NSMutableArray alloc] init];
         _ackCount = 0;
         _acks = [[NSMutableDictionary alloc] init];
+        _returnAllDataFromAck = NO;
     }
     return self;
 }
@@ -503,7 +505,8 @@ - (void) onData:(NSString *)data
                     id argsData = nil;
                     if (argsStr && ![argsStr isEqualToString:@""]) {
                         argsData = [SocketIOJSONSerialization objectFromJSONData:[argsStr dataUsingEncoding:NSUTF8StringEncoding] error:nil];
-                        if ([argsData count] > 0) {
+                        // either send complete response or only the first arg to callback
+                        if (!_returnAllDataFromAck && [argsData count] > 0) {
                             argsData = [argsData objectAtIndex:0];
                         }
                     }
@@ -670,7 +673,7 @@ - (void) connectionDidFinishLoading:(NSURLConnection *)connection
             connectionFailed = true;
         }
         else {
-            // add small buffer of 7sec (magic xD)
+            // add small buffer of 7sec (magic xD) otherwise heartbeat will be too late and connection is closed
             _heartbeatTimeout += 7.0;
         }
         DEBUGLOG(@"heartbeatTimeout: %f", _heartbeatTimeout);

diff --git a/SocketIOJSONSerialization.h b/SocketIOJSONSerialization.h
@@ -1,6 +1,6 @@
 //
 //  SocketIOJSONSerialization.h
-//  v0.3.2 ARC
+//  v0.3.3 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

diff --git a/SocketIOJSONSerialization.m b/SocketIOJSONSerialization.m
@@ -1,6 +1,6 @@
 //
 //  SocketIOJSONSerialization.m
-//  v0.3.2 ARC
+//  v0.3.3 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

diff --git a/SocketIOPacket.h b/SocketIOPacket.h
@@ -1,6 +1,6 @@
 //
 //  SocketIOPacket.h
-//  v0.3.2 ARC
+//  v0.3.3 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

diff --git a/SocketIOPacket.m b/SocketIOPacket.m
@@ -1,6 +1,6 @@
 //
 //  SocketIOPacket.h
-//  v0.3.2 ARC
+//  v0.3.3 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

diff --git a/SocketIOTransport.h b/SocketIOTransport.h
@@ -1,6 +1,6 @@
 //
 //  SocketIOTransport.h
-//  v0.3.2 ARC
+//  v0.3.3 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

diff --git a/SocketIOTransportWebsocket.h b/SocketIOTransportWebsocket.h
@@ -1,6 +1,6 @@
 //
 //  SocketIOTransportWebsocket.h
-//  v0.3.2 ARC
+//  v0.3.3 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

diff --git a/SocketIOTransportWebsocket.m b/SocketIOTransportWebsocket.m
@@ -1,6 +1,6 @@
 //
 //  SocketIOTransportWebsocket.m
-//  v0.3.2 ARC
+//  v0.3.3 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

diff --git a/SocketIOTransportXHR.h b/SocketIOTransportXHR.h
@@ -1,6 +1,6 @@
 //
 //  SocketIOTransportXHR.h
-//  v0.3.2 ARC
+//  v0.3.3 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

diff --git a/SocketIOTransportXHR.m b/SocketIOTransportXHR.m
@@ -1,6 +1,6 @@
 //
 //  SocketIOTransportXHR.m
-//  v0.3.2 ARC
+//  v0.3.3 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa