tipi 0.31 → 0.36

data/lib/tipi/http2_adapter.rb

@@ -15,6 +15,7 @@ module Tipi
       @conn = conn
       @opts = opts
       @upgrade_headers = upgrade_headers
+      @first = true
       
       @interface = ::HTTP2::Server.new
       @connection_fiber = Fiber.current
@@ -37,7 +38,7 @@ module Tipi
     
     def upgrade
       @conn << UPGRADE_MESSAGE
-      settings = @upgrade_headers['HTTP2-Settings']
+      settings = @upgrade_headers['http2-settings']
       Fiber.current.schedule(nil)
       @interface.upgrade(settings, @upgrade_headers, '')
     ensure
@@ -49,7 +50,7 @@ module Tipi
       @interface.on(:stream) { |stream| start_stream(stream, &block) }
       upgrade if @upgrade_headers
       
-      @conn.read_loop(&@interface.method(:<<))
+      @conn.recv_loop(&@interface.method(:<<))
     rescue SystemCallError, IOError
       # ignore
     ensure
@@ -57,7 +58,8 @@ module Tipi
     end
     
     def start_stream(stream, &block)
-      stream = HTTP2StreamHandler.new(stream, &block)
+      stream = HTTP2StreamHandler.new(stream, @conn, @first, &block)
+      @first = nil if @first
       @streams[stream] = true
     end
     

data/lib/tipi/http2_stream.rb

@@ -1,15 +1,18 @@
 # frozen_string_literal: true
 
 require 'http/2'
-require_relative './request'
+require 'qeweney/request'
 
 module Tipi
   # Manages an HTTP 2 stream
   class HTTP2StreamHandler
     attr_accessor :__next__
+    attr_reader :conn
     
-    def initialize(stream, &block)
+    def initialize(stream, conn, first, &block)
       @stream = stream
+      @conn = conn
+      @first = first
       @connection_fiber = Fiber.current
       @stream_fiber = spin { |req| handle_request(req, &block) }
       
@@ -43,7 +46,11 @@ module Tipi
     end
     
     def on_headers(headers)
-      @request = Request.new(headers.to_h, self)
+      @request = Qeweney::Request.new(headers.to_h, self)
+      if @first
+        @request.headers[':first'] = true
+        @first = false
+      end
       @stream_fiber.schedule @request
     end
     
@@ -96,7 +103,7 @@ module Tipi
     
     # response API
     def respond(chunk, headers)
-      headers[':status'] ||= '200'
+      headers[':status'] ||= Qeweney::Status::OK
       @stream.headers(headers, end_stream: false)
       @stream.data(chunk, end_stream: true)
       @headers_sent = true
@@ -105,21 +112,26 @@ module Tipi
     def send_headers(headers, empty_response = false)
       return if @headers_sent
       
-      headers[':status'] ||= (empty_response ? 204 : 200).to_s
+      headers[':status'] ||= (empty_response ? Qeweney::Status::NO_CONTENT : Qeweney::Status::OK).to_s
       @stream.headers(headers, end_stream: false)
       @headers_sent = true
     end
     
     def send_chunk(chunk, done: false)
       send_headers({}, false) unless @headers_sent
-      @stream.data(chunk, end_stream: done)
+      
+      if chunk
+        @stream.data(chunk, end_stream: done)
+      elsif done
+        @stream.close
+      end
     end
     
     def finish
       if @headers_sent
         @stream.close
       else
-        headers[':status'] ||= '204'
+        headers[':status'] ||= Qeweney::Status::NO_CONTENT
         @stream.headers(headers, end_stream: true)
       end
     end

data/lib/tipi/rack_adapter.rb

@@ -62,16 +62,24 @@ module Tipi
         when 'REQUEST_METHOD' then request.method
         when 'PATH_INFO'      then request.path
         when 'QUERY_STRING'   then request.query_string || ''
-        when 'SERVER_NAME'    then request.headers['Host']
+        when 'SERVER_NAME'    then request.headers['host']
         when 'rack.input'     then InputStream.new(request)
         when HTTP_HEADER_RE   then request.headers[$1.downcase]
         else                       RACK_ENV[key]
         end
       end
-      
+
       def respond(request, (status_code, headers, body))
         headers[':status'] = status_code.to_s
-        request.respond(body.first, headers)
+
+        content =
+          if body.respond_to?(:to_path)
+            File.open(body.to_path, 'rb') { |f| f.read }
+          else
+            body.first
+          end
+
+        request.respond(content, headers)
       end
     end
   end

data/lib/tipi/version.rb

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

data/lib/tipi/websocket.rb

@@ -7,13 +7,13 @@ module Tipi
   # Websocket connection
   class Websocket
     def self.handler(&block)
-      proc { |client, header|
-        block.(new(client, header))
+      proc { |conn, headers|
+        block.(new(conn, headers))
       }
     end  
 
-    def initialize(client, headers)
-      @client = client
+    def initialize(conn, headers)
+      @conn = conn
       @headers = headers
       setup(headers)
     end
@@ -28,22 +28,38 @@ module Tipi
     HTTP
     
     def setup(headers)
-      key = headers['Sec-WebSocket-Key']
-      @version = headers['Sec-WebSocket-Version'].to_i
+      key = headers['sec-websocket-key']
+      @version = headers['sec-websocket-version'].to_i
       accept = Digest::SHA1.base64digest([key, S_WS_GUID].join)
-      @client << format(UPGRADE_RESPONSE, accept: accept)
+      @conn << format(UPGRADE_RESPONSE, accept: accept)
       
       @reader = ::WebSocket::Frame::Incoming::Server.new(version: @version)
     end
     
     def recv
-      loop do
-        data = @client.readpartial(8192)
-        break nil unless data
-        
+      if (msg = @reader.next)
+        return msg.to_s
+      end
+    
+      @conn.recv_loop do |data|
         @reader << data
         if (msg = @reader.next)
-          break msg.to_s
+          return msg.to_s
+        end
+      end
+
+      nil
+    end
+
+    def recv_loop
+      if (msg = @reader.next)
+        yield msg.to_s
+      end
+
+      @conn.recv_loop do |data|
+        @reader << data
+        while (msg = @reader.next)
+          yield msg.to_s
         end
       end
     end
@@ -52,8 +68,12 @@ module Tipi
       frame = ::WebSocket::Frame::Outgoing::Server.new(
         version: @version, data: data, type: :text
       )
-      @client << frame.to_s
+      @conn << frame.to_s
     end
     alias_method :<<, :send
+
+    def close
+      @conn.close
+    end
   end
 end

data/test/helper.rb

@@ -33,8 +33,7 @@ class MiniTest::Test
 
   def teardown
     # puts "* teardown #{self.name.inspect} Fiber.current: #{Fiber.current.inspect}"
-    Fiber.current.terminate_all_children
-    Fiber.current.await_all_children
+    Fiber.current.shutdown_all_children
   rescue => e
     puts e
     puts e.backtrace.join("\n")

data/test/test_http_server.rb

@@ -25,7 +25,9 @@ class IO
     eg(
       :read        => ->(*args) { input.read(*args) },
       :read_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
+      :recv_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
       :readpartial => ->(*args) { input.readpartial(*args) },
+      :recv        => ->(*args) { input.readpartial(*args) },
       :<<          => ->(*args) { output.write(*args) },
       :write       => ->(*args) { output.write(*args) },
       :close       => -> { output.close },
@@ -89,7 +91,6 @@ class HTTP1ServerTest < MiniTest::Test
   end
 
   def test_that_server_maintains_connection_when_using_keep_alives
-    puts 'test_that_server_maintains_connection_when_using_keep_alives'
     @server, connection = spin_server do |req|
       req.respond('Hi', {})
     end
@@ -121,7 +122,7 @@ class HTTP1ServerTest < MiniTest::Test
 
   def test_pipelining_client
     @server, connection = spin_server do |req|
-      if req.headers['Foo'] == 'bar'
+      if req.headers['foo'] == 'bar'
         req.respond('Hello, foobar!', {})
       else
         req.respond('Hello, world!', {})

data/test/test_request.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+require 'tipi'
+
+class String
+  def http_lines
+    gsub "\n", "\r\n"
+  end
+end
+
+class IO
+  # Creates two mockup sockets for simulating server-client communication
+  def self.server_client_mockup
+    server_in, client_out = IO.pipe
+    client_in, server_out = IO.pipe
+
+    server_connection = mockup_connection(server_in, server_out, client_out)
+    client_connection = mockup_connection(client_in, client_out, server_out)
+
+    [server_connection, client_connection]
+  end
+
+  def self.mockup_connection(input, output, output2)
+    eg(
+      :read        => ->(*args) { input.read(*args) },
+      :read_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
+      :recv_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
+      :readpartial => ->(*args) { input.readpartial(*args) },
+      :recv        => ->(*args) { input.readpartial(*args) },
+      :<<          => ->(*args) { output.write(*args) },
+      :write       => ->(*args) { output.write(*args) },
+      :close       => -> { output.close },
+      :eof?        => -> { output2.closed? }
+    )
+  end
+end
+
+class RequestHeadersTest < MiniTest::Test
+  def teardown
+    @server&.interrupt if @server&.alive?
+    snooze
+    super
+  end
+
+  def spin_server(opts = {}, &handler)
+    server_connection, client_connection = IO.server_client_mockup
+    coproc = spin do
+      Tipi.client_loop(server_connection, opts, &handler)
+    end
+    [coproc, client_connection, server_connection]
+  end
+
+  def test_request_headers
+    req = nil
+    @server, connection = spin_server do |r|
+      req = r
+      req.respond('Hello, world!')
+    end
+
+    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
+
+    assert_kind_of Qeweney::Request, req
+    assert_equal 'blah.com', req.headers['host']
+    assert_equal 'bar', req.headers['foo']
+    assert_equal ['1', '3', '2'], req.headers['hi']
+    assert_equal 'get', req.headers[':method']
+    assert_equal '/titi', req.headers[':path']
+  end
+
+  def test_request_host
+    req = nil
+    @server, connection = spin_server do |r|
+      req = r
+      req.respond('Hello, world!')
+    end
+
+    connection << "GET /titi HTTP/1.1\nHost: blah.com\nFoo: bar\nhi: 1\nHi: 2\nhi: 3\n\n"
+    snooze
+    assert_equal 'blah.com', req.host
+  end
+
+  def test_request_connection
+    req = nil
+    @server, connection = spin_server do |r|
+      req = r
+      req.respond('Hello, world!')
+    end
+
+    connection << "GET /titi HTTP/1.1\nConnection: keep-alive\nFoo: bar\nhi: 1\nHi: 2\nhi: 3\n\n"
+    snooze
+    assert_equal 'keep-alive', req.connection
+  end
+
+  def test_request_upgrade_protocol
+    req = nil
+    @server, connection = spin_server do |r|
+      req = r
+      req.respond('Hello, world!')
+    end
+
+    connection << "GET /titi HTTP/1.1\nConnection: upgrade\nUpgrade: foobar\n\n"
+    snooze
+    assert_equal 'foobar', req.upgrade_protocol
+  end
+end

data/tipi.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.licenses    = ['MIT']
   s.summary     = 'Tipi - the All-in-one Web Server for Ruby Apps'
   s.author      = 'Sharon Rosner'
-  s.email       = 'ciconia@gmail.com'
+  s.email       = 'sharon@noteflakes.com'
   s.files       = `git ls-files`.split
   s.homepage    = 'http://github.com/digital-fabric/tipi'
   s.metadata    = {
@@ -19,13 +19,17 @@ Gem::Specification.new do |s|
 
   s.executables   = ['tipi']
 
-  s.add_runtime_dependency      'polyphony',          '~>0.44'
+  s.add_runtime_dependency      'polyphony',          '~>0.51.0'
+  s.add_runtime_dependency      'qeweney',            '~>0.3'
   
   s.add_runtime_dependency      'http_parser.rb',     '~>0.6.0'
   s.add_runtime_dependency      'http-2',             '~>0.10.0'
   s.add_runtime_dependency      'rack',               '>=2.0.8', '<2.3.0'
   s.add_runtime_dependency      'websocket',          '~>1.2.8'
-  
+
+  # for digital fabric
+  s.add_runtime_dependency      'msgpack',            '~>1.4.2'
+
   s.add_development_dependency  'rake',               '~>12.3.3'
   s.add_development_dependency  'localhost',          '~>1.1.4'
   s.add_development_dependency  'minitest',           '~>5.11.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tipi
 version: !ruby/object:Gem::Version
-  version: '0.31'
+  version: '0.36'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: 0.51.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: 0.51.0
+- !ruby/object:Gem::Dependency
+  name: qeweney
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.8
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +185,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.17.1
 description: 
-email: ciconia@gmail.com
+email: sharon@noteflakes.com
 executables:
 - tipi
 extensions: []
@@ -174,18 +202,32 @@ files:
 - Rakefile
 - TODO.md
 - bin/tipi
+- df/agent.rb
+- df/etc_benchmark.rb
+- df/multi_agent_supervisor.rb
+- df/multi_client.rb
+- df/routing_benchmark.rb
+- df/sample_agent.rb
+- df/server.rb
+- df/sse_page.html
+- df/stress.rb
+- df/ws_page.html
 - docs/README.md
 - docs/tipi-logo.png
 - examples/cuba.ru
 - examples/hanami-api.ru
 - examples/hello.ru
+- examples/http_request_ws_server.rb
 - examples/http_server.js
 - examples/http_server.rb
 - examples/http_server_forked.rb
+- examples/http_server_form.rb
 - examples/http_server_graceful.rb
 - examples/http_server_simple.rb
 - examples/http_server_throttled.rb
+- examples/http_server_throttled_accept.rb
 - examples/http_server_timeout.rb
+- examples/http_unix_socket_server.rb
 - examples/http_ws_server.rb
 - examples/https_server.rb
 - examples/https_server_forked.rb
@@ -193,6 +235,7 @@ files:
 - examples/rack_server.rb
 - examples/rack_server_https.rb
 - examples/rack_server_https_forked.rb
+- examples/routing_server.rb
 - examples/websocket_client.rb
 - examples/websocket_demo.rb
 - examples/websocket_secure_server.rb
@@ -200,13 +243,21 @@ files:
 - examples/ws_page.html
 - examples/wss_page.html
 - lib/tipi.rb
+- lib/tipi/config_dsl.rb
 - lib/tipi/configuration.rb
+- lib/tipi/digital_fabric.rb
+- lib/tipi/digital_fabric/agent.rb
+- lib/tipi/digital_fabric/agent_proxy.rb
+- lib/tipi/digital_fabric/executive.rb
+- lib/tipi/digital_fabric/executive/index.html
+- lib/tipi/digital_fabric/protocol.rb
+- lib/tipi/digital_fabric/request_adapter.rb
+- lib/tipi/digital_fabric/service.rb
 - lib/tipi/handler.rb
 - lib/tipi/http1_adapter.rb
 - lib/tipi/http2_adapter.rb
 - lib/tipi/http2_stream.rb
 - lib/tipi/rack_adapter.rb
-- lib/tipi/request.rb
 - lib/tipi/version.rb
 - lib/tipi/websocket.rb
 - test/coverage.rb
@@ -214,6 +265,7 @@ files:
 - test/helper.rb
 - test/run.rb
 - test/test_http_server.rb
+- test/test_request.rb
 - tipi.gemspec
 homepage: http://github.com/digital-fabric/tipi
 licenses:
@@ -239,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Tipi - the All-in-one Web Server for Ruby Apps