tp2 0.19.3 → 0.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0b5eac74e3e54f7dfbad1af92a110aa755c3e5ebe18229879c734baaa24e8cf
-  data.tar.gz: ca1bf493c839517f11db5b0d346958c44bfd1aa194dbbd18e2300e9d843e8d9b
+  metadata.gz: 9e014b48f0e569963bc4a7c69735b7d3b2745e0300285be727e56a822302705d
+  data.tar.gz: 8a620cba8ce06490c6b4c4fd830ab2883b65a41a133aa86cf0f3c382610c0c1b
 SHA512:
-  metadata.gz: bab1d252cbe06291116e6ddbb8e973e8a0b0acefd055acd52290d371629dc85abb6a4f4f5339a13bdbf20b2f1647b53517f30695ea356b0a5f9dcc30d01cb360
-  data.tar.gz: 6c22dd2ebdb82c883f6805f2f0d456e76f5b86d84e57d2a1dfc3c8b66dbd2c36710e4f98d91607b6e73301390b3fbab078dda1e9a571cd3f832ed9e8b2efe2e7
+  metadata.gz: 03b13bf4d0529187cf96f862aa0bae5698e72337e39a2c820e319342dac8f9d8994f86bd66da2e9637947f330cac0c86ce0bec1fee299d92cc3430281231b3fc
+  data.tar.gz: 23c1881fc7db29bd5b78325a1fc7338674acb8a9db5b7cd735f0ea77e904e667312c6c49acf61b919743bdad1e375a4e519b9f517f4144b24347ab9c25d50356

data/.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby: [3.4, 'head']
+        ruby: ['head']
 
     name: >-
       ${{matrix.os}}, ${{matrix.ruby}}

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.19.4 2026-01-26
+
+- Fix and make graceful_shutdown idempotent
+- Update dependencies
+
 # 0.19.3 2025-12-10
 
 - Update UringMachine

data/Gemfile

@@ -1,12 +1,12 @@
-source 'https://rubygems.org'
+source 'https://gem.coop'
 
 gemspec name: 'tp2'
 
 group :development do
-  gem 'listen',         '3.9.0'
-  gem 'minitest',       '5.25.4'
-  gem 'rake',           '13.2.1'
-  gem 'rake-compiler',  '1.2.9'
+  gem 'listen',         '3.10.0'
+  gem 'minitest',       '6.0.1'
+  gem 'rake',           '13.3.1'
+  gem 'rake-compiler',  '1.3.1'
   gem 'simplecov',      '0.22.0'
-  gem 'yard',           '0.9.37'
+  gem 'yard',           '0.9.38'
 end

data/examples/simple.rb

@@ -8,9 +8,19 @@ end
 
 require 'tp2'
 
+BODY = 'foobar' * 1000
 app = ->(req) {
-  req.respond('foobar', ':status' => Qeweney::Status::TEAPOT)
+  req.respond(BODY)
 }
 
-TP2.config(&app)
-TP2.run
+PORT = 1234
+
+machine = UM.new
+opts = {
+  banner: TP2::BANNER,
+}
+# opts[:logger] = TP2::Logger.new(machine, **opts)
+env = { bind: "127.0.0.1:#{PORT}" }.merge(opts)
+puts "Listening on #{env[:bind]}"
+server = TP2::Server.new(machine, env) { app&.call(it) }
+server.run

data/lib/tp2/connection.rb

@@ -153,6 +153,11 @@ module TP2
 
     SEND_FLAGS = UM::MSG_NOSIGNAL | UM::MSG_WAITALL
 
+    EMPTY_CHUNK = "0\r\n\r\n"
+    EMPTY_CHUNK_LEN = EMPTY_CHUNK.bytesize
+
+    CHUNKED_ENCODING_POSTLUDE = "\r\n#{EMPTY_CHUNK}"
+
     # Sends response including headers and body. Waits for the request to complete
     # if not yet completed. The body is sent using chunked transfer encoding.
     # @param request [Qeweney::Request] HTTP request
@@ -165,8 +170,8 @@ module TP2
       @response_headers = headers
       request&.tx_incr(formatted_headers.bytesize + (body ? body.bytesize : 0))
       if body
-        buf = "#{formatted_headers}#{body.bytesize.to_s(16)}\r\n#{body}\r\n#{EMPTY_CHUNK}"
-        @machine.send(@fd, buf, buf.bytesize, SEND_FLAGS)
+        chunk_prelude = "#{body.bytesize.to_s(16)}\r\n"
+        @machine.sendv(@fd, formatted_headers, chunk_prelude, body, CHUNKED_ENCODING_POSTLUDE)
       else
         @machine.send(@fd, formatted_headers, formatted_headers.bytesize, SEND_FLAGS)
       end
@@ -187,9 +192,6 @@ 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.

data/lib/tp2/server.rb

@@ -50,11 +50,15 @@ module TP2
 
     def run
       setup
-      @machine.join(*@accept_fibers)
+      @machine.await_fibers(@accept_fibers)
     rescue UM::Terminate
       graceful_shutdown
     end
 
+    def stop!
+      graceful_shutdown
+    end
+
     private
 
     def setup
@@ -69,7 +73,7 @@ module TP2
       setup_server_extensions
 
       # map fibers
-      @connection_fiber_map = {}
+      @connection_fibers = Set.new
     end
 
     def get_bind_entries
@@ -124,47 +128,52 @@ module TP2
     end
 
     def accept_incoming(listen_fd)
-      @machine.accept_each(listen_fd) do |fd|
-        conn = Connection.new(self, @machine, fd, @env, &@app)
-        f = @machine.spin(conn) do
-          it.run
-        ensure
-          @connection_fiber_map.delete(f)
-        end
-        @connection_fiber_map[f] = true
-      end
+      @machine.accept_each(listen_fd) { start_client_connection(it) }
     rescue UM::Terminate
       # terminated
-    rescue Exception => e
-      p e
-      p e.backtrace
-      exit
+    end
+
+    def start_client_connection(fd)
+      conn = Connection.new(self, @machine, fd, @env, &@app)
+      f = @machine.spin(conn) do
+        it.run
+      ensure
+        @connection_fibers.delete(f)
+      end
+      @connection_fibers << f
     end
 
     def close_all_server_fds
       @server_fds.each { @machine.close_async(it) }
     end
 
+    STOP = UM::Terminate.new
+
+    def stop_accept_fibers
+      @accept_fibers.each { @machine.schedule(it, STOP) if !it.done? }
+      @machine.await_fibers(@accept_fibers)
+    end
+
     def graceful_shutdown
       @env[:logger]&.info(message: 'Shutting down gracefully...')
 
       # stop listening
       close_all_server_fds
+      stop_accept_fibers
       @machine.snooze
 
-      return if @connection_fiber_map.empty?
+      return if @connection_fibers.empty?
 
       # sleep for a bit, let requests finish
       @machine.sleep(PENDING_REQUESTS_GRACE_PERIOD)
-      return if @connection_fiber_map.empty?
+      return if @connection_fibers.empty?
 
       # terminate pending fibers
-      pending = @connection_fiber_map.keys
-      signal = UM::Terminate.new
-      pending.each { @machine.schedule(it, signal) }
+      pending = @connection_fibers.to_a
+      pending.each { @machine.schedule(it, STOP) }
 
       @machine.timeout(PENDING_REQUESTS_TIMEOUT_PERIOD, UM::Terminate) do
-        @machine.join(*@connection_fiber_map.keys)
+        @machine.await_fibers(@connection_fibers)
       rescue UM::Terminate
         # timeout on waiting for adapters to finish running, do nothing
       end

data/lib/tp2/version.rb

@@ -1,3 +1,3 @@
 module TP2
-  VERSION = '0.19.3'
+  VERSION = '0.19.4'
 end

data/test/test_server.rb

@@ -38,15 +38,13 @@ class ServerTest < Minitest::Test
 
   def run_server
     @server.run
-  rescue STOP
-    # ignore
   ensure
     @server_done = true
   end
 
   def teardown
     @machine.close(@client_fd) rescue nil
-    @machine.schedule(@f_server, STOP.new)
+    @server.stop!
     @machine.snooze until @server_done
   end
 
@@ -113,7 +111,7 @@ class ServerTest < Minitest::Test
     write_http_request "GET /foo HTTP/1.1\r\nServer: foo.com\r\n\r\nSCHMET /bar HTTP/1.1\r\n\r\n"
 
     @machine.sleep(0.01)
-    @machine.schedule(@f_server, UM::Terminate.new)
+    @server.stop!
     @machine.snooze
 
     response = read_client_side
@@ -282,9 +280,9 @@ class ServerTest < Minitest::Test
     @env[:logger] = TestLogger.new
     @app = ->(req) { reqs << req; req.respond('Hello, world!', {}) }
 
-    write_http_request "GET / HTTP/1.0\r\n\r\n"
+    write_http_request "GET / HTTP/1.1\r\n\r\n"
     response = read_client_side
-    expected = "HTTP/1.1 200\r\nContent-Length: 13\r\n\r\nHello, world!"
+    expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\nd\r\nHello, world!\r\n0\r\n\r\n"
     assert_equal(expected, response)
 
     entries = @env[:logger].entries

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.22.0'
+  s.add_dependency 'uringmachine',    '~> 0.23.1'
   s.add_dependency 'qeweney',         '~> 0.23'
   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.19.3
+  version: 0.19.4
 platform: ruby
 authors:
 - Sharon Rosner
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.0
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Experimental HTTP/1 server for UringMachine
 test_files: []