jetstream_bridge 1.6.0 → 1.7.0

data/lib/jetstream_bridge/{publisher.rb → publisher/publisher.rb}

@@ -2,10 +2,10 @@
 
 require 'json'
 require 'securerandom'
-require_relative 'connection'
-require_relative 'logging'
-require_relative 'config'
-require_relative 'model_utils'
+require_relative '../core/connection'
+require_relative '../core/logging'
+require_relative '../core/config'
+require_relative '../core/model_utils'
 
 module JetstreamBridge
   # Publishes to "{env}.data.sync.{app}.{dest}".
@@ -63,71 +63,23 @@ module JetstreamBridge
         return with_retries { do_publish(subject, envelope) }
       end
 
-      now = Time.now.utc
+      repo     = OutboxRepository.new(klass)
       event_id = envelope['event_id'].to_s
+      record   = repo.find_or_build(event_id)
 
-      record = ModelUtils.find_or_init_by_best(
-        klass,
-        { event_id: event_id },
-        # Fallback key if app uses a different unique column:
-        { dedup_key: event_id }
-      )
-
-      # If already sent, do nothing
-      if record.respond_to?(:sent_at) && record.sent_at
+      if repo.already_sent?(record)
         Logging.info("Outbox already sent event_id=#{event_id}; skipping publish.",
                      tag: 'JetstreamBridge::Publisher')
         return true
       end
 
-      # populate / update
-      ModelUtils.assign_known_attrs(record, {
-        event_id:      event_id,
-        subject:       subject,
-        payload:       ModelUtils.json_dump(envelope),
-        headers:       ModelUtils.json_dump({ 'Nats-Msg-Id' => event_id }),
-        status:        'publishing',
-        attempts:      (record.respond_to?(:attempts) ? (record.attempts || 0) + 1 : nil),
-        last_error:    nil,
-        enqueued_at:   (record.respond_to?(:enqueued_at) ? (record.enqueued_at || now) : nil),
-        updated_at:    (record.respond_to?(:updated_at) ? now : nil)
-      })
-      record.save!
+      repo.persist_pre(record, subject, envelope)
 
       ok = with_retries { do_publish(subject, envelope) }
-
-      if ok
-        ModelUtils.assign_known_attrs(record, {
-          status:   'sent',
-          sent_at:  (record.respond_to?(:sent_at) ? now : nil),
-          updated_at: (record.respond_to?(:updated_at) ? now : nil)
-        })
-        record.save!
-      else
-        ModelUtils.assign_known_attrs(record, {
-          status:     'failed',
-          last_error: 'Publish returned false',
-          updated_at: (record.respond_to?(:updated_at) ? now : nil)
-        })
-        record.save!
-      end
-
+      ok ? repo.persist_success(record) : repo.persist_failure(record, 'Publish returned false')
       ok
     rescue => e
-      # Persist the failure on the outbox row as best as we can
-      begin
-        if record
-          ModelUtils.assign_known_attrs(record, {
-            status:     'failed',
-            last_error: "#{e.class}: #{e.message}",
-            updated_at: (record.respond_to?(:updated_at) ? Time.now.utc : nil)
-          })
-          record.save!
-        end
-      rescue => e2
-        Logging.warn("Failed to persist outbox failure: #{e2.class}: #{e2.message}",
-                     tag: 'JetstreamBridge::Publisher')
-      end
+      repo.persist_exception(record, e) if defined?(repo) && defined?(record)
       log_error(false, e)
     end
     # ---- /Outbox path ----

data/lib/jetstream_bridge/railtie.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'rails/railtie'
+
+module JetstreamBridge
+  # Railtie for JetstreamBridge.
+  class Railtie < ::Rails::Railtie
+    rake_tasks do
+      load File.expand_path('tasks/install.rake', __dir__)
+    end
+  end
+end

data/lib/jetstream_bridge/tasks/install.rake

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+namespace :jetstream_bridge do
+  desc 'Install JetstreamBridge (initializer + migrations)'
+  task install: :environment do
+    puts '[jetstream_bridge] Generating initializer and migrations...'
+    Rails::Generators.invoke('jetstream_bridge:install', [], behavior: :invoke, destination_root: Rails.root.to_s)
+    puts '[jetstream_bridge] Done.'
+  end
+end

data/lib/jetstream_bridge/{overlap_guard.rb → topology/overlap_guard.rb}

@@ -2,7 +2,7 @@
 
 require 'json'
 require_relative 'subject_matcher'
-require_relative 'logging'
+require_relative '../core/logging'
 
 module JetstreamBridge
   # Checks for overlapping subjects.
@@ -12,6 +12,7 @@ module JetstreamBridge
       def check!(jts, target_name, new_subjects)
         conflicts = overlaps(jts, target_name, new_subjects)
         return if conflicts.empty?
+
         raise conflict_message(target_name, conflicts)
       end
 
@@ -22,13 +23,13 @@ module JetstreamBridge
         streams = list_streams_with_subjects(jts)
         others  = streams.reject { |s| s[:name] == target_name }
 
-        others.map do |s|
+        others.filter_map do |s|
           pairs = desired.flat_map do |n|
             Array(s[:subjects]).map(&:to_s).select { |e| SubjectMatcher.overlap?(n, e) }
                                .map { |e| [n, e] }
           end
           { name: s[:name], pairs: pairs } unless pairs.empty?
-        end.compact
+        end
       end
 
       # Returns [allowed, blocked] given desired subjects.
@@ -56,9 +57,10 @@ module JetstreamBridge
         offset = 0
         loop do
           resp  = js_api_request(jts, '$JS.API.STREAM.NAMES', { offset: offset })
-          batch = Array(resp['streams']).map { |h| h['name'] }.compact
+          batch = Array(resp['streams']).filter_map { |h| h['name'] }
           names.concat(batch)
           break if names.size >= resp['total'].to_i || batch.empty?
+
           offset = names.size
         end
         names

data/lib/jetstream_bridge/topology/stream.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+require_relative '../core/logging'
+require_relative 'overlap_guard'
+require_relative 'subject_matcher'
+
+module JetstreamBridge
+  # Ensures a stream exists and adds only subjects that are not already covered.
+  class Stream
+    class << self
+      def ensure!(jts, name, subjects)
+        desired = normalize_subjects(subjects)
+        raise ArgumentError, 'subjects must not be empty' if desired.empty?
+
+        attempts = 0
+        begin
+          info = safe_stream_info(jts, name)
+          info ? ensure_update(jts, name, info, desired) : ensure_create(jts, name, desired)
+        rescue NATS::JetStream::Error => e
+          if overlap_error?(e) && (attempts += 1) <= 1
+            Logging.warn("Overlap race while ensuring #{name}; retrying once...", tag: 'JetstreamBridge::Stream')
+            sleep(0.05)
+            retry
+          elsif overlap_error?(e)
+            Logging.warn(
+              "Overlap persists ensuring #{name}; leaving unchanged. err=#{e.message.inspect}",
+              tag: 'JetstreamBridge::Stream')
+            nil
+          else
+            raise
+          end
+        end
+      end
+
+      private
+
+      # ---------- Update existing stream ----------
+
+      def ensure_update(jts, name, info, desired)
+        existing = normalize_subjects(info.config.subjects || [])
+        to_add   = missing_subjects(existing, desired)
+        return log_already_covered(name) if to_add.empty?
+
+        allowed, blocked = OverlapGuard.partition_allowed(jts, name, to_add)
+        return log_all_blocked(name, blocked) if allowed.empty?
+
+        target = (existing + allowed).uniq
+        OverlapGuard.check!(jts, name, target)
+        jts.update_stream(name: name, subjects: target)
+        log_updated(name, allowed, blocked)
+      end
+
+      # ---------- Create new stream ----------
+
+      def ensure_create(jts, name, desired)
+        allowed, blocked = OverlapGuard.partition_allowed(jts, name, desired)
+        return log_not_created(name, blocked) if allowed.empty?
+
+        jts.add_stream(name: name, subjects: allowed, retention: 'interest', storage: 'file')
+        log_created(name, allowed, blocked)
+      end
+
+      # ---------- Helpers ----------
+
+      def safe_stream_info(jts, name)
+        jts.stream_info(name)
+      rescue NATS::JetStream::Error => e
+        return nil if stream_not_found?(e)
+        raise
+      end
+
+      def missing_subjects(existing, desired)
+        desired.reject { |d| SubjectMatcher.covered?(existing, d) }
+      end
+
+      def normalize_subjects(list)
+        Array(list).flatten.compact.map!(&:to_s).reject(&:empty?).uniq
+      end
+
+      def stream_not_found?(error)
+        msg = error.message.to_s
+        msg =~ /stream\s+not\s+found/i || msg =~ /\b404\b/
+      end
+
+      def overlap_error?(error)
+        msg = error.message.to_s
+        msg =~ /subjects?\s+overlap/i || msg =~ /\berr_code=10065\b/ || msg =~ /\bstatus_code=400\b/
+      end
+
+      # ---------- Logging wrappers ----------
+
+      def log_already_covered(name)
+        Logging.info("Stream #{name} exists; subjects already covered.", tag: 'JetstreamBridge::Stream')
+      end
+
+      def log_all_blocked(name, blocked)
+        if blocked.any?
+          Logging.warn(
+            "Stream #{name}: all missing subjects are owned by other streams; leaving unchanged. " \
+            "blocked=#{blocked.inspect}",
+            tag: 'JetstreamBridge::Stream'
+          )
+        else
+          Logging.info("Stream #{name} exists; nothing to add.", tag: 'JetstreamBridge::Stream')
+        end
+      end
+
+      def log_updated(name, added, blocked)
+        msg = "Updated stream #{name}; added subjects=#{added.inspect}"
+        msg += " (skipped overlapped=#{blocked.inspect})" if blocked.any?
+        Logging.info(msg, tag: 'JetstreamBridge::Stream')
+      end
+
+      def log_not_created(name, blocked)
+        Logging.warn(
+          "Not creating stream #{name}: all desired subjects are owned by other streams. " \
+          "blocked=#{blocked.inspect}",
+          tag: 'JetstreamBridge::Stream'
+        )
+      end
+
+      def log_created(name, allowed, blocked)
+        msg = "Created stream #{name} subjects=#{allowed.inspect}"
+        msg += " (skipped overlapped=#{blocked.inspect})" if blocked.any?
+        Logging.info(msg, tag: 'JetstreamBridge::Stream')
+      end
+    end
+  end
+end

data/lib/jetstream_bridge/{topology.rb → topology/topology.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
+require_relative '../core/config'
+require_relative '../core/logging'
 require_relative 'stream'
-require_relative 'config'
-require_relative 'logging'
 
 module JetstreamBridge
   class Topology

data/lib/jetstream_bridge/version.rb

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

data/lib/jetstream_bridge.rb

@@ -1,48 +1,60 @@
 # frozen_string_literal: true
 
 require_relative 'jetstream_bridge/version'
-require_relative 'jetstream_bridge/config'
-require_relative 'jetstream_bridge/duration'
-require_relative 'jetstream_bridge/logging'
-require_relative 'jetstream_bridge/connection'
-require_relative 'jetstream_bridge/publisher'
-require_relative 'jetstream_bridge/consumer'
-
-# JetstreamBridge
-#
-# Top-level module that exposes configuration and autoloads optional AR models.
-# Use `JetstreamBridge.configure` to set defaults for your environment.
-module JetstreamBridge
-  autoload :OutboxEvent, 'jetstream_bridge/outbox_event'
-  autoload :InboxEvent,  'jetstream_bridge/inbox_event'
+require_relative 'jetstream_bridge/core/config'
+require_relative 'jetstream_bridge/core/duration'
+require_relative 'jetstream_bridge/core/logging'
+require_relative 'jetstream_bridge/core/connection'
+require_relative 'jetstream_bridge/publisher/publisher'
+require_relative 'jetstream_bridge/consumer/consumer'
+
+# If you have a Railtie for tasks/eager-loading
+require_relative 'jetstream_bridge/railtie' if defined?(Rails::Railtie)
+
+# Load gem-provided models from lib/
+require_relative 'jetstream_bridge/models/outbox_event'
+require_relative 'jetstream_bridge/models/inbox_event'
+
 
+# JetstreamBridge main module.
+module JetstreamBridge
   class << self
-    # Access the global configuration.
-    # @return [JetstreamBridge::Config]
     def config
       @config ||= Config.new
     end
 
-    # Configure via hash and/or block.
-    # @param overrides [Hash] optional config key/value pairs
-    # @yieldparam [JetstreamBridge::Config] config
-    # @return [JetstreamBridge::Config]
     def configure(overrides = {})
       cfg = config
-      overrides.each { |k, v| assign!(cfg, k, v) }
+      overrides.each { |k, v| assign!(cfg, k, v) } unless overrides.nil? || overrides.empty?
       yield(cfg) if block_given?
       cfg
     end
 
-    # Reset memoized config (useful in tests).
     def reset!
       @config = nil
     end
 
+    def use_outbox?
+      config.use_outbox
+    end
+
+    def use_inbox?
+      config.use_inbox
+    end
+
+    def use_dlq?
+      config.use_dlq
+    end
+
+    def ensure_topology!
+      Connection.connect!
+      true
+    end
+
     private
 
     def assign!(cfg, key, val)
-      setter = "#{key}="
+      setter = :"#{key}="
       raise ArgumentError, "Unknown configuration option: #{key}" unless cfg.respond_to?(setter)
 
       cfg.public_send(setter, val)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetstream_bridge
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Mike Attara
@@ -67,75 +67,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.66'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.66'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.66'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.66'
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
@@ -151,19 +137,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: bundler-audit
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '1.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '1.21'
 description: |-
   Publisher/Consumer utilities for NATS JetStream with environment-scoped subjects,
   overlap guards, DLQ routing, retries/backoff, and optional Inbox/Outbox patterns.
@@ -182,28 +168,41 @@ files:
 - ".idea/misc.xml"
 - ".idea/modules.xml"
 - ".idea/vcs.xml"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - jetstream_bridge.gemspec
+- lib/generators/jetstream_bridge/initializer/initializer_generator.rb
+- lib/generators/jetstream_bridge/initializer/templates/jetstream_bridge.rb
+- lib/generators/jetstream_bridge/install/install_generator.rb
+- lib/generators/jetstream_bridge/migrations/migrations_generator.rb
+- lib/generators/jetstream_bridge/migrations/templates/create_jetstream_inbox_events.rb.erb
+- lib/generators/jetstream_bridge/migrations/templates/create_jetstream_outbox_events.rb.erb
 - lib/jetstream_bridge.rb
-- lib/jetstream_bridge/config.rb
-- lib/jetstream_bridge/connection.rb
-- lib/jetstream_bridge/consumer.rb
-- lib/jetstream_bridge/consumer_config.rb
-- lib/jetstream_bridge/dlq.rb
-- lib/jetstream_bridge/duration.rb
-- lib/jetstream_bridge/inbox_event.rb
-- lib/jetstream_bridge/logging.rb
-- lib/jetstream_bridge/message_processor.rb
-- lib/jetstream_bridge/model_utils.rb
-- lib/jetstream_bridge/outbox_event.rb
-- lib/jetstream_bridge/overlap_guard.rb
-- lib/jetstream_bridge/publisher.rb
-- lib/jetstream_bridge/stream.rb
-- lib/jetstream_bridge/subject_matcher.rb
-- lib/jetstream_bridge/topology.rb
+- lib/jetstream_bridge/consumer/consumer.rb
+- lib/jetstream_bridge/consumer/consumer_config.rb
+- lib/jetstream_bridge/consumer/inbox/inbox_message.rb
+- lib/jetstream_bridge/consumer/inbox/inbox_processor.rb
+- lib/jetstream_bridge/consumer/inbox/inbox_repository.rb
+- lib/jetstream_bridge/consumer/message_processor.rb
+- lib/jetstream_bridge/consumer/subscription_manager.rb
+- lib/jetstream_bridge/core/config.rb
+- lib/jetstream_bridge/core/connection.rb
+- lib/jetstream_bridge/core/duration.rb
+- lib/jetstream_bridge/core/logging.rb
+- lib/jetstream_bridge/core/model_utils.rb
+- lib/jetstream_bridge/models/inbox_event.rb
+- lib/jetstream_bridge/models/outbox_event.rb
+- lib/jetstream_bridge/publisher/outbox_repository.rb
+- lib/jetstream_bridge/publisher/publisher.rb
+- lib/jetstream_bridge/railtie.rb
+- lib/jetstream_bridge/tasks/install.rake
+- lib/jetstream_bridge/topology/overlap_guard.rb
+- lib/jetstream_bridge/topology/stream.rb
+- lib/jetstream_bridge/topology/subject_matcher.rb
+- lib/jetstream_bridge/topology/topology.rb
 - lib/jetstream_bridge/version.rb
 homepage: https://github.com/attaradev/jetstream_bridge
 licenses: