tp2 0.9 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fa7578335fe3be94277b5e3ddbb4417e72dd911a73cbc914607177b1b58107f
-  data.tar.gz: e07b7f54b2056418051529db6a6f0e6dffddbbd87266f33cf15806fddb48485d
+  metadata.gz: 7794469f473ba02c2feb32c638c8659536b5b04b32e1b93479af7638e76e1019
+  data.tar.gz: 567e71e0a872ee5a5abcaa00208b149e2b59a69fe3e42f1e73687e3a79a036f9
 SHA512:
-  metadata.gz: 54b5a8c620e014a83d2955a19de91ea6945ea6c456ec8040367778c44f33f99da6d079d00737cd68201a82461655f5dbd9c35ab34ee8da3a349fc8624d3fd4f1
-  data.tar.gz: 0ca8cb386203f8c91fe7c5d62a0fe79f332863f5c97145f65459c12650033dc1bbf4781c988070868ad760a7844350f45ba645ec8ad2891e03e73b0b485504d5
+  metadata.gz: 21ffae9b2a103464dcfc23eae43020df47173c3ff0c8354ec57755dd45607ae56c9b0be14f95291f2b7ae1c2f768b3981553a3a2bee590ec83aa2497f1b2e631
+  data.tar.gz: fb203df62bba5e961bcbf380117eaec22c249dd7ed1615e4f6ce59d287ebb4f2901aad30dd8ac0759295882d4b6f9dbdea2e0f594298d9e4972d1e8a6e9a881f

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# Version 0.11 2025-06-13
+
+- Improve logging for protocol errors
+- Enable YJIT when running bin/tp2
+
+# Version 0.10 2025-06-10
+
+- Fix static file serving
+- Fix silent mode
+
 # Version 0.9 2025-06-09
 
 - Use `#close_async` for closing sockets

data/bin/tp2

@@ -31,8 +31,8 @@ parser = OptionParser.new do |o|
   }
 
   o.on("-s", "--silent", "Silent mode") {
-    opts[:banner] = false
-    opts[:log] = false
+    opts[:banner] = nil
+    opts[:log] = nil
   }
 
   o.on("-h", "--help", "Show this help message") do
@@ -90,4 +90,5 @@ end
 
 detect_app(opts) if !opts[:app_type]
 
+RubyVM::YJIT.enable rescue nil
 TP2.run(opts)

data/lib/tp2/http1_adapter.rb

@@ -32,6 +32,8 @@ module TP2
         # we're done
       when SystemCallError
         @opts[:log]&.log("Encountered #{e.class}, closing connection")
+      when ProtocolError
+        @opts[:log]&.log("Protocol error (#{e.message}), closing connection")
       when StandardError
         @opts[:log]&.log("Unhandled exception #{e.class}: #{e.message}, closing connection")
         @opts[:log]&.log(e.backtrace.join("\n"))
@@ -128,6 +130,9 @@ module TP2
       @response_headers = headers
     end
 
+    EMPTY_CHUNK = "0\r\n\r\n"
+    EMPTY_CHUNK_LEN = EMPTY_CHUNK.bytesize
+
     # Sends a response body chunk. If no headers were sent, default headers are
     # sent using #send_headers. if the done option is true(thy), an empty chunk
     # will be sent to signal response completion to the client.
@@ -138,7 +143,7 @@ module TP2
     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
+      data << EMPTY_CHUNK if done
       return if data.empty?
 
       request.tx_incr(data.bytesize)
@@ -149,9 +154,6 @@ module TP2
       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]
@@ -164,6 +166,42 @@ module TP2
       end
     end
 
+    def respond_with_static_file(req, path, opts, cache_headers)
+      fd = @machine.open(path, UM::O_RDONLY)
+      opts ||= {}
+      if opts[:headers]
+        opts[:headers].merge!(cache_headers)
+      else
+        opts[:headers] = cache_headers
+      end
+
+      maxlen = opts[:max_len] || 65536
+      buf = String.new(capacity: maxlen)
+      headers_sent = nil
+      while true
+        res = @machine.read(fd, buf, maxlen, 0)
+        if res < maxlen && !headers_sent
+          return respond(req, buf, opts[:headers])
+        elsif res == 0
+          return finish(req)
+        end
+        
+        if !headers_sent
+          send_headers(req, opts[:headers])
+          headers_sent = true
+        end
+        done = res < maxlen
+        send_chunk(req, buf, done: done)
+        return if done
+      end
+    ensure
+      @machine.close(fd) if fd
+    end
+
+    def close
+      @machine.close_async(@fd)
+    end
+
     private
 
     def log(request, response_headers)
@@ -241,7 +279,7 @@ module TP2
     def read(len, buf = nil, raise_on_eof = true)
       str = @stream.get_string(buf, len)
       if !str && raise_on_eof
-        raise ProtocolError, "Missing data"
+        raise ProtocolError, 'Missing data'
       end
 
       str

data/lib/tp2/request_extensions.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 class Qeweney::Request
-  def serve_io(io, opts)
-    # TODO: implement using UM
+  def respond_with_static_file(path, etag, last_modified, opts)
+    cache_headers = (etag || last_modified) ? {
+      'etag' => etag,
+      'last-modified' => last_modified,
+    } : {}
 
-    raise NotImplementedError
+    adapter.respond_with_static_file(self, path, opts, cache_headers)
   end
 end

data/lib/tp2/version.rb

@@ -1,3 +1,3 @@
 module TP2
-  VERSION = '0.9'
+  VERSION = '0.11'
 end

data/test/test_http1_adapter.rb

@@ -520,4 +520,57 @@ class HTTP1AdapterTest < Minitest::Test
     assert_equal expected, response
     assert count >= chunk_count
   end
+
+  def test_static_file_serving
+    fn = "/tmp/tp2-#{rand(1000)}"
+    IO.write(fn, 'foobar')
+
+    @hook = ->(req) do
+      req.respond_with_static_file(fn, nil, nil, nil)
+      req.adapter.close
+    end
+
+    response = +''
+    count = 0
+
+    write_client_side("GET / HTTP/1.1\r\n\r\n")
+    @machine.spin { @adapter.serve_request }
+
+    while (data = read_client_side(65536))
+      response << data
+      count += 1
+      @machine.snooze
+    end
+
+    content = IO.read(__FILE__)
+    file_size = content.bytesize
+    expected = "HTTP/1.1 200\r\nContent-Length: 6\r\n\r\nfoobar"
+
+    assert_equal expected, response
+  end
+
+  def test_static_file_serving_big
+    fn = "/tmp/tp2-#{rand(1000)}"
+    IO.write(fn, 'foobar')
+
+    @hook = ->(req) do
+      req.respond_with_static_file(fn, nil, nil, { max_len: 3 })
+      req.adapter.close
+    end
+
+    response = +''
+    count = 0
+
+    write_client_side("GET / HTTP/1.1\r\n\r\n")
+    @machine.spin { @adapter.serve_request }
+
+    while (data = read_client_side(65536))
+      response << data
+      count += 1
+      @machine.snooze
+    end
+
+    expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n3\r\nfoo\r\n3\r\nbar\r\n0\r\n\r\n"
+    assert_equal expected, response
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tp2
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '0.11'
 platform: ruby
 authors:
 - Sharon Rosner