jetstream_bridge 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b75d900f4ede2b0dbc787641f532cfcbe07619435eaf3a1673b163d8f87658b
-  data.tar.gz: 7295f58824d037c799c6aa3487b650fe3030b50acd24fe858878dfbafa8c3cba
+  metadata.gz: '087fb2993c66be217aa3b544a333d0b166aec88f9a006051010e46309faac51f'
+  data.tar.gz: 2489d32b3047955699c11ae640014baec66855cad384543b3220fe778ff2b65a
 SHA512:
-  metadata.gz: 5788fd8947c2d9d3f6e7dc9c7da0bd9fe072c9682fb13a220b12977e4c53e3ec9b373917f96a7ee415488b3081c3dd939afedd56a9ec98f324e0e31919a48106
-  data.tar.gz: a8223affe27e1cf99bf2db07bf8672b49ecece81e410b40f3727366813ba6d39e18ae828052b6c9cf68693354af2eb382a3566338fb4312ceb78008c2a993b4b
+  metadata.gz: 88e316fb7cfc4f5048290ca37e3c065fc7cb6e059627f5900455c14adf59957c9f8db8e428b82f879511979db2e52ff1a15decb754c7156f9a51f81d766d30f3
+  data.tar.gz: 897a1695d32323c7d33dcc8a3811cb9a7952e45088d14b8c81713f08085869805d97a40de34c3c10f33ae8c39861972ff4f9c1cff1af57699c10aa5e8bf05a50

data/lib/jetstream_bridge/consumer/consumer.rb

@@ -104,6 +104,8 @@ module JetstreamBridge
       @reconnect_attempts = 0
       @running = true
       @shutdown_requested = false
+      @signal_received = nil
+      @signal_logged = false
       @start_time    = Time.now
       @iterations    = 0
       @last_health_check = Time.now
@@ -197,6 +199,12 @@ module JetstreamBridge
         tag: 'JetstreamBridge::Consumer'
       )
       while @running
+        # Check if signal was received and log it (safe from main loop)
+        if @signal_received && !@signal_logged
+          Logging.info("Received #{@signal_received}, stopping consumer...", tag: 'JetstreamBridge::Consumer')
+          @signal_logged = true
+        end
+
         processed = process_batch
         idle_sleep(processed)
 
@@ -368,8 +376,11 @@ module JetstreamBridge
     def setup_signal_handlers
       %w[INT TERM].each do |sig|
         Signal.trap(sig) do
-          Logging.info("Received #{sig}, stopping consumer...", tag: 'JetstreamBridge::Consumer')
-          stop!
+          # CRITICAL: Only set flags in trap context, no I/O or mutex operations
+          # Logging and other operations are unsafe from signal handlers
+          @signal_received = sig
+          @running = false
+          @shutdown_requested = true
         end
       end
     rescue ArgumentError => e
@@ -440,7 +451,11 @@ module JetstreamBridge
       Logging.info('Draining in-flight messages...', tag: 'JetstreamBridge::Consumer')
       # Process any pending messages with a short timeout
       5.times do
-        msgs = @psub.fetch(@batch_size, timeout: 1)
+        msgs = if JetstreamBridge.config.push_consumer?
+                 drain_messages_push
+               else
+                 @psub.fetch(@batch_size, timeout: 1)
+               end
         break if msgs.nil? || msgs.empty?
 
         msgs.each { |m| process_one(m) }
@@ -455,6 +470,18 @@ module JetstreamBridge
       Logging.error("Drain failed: #{e.class} #{e.message}", tag: 'JetstreamBridge::Consumer')
     end
 
+    def drain_messages_push
+      # For push consumers during drain, collect messages with a shorter timeout
+      messages = []
+      @batch_size.times do
+        msg = @psub.next_msg(timeout: 1)
+        messages << msg if msg
+      rescue NATS::Timeout, NATS::IO::Timeout
+        break
+      end
+      messages
+    end
+
     def safe_nak_message(msg)
       return unless msg.respond_to?(:nak)
 

data/lib/jetstream_bridge/core/connection.rb

@@ -237,7 +237,36 @@ module JetstreamBridge
           'NATS reconnected, refreshing JetStream context',
           tag: 'JetstreamBridge::Connection'
         )
-        refresh_jetstream_context
+
+        # Retry JetStream context refresh with exponential backoff
+        max_attempts = 3
+        attempts = 0
+        success = false
+
+        while attempts < max_attempts && !success
+          attempts += 1
+          begin
+            refresh_jetstream_context
+            success = true
+          rescue StandardError => e
+            if attempts < max_attempts
+              delay = 0.5 * (2**(attempts - 1)) # 0.5s, 1s, 2s
+              Logging.warn(
+                "JetStream context refresh attempt #{attempts}/#{max_attempts} failed: #{e.message}. " \
+                "Retrying in #{delay}s...",
+                tag: 'JetstreamBridge::Connection'
+              )
+              sleep(delay)
+            else
+              Logging.error(
+                "Failed to refresh JetStream context after #{attempts} attempts. " \
+                'Will retry on next reconnect.',
+                tag: 'JetstreamBridge::Connection'
+              )
+            end
+          end
+        end
+
         @reconnecting = false
       end
 
@@ -458,15 +487,21 @@ module JetstreamBridge
       @last_reconnect_error = e
       @last_reconnect_error_at = Time.now
       @state = State::FAILED
-      cleanup_connection!(close_nc: false)
+
+      # Clear JetStream context but keep NATS connection alive for retry
+      @jts = nil
+
+      # Invalidate health check cache to force re-check
+      @cached_health_status = false
+      @last_health_check = Time.now.to_i
+
       Logging.error(
         "Failed to refresh JetStream context: #{e.class} #{e.message}",
         tag: 'JetstreamBridge::Connection'
       )
 
-      # Invalidate health check cache to force re-check
-      @cached_health_status = false
-      @last_health_check = Time.now.to_i
+      # Re-raise so caller (on_reconnect handler) can retry
+      raise
     end
 
     # Expose for class-level helpers (not part of public API)
@@ -491,11 +526,22 @@ module JetstreamBridge
       rescue StandardError
         # ignore cleanup errors
       end
-      @nc = nil
-      @jts = nil
+
+      # Only clear connection references if we're closing the connection
+      # When close_nc is false (e.g., during reconnect failures), keep @nc
+      # so the connection can recover when NATS auto-reconnects
+      if close_nc
+        @nc = nil
+        @jts = nil
+        @connected_at = nil
+      else
+        # Clear JetStream context but keep NATS connection reference
+        @jts = nil
+      end
+
+      # Always invalidate health check cache
       @cached_health_status = nil
       @last_health_check = nil
-      @connected_at = nil
     end
 
     def config_auto_provision

data/lib/jetstream_bridge/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jetstream_bridge
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Mike Attara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-27 00:00:00.000000000 Z
+date: 2026-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord