Modified receiving frame

Author: sta

websocket-sharp/WebSocket.cs

@@ -822,8 +822,9 @@ private void init (WebSocketContext context)
     private void open ()
     {
       _readyState = WebSocketState.OPEN;
-      startReceiving ();
+
       OnOpen.Emit (this, EventArgs.Empty);
+      startReceiving ();
     }
 
     private bool processAbnormalFrame ()
@@ -1230,28 +1231,29 @@ private void startReceiving ()
       _exitReceiving = new AutoResetEvent (false);
       _receivePong = new AutoResetEvent (false);
 
-      Action<WsFrame> completed = null;
-      completed = frame =>
-      {
-        try {
+      Action receive = null;
+      receive = () => _stream.ReadFrameAsync (
+        frame =>
+        {
           if (processFrame (frame))
-            _stream.ReadFrameAsync (completed);
+            receive ();
           else
             _exitReceiving.Set ();
-        }
-        catch (WebSocketException ex) {
-          _logger.Fatal (ex.ToString ());
-          error ("An exception has occured.");
-          close (ex.Code, ex.Message, false);
-        }
-        catch (Exception ex) {
+        },
+        ex =>
+        {
           _logger.Fatal (ex.ToString ());
           error ("An exception has occured.");
-          close (CloseStatusCode.ABNORMAL, null, false);
-        }
-      };
+          if (ex.GetType () == typeof (WebSocketException))
+          {
+            var wsex = (WebSocketException) ex;
+            close (wsex.Code, wsex.Message, false);
+          }
+          else
+            close (CloseStatusCode.ABNORMAL, null, false);
+        });
 
-      _stream.ReadFrameAsync (completed);
+      receive ();
     }
 
     // As server

websocket-sharp/WsFrame.cs

@@ -573,42 +573,45 @@ public IEnumerator<byte> GetEnumerator ()
 
     public static WsFrame Parse (byte [] src)
     {
-      return Parse (src, true);
+      return Parse (src, true, null);
     }
 
     public static WsFrame Parse (Stream stream)
     {
-      return Parse (stream, true);
+      return Parse (stream, true, null);
     }
 
-    public static WsFrame Parse (byte [] src, bool unmask)
+    public static WsFrame Parse (byte [] src, Action<Exception> error)
     {
-      using (var stream = new MemoryStream (src))
-      {
-        return Parse (stream, unmask);
-      }
+      return Parse (src, true, error);
+    }
+
+    public static WsFrame Parse (Stream stream, Action<Exception> error)
+    {
+      return Parse (stream, true, error);
     }
 
-    public static WsFrame Parse (Stream stream, bool unmask)
+    public static WsFrame Parse (byte [] src, bool unmask, Action<Exception> error)
     {
-      return Parse (stream, unmask, null);
+      using (var stream = new MemoryStream (src))
+      {
+        return Parse (stream, unmask, error);
+      }
     }
 
     public static WsFrame Parse (Stream stream, bool unmask, Action<Exception> error)
     {
       WsFrame frame = null;
-      try
-      {
+      try {
         var header = stream.ReadBytes (2);
         frame = header.Length == 2
               ? parse (header, stream, unmask)
               : CreateCloseFrame (
                   Mask.UNMASK,
                   CloseStatusCode.ABNORMAL,
-                  "'Header' of a frame cannot be read from the data stream.");
+                  "The header part of a frame cannot be read from the 'stream'.");
       }
-      catch (Exception ex)
-      {
+      catch (Exception ex) {
         if (error != null)
           error (ex);
       }
@@ -629,43 +632,25 @@ public static void ParseAsync (Stream stream, Action<WsFrame> completed, Action<
     public static void ParseAsync (
       Stream stream, bool unmask, Action<WsFrame> completed, Action<Exception> error)
     {
-      var header = new byte [2];
-      AsyncCallback callback = ar =>
-      {
-        WsFrame frame = null;
-        try
+      stream.ReadBytesAsync (
+        2,
+        header =>
         {
-          var readLen = stream.EndRead (ar);
-          if (readLen == 1)
-          {
-            var tmp = stream.ReadByte ();
-            if (tmp > -1)
-            {
-              header [1] = (byte) tmp;
-              readLen++;
-            }
-          }
-
-          frame = readLen == 2
-                ? parse (header, stream, unmask)
-                : CreateCloseFrame (
-                    Mask.UNMASK,
-                    CloseStatusCode.ABNORMAL,
-                    "'Header' of a frame cannot be read from the data stream.");
-        }
-        catch (Exception ex)
+          var frame = header.Length == 2
+                    ? parse (header, stream, unmask)
+                    : CreateCloseFrame (
+                        Mask.UNMASK,
+                        CloseStatusCode.ABNORMAL,
+                        "The header part of a frame cannot be read from the 'stream'.");
+
+          if (completed != null)
+            completed (frame);
+        },
+        ex =>
         {
           if (error != null)
             error (ex);
-        }
-        finally
-        {
-          if (completed != null)
-            completed (frame);
-        }
-      };
-
-      stream.BeginRead (header, 0, 2, callback, null);
+        });
     }
 
     public void Print (bool dumped)

websocket-sharp/WsStream.cs

@@ -174,18 +174,26 @@ public WsFrame ReadFrame ()
     {
       lock (_forRead)
       {
-        try {
-          return WsFrame.Parse (_innerStream);
-        }
-        catch {
-          return null;
-        }
+        return WsFrame.Parse (_innerStream, null);
+      }
+    }
+
+    public WsFrame ReadFrame (Action<Exception> error)
+    {
+      lock (_forRead)
+      {
+        return WsFrame.Parse (_innerStream, error);
       }
     }
 
     public void ReadFrameAsync (Action<WsFrame> completed)
     {
-      WsFrame.ParseAsync (_innerStream, completed);
+      WsFrame.ParseAsync (_innerStream, completed, null);
+    }
+
+    public void ReadFrameAsync (Action<WsFrame> completed, Action<Exception> error)
+    {
+      WsFrame.ParseAsync (_innerStream, completed, error);
     }
 
     public string [] ReadHandshake ()