fetch-api 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4217a0ddb4ec43da71a630ba5de24d9a6a02af0f5cf2b39286702c1cc512c699
-  data.tar.gz: 05abc4f266fab3577c2223de54957b8c6a84e7b3ccc24df428f40e771c1e311d
+  metadata.gz: eb43f07388e02a5f1ec3ccf700a634962896b68e8de60c402aacfe078499dc06
+  data.tar.gz: 228e63fa8ba87bdb73f4ed82dd92af70724bb5e3c0a10c2be1849bba3752b846
 SHA512:
-  metadata.gz: c7caa0c96f93f03ae799a121fc7f25410f401c9c192a7546f97627c760cb638627b79d01b0911ed8a4f2ebaacdaa619e86e84a2b88443a721f066a4a9fd4c1d9
-  data.tar.gz: 826e3c4ff75b7b3c3f0886949a6fe141cdd360fd31da86b42b08aabde98b0a608ac6f51561b65819b65622a1a2f344f5e6784505bafb990d0aad300ac8f378b6
+  metadata.gz: 99785c3983dbf1e311e3e845ad92a41791af9089b1ecf349973e5a3a14159b1ec855b07c16f46980248b1f8375d3761fd6696cebde999763053a178117257510
+  data.tar.gz: 6c969cd4edfc77256e960cab56d7fe9db4a345f754e811e278b18d27900c393625ead267a566abb4334e743270b181ac9921fdfdc51f45f715da8f8701ed28cb

data/README.md

@@ -110,8 +110,8 @@ These values can be configured as follows (in seconds):
 
 ``` ruby
 Fetch.configure do |config|
-  config.max_idle_time      = 10 # default
-  config.keep_alive_timeout = 2  # default
+  config.max_idle_time      = 30 # default
+  config.keep_alive_timeout = 15 # default
 end
 ```
 

data/lib/fetch/client.rb

@@ -51,7 +51,7 @@ module Fetch
           # @type var location: String
           location = res['Location']
 
-          fetch(location, method:, headers:, body:, redirect:, _redirected: true) # steep:ignore ArgumentTypeMismatch
+          fetch(location, method:, headers:, body:, redirect:, _redirected: true)
         when 'error'
           raise RedirectError, "redirected to #{res['Location']}"
         when 'manual'

data/lib/fetch/connection_pool.rb

@@ -4,76 +4,67 @@ require 'thread'
 
 module Fetch
   class ConnectionPool
-    Entry = Struct.new(:connection, :in_use, :last_used, keyword_init: true)
-
     def initialize
       @connections = {}
       @mutex       = Mutex.new
 
       @sweeper = Thread.new {
         loop do
-          sleep 1
           sweep
 
-          Thread.stop if @connections.empty?
+          if @connections.empty?
+            Thread.stop
+          else
+            sleep 1
+          end
         end
       }
     end
 
     def with_connection(uri, &block)
-      conn = acquire(uri)
+      conn = checkout(uri)
 
       begin
         block.call(conn)
       ensure
-        release uri
+        checkin uri, conn
       end
     end
 
     private
 
-    def acquire(uri)
-      @mutex.synchronize {
-        entry = @connections[uri.origin]
-
-        if entry
-          entry.in_use = true
-
-          entry.connection
-        else
-          # @type var host: String
-          host = uri.host
-
-          Net::HTTP.new(host, uri.port).tap {|http|
-            http.use_ssl            = uri.scheme == 'https'
-            http.keep_alive_timeout = Fetch.config.keep_alive_timeout
-
-            http.start
-
-            @connections[uri.origin] = Entry.new(connection: http, in_use: true)
-          }
-        end
-      }.tap {
-        @sweeper.wakeup
-      }
+    def checkout(uri)
+      if entry = @mutex.synchronize { @connections.delete(uri.origin) }
+        entry.first
+      else
+        # @type var host: String
+        host = uri.host
+
+        Net::HTTP.new(host, uri.port).tap {|http|
+          http.use_ssl            = uri.scheme == 'https'
+          http.keep_alive_timeout = Fetch.config.keep_alive_timeout
+          http.start
+        }
+      end
     end
 
-    def release(uri)
+    def checkin(uri, conn)
       @mutex.synchronize do
-        if entry = @connections[uri.origin]
-          entry.in_use    = false
-          entry.last_used = Time.now
-        end
+        @connections[uri.origin] = [conn, Time.now]
       end
+
+      @sweeper.wakeup
     end
 
     def sweep
       @mutex.synchronize do
-        @connections.each do |origin, entry|
-          next if entry.in_use
-
-          if entry.last_used + Fetch.config.max_idle_time < Time.now
-            entry.connection.finish
+        @connections.each do |origin, (conn, last_used)|
+          if last_used + Fetch.config.max_idle_time < Time.now
+            begin
+              conn.finish
+            rescue IOError
+              # do nothing
+            end
 
             @connections.delete origin
           end

data/lib/fetch/version.rb

@@ -1,3 +1,3 @@
 module Fetch
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/lib/fetch.rb

@@ -10,7 +10,7 @@ module Fetch
   end
 
   configure do |config|
-    config.max_idle_time      = 10
-    config.keep_alive_timeout = 2
+    config.max_idle_time      = 30
+    config.keep_alive_timeout = 15
   end
 end

data/sig/fetch/connection_pool.rbs

@@ -1,20 +1,12 @@
 module Fetch
   class ConnectionPool
-    class Entry
-      attr_accessor connection: Net::HTTP
-      attr_accessor in_use: bool
-      attr_accessor last_used: Time
-
-      def initialize: (connection: Net::HTTP, in_use: bool, ?last_used: Time) -> void
-    end
-
     def initialize: () -> void
     def with_connection: [T] (URI::HTTP) { (Net::HTTP) -> T } -> T
 
     private
 
-    def acquire: (URI::HTTP) -> Net::HTTP
-    def release: (URI::HTTP) -> void
+    def checkout: (URI::HTTP) -> Net::HTTP
+    def checkin: (URI::HTTP, Net::HTTP) -> void
     def sweep: () -> void
   end
 end

data/sig/fetch/version.rbs

@@ -0,0 +1,3 @@
+module Fetch
+  VERSION: String
+end

data/sig/fetch.rbs

@@ -1,6 +1,4 @@
 module Fetch
-  VERSION: String
-
   attr_accessor self.config: Config
 
   def self.configure: () { (Config) -> void } -> void

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fetch-api
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Keita Urashima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forwardable
@@ -139,6 +139,7 @@ files:
 - sig/fetch/headers.rbs
 - sig/fetch/response.rbs
 - sig/fetch/url_search_params.rbs
+- sig/fetch/version.rbs
 homepage: https://github.com/ursm/fetch-api
 licenses:
 - MIT
@@ -160,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Something like the Fetch API for Ruby