Merge pull request #443 from OneBusAway/release-please--branches--main--changes--next

release: 0.1.0-alpha.206

Author: aaronbrethorst

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.1.0-alpha.205"
+  ".": "0.1.0-alpha.206"
 }

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.1.0-alpha.206 (2025-03-05)
+
+Full Changelog: [v0.1.0-alpha.205...v0.1.0-alpha.206](https://github.com/OneBusAway/ruby-sdk/compare/v0.1.0-alpha.205...v0.1.0-alpha.206)
+
+### Chores
+
+* **internal:** add utils methods for parsing SSE ([#444](https://github.com/OneBusAway/ruby-sdk/issues/444)) ([3e8248b](https://github.com/OneBusAway/ruby-sdk/commit/3e8248b68c2e7af53876afd1bd554b8f0e8d6296))
+* **internal:** version bump ([#442](https://github.com/OneBusAway/ruby-sdk/issues/442)) ([cc8bdc5](https://github.com/OneBusAway/ruby-sdk/commit/cc8bdc5cc7885a536bd33dd6450f630452856667))
+
 ## 0.1.0-alpha.205 (2025-03-04)
 
 Full Changelog: [v0.1.0-alpha.204...v0.1.0-alpha.205](https://github.com/OneBusAway/ruby-sdk/compare/v0.1.0-alpha.204...v0.1.0-alpha.205)

Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    onebusaway-sdk (0.1.0.pre.alpha.205)
+    onebusaway-sdk (0.1.0.pre.alpha.206)
       connection_pool
 
 GEM

lib/onebusaway-sdk/base_client.rb

@@ -28,7 +28,7 @@ class << self
       # @raise [ArgumentError]
       #
       def validate!(req)
-        keys = [:method, :path, :query, :headers, :body, :unwrap, :page, :model, :options]
+        keys = [:method, :path, :query, :headers, :body, :unwrap, :page, :stream, :model, :options]
         case req
         in Hash
           req.each_key do |k|
@@ -201,6 +201,8 @@ def initialize(
     #
     #   @option req [Class, nil] :page
     #
+    #   @option req [Class, nil] :stream
+    #
     #   @option req [OnebusawaySDK::Converter, Class, nil] :model
     #
     # @param opts [Hash{Symbol=>Object}] .
@@ -318,7 +320,7 @@ def initialize(
     # @param send_retry_header [Boolean]
     #
     # @raise [OnebusawaySDK::APIError]
-    # @return [Array(Net::HTTPResponse, Enumerable)]
+    # @return [Array(Integer, Net::HTTPResponse, Enumerable)]
     #
     private def send_request(request, redirect_count:, retry_count:, send_retry_header:)
       url, headers, max_retries, timeout = request.fetch_values(:url, :headers, :max_retries, :timeout)
@@ -341,7 +343,7 @@ def initialize(
 
       case status
       in ..299
-        [response, stream]
+        [status, response, stream]
       in 300..399 if redirect_count >= self.class::MAX_REDIRECTS
         message = "Failed to complete the request within #{self.class::MAX_REDIRECTS} redirects."
 
@@ -359,13 +361,15 @@ def initialize(
         )
       in OnebusawaySDK::APIConnectionError if retry_count >= max_retries
         raise status
-      in (400..) if retry_count >= max_retries || (response && !self.class.should_retry?(
-        status,
-        headers: response
-      ))
+      in (400..) if retry_count >= max_retries || !self.class.should_retry?(status, headers: response)
         decoded = OnebusawaySDK::Util.decode_content(response, stream: stream, suppress_error: true)
 
-        stream.each { srv_fault ? break : next }
+        if srv_fault
+          OnebusawaySDK::Util.close_fused!(stream)
+        else
+          stream.each { next }
+        end
+
         raise OnebusawaySDK::APIStatusError.for(
           url: url,
           status: status,
@@ -376,7 +380,11 @@ def initialize(
       in (400..) | OnebusawaySDK::APIConnectionError
         delay = retry_delay(response, retry_count: retry_count)
 
-        stream&.each { srv_fault ? break : next }
+        if srv_fault
+          OnebusawaySDK::Util.close_fused!(stream)
+        else
+          stream&.each { next }
+        end
         sleep(delay)
 
         send_request(
@@ -388,48 +396,6 @@ def initialize(
       end
     end
 
-    # @private
-    #
-    # @param req [Hash{Symbol=>Object}] .
-    #
-    #   @option req [Symbol] :method
-    #
-    #   @option req [String, Array<String>] :path
-    #
-    #   @option req [Hash{String=>Array<String>, String, nil}, nil] :query
-    #
-    #   @option req [Hash{String=>String, Integer, Array<String, Integer, nil>, nil}, nil] :headers
-    #
-    #   @option req [Object, nil] :body
-    #
-    #   @option req [Symbol, nil] :unwrap
-    #
-    #   @option req [Class, nil] :page
-    #
-    #   @option req [OnebusawaySDK::Converter, Class, nil] :model
-    #
-    #   @option req [OnebusawaySDK::RequestOptions, Hash{Symbol=>Object}, nil] :options
-    #
-    # @param headers [Hash{String=>String}, Net::HTTPHeader]
-    #
-    # @param stream [Enumerable]
-    #
-    # @return [Object]
-    #
-    private def parse_response(req, headers:, stream:)
-      decoded = OnebusawaySDK::Util.decode_content(headers, stream: stream)
-      unwrapped = OnebusawaySDK::Util.dig(decoded, req[:unwrap])
-
-      case [req[:page], req.fetch(:model, OnebusawaySDK::Unknown)]
-      in [Class => page, _]
-        page.new(client: self, req: req, headers: headers, unwrapped: unwrapped)
-      in [nil, Class | OnebusawaySDK::Converter => model]
-        OnebusawaySDK::Converter.coerce(model, unwrapped)
-      in [nil, nil]
-        unwrapped
-      end
-    end
-
     # Execute the request specified by `req`. This is the method that all resource
     #   methods call into.
     #
@@ -449,6 +415,8 @@ def initialize(
     #
     #   @option req [Class, nil] :page
     #
+    #   @option req [Class, nil] :stream
+    #
     #   @option req [OnebusawaySDK::Converter, Class, nil] :model
     #
     #   @option req [OnebusawaySDK::RequestOptions, Hash{Symbol=>Object}, nil] :options
@@ -458,19 +426,31 @@ def initialize(
     #
     def request(req)
       self.class.validate!(req)
+      model = req.fetch(:model) { OnebusawaySDK::Unknown }
       opts = req[:options].to_h
       OnebusawaySDK::RequestOptions.validate!(opts)
       request = build_request(req.except(:options), opts)
+      url = request.fetch(:url)
 
       # Don't send the current retry count in the headers if the caller modified the header defaults.
       send_retry_header = request.fetch(:headers)["x-stainless-retry-count"] == "0"
-      response, stream = send_request(
+      status, response, stream = send_request(
         request,
         redirect_count: 0,
         retry_count: 0,
         send_retry_header: send_retry_header
       )
-      parse_response(req, headers: response, stream: stream)
+
+      decoded = OnebusawaySDK::Util.decode_content(response, stream: stream)
+      case req
+      in { stream: Class => st }
+        st.new(model: model, url: url, status: status, response: response, messages: decoded)
+      in { page: Class => page }
+        page.new(client: self, req: req, headers: response, unwrapped: decoded)
+      else
+        unwrapped = OnebusawaySDK::Util.dig(decoded, req[:unwrap])
+        OnebusawaySDK::Converter.coerce(model, unwrapped)
+      end
     end
 
     # @return [String]

lib/onebusaway-sdk/errors.rb

@@ -99,11 +99,12 @@ class APIStatusError < OnebusawaySDK::APIError
     # @param body [Object, nil]
     # @param request [nil]
     # @param response [nil]
+    # @param message [String, nil]
     #
     # @return [OnebusawaySDK::APIStatusError]
     #
-    def self.for(url:, status:, body:, request:, response:)
-      kwargs = {url: url, status: status, body: body, request: request, response: response}
+    def self.for(url:, status:, body:, request:, response:, message: nil)
+      kwargs = {url: url, status: status, body: body, request: request, response: response, message: message}
 
       case status
       in 400

lib/onebusaway-sdk/pooled_net_requester.rb

@@ -131,33 +131,38 @@ def execute(request)
       req = self.class.build_request(request)
 
       eof = false
+      finished = false
       enum = Enumerator.new do |y|
         with_pool(url) do |conn|
+          next if finished
+
           self.class.calibrate_socket_timeout(conn, deadline)
           conn.start unless conn.started?
 
           self.class.calibrate_socket_timeout(conn, deadline)
           conn.request(req) do |rsp|
             y << [conn, rsp]
+            break if finished
+
             rsp.read_body do |bytes|
               y << bytes
+              break if finished
+
               self.class.calibrate_socket_timeout(conn, deadline)
             end
             eof = true
           end
         end
       end
 
-      # need to protect the `Enumerator` against `#.rewind`
-      fused = false
       conn, response = enum.next
-      body = Enumerator.new do |y|
-        next if fused
-
-        fused = true
-        loop { y << enum.next }
-      ensure
-        conn.finish if !eof && conn.started?
+      body = OnebusawaySDK::Util.fused_enum(enum) do
+        finished = true
+        tap do
+          enum.next
+        rescue StopIteration
+        end
+        conn.finish if !eof && conn&.started?
       end
       [response, (response.body = body)]
     end

lib/onebusaway-sdk/util.rb

@@ -496,6 +496,9 @@ def encode_content(headers, body)
       #
       def decode_content(headers, stream:, suppress_error: false)
         case headers["content-type"]
+        in %r{^text/event-stream}
+          lines = enum_lines(stream)
+          parse_sse(lines)
         in %r{^application/json}
           json = stream.to_a.join
           begin
@@ -512,6 +515,121 @@ def decode_content(headers, stream:, suppress_error: false)
         end
       end
     end
+
+    class << self
+      # @private
+      #
+      # https://doc.rust-lang.org/std/iter/trait.FusedIterator.html
+      #
+      # @param enum [Enumerable]
+      # @param close [Proc]
+      #
+      # @return [Enumerable]
+      #
+      def fused_enum(enum, &close)
+        fused = false
+        iter = Enumerator.new do |y|
+          next if fused
+
+          fused = true
+          loop { y << enum.next }
+        ensure
+          close&.call
+          close = nil
+        end
+
+        iter.define_singleton_method(:rewind) do
+          fused = true
+          self
+        end
+        iter
+      end
+
+      # @private
+      #
+      # @param enum [Enumerable, nil]
+      #
+      def close_fused!(enum)
+        return unless enum.is_a?(Enumerator)
+
+        # rubocop:disable Lint/UnreachableLoop
+        enum.rewind.each { break }
+        # rubocop:enable Lint/UnreachableLoop
+      end
+
+      # @private
+      #
+      # @param enum [Enumerable, nil]
+      # @param blk [Proc]
+      #
+      def chain_fused(enum, &blk)
+        iter = Enumerator.new { blk.call(_1) }
+        fused_enum(iter) { close_fused!(enum) }
+      end
+    end
+
+    class << self
+      # @private
+      #
+      # @param enum [Enumerable]
+      #
+      # @return [Enumerable]
+      #
+      def enum_lines(enum)
+        chain_fused(enum) do |y|
+          buffer = String.new
+          enum.each do |row|
+            buffer << row
+            while (idx = buffer.index("\n"))
+              y << buffer.slice!(..idx)
+            end
+          end
+          y << buffer unless buffer.empty?
+        end
+      end
+
+      # @private
+      #
+      # https://html.spec.whatwg.org/multipage/server-sent-events.html#parsing-an-event-stream
+      #
+      # @param lines [Enumerable]
+      #
+      # @return [Hash{Symbol=>Object}]
+      #
+      def parse_sse(lines)
+        chain_fused(lines) do |y|
+          blank = {event: nil, data: nil, id: nil, retry: nil}
+          current = {}
+
+          lines.each do |line|
+            case line.strip
+            in ""
+              next if current.empty?
+              y << {**blank, **current}
+              current = {}
+            in /^:/
+              next
+            in /^([^:]+):\s?(.*)$/
+              _, field, value = Regexp.last_match.to_a
+              case field
+              in "event"
+                current.merge!(event: value)
+              in "data"
+                (current[:data] ||= String.new) << value << "\n"
+              in "id" unless value.include?("\0")
+                current.merge!(id: value)
+              in "retry" if /^\d+$/ =~ value
+                current.merge!(retry: Integer(value))
+              else
+              end
+            else
+            end
+          end
+
+          y << {**blank, **current} unless current.empty?
+        end
+      end
+    end
   end
 
   # rubocop:enable Metrics/ModuleLength

lib/onebusaway-sdk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OnebusawaySDK
-  VERSION = "0.1.0-alpha.205"
+  VERSION = "0.1.0-alpha.206"
 end