cosmonats 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f94d9b1e192b098e1bcb3ce77998d7b0ed9aca359af41fefe2a572624fa6b91
-  data.tar.gz: 12bba3015a4beb335efae8dfe5fc178a6c467d203eaf61f922bf1b3091b67ce6
+  metadata.gz: 0bb0db4ef3d9dac8fe723ab7440ccc6b2fcd3d5c746efd2cb3dd4c5a28c2d6f6
+  data.tar.gz: 06b65ca804dda9a66bc239feefb54cb9bdad2c23d63a0e514c97c33f602616f7
 SHA512:
-  metadata.gz: e24c844b4f17aa7eaffceebdd6b847858855fc0b5526b5537832893fd144e71f427ae352700adff3c5b39ed5cd04c89bc84007d01548ff97ba701a45e8c836b9
-  data.tar.gz: d1a7d5e0d45c5f9b03388259b45a5a6ce659dd39378a0f13e8f31cf36d7f969a332076cada74b564f2fd7d504c646df0715778679d0e67743a5f0ef08398e7c9
+  metadata.gz: 0525004e2df9b1d37488e698a83ce5decf8681a673e6d66e720dc74788c78f7ebd16abd63510f830a62a8efbdad09bcc06278747e8423bce892bcaa9663f43ad
+  data.tar.gz: b1b522586095c52f72631c80f1e6d8f22fc8853450515ecf49c91469bed0cd2269273cb0a2de95f46fd8c6e18d9a71e3ee7b5c9fad25cc60bf16cd2a62d2c1c2

data/lib/cosmo/api/stream.rb

@@ -45,21 +45,24 @@ module Cosmo
 
       def retries
         client.list_consumers(name).sum { _1["num_redelivered"].to_i }
+      rescue NATS::Error
+        0
       end
 
       def each
         return if total.zero?
 
-        state = info[:state]
-        current = @offset || state.first_seq.to_i
-        last = state.last_seq.to_i
+        candidates = {}
+        current, last, subjects = scan_range
 
         loop do
           break if current > last
 
-          job = message(current)
-          current += 1
-          next unless job
+          subject, job = next_candidate(subjects, candidates, current)
+          break unless job
+
+          candidates.delete(subject)
+          current = job.seq.to_i + 1
 
           yield job
         end
@@ -120,6 +123,33 @@ module Cosmo
 
       private
 
+      def scan_range
+        data = info
+        state = data[:state]
+        current = @offset || state.first_seq.to_i
+        subjects = Array(data[:config].subjects).reject { _1.start_with?(Cron::Entry::SUBJECT_PREFIX) }
+        [current, state.last_seq.to_i, subjects]
+      end
+
+      # Lowest-seq message at or after current across all job subject filters,
+      # caching each subject's next candidate so it isn't re-queried every step.
+      def next_candidate(subjects, candidates, current)
+        subjects.each do |subject|
+          next if candidates.key?(subject)
+
+          candidates[subject] = next_message(subject, current)
+        end
+
+        candidates.compact.min_by { |_, msg| msg.seq.to_i }
+      end
+
+      # Jump straight to the next message on the subject after seq, skipping any acked/deleted gaps
+      def next_message(subject, seq)
+        Job.new(name, client.get_message(name, next: true, seq: seq, subject: subject, direct: true))
+      rescue NATS::JetStream::Error::NotFound
+        nil
+      end
+
       def client
         self.class.client
       end

data/lib/cosmo/cli.rb

@@ -124,7 +124,7 @@ module Cosmo
             class_name = entry.delete(:class)
             API::Cron.instance.upsert!(**entry, name: name, class_name: class_name)
             sum + 1
-          end
+          end.to_i
 
           puts "Cron sync complete: #{schedules} schedule(s) registered" unless schedules.zero?
           puts "Cosmo streams#{" and cron schedules" unless schedules.zero?} set up successfully."

data/lib/cosmo/client.rb

@@ -69,6 +69,8 @@ module Cosmo
       return [] if data.nil? || data["streams"].nil?
 
       data["streams"]
+    rescue NATS::Error
+      []
     end
 
     def pause_stream(name)
@@ -101,8 +103,8 @@ module Cosmo
       js.consumer_info(stream_name, consumer_name)
     end
 
-    def get_message(name, **options)
-      js.get_msg(name, **options)
+    def get_message(stream_name, **options)
+      js.get_msg(stream_name, **options)
     end
 
     def delete_message(name, seq)

data/lib/cosmo/job/processor.rb

@@ -79,13 +79,10 @@ module Cosmo
           sw = stopwatch
           Logger.with(jid: data[:jid])
           Logger.info "start"
-          instance = worker_class.new
-          instance.jid = data[:jid]
-          if duration
-            Timeout.timeout(duration) { instance.perform(*data[:args]) }
-          else
-            instance.perform(*data[:args])
-          end
+
+          instance = worker_class.new.tap { |w| w.jid = data[:jid] }
+          perform_job(instance, data: data, message: message, duration: duration)
+
           message.ack
           Logger.with(elapsed: sw.elapsed_seconds) { Logger.info "done" }
           true
@@ -190,6 +187,21 @@ module Cosmo
           API::Counter.instance.with(&block)
         end
       end
+
+      # @param job_instance [Cosmo::Job]
+      # @param data [Hash]
+      # @param message [NATS::Msg]
+      # @param duration [Float, nil]
+      #
+      # rubocop:disable Lint/UnusedMethodArgument
+      def perform_job(job_instance, data:, message:, duration: nil)
+        if duration
+          Timeout.timeout(duration) { job_instance.perform(*data[:args]) }
+        else
+          job_instance.perform(*data[:args])
+        end
+      end
+      # rubocop:enable Lint/UnusedMethodArgument
     end
   end
 end

data/lib/cosmo/sentry/auto.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require "cosmo/job/processor"
+require "cosmo/sentry/job_processor_middleware"
+
+Cosmo::Job::Processor.prepend Cosmo::Sentry::JobProcessorMiddleware

data/lib/cosmo/sentry/job_processor_middleware.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+module Cosmo
+  module Sentry
+    module JobProcessorMiddleware
+      NAME_PREFIX = "Cosmonats"
+      OP_NAME = "queue.cosmonats"
+      SPAN_ORIGIN = "auto.queue.cosmonats"
+      STATUS_OK = 200
+      STATUS_FAIL = 500
+
+      # @param job_instance [Cosmo::Job]
+      # @param data [Hash]
+      # @param message [NATS::Msg]
+      # @param duration [Float, nil]
+      def perform_job(job_instance, data:, message:, duration: nil)
+        unless ::Sentry.initialized?
+          super
+          return
+        end
+
+        scope = ::Sentry.get_current_scope
+        transaction_name = "#{NAME_PREFIX}/#{job_instance.class.name}"
+        scope.set_transaction_name(transaction_name, source: :task)
+
+        transaction = ::Sentry.start_transaction(
+          name: scope.transaction_name,
+          source: scope.transaction_source,
+          op: OP_NAME,
+          origin: SPAN_ORIGIN
+        )
+        transaction&.set_data("messaging.message.id", data[:jid])
+        transaction&.set_data("messaging.destination.name", "#{message.metadata.stream}:#{message.subject}")
+        transaction&.set_data("messaging.message.retry.count", data[:retry] || 0)
+
+        begin
+          super
+
+          transaction&.set_http_status(STATUS_OK)
+          transaction&.finish
+        rescue StandardError => e
+          ::Sentry.capture_exception(
+            e,
+            contexts: {
+              cosmonats: data.merge(
+                nats_stream: message.metadata.stream,
+                nats_subject: message.subject,
+                timeout_duration: duration
+              )
+            },
+            hint: {
+              background: true,
+              integration: "cosmonats"
+            }
+          )
+          transaction&.set_http_status(STATUS_FAIL)
+          transaction&.finish
+
+          raise e
+        end
+      end
+    end
+  end
+end
+# rubocop:enable Metrics/MethodLength, Metrics/AbcSize

data/lib/cosmo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cosmo
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/cosmo/web/assets/app.css

@@ -509,6 +509,23 @@ details code { display: block; max-width: 400px; white-space: pre-wrap; }
 .htmx-request .htmx-indicator,
 .htmx-request.htmx-indicator   { opacity: 1; }
 
+#global-spinner {
+  position: fixed;
+  top: var(--space-2x);
+  right: var(--space-2x);
+  width: 24px;
+  height: 24px;
+  border: 3px solid var(--color-border);
+  border-top-color: var(--color-primary);
+  border-radius: 50%;
+  animation: spin 0.6s linear infinite;
+  z-index: 100;
+}
+
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
 /* ── Responsive ────────────────────────────────────────────────────────── */
 @media (max-width: 768px) {
   .nav            { flex-wrap: wrap; }

data/lib/cosmo/web/views/jobs/_enqueued.erb

@@ -5,6 +5,7 @@
               hx-target="#content"
               hx-swap="innerHTML"
               hx-push-url="true"
+              hx-indicator="#global-spinner"
               class="btn <%= "btn-primary" if @stream_name.to_s == stream_name.to_s %>">
         <%= h(stream_name) %>
       </button>
@@ -66,6 +67,7 @@
       <a hx-get="<%= url_for('/jobs/_enqueued', stream_name: @stream_name, page: @page - 1, limit: @limit) %>"
          hx-target="#enqueued-poller"
          hx-swap="outerHTML"
+         hx-indicator="#global-spinner"
          class="btn">&#x2190; Prev</a>
     <% else -%>
       <span class="btn btn-disabled">&#x2190; Prev</span>
@@ -77,6 +79,7 @@
       <a hx-get="<%= url_for('/jobs/_enqueued', stream_name: @stream_name, page: @page + 1, limit: @limit) %>"
          hx-target="#enqueued-poller"
          hx-swap="outerHTML"
+         hx-indicator="#global-spinner"
          class="btn">Next &#x2192;</a>
     <% else -%>
       <span class="btn btn-disabled">Next &#x2192;</span>

data/lib/cosmo/web/views/jobs/_stats.erb

@@ -19,7 +19,8 @@
       <a href="<%= url_for('/jobs/busy') %>"
          hx-get="<%= url_for('/jobs/busy') %>"
          hx-target="#content"
-         hx-push-url="true">&#x23F3; Busy</a>
+         hx-push-url="true"
+         hx-indicator="#global-spinner">&#x23F3; Busy</a>
     </p>
   </article>
   <article class="stat-card">
@@ -29,6 +30,7 @@
          hx-get="<%= url_for('/jobs/enqueued') %>"
          hx-target="#content"
          hx-push-url="true"
+         hx-indicator="#global-spinner"
          class="<%= 'active' if referrer?('/jobs/enqueued') %>">&#x1F4EC; Enqueued</a>
     </p>
   </article>
@@ -39,6 +41,7 @@
          hx-get="<%= url_for('/jobs/scheduled') %>"
          hx-target="#content"
          hx-push-url="true"
+         hx-indicator="#global-spinner"
          class="<%= 'active' if referrer?('/jobs/scheduled') %>">&#x23F0; Scheduled</a>
     </p>
   </article>
@@ -49,6 +52,7 @@
          hx-get="<%= url_for('/jobs/dead') %>"
          hx-target="#content"
          hx-push-url="true"
+         hx-indicator="#global-spinner"
          class="<%= 'active' if referrer?('/jobs/dead') %>">&#x1F480; Dead</a>
     </p>
   </article>

data/lib/cosmo/web/views/layout.erb

@@ -28,6 +28,7 @@
   </header>
   <main class="container">
     <%= content_for :view %>
+    <div id="global-spinner" class="htmx-indicator" aria-hidden="true"></div>
   </main>
 </body>
 </html>

data/sig/cosmo/api/stream.rbs

@@ -44,6 +44,12 @@ module Cosmo
 
       private
 
+      def scan_range: () -> [::Integer, ::Integer, Array[::String]]
+
+      def next_candidate: (Array[::String] subjects, Hash[::String, Job?] candidates, ::Integer current) -> [::String, Job]?
+
+      def next_message: (::String subject, ::Integer seq) -> Job?
+
       def client: () -> Client
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmonats
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dmitry Vorotilin
@@ -88,6 +88,8 @@ files:
 - lib/cosmo/processor.rb
 - lib/cosmo/publisher.rb
 - lib/cosmo/railtie.rb
+- lib/cosmo/sentry/auto.rb
+- lib/cosmo/sentry/job_processor_middleware.rb
 - lib/cosmo/stream.rb
 - lib/cosmo/stream/data.rb
 - lib/cosmo/stream/message.rb
@@ -197,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Lightweight background and stream processing
 test_files: []