service_mesh_nats 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683e607b098b1fd2c8a5aa3d2d89182658f2cc7271523456f4d0c50879a2748f
-  data.tar.gz: 0202c5b52d82746c1ecf86204efc29326c64f1b5edf60bcb6052c538bc26bed5
+  metadata.gz: 8766fe267e81c95787f56181bf3124d3a4a12de3f88da6acf7eb6297f181b6fb
+  data.tar.gz: 558e29c69edc0287eca76e4ba26963551d6f9670937b5fc98d0fca00dfdf06ee
 SHA512:
-  metadata.gz: 423a075d243dcc467dc0208a5c5fdb2881c70c03af0c602f48ce0b461a19e2efb08fa68158122724a74cdbecac04e105b459eb49ba492d9ec9b7315f3fa522ed
-  data.tar.gz: 7e63ac578689eecbe34d4b3ee8b1880868eb4d1e40d7ec27e994e0ff8bcb2e911be6ec72ffb301d8fdb203d209b4fc6ec08a89c8c4e6a1861ec30d67b2727519
+  metadata.gz: f10332c9b690bf5d33606d588ad142a31e484e6ef70e8dc63d66dee5183e1fbf07dcfe8f0018ed75a230202f8cf8a6720255c7155404e395aca44422eca5e8eb
+  data.tar.gz: 7fd4f7fad61c811ccdd388e966cd9da91f504945691926d957dab6b77fcdc900a5ca7f4fc40549638039a2dda6c88fc2d829c97f8775b887349540fd34afe914

data/lib/service_mesh_nats/runtime.rb

@@ -9,7 +9,7 @@ module ServiceMeshNats
   # connection and runs their handlers on a bounded thread pool.
   class Runtime
     # A validated Endpoint or Subscriber. queue nil means a plain subscription.
-    Binding = Data.define(:subject, :queue, :target, :handler, :replies)
+    Subscription = Data.define(:subject, :queue, :target, :handler, :replies)
 
     FLUSH_BUDGET = 5.0
 
@@ -19,13 +19,13 @@ module ServiceMeshNats
     # Reads ServiceMesh::DEPLOYMENT_GROUP_KEY and CONCURRENCY_KEY from +config+;
     # connection keys are ignored, the client carries them. Raises
     # ServiceMesh::NoDeploymentGroup, BadConfig, ServiceMesh::KindMismatch, or
-    # ServiceMesh::InvalidTarget. Two bindings on one subject become two
-    # subscriptions. The connection is not touched until start.
+    # ServiceMesh::InvalidTarget. Two endpoints or subscribers on one subject
+    # become two subscriptions. The connection is not touched until start.
     def initialize(client, config, endpoints: [], subscribers: [], logger: Logger.new($stderr))
       @settings = RuntimeSettings.parse(config)
       @client = client
       @logger = logger
-      @bindings = bind_all(endpoints, subscribers)
+      @subscriptions = prepare_all(endpoints, subscribers)
 
       @lock = Mutex.new
       @state = :created
@@ -42,7 +42,7 @@ module ServiceMeshNats
       @client.service_map
     end
 
-    # Subscribes every binding on the client's connection and begins
+    # Subscribes every endpoint and subscriber on the client's connection and begins
     # receiving. Raises AlreadyStarted on a running runtime, Stopped after
     # stop, and Closed when the client has been closed. A failure while
     # subscribing or flushing unsubscribes what was subscribed, leaves the
@@ -57,7 +57,7 @@ module ServiceMeshNats
         pool = Concurrent::FixedThreadPool.new(@settings.concurrency, name: "service_mesh_nats")
         subs = []
         begin
-          @bindings.each do |b|
+          @subscriptions.each do |b|
             opts = b.queue ? {queue: b.queue} : {}
             subs << nc.subscribe(b.subject, opts) { |msg| dispatch(pool, nc, b, msg) }
           end
@@ -111,41 +111,41 @@ module ServiceMeshNats
       @logger.warn("service_mesh_nats: flush during stop failed: #{e.message}")
     end
 
-    def bind_all(endpoints, subscribers)
-      bind = lambda do |target, want, use, metadata, handler, replies|
+    def prepare_all(endpoints, subscribers)
+      prepare = lambda do |target, want, use, metadata, handler, replies|
         Subject.check_kind!(target, want, use)
         subject = Subject.format(target)
         raise ArgumentError, "#{use} #{subject} handler must respond to call" unless handler.respond_to?(:call)
 
-        queue = Subject.consumer_group(metadata, target.metadata, @settings.deployment_group)
-        Binding.new(subject: subject, queue: queue, target: target, handler: handler, replies: replies)
+        queue = Subject.consumer_group(metadata, @settings.deployment_group)
+        Subscription.new(subject: subject, queue: queue, target: target, handler: handler, replies: replies)
       end
 
-      endpoints.map { |e| bind.call(e.target, :route, "Endpoint", e.metadata, e.handler, true) } +
-        subscribers.map { |s| bind.call(s.target, :topic, "Subscriber", s.metadata, s.handler, false) }
+      endpoints.map { |e| prepare.call(e.target, :route, "Endpoint", e.metadata, e.handler, true) } +
+        subscribers.map { |s| prepare.call(s.target, :topic, "Subscriber", s.metadata, s.handler, false) }
     end
 
     # Runs on nats-pure's subscription thread; hands the message to the pool.
-    def dispatch(pool, nc, binding, msg)
-      pool.post { serve(nc, binding, msg) }
+    def dispatch(pool, nc, subscription, msg)
+      pool.post { serve(nc, subscription, msg) }
     rescue Concurrent::RejectedExecutionError
       # The pool is shutting down; the subscription is already gone.
     end
 
-    def serve(nc, binding, msg)
-      inbound = ServiceMesh::Message.new(target: binding.target, metadata: msg.header || {}, payload: msg.data.to_s)
+    def serve(nc, subscription, msg)
+      inbound = ServiceMesh::Message.new(target: subscription.target, metadata: msg.header || {}, payload: msg.data.to_s)
 
-      out = binding.handler.call(inbound)
-      return unless binding.replies && msg.reply
+      out = subscription.handler.call(inbound)
+      return unless subscription.replies && msg.reply
 
       unless out.is_a?(ServiceMesh::Message)
-        raise TypeError, "endpoint #{binding.subject} handler returned #{out.class}, expected ServiceMesh::Message"
+        raise TypeError, "endpoint #{subscription.subject} handler returned #{out.class}, expected ServiceMesh::Message"
       end
 
       reply(nc, msg.reply, out.metadata, out.payload)
     rescue => e
-      @logger.error("service_mesh_nats: handler failed on #{binding.subject}: #{e.class}: #{e.message}")
-      reply(nc, msg.reply, {HANDLER_ERROR_HEADER => e.message}, "") if binding.replies && msg.reply
+      @logger.error("service_mesh_nats: handler failed on #{subscription.subject}: #{e.class}: #{e.message}")
+      reply(nc, msg.reply, {HANDLER_ERROR_HEADER => e.message}, "") if subscription.replies && msg.reply
     end
 
     def reply(nc, subject, metadata, payload)

data/lib/service_mesh_nats/subject.rb

@@ -33,19 +33,15 @@ module ServiceMeshNats
       raise ServiceMesh::KindMismatch, "#{use} requires a #{want} target, got #{target.kind}"
     end
 
-    # The queue group for a binding. Binding metadata wins, then target
-    # metadata, then the deployment group. nil means a plain subscription.
-    def consumer_group(binding_metadata, target_metadata, deployment_group)
-      [binding_metadata, target_metadata].each do |md|
-        next unless md.key?(ServiceMesh::CONSUMER_GROUP_KEY)
-
-        value = md[ServiceMesh::CONSUMER_GROUP_KEY].to_s
-        next if value.empty?
-        return nil if value == ServiceMesh::CONSUMER_GROUP_NONE
-
-        return value
-      end
-      deployment_group
+    # The queue group of an Endpoint or Subscriber, from its metadata, falling
+    # back to the runtime's deployment group. nil means a plain subscription.
+    # A Target carries no consumer group, so its metadata is not read.
+    def consumer_group(metadata, deployment_group)
+      value = metadata[ServiceMesh::CONSUMER_GROUP_KEY].to_s
+      return deployment_group if value.empty?
+      return nil if value == ServiceMesh::CONSUMER_GROUP_NONE
+
+      value
     end
   end
 end

data/lib/service_mesh_nats/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ServiceMeshNats
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: service_mesh_nats
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Bryant Morrill
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-29 00:00:00.000000000 Z
+date: 2026-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nats-pure
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 description:
 email:
 - bryantreadmorrill@gmail.com