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,13 +18,8 @@ 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 ("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 ("wss://localhost:5963/Chat"))
       //using (var ws = new WebSocket ("ws://localhost:4649/Chat?name=nobita"))
@@ -34,32 +29,24 @@ public static void Main (string[] args)
 
         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"
-              }
-            );
+        ws.OnMessage += (sender, e) => {
+            var fmt = "[WebSocket Message] {0}";
+            var body = !e.IsPing ? e.Data : "A ping was received.";
+
+            Console.WriteLine (fmt, body);
+          };
+
+        ws.OnError += (sender, e) => {
+            var fmt = "[WebSocket Error] {0}";
+
+            Console.WriteLine (fmt, e.Message);
+          };
+
+        ws.OnClose += (sender, e) => {
+            var fmt = "[WebSocket Close ({0})] {1}";
+
+            Console.WriteLine (fmt, e.Code, e.Reason);
+          };
 #if DEBUG
         // To change the logging level.
         ws.Log.Level = LogLevel.Trace;
@@ -69,6 +56,10 @@ public static void Main (string[] args)
 
         // To emit a WebSocket.OnMessage event when receives a ping.
         //ws.EmitOnPing = true;
+
+        // To disable a delay when send or receive buffer of the underlying
+        // TCP socket is not full.
+        ws.NoDelay = true;
 #endif
         // To enable the Per-message Compression extension.
         //ws.Compression = CompressionMethod.Deflate;
@@ -77,13 +68,12 @@ public static void Main (string[] args)
         /*
         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.
           };
@@ -112,10 +102,13 @@ public static void Main (string[] args)
         //ws.ConnectAsync ();
 
         Console.WriteLine ("\nType 'exit' to exit.\n");
+
         while (true) {
           Thread.Sleep (1000);
           Console.Write ("> ");
+
           var msg = Console.ReadLine ();
+
           if (msg == "exit")
             break;