DefaultProtocol

Author: mattqs

Src/EngineIoClientDotNet.Tests.mono/ClientTests/ServerConnectionTest.cs

@@ -397,6 +397,47 @@ public void UpgradeCookie()
             Assert.Equal("got cookie", test);
         }
 
+        //[Fact]
+        //public void PrimusEndpoint()
+        //{
+        //    var log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod());
+        //    log.Info("Start");
+        //    _manualResetEvent = new ManualResetEvent(false);
+
+        //    var events = new Queue<string>();
+
+        //    var options = CreateOptions();
+        //    options.Cookies.Add("foo", "bar");
+        //    options.Hostname = "testme.quobject.com/";
+        //    options.Path = "primus";
+        //    var socket = new Socket(options);
+        //    //var socket = new Socket("testme.quobject.com");
+        //    socket.On(Socket.EVENT_OPEN, () =>
+        //    {
+        //        log.Info("EVENT_OPEN");
+        //        socket.Send("cookie");
+        //    });
+        //    socket.On(Socket.EVENT_MESSAGE, (d) =>
+        //    {
+        //        var data = (string)d;
+        //        log.Info("EVENT_MESSAGE data = " + data);
+        //        events.Enqueue(data);
+        //        if (events.Count > 1)
+        //        {
+        //            _manualResetEvent.Set();
+        //        }
+        //    });
+        //    socket.Open();
+        //    _manualResetEvent.WaitOne();
+        //    socket.Close();
+
+        //    string result;
+        //    result = events.Dequeue();
+        //    Assert.Equal("hi", result);
+        //    result = events.Dequeue();
+        //    Assert.Equal("got cookie", result);
+        //}
+
     }
 
 }

Src/EngineIoClientDotNet.Tests.mono/ClientTests/SocketTest.cs

@@ -80,5 +80,16 @@ public void SocketOptionCookies()
             options.Cookies.Add("name2","value2");
             Assert.Equal("foo=bar; name2=value2", options.GetCookiesAsString());
         }
+
+        [Fact]
+        public void DefaultProtocol()
+        {
+
+            var log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod());
+            log.Info("Start");
+
+            var socket = new Socket("testme.quobject.com");
+            Assert.NotNull(socket);
+        }
     }
 }

Src/EngineIoClientDotNet.mono/Client/Socket.cs

@@ -102,8 +102,21 @@ public Socket(string uri)
         }
 
         public Socket(string uri, Options options)
-            : this(uri == null ? null : new Uri(uri), options)
+            : this(uri == null ? null : String2Uri(uri), options)
         {
+            
+        }
+
+        private static Uri String2Uri(string uri)
+        {
+            if (uri.StartsWith("http") || uri.StartsWith("ws"))
+            {
+                return new Uri(uri);
+            }
+            else
+            {
+                return new Uri("http://" + uri);
+            }
         }
 
         public Socket(Uri uri, Options options)

Src/EngineIoClientDotNet.mono/Client/Socket_net35.cs

@@ -106,8 +106,21 @@ public Socket(string uri)
         }
 
         public Socket(string uri, Options options)
-            : this(uri == null ? null : new Uri(uri), options)
+            : this(uri == null ? null : String2Uri(uri), options)
         {
+            
+        }
+
+        private static Uri String2Uri(string uri)
+        {
+            if (uri.StartsWith("http") || uri.StartsWith("ws"))
+            {
+                return new Uri(uri);
+            }
+            else
+            {
+                return new Uri("http://" + uri);
+            }
         }
 
         public Socket(Uri uri, Options options)
@@ -346,7 +359,7 @@ public class Options : Transport.Options
             public string QueryString;
 
 
-			
+            
             public static Options FromURI(Uri uri, Options opts)
             {
                 if (opts == null)
@@ -365,8 +378,8 @@ public static Options FromURI(Uri uri, Options opts)
 
                 return opts;
             }
-			
-	
+            
+    
         }
 
 

TestServer/server.js

@@ -12,7 +12,8 @@ var
   },
   server,
   https,
-  http;
+  http,
+  primus_server;
 
 
   console.log("https port = " + config.server.ssl_port);
@@ -24,18 +25,27 @@ var
 
   console.log("http port = " + config.server.port);
   http = require('http').createServer(app);
-  server = require('engine.io').attach(http, {'pingInterval': 500});
+  server = require('engine.io').attach(http, { 'pingInterval': 500 });
+  primus_server = require('engine.io').attach(http, { 'pingInterval': 500, 'path' : '/primus/engine.io' });
   http.listen( config.server.port, function() {
     console.log('Engine.IO server listening on port', config.server.port);
   });
 
 
+  primus_server.on('connection', function (socket) {
+    console.log('primus_server connection');
+    socket.send('hi');
+  });
+
+
 http.on('request', function(request, response) {
   //console.log('request ' +util.inspect( request.headers));
 
 });
 
 
+
+
 server.on('connection', function(socket){
   socket.send('hi');