tp2 0.9 → 0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fa7578335fe3be94277b5e3ddbb4417e72dd911a73cbc914607177b1b58107f
-  data.tar.gz: e07b7f54b2056418051529db6a6f0e6dffddbbd87266f33cf15806fddb48485d
+  metadata.gz: b97ec9f81c0bb5aa55cc42ec96cc349f21c0bb88ebfe907300f58841e8bdcf4a
+  data.tar.gz: 48c9d21e5d2d4a7fe3d360dde8623deac46c0ddf0efccf94a1543c06e4bf7770
 SHA512:
-  metadata.gz: 54b5a8c620e014a83d2955a19de91ea6945ea6c456ec8040367778c44f33f99da6d079d00737cd68201a82461655f5dbd9c35ab34ee8da3a349fc8624d3fd4f1
-  data.tar.gz: 0ca8cb386203f8c91fe7c5d62a0fe79f332863f5c97145f65459c12650033dc1bbf4781c988070868ad760a7844350f45ba645ec8ad2891e03e73b0b485504d5
+  metadata.gz: 9fb4edb4db18989e6a218e15ed81543cf671ca5c925da3e134673fd93832b34c6345c5782b836b8e7f672492a53f73c0c0f83c832c4639beb00da5936f95dcee
+  data.tar.gz: 4cd296f4c7dd5ae7b72367a1f829589eaab29a3d0bacfff9c973cdfe82f78894c6da96819528421672537f6a308da4e3258290b4afb20b9631b7348a9dbb2379

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 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

data/lib/tp2/http1_adapter.rb

@@ -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/version.rb

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

metadata

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