tipi 0.41 → 0.46

data/df/server_utils.rb

@@ -7,24 +7,7 @@ require 'tipi/digital_fabric/executive'
 require 'json'
 require 'fileutils'
 require 'time'
-
-module ::Kernel
-  def trace(*args)
-    STDOUT.orig_write(format_trace(args))
-  end
-
-  def format_trace(args)
-    if args.first.is_a?(String)
-      if args.size > 1
-        format("%s: %p\n", args.shift, args)
-      else
-        format("%s\n", args.first)
-      end
-    else
-      format("%p\n", args.size == 1 ? args.first : args)
-    end
-  end
-end
+require 'polyphony/extensions/debug'
 
 FileUtils.cd(__dir__)
 
@@ -65,8 +48,10 @@ def listen_http
         # log("Done with HTTP connection", client: client)
         @service.decr_connection_count
       end
-    rescue => e
-      log("HTTP accept loop error", error: e, backtrace: e.backtrace)
+    rescue Polyphony::BaseException
+      raise
+    rescue Exception => e
+      log 'HTTP accept (unknown) error', error: e, backtrace: e.backtrace
     end
   end
 end
@@ -74,15 +59,19 @@ end
 CERTIFICATE_REGEXP = /(-----BEGIN CERTIFICATE-----\n[^-]+-----END CERTIFICATE-----\n)/.freeze
 
 def listen_https
-  spin('https_listener') do
+  spin(:https_listener) do
     private_key = OpenSSL::PKey::RSA.new IO.read('../../reality/ssl/privkey.pem')
     c = IO.read('../../reality/ssl/cacert.pem')
     certificates = c.scan(CERTIFICATE_REGEXP).map { |p|  OpenSSL::X509::Certificate.new(p.first) }
     ctx = OpenSSL::SSL::SSLContext.new
+    ctx.security_level = 0
     cert = certificates.shift
     log "SSL Certificate expires: #{cert.not_after.inspect}"
     ctx.add_certificate(cert, private_key, certificates)
-    ctx.ciphers = 'ECDH+aRSA'
+    # ctx.ciphers = 'ECDH+aRSA'
+    ctx.max_version = OpenSSL::SSL::TLS1_3_VERSION
+    ctx.min_version = OpenSSL::SSL::SSL3_VERSION
+    ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
     # TODO: further limit ciphers
     # ref: https://github.com/socketry/falcon/blob/3ec805b3ceda0a764a2c5eb68cde33897b6a35ff/lib/falcon/environments/tls.rb
@@ -99,7 +88,9 @@ def listen_https
     server = Polyphony::Net.tcp_listen('0.0.0.0', 10443, opts)
     id = 0
     loop do
-      client = server.accept
+      client = server.accept rescue nil
+      next unless client
+
       # log('Accept HTTPS client connection', client: client)
       spin("https#{id += 1}") do
         @service.incr_connection_count
@@ -110,10 +101,12 @@ def listen_https
         # log("Done with HTTP connection", client: client)
         @service.decr_connection_count
       end
-    rescue OpenSSL::SSL::SSLError, SystemCallError, TypeError => e
-      # log('HTTPS accept error', error: e, backtrace: e.backtrace)
-    rescue => e
-      log('HTTPS accept (unknown) error', error: e, backtrace: e.backtrace)
+    # rescue OpenSSL::SSL::SSLError, SystemCallError, TypeError => e
+    #   log('HTTPS accept error', error: e)
+    rescue Polyphony::BaseException
+      raise
+    rescue Exception => e
+      log 'HTTPS listener error: ', error: e, backtrace: e.backtrace
     end
   end
 end
@@ -126,13 +119,16 @@ def listen_unix
     socket = UNIXServer.new(UNIX_SOCKET_PATH)
 
     id = 0
-    socket.accept_loop do |client|
+    loop do
+      client = socket.accept
       # log('Accept Unix connection', client: client)
       spin("unix#{id += 1}") do
         Tipi.client_loop(client, {}) { |req| @service.http_request(req, true) }
       end
-    rescue OpenSSL::SSL::SSLError
-      # disregard
+    rescue Polyphony::BaseException
+      raise
+    rescue Exception => e
+      log 'Unix accept error', error: e, backtrace: e.backtrace
     end
   end
 end
@@ -141,33 +137,39 @@ def listen_df
   spin(:df_listener) do
     opts = {
       reuse_addr:  true,
+      reuse_port:  true,
       dont_linger: true,
     }
     log('Listening for DF connections on localhost:4321')
     server = Polyphony::Net.tcp_listen('0.0.0.0', 4321, opts)
 
     id = 0
-    server.accept_loop do |client|
+    loop do
+      client = server.accept
       # log('Accept DF connection', client: client)
       spin("df#{id += 1}") do
         Tipi.client_loop(client, {}) { |req| @service.http_request(req, true) }
       end
-    rescue OpenSSL::SSL::SSLError
-      # disregard
+    rescue Polyphony::BaseException
+      raise
+    rescue Exception => e
+      log 'DF accept (unknown) error', error: e, backtrace: e.backtrace
     end
   end
 end
 
-# Thread.backend.trace_proc = proc do |event, fiber, value, pri|
-#   fiber_id = fiber.tag || fiber.inspect
-#   case event
-#   when :fiber_schedule
-#     log format("=> %s %s %s %s", event, fiber_id, value.inspect, pri ? '' : '(priority)')
-#   when :fiber_run
-#     log format("=> %s %s %s", event, fiber_id, value.inspect)
-#   when :fiber_create, :fiber_terminate
-#     log format("=> %s %s", event, fiber_id)
-#   else
-#     log format("=> %s", event)
-#   end
-# end
+if ENV['TRACE'] == '1'
+  Thread.backend.trace_proc = proc do |event, fiber, value, pri|
+    fiber_id = fiber.tag || fiber.inspect
+    case event
+    when :fiber_schedule
+      log format("=> %s %s %s %s", event, fiber_id, value.inspect, pri ? '(priority)' : '')
+    when :fiber_run
+      log format("=> %s %s %s", event, fiber_id, value.inspect)
+    when :fiber_create, :fiber_terminate
+      log format("=> %s %s", event, fiber_id)
+    else
+      log format("=> %s", event)
+    end
+  end
+end

data/examples/full_service.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'tipi'
+
+::Exception.__disable_sanitized_backtrace__ = true
+
+certificate_db_path = File.expand_path('certificate_store.db', __dir__)
+certificate_store = Tipi::ACME::SQLiteCertificateStore.new(certificate_db_path)
+
+Tipi.full_service(
+  certificate_store: certificate_store
+) { |req| req.respond('Hello, world!') }

data/examples/hello.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+run { |req|
+  req.respond('Hello, world!')
+}

data/examples/hello.ru

@@ -2,8 +2,8 @@
 
 run lambda { |env|
   [
-        200,
-        {"Content-Type" => "text/plain"},
-        ["Hello, world!"]
+    200,
+    {"Content-Type" => "text/plain"},
+    ["Hello, world!"]
   ]
 }

data/examples/http1_parser.rb

@@ -31,23 +31,25 @@ f = spin do
     break unless headers
     trace headers
 
-    body = parser.read_body(headers)
+    body = parser.read_body
     trace "body: #{body ? body.bytesize : 0} bytes"
+    trace body if body && body.bytesize < 80
   end
 end
 
 o << "GET /a HTTP/1.1\r\n\r\n"
-o << "GET /b HTTP/1.1\r\n\r\n"
+
+# o << "GET /a HTTP/1.1\r\nContent-Length: 0\r\n\r\n"
 
 # o << "GET / HTTP/1.1\r\nHost: localhost:10080\r\nUser-Agent: curl/7.74.0\r\nAccept: */*\r\n\r\n"
 
-# o << "post /?q=time&blah=blah HTTP/1\r\nHost: dev.realiteq.net\r\n\r\n"
+o << "post /?q=time&blah=blah HTTP/1\r\nTransfer-Encoding: chunked\r\n\r\na\r\nabcdefghij\r\n0\r\n\r\n"
+
+data = " " * 4000000
+o << "get /?q=time HTTP/1.1\r\nContent-Length: #{data.bytesize}\r\n\r\n#{data}"
 
-# data = " " * 4000000
-# o << "get /?q=time HTTP/1.1\r\nContent-Length: #{data.bytesize}\r\n\r\n#{data}"
+o << "get /?q=time HTTP/1.1\r\nCookie: foo\r\nCookie: bar\r\n\r\n"
 
-# o << "get /?q=time HTTP/1.1\r\nCookie: foo\r\nCookie: bar\r\n\r\n"
+o.close
 
-# o.close
- 
 f.await

data/examples/http_server.js

@@ -12,7 +12,7 @@ const server = http.createServer((req, res) => {
   //   request_url: req.url,
   //   headers: req.headers
   // };
-  
+
   // res.writeHead(200, { 'Content-Type': 'application/json' });
   // res.end(JSON.stringify(requestCopy));
 

data/examples/http_server.rb

@@ -14,7 +14,7 @@ puts 'Listening on port 10080...'
 # GC.disable
 # Thread.current.backend.idle_gc_period = 60
 
-spin_loop(interval: 10) { p Thread.current.fiber_scheduling_stats }
+spin_loop(interval: 10) { p Thread.backend.stats }
 
 spin_loop(interval: 10) do
   GC.compact
@@ -29,6 +29,9 @@ spin do
       sleep 1
       req.send_chunk("bar\n")
       req.finish
+    elsif req.path == '/upload'
+      body = req.read
+      req.respond("Body: #{body.inspect} (#{body.bytesize} bytes)")
     else
       req.respond("Hello world!\n")
     end

data/examples/http_server_graceful.rb

@@ -24,4 +24,4 @@ puts "pid: #{Process.pid}"
 puts 'Send HUP to stop gracefully'
 puts 'Listening on port 1234...'
 
-suspend
+suspend

data/examples/https_server.rb

@@ -10,24 +10,50 @@ authority = Localhost::Authority.fetch
 opts = {
   reuse_addr:     true,
   dont_linger:    true,
-  secure_context: authority.server_context
 }
 
 puts "pid: #{Process.pid}"
 puts 'Listening on port 1234...'
-Tipi.serve('0.0.0.0', 1234, opts) do |req|
-  p path: req.path
-  if req.path == '/stream'
-    req.send_headers('Foo' => 'Bar')
-    sleep 0.5
-    req.send_chunk("foo\n")
-    sleep 0.5
-    req.send_chunk("bar\n", done: true)
-  else
-    req.respond("Hello world!\n")
+
+ctx = authority.server_context
+server = Polyphony::Net.tcp_listen('0.0.0.0', 1234, opts)
+loop do
+  socket = server.accept
+  client = OpenSSL::SSL::SSLSocket.new(socket, ctx)
+  client.sync_close = true
+  spin do
+    state = {}
+    accept_thread = Thread.new do
+      puts "call client accept"
+      client.accept
+      state[:result] = :ok
+    rescue Exception => e
+      puts error: e
+      state[:result] = e
+    end
+    "wait for accept thread"
+    accept_thread.join
+    "accept thread done"
+    if state[:result].is_a?(Exception)
+      puts "Exception in SSL handshake: #{state[:result].inspect}"
+      next
+    end
+    Tipi.client_loop(client, opts) do |req|
+      p path: req.path
+      if req.path == '/stream'
+        req.send_headers('Foo' => 'Bar')
+        sleep 0.5
+        req.send_chunk("foo\n")
+        sleep 0.5
+        req.send_chunk("bar\n", done: true)
+      elsif req.path == '/upload'
+        body = req.read
+        req.respond("Body: #{body.inspect} (#{body.bytesize} bytes)")
+      else
+        req.respond("Hello world!\n")
+      end
+    end
+  ensure
+    client ? client.close : socket.close
   end
-  # req.send_headers
-  # req.send_chunk("Method: #{req.method}\n")
-  # req.send_chunk("Path: #{req.path}\n")
-  # req.send_chunk("Query: #{req.query.inspect}\n", done: true)
 end

data/examples/rack_server_forked.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'tipi'
+
+app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
+unless File.file?(app_path)
+  STDERR.puts "Please provide rack config file (there are some in the examples directory.)"
+  exit!
+end
+
+app = Tipi::RackAdapter.load(app_path)
+opts = { reuse_addr: true, dont_linger: true }
+
+server = Tipi.listen('0.0.0.0', 1234, opts)
+puts 'listening on port 1234'
+
+child_pids = []
+4.times do
+  child_pids << Polyphony.fork do
+    puts "forked pid: #{Process.pid}"
+    server.each(&app)
+  end
+end
+
+child_pids.each { |pid| Thread.current.backend.waitpid(pid) }

data/examples/rack_server_https_forked.rb

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

data/examples/servername_cb.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'openssl'
+require 'fiber'
+
+ctx = OpenSSL::SSL::SSLContext.new
+
+f = Fiber.new { |peer| loop { p peer: peer; _name, peer = peer.transfer nil } }
+ctx.servername_cb = proc { |_socket, name|
+  p servername_cb: name
+  f.transfer([name, Fiber.current]).tap { |r| p result: r }
+}
+
+socket = Socket.new(:INET, :STREAM).tap do |s|
+  s.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1)
+  s.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEPORT, 1)
+  s.bind(Socket.sockaddr_in(12345, '0.0.0.0'))
+  s.listen(Socket::SOMAXCONN)
+end
+server = OpenSSL::SSL::SSLServer.new(socket, ctx)
+
+Thread.new do
+  sleep 0.5
+  socket = TCPSocket.new('127.0.0.1', 12345)
+  client = OpenSSL::SSL::SSLSocket.new(socket)
+  client.hostname = 'example.com'
+  p client: client
+  client.connect
+rescue => e
+  p client_error: e
+end
+
+while true
+  conn = server.accept
+  p accepted: conn
+  break
+end

data/examples/websocket_demo.rb

@@ -26,7 +26,7 @@ class WebsocketClient
   def receive
     parsed = @reader.next
     return parsed if parsed
-    
+
     @socket.read_loop do |data|
       @reader << data
       parsed = @reader.next