Provide direct transition into closed state.

Author: ioquatix

lib/protocol/websocket/connection.rb

@@ -55,21 +55,30 @@ def flush
 				@framer.flush
 			end
 
-			def closed?
-				@state == :closed
+			def open!
+				@state = :open
+				
+				return self
 			end
 
-			def close(code = Error::NO_ERROR, reason = "")
-				unless closed?
+			def close!(...)
+				unless @state == :closed
+					@state = :closed
+					
 					begin
-						send_close(code, reason)
+						send_close(...)
 					rescue
 						# Ignore.
 					end
-					
-					@state = :closed
 				end
-				
+			end
+			
+			def closed?
+				@state == :closed
+			end
+			
+			def close(...)
+				self.close!(...)
 				@framer.close
 			end
 
@@ -88,11 +97,11 @@ def read_frame
 
 				return frame
 			rescue ProtocolError => error
-				send_close(error.code, error.message)
+				close!(error.code, error.message)
 
 				raise
 			rescue
-				send_close(Error::PROTOCOL_ERROR, $!.message)
+				close!(Error::PROTOCOL_ERROR, $!.message)
 
 				raise
 			end
@@ -132,12 +141,7 @@ def receive_close(frame)
 
 				# If we're already closed, then we don't need to send a close frame. Otherwise, according to the RFC, we should echo the close frame. However, it's possible it will fail to send if the connection is already closed.
 				unless @state == :closed
-					@state = :closed
-					begin
-						send_close(code, reason)
-					rescue
-						# Ignore.
-					end
+					close!(code, reason)
 				end
 
 				if code and code != Error::NO_ERROR
@@ -156,18 +160,6 @@ def send_ping(data = "")
 				end
 			end
 
-			def open!
-				@state = :open
-				
-				return self
-			end
-			
-			def close!
-				@state = :closed
-				
-				return self
-			end
-			
 			def receive_ping(frame)
 				if @state != :closed
 					write_frame(frame.reply(mask: @mask))
@@ -249,7 +241,7 @@ def read(**options)
 					end
 				end
 			rescue ProtocolError => error
-				send_close(error.code, error.message)
+				close!(error.code, error.message)
 
 				raise
 			end

test/protocol/websocket/connection.rb

@@ -156,7 +156,7 @@
 				connection.read_frame
 			end.to raise_exception(EOFError, message: be =~ /Fake error/)
 
-			expect(connection).not.to be(:closed?)
+			expect(connection).to be(:closed?)
 
 			frame = client.read_frame
 			expect(frame).to be_a(Protocol::WebSocket::CloseFrame)