cosmonats 0.2.0 → 0.4.0

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

@@ -1,5 +1,5 @@
 <section>
-  <header></header>
+  <header><%= render('jobs/_tabs') %></header>
 
   <div hx-get="<%= url_for('/jobs/_stats') %>"
        hx-trigger="load, every 5s"
@@ -7,10 +7,12 @@
     <div class="alert alert-info">Loading statistics…</div>
   </div>
 
-  <div id="content"
-       hx-get="<%= url_for('/jobs/_enqueued', stream_name: @stream_name) %>"
-       hx-trigger="load"
-       hx-swap="innerHTML">
-    <div class="alert alert-info">Loading enqueued jobs&hellip;</div>
+  <div id="content">
+    <div id="enqueued-poller"
+         hx-get="<%= url_for('/jobs/_enqueued', stream_name: @stream_name) %>"
+         hx-trigger="load"
+         hx-swap="outerHTML">
+      <div class="alert alert-info">Loading enqueued jobs&hellip;</div>
+    </div>
   </div>
 </section>

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

@@ -1,5 +1,5 @@
 <section>
-  <header></header>
+  <header><%= render('jobs/_tabs') %></header>
 
   <div hx-get="<%= url_for('/jobs/_stats') %>"
        hx-trigger="load, every 5s"

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

@@ -1,5 +1,5 @@
 <section>
-  <header></header>
+  <header><%= render('jobs/_tabs') %></header>
 
   <div hx-get="<%= url_for('/jobs/_stats') %>"
        hx-trigger="load, every 5s"
@@ -8,10 +8,11 @@
   </div>
 
   <div id="content">
-    <div hx-get="<%= url_for('/jobs/_scheduled') %>"
-         hx-trigger="load, every 5s"
-         hx-swap="innerHTML">
-      <div class="alert alert-info">Loading scheduled jobs…</div>
+    <div id="scheduled-poller"
+         hx-get="<%= url_for('/jobs/_scheduled') %>"
+         hx-trigger="load"
+         hx-swap="outerHTML">
+      <div class="alert alert-info">Loading scheduled jobs&hellip;</div>
     </div>
   </div>
 </section>

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 current_page?('/jobs') %>">Jobs</a>
+            <a href="<%= url_for('/jobs') %>" class="<%= "active" if path_prefix?('/jobs', '/crons') %>">Jobs</a>
           </li>
           <li>
             <a href="<%= url_for('/streams') %>" class="<%= "active" if current_page?('/streams') %>">Streams</a>

data/lib/cosmo/web/views/streams/_info.erb

@@ -17,6 +17,8 @@
   </article>
 </div>
 
+<%= render("streams/_pause_banner", { name: @name, paused: @paused }) %>
+
 <div class="nav">
   <a href="<%= url_for('/streams') %>"
      hx-get="<%= url_for('/streams') %>"
@@ -87,3 +89,4 @@
     <div class="subject-tag" style="padding: var(--space) var(--space-2x); font-size: 1rem;"><%= h(sub) %></div>
   <% end -%>
 </div>
+

data/lib/cosmo/web/views/streams/_pause_banner.erb

@@ -0,0 +1,17 @@
+<% if @paused -%>
+  <div id="pause-banner-<%= h(@name) %>" class="alert alert-warning" style="display:flex; align-items:center; justify-content:space-between; flex-wrap:wrap; gap:var(--space-2x);">
+    <span>&#9208; <strong>Stream is paused</strong> — consumers are not fetching new messages.</span>
+    <a hx-patch="<%= url_for('/streams/unpause', { name: u(@name), banner: 1 }) %>"
+       hx-target="#pause-banner-<%= h(@name) %>"
+       hx-swap="outerHTML"
+       class="btn btn-success">&#9654; Resume Stream</a>
+  </div>
+<% else -%>
+  <div id="pause-banner-<%= h(@name) %>" class="alert alert-success" style="display:flex; align-items:center; justify-content:space-between; flex-wrap:wrap; gap:var(--space-2x);">
+    <span>&#9654; <strong>Stream is active</strong> — consumers are fetching new messages.</span>
+    <a hx-patch="<%= url_for('/streams/pause', { name: u(@name), banner: 1 }) %>"
+       hx-target="#pause-banner-<%= h(@name) %>"
+       hx-swap="outerHTML"
+       class="btn btn-warning">&#9208; Pause Stream</a>
+  </div>
+<% end -%>

data/lib/cosmo/web/views/streams/_stream_row.erb

@@ -0,0 +1,42 @@
+<tr id="stream-row-<%= h(@stream[:name]) %>">
+  <td>
+    <a href="<%= url_for('/streams/info', { name: u(@stream[:name]) }) %>"
+       hx-get="<%= url_for('/streams/info', { name: u(@stream[:name]) }) %>"
+       hx-target="#content"
+       hx-push-url="true"
+       class="stream-link"><%= h(@stream[:name]) %></a>
+  </td>
+  <td><%= format_numbers(@stream[:messages]) %></td>
+  <td><%= format_bytes(@stream[:bytes]) %></td>
+  <td><%= @stream[:consumer_count] %></td>
+  <td>
+    <div class="subjects">
+      <% Array(@stream[:subjects]).each do |subject| -%>
+        <span class="subject-tag"><%= h(subject) %></span>
+      <% end -%>
+    </div>
+  </td>
+  <td><code><%= format_numbers(@stream[:first_seq]) %> &rarr; <%= format_numbers(@stream[:last_seq]) %></code></td>
+  <td>
+    <% if @stream[:paused] -%>
+      <span class="badge badge-warning">&#9208; Paused</span>
+    <% elsif @stream[:consumer_count].to_i > 0 -%>
+      <span class="badge badge-success">&#9654; Active</span>
+    <% else -%>
+      <span class="badge">No consumers</span>
+    <% end -%>
+  </td>
+  <td>
+    <% if @stream[:paused] -%>
+      <a hx-patch="<%= url_for('/streams/unpause', { name: u(@stream[:name]) }) %>"
+         hx-target="#stream-row-<%= h(@stream[:name]) %>"
+         hx-swap="outerHTML"
+         class="btn btn-success">&#9654; Resume</a>
+    <% else -%>
+      <a hx-patch="<%= url_for('/streams/pause', { name: u(@stream[:name]) }) %>"
+         hx-target="#stream-row-<%= h(@stream[:name]) %>"
+         hx-swap="outerHTML"
+         class="btn btn-warning">&#9208; Pause</a>
+    <% end -%>
+  </td>
+</tr>

data/lib/cosmo/web/views/streams/_table.erb

@@ -11,30 +11,13 @@
           <th>Consumers</th>
           <th>Subjects</th>
           <th>Sequence</th>
+          <th>Status</th>
+          <th>Actions</th>
         </tr>
       </thead>
       <tbody>
-        <% @streams.each do |s| -%>
-        <tr>
-          <td>
-            <a href="<%= url_for('/streams/info', { name: u(s[:name]) }) %>"
-               hx-get="<%= url_for('/streams/info', { name: u(s[:name]) }) %>"
-               hx-target="#content"
-               hx-push-url="true"
-               class="stream-link"><%= h(s[:name]) %></a>
-          </td>
-          <td><%= format_numbers(s[:messages]) %></td>
-          <td><%= format_bytes(s[:bytes]) %></td>
-          <td><%= s[:consumer_count] %></td>
-          <td>
-            <div class="subjects">
-              <% (s[:subjects] || []).each do |sub| -%>
-                <span class="subject-tag"><%= h(sub) %></span>
-              <% end -%>
-            </div>
-          </td>
-          <td><code><%= format_numbers(s[:first_seq]) %> &rarr; <%= format_numbers(s[:last_seq]) %></code></td>
-        </tr>
+        <% @streams.each do |stream| -%>
+          <%= render("streams/_stream_row", { stream: stream }) %>
         <% end -%>
       </tbody>
     </table>

data/lib/cosmo/web.rb

@@ -9,6 +9,7 @@ require "cosmo/web/controllers/application"
 require "cosmo/web/controllers/jobs"
 require "cosmo/web/controllers/streams"
 require "cosmo/web/controllers/actions"
+require "cosmo/web/controllers/crons"
 
 module Cosmo
   class Web
@@ -41,6 +42,12 @@ module Cosmo
                  in [:get,    "/streams/info"]          then [Controllers::Streams, :info]
                  in [:get,    "/streams/_table"]        then [Controllers::Streams, :_table]
                  in [:get,    "/streams/_info"]         then [Controllers::Streams, :_info]
+                 in [:patch,  "/streams/pause"]         then [Controllers::Streams, :pause]
+                 in [:patch,  "/streams/unpause"]       then [Controllers::Streams, :unpause]
+                 in [:get,    "/crons"]                 then [Controllers::Crons,   :index]
+                 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,    "/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

@@ -12,6 +12,7 @@ require "cosmo/stream"
 require "cosmo/cli"
 require "cosmo/engine"
 require "cosmo/api"
+require "cosmo/railtie" if defined?(Rails::Railtie)
 
 module Cosmo
   class Error < StandardError; end

data/sig/cosmo/active_job/adapter.rbs

@@ -0,0 +1,13 @@
+module Cosmo
+  module ActiveJobAdapter
+    class Adapter
+      def enqueue: (untyped job) -> String
+      def enqueue_at: (untyped job, Numeric timestamp) -> String
+
+      private
+
+      def publish: (untyped job, Numeric? timestamp) -> String
+      def job_cosmo_options: (untyped job) -> Hash[Symbol, untyped]
+    end
+  end
+end

data/sig/cosmo/active_job/executor.rbs

@@ -0,0 +1,9 @@
+module Cosmo
+  module ActiveJobAdapter
+    class Executor
+      include Cosmo::Job
+
+      def perform: (Hash[Symbol, untyped] job_data) -> void
+    end
+  end
+end

data/sig/cosmo/active_job/options.rbs

@@ -0,0 +1,14 @@
+module Cosmo
+  module ActiveJobAdapter
+    VALID_OPTIONS: ::Array[::Symbol]
+
+    module Options
+      def self.included: (::Module base) -> void
+
+      module ClassMethods
+        def cosmo_options: (**untyped opts) -> ::Hash[::Symbol, untyped]
+        def get_cosmo_options: () -> ::Hash[::Symbol, untyped]
+      end
+    end
+  end
+end

data/sig/cosmo/api/cron/entry.rbs

@@ -0,0 +1,30 @@
+module Cosmo
+  module API
+    class Cron
+      class Entry
+        SUBJECT_PREFIX: ::String
+
+        attr_reader class_name: ::String
+        attr_reader stream: ::String
+        attr_reader expression: ::String
+        attr_reader args: ::Array[untyped]
+        attr_reader timezone: ::String?
+        attr_reader name: ::String?
+
+        def self.normalize_expression: (untyped expr) -> ::String
+
+        def initialize: (class_name: ::String, stream: ::String, expression: ::String,
+                          ?args: ::Array[untyped], ?timezone: ::String?, ?name: (::String | ::Symbol)?) -> void
+
+        def schedule_subject: () -> ::String
+        def target_subject: () -> ::String
+        def job_name: () -> ::String
+        def job_payload: () -> ::String
+        def as_json: () -> Hash[Symbol, untyped]
+        def to_s: () -> ::String
+        alias inspect to_s
+      end
+    end
+  end
+end
+

data/sig/cosmo/api/cron.rbs

@@ -0,0 +1,25 @@
+module Cosmo
+  module API
+    class Cron
+      def all: () -> ::Array[Hash[Symbol, untyped]]
+
+      def upsert!: (?Cosmo::API::Cron::Entry schedule_obj,
+                    ?class_name: ::String?,
+                    ?stream: ::String?,
+                    ?expression: ::String?,
+                    ?args: ::Array[untyped],
+                    ?timezone: ::String?,
+                    ?name: ::String?) -> Hash[Symbol, untyped]?
+
+      def delete!: (::String subject) -> void
+
+      def run_now!: (::String schedule_subject) -> void
+
+      private
+
+      def schedules_from_stream: (::String stream_name) -> ::Array[Hash[Symbol, untyped]]
+      def build_from_nats: (::String stream_name, ::String subject) -> Hash[Symbol, untyped]?
+      def name_from_subject: (::String subject) -> ::String?
+    end
+  end
+end

data/sig/cosmo/api/kv.rbs

@@ -5,11 +5,13 @@ module Cosmo
       @options: Hash[Symbol, untyped]
       @kv: untyped
 
+      attr_reader kv: untyped
+
       def initialize: (::String name, ?Hash[Symbol, untyped]? options) -> void
 
-      def set: (::String | ::Integer key, ::String value) -> untyped
+      def set: (::String | ::Integer key, untyped value, ?ttl: ::Integer?) -> untyped
 
-      def get: (::String | ::Integer key) -> ::String?
+      def get: (::String | ::Integer key) -> untyped
 
       def delete: (::String | ::Integer key) -> untyped
 
@@ -21,10 +23,6 @@ module Cosmo
 
       def count: () -> ::Integer
       alias size count
-
-      private
-
-      def kv: () -> untyped
     end
   end
 end

data/sig/cosmo/api/stream.rbs

@@ -26,7 +26,7 @@ module Cosmo
 
       def retries: () -> ::Integer
 
-      def each: (?from: ::Integer?) { (Job) -> void } -> void
+      def each: () { (Job) -> void } -> void
 
       def messages: (?page: ::Integer?, ?limit: ::Integer?) -> Array[Job]
 
@@ -36,6 +36,12 @@ module Cosmo
 
       def delete: (::Integer seq) -> untyped
 
+      def pause!: () -> untyped
+
+      def unpause!: () -> untyped
+
+      def paused?: () -> bool
+
       private
 
       def client: () -> Client

data/sig/cosmo/client.rbs

@@ -21,20 +21,36 @@ module Cosmo
 
     def delete_stream: (::String | Symbol name, ?Hash[Symbol, untyped] params) -> untyped
 
-    def list_streams: () -> Array[::String]
+    def update_stream: (::String | Symbol name, Hash[Symbol, untyped] config) -> untyped
+
+    def setup_stream: (::String name, Hash[Symbol, untyped] config) -> untyped
+
+    def cron_subjects_in_stream: (::String stream_name, ::String filter) -> Array[::String]
+
+    def list_streams: () -> Array[Hash[::String, untyped]]
+
+    def pause_stream: (::String name) -> void
+
+    def unpause_stream: (::String name) -> void
+
+    def stream_paused?: (::String name) -> bool
 
     def list_consumers: (::String stream_name) -> Array[Hash[::String, untyped]]
 
+    def consumer_info: (::String stream_name, ::String consumer_name) -> NATS::JetStream::API::ConsumerInfo
+
     def get_message: (::String | Symbol name, **untyped options) -> NATS::JetStream::API::RawStreamMsg
 
     def delete_message: (::String name, ::Integer seq) -> Hash[::String, untyped]
 
     def purge: (::String stream_name, ::String? subject) -> ::Integer?
 
-    def consumer_info: (::String stream_name, ::String consumer_name) -> NATS::JetStream::API::ConsumerInfo
-
-    def kv: (::String name, **untyped opts) -> NATS::KeyValue
+    def kv: (::String name, ?allow_msg_ttl: bool, **untyped opts) -> untyped
 
     def close: -> void
+
+    private
+
+    def create_kv_with_msg_ttl: (::String name, **untyped opts) -> untyped
   end
 end

data/sig/cosmo/config.rbs

@@ -1,17 +1,14 @@
 module Cosmo
-  class Config
+  class Config < ::Hash[Symbol, untyped]
     NANO: Integer
     DEFAULT_PATH: ::String
 
     self.@instance: Config
-    self.@system: Hash[Symbol, untyped]
-    @config: Hash[Symbol, untyped]?
-    @system: Hash[Symbol, untyped]
-    @defaults: Hash[Symbol, untyped]
+    self.@internal: Hash[Symbol, untyped]
 
     def self.instance: () -> Config
 
-    def self.system: () -> Hash[Symbol, untyped]
+    def self.internal: () -> Hash[Symbol, untyped]
 
     def self.parse_file: (::String path) -> Hash[Symbol, untyped]
 
@@ -31,15 +28,6 @@ module Cosmo
 
     def self.load: (?::String? path) -> void
 
-    def initialize: () -> void
-
-    def []: (Symbol key) -> untyped
-
-    def fetch: (Symbol key, ?untyped default) -> untyped
-
-    def dig: (*Symbol keys) -> untyped
-
-    def to_h: () -> Hash[Symbol, untyped]
 
     def set: (*untyped) -> untyped
 

data/sig/cosmo/job/data.rbs

@@ -1,7 +1,7 @@
 module Cosmo
   module Job
     class Data
-      DEFAULTS: { stream: Symbol, retry: Integer | bool, dead: bool }
+      DEFAULTS: { stream: Symbol, retry: Integer, dead: bool, limit: nil }
 
       @class_name: ::String
       @args: Array[untyped]

data/sig/cosmo/job/limit.rbs

@@ -0,0 +1,18 @@
+module Cosmo
+  module Job
+    class Limit
+      BUCKET: ::String
+
+      self.@instance: Limit
+
+      def self.instance: () -> Limit
+
+      def initialize: () -> void
+
+      def acquire: (::String key, jid: ::String, limit: ::Integer, duration: ::Integer) -> ::String?
+
+      def release: (::String slot) -> void
+    end
+  end
+end
+

data/sig/cosmo/job/processor.rbs

@@ -1,23 +1,33 @@
 module Cosmo
   module Job
     class Processor < ::Cosmo::Processor
-      @weights: Array[Symbol]
+      private
 
-      def initialize: (Utils::ThreadPool pool, untyped running, Hash[Symbol, untyped] options) -> void
+      def setup: () -> void
 
-      private
+      def schedule_loop: () -> void
 
-      def run_loop: () -> void
+      def scheduler?: () -> bool
 
-      def setup: () -> void
+      def consumers: () -> Array[untyped]
 
-      def work_loop: () -> void
+      def fetch_subjects: (Hash[Symbol, untyped] config) -> untyped
 
-      def schedule_loop: () -> void
+      def fetch_timeout: (Hash[Symbol, untyped] config) -> Float
+
+      def process: (Array[untyped] messages, untyped processor) -> void
+
+      def handle_failure: (untyped message, Hash[Symbol, untyped] data) -> bool
+
+      def subscribe: (Symbol stream_name, Hash[Symbol, untyped] config) -> [untyped, Hash[Symbol, untyped], nil]
+
+      def drop_message: (untyped message, Hash[Symbol, untyped] data) -> void
+
+      def move_message: (untyped message, ?Hash[Symbol, untyped]? data) -> void
 
-      def process: (Array[untyped] messages) -> void
+      def with_stats: (untyped message) { () -> untyped } -> void
 
-      def handle_failure: (untyped message, Hash[Symbol, untyped] data) -> void
+      def acquire_concurrency_slot: (untyped worker_class, untyped message, Hash[Symbol, untyped] data) -> (::String | false)
     end
   end
 end

data/sig/cosmo/job.rbs

@@ -5,7 +5,14 @@ module Cosmo
     module ClassMethods
       @default_options: Hash[Symbol, untyped]
 
-      def options: (?stream: Symbol?, ?retry: Integer?, ?dead: bool?) -> Hash[Symbol, untyped]
+      def options: (**untyped config) -> Hash[Symbol, untyped]
+      alias cosmo_options options
+
+      def concurrency_options: () -> { limit: Integer, key: Proc?, duration: Integer }?
+
+      def concurrency_key: (Array[untyped] args) -> ::String?
+
+      def limits_concurrency?: () -> bool
 
       def perform: (*untyped args, ?async: bool, **untyped options) -> (::String | nil)
 
@@ -24,9 +31,7 @@ module Cosmo
       def client: () -> Client
     end
 
-    attr_reader jid: ::String
-
-    def jid=: (::String) -> ::String
+    attr_accessor jid: ::String
 
     def perform: (*untyped) -> untyped
 

data/sig/cosmo/processor.rbs

@@ -1,24 +1,46 @@
 module Cosmo
   class Processor
+    STREAM_PAUSED_RECHECK_TTL: Float
+    STREAMS_PAUSED_IDLE_SLEEP: Float
+    STREAM_EMPTY_BACKOFF_MAX: Float
+
     @pool: Utils::ThreadPool
     @running: untyped
     @consumers: Array[untyped]
+    @threads: Array[Thread]
+    @cache: Utils::TTLCache
     @options: Hash[Symbol, untyped]
+    @locks: Hash[::String, Mutex]
+    @consumer_state: untyped
 
     def self.run: (*untyped) -> Processor
 
+    attr_reader consumers: Array[untyped]
+
     def initialize: (Utils::ThreadPool pool, untyped running, Hash[Symbol, untyped] options) -> void
 
     def run: () -> void
 
+    def stop: (?::Integer | ::Float timeout) -> void
+
     private
 
     def run_loop: () -> void
 
+    def work_loop: () -> void
+
+    def schedule_loop: () -> void
+
+    def scheduler?: () -> bool
+
     def setup: () -> void
 
     def process: (*untyped) -> void
 
+    def fetch_timeout: (Hash[Symbol, untyped] config) -> Float
+
+    def fetch_subjects: (Hash[Symbol, untyped] config) -> untyped
+
     def running?: () -> bool
 
     def fetch: (untyped subscription, batch_size: Integer, timeout: Float) ?{ (Array[untyped]) -> void } -> void
@@ -26,5 +48,9 @@ module Cosmo
     def client: () -> Client
 
     def stopwatch: () -> Utils::Stopwatch
+
+    def lock: (::String stream_name) { () -> void } -> void
+
+    def consumer_state: () -> untyped
   end
 end

data/sig/cosmo/railtie.rbs

@@ -0,0 +1,4 @@
+module Cosmo
+  class Railtie < ::Rails::Railtie
+  end
+end

data/sig/cosmo/stream/processor.rbs

@@ -3,27 +3,21 @@ module Cosmo
     class Processor < ::Cosmo::Processor
       @configs: Array[Hash[Symbol, untyped]]
 
-      def initialize: (Utils::ThreadPool pool, untyped running, Hash[Symbol, untyped] options) -> void
-
       private
 
-      def run_loop: () -> void
-
       def setup: () -> void
 
-      def convert_timeout: (Numeric) -> Float
-
-      def work_loop: () -> void
-
       def process: (Array[untyped] messages, untyped processor) -> void
 
-      def setup_configs: () -> void
+      def fetch_subjects: (Hash[Symbol, untyped] config) -> untyped
 
-      def setup_consumers: () -> void
+      def fetch_timeout: (Hash[Symbol, untyped] config) -> Float
 
       def static_config: -> Array[Hash[Symbol, untyped]]
 
       def dynamic_config: -> Array[Hash[Symbol, untyped]]
+
+      def subscribe: (Symbol? stream_name, Hash[Symbol, untyped] config) -> [untyped, Hash[Symbol, untyped], untyped]
     end
   end
 end

data/sig/cosmo/utils/hash.rbs

@@ -3,23 +3,19 @@ module Cosmo
     module Hash
       def self.symbolize_keys!: (untyped obj) -> (::Hash[Symbol, untyped] | Array[untyped] | untyped)
 
-      def self.dup: [T] (T hash) -> T
+      def self.stringify_keys: (untyped obj) -> (::Hash[String, untyped] | Array[untyped] | untyped)
 
-      def self.keys?: (::Hash[untyped, untyped] hash, *untyped keys) -> bool
+      def self.dup: [T] (T hash) -> T
 
       def self.set: (::Hash[untyped, untyped] hash, *untyped keys, value: untyped) -> untyped
 
-      def self.merge: (::Hash[untyped, untyped] hash1, ::Hash[untyped, untyped]? hash2) -> ::Hash[untyped, untyped]
-
       def symbolize_keys!: (untyped obj) -> (::Hash[Symbol, untyped] | Array[untyped] | untyped)
 
-      def dup: [T] (T hash) -> T
+      def stringify_keys: (untyped obj) -> (::Hash[String, untyped] | Array[untyped] | untyped)
 
-      def keys?: (::Hash[untyped, untyped] hash, *untyped keys) -> bool
+      def dup: [T] (T hash) -> T
 
       def set: (::Hash[untyped, untyped] hash, *untyped keys, value: untyped) -> untyped
-
-      def merge: (::Hash[untyped, untyped] hash1, ::Hash[untyped, untyped]? hash2) -> ::Hash[untyped, untyped]
     end
   end
 end