protocol-websocket 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 625dad3dc10a593cb806a3cf3174414ffab74cd1b26107e520f6c938d66713bc
-  data.tar.gz: 6f73f9dd24b1f235310ae26afdee3cb85901d568b9414d509280cf20c38b42ff
+  metadata.gz: 58b07db9f128f30d49b779a04a08624afbeb59abe9cc3e0028ded1e2d5e6a7f3
+  data.tar.gz: 646c2a5004051f46d6f4872fec0842d695d6e4a1b2273421bc164293315df4e0
 SHA512:
-  metadata.gz: 128be3205862ad76b5e728de4dc9aa65dd913e903a5acdfd41267b49267f7b5c30429d8893177503ee384aed81b327b57af446dbd8ed5ac2c02b3a45111f25bf
-  data.tar.gz: 0a7a73d4d35ce39e6b38c5d3c78af3bb1c8326605db6f7ce665cd34c6538a5941b7994f6b8c70a597fb8ae16db8c86b4f83e95189f746c2b70ffd93ec888de2b
+  metadata.gz: f1f28c28daa4dc109df788ae226c4b9a0a1081d20a2316a4e23ff48e1632dd9662a32c2bad2573fed32cde1624c7ab7c23a53b805e946068a70543f93b188cbf
+  data.tar.gz: 0d64b3c9f3d809bd6b965b15780be053c15cfc37ff7fc5c66d0d7dc73e614821550ee25746f6a4b28b9c6f69603254daa3f4bd83b63e4cd5dbe8b4f223be9ab6

checksums.yaml.gz.sig

@@ -1,3 +1,3 @@
-��7c4W����;��F��!_����U���?���>���/�G�EF3�|�Q��G�y�eyIj1��lx�2@s���c�h��ä��n	Pk�j��'�~������0�ϣ�����9D]Ǐ:�*}��	s	2�=�	k�x���*��Wo�� 4�����H/[PU�������e#^od)����A���#HϢ��RvK�'Y�Aީ)�[���_M��}��2���̒jҋ��d�	���d�/9�
-`�Z>�'�Q�	��G)r6��@.�Q%?>���HN�?�����U|n�*Fڊ�O�8�%6)�n�ʉ|�j����h����G�V0$�V��"(�$]��D�u�!�1��
-3C����U���7�
+l��ҭ��V4�$C==N�*$���D�e�Z�8j�k��.�a<!���Ih�Z��8�mˋ4����m@�"sk�58Gؒ�
+=~�{�!�ַu�WY����M�F�
+����nG~�b�o�4#�3��響`�K���Y�����9.�λ��J��b�虎�;r1�5�����y,0�
J��od���I���� y���X�\V +��|R-g�7��E�t����n����c���q��n�5�8u{'��6wY1�v��L���Vڤ�l��!ߤ���$��Ի�.b�$����b'bٳ��'H
bJ^�!���Q��Yeb���j�܍=F�-8�!VT��o����*��$���g�d�&�O��-I|HB

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.0"
 	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.0
 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-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A low level implementation of the WebSocket protocol.