protocol-websocket 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e079958535576416ddb72c68df979c7d8df7ef808986208917a0511d1ae69a64
-  data.tar.gz: 6d6bfa79a21f935a9ca4928e4fbcc9f0942f822e0efed9bfb53387b2b46fad8b
+  metadata.gz: c86a30474a3cc59d80067cff2ffd5ca70ad3e6a1790cb733ec3c3e50a470d8ee
+  data.tar.gz: 0dd99e817ecb007230fd72a5d6192377407c342335957fb7684e36e7e5ce0eee
 SHA512:
-  metadata.gz: a6fcc1de1d57eec7d08dc692af7dbc75c8758d064f98a47f05f8cc7a084dfcf4333cebe2c3e8dbc9c64a562744eb466e816bf28df07e77fc9a3b855e16cf589e
-  data.tar.gz: '095cd95f03d4cb7d3e564725d0ab638917b4ff644ad439316e89700e85f26068b888d425b483be30110c86fca95554c44a5a7f5bd18e84aeac4bbbecd53ac619'
+  metadata.gz: af32770dae2bd359017808d16534872fa59aeb1de7323c1ceaba940d8b553ec59c23c73fe5fe83c352e8a08a4afca976ca06b0cc253d30c3ebf0d6ddf4ffde81
+  data.tar.gz: e4ff5515d2ff8312058161e08b5e42996282aa78d24f03a12dcf47de9541654c8d8de4b27b50cac65498bbd79de62f681c2f9894ff60b5925886db480c53973b

data/.gitignore

@@ -10,3 +10,4 @@
 # rspec failure tracking
 .rspec_status
 Gemfile.lock
+.covered.db

data/lib/protocol/websocket/connection.rb

@@ -50,7 +50,7 @@ module Protocol
 			end
 			
 			def close
-				send_close
+				send_close unless closed?
 				
 				@framer.close
 			end
@@ -121,7 +121,8 @@ module Protocol
 				frame = CloseFrame.new(mask: @mask)
 				frame.pack(code, message)
 				
-				write_frame(frame)
+				self.write_frame(frame)
+				self.flush
 				
 				@state = :closed
 			end

data/lib/protocol/websocket/{digest.rb → headers.rb}

@@ -19,13 +19,34 @@
 # THE SOFTWARE.
 
 require 'digest/sha1'
+require 'securerandom'
 
 module Protocol
 	module WebSocket
-		GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-		
-		def self.accept_digest(key)
-			Digest::SHA1.base64digest(key + GUID)
+		module Headers
+			# The protocol string used for the `upgrade:` header (HTTP/1) and `:protocol` pseudo-header (HTTP/2).
+			PROTOCOL = "websocket".freeze
+			
+			# These general headers are used to negotiate the connection.
+			SEC_WEBSOCKET_PROTOCOL = 'sec-websocket-protocol'.freeze
+			SEC_WEBSOCKET_VERSION = 'sec-websocket-version'.freeze
+			
+			SEC_WEBSOCKET_KEY = 'sec-websocket-key'.freeze
+			SEC_WEBSOCKET_ACCEPT = 'sec-websocket-accept'.freeze
+			
+			module Nounce
+				GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
+				
+				# Valid for the `SEC_WEBSOCKET_KEY` header.
+				def self.generate_key
+					SecureRandom.base64(16)
+				end
+				
+				# Valid for the `SEC_WEBSOCKET_ACCEPT` header.
+				def self.accept_digest(key)
+					Digest::SHA1.base64digest(key + GUID)
+				end
+			end
 		end
 	end
 end

data/lib/protocol/websocket/version.rb

@@ -20,6 +20,6 @@
 
 module Protocol
 	module WebSocket
-		VERSION = "0.5.0"
+		VERSION = "0.6.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-websocket
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -112,10 +112,10 @@ files:
 - lib/protocol/websocket/close_frame.rb
 - lib/protocol/websocket/connection.rb
 - lib/protocol/websocket/continuation_frame.rb
-- lib/protocol/websocket/digest.rb
 - lib/protocol/websocket/error.rb
 - lib/protocol/websocket/frame.rb
 - lib/protocol/websocket/framer.rb
+- lib/protocol/websocket/headers.rb
 - lib/protocol/websocket/ping_frame.rb
 - lib/protocol/websocket/pong_frame.rb
 - lib/protocol/websocket/text_frame.rb
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A low level implementation of the WebSocket protocol.