tipi 0.30 → 0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92c33ccc40f7b8f4f53fded65ab5902c81bcf0a92598fa5b2be3ada409a78721
-  data.tar.gz: b4f80d28c10539b44d1554fbd8e640c253919070cc576efbf62249eee8efeeb7
+  metadata.gz: 8eb4db3e433119acc5b10688d6a558de425f8f4b390bbd280055bd9429acde60
+  data.tar.gz: 90f6dfc0ba6b99acb8b3d251845774f146641bbc922cd5b25658a7bf3fc97ef1
 SHA512:
-  metadata.gz: 6a5712289bb6adc18e4c6fa24495157c19c41831036adc2e5ef082a640b09df426d015de5f00cb48d1d78d0855ce078c1cc7f2c15a1cec24a68cf022d45f9eea
-  data.tar.gz: 55e627cb9a6e91a846460ee30f3480ad77e4cb9124a40cd2fc68bf9abba7d6ecdbc52530ac92271d78c4a75fc9654be706efb59dba491ebbc6bc70532bc42aaa
+  metadata.gz: 80aa5c2464a8812b79dc6fa15c0230dde2bb839f66737b1fac03f8c7d51fbf1bc6ba3f7f1ad1bc6882f6ad8184ecb614b44dd43cdc67a403ae30dac541137579
+  data.tar.gz: 8e77ba6c910898761ef63f435ad70e8bcd0f3f7ff14f5e86be2ea675c9387affa191a6ccc0c5f44565b6b8d1ea661606eb2e8a5c4cbb0ac4ed9119fa26828e27

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.31 2020-07-28
+
+* Fix websocket server code
+* Implement configuration layer (WIP)
+* Improve performance of rack adapter
+
 ## 0.30 2020-07-15
 
 * Rename project to Tipi

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    tipi (0.30)
+    tipi (0.31)
       http-2 (~> 0.10.0)
       http_parser.rb (~> 0.6.0)
-      polyphony (~> 0.43.5)
+      polyphony (~> 0.44)
       rack (>= 2.0.8, < 2.3.0)
       websocket (~> 1.2.8)
 
@@ -16,7 +16,7 @@ GEM
     docile (1.3.2)
     http-2 (0.10.2)
     http_parser.rb (0.6.0)
-    json (2.1.0)
+    json (2.3.1)
     localhost (1.1.4)
     minitest (5.11.3)
     minitest-reporters (1.4.2)
@@ -24,7 +24,7 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    polyphony (0.43.5)
+    polyphony (0.44.0)
     rack (2.2.3)
     rake (12.3.3)
     ruby-progressbar (1.10.1)

data/README.md

@@ -1,3 +1,5 @@
+<p align="center"><img src="docs/tipi-logo.png" /></p>
+
 # Tipi - the All-in-one Web Server for Ruby Apps
 
 [![Gem Version](https://badge.fury.io/rb/tipi.svg)](http://rubygems.org/gems/tipi)
@@ -14,9 +16,13 @@ reverse-proxy such as Nginx.
 
 ## Features
 
-* **Full-blown, integrated, high-performance HTTP 1 / HTTP 2 / WebSocket server
-  with TLS/SSL termination, automatic ALPN protocol selection, and body
-  streaming**.
+* High-performance, highly concurrent web server based on
+  [Polyphony](https://github.com/digital-fabric/polyphony)
+* Full support for HTTP, HTTP/2, WebSocket protocols
+* Built-in SSL termination for secure, encrypted connections
+* Automatic ALPN protocol selection
+* Request and response body streaming for efficient downloads and uploads
+* Full support for Rack-based apps
 
 ## Documentation
 

data/bin/tipi

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 
-require File.expand_path('../lib/tipi', __dir__)
-require File.expand_path('../lib/tipi/rack_adapter', __dir__)
+require 'bundler/setup'
+require 'polyphony'
+require File.expand_path('../lib/tipi/configuration', __dir__)
 
-app_path = ARGV.first || './config.ru'
-app = Tipi::RackAdapter.load(app_path)
-opts = { reuse_addr: true, dont_linger: true }
+config = {}
+#config[:forked] = 4
 
-puts "listening on port 1234"
-puts "pid: #{Process.pid}"
-Tipi.serve('0.0.0.0', 1234, opts, &app)
+configuration_manager = spin { Tipi::Configuration.supervise_config }
+
+configuration_manager << config
+configuration_manager.await

data/examples/hello.ru

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+run lambda { |env|
+  [
+        200,
+        {"Content-Type" => "text/plain"},
+        ["Hello, world!"]
+  ]
+}

data/examples/http_server_forked.rb

@@ -26,4 +26,4 @@ child_pids = []
   child_pids << pid
 end
 
-child_pids.each { |pid| Thread.current.agent.waitpid(pid) }
+child_pids.each { |pid| Thread.current.backend.waitpid(pid) }

data/examples/https_server_forked.rb

@@ -13,7 +13,7 @@ opts = {
   secure_context: authority.server_context
 }
 
-server = Polyphony::HTTP::Server.listen('0.0.0.0', 1234, opts)
+server = Tipi.listen('0.0.0.0', 1234, opts)
 
 puts 'Listening on port 1234'
 
@@ -29,4 +29,4 @@ child_pids = []
   child_pids << pid
 end
 
-child_pids.each { |pid| Thread.current.agent.waitpid(pid) }
+child_pids.each { |pid| Thread.current.backend.waitpid(pid) }

data/examples/rack_server.rb

@@ -4,7 +4,7 @@ require 'bundler/setup'
 require 'tipi'
 
 app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
-app = Polyphony::HTTP::Server::RackAdapter.load(app_path)
+app = Tipi::RackAdapter.load(app_path)
 opts = { reuse_addr: true, dont_linger: true }
 
 puts 'listening on port 1234'

data/examples/websocket_client.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+require 'websocket'
+
+::Exception.__disable_sanitized_backtrace__ = true
+
+class WebsocketClient
+  def initialize(url, headers = {})
+    @socket = TCPSocket.new('127.0.0.1', 1234)
+    do_handshake(url, headers)
+  end
+
+  def do_handshake(url, headers)
+    handshake = WebSocket::Handshake::Client.new(url: url, headers: headers)
+    @socket << handshake.to_s
+    @socket.read_loop do |data|
+      handshake << data
+      break if handshake.finished?
+    end
+    raise 'Websocket handshake failed' unless handshake.valid?
+    @version = handshake.version
+
+    @reader = WebSocket::Frame::Incoming::Client.new(version: @version)
+  end
+
+  def receive
+    loop do
+      data = @socket.readpartial(8192)
+      @reader << data
+      parsed = @reader.next
+      return parsed if parsed
+    end
+  end
+
+  def send(data)
+    frame = WebSocket::Frame::Outgoing::Client.new(
+      version: @version,
+      data: data,
+      type: :text
+    )
+    @socket << frame.to_s
+  end
+  alias_method :<<, :send
+
+  def close
+    @socket.close
+  end
+end
+
+
+(1..3).each do |i|
+  spin do
+    client = WebsocketClient.new('ws://127.0.0.1:1234/', { Cookie: "SESSIONID=#{i * 10}" })
+    (1..3).each do |j|
+      sleep rand(0.2..0.5)
+      client.send "Hello from client #{i} (#{j})"
+      puts "server reply: #{client.receive}"
+    end
+    client.close
+  end
+end
+
+suspend

data/examples/websocket_demo.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'polyphony', '~> 0.44'
+  gem 'tipi', '~> 0.31'
+end
+
+require 'tipi/websocket'
+
+class WebsocketClient
+  def initialize(url, headers = {})
+    @socket = TCPSocket.new('127.0.0.1', 1234)
+    do_handshake(url, headers)
+  end
+
+  def do_handshake(url, headers)
+    handshake = WebSocket::Handshake::Client.new(url: url, headers: headers)
+    @socket << handshake.to_s
+    @socket.read_loop do |data|
+      handshake << data
+      break if handshake.finished?
+    end
+    raise 'Websocket handshake failed' unless handshake.valid?
+    @version = handshake.version
+
+    @reader = WebSocket::Frame::Incoming::Client.new(version: @version)
+  end
+
+  def receive
+    loop do
+      data = @socket.readpartial(8192)
+      @reader << data
+      parsed = @reader.next
+      return parsed if parsed
+    end
+  end
+
+  def send(data)
+    frame = WebSocket::Frame::Outgoing::Client.new(
+      version: @version,
+      data: data,
+      type: :text
+    )
+    @socket << frame.to_s
+  end
+  alias_method :<<, :send
+
+  def close
+    @socket.close
+  end
+end
+
+server = spin do
+  websocket_handler = Tipi::Websocket.handler do |conn|
+    while (msg = conn.recv)
+      conn << "you said: #{msg}"
+    end
+  end
+
+  opts = { upgrade: { websocket: websocket_handler } }
+  puts 'Listening on port http://127.0.0.1:1234/'
+  Tipi.serve('0.0.0.0', 1234, opts) do |req|
+    req.respond("Hello world!\n")
+  end
+end
+
+sleep 0.01 # wait for server to start
+
+clients = (1..3).map do |i|
+  spin do
+    client = WebsocketClient.new('ws://127.0.0.1:1234/', { Cookie: "SESSIONID=#{i * 10}" })
+    (1..3).each do |j|
+      sleep rand(0.2..0.5)
+      client.send "Hello from client #{i} (#{j})"
+      puts "server reply: #{client.receive}"
+    end
+    client.close
+  end
+end
+
+Fiber.await(*clients)

data/examples/websocket_server.rb

@@ -2,6 +2,7 @@
 
 require 'bundler/setup'
 require 'tipi'
+require 'tipi/websocket'
 
 def ws_handler(conn)
   while (msg = conn.recv)
@@ -13,7 +14,7 @@ opts = {
   reuse_addr:  true,
   dont_linger: true,
   upgrade:     {
-    websocket: Polyphony::Websocket.handler(&method(:ws_handler))
+    websocket: Tipi::Websocket.handler(&method(:ws_handler))
   }
 }
 

data/lib/tipi.rb

@@ -3,6 +3,7 @@
 require 'polyphony'
 require_relative './tipi/http1_adapter'
 require_relative './tipi/http2_adapter'
+require_relative './tipi/configuration'
 
 module Tipi
   ALPN_PROTOCOLS = %w[h2 http/1.1].freeze

data/lib/tipi/configuration.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require_relative './handler'
+
+module Tipi
+  module Configuration
+    class << self
+      def supervise_config
+        current_runner = nil
+        while (config = receive)
+          old_runner, current_runner = current_runner, spin { run(config) }
+          old_runner&.stop
+        end
+      end
+      
+      def run(config)
+        start_listeners(config)
+        config[:forked] ? forked_supervise(config) : simple_supervise(config)
+      end
+
+      def start_listeners(config)
+        puts "listening on port 1234"
+        @server = Polyphony::Net.tcp_listen('0.0.0.0', 1234, { reuse_addr: true, dont_linger: true })
+      end
+
+      def simple_supervise(config)
+        virtual_hosts = setup_virtual_hosts(config)
+        start_acceptors(config, virtual_hosts)
+        suspend
+        # supervise(restart: true)
+      end
+      
+      def forked_supervise(config)
+        config[:forked].times do
+          spin { Polyphony.watch_process { simple_supervise(config) } }
+        end
+        suspend
+      end
+
+      def setup_virtual_hosts(config)
+        {
+          '*': Tipi::DefaultHandler.new(config)
+        }
+      end
+
+      def start_acceptors(config, virtual_hosts)
+        spin do
+          puts "pid: #{Process.pid}"
+          while (connection = @server.accept)
+            spin { virtual_hosts[:'*'].call(connection) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tipi/handler.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require_relative './rack_adapter'
+require_relative './http1_adapter'
+require_relative './http2_adapter'
+
+module Tipi
+  class DefaultHandler
+    def initialize(config)
+      @config = config
+
+      app_path = ARGV.first || './config.ru'
+      @app = Tipi::RackAdapter.load(app_path)
+    end
+
+    def call(socket)
+      socket.no_delay if socket.respond_to?(:no_delay)
+      adapter = protocol_adapter(socket, {})
+      adapter.each(&@app)
+    ensure
+      socket.close
+    end
+    
+    ALPN_PROTOCOLS = %w[h2 http/1.1].freeze
+    H2_PROTOCOL = 'h2'
+
+    def protocol_adapter(socket, opts)
+      use_http2 = socket.respond_to?(:alpn_protocol) &&
+                  socket.alpn_protocol == H2_PROTOCOL
+      
+      klass = use_http2 ? HTTP2Adapter : HTTP1Adapter
+      klass.new(socket, opts)
+    end
+  end
+end

data/lib/tipi/rack_adapter.rb

@@ -31,30 +31,41 @@ module Tipi
         src = IO.read(path)
         instance_eval(src, path, 1)
       end
+
+      RACK_ENV = {
+        'SCRIPT_NAME'                    => '',
+        'rack.version'                   => Rack::VERSION,
+        'SERVER_PORT'                    => '80', # ?
+        'rack.url_scheme'                => 'http', # ?
+        'rack.errors'                    => STDERR, # ?
+        'rack.multithread'               => false,
+        'rack.run_once'                  => false,
+        'rack.hijack?'                   => false,
+        'rack.hijack'                    => nil,
+        'rack.hijack_io'                 => nil,
+        'rack.session'                   => nil,
+        'rack.logger'                    => nil,
+        'rack.multipart.buffer_size'     => nil,
+        'rack.multipar.tempfile_factory' => nil
+      }
       
       def env(request)
-        {
-          'REQUEST_METHOD'                 => request.method,
-          'SCRIPT_NAME'                    => '',
-          'PATH_INFO'                      => request.path,
-          'QUERY_STRING'                   => request.query_string || '',
-          'SERVER_NAME'                    => request.headers['Host'], # ?
-          'SERVER_PORT'                    => '80', # ?
-          'rack.version'                   => Rack::VERSION,
-          'rack.url_scheme'                => 'https', # ?
-          'rack.input'                     => InputStream.new(request),
-          'rack.errors'                    => STDERR, # ?
-          'rack.multithread'               => false,
-          'rack.run_once'                  => false,
-          'rack.hijack?'                   => false,
-          'rack.hijack'                    => nil,
-          'rack.hijack_io'                 => nil,
-          'rack.session'                   => nil,
-          'rack.logger'                    => nil,
-          'rack.multipart.buffer_size'     => nil,
-          'rack.multipar.tempfile_factory' => nil
-        }.tap do |env|
-          request.headers.each { |k, v| env["HTTP_#{k.upcase}"] = v }
+        Hash.new do |h, k|
+          h[k] = env_value_from_request(request, k)
+        end
+      end
+
+      HTTP_HEADER_RE = /^HTTP_(.+)$/.freeze
+
+      def env_value_from_request(request, key)
+        case key
+        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 'rack.input'     then InputStream.new(request)
+        when HTTP_HEADER_RE   then request.headers[$1.downcase]
+        else                       RACK_ENV[key]
         end
       end
       

data/lib/tipi/version.rb

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

data/lib/tipi/websocket.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-export :handler
-
 require 'digest/sha1'
 require 'websocket'
 

data/test/helper.rb

@@ -27,7 +27,7 @@ class MiniTest::Test
     end
     Fiber.current.setup_main_fiber
     Fiber.current.instance_variable_set(:@auto_watcher, nil)
-    Thread.current.agent = Polyphony::LibevAgent.new
+    Thread.current.backend = Polyphony::Backend.new
     sleep 0
   end
 

data/test/test_http_server.rb

@@ -210,7 +210,6 @@ class HTTP1ServerTest < MiniTest::Test
     opts = {
       upgrade: {
         echo: lambda do |conn, _headers|
-          p :echo1
           conn << <<~HTTP.http_lines
             HTTP/1.1 101 Switching Protocols
             Upgrade: echo
@@ -218,13 +217,7 @@ class HTTP1ServerTest < MiniTest::Test
 
           HTTP
 
-          loop do
-            data = conn.readpartial(8192)
-            conn << data
-            snooze
-          rescue EOFError
-            break
-          end
+          conn.read_loop { |data| conn << data }
           done = true
         end
       }
@@ -277,7 +270,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection.close
     assert !done
     
-    10.times { snooze }
+    12.times { snooze }
     assert done
   end
 

data/tipi.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.executables   = ['tipi']
 
-  s.add_runtime_dependency      'polyphony',          '~>0.43.5'
+  s.add_runtime_dependency      'polyphony',          '~>0.44'
   
   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.30'
+  version: '0.31'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.43.5
+        version: '0.44'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.43.5
+        version: '0.44'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -175,9 +175,10 @@ files:
 - TODO.md
 - bin/tipi
 - docs/README.md
-- docs/summary.md
+- docs/tipi-logo.png
 - examples/cuba.ru
 - examples/hanami-api.ru
+- examples/hello.ru
 - examples/http_server.js
 - examples/http_server.rb
 - examples/http_server_forked.rb
@@ -192,11 +193,15 @@ files:
 - examples/rack_server.rb
 - examples/rack_server_https.rb
 - examples/rack_server_https_forked.rb
+- examples/websocket_client.rb
+- examples/websocket_demo.rb
 - examples/websocket_secure_server.rb
 - examples/websocket_server.rb
 - examples/ws_page.html
 - examples/wss_page.html
 - lib/tipi.rb
+- lib/tipi/configuration.rb
+- lib/tipi/handler.rb
 - lib/tipi/http1_adapter.rb
 - lib/tipi/http2_adapter.rb
 - lib/tipi/http2_stream.rb
@@ -234,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Tipi - the All-in-one Web Server for Ruby Apps

data/docs/summary.md

@@ -1,60 +0,0 @@
-# Table of contents
-
-* [Polyphony - Easy Concurrency for Ruby](../README.md)
-
-## Getting Started
-
-* [Installing](getting-started/installing.md)
-* [Tutorial](getting-started/tutorial.md)
-
-## Technical overview
-
-* [Design Principles](technical-overview/design-principles.md)
-* [Concurrency the Easy Way](technical-overview/concurrency.md)
-* [How Fibers are Scheduled](technical-overview/fiber-scheduling.md)
-* [Exception Handling](technical-overview/exception-handling.md)
-* [Frequently Asked Questions](technical-overview/faq.md)
-
-## How To
-
-* [Make an echo server](howto/echo-server.md)
-* [Make an HTTP server](howto/http-server.md)
-* [Make a Websocket server](howto/websocket-server.md)
-* [Use timers](howto/timers.md)
-* [Throttle recurrent operations](howto/throttle.md)
-* [Cancel ongoing operations](howto/cancel.md)
-* [Control coprocesses](howto/coprocesses.md)
-* [Synchronize concurrent operations](howto/synchronize.md)
-* [Perform CPU-bound operations](howto/cpu-bound.md)
-* [Control backpressure](howto/backpressure.md)
-* [Fork worker processes](howto/worker-processes.md)
-
-## Polyphony extensions
-
-* [Postgresql](extensions/pg)
-* [Redis](extensions/redis)
-* [IRB](extensions/irb)
-* [Throttlers](#)
-* [Resource Pools](#)
-* [Synchronisation](#)
-* [Web Server](user-guide/web-server.md)
-* [Websocket Server](#)
-* [Reactor API](#)
-
-## API Reference
-
-* [Polyphony::CancelScope](#)
-* [Polyphony::Coprocess](#)
-* [Gyro](#)
-* [Gyro::Async](#)
-* [Gyro::Child](#)
-* [Gyro::IO](#)
-* [Gyro::Timer](#)
-* [Kernel](#)
-* [Polyphony](#)
-* [Polyphony::Mutex](#)
-* [Polyphony::Pulser](#)
-* [Polyphony::ResourcePool](#)
-* [Polyphony::Throttler](#)
-
-## [Contributing to Polyphony](contributing.md)