tp2 0.8.3 → 0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 991ec5937591a3e57675d686d11670b682e7c5644391b4f301b091befcbae17f
-  data.tar.gz: 7413f8027c235ff4377077d7391b58c7540cf1257d05c3d9c6b837705c1c1329
+  metadata.gz: b97ec9f81c0bb5aa55cc42ec96cc349f21c0bb88ebfe907300f58841e8bdcf4a
+  data.tar.gz: 48c9d21e5d2d4a7fe3d360dde8623deac46c0ddf0efccf94a1543c06e4bf7770
 SHA512:
-  metadata.gz: fead1d1fdfad4ad3a66e757ed9613af4651fe25fe112cfede015d7c410f4655e52f51eaaa7b7530aea84d49201566088e88305464cd823a8dd9583b7bf21297d
-  data.tar.gz: 01cfb68c33c5a7b2a652e7d01d87798be696dc3bcbc0a62dbc1b9c134e709170cc9fc35d9ca4873518bb308eccf0f0973720238814f167e52f34a203cfff03d8
+  metadata.gz: 9fb4edb4db18989e6a218e15ed81543cf671ca5c925da3e134673fd93832b34c6345c5782b836b8e7f672492a53f73c0c0f83c832c4639beb00da5936f95dcee
+  data.tar.gz: 4cd296f4c7dd5ae7b72367a1f829589eaab29a3d0bacfff9c973cdfe82f78894c6da96819528421672537f6a308da4e3258290b4afb20b9631b7348a9dbb2379

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 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
+- Update UringMachine
+
 # Version 0.8.3 2025-06-09
 
 - Improve error handling

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

data/lib/tp2/http1_adapter.rb

@@ -39,7 +39,7 @@ module TP2
         raise
       end
     ensure
-      @machine.close(@fd)
+      @machine.close_async(@fd)
     end
 
     def serve_request
@@ -164,6 +164,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)

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/server.rb

@@ -119,7 +119,7 @@ module TP2
     end
 
     def close_all_server_fds
-      @server_fds.each { @machine.close(it) }
+      @server_fds.each { @machine.close_async(it) }
     end
 
     def graceful_shutdown
@@ -145,8 +145,6 @@ module TP2
     rescue UM::Terminate
         # timeout on waiting for adapters to finish running, do nothing
       end
-    ensure
-      @machine.close(@server_fd) rescue nil
     end
   end
 end

data/lib/tp2/version.rb

@@ -1,3 +1,3 @@
 module TP2
-  VERSION = '0.8.3'
+  VERSION = '0.10'
 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

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.13'
+  s.add_dependency 'uringmachine',    '>=0.14'
   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.8.3
+  version: '0.10'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement