jetstream_bridge 2.7.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc39ce8a4d26a2488bcd9bb756a6380d3a5336e2048c2bb5b18082b4e7930e5d
-  data.tar.gz: f9c0298070c6a25771d8bf9848582bf256d1b7890e7d4944ad3653eead18a96f
+  metadata.gz: 0fd7228628d4d5308efceec8d1bf60d9dcff0caf311ab6d459c6c9fc32fbea11
+  data.tar.gz: 4fe44a58012328837b727807d5d07aa3f265ff8c23dc852a906d84714eaebbf8
 SHA512:
-  metadata.gz: c1b927989ccca2615e3e5229ac5679f9e4bfe76ec92d978cafe6cb1c4dcae40ccbecf4d88699020e9c4cebb695a6de7efedd8bfef259053c901db336181ac294
-  data.tar.gz: 51caa80c8790f79ea2808ab0f85de484b6b17626a08eaf06eb674340a4cead39d8016d2f971b97508e1be45e661490b555360378fcadf7b5c3f407bf30c4453f
+  metadata.gz: d9343bc42829b93c1279e4bd2a22fafdd77f69a1e18330b9771f37caeb04fac83fab7687b099484e670a8027d139ee5354601485a06d83ac79b1e3bd265b3a29
+  data.tar.gz: aab3b5ae4b601ece51560a46fca18f459f01de29b3731fd545ad08e1a00607e54b03167b484a5aa59e414be448c877d8f909c17640fa00ab2c4301618953c2fe

data/lib/jetstream_bridge/consumer/consumer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require 'oj'
 require 'securerandom'
 require_relative '../core/connection'
 require_relative '../core/duration'

data/lib/jetstream_bridge/consumer/dlq_publisher.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require 'oj'
 require 'time'
 require_relative '../core/logging'
 
@@ -46,7 +46,7 @@ module JetstreamBridge
       headers['x-dead-letter'] = 'true'
       headers['x-dlq-reason']  = reason
       headers['x-deliveries']  = deliveries.to_s
-      headers['x-dlq-context'] = JSON.generate(envelope)
+      headers['x-dlq-context'] = Oj.dump(envelope, mode: :compat)
       headers
     end
   end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require 'oj'
 
 module JetstreamBridge
   # Immutable value object for a single NATS message.
@@ -12,6 +12,7 @@ module JetstreamBridge
       seq        = meta.respond_to?(:stream_sequence) ? meta.stream_sequence : nil
       deliveries = meta.respond_to?(:num_delivered)   ? meta.num_delivered   : nil
       stream     = meta.respond_to?(:stream)          ? meta.stream          : nil
+      consumer   = meta.respond_to?(:consumer)        ? meta.consumer        : nil
       subject    = msg.subject.to_s
 
       headers = {}
@@ -19,18 +20,18 @@ module JetstreamBridge
 
       raw  = msg.data
       body = begin
-        JSON.parse(raw)
-      rescue StandardError
+        Oj.load(raw, mode: :strict)
+      rescue Oj::Error
         {}
       end
 
       id = (headers['nats-msg-id'] || body['event_id']).to_s.strip
       id = "seq:#{seq}" if id.empty?
 
-      new(msg, seq, deliveries, stream, subject, headers, body, raw, id, Time.now.utc)
+      new(msg, seq, deliveries, stream, subject, headers, body, raw, id, Time.now.utc, consumer)
     end
 
-    def initialize(msg, seq, deliveries, stream, subject, headers, body, raw, event_id, now)
+    def initialize(msg, seq, deliveries, stream, subject, headers, body, raw, event_id, now, consumer = nil)
       @msg        = msg
       @seq        = seq
       @deliveries = deliveries
@@ -41,10 +42,32 @@ module JetstreamBridge
       @raw        = raw
       @event_id   = event_id
       @now        = now
+      @consumer   = consumer
     end
 
     def body_for_store
       body.empty? ? raw : body
     end
+
+    def data
+      raw
+    end
+
+    def header
+      headers
+    end
+
+    def metadata
+      @metadata ||= Struct.new(:num_delivered, :sequence, :consumer, :stream)
+                           .new(deliveries, seq, @consumer, stream)
+    end
+
+    def ack(*args, **kwargs)
+      msg.ack(*args, **kwargs) if msg.respond_to?(:ack)
+    end
+
+    def nak(*args, **kwargs)
+      msg.nak(*args, **kwargs) if msg.respond_to?(:nak)
+    end
   end
 end

data/lib/jetstream_bridge/consumer/message_processor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require 'oj'
 require_relative '../core/logging'
 require_relative 'message_context'
 require_relative 'dlq_publisher'
@@ -37,12 +37,8 @@ module JetstreamBridge
 
     def parse_message(msg, ctx)
       data = msg.data
-      if defined?(Oj)
-        Oj.load(data, mode: :strict)
-      else
-        JSON.parse(data)
-      end
-    rescue JSON::ParserError => e
+      Oj.load(data, mode: :strict)
+    rescue Oj::ParseError => e
       @dlq.publish(msg, ctx,
                    reason: 'malformed_json', error_class: e.class.name, error_message: e.message)
       msg.ack

data/lib/jetstream_bridge/consumer/subscription_manager.rb

@@ -11,6 +11,8 @@ module JetstreamBridge
       @jts     = jts
       @durable = durable
       @cfg     = cfg
+      @desired_cfg      = ConsumerConfig.consumer_config(@durable, filter_subject)
+      @desired_cfg_norm = normalize_consumer_config(@desired_cfg)
     end
 
     def stream_name
@@ -22,18 +24,18 @@ module JetstreamBridge
     end
 
     def desired_consumer_cfg
-      ConsumerConfig.consumer_config(@durable, filter_subject)
+      @desired_cfg
     end
 
     def ensure_consumer!
       info = consumer_info_or_nil
       return create_consumer! unless info
 
-      want = desired_consumer_cfg
-      if consumer_matches?(info, want)
+      have_norm = normalize_consumer_config(info.config)
+      if have_norm == @desired_cfg_norm
         log_consumer_ok
       else
-        log_consumer_diff(info, want)
+        log_consumer_diff(have_norm)
         recreate_consumer!
       end
     end
@@ -58,15 +60,8 @@ module JetstreamBridge
 
     # ---- comparison ----
 
-    def consumer_matches?(info, want)
-      have_norm = normalize_consumer_config(info.config)
-      want_norm = normalize_consumer_config(want)
-      have_norm == want_norm
-    end
-
-    def log_consumer_diff(info, want)
-      have_norm = normalize_consumer_config(info.config)
-      want_norm = normalize_consumer_config(want)
+    def log_consumer_diff(have_norm)
+      want_norm = @desired_cfg_norm
 
       diffs = {}
       (have_norm.keys | want_norm.keys).each do |k|

data/lib/jetstream_bridge/core/connection.rb

@@ -2,7 +2,7 @@
 
 require 'nats/io/client'
 require 'singleton'
-require 'json'
+require 'oj'
 require_relative 'duration'
 require_relative 'logging'
 require_relative 'config'

data/lib/jetstream_bridge/core/duration.rb

@@ -14,6 +14,7 @@ module JetstreamBridge
   # Examples:
   #   Duration.to_millis(30)                        #=> 30000   (auto)
   #   Duration.to_millis(1500)                      #=> 1500    (auto)
+  #   Duration.to_millis("1500")                    #=> 1500    (auto)
   #   Duration.to_millis(1500, default_unit: :s)    #=> 1_500_000
   #   Duration.to_millis("30s")                     #=> 30000
   #   Duration.to_millis("500ms")                   #=> 500
@@ -48,7 +49,7 @@ module JetstreamBridge
       case val
       when Integer then int_to_ms(val, default_unit: default_unit)
       when Float   then float_to_ms(val, default_unit: default_unit)
-      when String  then string_to_ms(val, default_unit: default_unit == :auto ? :s : default_unit)
+      when String  then string_to_ms(val, default_unit: default_unit)
       else
         raise ArgumentError, "invalid duration type: #{val.class}" unless val.respond_to?(:to_f)
 
@@ -59,7 +60,10 @@ module JetstreamBridge
 
     # Normalize an array of durations into integer milliseconds.
     def normalize_list_to_millis(values, default_unit: :auto)
-      Array(values).map { |v| to_millis(v, default_unit: default_unit) }
+      vals = Array(values)
+      return [] if vals.empty?
+
+      vals.map { |v| to_millis(v, default_unit: default_unit) }
     end
 
     # --- internal helpers ---
@@ -70,7 +74,7 @@ module JetstreamBridge
         # Preserve existing heuristic for compatibility
         num >= 1_000 ? num : num * 1_000
       else
-        coerce_numeric_to_ms(i.to_f, default_unit)
+        coerce_numeric_to_ms(num.to_f, default_unit)
       end
     end
 
@@ -80,8 +84,9 @@ module JetstreamBridge
 
     def string_to_ms(str, default_unit:)
       s = str.strip
-      # Plain number string => use default_unit explicitly (not heuristic)
-      return coerce_numeric_to_ms(s.delete('_').to_f, default_unit) if NUMBER_RE.match?(s)
+      # Plain number strings are treated like integers so the :auto
+      # heuristic still applies (<1000 => seconds, >=1000 => ms).
+      return int_to_ms(s.delete('_').to_i, default_unit: default_unit) if NUMBER_RE.match?(s)
 
       m = TOKEN_RE.match(s)
       raise ArgumentError, "invalid duration: #{str.inspect}" unless m

data/lib/jetstream_bridge/core/model_codec_setup.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'oj'
+
 module JetstreamBridge
   module ModelCodecSetup
     module_function
@@ -17,7 +19,7 @@ module JetstreamBridge
         next unless column?(klass, attr)
         next if json_column?(klass, attr) || already_serialized?(klass, attr)
 
-        klass.serialize attr.to_sym, coder: JSON
+        klass.serialize attr.to_sym, coder: Oj
       end
     rescue ActiveRecord::StatementInvalid, ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError
       # ignore when schema isn’t available yet

data/lib/jetstream_bridge/core/model_utils.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'oj'
+
 module JetstreamBridge
   module ModelUtils
     module_function
@@ -36,15 +38,18 @@ module JetstreamBridge
     end
 
     def json_dump(obj)
-      obj.is_a?(String) ? obj : JSON.generate(obj)
-    rescue
+      return obj if obj.is_a?(String)
+
+      Oj.dump(obj, mode: :compat)
+    rescue Oj::Error, TypeError
       obj.to_s
     end
 
     def json_load(str)
       return str if str.is_a?(Hash)
-      JSON.parse(str.to_s)
-    rescue
+
+      Oj.load(str.to_s, mode: :strict)
+    rescue Oj::Error
       {}
     end
   end

data/lib/jetstream_bridge/inbox_event.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'oj'
+
 begin
   require 'active_record'
 rescue LoadError
@@ -84,8 +86,8 @@ module JetstreamBridge
         v = self[:payload]
         case v
         when String then begin
-          JSON.parse(v)
-        rescue StandardError
+          Oj.load(v, mode: :strict)
+        rescue Oj::Error
           {}
         end
         when Hash then v

data/lib/jetstream_bridge/outbox_event.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require 'oj'
 
 begin
   require 'active_record'
@@ -93,8 +93,8 @@ module JetstreamBridge
         v = self[:payload]
         case v
         when String then begin
-          JSON.parse(v)
-        rescue StandardError
+          Oj.load(v, mode: :strict)
+        rescue Oj::Error
           {}
         end
         when Hash then v

data/lib/jetstream_bridge/publisher/publisher.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require 'oj'
 require 'securerandom'
 require_relative '../core/connection'
 require_relative '../core/logging'
@@ -50,12 +50,21 @@ module JetstreamBridge
     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'
-      )
-      true
+      ack = @jts.publish(subject, Oj.dump(envelope, mode: :compat), header: headers)
+      duplicate = ack.respond_to?(:duplicate?) && ack.duplicate?
+      msg = "Published #{subject} event_id=#{envelope['event_id']}"
+      msg += ' (duplicate)' if duplicate
+
+      Logging.info(msg, tag: 'JetstreamBridge::Publisher')
+
+      if ack.respond_to?(:error) && ack.error
+        Logging.error(
+          "Publish ack error: #{ack.error}",
+          tag: 'JetstreamBridge::Publisher'
+        )
+      end
+
+      !ack.respond_to?(:error) || ack.error.nil?
     end
 
     # ---- Outbox path ----

data/lib/jetstream_bridge/topology/overlap_guard.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require 'oj'
 require_relative 'subject_matcher'
 require_relative '../core/logging'
 
@@ -68,8 +68,8 @@ module JetstreamBridge
 
       def js_api_request(jts, subject, payload = {})
         # JetStream client should expose the underlying NATS client as `nc`
-        msg = jts.nc.request(subject, JSON.dump(payload))
-        JSON.parse(msg.data)
+        msg = jts.nc.request(subject, Oj.dump(payload, mode: :compat))
+        Oj.load(msg.data, mode: :strict)
       end
 
       def conflict_message(target, conflicts)

data/lib/jetstream_bridge/version.rb

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

data/lib/jetstream_bridge.rb

@@ -46,9 +46,19 @@ module JetstreamBridge
       config.use_dlq
     end
 
-    def ensure_topology?
+    # Establishes a connection and ensures stream topology.
+    #
+    # @return [Object] JetStream context
+    def ensure_topology!
       Connection.connect!
-      true
+      Connection.jetstream
+    end
+
+    # @deprecated Use {ensure_topology!} instead. This method will be removed
+    #   in a future version.
+    def ensure_topology?
+      Logging.warn('ensure_topology? is deprecated; use ensure_topology! instead', tag: 'JetstreamBridge')
+      !!ensure_topology!
     end
 
     private

metadata

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