jetstream_bridge 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c35f196b9196a72202963a0cd3bd6c69cac3f69b24ffa088acec1da028626b08
-  data.tar.gz: cc6fd1ee6669d29bfb25f9ce0c88102df0e19a764b0402ff7cc2314bdec93fdb
+  metadata.gz: fc39ce8a4d26a2488bcd9bb756a6380d3a5336e2048c2bb5b18082b4e7930e5d
+  data.tar.gz: f9c0298070c6a25771d8bf9848582bf256d1b7890e7d4944ad3653eead18a96f
 SHA512:
-  metadata.gz: fb054b30229005b00cbe3d39c1a798fdf6fe90cce7b8e440105528fa4b3415ecec78058daeaa3c38e43894cca57ccae0b12dff037cbbda260da5959253873ca9
-  data.tar.gz: fd3ed465ab7601c221ba861032467bcef304bf17b0e45335df92c5f862900dfc03592ba95c0bc30ae32ff03b81484f6975709d609d317a9d1e81154bbd8df17a
+  metadata.gz: c1b927989ccca2615e3e5229ac5679f9e4bfe76ec92d978cafe6cb1c4dcae40ccbecf4d88699020e9c4cebb695a6de7efedd8bfef259053c901db336181ac294
+  data.tar.gz: 51caa80c8790f79ea2808ab0f85de484b6b17626a08eaf06eb674340a4cead39d8016d2f971b97508e1be45e661490b555360378fcadf7b5c3f407bf30c4453f

data/lib/jetstream_bridge/consumer/consumer.rb

@@ -15,35 +15,47 @@ require_relative 'inbox/inbox_processor'
 module JetstreamBridge
   # Subscribes to destination subject and processes messages via a pull durable.
   class Consumer
-    DEFAULT_BATCH_SIZE = 25
-    FETCH_TIMEOUT_SECS = 5
-    IDLE_SLEEP_SECS    = 0.05
+    DEFAULT_BATCH_SIZE    = 25
+    FETCH_TIMEOUT_SECS    = 5
+    IDLE_SLEEP_SECS       = 0.05
+    MAX_IDLE_BACKOFF_SECS = 1.0
 
     def initialize(durable_name: JetstreamBridge.config.durable_name,
                    batch_size: DEFAULT_BATCH_SIZE, &block)
-      @handler    = block
-      @batch_size = batch_size
-      @durable    = durable_name
-      @jts        = Connection.connect!
+      raise ArgumentError, 'handler block required' unless block_given?
+
+      @handler       = block
+      @batch_size    = Integer(batch_size)
+      @durable       = durable_name
+      @idle_backoff  = IDLE_SLEEP_SECS
+      @running       = true
+      @jts           = Connection.connect!
 
       ensure_destination!
 
       @sub_mgr = SubscriptionManager.new(@jts, @durable, JetstreamBridge.config)
-      @sub_mgr.ensure_consumer!
-      @psub = @sub_mgr.subscribe!
-
       @processor  = MessageProcessor.new(@jts, @handler)
       @inbox_proc = InboxProcessor.new(@processor) if JetstreamBridge.config.use_inbox
+
+      ensure_subscription!
     end
 
     def run!
-      Logging.info("Consumer #{@durable} started…", tag: 'JetstreamBridge::Consumer')
-      loop do
+      Logging.info(
+        "Consumer #{@durable} started (batch=#{@batch_size}, dest=#{JetstreamBridge.config.destination_subject})…",
+        tag: 'JetstreamBridge::Consumer'
+      )
+      while @running
         processed = process_batch
-        sleep(IDLE_SLEEP_SECS) if processed.zero?
+        idle_sleep(processed)
       end
     end
 
+    # Allow external callers to stop a long-running loop gracefully.
+    def stop!
+      @running = false
+    end
+
     private
 
     def ensure_destination!
@@ -52,14 +64,24 @@ module JetstreamBridge
       raise ArgumentError, 'destination_app must be configured'
     end
 
+    def ensure_subscription!
+      @sub_mgr.ensure_consumer!
+      @psub = @sub_mgr.subscribe!
+    end
+
     # Returns number of messages processed; 0 on timeout/idle or after recovery.
     def process_batch
       msgs = fetch_messages
-      process_messages(msgs)
+      return 0 if msgs.nil? || msgs.empty?
+
+      msgs.sum { |m| process_one(m) }
     rescue NATS::Timeout, NATS::IO::Timeout
       0
     rescue NATS::JetStream::Error => e
       handle_js_error(e)
+    rescue StandardError => e
+      Logging.error("Unexpected process_batch error: #{e.class} #{e.message}", tag: 'JetstreamBridge::Consumer')
+      0
     end
 
     # --- helpers ---
@@ -68,10 +90,6 @@ module JetstreamBridge
       @psub.fetch(@batch_size, timeout: FETCH_TIMEOUT_SECS)
     end
 
-    def process_messages(msgs)
-      msgs.sum { |m| process_one(m) }
-    end
-
     def process_one(msg)
       if @inbox_proc
         @inbox_proc.process(msg) ? 1 : 0
@@ -79,6 +97,10 @@ module JetstreamBridge
         @processor.handle_message(msg)
         1
       end
+    rescue StandardError => e
+      # Safety: never let a single bad message kill the batch loop.
+      Logging.error("Message processing crashed: #{e.class} #{e.message}", tag: 'JetstreamBridge::Consumer')
+      0
     end
 
     def handle_js_error(e)
@@ -87,22 +109,36 @@ module JetstreamBridge
           "Recovering subscription after error: #{e.class} #{e.message}",
           tag: 'JetstreamBridge::Consumer'
         )
-        @sub_mgr.ensure_consumer!
-        @psub = @sub_mgr.subscribe!
+        ensure_subscription!
       else
-        Logging.error(
-          "Fetch failed: #{e.class} #{e.message}",
-          tag: 'JetstreamBridge::Consumer'
-        )
+        Logging.error("Fetch failed (non-recoverable): #{e.class} #{e.message}", tag: 'JetstreamBridge::Consumer')
       end
       0
     end
 
     def recoverable_consumer_error?(error)
       msg = error.message.to_s
+      code = js_err_code(msg)
+      # Heuristics: consumer/stream missing, no responders, or common 404-ish cases
       msg =~ /consumer.*(not\s+found|deleted)/i ||
         msg =~ /no\s+responders/i ||
-        msg =~ /stream.*not\s+found/i
+        msg =~ /stream.*not\s+found/i ||
+        code == 404
+    end
+
+    def js_err_code(message)
+      m = message.match(/err_code=(\d{3,5})/)
+      m ? m[1].to_i : nil
+    end
+
+    def idle_sleep(processed)
+      if processed.zero?
+        # exponential-ish backoff with a tiny jitter to avoid sync across workers
+        @idle_backoff = [@idle_backoff * 1.5, MAX_IDLE_BACKOFF_SECS].min
+        sleep(@idle_backoff + (rand * 0.01))
+      else
+        @idle_backoff = IDLE_SLEEP_SECS
+      end
     end
   end
 end

data/lib/jetstream_bridge/consumer/inbox/inbox_message.rb

@@ -7,17 +7,17 @@ module JetstreamBridge
   class InboxMessage
     attr_reader :msg, :seq, :deliveries, :stream, :subject, :headers, :body, :raw, :event_id, :now
 
-    def self.from_nats(m)
-      meta       = (m.respond_to?(:metadata) && m.metadata) || nil
+    def self.from_nats(msg)
+      meta       = (msg.respond_to?(:metadata) && msg.metadata) || nil
       seq        = meta.respond_to?(:stream_sequence) ? meta.stream_sequence : nil
       deliveries = meta.respond_to?(:num_delivered)   ? meta.num_delivered   : nil
       stream     = meta.respond_to?(:stream)          ? meta.stream          : nil
-      subject    = m.subject.to_s
+      subject    = msg.subject.to_s
 
       headers = {}
-      (m.header || {}).each { |k, v| headers[k.to_s.downcase] = v }
+      (msg.header || {}).each { |k, v| headers[k.to_s.downcase] = v }
 
-      raw  = m.data
+      raw  = msg.data
       body = begin
         JSON.parse(raw)
       rescue StandardError
@@ -27,11 +27,11 @@ module JetstreamBridge
       id = (headers['nats-msg-id'] || body['event_id']).to_s.strip
       id = "seq:#{seq}" if id.empty?
 
-      new(m, seq, deliveries, stream, subject, headers, body, raw, id, Time.now.utc)
+      new(msg, seq, deliveries, stream, subject, headers, body, raw, id, Time.now.utc)
     end
 
-    def initialize(m, seq, deliveries, stream, subject, headers, body, raw, event_id, now)
-      @msg        = m
+    def initialize(msg, seq, deliveries, stream, subject, headers, body, raw, event_id, now)
+      @msg        = msg
       @seq        = seq
       @deliveries = deliveries
       @stream     = stream

data/lib/jetstream_bridge/consumer/inbox/inbox_processor.rb

@@ -13,24 +13,24 @@ module JetstreamBridge
     end
 
     # @return [true,false] processed?
-    def process(m)
+    def process(msg)
       klass = ModelUtils.constantize(JetstreamBridge.config.inbox_model)
-      return process_direct(m, klass) unless ModelUtils.ar_class?(klass)
+      return process_direct?(msg, klass) unless ModelUtils.ar_class?(klass)
 
-      msg   = InboxMessage.from_nats(m)
+      msg   = InboxMessage.from_nats(msg)
       repo  = InboxRepository.new(klass)
       record = repo.find_or_build(msg)
 
       if repo.already_processed?(record)
-        m.ack
+        msg.ack
         return true
       end
 
       repo.persist_pre(record, msg)
-      @processor.handle_message(m)
+      @processor.handle_message(msg)
       repo.persist_post(record)
       true
-    rescue => e
+    rescue StandardError => e
       repo.persist_failure(record, e) if defined?(repo) && defined?(record)
       Logging.error("Inbox processing failed: #{e.class}: #{e.message}",
                     tag: 'JetstreamBridge::Consumer')
@@ -39,12 +39,12 @@ module JetstreamBridge
 
     private
 
-    def process_direct(m, klass)
+    def process_direct?(msg, klass)
       unless ModelUtils.ar_class?(klass)
         Logging.warn("Inbox model #{klass} is not an ActiveRecord model; processing directly.",
                      tag: 'JetstreamBridge::Consumer')
       end
-      @processor.handle_message(m)
+      @processor.handle_message(msg)
       true
     end
   end

data/lib/jetstream_bridge/consumer/message_context.rb

@@ -10,12 +10,12 @@ module JetstreamBridge
   ) do
     def self.build(msg)
       new(
-        event_id:   msg.header&.[]('nats-msg-id') || SecureRandom.uuid,
+        event_id: msg.header&.[]('nats-msg-id') || SecureRandom.uuid,
         deliveries: msg.metadata&.num_delivered.to_i,
-        subject:    msg.subject,
-        seq:        msg.metadata&.sequence,
-        consumer:   msg.metadata&.consumer,
-        stream:     msg.metadata&.stream
+        subject: msg.subject,
+        seq: msg.metadata&.sequence,
+        consumer: msg.metadata&.consumer,
+        stream: msg.metadata&.stream
       )
     end
   end

data/lib/jetstream_bridge/consumer/subscription_manager.rb

@@ -86,8 +86,8 @@ module JetstreamBridge
         filter_subject: sval(cfg, :filter_subject), # string
         ack_policy: sval(cfg, :ack_policy), # string
         deliver_policy: sval(cfg, :deliver_policy), # string
-        max_deliver: ival(cfg, :max_deliver),         # integer
-        ack_wait_ms: d_ms(cfg, :ack_wait),            # integer ms
+        max_deliver: ival(cfg, :max_deliver), # integer
+        ack_wait: d_ms(cfg, :ack_wait), # integer ms
         backoff_ms: darr_ms(cfg, :backoff) # array of integer ms
       }
     end

data/lib/jetstream_bridge/inbox_event.rb

@@ -110,8 +110,8 @@ module JetstreamBridge
         def raise_missing_ar!(which, method_name)
           raise(
             "#{which} requires ActiveRecord (tried to call ##{method_name}). " \
-            'Enable `use_inbox` only in apps with ActiveRecord, or add ' \
-            '`gem \"activerecord\"` to your Gemfile.'
+            "Enable `use_inbox` only in apps with ActiveRecord, or add " \
+            "`gem \"activerecord\"` to your Gemfile."
           )
         end
       end

data/lib/jetstream_bridge/outbox_event.rb

@@ -120,8 +120,8 @@ module JetstreamBridge
         def raise_missing_ar!(which, method_name)
           raise(
             "#{which} requires ActiveRecord (tried to call ##{method_name}). " \
-            'Enable `use_outbox` only in apps with ActiveRecord, or add ' \
-            '`gem "activerecord"` to your Gemfile.'
+            "Enable `use_outbox` only in apps with ActiveRecord, or add " \
+            "`gem \"activerecord\"` to your Gemfile."
           )
         end
       end

data/lib/jetstream_bridge/topology/subject_matcher.rb

@@ -34,12 +34,12 @@ module JetstreamBridge
       return true if i == p.length && i == s.length
 
       # If pattern has remaining '>' it can absorb remainder
-      p[i] == '>' || p[i..-1]&.include?('>')
+      p[i] == '>' || p[i..]&.include?('>')
     end
 
     # Do two wildcard patterns admit at least one same subject?
-    def overlap?(a, b)
-      overlap_parts?(a.split('.'), b.split('.'))
+    def overlap?(sub_a, sub_b)
+      overlap_parts?(sub_a.split('.'), sub_b.split('.'))
     end
 
     def overlap_parts?(a_parts, b_parts)
@@ -50,13 +50,14 @@ module JetstreamBridge
         bt = b_parts[bi]
         return true if at == '>' || bt == '>'
         return false unless at == bt || at == '*' || bt == '*'
+
         ai += 1
         bi += 1
       end
 
       # If any side still has a '>' remaining, it can absorb the other's remainder
-      a_tail = a_parts[ai..-1] || []
-      b_tail = b_parts[bi..-1] || []
+      a_tail = a_parts[ai..] || []
+      b_tail = b_parts[bi..] || []
       return true if a_tail.include?('>') || b_tail.include?('>')
 
       # Otherwise they overlap only if both consumed exactly

data/lib/jetstream_bridge/version.rb

@@ -4,5 +4,5 @@
 #
 # Version constant for the gem.
 module JetstreamBridge
-  VERSION = '2.6.0'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetstream_bridge
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Mike Attara
@@ -11,7 +11,7 @@ cert_chain: []
 date: 2025-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,90 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.66'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.66'
-- !ruby/object:Gem::Dependency
-  name: rubocop-packaging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.21'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
 description: |-
   Publisher/Consumer utilities for NATS JetStream with environment-scoped subjects,
   overlap guards, DLQ routing, retries/backoff, and optional Inbox/Outbox patterns.