jetstream_bridge 1.15.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52de97c8d390176c6113c836f07126258f513ddf7feac51dd570d271a43f8ca5
-  data.tar.gz: 56a583ab2be2170e28afe5e1c89b33e51f8d40fa84dfb66b89666949e9390dc9
+  metadata.gz: 7addd218fb551e3cf359fb7a1ba35c5dc7b19b6085d391de3c94be4002d26d34
+  data.tar.gz: 218f2a64bf0617be5a770ef43ec6defbfd89825700441e35f59f77e813b9fbf5
 SHA512:
-  metadata.gz: 64408358299860a7bb08897d8e0360e265274990499fe963cbd133a4592e186d71055814d9aeaf87b695b8035fab095a6f67ef99027135f9c7a5205e299be11e
-  data.tar.gz: 0bff44a878e9a78f8288c6aed2f9dd8319a249b8f6b1f3275666040f248999a5cfda73fbc5196f6641a84f52ffcad0eba001bc0ac71ab83e6b04c0ce21b8d8f2
+  metadata.gz: ac1ab60e3908269576f740b046913c5d32f438aa6f4ce5e65b7977d7a0c20c5c304b1b1784eb61a4aaab8b58e6513822ab68a3372298650c21640049c6f3396b
+  data.tar.gz: 49e59b0ca025bca0a3a20f96cf68a1f43cf3627e701a1841ae5b4f3bb809347f68ad0ed066353e54bb9873472be6d7e37b2eb286f99ffa8450f97a87726a5ace

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jetstream_bridge (1.15.0)
+    jetstream_bridge (2.1.0)
       activerecord (>= 6.0)
       activesupport (>= 6.0)
       nats-pure (~> 2.4)

data/README.md

@@ -23,7 +23,7 @@ Includes durable consumers, backpressure, retries, **DLQ**, optional **Inbox/Out
 
 ```ruby
 # Gemfile
-gem "jetstream_bridge"
+gem "jetstream_bridge", "~> 2.0"
 ```
 
 ```bash
@@ -98,11 +98,11 @@ end
 
 ## 📡 Subject Conventions
 
-| Direction     | Subject Pattern                |
-|---------------|--------------------------------|
-| **Publish**   | `{env}.data.sync.{app}.{dest}` |
-| **Subscribe** | `{env}.data.sync.{dest}.{app}` |
-| **DLQ**       | `{env}.data.sync.dlq`          |
+| Direction     | Subject Pattern           |
+|---------------|---------------------------|
+| **Publish**   | `{env}.sync.{app}.{dest}` |
+| **Subscribe** | `{env}.sync.{dest}.{app}` |
+| **DLQ**       | `{env}.sync.dlq`          |
 
 * `{app}`: `app_name`
 * `{dest}`: `destination_app`
@@ -110,12 +110,12 @@ end
 
 ---
 
-## 🧱 Stream Topology (auto-ensure & overlap-safe)
+## 🧱 Stream Topology (auto-ensure and overlap-safe)
 
 On first connection, Jetstream Bridge **ensures** a single stream exists for your `env` and that it covers:
 
-* `source_subject` (`{env}.data.sync.{app}.{dest}`)
-* `destination_subject` (`{env}.data.sync.{dest}.{app}`)
+* `source_subject` (`{env}.sync.{app}.{dest}`)
+* `destination_subject` (`{env}.sync.{dest}.{app}`)
 * `dlq_subject` (if enabled)
 
 It’s **overlap-safe**:
@@ -200,7 +200,7 @@ If **Outbox** is enabled, the publish call:
 
 ```ruby
 JetstreamBridge::Consumer.new(
-  durable_name: "#{Rails.env}-peerapp-events",
+  durable_name: "#{Rails.env}-#{app_name}-workers",
   batch_size:   25
 ) do |event, subject, deliveries|
   # Your idempotent domain logic here
@@ -257,7 +257,7 @@ You may run a separate process to subscribe and triage messages that exceed `max
 ### Scaling
 
 * Run consumers in **separate processes/containers**
-* Scale consumers independently from web
+* Scale consumers independently of web
 * Tune `batch_size`, `ack_wait`, `max_deliver`, and `backoff`
 
 ### Health check

data/lib/jetstream_bridge/consumer/consumer.rb

@@ -13,7 +13,7 @@ require_relative 'subscription_manager'
 require_relative 'inbox/inbox_processor'
 
 module JetstreamBridge
-  # Subscribes to "{env}.data.sync.{dest}.{app}" and processes messages.
+  # Subscribes to "{env}.sync.{dest}.{app}" and processes messages.
   class Consumer
     DEFAULT_BATCH_SIZE = 25
     FETCH_TIMEOUT_SECS = 5
@@ -22,7 +22,7 @@ module JetstreamBridge
     def initialize(durable_name:, batch_size: DEFAULT_BATCH_SIZE, &block)
       @handler    = block
       @batch_size = batch_size
-      @durable    = durable_name
+      @durable    = durable_name || JetstreamBridge.config.durable_name
       @jts        = Connection.connect!
 
       ensure_destination!

data/lib/jetstream_bridge/core/config.rb

@@ -11,7 +11,7 @@ module JetstreamBridge
       @nats_urls       = ENV['NATS_URLS'] || ENV['NATS_URL'] || 'nats://localhost:4222'
       @env             = ENV['NATS_ENV']  || 'development'
       @app_name        = ENV['APP_NAME']  || 'app'
-      @destination_app = ENV['DESTINATION_APP']
+      @destination_app = ENV.fetch('DESTINATION_APP', nil)
 
       @max_deliver = 5
       @ack_wait    = '30s'
@@ -30,19 +30,23 @@ module JetstreamBridge
     end
 
     # Base subjects
-    # Producer publishes to:   {env}.data.sync.{app}.{dest}
-    # Consumer subscribes to:  {env}.data.sync.{dest}.{app}
+    # Producer publishes to:   {env}.sync.{app}.{dest}
+    # Consumer subscribes to:  {env}.sync.{dest}.{app}
     def source_subject
-      "#{env}.data.sync.#{app_name}.#{destination_app}"
+      "#{env}.#{app_name}.sync.#{destination_app}"
     end
 
     def destination_subject
-      "#{env}.data.sync.#{destination_app}.#{app_name}"
+      "#{env}.#{destination_app}.sync.#{app_name}"
     end
 
     # DLQ
     def dlq_subject
-      "#{env}.data.sync.dlq"
+      "#{env}.sync.dlq"
+    end
+
+    def durable_name
+      "#{env}-#{app_name}-workers"
     end
   end
 end

data/lib/jetstream_bridge/core/connection.rb

@@ -21,11 +21,21 @@ module JetstreamBridge
     }.freeze
 
     class << self
-      # Thread-safe delegator to the singleton instance
+      # Thread-safe delegator to the singleton instance.
+      # Returns a live JetStream context.
       def connect!
         @__mutex ||= Mutex.new
         @__mutex.synchronize { instance.connect! }
       end
+
+      # Optional accessors if callers need raw handles
+      def nc
+        instance.__send__(:nc)
+      end
+
+      def jetstream
+        instance.__send__(:jetstream)
+      end
     end
 
     # Idempotent: returns an existing, healthy JetStream context or establishes one.
@@ -36,12 +46,17 @@ module JetstreamBridge
       raise 'No NATS URLs configured' if servers.empty?
 
       establish_connection(servers)
+
       Logging.info(
-        "Connected to NATS (#{servers.size} server#{servers.size == 1 ? '' : 's'}): #{sanitize_urls(servers).join(',')}",
+        "Connected to NATS (#{servers.size} server#{unless servers.size == 1
+                                                      's'
+                                                    end}): #{sanitize_urls(servers).join(', ')}",
         tag: 'JetstreamBridge::Connection'
       )
 
+      # Ensure topology (streams, subjects, overlap guard, etc.)
       Topology.ensure!(@jts)
+
       @jts
     end
 
@@ -62,7 +77,26 @@ module JetstreamBridge
     def establish_connection(servers)
       @nc = NATS::IO::Client.new
       @nc.connect({ servers: servers }.merge(DEFAULT_CONN_OPTS))
+
+      # Create JetStream context
       @jts = @nc.jetstream
+
+      # --- Compatibility shim: ensure JetStream responds to #nc for older/newer clients ---
+      # Some versions of the NATS Ruby client don't expose nc on the JetStream object.
+      # We attach a singleton method, so code expecting `js.nc` continues to work.
+      return if @jts.respond_to?(:nc)
+
+      nc_ref = @nc
+      @jts.define_singleton_method(:nc) { nc_ref }
+
+      # ------------------------------------------------------------------------------------
+    end
+
+    # Expose for class-level helpers (not part of public API)
+    attr_reader :nc
+
+    def jetstream
+      @jts
     end
 
     # Mask credentials in NATS URLs:

data/lib/jetstream_bridge/publisher/publisher.rb

@@ -9,7 +9,7 @@ require_relative '../core/model_utils'
 require_relative 'outbox_repository'
 
 module JetstreamBridge
-  # Publishes to "{env}.data.sync.{app}.{dest}".
+  # Publishes to "{env}.sync.{app}.{dest}".
   class Publisher
     DEFAULT_RETRIES = 2
     RETRY_BACKOFFS  = [0.25, 1.0].freeze
@@ -33,7 +33,7 @@ module JetstreamBridge
       if JetstreamBridge.config.use_outbox
         publish_via_outbox(subject, envelope)
       else
-        with_retries { do_publish(subject, envelope) }
+        with_retries { do_publish?(subject, envelope) }
       end
     rescue StandardError => e
       log_error(false, e)
@@ -47,8 +47,8 @@ module JetstreamBridge
       raise ArgumentError, 'destination_app must be configured'
     end
 
-    def do_publish(subject, envelope)
-      headers = { 'Nats-Msg-Id' => envelope['event_id'] }
+    def do_publish?(subject, envelope)
+      headers = { 'nats-msg-id' => envelope['event_id'] }
       @jts.publish(subject, JSON.generate(envelope), header: headers)
       Logging.info("Published #{subject} event_id=#{envelope['event_id']}",
                    tag: 'JetstreamBridge::Publisher')
@@ -62,7 +62,7 @@ module JetstreamBridge
       unless ModelUtils.ar_class?(klass)
         Logging.warn("Outbox model #{klass} is not an ActiveRecord model; publishing directly.",
                      tag: 'JetstreamBridge::Publisher')
-        return with_retries { do_publish(subject, envelope) }
+        return with_retries { do_publish?(subject, envelope) }
       end
 
       repo     = OutboxRepository.new(klass)

data/lib/jetstream_bridge/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jetstream_bridge
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Mike Attara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-19 00:00:00.000000000 Z
+date: 2025-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord