Better handling of EOFError.

socketry · May 5, 2019 · 6ab8e9c · 6ab8e9c
1 parent c0bc417
commit 6ab8e9c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/async/websocket/frame.rb b/lib/async/websocket/frame.rb
@@ -93,7 +93,10 @@ def pack(payload)
 			end
 
 			def read(stream)
-				buffer = stream.read(2) or raise EOFError
+				unless buffer = stream.read(2)
+					return nil
+				end
+
 				first, second = buffer.unpack("CC")
 
 				@fin = !!(first & 0b1000_0000)

diff --git a/lib/async/websocket/framer.rb b/lib/async/websocket/framer.rb
@@ -39,9 +39,11 @@ def flush
 			def read_frame
 				frame = Frame.new
 
-				frame.read(@stream)
-
-				return frame
+				if frame.read(@stream)
+					return frame
+				else
+					return nil
+				end
 			end
 
 			def write_frame(frame)