jetstream_bridge 4.5.2 → 4.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08ea80256539bb801e52672dc900d0e858b4a22fcc76e0958dfa1341e908dcc8'
-  data.tar.gz: 6fd4e80d372f8c9c022dfe0992356a73784f517d0a18d78e65ec78a01652443d
+  metadata.gz: 8f268d96e9181e741027749623be2f513fc3e06a95dee4b46f3ebbb34dc89e2a
+  data.tar.gz: ea64cc3f05eab3b20e562fc10a1f092d6ebe00e2a5d231ec1842cac957a2c229
 SHA512:
-  metadata.gz: 5b3a853557c531acac60a559673f95e2daab985ec43adf9b711108d2541fef59e109b894e070459a9259a4a3ccceedc15812e1768ce3a41d47b0087ec40a4a65
-  data.tar.gz: 76de67fbf04fdc62bab5c952238403a91f430396a20c738d9863aae4dbc2faed364cf9686791ddc566ffb7fb9a82acb2afef780f3dbbcbdb62d9287d6b58fea6
+  metadata.gz: 502702da2e9905488fc58c6d3d20f2372e92bd8b54c1c5ad561842ab5b4c563a2692688bf3271af057d719dd134ae2cb1d299a43609cb6281f14956b438e2f25
+  data.tar.gz: bc5a499270533e30d57b4c3c9af66939acbff0c1ff11b884a868ce636a19cc5edf697145a3e78cf7fed5e7a25c53ca7123497ee9fa507944bdfd78788571d30c

data/lib/jetstream_bridge/consumer/subscription_manager.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'json'
 require_relative '../core/logging'
 require_relative '../core/duration'
 require_relative '../errors'
@@ -47,32 +48,7 @@ module JetstreamBridge
       # 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
+      return build_pull_subscription(nc) if nc.respond_to?(:new_inbox) && nc.respond_to?(:subscribe)
 
       # Fallback for environments (mocks/tests) where low-level NATS client is unavailable.
       if @jts.respond_to?(:pull_subscribe)
@@ -193,5 +169,82 @@ module JetstreamBridge
 
       nil
     end
+
+    def build_pull_subscription(nats_client)
+      prefix = @jts.instance_variable_get(:@prefix) || '$JS.API'
+      deliver = nats_client.new_inbox
+      sub = nats_client.subscribe(deliver)
+      sub.instance_variable_set(:@_jsb_nc, nats_client)
+      sub.instance_variable_set(:@_jsb_deliver, deliver)
+      sub.instance_variable_set(:@_jsb_next_subject, "#{prefix}.CONSUMER.MSG.NEXT.#{stream_name}.#{@durable}")
+
+      extend_pull_subscription(sub)
+      attach_jsi(sub)
+
+      Logging.info(
+        "Created pull subscription without verification for consumer #{@durable} " \
+        "(stream=#{stream_name}, filter=#{filter_subject})",
+        tag: 'JetstreamBridge::Consumer'
+      )
+
+      sub
+    end
+
+    def extend_pull_subscription(sub)
+      pull_mod = begin
+        NATS::JetStream.const_get(:PullSubscription)
+      rescue NameError
+        nil
+      end
+
+      sub.extend(pull_mod) if pull_mod
+      shim_fetch(sub) unless pull_mod
+    end
+
+    def shim_fetch(sub)
+      Logging.warn(
+        'PullSubscription mixin unavailable; using shim fetch implementation',
+        tag: 'JetstreamBridge::Consumer'
+      )
+
+      sub.define_singleton_method(:fetch) do |batch_size, timeout: nil|
+        nc_handle = instance_variable_get(:@_jsb_nc)
+        deliver_subject = instance_variable_get(:@_jsb_deliver)
+        next_subject = instance_variable_get(:@_jsb_next_subject)
+        unless nc_handle && deliver_subject && next_subject
+          raise JetstreamBridge::ConnectionError, 'Missing NATS handles for fetch'
+        end
+
+        expires_ns = ((timeout || 5).to_f * 1_000_000_000).to_i
+        payload = { batch: batch_size, expires: expires_ns }.to_json
+
+        nc_handle.publish(next_subject, payload, deliver_subject)
+        nc_handle.flush
+
+        messages = []
+        batch_size.times do
+          msg = next_msg(timeout || 5)
+          messages << msg if msg
+        rescue NATS::IO::Timeout, NATS::Timeout
+          break
+        end
+        messages
+      end
+    end
+
+    def attach_jsi(sub)
+      js_sub_class = begin
+        NATS::JetStream.const_get(:JS).const_get(:Sub)
+      rescue NameError
+        Struct.new(:js, :stream, :consumer, :nms, keyword_init: true)
+      end
+
+      sub.jsi = js_sub_class.new(
+        js: @jts,
+        stream: stream_name,
+        consumer: @durable,
+        nms: sub.instance_variable_get(:@_jsb_next_subject)
+      )
+    end
   end
 end

data/lib/jetstream_bridge/version.rb

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

metadata

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