changes suggested by louis49 to support namespace

Author: francoisp

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];
 

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, @"+"];

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];
 

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'  => '[email protected]' }
+spec.authors          = { 'Philipp Kyeck' => '[email protected]' }
 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' }