html2rss 0.32.1 → 0.32.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d74d19e935fcf05c7bd0893f2113dfac1e6639de926ef8844159118ad13ff5
-  data.tar.gz: 3999a5e55251f993b6721d9d3f8c03b8c7588fa0834499a53c808789bb7a3ded
+  metadata.gz: 8d37540b2f300af8a1db631e16cf6cabf4cfa76069000a71c7723737225bd6c3
+  data.tar.gz: bd8f656ae629587336257d790da183c759b9c709c1ba411e5c0041156d35dd6b
 SHA512:
-  metadata.gz: 1c7bea03d8553b2e8ec76c8216b57e0f07b20157cb1c1710c31b4730281b410c95b61541fae56bc4d3853cedf5e62854e0255b920607e28cfa902e941e779953
-  data.tar.gz: 6911fdce7df3238bbe27b28b6a8f747077b12a5cd949b12e4cc0bddadff1433f0ef56662cc361f7d80c90924fe38813ac6584ef0ec08a6b39b0859bc4067d2d4
+  metadata.gz: 802b88abad9bbadfa6753a5c62694a66c6eec3774e84d85191beabdfdd2bc8df3e37fdf325bc14c1d6fda0b90528aca2484df15d0d985b6e328c07f4c27a49b9
+  data.tar.gz: 827d398c34732c10600ced1002525702392448fcb4e8b585f7c27048c8fae38e9c2652307705c8a91e82fba295dbbfa8bfb0cc4dc3a71c4d70cdf9773722a4cf

data/lib/html2rss/auto_source/scraper/meta_oembed.rb

@@ -116,6 +116,7 @@ module Html2rss
         end
 
         # @return [Hash{Symbol => Object}] oEmbed fields hash
+        # rubocop:disable-next Metrics/AbcSize, Metrics/MethodLength -- structured warn keeps fields local
         def fetch_oembed_data
           return {} unless request_session && (link_node = oembed_link_node)
           return {} unless (oembed_url = resolve_url(link_node['href']))
@@ -123,7 +124,12 @@ module Html2rss
           response = request_session.follow_up(url: oembed_url, relation: :auto_source, origin_url: url)
           parse_oembed_response(response)
         rescue Html2rss::Error, RequestService::UnsupportedResponseContentType, JSON::ParserError => error
-          Log.warn("#{self.class}: failed to fetch oEmbed payload (#{error.class}: #{error.message})")
+          Log.warn({
+            event_name: 'meta_oembed.fetch_failed',
+            host: url.host,
+            error_class: error.class.name,
+            message: "#{self.class}: failed to fetch oEmbed payload (#{error.class}: #{error.message})"
+          }.to_json)
           {}
         end
 

data/lib/html2rss/auto_source/scraper/native_feed.rb

@@ -57,16 +57,25 @@ module Html2rss
         ##
         # @yieldparam article [Hash{Symbol => Object}]
         # @return [Enumerator, void]
+        # rubocop:disable-next Metrics/AbcSize, Metrics/MethodLength -- structured empty/items logs
         def each(&)
           return enum_for(:each) unless block_given?
 
           articles = fetch_articles
           if articles.empty?
-            Log.info("#{self.class}: host=#{url.host} item_count=0 fallback=true")
+            Log.info({
+              event_name: 'auto_source.native_feed.empty',
+              host: url.host,
+              message: "#{self.class}: host=#{url.host} item_count=0 fallback=true"
+            }.to_json)
             return
           end
 
-          Log.info("#{self.class}: host=#{url.host} item_count=#{articles.size} fallback=false")
+          Log.info({
+            event_name: 'auto_source.native_feed.items',
+            host: url.host,
+            message: "#{self.class}: host=#{url.host} item_count=#{articles.size} fallback=false"
+          }.to_json)
           articles.each(&)
         end
 
@@ -74,7 +83,8 @@ module Html2rss
 
         attr_reader :parsed_body, :url, :request_session
 
-        def fetch_articles # rubocop:disable Metrics/MethodLength -- discovery + parse path
+        # rubocop:disable-next Metrics/AbcSize, Metrics/MethodLength -- discovery + parse + structured warn
+        def fetch_articles
           return [] unless request_session
 
           response = Syndication::Discovery.best_feed_response(
@@ -87,7 +97,12 @@ module Html2rss
 
           Syndication::Parser.parse_response(response)
         rescue Html2rss::Error, ArgumentError => error
-          Log.warn("#{self.class}: host=#{url.host} failed (#{error.class}: #{error.message})")
+          Log.warn({
+            event_name: 'auto_source.native_feed.failed',
+            host: url.host,
+            error_class: error.class.name,
+            message: "#{self.class}: host=#{url.host} failed (#{error.class}: #{error.message})"
+          }.to_json)
           []
         end
       end

data/lib/html2rss/auto_source/scraper/schema.rb

@@ -12,7 +12,7 @@ module Html2rss
       #
       # @see https://schema.org/docs/full.html
       # @see https://developers.google.com/search/docs/appearance/structured-data/article#microdata
-      class Schema
+      class Schema # rubocop:disable Metrics/ClassLength -- scraper + structured warn paths
         include Enumerable
 
         # Matches a leading schema.org URL prefix on @type values (http or https).
@@ -156,7 +156,11 @@ module Html2rss
           def parse_script_tag(script_tag)
             JSON.parse(script_tag.text, symbolize_names: true)
           rescue JSON::ParserError => error
-            Log.warn("#{name}: failed to parse JSON", error: error.message)
+            Log.warn({
+              event_name: 'schema.parse_failed',
+              error_class: error.class.name,
+              message: "#{name}: failed to parse JSON (#{error.message})"
+            }.to_json)
             []
           end
         end

data/lib/html2rss/auto_source/scraper/sitemap.rb

@@ -7,7 +7,7 @@ module Html2rss
     module Scraper
       ##
       # Scrapes articles from XML sitemaps explicitly linked in HTML or discovered via standard sitemap paths.
-      class Sitemap
+      class Sitemap # rubocop:disable Metrics/ClassLength -- scraper + structured warn paths
         include Enumerable
 
         # Selector for sitemap link tags in HTML head
@@ -78,6 +78,7 @@ module Html2rss
 
         attr_reader :parsed_body, :body, :url, :request_session, :min_priority, :max_age_days
 
+        # rubocop:disable-next Metrics/MethodLength -- structured budget-exhausted warn
         def fetch_and_parse_entries
           entries = parse_direct_sitemap
           return entries unless entries.empty?
@@ -87,7 +88,11 @@ module Html2rss
 
           parse_sitemap_xml(xml_body)
         rescue Html2rss::RequestService::RequestBudgetExceeded
-          Log.warn("#{self.class}: sitemap fetch stopped — request budget exhausted")
+          Log.warn({
+            event_name: 'sitemap.budget_exhausted',
+            host: url.host,
+            message: "#{self.class}: sitemap fetch stopped — request budget exhausted"
+          }.to_json)
           []
         end
 
@@ -122,10 +127,15 @@ module Html2rss
 
           Scraper::Sitemap::Parser.call(xml, min_priority:, max_age_days:).entries
         rescue Html2rss::RequestService::RequestBudgetExceeded
-          Log.warn("#{self.class}: sitemap fan-out stopped — request budget exhausted")
+          Log.warn({
+            event_name: 'sitemap.fanout_budget_exhausted',
+            host: url.host,
+            message: "#{self.class}: sitemap fan-out stopped — request budget exhausted"
+          }.to_json)
           nil
         end
 
+        # rubocop:disable-next Metrics/MethodLength -- structured fetch-failed warn
         def fetch_xml(target_url)
           return unless request_session && target_url
 
@@ -134,7 +144,12 @@ module Html2rss
         rescue Html2rss::RequestService::RequestBudgetExceeded
           raise
         rescue Html2rss::Error => error
-          Log.warn("#{self.class}: failed to fetch sitemap (#{error.class}: #{error.message})")
+          Log.warn({
+            event_name: 'sitemap.fetch_failed',
+            host: url.host,
+            error_class: error.class.name,
+            message: "#{self.class}: failed to fetch sitemap (#{error.class}: #{error.message})"
+          }.to_json)
           nil
         end
 

data/lib/html2rss/auto_source/scraper/wordpress_api/posts_endpoint.rb

@@ -59,7 +59,7 @@ module Html2rss
             nil
           end
 
-          def fetchable_page_scope?
+          def fetchable_page_scope? # rubocop:disable Metrics/MethodLength -- scope checks + structured warn
             return true if page_scope.fetchable?
 
             if page_scope.reason == :non_archive
@@ -70,7 +70,11 @@ module Html2rss
               return false
             end
 
-            logger.warn("#{WordpressApi}: unable to derive safe WordPress archive scope for #{page_url}")
+            logger.warn({
+              event_name: 'wordpress_api.unsafe_archive_scope',
+              host: page_url.host,
+              message: "#{WordpressApi}: unable to derive safe WordPress archive scope for #{page_url}"
+            }.to_json)
             false
           end
 

data/lib/html2rss/auto_source/scraper/wordpress_api.rb

@@ -75,19 +75,31 @@ module Html2rss
 
         attr_reader :parsed_body, :url, :request_session, :page_scope
 
+        # rubocop:disable-next Metrics/AbcSize, Metrics/MethodLength -- structured rescue logs
         def fetch_posts
           response = posts_response
           return unless response
 
           Array(response.parsed_body)
         rescue RequestService::UnsupportedResponseContentType => error
-          Log.warn("#{self.class}: unsupported WordPress API posts content type (#{error.message})")
+          Log.warn({
+            event_name: 'wordpress_api.unsupported_content_type',
+            host: url.host,
+            error_class: error.class.name,
+            message: "#{self.class}: unsupported WordPress API posts content type (#{error.message})"
+          }.to_json)
           nil
         rescue JSON::ParserError => error
-          Log.warn("#{self.class}: failed to parse WordPress API posts JSON (#{error.message})")
+          Log.warn({
+            event_name: 'wordpress_api.parse_failed',
+            host: url.host,
+            error_class: error.class.name,
+            message: "#{self.class}: failed to parse WordPress API posts JSON (#{error.message})"
+          }.to_json)
           nil
         end
 
+        # rubocop:disable-next Metrics/MethodLength -- structured fetch-failed warn
         def posts_response
           return unless request_session
           return unless (resolved_posts_url = posts_endpoint_url)
@@ -98,7 +110,12 @@ module Html2rss
             origin_url: url
           )
         rescue Html2rss::Error => error
-          Log.warn("#{self.class}: failed to fetch WordPress API posts (#{error.class}: #{error.message})")
+          Log.warn({
+            event_name: 'wordpress_api.fetch_failed',
+            host: url.host,
+            error_class: error.class.name,
+            message: "#{self.class}: failed to fetch WordPress API posts (#{error.class}: #{error.message})"
+          }.to_json)
           nil
         end
 

data/lib/html2rss/auto_source.rb

@@ -277,7 +277,12 @@ module Html2rss
     def run_scraper(instance)
       instance.map { |item| article_from_scraper_item(item, instance) }
     rescue *OPERATIONAL_ERRORS => error
-      Log.warn("#{self.class}: #{instance.class} quarantined #{error.class}: #{error.message}")
+      Log.warn({
+        event_name: 'auto_source.quarantined',
+        host: url.host,
+        error_class: error.class.name,
+        message: "#{self.class}: #{instance.class} quarantined #{error.class}: #{error.message}"
+      }.to_json)
       []
     end
 

data/lib/html2rss/feed_pipeline/README.md

@@ -35,6 +35,10 @@ These abort immediately (`AutoFallback::NON_FALLBACK_ERRORS`): unknown strategy,
 
 Retries share the feed's request/session policy. Pin a concrete strategy when you need a single-hop budget profile.
 
+### Terminal fallback outcome
+
+A hop that returns zero items does **not** erase an earlier terminal transport failure (`RequestTimedOut` or `BlockedSurfaceDetected`). `AutoFallback` remembers that error across later hops and, when no later hop yields items, re-raises it with `attempts` attached. A later hop that extracts items still succeeds. Two zero-item hops with no terminal transport error still raise `NoFeedItemsExtracted`. `html2rss-web` `ErrorClassifier` maps the raised error to HTTP/cache policy; it does not invent a second cache rule for empty extraction.
+
 ## Success signals
 
 - `Html2rss::RequestService::Response` includes transport metadata for the strategy that produced it.

data/lib/html2rss/feed_pipeline/auto_fallback.rb

@@ -27,16 +27,26 @@ module Html2rss
         RequestService::RedirectLimitReached
       ].freeze
 
+      # Transport failures preserved across a later hop that extracts zero items.
+      # Re-raised from finalize_failure so web maps them to uncacheable gateway/blocked
+      # decisions instead of EXTRACTION_EMPTY.
+      TERMINAL_TRANSPORT_ERRORS = [
+        RequestService::RequestTimedOut,
+        RequestService::BlockedSurfaceDetected
+      ].freeze
+
       ##
       # Mutable run state for one auto-fallback chain: attempts plus selected result.
       class AttemptState
-        attr_reader :attempts, :result, :last_response, :last_error, :entry_resolution
+        attr_reader :attempts, :result, :last_response, :last_error, :entry_resolution,
+                    :terminal_transport_error
 
         def initialize
           @attempts = []
           @result = nil
           @last_response = nil
           @last_error = nil
+          @terminal_transport_error = nil
           @entry_resolution = nil
           @resolution_tried = false
           @aborted = false
@@ -76,6 +86,9 @@ module Html2rss
           attempt[:transport_meta] = meta if meta&.any?
           @attempts << attempt
           @last_error = error
+          return unless TERMINAL_TRANSPORT_ERRORS.any? { |klass| error.is_a?(klass) }
+
+          @terminal_transport_error = error
         end
 
         # @param strategy [Symbol] strategy that returned a response
@@ -85,7 +98,7 @@ module Html2rss
         def record_items(strategy:, items_count:, transport_meta: nil)
           @last_error = nil
           attempt = { strategy:, items_count:, error_class: nil }
-          attempt[:transport_meta] = transport_meta if transport_meta && !transport_meta.empty?
+          attempt[:transport_meta] = transport_meta if transport_meta&.any?
           @attempts << attempt
         end
 
@@ -183,7 +196,9 @@ module Html2rss
 
       # rubocop:disable-next Metrics/MethodLength, Metrics/AbcSize -- extract + resolution delegate
       def process_response(response:, strategy:, next_strategy:, request_session:, state:)
-        articles, dedup_dropped, admission_drops = articles_for(response:, request_session:)
+        articles, dedup_dropped, admission_drops = pipeline.deduplicated_articles(
+          config:, response:, request_session:
+        )
         state.remember_response(response)
         items_count = articles.size
         state.record_items(strategy:, items_count:, transport_meta: response.transport_meta)
@@ -204,7 +219,7 @@ module Html2rss
                                 state:)
         end
 
-        if deterministic_status?(response)
+        if DETERMINISTIC_HTTP_STATUSES.member?(response&.status)
           state.abort!
           Log.debug("#{self.class}: deterministic HTTP #{response.status}; aborting auto fallback")
           return
@@ -213,15 +228,7 @@ module Html2rss
         log_info_fallback_zero_items(strategy:, next_strategy:, response:) if next_strategy
       end
 
-      def deterministic_status?(response)
-        DETERMINISTIC_HTTP_STATUSES.member?(response&.status)
-      end
-
-      def articles_for(response:, request_session:)
-        pipeline.deduplicated_articles(config:, response:, request_session:)
-      end
-
-      # rubocop:disable-next Metrics/ParameterLists -- success kwargs match PipelineOutcome
+      # rubocop:disable-next Metrics/ParameterLists, Metrics/MethodLength -- success kwargs + structured selected log
       def record_success(response:, strategy:, articles:, dedup_dropped:, admission_drops:, state:)
         attempt_count = state.attempts.size
         state.succeed!(
@@ -231,63 +238,72 @@ module Html2rss
         )
         return unless attempt_count > 1
 
-        Log.info("#{self.class}: auto selected strategy=#{strategy} after attempts=#{attempt_count} " \
-                 "host=#{response.url.host} elapsed=#{format('%.3f', budget.elapsed_seconds)}s " \
-                 "budget_remaining=#{budget_remaining_label}")
+        Log.info({
+          event_name: 'auto_fallback.selected',
+          host: response.url.host,
+          strategy: strategy.to_s,
+          attempt_count:,
+          message: "#{self.class}: auto selected strategy=#{strategy} after attempts=#{attempt_count} " \
+                   "host=#{response.url.host} elapsed=#{format('%.3f', budget.elapsed_seconds)}s " \
+                   "budget_remaining=#{budget_remaining_label}"
+        }.to_json)
       end
 
       def finalize_failure(state)
-        if raise_last_error?(state)
-          error = state.last_error
+        error = failure_error(state)
+        if error
           error.attempts = state.attempts if error.is_a?(Html2rss::Error)
           raise error
         end
 
+        response = state.last_response
         raise NoFeedItemsExtracted.new(
           attempts: state.attempts,
-          surface_category: surface_category_for(state.last_response)
+          surface_category: (PageRecon.surface_category_for(response:, url: response.url) if response)
         )
       end
 
-      def raise_last_error?(state)
-        error = state.last_error
-        return false if error.nil? || error.is_a?(RequestService::BotasaurusConfigurationError)
-
-        true
-      end
+      # Prefer a remembered timeout/blocked-surface over a later zero-item hop so
+      # callers do not cache EXTRACTION_EMPTY for a transport failure.
+      def failure_error(state)
+        return state.terminal_transport_error if state.terminal_transport_error
 
-      def surface_category_for(response)
-        return unless response
+        error = state.last_error
+        return if error.nil? || error.is_a?(RequestService::BotasaurusConfigurationError)
 
-        PageRecon.surface_category_for(response:, url: response.url)
+        error
       end
 
-      # rubocop:disable-next Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable-next Metrics/AbcSize, Metrics/MethodLength -- shared payload then info/warn dispatch
       def log_fallback_error(strategy:, next_strategy:, error:, request_session:)
         host = request_session.url.host
         detail = "host=#{host} elapsed=#{format('%.3f', budget.elapsed_seconds)}s " \
                  "budget_remaining=#{budget_remaining_label}"
-        if error.is_a?(RequestService::RequestTimedOut)
-          Log.info("#{self.class}: auto fallback #{strategy} -> #{next_strategy} " \
-                   "after timeout=#{error.class} #{detail}")
-        else
-          Log.warn({
-            event_name: 'auto_fallback.error',
-            host:,
-            strategy: strategy.to_s,
-            next_strategy: next_strategy.to_s,
-            error_class: error.class.name,
-            message: "#{self.class}: auto fallback #{strategy} -> #{next_strategy} " \
-                     "after error=#{error.class} #{detail}"
-          }.to_json)
-        end
+        timed_out = error.is_a?(RequestService::RequestTimedOut)
+        payload = {
+          event_name: timed_out ? 'auto_fallback.timeout' : 'auto_fallback.error',
+          host:,
+          strategy: strategy.to_s,
+          next_strategy: next_strategy.to_s,
+          error_class: error.class.name,
+          message: "#{self.class}: auto fallback #{strategy} -> #{next_strategy} " \
+                   "after #{timed_out ? "timeout=#{error.class}" : "error=#{error.class}"} #{detail}"
+        }.to_json
+        timed_out ? Log.info(payload) : Log.warn(payload)
         Log.debug("#{self.class}: strategy=#{strategy} error=#{error.class}: #{error.message} #{detail}")
       end
 
       def log_info_fallback_zero_items(strategy:, next_strategy:, response:)
-        Log.info("#{self.class}: auto fallback #{strategy} -> #{next_strategy} after zero extracted items " \
-                 "host=#{response.url.host} elapsed=#{format('%.3f', budget.elapsed_seconds)}s " \
-                 "budget_remaining=#{budget_remaining_label}")
+        host = response.url.host
+        Log.info({
+          event_name: 'auto_fallback.zero_items',
+          host:,
+          strategy: strategy.to_s,
+          next_strategy: next_strategy.to_s,
+          message: "#{self.class}: auto fallback #{strategy} -> #{next_strategy} after zero extracted items " \
+                   "host=#{host} elapsed=#{format('%.3f', budget.elapsed_seconds)}s " \
+                   "budget_remaining=#{budget_remaining_label}"
+        }.to_json)
       end
 
       def budget_remaining_label

data/lib/html2rss/feed_resolution.rb

@@ -285,10 +285,13 @@ module Html2rss
 
       def result(applied:, reason:, scrape_url:, probe_count:, winner_score:)
         scrape_host = Html2rss::Url.from_absolute(scrape_url).host
-        Log.info(
-          "FeedResolution: entry_host=#{entry_url.host} scrape_host=#{scrape_host} " \
-          "applied=#{applied} probe_count=#{probe_count} winner_score=#{winner_score.inspect} reason=#{reason}"
-        )
+        Log.info({
+          event_name: 'feed_resolution.result',
+          host: entry_url.host,
+          message: "FeedResolution: entry_host=#{entry_url.host} scrape_host=#{scrape_host} " \
+                   "applied=#{applied} probe_count=#{probe_count} winner_score=#{winner_score.inspect} " \
+                   "reason=#{reason}"
+        }.to_json)
         Result.new(entry_url: entry_url.to_s, scrape_url:, applied:, reason:, probe_count:, winner_score:)
       end
     end

data/lib/html2rss/request_service/httpx_strategy.rb

@@ -21,9 +21,9 @@ module Html2rss
       # combined with ping! on a reused closed selector that never decrements retries,
       # that overflows the stack and kills Falcon workers.
       RETRY_AFTER_SECONDS = 0.25
-      # Bounds passed to the retries plugin and every +session.with+.
-      # HTTPX retries stay inside one {RequestService::Budget} slot and the shared
-      # wall-clock deadline; do not consume a slot per attempt.
+      # Base-session retries plugin defaults (stack-overflow guard for ping reconnects).
+      # Per-request +session.with+ sets +max_retries: 0+; Ruby owns TimeoutError retries
+      # against the monotonic deadline so HTTPX cannot stack read timeouts past the cap.
       # Do not reload +:fiber_concurrency+: a reused closed selector made +ping!+
       # skip decrementing retries and recurse until +SystemStackError+.
       #
@@ -54,19 +54,19 @@ module Html2rss
       def perform_execute
         deadline = request_deadline
         reset_redirect_tracking!
-        raw_response = request_with_terminal_redirect_retry(deadline:)
+        raw_response = request_with_deadline_retries(deadline:)
         build_response(raw_response)
       end
 
       private
 
-      # Caps one HTTPX execute (including internal MAX_RETRIES) so a hanging
-      # :default tier cannot consume the full shared auto-fallback budget.
+      # Caps one strategy execute (Ruby retries included) so a hanging :default tier
+      # cannot consume the full shared auto-fallback budget.
       #
       # @return [Float] monotonic deadline
       def request_deadline
         budget_timeout = ctx.budget.effective_timeout_seconds(fallback: ctx.policy.total_timeout_seconds)
-        monotonic_now + [budget_timeout, attempt_timeout_ceiling].min
+        Process.clock_gettime(Process::CLOCK_MONOTONIC) + [budget_timeout, attempt_timeout_ceiling].min
       end
 
       # @return [Float] connect + read ceiling for a single attempt
@@ -81,8 +81,30 @@ module Html2rss
         @current_url = request_url
       end
 
-      def request_with_terminal_redirect_retry(deadline:)
-        raw_response = execute_http_request(deadline:)
+      # Retries HTTPX timeouts in Ruby while the shared monotonic deadline has time left.
+      # First try consumes the budget slot; retries do not.
+      def request_with_deadline_retries(deadline:)
+        state = { retries_remaining: MAX_RETRIES, consume_budget: true }
+
+        begin
+          request_with_terminal_redirect_retry(deadline:, consume_budget: state[:consume_budget])
+        rescue HTTPX::TimeoutError => error
+          prepare_deadline_retry!(deadline:, state:, error:)
+          retry
+        end
+      end
+
+      def prepare_deadline_retry!(deadline:, state:, error:)
+        raise error if state[:retries_remaining].zero?
+
+        remaining_timeout_seconds(deadline)
+        state[:retries_remaining] -= 1
+        state[:consume_budget] = false
+        reset_redirect_tracking!
+      end
+
+      def request_with_terminal_redirect_retry(deadline:, consume_budget: true)
+        raw_response = execute_http_request(deadline:, consume_budget:)
         return raw_response unless redirect_limit_reached?(raw_response)
 
         unless terminal_redirect_retryable?(raw_response)
@@ -164,6 +186,7 @@ module Html2rss
         session.with(session_options(deadline))
       end
 
+      # Plugin retries stay off per request; Ruby owns deadline-bounded TimeoutError retries.
       def session_options(deadline)
         remaining = remaining_timeout_seconds(deadline)
         {
@@ -173,7 +196,7 @@ module Html2rss
           max_response_body_size: ctx.policy.max_response_bytes,
           resolver_class: :system,
           redirect_on: redirect_callback,
-          **RETRY_OPTIONS
+          **RETRY_OPTIONS.merge(max_retries: 0)
         }
       end
 
@@ -219,16 +242,12 @@ module Html2rss
       end
 
       def remaining_timeout_seconds(deadline)
-        remaining = deadline - monotonic_now
+        remaining = deadline - Process.clock_gettime(Process::CLOCK_MONOTONIC)
         raise RequestTimedOut, 'Request timed out' if remaining <= 0
 
         remaining
       end
 
-      def monotonic_now
-        Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      end
-
       def timeout_error?(error)
         error.is_a?(HTTPX::TimeoutError) || super
       end

data/lib/html2rss/request_service/strategy.rb

@@ -111,18 +111,24 @@ module Html2rss
 
       # @param reason [String] timeout classification (budget_exhausted / transport)
       # @return [void]
-      # rubocop:disable-next Metrics/AbcSize -- structured timeout fields stay in one log line
+      # rubocop:disable-next Metrics/AbcSize, Metrics/MethodLength -- structured timeout fields stay in one log line
       def log_timeout!(reason:)
         remaining = ctx.budget.remaining_timeout_seconds
         remaining_label = remaining.nil? ? 'untracked' : format('%.3f', remaining)
+        host = ctx.url.host
         detail = [
           "strategy=#{self.class.name}",
-          "host=#{ctx.url.host}",
+          "host=#{host}",
           "elapsed=#{format('%.3f', ctx.budget.elapsed_seconds)}s",
           "budget_remaining=#{remaining_label}",
           "reason=#{reason}"
         ]
-        Log.info("#{self.class}: request timeout #{detail.join(' ')}")
+        Log.info({
+          event_name: 'request_service.timeout',
+          host:,
+          strategy: self.class.name,
+          message: "#{self.class}: request timeout #{detail.join(' ')}"
+        }.to_json)
       end
 
       # @param error [StandardError]

data/lib/html2rss/sst/normalizer.rb

@@ -119,17 +119,29 @@ module Html2rss
 
         body = parsed.at_css('body')
         if body
-          Html2rss::Log.warn('sst.normalizer root fallback: body')
+          Html2rss::Log.warn({
+            event_name: 'sst.normalizer.root_fallback',
+            reason: 'body',
+            message: 'sst.normalizer root fallback: body'
+          }.to_json)
           return body
         end
 
         first = parsed.element_children.find { |child| element_root?(child) }
         if first
-          Html2rss::Log.warn('sst.normalizer root fallback: first element child')
+          Html2rss::Log.warn({
+            event_name: 'sst.normalizer.root_fallback',
+            reason: 'first_element_child',
+            message: 'sst.normalizer root fallback: first element child'
+          }.to_json)
           return first
         end
 
-        Html2rss::Log.warn('sst.normalizer root fallback: self')
+        Html2rss::Log.warn({
+          event_name: 'sst.normalizer.root_fallback',
+          reason: 'self',
+          message: 'sst.normalizer root fallback: self'
+        }.to_json)
         parsed
       end
 
@@ -146,7 +158,11 @@ module Html2rss
 
         if @node_count >= MAX_NODES && !@degraded
           @degraded = true
-          Html2rss::Log.warn("sst.normalizer MAX_NODES=#{MAX_NODES} breached; degrading to semantic-tag-only")
+          Html2rss::Log.warn({
+            event_name: 'sst.normalizer.max_nodes',
+            max_nodes: MAX_NODES,
+            message: "sst.normalizer MAX_NODES=#{MAX_NODES} breached; degrading to semantic-tag-only"
+          }.to_json)
         end
 
         return if @degraded && !SEMANTIC_DEGRADE_TAGS.include?(tag)

data/lib/html2rss/syndication/discovery.rb

@@ -60,7 +60,11 @@ module Html2rss
         ).tap do |response|
           next unless response
 
-          Log.info("Syndication::Discovery: host=#{page.host} selected_feed_url=#{response.url}")
+          Log.info({
+            event_name: 'syndication.discovery.selected',
+            host: page.host,
+            message: "Syndication::Discovery: host=#{page.host} selected_feed_url=#{response.url}"
+          }.to_json)
         end
       end
 

data/lib/html2rss/syndication/parser.rb

@@ -6,7 +6,7 @@ module Html2rss
   module Syndication
     ##
     # Parses RSS 2.0 and Atom documents into AutoSource article hashes.
-    module Parser
+    module Parser # rubocop:disable Metrics/ModuleLength -- feed formats + structured parse warn
       module_function
 
       ##
@@ -29,7 +29,11 @@ module Html2rss
 
         items_from(feed, base_url:).filter_map { |item| article_hash(item, base_url:) }
       rescue RSS::Error => error
-        Log.warn("Syndication::Parser: failed to parse feed (#{error.class}: #{error.message})")
+        Log.warn({
+          event_name: 'syndication.parse_failed',
+          error_class: error.class.name,
+          message: "Syndication::Parser: failed to parse feed (#{error.class}: #{error.message})"
+        }.to_json)
         []
       end
 

data/lib/html2rss/version.rb

@@ -2,6 +2,6 @@
 
 module Html2rss
   # Current application version.
-  VERSION = '0.32.1'
+  VERSION = '0.32.3'
   public_constant :VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html2rss
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.32.3
 platform: ruby
 authors:
 - Gil Desmarais
@@ -478,7 +478,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/html2rss/html2rss/releases/tag/v0.32.1
+  changelog_uri: https://github.com/html2rss/html2rss/releases/tag/v0.32.3
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: