terminal-shop 0.1.0.pre.alpha.9 → 0.1.0.pre.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7302bc4cca8faceca8577dce4b9b10362963e1d51e24657389a8c663376299e
-  data.tar.gz: 2fd2e9b55fc3c9ba9f4038a44e6bf71e18a49d1d4186a44031ffbe2e43be1fe7
+  metadata.gz: e49f5a72c701e7a5a68d1b537d9910a95d385966dcab6788a080c0d7cfefc503
+  data.tar.gz: c94a21a6fc772735aedd857c5f592b5ab0eb7344419814d593f7bec71b96b5e5
 SHA512:
-  metadata.gz: 0f8be58ee44eddefe127293b9423358e625982a33a00d83076f23acfcb5845bb27633e0ee6820fe1b7c7915bfdad29a9b40db3a971cf74490082e5cc0573189d
-  data.tar.gz: 6bff5193dcd2072b584d1a6ff52d4bf7173c66ff6d2568665fcd1c1a7a73e536718fd90c4f393574c579f8a368afeb547ff83bb2475493c25de5917a4d753280
+  metadata.gz: 4b5237266009ebbfb3019971b882c5c92076931ee011fbad8023c8ac806a89bd58eeb1373aa38ee60374d8af66913bacd8f00afd5f809bec5e682cabdb70dced
+  data.tar.gz: 882c016a8b85b9ce829fb952eb63cccf295595f64c500863a8550243946e5164b0308af9699f618cfd768a812831d4d2953af97a1ef12c7e3dc3bc9ab0f5c8b8

data/lib/terminal-shop/pooled_net_requester.rb

@@ -12,29 +12,58 @@ module TerminalShop
     # @private
     #
     # @param url [URL::Generic]
-    # @param timeout [Float]
+    # @param blk [Proc]
     #
     # @return [ConnectionPool]
     #
-    private def get_pool(url)
+    private def with_pool(url, &blk)
       origin = TerminalShop::Util.uri_origin(url)
-      @mutex.synchronize do
-        @pools[origin] ||= ConnectionPool.new(size: Etc.nprocessors) do
-          port =
-            case [url.port, url.scheme]
-            in [Integer, _]
-              url.port
-            in [nil, "http" | "ws"]
-              Net::HTTP.http_default_port
-            in [nil, "https" | "wss"]
-              Net::HTTP.https_default_port
-            end
+      key = :"#{self.class.name}-connection_in_use_for_#{origin}"
+
+      return blk.call(make_conn(url)) if Thread.current[key]
+
+      pool =
+        @mutex.synchronize do
+          @pools[origin] ||= ConnectionPool.new(size: Etc.nprocessors) do
+            make_conn(url)
+          end
+        end
+
+      pool.with do |conn|
+        Thread.current[key] = true
+
+        blk.call(conn)
+        # rubocop:disable Lint/RescueException
+      rescue Exception => e
+        # rubocop:enable Lint/RescueException
+        # should close connection on all errors to ensure no invalid state persists
+        conn.finish if conn.started?
+        raise e
+      ensure
+        Thread.current[key] = nil
+      end
+    end
 
-          session = Net::HTTP.new(url.host, port)
-          session.use_ssl = %w[https wss].include?(url.scheme)
-          session.max_retries = 0
-          session
+    # @private
+    #
+    # @param url [URI::Generic]
+    #
+    # @return [Net::HTTP]
+    #
+    private def make_conn(url)
+      port =
+        case [url.port, url.scheme]
+        in [Integer, _]
+          url.port
+        in [nil, "http" | "ws"]
+          Net::HTTP.http_default_port
+        in [nil, "https" | "wss"]
+          Net::HTTP.https_default_port
         end
+
+      Net::HTTP.new(url.host, port).tap do
+        _1.use_ssl = %w[https wss].include?(url.scheme)
+        _1.max_retries = 0
       end
     end
 
@@ -44,7 +73,7 @@ module TerminalShop
     #   @option req [Symbol] :method
     #   @option req [URI::Generic] :url
     #   @option req [Hash{String => String}] :headers
-    #   @option req [String, Hash] :body
+    #   @option req [String, Hash, IO, StringIO] :body
     #   @option req [Float] :timeout
     #
     # @return [Net::HTTPResponse]
@@ -55,7 +84,7 @@ module TerminalShop
       request = Net::HTTPGenericRequest.new(
         method.to_s.upcase,
         !body.nil?,
-        ![:head, :options].include?(method),
+        method != :head,
         url.to_s
       )
 
@@ -67,28 +96,30 @@ module TerminalShop
         request.body_stream = body
       end
 
-      # This timeout is for acquiring a connection from the pool
-      # The default 5 seconds seems too short, lets just have a nearly unbounded queue for now
-      #
-      # TODO: revisit this around granular timeout / concurrency control
-      get_pool(url).with(timeout: 600) do |conn|
+      with_pool(url) do |conn|
+        make_request(conn, request, timeout)
+      end
+    end
+
+    # @private
+    #
+    # @param conn [Net::HTTP]
+    # @param request [Net::HTTPGenericRequest]
+    # @param timeout [Float]
+    #
+    # @return [Net::HTTPResponse]
+    #
+    private def make_request(conn, request, timeout)
+      unless conn.started?
         conn.open_timeout = timeout
-        conn.read_timeout = timeout
-        conn.write_timeout = timeout
-        conn.continue_timeout = timeout
+        conn.start
+      end
 
-        conn.start unless conn.started?
+      conn.read_timeout = timeout
+      conn.write_timeout = timeout
+      conn.continue_timeout = timeout
 
-        conn.request(request)
-        # rubocop:disable Lint/RescueException
-      rescue Exception => e
-        # rubocop:enable Lint/RescueException
-        # should close connection on all errors to ensure no invalid state persists
-        conn.finish if conn.started?
-        raise e
-      end
-    rescue ConnectionPool::TimeoutError
-      raise TerminalShop::APITimeoutError.new(url: url)
+      conn.request(request)
     end
   end
 end

data/lib/terminal-shop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TerminalShop
-  VERSION = "0.1.0-alpha.9"
+  VERSION = "0.1.0-alpha.10"
 end

data/rbi/lib/terminal-shop/version.rbi

@@ -1,5 +1,5 @@
 # typed: strong
 
 module TerminalShop
-  VERSION = "0.1.0-alpha.9"
+  VERSION = "0.1.0-alpha.10"
 end

data/sig/terminal-shop/version.rbs

@@ -1,3 +1,3 @@
 module TerminalShop
-  VERSION: "0.1.0-alpha.8"
+  VERSION: "0.1.0-alpha.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal-shop
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.alpha.9
+  version: 0.1.0.pre.alpha.10
 platform: ruby
 authors:
 - Terminal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool