tipi 0.36 → 0.39

data/lib/tipi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tipi
-  VERSION = '0.36'
+  VERSION = '0.39'
 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/test/test_http_server.rb

@@ -60,8 +60,8 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.0\r\n\r\n"
 
     response = connection.readpartial(8192)
-    expected = <<~HTTP.chomp.http_lines
-      HTTP/1.0 200
+    expected = <<~HTTP.chomp.http_lines.chomp
+      HTTP/1.1 200
       Content-Length: 13
 
       Hello, world!
@@ -78,14 +78,11 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
 
     response = connection.readpartial(8192)
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.http_lines.chomp
       HTTP/1.1 200
-      Transfer-Encoding: chunked
+      Content-Length: 13
 
-      d
       Hello, world!
-      0
-
     HTTP
     assert_equal(expected, response)
   end
@@ -98,26 +95,23 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.0\r\nConnection: keep-alive\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    assert_equal("HTTP/1.0 200\r\nContent-Length: 2\r\n\r\nHi", response)
+    assert_equal("HTTP/1.1 200\r\nContent-Length: 2\r\n\r\nHi", response)
 
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.http_lines.chomp
       HTTP/1.1 200
-      Transfer-Encoding: chunked
+      Content-Length: 2
 
-      2
       Hi
-      0
-
     HTTP
     assert_equal(expected, response)
 
     connection << "GET / HTTP/1.0\r\n\r\n"
     response = connection.readpartial(8192)
     assert connection.eof?
-    assert_equal("HTTP/1.0 200\r\nContent-Length: 2\r\n\r\nHi", response)
+    assert_equal("HTTP/1.1 200\r\nContent-Length: 2\r\n\r\nHi", response)
   end
 
   def test_pipelining_client
@@ -130,24 +124,17 @@ class HTTP1ServerTest < MiniTest::Test
     end
 
     connection << "GET / HTTP/1.1\r\n\r\nGET / HTTP/1.1\r\nFoo: bar\r\n\r\n"
-    2.times { snooze }
+    sleep 0.01
     response = connection.readpartial(8192)
 
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.http_lines.chomp
       HTTP/1.1 200
-      Transfer-Encoding: chunked
-
-      d
-      Hello, world!
-      0
+      Content-Length: 13
 
-      HTTP/1.1 200
-      Transfer-Encoding: chunked
+      Hello, world!HTTP/1.1 200
+      Content-Length: 14
 
-      e
       Hello, foobar!
-      0
-
     HTTP
     assert_equal(expected, response)
   end
@@ -172,22 +159,22 @@ class HTTP1ServerTest < MiniTest::Test
       6
       foobar
     HTTP
-    20.times { snooze }
+    sleep 0.01
     assert request
     assert_equal %w[foobar], chunks
     assert !request.complete?
 
     connection << "6\r\nbazbud\r\n"
-    20.times { snooze }
+    sleep 0.01
     assert_equal %w[foobar bazbud], chunks
     assert !request.complete?
 
     connection << "0\r\n\r\n"
-    20.times { snooze }
+    sleep 0.01
     assert_equal %w[foobar bazbud], chunks
     assert request.complete?
 
-    2.times { snooze }
+    sleep 0.01
 
     response = connection.readpartial(8192)
 
@@ -210,7 +197,8 @@ class HTTP1ServerTest < MiniTest::Test
 
     opts = {
       upgrade: {
-        echo: lambda do |conn, _headers|
+        echo: lambda do |adapter, _headers|
+          conn = adapter.conn
           conn << <<~HTTP.http_lines
             HTTP/1.1 101 Switching Protocols
             Upgrade: echo
@@ -231,14 +219,11 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.http_lines.chomp
       HTTP/1.1 200
-      Transfer-Encoding: chunked
+      Content-Length: 2
 
-      2
       Hi
-      0
-
     HTTP
     assert_equal(expected, response)
 
@@ -271,7 +256,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection.close
     assert !done
     
-    12.times { snooze }
+    sleep 0.01
     assert done
   end
 

data/test/test_request.rb

@@ -60,7 +60,7 @@ class RequestHeadersTest < MiniTest::Test
 
     connection << "GET /titi HTTP/1.1\r\nHost: blah.com\r\nFoo: bar\r\nhi: 1\r\nHi: 2\r\nhi: 3\r\n\r\n"
 
-    snooze
+    sleep 0.01
 
     assert_kind_of Qeweney::Request, req
     assert_equal 'blah.com', req.headers['host']
@@ -78,7 +78,7 @@ class RequestHeadersTest < MiniTest::Test
     end
 
     connection << "GET /titi HTTP/1.1\nHost: blah.com\nFoo: bar\nhi: 1\nHi: 2\nhi: 3\n\n"
-    snooze
+    sleep 0.01
     assert_equal 'blah.com', req.host
   end
 
@@ -90,7 +90,7 @@ class RequestHeadersTest < MiniTest::Test
     end
 
     connection << "GET /titi HTTP/1.1\nConnection: keep-alive\nFoo: bar\nhi: 1\nHi: 2\nhi: 3\n\n"
-    snooze
+    sleep 0.01
     assert_equal 'keep-alive', req.connection
   end
 
@@ -102,7 +102,7 @@ class RequestHeadersTest < MiniTest::Test
     end
 
     connection << "GET /titi HTTP/1.1\nConnection: upgrade\nUpgrade: foobar\n\n"
-    snooze
+    sleep 0.01
     assert_equal 'foobar', req.upgrade_protocol
   end
 end

data/tipi.gemspec

@@ -19,8 +19,8 @@ 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      'polyphony',          '~>0.55.0'
+  s.add_runtime_dependency      'qeweney',            '~>0.9.1'
   
   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.39'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.55.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.55.0
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.9.1
 - !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