tp2 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae8cadc9d8c02c88322e7576695b2b3d671c236dfb57125062c61eef9fff67fe
-  data.tar.gz: edc9d28d07f496aff7e366e606227854756af7604a465254161cb0cb06e4bfd9
+  metadata.gz: 75f66b5020339be69ee5ee0122eea1673a4f96330cedfec95cde805ef43b9221
+  data.tar.gz: efc072f110cacc703c6ae75f4bade2a0753c73ecffae0f3055f6346eb165c79d
 SHA512:
-  metadata.gz: 1966581cc85753018ccc6996751e235c90e7f12d06bcc73d02f11b73f4e95fbe97c3428dbb87dd3bdeeee9336a0719eaf8307c04c8be7825980e7c110cfe50c9
-  data.tar.gz: f564f9845b1733b8978d6a8e58a8ac8ab77bfcdf64bb12a4c7cdf69f0eff935a724ed9425eb6df299e467620ce5aa4d0fbf8cca6581019858c9650f8c632f242
+  metadata.gz: 5d522b6958b99135fe730b514d30ec8be9e18e01cabce1892e188ca2c255c5f963c4fc6ecf6c6b6f82b0c7ef9fc10c56dd2020a57bfbf9ea7abf27b3a3c88d2b
+  data.tar.gz: 64a166087f1bae5a36f648ae2068ffa731fc4ecba6e77c400a311fc8be82eea795cf25b640f94f91731d7d3d7484645837b462a0058159a3eb68f2787e54e8d5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 0.8 2025-06-07
+
+- Add silent mode
+- Add basic request logging
+- Update UringMachine
+
 # Version 0.7.1 2025-06-07
 
 - Update UringMachine

data/bin/tp2

@@ -4,8 +4,10 @@
 require "tp2"
 require "optparse"
 
-
-opts = {}
+opts = {
+  banner: true,
+  log: true
+}
 
 parser = OptionParser.new do |o|
   o.banner = "Usage: tp2 [options]"
@@ -28,6 +30,11 @@ parser = OptionParser.new do |o|
     opts[:bind] << it
   }
 
+  o.on("-s", "--silent", "Silent mode") {
+    opts[:banner] = false
+    opts[:log] = false
+  }
+
   o.on("-h", "--help", "Show this help message") do
     puts o
     exit
@@ -83,5 +90,4 @@ end
 
 detect_app(opts) if !opts[:app_type]
 
-puts TP2::BANNER
 TP2.run(opts)

data/examples/app.rb

@@ -2,8 +2,10 @@
 
 require 'bundler/setup'
 require 'tp2'
+require 'json'
 
 TP2.config do |req|
-  req.respond('Hello, world!')
+  body = req.headers.to_json
+  req.respond(body, 'Content-Type' => 'application/json')
 end
 TP2.run

data/lib/tp2/http1_adapter.rb

@@ -7,21 +7,27 @@ module TP2
   class HTTP1Adapter
     attr_reader :fd
 
-    def initialize(machine, fd, &app)
+    def initialize(machine, fd, opts, &app)
       @machine = machine
       @fd = fd
+      @opts = opts
       @stream = UM::Stream.new(machine, fd)
       @app = app
+
+      @done = nil
+      @response_headers = nil
     end
 
     def run
       while true
+        @done = nil
+        @response_headers = nil
         persist = serve_request
         break if !persist
       end
     rescue UM::Terminate
-      # do nothing
-    rescue => e
+      # terminated
+    rescue Exception => e
       puts '!' * 40
       p e
       puts e.backtrace.join("\n")
@@ -86,9 +92,9 @@ module TP2
     # @param request [Qeweney::Request] HTTP request
     # @param body [String] response body
     # @param headers
-    def respond(_request, body, headers)
+    def respond(request, body, headers)
       formatted_headers = format_headers(headers, body, false)
-      # request.tx_incr(formatted_headers.bytesize + (body ? body.bytesize : 0))
+      request.tx_incr(formatted_headers.bytesize + (body ? body.bytesize : 0))
       if body
         buf = formatted_headers + body
         @machine.send(@fd, buf, buf.bytesize, SEND_FLAGS)
@@ -96,6 +102,9 @@ module TP2
       else
         @machine.send(@fd, formatted_headers, formatted_headers.bytesize, SEND_FLAGS)
       end
+      log(request, headers) if @opts[:log]
+      @done = true
+      @response_headers = headers
     end
 
     # Sends response headers. If empty_response is truthy, the response status
@@ -107,9 +116,10 @@ module TP2
     # @return [void]
     def send_headers(request, headers, empty_response: false, chunked: true)
       formatted_headers = format_headers(headers, !empty_response, http1_1?(request) && chunked)
-      # request.tx_incr(formatted_headers.bytesize)
+      request.tx_incr(formatted_headers.bytesize)
       #
       @machine.send(@fd, formatted_headers, formatted_headers.bytesize, SEND_FLAGS)
+      @response_headers = headers
     end
 
     # Sends a response body chunk. If no headers were sent, default headers are
@@ -119,26 +129,50 @@ module TP2
     # @param chunk [String] response body chunk
     # @param done [boolean] whether the response is completed
     # @return [void]
-    def send_chunk(_request, chunk, done: false)
+    def send_chunk(request, chunk, done: false)
       data = +''
       data << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n" if chunk
       data << "0\r\n\r\n" if done
       return if data.empty?
 
-      # request.tx_incr(data.bytesize)
+      request.tx_incr(data.bytesize)
       @machine.send(@fd, data, data.bytesize, SEND_FLAGS)
+      if done && !@done
+        log(request, @response_headers) if @opts[:log]
+        @done = true
+      end
     end
 
+    EMPTY_CHUNK = "0\r\n\r\n"
+    EMPTY_CHUNK_LEN = EMPTY_CHUNK.bytesize
+
     # Finishes the response to the current request. If no headers were sent,
     # default headers are sent using #send_headers.
     # @return [void]
-    def finish(_request)
-      # request.tx_incr(5)
-      @machine.send(@fd, "0\r\n\r\n", "0\r\n\r\n".bytesize, SEND_FLAGS)
+    def finish(request)
+      request.tx_incr(EMPTY_CHUNK_LEN)
+      @machine.send(@fd, EMPTY_CHUNK, EMPTY_CHUNK_LEN, SEND_FLAGS)
+      if !@done
+        log(request, @response_headers) if @opts[:log]
+        @done = true
+      end
     end
 
     private
 
+    def log(request, response_headers)
+      request_headers = request.headers
+      str = format(
+        "%<stamp>s %<method>s %<path>s %<status>s %<tx>d\n",
+        stamp:  Time.now.strftime('%Y-%m-%d %H:%M:%S.%3N'),
+        method: request_headers[':method'].upcase,
+        path:   request_headers[':path'],
+        status: @status,
+        tx:     request_headers[':tx']
+      )
+      @machine.write_async(1, str)
+    end
+
     RE_REQUEST_LINE = /^([a-z]+)\s+([^\s]+)\s+(http\/[0-9\.]{1,3})/i.freeze
     RE_HEADER_LINE = /^([a-z0-9\-]+)\:\s+(.+)/i.freeze
     MAX_REQUEST_LINE_LEN = 1 << 14 # 16KB
@@ -237,9 +271,8 @@ module TP2
     # @param chunked [boolean] whether to use chunked transfer encoding
     # @return [String] formatted response headers
     def format_headers(headers, body, chunked)
-      status = headers[':status']
-      status ||= (body ? Qeweney::Status::OK : Qeweney::Status::NO_CONTENT)
-      lines = format_status_line(body, status, chunked)
+      @status = headers[':status'] || (body ? Qeweney::Status::OK : Qeweney::Status::NO_CONTENT)
+      lines = format_status_line(body, @status, chunked)
       headers.each do |k, v|
         next if k =~ INTERNAL_HEADER_REGEXP
 

data/lib/tp2/server.rb

@@ -17,7 +17,7 @@ module TP2
 
     def self.tp2_app(opts)
       if opts[:app_location]
-        puts "Loading app at #{opts[:app_location]}"
+        puts "Loading app at #{opts[:app_location]}" if opts[:log]
         require opts[:app_location]
 
         opts.merge!(TP2.config)
@@ -67,7 +67,7 @@ module TP2
         @accept_fibers << @machine.spin { accept_incoming(fd) }
       end
       bind_string = bind_info.map { it.join(':') }.join(", ")
-      puts "Listening on #{bind_string}"
+      @machine.puts("Listening on #{bind_string}") if @opts[:log]
       
       # map fibers
       @connection_fiber_map = {}
@@ -102,7 +102,7 @@ module TP2
 
     def accept_incoming(listen_fd)
       @machine.accept_each(listen_fd) do |fd|
-        conn = HTTP1Adapter.new(@machine, fd, &@app)
+        conn = HTTP1Adapter.new(@machine, fd, @opts, &@app)
         f = @machine.spin(conn) do
           it.run
         ensure
@@ -110,6 +110,12 @@ module TP2
         end
         @connection_fiber_map[f] = true
       end
+    rescue UM::Terminate
+      # terminated
+    rescue Exception => e
+      p e
+      p e.backtrace
+      exit!
     end
 
     def close_all_server_fds

data/lib/tp2/version.rb

@@ -1,3 +1,3 @@
 module TP2
-  VERSION = '0.7.1'
+  VERSION = '0.8.1'
 end

data/lib/tp2.rb

@@ -4,6 +4,12 @@ require 'uringmachine'
 require 'tp2/version'
 require 'tp2/server'
 
+class UringMachine
+  def puts(str)
+    write_async(1, "#{str}\n")
+  end
+end
+
 module TP2
   BANNER = (
     "\n" +
@@ -15,7 +21,6 @@ module TP2
     "  /   \\      https://github.com/noteflakes/tp2\n" +
     "⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺\n"
   )
-
   
   class << self
     def run(opts = nil, &app)
@@ -27,8 +32,8 @@ module TP2
         machine = UM.new
         server = Server.new(machine, opts, &app)
 
-        setup_signal_handling(machine)
-
+        setup_signal_handling(machine, Fiber.current)
+        machine.puts(TP2::BANNER) if opts[:banner]
         server.run
       ensure
         @in_run = false
@@ -44,18 +49,18 @@ module TP2
 
     private
 
-    def setup_signal_handling(machine)
+    def setup_signal_handling(machine, fiber)
       queue = UM::Queue.new
       trap('SIGINT') { machine.push(queue, :SIGINT) }
-      machine.spin { terminate_on_signal(machine, queue, Fiber.current) }
+      machine.spin { watch_for_int_signal(machine, queue, fiber) }
     end
 
     # waits for signal from queue, then terminates given fiber
     # to be done
-    def terminate_on_signal(machine, queue, fiber)
+    def watch_for_int_signal(machine, queue, fiber)
       sig = machine.shift(queue)
-      puts "\nGot signal (#{sig}), shutting down gracefully..."
+      machine.puts("\nGot #{sig} signal, shutting down gracefully...")
       machine.schedule(fiber, UM::Terminate.new)
     end
   end
-end
+end

data/test/test_http1_adapter.rb

@@ -31,7 +31,7 @@ class HTTP1AdapterTest < Minitest::Test
     @reqs = []
     @hook = nil
     @app = ->(req) { @hook&.call(req); @reqs << req }
-    @adapter = TP2::HTTP1Adapter.new(@machine, @s_fd, &@app)
+    @adapter = TP2::HTTP1Adapter.new(@machine, @s_fd, {}, &@app)
   end
 
   def teardown

data/test/test_server.rb

@@ -136,7 +136,8 @@ class ServerTest < Minitest::Test
       ':path' => '/foo',
       ':protocol' => 'http/1.1',
       'server' => 'foo.com',
-      'content-length' => '3'
+      'content-length' => '3',
+      ':tx' => 48,
     }, headers)
     body = @bodies.shift
     assert_equal 'abc', body
@@ -148,7 +149,8 @@ class ServerTest < Minitest::Test
       ':path' => '/bar',
       ':protocol' => 'http/1.1',
       'server' => 'bar.com',
-      'content-length' => '6'
+      'content-length' => '6',
+      ':tx' => 51,
     }, headers)
     body = @bodies.shift
     assert_equal 'defghi', body

data/tp2.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.4'
   s.executables   = ['tp2']
 
-  s.add_dependency 'uringmachine',    '>=0.12.1'
+  s.add_dependency 'uringmachine',    '>=0.13'
   s.add_dependency 'qeweney',         '0.21'
   s.add_dependency 'rack',            '3.1.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tp2
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors:
 - Sharon Rosner
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement