websocket-driver 0.7.4 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91c58586ddd290ad5d320267e36706bdbcffb09c7ba5300d6c3fcd50f342ec2f
-  data.tar.gz: 7f5afd33de5b0c0e68d7d4cbab726e7ada8200f1b5916e01feb6a3508e3f3e51
+  metadata.gz: 48624348056a8a90b22cf6844120166be3ec700a80ec4ab23c1d6c1f5e43aa1a
+  data.tar.gz: 0f157eaba15f2cd8c544042700159a692b0bf74f71a03c40b3da04a705409236
 SHA512:
-  metadata.gz: 92ececf04fb09b31c8fd1617a38351d7a04c4306f3a27b7061e1220710a5a703da162ca0b47ee2fbdf63e20606040a022de61c51c651add2356665526adffe46
-  data.tar.gz: f89d71520719be104eb649c318ca85bdd107ec875a62405061fe0268d9df08b0487fe333c531d4635950245ef2879c9fc43c8a148a63afc97f508f28cc4c7397
+  metadata.gz: f27c8eafe669ee83b263f56d1b0aeb49bcfba6c5bcc1b027b3bf3a04f71c58e7d9bc6fa99a24f8f4724f6f3d5961a7c90c2fdea978b6f9f1324d5a3f1012d056
+  data.tar.gz: 833502731fc73a3b05664d29343199e4c07e5b77825b5a3b2b851d6742506d7c33207a5da0369f692cc073c0e192583db083ba127abaa85eb9b130b4ac1aeb7f

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.7.6 / 2023-07-25
+
+- Fix handling of default ports in `Host` headers on Ruby 3.1+
+
+### 0.7.5 / 2021-06-12
+
+- Do not change the encoding of strings passed to `Driver#text`
+
 ### 0.7.4 / 2021-05-24
 
 - Optimise conversions between strings and byte arrays and related encoding

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2010-2021 James Coglan
+Copyright 2010-2023 James Coglan
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 this file except in compliance with the License. You may obtain a copy of the

data/lib/websocket/driver/client.rb

@@ -23,11 +23,10 @@ module WebSocket
           raise URIError, "#{ socket.url } is not a valid WebSocket URL"
         end
 
-        host      = uri.host + (uri.port ? ":#{ uri.port }" : '')
         path      = (uri.path == '') ? '/' : uri.path
         @pathname = path + (uri.query ? '?' + uri.query : '')
 
-        @headers['Host']                  = host
+        @headers['Host']                  = Driver.host_header(uri)
         @headers['Upgrade']               = 'websocket'
         @headers['Connection']            = 'Upgrade'
         @headers['Sec-WebSocket-Key']     = @key

data/lib/websocket/driver/hybi.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 module WebSocket
   class Driver
 
@@ -164,7 +166,7 @@ module WebSocket
         message.rsv1   = message.rsv2 = message.rsv3 = false
         message.opcode = OPCODES[type || (String === buffer ? :text : :binary)]
 
-        payload = Driver.encode(buffer, Encoding::BINARY)
+        payload = Driver.encode(buffer)
         payload = [code, payload].pack('S>a*') if code
         message.data = payload
 

data/lib/websocket/driver/proxy.rb

@@ -4,8 +4,6 @@ module WebSocket
     class Proxy
       include EventEmitter
 
-      PORTS = { 'ws' => 80, 'wss' => 443 }
-
       attr_reader :status, :headers
 
       def initialize(client, origin, options)
@@ -20,7 +18,7 @@ module WebSocket
         @state   = 0
 
         @headers = Headers.new
-        @headers['Host'] = @origin.host + (@origin.port ? ":#{ @origin.port }" : '')
+        @headers['Host'] = Driver.host_header(@origin)
         @headers['Connection'] = 'keep-alive'
         @headers['Proxy-Connection'] = 'keep-alive'
 

data/lib/websocket/driver.rb

@@ -42,6 +42,7 @@ module WebSocket
     end
 
     MAX_LENGTH = 0x3ffffff
+    PORTS      = { 'ws' => 80, 'wss' => 443 }
     STATES     = [:connecting, :open, :closing, :closed]
 
     ConnectEvent = Struct.new(nil)
@@ -115,7 +116,7 @@ module WebSocket
     end
 
     def text(message)
-      message = message.encode(Encoding::UTF_8) unless message.encoding == Encoding::UTF_8
+      message = Driver.encode(message, Encoding::UTF_8)
       frame(message, :text)
     end
 
@@ -194,19 +195,27 @@ module WebSocket
       end
     end
 
-    def self.encode(string, encoding = nil)
-      case string
-        when Array then
-          string = string.pack('C*')
-          encoding ||= Encoding::BINARY
-        when String then
-          encoding ||= Encoding::UTF_8
+    def self.encode(data, encoding = nil)
+      if Array === data
+        encoding ||= Encoding::BINARY
+        return data.pack('C*').force_encoding(encoding)
       end
-      unless string.encoding == encoding
-        string = string.dup if string.frozen?
-        string.force_encoding(encoding)
+
+      encoding ||= Encoding::UTF_8
+
+      return data if data.encoding == encoding
+      return data.encode(encoding) unless data.encoding == Encoding::BINARY
+
+      data = data.dup if data.frozen?
+      data.force_encoding(encoding)
+    end
+
+    def self.host_header(uri)
+      host = uri.host
+      if uri.port and uri.port != PORTS[uri.scheme]
+        host += ":#{uri.port}"
       end
-      string
+      host
     end
 
     def self.validate_options(options, valid_keys)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.6
 platform: ruby
 authors:
 - James Coglan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-extensions
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: WebSocket protocol handler with pluggable I/O