cosmonats 0.4.2 → 0.5.0

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

@@ -14,10 +14,12 @@
 
   <div class="pending">
     <span></span>
-    <span class="text-muted"><%= @total %> message(s) pending</span>
+    <span class="text-muted"><%= @total.to_i %> message(s) pending</span>
   </div>
 
-  <% if @jobs.empty? -%>
+  <% if @jobs.nil? -%>
+    <div class="alert alert-success">No streams found</div>
+  <% elsif @jobs.empty? -%>
     <div class="alert alert-success">Stream <code><%= h(@stream_name) %></code> is empty</div>
   <% else -%>
     <div class="table-container">
@@ -61,44 +63,44 @@
     </div>
   <% end -%>
 
-  <% if @total_pages > 1 -%>
-  <div class="pagination">
-    <% if @page > 1 -%>
-      <a hx-get="<%= url_for('/jobs/enqueued', stream_name: @stream_name, page: @page - 1, limit: @limit) %>"
-         hx-target="#enqueued-poller"
-         hx-swap="outerHTML"
-         hx-push-url="true"
-         hx-indicator="#global-spinner"
-         class="btn">&#x2190; Prev</a>
-    <% else -%>
-      <span class="btn btn-disabled">&#x2190; Prev</span>
-    <% end -%>
-
-    <% pages(@page, @total_pages).each do |p| -%>
-      <% if p == :gap -%>
-        <span class="pagination-gap">&hellip;</span>
-      <% elsif p == @page -%>
-        <span class="btn btn-primary btn-disabled"><%= p %></span>
-      <% else -%>
-        <a hx-get="<%= url_for('/jobs/enqueued', stream_name: @stream_name, page: p, limit: @limit) %>"
+  <% if @total_pages.to_i > 1 -%>
+    <div class="pagination">
+      <% if @page > 1 -%>
+        <a hx-get="<%= url_for('/jobs/enqueued', stream_name: @stream_name, page: @page - 1, limit: @limit) %>"
            hx-target="#enqueued-poller"
            hx-swap="outerHTML"
            hx-push-url="true"
            hx-indicator="#global-spinner"
-           class="btn"><%= p %></a>
+           class="btn">&#x2190; Prev</a>
+      <% else -%>
+        <span class="btn btn-disabled">&#x2190; Prev</span>
       <% end -%>
-    <% end -%>
 
-    <% if @page < @total_pages -%>
-      <a hx-get="<%= url_for('/jobs/enqueued', stream_name: @stream_name, page: @page + 1, limit: @limit) %>"
-         hx-target="#enqueued-poller"
-         hx-swap="outerHTML"
-         hx-push-url="true"
-         hx-indicator="#global-spinner"
-         class="btn">Next &#x2192;</a>
-    <% else -%>
-      <span class="btn btn-disabled">Next &#x2192;</span>
-    <% end -%>
-  </div>
+      <% pages(@page, @total_pages).each do |p| -%>
+        <% if p == :gap -%>
+          <span class="pagination-gap">&hellip;</span>
+        <% elsif p == @page -%>
+          <span class="btn btn-primary btn-disabled"><%= p %></span>
+        <% else -%>
+          <a hx-get="<%= url_for('/jobs/enqueued', stream_name: @stream_name, page: p, limit: @limit) %>"
+             hx-target="#enqueued-poller"
+             hx-swap="outerHTML"
+             hx-push-url="true"
+             hx-indicator="#global-spinner"
+             class="btn"><%= p %></a>
+        <% end -%>
+      <% end -%>
+
+      <% if @page < @total_pages -%>
+        <a hx-get="<%= url_for('/jobs/enqueued', stream_name: @stream_name, page: @page + 1, limit: @limit) %>"
+           hx-target="#enqueued-poller"
+           hx-swap="outerHTML"
+           hx-push-url="true"
+           hx-indicator="#global-spinner"
+           class="btn">Next &#x2192;</a>
+      <% else -%>
+        <span class="btn btn-disabled">Next &#x2192;</span>
+      <% end -%>
+    </div>
   <% end -%>
 </div>

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

@@ -1,6 +1,8 @@
 <nav class="tabs">
   <a href="<%= url_for('/jobs') %>"
      class="<%= 'active' if path_prefix?('/jobs') %>">&#x1F4CB; Dashboard</a>
+  <a href="<%= url_for('/batches') %>"
+     class="<%= 'active' if path_prefix?('/batches') %>">&#x1F4E6; Batches</a>
   <a href="<%= url_for('/crons') %>"
      class="<%= 'active' if path_prefix?('/crons') %>">&#x23F0; Crons</a>
 </nav>

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

@@ -14,7 +14,7 @@
         <a href="<%= url_for('/jobs') %>" class="navbar-brand">🚀 Cosmo</a>
         <ul class="nav-list">
           <li>
-            <a href="<%= url_for('/jobs') %>" class="<%= "active" if path_prefix?('/jobs', '/crons') %>">Jobs</a>
+            <a href="<%= url_for('/jobs') %>" class="<%= "active" if path_prefix?('/jobs', '/crons', '/batches') %>">Jobs</a>
           </li>
           <li>
             <a href="<%= url_for('/streams') %>" class="<%= "active" if current_page?('/streams') %>">Streams</a>

data/lib/cosmo/web.rb

@@ -10,6 +10,7 @@ require "cosmo/web/controllers/jobs"
 require "cosmo/web/controllers/streams"
 require "cosmo/web/controllers/actions"
 require "cosmo/web/controllers/crons"
+require "cosmo/web/controllers/batches"
 
 module Cosmo
   class Web
@@ -48,6 +49,8 @@ module Cosmo
                  in [:get,    "/crons/_table"]          then [Controllers::Crons,   :_table]
                  in [:delete, "/crons/delete"]          then [Controllers::Crons,   :delete]
                  in [:post,   "/crons/run"]             then [Controllers::Crons,   :run_now]
+                 in [:get,    "/batches"]               then [Controllers::Batches, :index]
+                 in [:get,    "/batches/_table"]        then [Controllers::Batches, :_table]
                  in [:get,    "/actions"]               then [Controllers::Actions, :index]
                  in [:get,    "/assets/htmx.min.js.gz"] then serve("htmx.2.0.8.min.js.gz",
                                                                    "application/javascript",

data/lib/cosmo.rb

@@ -8,6 +8,7 @@ require "cosmo/version"
 require "cosmo/config"
 require "cosmo/logger"
 require "cosmo/job"
+require "cosmo/batch"
 require "cosmo/stream"
 require "cosmo/cli"
 require "cosmo/engine"

data/sig/cosmo/active_job/executor.rbs

@@ -3,6 +3,8 @@ module Cosmo
     class Executor
       include Cosmo::Job
 
+      def self.retry_in: (Hash[Symbol, untyped] data) -> Proc?
+
       def perform: (Hash[Symbol, untyped] job_data) -> void
     end
   end

data/sig/cosmo/api/batch.rbs

@@ -0,0 +1,43 @@
+module Cosmo
+  module API
+    class Batch
+      LIMIT: ::Integer
+
+      def self.all: (?limit: ::Integer) -> Array[Batch]
+
+      def self.kv: () -> KV
+
+      def self.counter: () -> Counter
+
+      @bid: ::String
+
+      attr_reader bid: ::String
+
+      def initialize: (::String bid) -> void
+
+      def meta: () -> Hash[Symbol, untyped]
+
+      def parent_id: () -> ::String?
+
+      def created_at: () -> ::Integer?
+
+      def ready?: () -> bool
+
+      def stats: () -> Hash[Symbol, untyped]
+
+      def callback: (Symbol event) -> Hash[Symbol, untyped]?
+
+      def callbacks: () -> Hash[Symbol, Hash[Symbol, untyped]?]
+
+      def fired?: (Symbol event) -> bool
+
+      private
+
+      def live_stats: () -> Hash[Symbol, untyped]
+
+      def kv: () -> KV
+
+      def counter: () -> Counter
+    end
+  end
+end

data/sig/cosmo/batch/callback.rbs

@@ -0,0 +1,9 @@
+module Cosmo
+  class Batch
+    class Callback
+      include Cosmo::Job
+
+      def perform: (::String class_name, Symbol event, Hash[Symbol, untyped] status, Hash[Symbol, untyped] opts) -> void
+    end
+  end
+end

data/sig/cosmo/batch/dispatcher.rbs

@@ -0,0 +1,23 @@
+module Cosmo
+  class Batch
+    module Dispatcher
+      private
+
+      def release_pending: (::String bid, ?msg_id: ::String?) -> void
+
+      def finalize: (::String bid) -> void
+
+      def purge_counters: (::String bid) -> void
+
+      def parent_propagate: (::String bid, failed: ::Integer) -> void
+
+      def link: (::String parent_id) -> void
+
+      def try_fire: (::String bid, Symbol event, ?stats: Hash[Symbol, untyped]?) -> void
+
+      def fireable?: (untyped callback_entry, Symbol event, Hash[Symbol, untyped]? stats) -> bool
+
+      def dispatch_callback: (untyped callback_entry, ::String bid, Symbol event, Hash[Symbol, untyped] stats) -> void
+    end
+  end
+end

data/sig/cosmo/batch.rbs

@@ -0,0 +1,49 @@
+module Cosmo
+  class Batch
+    extend Dispatcher
+
+    BUCKET: ::String
+    DEFAULT_EXPIRY: ::String
+    EVENTS: ::Array[Symbol]
+
+    self.@counter: API::Counter
+    self.@kv: API::KV
+
+    def self.current: () -> Batch?
+
+    def self.notify: (::String bid, ::String jid, success: bool) -> void
+
+    def self.counter: () -> API::Counter
+
+    def self.kv: () -> API::KV
+
+    @bid: ::String
+    @parent_id: ::String?
+
+    attr_reader bid: ::String
+
+    attr_reader parent_id: ::String?
+
+    def initialize: (?parent: ::String?) -> void
+
+    def jobs: () { () -> void } -> void
+
+    def on: (Symbol event, Class klass, **untyped) -> void
+
+    def register_job!: () -> void
+
+    def rollback_job!: () -> void
+
+    private
+
+    def counter: () -> API::Counter
+
+    def kv: () -> API::KV
+
+    def link: (::String parent_id) -> void
+
+    def release_pending: () -> void
+
+    def try_fire: (Symbol event) -> void
+  end
+end

data/sig/cosmo/config.rbs

@@ -10,6 +10,8 @@ module Cosmo
 
     def self.internal: () -> Hash[Symbol, untyped]
 
+    def self.to_ns: (Numeric seconds) -> ::Integer
+
     def self.parse_file: (::String path) -> Hash[Symbol, untyped]
 
     def self.normalize!: (Hash[Symbol, untyped] config) -> void

data/sig/cosmo/job/data.rbs

@@ -3,6 +3,8 @@ module Cosmo
     class Data
       DEFAULTS: { stream: Symbol, retry: Integer, dead: bool, limit: nil }
 
+      def self.default_retry: () -> Integer
+
       @class_name: ::String
       @args: Array[untyped]
       @options: Hash[Symbol, untyped]
@@ -27,7 +29,7 @@ module Cosmo
 
       def validate!: () -> void
 
-      def retries: () -> (Integer | bool)
+      def retries: () -> Integer
 
       def dead: () -> bool
     end

data/sig/cosmo/job/processor.rbs

@@ -1,6 +1,8 @@
 module Cosmo
   module Job
     class Processor < ::Cosmo::Processor
+      @weights: Array[Symbol]?
+
       private
 
       def setup: () -> void
@@ -17,7 +19,19 @@ module Cosmo
 
       def process: (Array[untyped] messages, untyped processor) -> void
 
-      def handle_failure: (untyped message, Hash[Symbol, untyped] data) -> bool
+      def handle_failure: (untyped worker_class, untyped message, Hash[Symbol, untyped] data, Exception? exception) -> bool
+
+      def nak_message: (untyped worker_class, untyped message, Hash[Symbol, untyped] data, Integer current_attempt, Exception? exception) -> void
+
+      def warn_capped: (untyped message, Hash[Symbol, untyped] data, Integer capped_at) -> void
+
+      def deliver_cap: (untyped stream_name, Integer desired_retries) -> Integer?
+
+      def consumer_entry: (untyped stream_name) -> [untyped, Hash[Symbol, untyped], untyped]?
+
+      def retry_delay: (untyped worker_class, Hash[Symbol, untyped] data, Integer current_attempt, Exception? exception) -> Numeric
+
+      def default_retry_delay: (Integer current_attempt) -> Integer
 
       def subscribe: (Symbol stream_name, Hash[Symbol, untyped] config) -> [untyped, Hash[Symbol, untyped], nil]
 
@@ -28,6 +42,8 @@ module Cosmo
       def with_stats: (untyped message) { () -> untyped } -> void
 
       def acquire_concurrency_slot: (untyped worker_class, untyped message, Hash[Symbol, untyped] data) -> (::String | false)
+
+      def perform_job: (untyped job_instance, data: Hash[Symbol, untyped], message: untyped, ?duration: Float?) -> untyped
     end
   end
 end

data/sig/cosmo/job.rbs

@@ -14,6 +14,8 @@ module Cosmo
 
       def limits_concurrency?: () -> bool
 
+      def retry_in: (?Hash[Symbol, untyped]? data) -> Proc?
+
       def perform: (*untyped args, ?async: bool, **untyped options) -> (::String | nil)
 
       def perform_async: (*untyped args) -> ::String
@@ -29,10 +31,18 @@ module Cosmo
       private
 
       def client: () -> Client
+
+      def publish: (Data data, Batch? batch) -> void
     end
 
     attr_accessor jid: ::String
 
+    attr_accessor enqueued_at: ::Time?
+
+    attr_accessor attempt: ::Integer?
+
+    attr_accessor scheduled_by: ::String?
+
     def perform: (*untyped) -> untyped
 
     def logger: () -> untyped

data/sig/cosmo/processor.rbs

@@ -1,8 +1,8 @@
 module Cosmo
   class Processor
-    STREAM_PAUSED_RECHECK_TTL: Float
-    STREAMS_PAUSED_IDLE_SLEEP: Float
-    STREAM_EMPTY_BACKOFF_MAX: Float
+    STREAM_PAUSED_RECHECK_TTL: ::String
+    STREAMS_PAUSED_IDLE_SLEEP: ::String
+    STREAM_EMPTY_BACKOFF_MAX: ::String
 
     @pool: Utils::ThreadPool
     @running: untyped

data/sig/cosmo/utils/duration.rbs

@@ -0,0 +1,11 @@
+module Cosmo
+  module Utils
+    module Duration
+      UNITS: ::Hash[::String, ::Integer]
+
+      def self.parse: (Numeric | ::String value) -> Numeric
+
+      def parse: (Numeric | ::String value) -> Numeric
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmonats
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Dmitry Vorotilin
@@ -37,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +82,7 @@ files:
 - lib/cosmo/active_job/executor.rb
 - lib/cosmo/active_job/options.rb
 - lib/cosmo/api.rb
+- lib/cosmo/api/batch.rb
 - lib/cosmo/api/busy.rb
 - lib/cosmo/api/counter.rb
 - lib/cosmo/api/cron.rb
@@ -76,6 +91,9 @@ files:
 - lib/cosmo/api/kv.rb
 - lib/cosmo/api/stats.rb
 - lib/cosmo/api/stream.rb
+- lib/cosmo/batch.rb
+- lib/cosmo/batch/callback.rb
+- lib/cosmo/batch/dispatcher.rb
 - lib/cosmo/cli.rb
 - lib/cosmo/client.rb
 - lib/cosmo/config.rb
@@ -96,6 +114,7 @@ files:
 - lib/cosmo/stream/processor.rb
 - lib/cosmo/stream/serializer.rb
 - lib/cosmo/utils.rb
+- lib/cosmo/utils/duration.rb
 - lib/cosmo/utils/hash.rb
 - lib/cosmo/utils/json.rb
 - lib/cosmo/utils/overrides.rb
@@ -112,12 +131,15 @@ files:
 - lib/cosmo/web/context.rb
 - lib/cosmo/web/controllers/actions.rb
 - lib/cosmo/web/controllers/application.rb
+- lib/cosmo/web/controllers/batches.rb
 - lib/cosmo/web/controllers/crons.rb
 - lib/cosmo/web/controllers/jobs.rb
 - lib/cosmo/web/controllers/streams.rb
 - lib/cosmo/web/helpers/application.rb
 - lib/cosmo/web/renderer.rb
 - lib/cosmo/web/views/actions/index.erb
+- lib/cosmo/web/views/batches/_table.erb
+- lib/cosmo/web/views/batches/index.erb
 - lib/cosmo/web/views/crons/_table.erb
 - lib/cosmo/web/views/crons/index.erb
 - lib/cosmo/web/views/jobs/_busy.erb
@@ -143,6 +165,7 @@ files:
 - sig/cosmo/active_job/adapter.rbs
 - sig/cosmo/active_job/executor.rbs
 - sig/cosmo/active_job/options.rbs
+- sig/cosmo/api/batch.rbs
 - sig/cosmo/api/busy.rbs
 - sig/cosmo/api/counter.rbs
 - sig/cosmo/api/cron.rbs
@@ -151,6 +174,9 @@ files:
 - sig/cosmo/api/kv.rbs
 - sig/cosmo/api/stats.rbs
 - sig/cosmo/api/stream.rbs
+- sig/cosmo/batch.rbs
+- sig/cosmo/batch/callback.rbs
+- sig/cosmo/batch/dispatcher.rbs
 - sig/cosmo/cli.rbs
 - sig/cosmo/client.rbs
 - sig/cosmo/config.rbs
@@ -168,6 +194,7 @@ files:
 - sig/cosmo/stream/message.rbs
 - sig/cosmo/stream/processor.rbs
 - sig/cosmo/stream/serializer.rbs
+- sig/cosmo/utils/duration.rbs
 - sig/cosmo/utils/hash.rbs
 - sig/cosmo/utils/json.rbs
 - sig/cosmo/utils/signal.rbs