tipi 0.36 → 0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82a6e09e9b1777016ef5da412c7e60d7224c8ea4d2839b486f02ccda2774d522
-  data.tar.gz: 0d2ae87d9c2525432417699553670503528e52a6ca3c0d400e8a7a0bfeae0142
+  metadata.gz: 4129b10a7f6b5fb92e4e4784bf8cfd12ea2659840b616b7627bf28d1dc423e87
+  data.tar.gz: 7f5f71c4a870e33c7de84fd292568b3aca582dcc1adc9496d99e636328b3df4b
 SHA512:
-  metadata.gz: db5d80d15a5fc164b09461fe91bb0a35549910f6e7783583f0df838c3d5d5379b797cb67bd7d19236b9a5388a2ba1957fa081092ca103643cd028d475668cfcd
-  data.tar.gz: f9d965dcc195568900d3a772892925bea90fc45b8e8a5e8ad4c0370323a388b26c66e6a85fc629c73d9b028caebc4f6bf27c430991ba9e1e2dd4335fce98bc6a
+  metadata.gz: c1bfcbf1cdf4fa2868554e690a71543d89a37bf2d8cfa27cf604e453fb411d5b1dd2e4bc10678cbe79db6a94238ffef1a09e53771f7e8d8e71f2512b87f7265a
+  data.tar.gz: 4f476a65800ffb6cbcdfde6e10ed9e1dd7b9fcc4ddd69ad2babed1a747cba4f94e05659cbd235c1f7e71e1595851d77896262d45d1036d216d866b7bdc3f914a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.37 2021-02-15
+
+* Update upgrade mechanism to work with updated Qeweney API
+
 ## 0.36 2021-02-12
 
 * Use `Qeweney::Status` constants

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    tipi (0.36)
+    tipi (0.37)
       http-2 (~> 0.10.0)
       http_parser.rb (~> 0.6.0)
       msgpack (~> 1.4.2)
       polyphony (~> 0.51.0)
-      qeweney (~> 0.3)
+      qeweney (~> 0.5)
       rack (>= 2.0.8, < 2.3.0)
       websocket (~> 1.2.8)
 
@@ -29,7 +29,7 @@ GEM
       ruby-progressbar
     msgpack (1.4.2)
     polyphony (0.51.0)
-    qeweney (0.3)
+    qeweney (0.5)
       escape_utils (~> 1.2.1)
     rack (2.2.3)
     rake (12.3.3)

data/examples/http_request_ws_server.rb

@@ -27,7 +27,8 @@ puts 'Listening on port 4411...'
 
 Tipi.serve('0.0.0.0', 4411, opts) do |req|
   if req.upgrade_protocol == 'websocket'
-    ws_handler(Tipi::Websocket.new(req.adapter.conn, req.headers))
+    conn = req.upgrade_to_websocket
+    ws_handler(conn)
   else
     req.respond(HTML, 'Content-Type' => 'text/html')
   end

data/lib/tipi/http1_adapter.rb

@@ -131,6 +131,14 @@ module Tipi
     # protocols, notably WebSocket, can be specified by passing a hash to the
     # :upgrade option when starting a server:
     #
+    #     def ws_handler(conn)
+    #       conn << 'hi'
+    #       msg = conn.recv
+    #       conn << "You said #{msg}"
+    #       conn << 'bye'
+    #       conn.close
+    #     end
+    #
     #     opts = {
     #       upgrade: {
     #         websocket: Tipi::Websocket.handler(&method(:ws_handler))
@@ -154,7 +162,7 @@ module Tipi
     
     def upgrade_with_handler(handler, headers)
       @parser = @requests_head = @requests_tail = nil
-      handler.(@conn, headers)
+      handler.(self, headers)
       true
     end
     
@@ -173,6 +181,10 @@ module Tipi
         ':authority' => headers['host']
       )
     end
+
+    def websocket_connection(req)
+      Tipi::Websocket.new(@conn, req.headers)
+    end
     
     # response API
 

data/lib/tipi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tipi
-  VERSION = '0.36'
+  VERSION = '0.37'
 end

data/lib/tipi/websocket.rb

@@ -7,32 +7,17 @@ module Tipi
   # Websocket connection
   class Websocket
     def self.handler(&block)
-      proc { |conn, headers|
-        block.(new(conn, headers))
-      }
-    end  
+      proc do |adapter, headers|
+        req = Qeweney::Request.new(headers, adapter)
+        websocket = req.upgrade_to_websocket
+        block.(websocket)
+      end
+    end
 
     def initialize(conn, headers)
       @conn = conn
       @headers = headers
-      setup(headers)
-    end
-    
-    S_WS_GUID = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
-    UPGRADE_RESPONSE = <<~HTTP.gsub("\n", "\r\n")
-    HTTP/1.1 101 Switching Protocols
-    Upgrade: websocket
-    Connection: Upgrade
-    Sec-WebSocket-Accept: %<accept>s
-    
-    HTTP
-    
-    def setup(headers)
-      key = headers['sec-websocket-key']
       @version = headers['sec-websocket-version'].to_i
-      accept = Digest::SHA1.base64digest([key, S_WS_GUID].join)
-      @conn << format(UPGRADE_RESPONSE, accept: accept)
-      
       @reader = ::WebSocket::Frame::Incoming::Server.new(version: @version)
     end
     
@@ -64,8 +49,10 @@ module Tipi
       end
     end
     
+    OutgoingFrame = ::WebSocket::Frame::Outgoing::Server
+
     def send(data)
-      frame = ::WebSocket::Frame::Outgoing::Server.new(
+      frame = OutgoingFrame.new(
         version: @version, data: data, type: :text
       )
       @conn << frame.to_s

data/tipi.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = ['tipi']
 
   s.add_runtime_dependency      'polyphony',          '~>0.51.0'
-  s.add_runtime_dependency      'qeweney',            '~>0.3'
+  s.add_runtime_dependency      'qeweney',            '~>0.5'
   
   s.add_runtime_dependency      'http_parser.rb',     '~>0.6.0'
   s.add_runtime_dependency      'http-2',             '~>0.10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tipi
 version: !ruby/object:Gem::Version
-  version: '0.36'
+  version: '0.37'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -214,6 +214,7 @@ files:
 - df/ws_page.html
 - docs/README.md
 - docs/tipi-logo.png
+- e
 - examples/cuba.ru
 - examples/hanami-api.ru
 - examples/hello.ru