v0.4

  update example code to also include the new setResourceName: method
  allow socket.io resource to be renamed from outside. close #80.
  cleaned up URL schemas and their usage
  try forced disconnect in SocketTester example
  adjust the forced disconnect method a bit
  change deployment target to iOS 5 (because socket-rocket needs it and we're using __weak now)
  update submodules
  SocketIO: don't use NSURLConnection delegate property in -dealloc - not available without BlocksKit
  Synchronous disconnect
  Fixed for sending events before socket is connected
  Ensure to cleanup properly in -disconnect & -dealloc - fixes crashes
  Add initial connection timeout
  Fixed disconnect error loop
  Changed timeout timer from NSTimer to GCD timer to avoid retain cycle.

Author: pkyeck

README.md

@@ -1,4 +1,4 @@
-# Socket.IO / Objective C Library (ARC version)
+# Socket.IO / Objective C Library
 
   Interface to communicate between Objective C and [Socket.IO](http://socket.io/)
   with the help of websockets or [Long-Polling](http://en.wikipedia.org/wiki/Push_technology#Long_polling). Originally based on fpotter's [socketio-cocoa](https://github.com/fpotter/socketio-cocoa)
@@ -11,6 +11,10 @@
    * [json-framework](https://github.com/stig/json-framework/) (optional)
    * [JSONKit](https://github.com/johnezang/JSONKit/) (optional)
 
+## Requirements
+
+As of version 0.4, this library requires at least OS X 10.7 or iOS 5.0.
+
 
 ## Non-ARC version
 
@@ -119,7 +123,7 @@ Different Socket Libraries + Error Handling by taiyangc <https://github.com/taiy
 
 (The MIT License)
 
-Copyright (c) 2011-12 Philipp Kyeck <http://beta-interactive.de>
+Copyright (c) 2011-13 Philipp Kyeck <http://beta-interactive.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

SocketIO.h

@@ -1,6 +1,6 @@
 //
 //  SocketIO.h
-//  v0.3.3 ARC
+//  v0.4 ARC
 //
 //  based on 
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
@@ -79,7 +79,7 @@ typedef enum {
 
     // heartbeat
     NSTimeInterval _heartbeatTimeout;
-    NSTimer *_timeout;
+    dispatch_source_t _timeout;
 
     NSMutableArray *_queue;
 
@@ -107,7 +107,10 @@ typedef enum {
 - (void) connectToHost:(NSString *)host onPort:(NSInteger)port;
 - (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDictionary *)params;
 - (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDictionary *)params withNamespace:(NSString *)endpoint;
+- (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDictionary *)params withNamespace:(NSString *)endpoint withConnectionTimeout: (NSTimeInterval) connectionTimeout;
+
 - (void) disconnect;
+- (void) disconnectForced;
 
 - (void) sendMessage:(NSString *)data;
 - (void) sendMessage:(NSString *)data withAcknowledge:(SocketIOCallback)function;
@@ -117,4 +120,6 @@ typedef enum {
 - (void) sendEvent:(NSString *)eventName withData:(id)data andAcknowledge:(SocketIOCallback)function;
 - (void) sendAcknowledgement:(NSString*)pId withArgs:(NSArray *)data;
 
+- (void) setResourceName:(NSString *)name;
+
 @end

SocketIO.m

@@ -1,6 +1,6 @@
 //
 //  SocketIO.m
-//  v0.3.3 ARC
+//  v0.4 ARC
 //
 //  based on 
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
@@ -37,10 +37,11 @@
 #define DEBUGLOG(...)
 #endif
 
-static NSString* kInsecureHandshakeURL = @"http://%@/socket.io/1/?t=%d%@";
-static NSString* kInsecureHandshakePortURL = @"http://%@:%d/socket.io/1/?t=%d%@";
-static NSString* kSecureHandshakePortURL = @"https://%@:%d/socket.io/1/?t=%d%@";
-static NSString* kSecureHandshakeURL = @"https://%@/socket.io/1/?t=%d%@";
+static NSString* kResourceName = @"socket.io";
+static NSString* kHandshakeURL = @"%@://%@%@/%@/1/?t=%d%@";
+static NSString* kForceDisconnectURL = @"%@://%@%@/%@/1/xhr-polling/%@?disconnect";
+
+float const defaultConnectionTimeout = 10.0f;
 
 NSString* const SocketIOError     = @"SocketIOError";
 NSString* const SocketIOException = @"SocketIOException";
@@ -95,15 +96,27 @@ - (id) initWithDelegate:(id<SocketIODelegate>)delegate
 
 - (void) connectToHost:(NSString *)host onPort:(NSInteger)port
 {
-    [self connectToHost:host onPort:port withParams:nil withNamespace:@""];
+    [self connectToHost:host onPort:port withParams:nil withNamespace:@"" withConnectionTimeout:defaultConnectionTimeout];
 }
 
 - (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDictionary *)params
 {
-    [self connectToHost:host onPort:port withParams:params withNamespace:@""];
+    [self connectToHost:host onPort:port withParams:params withNamespace:@"" withConnectionTimeout:defaultConnectionTimeout];
 }
 
-- (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDictionary *)params withNamespace:(NSString *)endpoint
+- (void) connectToHost:(NSString *)host
+                onPort:(NSInteger)port
+            withParams:(NSDictionary *)params
+         withNamespace:(NSString *)endpoint
+{
+    [self connectToHost:host onPort:port withParams:params withNamespace:@"" withConnectionTimeout:defaultConnectionTimeout];
+}
+
+- (void) connectToHost:(NSString *)host
+                onPort:(NSInteger)port
+            withParams:(NSDictionary *)params
+         withNamespace:(NSString *)endpoint
+ withConnectionTimeout:(NSTimeInterval)connectionTimeout
 {
     if (!_isConnected && !_isConnecting) {
         _isConnecting = YES;
@@ -120,31 +133,22 @@ - (void) connectToHost:(NSString *)host onPort:(NSInteger)port withParams:(NSDic
         }];
 
         // do handshake via HTTP request
-        NSString *s;
-        NSString *format;
-        if (_port) {
-            format = _useSecure ? kSecureHandshakePortURL : kInsecureHandshakePortURL;
-            s = [NSString stringWithFormat:format, _host, _port, rand(), query];
-        }
-        else {
-            format = _useSecure ? kSecureHandshakeURL : kInsecureHandshakeURL;
-            s = [NSString stringWithFormat:format, _host, rand(), query];
-        }
-        DEBUGLOG(@"Connecting to socket with URL: %@", s);
-        NSURL *url = [NSURL URLWithString:s];
+        NSString *protocol = _useSecure ? @"https" : @"http";
+        NSString *port = _port ? [NSString stringWithFormat:@":%d", _port] : @"";
+        NSString *handshakeUrl = [NSString stringWithFormat:kHandshakeURL, protocol, _host, port, kResourceName, rand(), query];
+        
+        DEBUGLOG(@"Connecting to socket with URL: %@", handshakeUrl);
         query = nil;
-                
 
         // make a request
-        NSURLRequest *request = [NSURLRequest requestWithURL:url
+        NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:handshakeUrl]
                                                  cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData 
-                                             timeoutInterval:10.0];
+                                             timeoutInterval:connectionTimeout];
 
-        _handshake = [[NSURLConnection alloc] initWithRequest:request
-                                                     delegate:self startImmediately:NO];
-        [_handshake scheduleInRunLoop:[NSRunLoop mainRunLoop]
-                              forMode:NSDefaultRunLoopMode];
+        _handshake = [[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:NO];
+        [_handshake scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
         [_handshake start];
+        
         if (_handshake) {
             _httpRequestData = [NSMutableData data];
         }
@@ -162,9 +166,31 @@ - (void) disconnect
     }
     else if (_isConnecting) {
         [_handshake cancel];
+        [self onDisconnect: nil];
     }
 }
 
+- (void) disconnectForced
+{
+    NSString *protocol = [self useSecure] ? @"https" : @"http";
+    NSString *port = _port ? [NSString stringWithFormat:@":%d", _port] : @"";
+    NSString *urlString = [NSString stringWithFormat:kForceDisconnectURL, protocol, _host, port, kResourceName, _sid];
+    NSURL *url = [NSURL URLWithString:urlString];
+    DEBUGLOG(@"Force disconnect at: %@", urlString);
+    
+    NSURLRequest *request = [NSURLRequest requestWithURL:url];
+    NSError *error = nil;
+    NSHTTPURLResponse *response = nil;
+    
+    [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&error];
+    
+    if (error || [response statusCode] != 200) {
+        DEBUGLOG(@"Error during disconnect: %@", error);
+    }
+    
+    [self onDisconnect:error];
+}
+
 - (void) sendMessage:(NSString *)data
 {
     [self sendMessage:data withAcknowledge:nil];
@@ -224,13 +250,19 @@ - (void) sendAcknowledgement:(NSString *)pId withArgs:(NSArray *)data
     [self send:packet];
 }
 
+- (void) setResourceName:(NSString *)name
+{
+    kResourceName = [name copy];
+}
+
 # pragma mark -
 # pragma mark private methods
 
 - (void) sendDisconnect
 {
     SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"disconnect"];
     [self send:packet];
+    [self onDisconnect:nil];
 }
 
 - (void) sendConnect
@@ -246,7 +278,11 @@ - (void) sendHeartbeat
 }
 
 - (void) send:(SocketIOPacket *)packet
-{   
+{
+    if (![self isConnected] && ![self isConnecting]) {
+        DEBUGLOG(@"Already disconnected!");
+        return;
+    }
     DEBUGLOG(@"send()");
     NSNumber *type = [packet typeAsNumber];
     NSMutableArray *encoded = [NSMutableArray arrayWithObject:type];
@@ -359,6 +395,11 @@ - (void) removeAcknowledgeForKey:(NSString *)key
 
 - (void) onTimeout 
 {
+    if (_timeout) {
+        dispatch_source_cancel(_timeout);
+        _timeout = NULL;
+    }
+    
     DEBUGLOG(@"Timed out waiting for heartbeat.");
     [self onDisconnect:[NSError errorWithDomain:SocketIOError
                                            code:SocketIOHeartbeatTimeout
@@ -368,16 +409,29 @@ - (void) onTimeout
 - (void) setTimeout 
 {
     DEBUGLOG(@"start/reset timeout");
-    if (_timeout != nil) {
-        [_timeout invalidate];
-        _timeout = nil;
+    if (_timeout) {
+        dispatch_source_cancel(_timeout);
+        _timeout = NULL;
     }
 
-    _timeout = [NSTimer scheduledTimerWithTimeInterval:_heartbeatTimeout
-                                                target:self 
-                                              selector:@selector(onTimeout) 
-                                              userInfo:nil 
-                                               repeats:NO];
+    _timeout = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER,
+                                      0,
+                                      0,
+                                      dispatch_get_main_queue());
+    
+    dispatch_source_set_timer(_timeout,
+                              dispatch_time(DISPATCH_TIME_NOW, _heartbeatTimeout * NSEC_PER_SEC),
+                              0,
+                              0);
+    
+    __weak SocketIO *weakSelf = self;
+    
+    dispatch_source_set_event_handler(_timeout, ^{
+        [weakSelf onTimeout];
+    });
+    
+    dispatch_resume(_timeout);
+    
 }
 
 
@@ -556,9 +610,9 @@ - (void) onDisconnect:(NSError *)error
     [_queue removeAllObjects];
 
     // Kill the heartbeat timer
-    if (_timeout != nil) {
-        [_timeout invalidate];
-        _timeout = nil;
+    if (_timeout) {
+        dispatch_source_cancel(_timeout);
+        _timeout = NULL;
     }
 
     // Disconnect the websocket, just in case
@@ -762,14 +816,20 @@ - (void) connection:(NSURLConnection *)connection
 
 - (void) dealloc
 {
+    [_handshake cancel];
+    _handshake = nil;
+
     _host = nil;
     _sid = nil;
     _endpoint = nil;
 
+    _transport.delegate = nil;
     _transport = nil;
 
-    [_timeout invalidate];
-    _timeout = nil;
+    if (_timeout) {
+        dispatch_source_cancel(_timeout);
+        _timeout = NULL;
+    }
 
     _queue = nil;
     _acks = nil;

SocketIOJSONSerialization.h

@@ -1,6 +1,6 @@
 //
 //  SocketIOJSONSerialization.h
-//  v0.3.3 ARC
+//  v0.4 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

SocketIOJSONSerialization.m

@@ -1,6 +1,6 @@
 //
 //  SocketIOJSONSerialization.m
-//  v0.3.3 ARC
+//  v0.4 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

SocketIOPacket.h

@@ -1,6 +1,6 @@
 //
 //  SocketIOPacket.h
-//  v0.3.3 ARC
+//  v0.4 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

SocketIOPacket.m

@@ -1,6 +1,6 @@
 //
 //  SocketIOPacket.h
-//  v0.3.3 ARC
+//  v0.4 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

SocketIOTransport.h

@@ -1,6 +1,6 @@
 //
 //  SocketIOTransport.h
-//  v0.3.3 ARC
+//  v0.4 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

SocketIOTransportWebsocket.h

@@ -1,6 +1,6 @@
 //
 //  SocketIOTransportWebsocket.h
-//  v0.3.3 ARC
+//  v0.4 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

SocketIOTransportWebsocket.m

@@ -1,6 +1,6 @@
 //
 //  SocketIOTransportWebsocket.m
-//  v0.3.3 ARC
+//  v0.4 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa