jetstream_bridge 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e107d86ffe1dfa7ee9362c82a6f827ad5e5501d0c9eedff4b2da359c360465cc
-  data.tar.gz: 33e9522da1b3a13161858c46b125978a3760d5263996ff4a12ad4b7d5ab2a8cd
+  metadata.gz: 4d4dcab294bcdbc3c618eef156debf4d7d5e567a105c7795b509cc68543cb592
+  data.tar.gz: de590eb069ca8f09a17b69c53cdc01c4730563ce51f9f43f937cff66d41df700
 SHA512:
-  metadata.gz: 4c276cc1a4c2bfa086b39051d60a8cae9b3668c70a556ffd08c6235bf2031f74649872ec265921604c36589b1fa4776cd74094ecc5977aad3c09abe4d989e8f7
-  data.tar.gz: 571d9ca427e2ea0f06a428ec197242bd437f54711fefbcfa23f13450a39ad7c70bc70720af8ccad2b4039579246e2d056daac9bd48b11ea232e0fbb1a4369adc
+  metadata.gz: '09c98872c6174c4c5a71d1d94d049ce0e554a0667e9a0db864a0a245a6d1cb5865db9b9a979de3d39a2948a7943da260e8f2c9d90fcd74f3eee65490e2d63968'
+  data.tar.gz: 4405598ee5e9050c1f344ed00e388974da0959775a9cd07460ec2f6dbf5c730f562210c2c35e16e5b0b2e3eac61bc3905e294dd3066c61f7bce12a4108000ff7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jetstream_bridge (2.0.0)
+    jetstream_bridge (2.2.0)
       activerecord (>= 6.0)
       activesupport (>= 6.0)
       nats-pure (~> 2.4)
@@ -142,8 +142,6 @@ GEM
       racc (~> 1.4)
     nokogiri (1.18.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.7-x86_64-linux-gnu)
-      racc (~> 1.4)
     parallel (1.27.0)
     parser (3.3.9.0)
       ast (~> 2.4.1)

data/README.md

@@ -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}.{app}.sync.{dest}` |
+| **Subscribe** | `{env}.{dest}.sync.{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}.{app}.sync.{dest}`)
+* `destination_subject` (`{env}.{dest}.sync.{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

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}.{dest}.sync.{app}" and processes messages.
   class Consumer
     DEFAULT_BATCH_SIZE = 25
     FETCH_TIMEOUT_SECS = 5

data/lib/jetstream_bridge/core/config.rb

@@ -30,19 +30,19 @@ 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}.{app}.sync.{dest}
+    # Consumer subscribes to:  {env}.{dest}.sync.{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

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}.{app}.sync.{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)
@@ -77,7 +77,7 @@ module JetstreamBridge
 
       repo.persist_pre(record, subject, envelope)
 
-      ok = with_retries { do_publish(subject, envelope) }
+      ok = with_retries { do_publish?(subject, envelope) }
       ok ? repo.persist_success(record) : repo.persist_failure(record, 'Publish returned false')
       ok
     rescue StandardError => e

data/lib/jetstream_bridge/version.rb

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

metadata

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