jetstream_bridge 4.0.1 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 358b977021f3b620cbbedb6af88bca009060f2da62ec932cbdcf5db1e3b0b375
-  data.tar.gz: 4f0ca0e54a96aee5971460c2be2fdeac82e5f6df00fc70a17fb90e472e91e1ee
+  metadata.gz: fdb73e243bddbd9812d6d454d1975d15f6f8d98325c7759853d32a01c830e27e
+  data.tar.gz: 8c570f62d4e4b0efddf59e6a4033026b5cabaad83fe808ec0942ad57f3874d5e
 SHA512:
-  metadata.gz: 550efc74885ce2b4d2fbc86742bf0db0dabdf402b64c6b072a3007b435946e09f460f5b759f1f027a3ba4ed8211b9a807ff6f157b075179d2901284703097b47
-  data.tar.gz: '09478489b9e13b897979657cb5fa5dd6da90f9399ad4e09d7f5e0436c9fc881e02c1ffc2c7441834d72dff3c9549b846d199c4cb6bf5adee845babb4877235ae'
+  metadata.gz: c9b95208ecf116e52daa75e77d3edb62899e6724bec67c72c4322aab31778392906053f77e9eb420c855605ee6aca41eacad9c509b47e5123e710436d201718c
+  data.tar.gz: 588603c1946d72946c9ba990869869e5932c3f04e265cefbbc2d6f0c3829467e1e498eab307b84770b7d88ed134184d6c8f07596968d0b30da107204fa3bca5f

data/CHANGELOG.md

@@ -5,6 +5,47 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.0.3] - 2025-11-23
+
+### Added
+
+- **Connection Validation** - Comprehensive NATS URL validation on initialization
+  - Validates URL format, scheme (nats/nats+tls), host presence, and port range (1-65535)
+  - Verifies NATS connection established after connect
+  - Verifies JetStream availability with account info check
+  - Helpful error messages for common misconfigurations
+  - All validation errors include specific guidance for fixes
+
+- **Connection Logging** - Detailed logging throughout connection lifecycle
+  - Debug logs for URL validation progress and verification steps
+  - Info logs for successful validation and JetStream stats (streams, consumers, memory, storage)
+  - Error logs for all validation failures with specific details
+  - Automatic credential sanitization in all log messages
+  - Human-readable resource usage formatting (bytes to KB/MB/GB)
+
+### Fixed
+
+- **Health Check** - Fixed `healthy` field returning `nil` instead of `false` when disconnected
+  - Changed `stream_info[:exists]` to `stream_info&.fetch(:exists, false)` for proper nil handling
+  - Ensures boolean values always returned for monitoring systems
+
+### Changed
+
+- **Code Organization** - Moved all inline RuboCop rules to centralized `.rubocop.yml`
+  - Removed inline comments from 5 files (logging.rb, model_utils.rb, inbox_event.rb, outbox_event.rb, inbox_message.rb)
+  - Added exclusions to `.rubocop.yml` for metrics and naming rules
+  - Cleaner codebase with all style exceptions in one location
+
+## [4.0.2] - 2025-11-23
+
+### Fixed
+
+- **Stream Updates** - Prevent retention policy change errors (NATS error 10052)
+  - Skip all stream updates when retention policy differs from expected 'workqueue'
+  - Prevents "stream configuration update can not change retention policy to/from workqueue" error
+  - Logs warning when stream has mismatched retention policy but skips update
+  - Ensures compatibility with existing streams that have different retention policies
+
 ## [4.0.1] - 2025-11-23
 
 ### Fixed

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

@@ -8,7 +8,6 @@ module JetstreamBridge
   class InboxMessage
     attr_reader :msg, :seq, :deliveries, :stream, :subject, :headers, :body, :raw, :event_id, :now
 
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def self.from_nats(msg)
       meta       = (msg.respond_to?(:metadata) && msg.metadata) || nil
       seq        = meta.respond_to?(:stream_sequence) ? meta.stream_sequence : nil
@@ -33,9 +32,7 @@ module JetstreamBridge
 
       new(msg, seq, deliveries, stream, subject, headers, body, raw, id, Time.now.utc, consumer)
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-    # rubocop:disable Metrics/ParameterLists
     def initialize(msg, seq, deliveries, stream, subject, headers, body, raw, event_id, now, consumer = nil)
       @msg        = msg
       @seq        = seq
@@ -49,7 +46,6 @@ module JetstreamBridge
       @now        = now
       @consumer   = consumer
     end
-    # rubocop:enable Metrics/ParameterLists
 
     def body_for_store
       body.empty? ? raw : body

data/lib/jetstream_bridge/core/connection.rb

@@ -34,6 +34,8 @@ module JetstreamBridge
       connect_timeout: 5
     }.freeze
 
+    VALID_NATS_SCHEMES = %w[nats nats+tls].freeze
+
     class << self
       # Thread-safe delegator to the singleton instance.
       # Returns a live JetStream context.
@@ -106,11 +108,14 @@ module JetstreamBridge
     end
 
     def nats_servers
-      JetstreamBridge.config.nats_urls
-                     .to_s
-                     .split(',')
-                     .map(&:strip)
-                     .reject(&:empty?)
+      servers = JetstreamBridge.config.nats_urls
+                               .to_s
+                               .split(',')
+                               .map(&:strip)
+                               .reject(&:empty?)
+
+      validate_nats_urls!(servers)
+      servers
     end
 
     def establish_connection(servers)
@@ -141,9 +146,15 @@ module JetstreamBridge
 
       @nc.connect({ servers: servers }.merge(DEFAULT_CONN_OPTS))
 
+      # Verify connection is established
+      verify_connection!
+
       # Create JetStream context
       @jts = @nc.jetstream
 
+      # Verify JetStream is available
+      verify_jetstream!
+
       # Ensure JetStream responds to #nc
       return if @jts.respond_to?(:nc)
 
@@ -151,6 +162,129 @@ module JetstreamBridge
       @jts.define_singleton_method(:nc) { nc_ref }
     end
 
+    def validate_nats_urls!(servers)
+      Logging.debug(
+        "Validating #{servers.size} NATS URL(s): #{sanitize_urls(servers).join(', ')}",
+        tag: 'JetstreamBridge::Connection'
+      )
+
+      servers.each do |url|
+        # Check for basic URL format (scheme://host)
+        unless url.include?('://')
+          Logging.error(
+            "Invalid URL format (missing scheme): #{url}",
+            tag: 'JetstreamBridge::Connection'
+          )
+          raise ConnectionError, "Invalid NATS URL format: #{url}. Expected format: nats://host:port"
+        end
+
+        uri = URI.parse(url)
+
+        # Validate scheme
+        scheme = uri.scheme&.downcase
+        unless VALID_NATS_SCHEMES.include?(scheme)
+          Logging.error(
+            "Invalid URL scheme '#{uri.scheme}': #{Logging.sanitize_url(url)}",
+            tag: 'JetstreamBridge::Connection'
+          )
+          raise ConnectionError, "Invalid NATS URL scheme '#{uri.scheme}' in: #{url}. Expected 'nats' or 'nats+tls'"
+        end
+
+        # Validate host is present
+        if uri.host.nil? || uri.host.empty?
+          Logging.error(
+            "Missing host in URL: #{Logging.sanitize_url(url)}",
+            tag: 'JetstreamBridge::Connection'
+          )
+          raise ConnectionError, "Invalid NATS URL - missing host: #{url}"
+        end
+
+        # Validate port if present
+        if uri.port && (uri.port < 1 || uri.port > 65_535)
+          Logging.error(
+            "Invalid port #{uri.port} in URL: #{Logging.sanitize_url(url)}",
+            tag: 'JetstreamBridge::Connection'
+          )
+          raise ConnectionError, "Invalid NATS URL - port must be 1-65535: #{url}"
+        end
+
+        Logging.debug(
+          "URL validated: #{Logging.sanitize_url(url)}",
+          tag: 'JetstreamBridge::Connection'
+        )
+      rescue URI::InvalidURIError => e
+        Logging.error(
+          "Malformed URL: #{url} (#{e.message})",
+          tag: 'JetstreamBridge::Connection'
+        )
+        raise ConnectionError, "Invalid NATS URL format: #{url} (#{e.message})"
+      end
+
+      Logging.info(
+        'All NATS URLs validated successfully',
+        tag: 'JetstreamBridge::Connection'
+      )
+    end
+
+    def verify_connection!
+      Logging.debug(
+        'Verifying NATS connection...',
+        tag: 'JetstreamBridge::Connection'
+      )
+
+      unless @nc.connected?
+        Logging.error(
+          'NATS connection verification failed - client not connected',
+          tag: 'JetstreamBridge::Connection'
+        )
+        raise ConnectionError, 'Failed to establish connection to NATS server(s)'
+      end
+
+      Logging.info(
+        'NATS connection verified successfully',
+        tag: 'JetstreamBridge::Connection'
+      )
+    end
+
+    def verify_jetstream!
+      Logging.debug(
+        'Verifying JetStream availability...',
+        tag: 'JetstreamBridge::Connection'
+      )
+
+      # Verify JetStream is enabled by checking account info
+      account_info = @jts.account_info
+
+      Logging.info(
+        "JetStream verified - Streams: #{account_info.streams}, " \
+        "Consumers: #{account_info.consumers}, " \
+        "Memory: #{format_bytes(account_info.memory)}, " \
+        "Storage: #{format_bytes(account_info.storage)}",
+        tag: 'JetstreamBridge::Connection'
+      )
+    rescue NATS::IO::NoRespondersError
+      Logging.error(
+        'JetStream not available - no responders (JetStream not enabled)',
+        tag: 'JetstreamBridge::Connection'
+      )
+      raise ConnectionError, 'JetStream not enabled on NATS server. Please enable JetStream with -js flag'
+    rescue StandardError => e
+      Logging.error(
+        "JetStream verification failed: #{e.class} - #{e.message}",
+        tag: 'JetstreamBridge::Connection'
+      )
+      raise ConnectionError, "JetStream verification failed: #{e.message}"
+    end
+
+    def format_bytes(bytes)
+      return 'N/A' if bytes.nil? || bytes.zero?
+
+      units = %w[B KB MB GB TB]
+      exp = (Math.log(bytes) / Math.log(1024)).to_i
+      exp = [exp, units.length - 1].min
+      "#{(bytes / (1024.0**exp)).round(2)} #{units[exp]}"
+    end
+
     def refresh_jetstream_context
       @jts = @nc.jetstream
       nc_ref = @nc

data/lib/jetstream_bridge/core/logging.rb

@@ -40,7 +40,6 @@ module JetstreamBridge
       log(:error, msg, tag: tag)
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def sanitize_url(url)
       uri = URI.parse(url)
       return url unless uri.user || uri.password
@@ -67,6 +66,5 @@ module JetstreamBridge
         "#{scheme}://#{masked}@"
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   end
 end

data/lib/jetstream_bridge/core/model_utils.rb

@@ -14,13 +14,11 @@ module JetstreamBridge
       defined?(ActiveRecord::Base) && klass <= ActiveRecord::Base
     end
 
-    # rubocop:disable Naming/PredicatePrefix
     def has_columns?(klass, *cols)
       return false unless ar_class?(klass)
 
       cols.flatten.all? { |c| klass.column_names.include?(c.to_s) }
     end
-    # rubocop:enable Naming/PredicatePrefix
 
     def assign_known_attrs(record, attrs)
       attrs.each do |k, v|

data/lib/jetstream_bridge/models/inbox_event.rb

@@ -15,7 +15,6 @@ module JetstreamBridge
 
       class << self
         # Safe column presence check that never boots a connection during class load.
-        # rubocop:disable Naming/PredicatePrefix
         def has_column?(name)
           return false unless ar_connected?
 
@@ -23,7 +22,6 @@ module JetstreamBridge
         rescue ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError
           false
         end
-        # rubocop:enable Naming/PredicatePrefix
 
         def ar_connected?
           ActiveRecord::Base.connected? && connection_pool.active_connection?

data/lib/jetstream_bridge/models/outbox_event.rb

@@ -15,7 +15,6 @@ module JetstreamBridge
 
       class << self
         # Safe column presence check that never boots a connection during class load.
-        # rubocop:disable Naming/PredicatePrefix
         def has_column?(name)
           return false unless ar_connected?
 
@@ -23,7 +22,6 @@ module JetstreamBridge
         rescue ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError
           false
         end
-        # rubocop:enable Naming/PredicatePrefix
 
         def ar_connected?
           # Avoid creating a connection; rescue if pool isn't set yet.

data/lib/jetstream_bridge/topology/stream.rb

@@ -129,11 +129,15 @@ module JetstreamBridge
       def ensure_update(jts, name, info, desired_subjects)
         existing = StreamSupport.normalize_subjects(info.config.subjects || [])
         to_add   = StreamSupport.missing_subjects(existing, desired_subjects)
-        add_subjects(jts, name, existing, to_add) if to_add.any?
 
-        # Retention is immutable; warn if different and do not include on update.
+        # Retention is immutable; if different, skip all updates to avoid 10052 error.
         have_ret = info.config.retention.to_s.downcase
-        StreamSupport.log_retention_mismatch(name, have: have_ret, want: RETENTION) if have_ret != RETENTION
+        if have_ret != RETENTION
+          StreamSupport.log_retention_mismatch(name, have: have_ret, want: RETENTION)
+          return
+        end
+
+        add_subjects(jts, name, existing, to_add) if to_add.any?
 
         # Storage can be updated; do it without passing retention.
         have_storage = info.config.storage.to_s.downcase

data/lib/jetstream_bridge/version.rb

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

data/lib/jetstream_bridge.rb

@@ -126,7 +126,7 @@ module JetstreamBridge
       stream_info = fetch_stream_info if connected
 
       {
-        healthy: connected && stream_info[:exists],
+        healthy: connected && stream_info&.fetch(:exists, false),
         nats_connected: connected,
         connected_at: connected_at&.iso8601,
         stream: stream_info,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetstream_bridge
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.3
 platform: ruby
 authors:
 - Mike Attara