jetstream_bridge 4.4.1 → 4.5.1

data/lib/generators/jetstream_bridge/health_check/health_check_generator.rb

@@ -4,7 +4,7 @@ require 'rails/generators'
 
 module JetstreamBridge
   module Generators
-    class HealthCheckGenerator < Rails::Generators::Base
+    class HealthCheckGenerator < ::Rails::Generators::Base
       source_root File.expand_path('templates', __dir__)
       desc 'Creates a health check endpoint for JetStream Bridge monitoring'
 
@@ -41,12 +41,12 @@ module JetstreamBridge
             "connected_at": "2025-11-22T20:00:00Z",
             "stream": {
               "exists": true,
-              "name": "development-jetstream-bridge-stream",
-              "subjects": ["dev.app1.sync.app2"],
+              "name": "jetstream-bridge-stream",
+              "subjects": ["app1.sync.app2"],
               "messages": 42
             },
             "config": {
-              "env": "development",
+              "stream_name": "jetstream-bridge-stream",
               "app_name": "my_app",
               "destination_app": "other_app"
             },

data/lib/generators/jetstream_bridge/initializer/initializer_generator.rb

@@ -4,7 +4,7 @@ require 'rails/generators'
 
 module JetstreamBridge
   module Generators
-    class InitializerGenerator < Rails::Generators::Base
+    class InitializerGenerator < ::Rails::Generators::Base
       source_root File.expand_path('templates', __dir__)
       desc 'Creates config/initializers/jetstream_bridge.rb'
 

data/lib/generators/jetstream_bridge/initializer/templates/jetstream_bridge.rb

@@ -13,9 +13,8 @@ JetstreamBridge.configure do |config|
   # NATS server URLs (comma-separated for cluster)
   config.nats_urls = ENV.fetch('NATS_URLS', 'nats://localhost:4222')
 
-  # Environment identifier (e.g., 'development', 'production')
-  # Used in stream names and subject routing
-  config.env = ENV.fetch('NATS_ENV', Rails.env)
+  # Stream name (required) - managed separately from runtime credentials
+  config.stream_name = ENV.fetch('JETSTREAM_STREAM_NAME', 'jetstream-bridge-stream')
 
   # Application name (used in subject routing)
   config.app_name = ENV.fetch('APP_NAME', Rails.application.class.module_parent_name.underscore)

data/lib/generators/jetstream_bridge/install/install_generator.rb

@@ -5,16 +5,16 @@ require 'rails/generators'
 module JetstreamBridge
   module Generators
     # Install generator.
-    class InstallGenerator < Rails::Generators::Base
+    class InstallGenerator < ::Rails::Generators::Base
       desc 'Creates JetstreamBridge initializer and migrations'
       def create_initializer
-        Rails::Generators.invoke('jetstream_bridge:initializer', [], behavior: behavior,
-                                                                     destination_root: destination_root)
+        ::Rails::Generators.invoke('jetstream_bridge:initializer', [], behavior: behavior,
+                                                                       destination_root: destination_root)
       end
 
       def create_migrations
-        Rails::Generators.invoke('jetstream_bridge:migrations', [], behavior: behavior,
-                                                                    destination_root: destination_root)
+        ::Rails::Generators.invoke('jetstream_bridge:migrations', [], behavior: behavior,
+                                                                      destination_root: destination_root)
       end
     end
   end

data/lib/generators/jetstream_bridge/migrations/migrations_generator.rb

@@ -6,8 +6,8 @@ require 'rails/generators/active_record'
 module JetstreamBridge
   module Generators
     # Migrations generator.
-    class MigrationsGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
+    class MigrationsGenerator < ::Rails::Generators::Base
+      include ::Rails::Generators::Migration
 
       source_root File.expand_path('templates', __dir__)
       desc 'Creates Inbox/Outbox migrations for JetstreamBridge'

data/lib/jetstream_bridge/consumer/consumer.rb

@@ -244,17 +244,16 @@ module JetstreamBridge
 
     private
 
-    def ensure_destination_app_configured!
-      return unless JetstreamBridge.config.destination_app.to_s.empty?
-
-      raise ArgumentError, 'destination_app must be configured'
-    end
-
     def ensure_subscription!
       @sub_mgr.ensure_consumer!
       @psub = @sub_mgr.subscribe!
     end
 
+    def ensure_destination_app_configured!
+      # Use subject builder to enforce required components and align with existing validation messages.
+      JetstreamBridge.config.destination_subject
+    end
+
     # Returns number of messages processed; 0 on timeout/idle or after recovery.
     def process_batch
       msgs = fetch_messages

data/lib/jetstream_bridge/consumer/subscription_manager.rb

@@ -2,6 +2,7 @@
 
 require_relative '../core/logging'
 require_relative '../core/duration'
+require_relative '../errors'
 
 module JetstreamBridge
   # Encapsulates durable ensure + subscribe for a pull consumer.
@@ -10,8 +11,7 @@ module JetstreamBridge
       @jts     = jts
       @durable = durable
       @cfg     = cfg
-      @desired_cfg      = build_consumer_config(@durable, filter_subject)
-      @desired_cfg_norm = normalize_consumer_config(@desired_cfg)
+      @desired_cfg = build_consumer_config(@durable, filter_subject)
     end
 
     def stream_name
@@ -26,53 +26,69 @@ module JetstreamBridge
       @desired_cfg
     end
 
-    def ensure_consumer!
-      info = consumer_info_or_nil
-      return create_consumer! unless info
-
-      have_norm = normalize_consumer_config(info.config)
-      if have_norm == @desired_cfg_norm
-        log_consumer_ok
-      else
-        log_consumer_diff(have_norm)
-        recreate_consumer!
+    def ensure_consumer!(force: false)
+      # Runtime path: never hit JetStream management APIs to avoid admin permissions.
+      unless force || @cfg.auto_provision
+        log_runtime_skip
+        return
       end
+
+      create_consumer!
     end
 
     # Bind a pull subscriber to the existing durable.
     def subscribe!
-      @jts.pull_subscribe(
-        filter_subject,
-        @durable,
-        stream: stream_name,
-        config: desired_consumer_cfg
-      )
-    end
-
-    private
-
-    def consumer_info_or_nil
-      @jts.consumer_info(stream_name, @durable)
-    rescue NATS::JetStream::Error
-      nil
-    end
-
-    # ---- comparison ----
-
-    def log_consumer_diff(have_norm)
-      want_norm = @desired_cfg_norm
+      # Always bypass consumer_info to avoid requiring JetStream API permissions at runtime.
+      subscribe_without_verification!
+    end
+
+    def subscribe_without_verification!
+      # Manually create a pull subscription without calling consumer_info
+      # This bypasses the permission check in nats-pure's pull_subscribe
+      nc = resolve_nc
+
+      if nc.respond_to?(:new_inbox) && nc.respond_to?(:subscribe)
+        prefix = @jts.instance_variable_get(:@prefix) || '$JS.API'
+        deliver = nc.new_inbox
+        sub = nc.subscribe(deliver)
+
+        # Extend with PullSubscription module to add fetch methods
+        sub.extend(NATS::JetStream::PullSubscription)
+
+        # Set up the JSI (JetStream Info) struct that PullSubscription expects
+        # This matches what nats-pure does in pull_subscribe
+        subject = "#{prefix}.CONSUMER.MSG.NEXT.#{stream_name}.#{@durable}"
+        sub.jsi = NATS::JetStream::JS::Sub.new(
+          js: @jts,
+          stream: stream_name,
+          consumer: @durable,
+          nms: subject
+        )
+
+        Logging.info(
+          "Created pull subscription without verification for consumer #{@durable} " \
+          "(stream=#{stream_name}, filter=#{filter_subject})",
+          tag: 'JetstreamBridge::Consumer'
+        )
+
+        return sub
+      end
 
-      diffs = {}
-      (have_norm.keys | want_norm.keys).each do |k|
-        diffs[k] = { have: have_norm[k], want: want_norm[k] } unless have_norm[k] == want_norm[k]
+      # Fallback for environments (mocks/tests) where low-level NATS client is unavailable.
+      if @jts.respond_to?(:pull_subscribe)
+        Logging.info(
+          "Using pull_subscribe fallback for consumer #{@durable} (stream=#{stream_name})",
+          tag: 'JetstreamBridge::Consumer'
+        )
+        return @jts.pull_subscribe(filter_subject, @durable, stream: stream_name)
       end
 
-      Logging.warn(
-        "Consumer #{@durable} config mismatch (filter=#{filter_subject}) diff=#{diffs}",
-        tag: 'JetstreamBridge::Consumer'
-      )
+      raise JetstreamBridge::ConnectionError,
+            'Unable to create subscription without verification: NATS client not available'
     end
 
+    private
+
     def build_consumer_config(durable, filter_subject)
       {
         durable_name: durable,
@@ -86,30 +102,6 @@ module JetstreamBridge
       }
     end
 
-    # Normalize both server-returned config objects and our desired hash
-    # into a common hash with consistent units/types for accurate comparison.
-    def normalize_consumer_config(cfg)
-      {
-        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_secs: d_secs(cfg, :ack_wait), # integer seconds
-        backoff_secs: darr_secs(cfg, :backoff) # array of integer seconds
-      }
-    end
-
-    # ---- lifecycle helpers ----
-
-    def recreate_consumer!
-      Logging.warn(
-        "Consumer #{@durable} exists with mismatched config; recreating (filter=#{filter_subject})",
-        tag: 'JetstreamBridge::Consumer'
-      )
-      safe_delete_consumer
-      create_consumer!
-    end
-
     def create_consumer!
       @jts.add_consumer(stream_name, **desired_consumer_cfg)
       Logging.info(
@@ -118,22 +110,6 @@ module JetstreamBridge
       )
     end
 
-    def log_consumer_ok
-      Logging.info(
-        "Consumer #{@durable} exists with desired config.",
-        tag: 'JetstreamBridge::Consumer'
-      )
-    end
-
-    def safe_delete_consumer
-      @jts.delete_consumer(stream_name, @durable)
-    rescue NATS::JetStream::Error => e
-      Logging.warn(
-        "Delete consumer #{@durable} ignored: #{e.class} #{e.message}",
-        tag: 'JetstreamBridge::Consumer'
-      )
-    end
-
     # ---- cfg access/normalization (struct-like or hash-like) ----
 
     def get(cfg, key)
@@ -200,5 +176,22 @@ module JetstreamBridge
       # Always round up to avoid zero-second waits when sub-second durations are provided.
       [(millis / 1000.0).ceil, 1].max
     end
+
+    def log_runtime_skip
+      Logging.info(
+        "Skipping consumer provisioning/verification for #{@durable} at runtime to avoid JetStream API usage. " \
+        'Ensure it is pre-created via provisioning.',
+        tag: 'JetstreamBridge::Consumer'
+      )
+    end
+
+    def resolve_nc
+      return @jts.nc if @jts.respond_to?(:nc)
+      return @jts.instance_variable_get(:@nc) if @jts.instance_variable_defined?(:@nc)
+
+      return @cfg.mock_nats_client if @cfg.respond_to?(:mock_nats_client) && @cfg.mock_nats_client
+
+      nil
+    end
   end
 end

data/lib/jetstream_bridge/core/bridge_helpers.rb

@@ -37,32 +37,17 @@ module JetstreamBridge
       end
 
       def fetch_stream_info
+        return skipped_stream_info unless config.auto_provision
+
         # Ensure we have an active connection before querying stream info
         connect_if_needed!
 
         jts = Connection.jetstream
         raise ConnectionNotEstablishedError, 'NATS connection not established' unless jts
 
-        info = jts.stream_info(config.stream_name)
-
-        # Handle both object-style and hash-style access for compatibility
-        config_data = info.config
-        state_data = info.state
-        subjects = config_data.respond_to?(:subjects) ? config_data.subjects : config_data[:subjects]
-        messages = state_data.respond_to?(:messages) ? state_data.messages : state_data[:messages]
-
-        {
-          exists: true,
-          name: config.stream_name,
-          subjects: subjects,
-          messages: messages
-        }
+        stream_info_payload(jts.stream_info(config.stream_name))
       rescue StandardError => e
-        {
-          exists: false,
-          name: config.stream_name,
-          error: "#{e.class}: #{e.message}"
-        }
+        stream_error_payload(e)
       end
 
       def measure_nats_rtt
@@ -104,6 +89,39 @@ module JetstreamBridge
 
         cfg.public_send(setter, val)
       end
+
+      def stream_info_payload(info)
+        config_data = info.config
+        state_data = info.state
+
+        {
+          exists: true,
+          name: config.stream_name,
+          subjects: extract_field(config_data, :subjects),
+          messages: extract_field(state_data, :messages)
+        }
+      end
+
+      def extract_field(data, key)
+        data.respond_to?(key) ? data.public_send(key) : data[key]
+      end
+
+      def stream_error_payload(error)
+        {
+          exists: false,
+          name: config.stream_name,
+          error: "#{error.class}: #{error.message}"
+        }
+      end
+
+      def skipped_stream_info
+        {
+          exists: nil,
+          name: config.stream_name,
+          skipped: true,
+          reason: 'auto_provision=false (skip $JS.API.STREAM.INFO)'
+        }
+      end
     end
   end
 end

data/lib/jetstream_bridge/core/config.rb

@@ -11,9 +11,9 @@ module JetstreamBridge
   # @example Basic configuration
   #   JetstreamBridge.configure do |config|
   #     config.nats_urls = "nats://localhost:4222"
-  #     config.env = "production"
   #     config.app_name = "api_service"
   #     config.destination_app = "worker_service"
+  #     config.stream_name = "jetstream-bridge-stream"
   #     config.use_outbox = true
   #     config.use_inbox = true
   #   end
@@ -23,6 +23,7 @@ module JetstreamBridge
   #     config.nats_urls = ENV["NATS_URLS"]
   #     config.app_name = "api"
   #     config.destination_app = "worker"
+  #     config.stream_name = "jetstream-bridge-stream"
   #   end
   #
   class Config
@@ -50,9 +51,9 @@ module JetstreamBridge
     # NATS server URL(s)
     # @return [String]
     attr_accessor :nats_urls
-    # Environment namespace (development, staging, production)
+    # JetStream stream name (required)
     # @return [String]
-    attr_accessor :env
+    attr_accessor :stream_name
     # Application name for subject routing
     # @return [String]
     attr_accessor :app_name
@@ -95,11 +96,15 @@ module JetstreamBridge
     # Enable lazy connection (connect on first use instead of during configure)
     # @return [Boolean]
     attr_accessor :lazy_connect
+    # Allow JetStream Bridge to create/update streams/consumers and call JetStream management APIs.
+    # Disable for locked-down environments and handle provisioning separately.
+    # @return [Boolean]
+    attr_accessor :auto_provision
 
     def initialize
       @nats_urls       = ENV['NATS_URLS'] || ENV['NATS_URL'] || 'nats://localhost:4222'
-      @env             = ENV['NATS_ENV']  || 'development'
-      @app_name        = ENV['APP_NAME']  || 'app'
+      @stream_name     = ENV['JETSTREAM_STREAM_NAME'] || 'jetstream-bridge-stream'
+      @app_name        = ENV['APP_NAME'] || 'app'
       @destination_app = ENV.fetch('DESTINATION_APP', nil)
 
       @max_deliver = 5
@@ -118,6 +123,7 @@ module JetstreamBridge
       @connect_retry_attempts = 3
       @connect_retry_delay = 2
       @lazy_connect = false
+      @auto_provision = true
     end
 
     # Apply a configuration preset
@@ -131,34 +137,22 @@ module JetstreamBridge
       self
     end
 
-    # Get the JetStream stream name for this environment.
-    #
-    # @return [String] Stream name in format "{env}-jetstream-bridge-stream"
-    # @example
-    #   config.env = "production"
-    #   config.stream_name  # => "production-jetstream-bridge-stream"
-    def stream_name
-      "#{env}-jetstream-bridge-stream"
-    end
-
     # Get the NATS subject this application publishes to.
     #
-    # Producer publishes to:   {env}.{app}.sync.{dest}
-    # Consumer subscribes to:  {env}.{dest}.sync.{app}
+    # Producer publishes to:   {app}.sync.{dest}
+    # Consumer subscribes to:  {dest}.sync.{app}
     #
     # @return [String] Source subject for publishing
     # @raise [InvalidSubjectError] If components contain NATS wildcards
     # @raise [MissingConfigurationError] If required components empty
     # @example
-    #   config.env = "production"
     #   config.app_name = "api"
     #   config.destination_app = "worker"
-    #   config.source_subject  # => "production.api.sync.worker"
+    #   config.source_subject  # => "api.sync.worker"
     def source_subject
-      validate_subject_component!(env, 'env')
       validate_subject_component!(app_name, 'app_name')
       validate_subject_component!(destination_app, 'destination_app')
-      "#{env}.#{app_name}.sync.#{destination_app}"
+      "#{app_name}.sync.#{destination_app}"
     end
 
     # Get the NATS subject this application subscribes to.
@@ -166,44 +160,28 @@ module JetstreamBridge
     # @return [String] Destination subject for consuming
     # @raise [InvalidSubjectError] If components contain NATS wildcards
     # @raise [MissingConfigurationError] If required components empty
-    # @example
-    #   config.env = "production"
-    #   config.app_name = "api"
-    #   config.destination_app = "worker"
-    #   config.destination_subject  # => "production.worker.sync.api"
     def destination_subject
-      validate_subject_component!(env, 'env')
       validate_subject_component!(app_name, 'app_name')
       validate_subject_component!(destination_app, 'destination_app')
-      "#{env}.#{destination_app}.sync.#{app_name}"
+      "#{destination_app}.sync.#{app_name}"
     end
 
     # Get the dead letter queue subject for this application.
     #
     # Each app has its own DLQ for better isolation and monitoring.
     #
-    # @return [String] DLQ subject in format "{env}.{app_name}.sync.dlq"
+    # @return [String] DLQ subject in format "{app_name}.sync.dlq"
     # @raise [InvalidSubjectError] If components contain NATS wildcards
     # @raise [MissingConfigurationError] If required components are empty
-    # @example
-    #   config.env = "production"
-    #   config.app_name = "api"
-    #   config.dlq_subject  # => "production.api.sync.dlq"
     def dlq_subject
-      validate_subject_component!(env, 'env')
       validate_subject_component!(app_name, 'app_name')
-      "#{env}.#{app_name}.sync.dlq"
+      "#{app_name}.sync.dlq"
     end
 
     # Get the durable consumer name for this application.
     #
-    # @return [String] Durable name in format "{env}-{app_name}-workers"
-    # @example
-    #   config.env = "production"
-    #   config.app_name = "api"
-    #   config.durable_name  # => "production-api-workers"
     def durable_name
-      "#{env}-#{app_name}-workers"
+      "#{app_name}-workers"
     end
 
     # Validate all configuration settings.
@@ -219,7 +197,7 @@ module JetstreamBridge
       errors = []
       errors << 'destination_app is required' if destination_app.to_s.strip.empty?
       errors << 'nats_urls is required' if nats_urls.to_s.strip.empty?
-      errors << 'env is required' if env.to_s.strip.empty?
+      errors << 'stream_name is required' if stream_name.to_s.strip.empty?
       errors << 'app_name is required' if app_name.to_s.strip.empty?
       errors << 'max_deliver must be >= 1' if max_deliver.to_i < 1
       errors << 'backoff must be an array' unless backoff.is_a?(Array)