Merge original

Example/Example.csproj

@@ -34,7 +34,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug_Ubuntu</OutputPath>
-    <DefineConstants>DEBUG,UBUNTU</DefineConstants>
+    <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Externalconsole>true</Externalconsole>
@@ -43,16 +43,12 @@
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Release_Ubuntu</OutputPath>
-    <DefineConstants>UBUNTU</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Externalconsole>true</Externalconsole>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a">
-      <Package>notify-sharp</Package>
-    </Reference>
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
@@ -65,7 +61,5 @@
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Notifier.cs" />
-    <Compile Include="NotificationMessage.cs" />
   </ItemGroup>
 </Project>

Example/Program.cs

@@ -18,104 +18,125 @@ public static void Main (string[] args)
       // If you would like to connect to the server with the secure connection,
       // you should create a new instance with a wss scheme WebSocket URL.
 
-      using (var nf = new Notifier ())
-      using (var ws = new WebSocket ("ws://echo.websocket.org"))
-      //using (var ws = new WebSocket ("wss://echo.websocket.org"))
       //using (var ws = new WebSocket ("ws://localhost:4649/Echo"))
       //using (var ws = new WebSocket ("wss://localhost:5963/Echo"))
-      //using (var ws = new WebSocket ("ws://localhost:4649/Echo?name=nobita"))
-      //using (var ws = new WebSocket ("wss://localhost:5963/Echo?name=nobita"))
-      //using (var ws = new WebSocket ("ws://localhost:4649/Chat"))
+      using (var ws = new WebSocket ("ws://localhost:4649/Chat"))
       //using (var ws = new WebSocket ("wss://localhost:5963/Chat"))
       //using (var ws = new WebSocket ("ws://localhost:4649/Chat?name=nobita"))
       //using (var ws = new WebSocket ("wss://localhost:5963/Chat?name=nobita"))
       {
-        // Set the WebSocket events.
-
-        ws.OnOpen += (sender, e) => ws.Send ("Hi, there!");
-
-        ws.OnMessage += (sender, e) =>
-            nf.Notify (
-              new NotificationMessage {
-                Summary = "WebSocket Message",
-                Body = !e.IsPing ? e.Data : "Received a ping.",
-                Icon = "notification-message-im"
-              }
-            );
-
-        ws.OnError += (sender, e) =>
-            nf.Notify (
-              new NotificationMessage {
-                Summary = "WebSocket Error",
-                Body = e.Message,
-                Icon = "notification-message-im"
-              }
-            );
-
-        ws.OnClose += (sender, e) =>
-            nf.Notify (
-              new NotificationMessage {
-                Summary = String.Format ("WebSocket Close ({0})", e.Code),
-                Body = e.Reason,
-                Icon = "notification-message-im"
-              }
-            );
 #if DEBUG
         // To change the logging level.
         ws.Log.Level = LogLevel.Trace;
 
-        // To change the wait time for the response to the Ping or Close.
-        //ws.WaitTime = TimeSpan.FromSeconds (10);
+        // To enable the Per-message Compression extension.
+        //ws.Compression = CompressionMethod.Deflate;
 
         // To emit a WebSocket.OnMessage event when receives a ping.
         //ws.EmitOnPing = true;
-#endif
-        // To enable the Per-message Compression extension.
-        //ws.Compression = CompressionMethod.Deflate;
+
+        // To enable the redirection.
+        //ws.EnableRedirection = true;
+
+        // To disable a delay when send or receive buffer of the underlying
+        // TCP socket is not full.
+        ws.NoDelay = true;
+
+        // To send the Origin header.
+        //ws.Origin = "http://localhost:4649";
+
+        // To send the cookies.
+        //ws.SetCookie (new Cookie ("name", "nobita"));
+        //ws.SetCookie (new Cookie ("roles", "\"idiot, gunfighter\""));
+
+        // To send the credentials for the HTTP Authentication (Basic/Digest).
+        //ws.SetCredentials ("nobita", "password", false);
+
+        // To connect through the HTTP Proxy server.
+        //ws.SetProxy ("http://localhost:3128", "nobita", "password");
+
+        // To send a user header.
+
+        var reqHeader = "RequestForID";
+        var resHeader = "ID";
+
+        ws.SetUserHeader (reqHeader, resHeader);
+
 
         // To validate the server certificate.
         /*
         ws.SslConfiguration.ServerCertificateValidationCallback =
           (sender, certificate, chain, sslPolicyErrors) => {
-            ws.Log.Debug (
-              String.Format (
-                "Certificate:\n- Issuer: {0}\n- Subject: {1}",
-                certificate.Issuer,
-                certificate.Subject
-              )
-            );
+            var fmt = "Certificate:\n- Issuer: {0}\n- Subject: {1}";
+            var msg = String.Format (
+                        fmt,
+                        certificate.Issuer,
+                        certificate.Subject
+                      );
+
+            ws.Log.Debug (msg);
 
             return true; // If the server certificate is valid.
           };
          */
 
-        // To send the credentials for the HTTP Authentication (Basic/Digest).
-        //ws.SetCredentials ("nobita", "password", false);
+        // To change the wait time for the response to the Ping or Close.
+        //ws.WaitTime = TimeSpan.FromSeconds (10);
+#endif
+        // Set the WebSocket events.
 
-        // To send the Origin header.
-        //ws.Origin = "http://localhost:4649";
+        ws.OnClose +=
+          (sender, e) => {
+            var fmt = "[WebSocket Close ({0})] {1}";
 
-        // To send the cookies.
-        //ws.SetCookie (new Cookie ("name", "nobita"));
-        //ws.SetCookie (new Cookie ("roles", "\"idiot, gunfighter\""));
+            Console.WriteLine (fmt, e.Code, e.Reason);
+          };
 
-        // To connect through the HTTP Proxy server.
-        //ws.SetProxy ("http://localhost:3128", "nobita", "password");
+        ws.OnError +=
+          (sender, e) => {
+            var fmt = "[WebSocket Error] {0}";
 
-        // To enable the redirection.
-        //ws.EnableRedirection = true;
+            Console.WriteLine (fmt, e.Message);
+          };
+
+        ws.OnMessage +=
+          (sender, e) => {
+            var fmt = e.IsPing
+                      ? "[WebSocket Ping] {0}"
+                      : "[WebSocket Message] {0}";
+
+            Console.WriteLine (fmt, e.Data);
+          };
+
+        ws.OnOpen +=
+          (sender, e) => {
+#if DEBUG
+            var val = ws.HandshakeResponseHeaders[resHeader];
+
+            if (!val.IsNullOrEmpty ()) {
+              var fmt = "[WebSocket Open] {0}: {1}";
+
+              Console.WriteLine (fmt, resHeader, val);
+            }
+#endif
+            ws.Send ("Hi, there!");
+          };
 
         // Connect to the server.
         ws.Connect ();
 
         // Connect to the server asynchronously.
         //ws.ConnectAsync ();
 
-        Console.WriteLine ("\nType 'exit' to exit.\n");
+        Console.WriteLine ("\nType \"exit\" to exit.\n");
+
         while (true) {
           Thread.Sleep (1000);
+
           Console.Write ("> ");
+
           var msg = Console.ReadLine ();
+
           if (msg == "exit")
             break;