protocol-websocket 0.10.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 625dad3dc10a593cb806a3cf3174414ffab74cd1b26107e520f6c938d66713bc
-  data.tar.gz: 6f73f9dd24b1f235310ae26afdee3cb85901d568b9414d509280cf20c38b42ff
+  metadata.gz: 17a6b7e17274fe574b07bc2ad242cbe383671f7f05c84fd784ec474fbde5e28a
+  data.tar.gz: f1098660970a0cf6069d5037dd736b52b18b7da51727c9968a96970ecd1015b0
 SHA512:
-  metadata.gz: 128be3205862ad76b5e728de4dc9aa65dd913e903a5acdfd41267b49267f7b5c30429d8893177503ee384aed81b327b57af446dbd8ed5ac2c02b3a45111f25bf
-  data.tar.gz: 0a7a73d4d35ce39e6b38c5d3c78af3bb1c8326605db6f7ce665cd34c6538a5941b7994f6b8c70a597fb8ae16db8c86b4f83e95189f746c2b70ffd93ec888de2b
+  metadata.gz: 1720e16bd8d32258b7583d9cde912229d64af57428ad3bb8644832c5b6f4e5c1588a798c9368a9638c5801f320e9b8489094d40ca5ffe45634b6d582d3f12170
+  data.tar.gz: 17ac4461055d2de24188f365a85e5fb80c907ab041fc62bdc2f376e24bec1178f950ef8ff4388d39c6c144e056e63d8fc8e28ab53dcd537a4f92af73c02a5dd2

data/lib/protocol/websocket/connection.rb

@@ -55,12 +55,32 @@ module Protocol
 				@framer.flush
 			end
 			
+			def open!
+				@state = :open
+				
+				return self
+			end
+			
+			def close!(...)
+				@state = :closed
+				
+				return self
+			end
+			
 			def closed?
 				@state == :closed
 			end
 			
-			def close(code = Error::NO_ERROR, reason = "")
-				send_close(code, reason) unless closed?
+			def close(...)
+				unless @state == :closed
+					close!
+					
+					begin
+						send_close(...)
+					rescue
+						# Ignore.
+					end
+				end
 				
 				@framer.close
 			end
@@ -80,11 +100,11 @@ module Protocol
 				
 				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
@@ -120,11 +140,13 @@ module Protocol
 			end
 					
 			def receive_close(frame)
-				@state = :closed
-				
 				code, reason = frame.unpack
 				
-				send_close(code, reason)
+				# 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
+					close!
+					send_close(code, reason)
+				end
 				
 				if code and code != Error::NO_ERROR
 					raise ClosedError.new reason, code
@@ -142,18 +164,6 @@ module Protocol
 				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))
@@ -198,8 +208,6 @@ module Protocol
 				
 				self.write_frame(frame)
 				self.flush
-				
-				@state = :closed
 			end
 			
 			# Write a message to the connection.
@@ -237,7 +245,7 @@ module Protocol
 					end
 				end
 			rescue ProtocolError => error
-				send_close(error.code, error.message)
+				close(error.code, error.message)
 				
 				raise
 			end

data/lib/protocol/websocket/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module WebSocket
-		VERSION = "0.10.0"
+		VERSION = "0.11.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-websocket
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -41,7 +41,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-02-04 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -119,8 +119,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/.DS_Store
-- lib/protocol/.DS_Store
 - lib/protocol/websocket.rb
 - lib/protocol/websocket/binary_frame.rb
 - lib/protocol/websocket/close_frame.rb
@@ -156,14 +154,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: A low level implementation of the WebSocket protocol.