pg_eventstore 1.3.4 → 1.5.0

data/lib/pg_eventstore/web/views/home/dashboard.erb

@@ -26,6 +26,7 @@
             <br/>
             <form id="filters-form" action="<%= url('/') %>" method="GET" data-parsley-validate class="form-horizontal form-label-left">
               <input type="hidden" name="per_page" value="<%= params[:per_page].to_i %>">
+              <input type="hidden" name="resolve_link_tos" value="<%= resolve_link_tos? %>">
               <div class="stream-filters">
                 <% streams_filter&.each do |attrs| %>
                   <%= erb :'home/partials/stream_filter', { layout: false }, { stream: attrs } %>
@@ -89,6 +90,16 @@
                     <button type="submit" class="d-none"></button>
                   </div>
                 </form>
+                <div class="float-md-right mt-2 mr-2">
+                  <div class="form-group">
+                    <div class="checkbox">
+                      <label for="resolve-link-tos" class="control-label">
+                        Resolve links
+                        <input type="checkbox" id="resolve-link-tos" value="true" autocomplete="off" <% if resolve_link_tos? %> checked <% end %> data-url-checked="<%= resolve_link_tos_url(true) %>" data-url-unchecked="<%= resolve_link_tos_url(false) %>">
+                      </label>
+                    </div>
+                  </div>
+                </div>
                 <div class="float-md-right mt-2 mr-2">
                   <div class="form-group">
                     <div class="checkbox">

data/lib/pg_eventstore/web/views/home/partials/events.erb

@@ -5,7 +5,12 @@
     <td><%= event.stream.context %></td>
     <td><%= event.stream.stream_name %></td>
     <td><a href="<%= stream_path(event) %>"><%= event.stream.stream_id %></a></td>
-    <td><%= event.type %></td>
+    <td>
+      <%= event.type %>
+      <% if event.link %>
+        <i class="fa fa-link"></i>
+      <% end %>
+    </td>
     <td><%= event.created_at.strftime('%F %T') %></td>
     <td><%= event.id %></td>
     <td><a href="javascript: void(0);" class="d-inline-block text-nowrap toggle-event-data">JSON <i

data/lib/pg_eventstore/web/views/subscriptions/index.erb

@@ -66,7 +66,7 @@
                         <tbody>
                           <tr>
                             <td><%= subscriptions_set.id %></td>
-                            <td><%= colored_state(subscriptions_set.state, subscriptions_set.updated_at) %></td>
+                            <td><%= colored_state(subscriptions_set.state, PgEventstore::SubscriptionsSetLifecycle::HEARTBEAT_INTERVAL, subscriptions_set.updated_at) %></td>
                             <td><%= subscriptions_set.restart_count %></td>
                             <td><%= subscriptions_set.max_restarts_number %></td>
                             <td><%= subscriptions_set.time_between_restarts %>s</td>
@@ -161,7 +161,7 @@
                             <td><%= subscription.current_position %></td>
                             <td><%= subscription.chunk_query_interval %>s</td>
                             <td><%= subscription.last_chunk_fed_at %></td>
-                            <td><%= colored_state(subscription.state, subscription.updated_at) %></td>
+                            <td><%= colored_state(subscription.state, PgEventstore::SubscriptionsLifecycle::HEARTBEAT_INTERVAL, subscription.updated_at) %></td>
                             <td>
                               <% if subscription.average_event_processing_time %>
                                 <%= "#{(1 / subscription.average_event_processing_time).to_i}/s" %>

data/lib/pg_eventstore.rb

@@ -5,6 +5,7 @@ require_relative 'pg_eventstore/utils'
 require_relative 'pg_eventstore/callbacks'
 require_relative 'pg_eventstore/extensions/options_extension'
 require_relative 'pg_eventstore/extensions/callbacks_extension'
+require_relative 'pg_eventstore/extensions/callback_handlers_extension'
 require_relative 'pg_eventstore/extensions/using_connection_extension'
 require_relative 'pg_eventstore/event_class_resolver'
 require_relative 'pg_eventstore/config'

data/sig/interfaces/_raw_event_handler.rbs

@@ -0,0 +1,3 @@
+interface _RawEventHandler
+  def call: (Hash[String, untyped] event) -> void
+end

data/sig/pg_eventstore/config.rbs

@@ -49,5 +49,7 @@ module PgEventstore
     attr_accessor subscriptions_set_max_retries: Integer
 
     attr_accessor subscriptions_set_retries_interval: Integer
+
+    attr_accessor subscription_graceful_shutdown_timeout: Integer | Float
   end
 end

data/sig/pg_eventstore/extensions/callback_handlers_extension.rbs

@@ -0,0 +1,11 @@
+module PgEventstore
+  module Extensions
+    module CallbackHandlersExtension
+      def self.included: (untyped klass) -> untyped
+
+      module ClassMethods
+        def setup_handler: (Symbol name, *untyped args) -> ^(*untyped rest) -> untyped
+      end
+    end
+  end
+end

data/sig/pg_eventstore/subscriptions/callback_handlers/commands_handler_handlers.rbs

@@ -0,0 +1,10 @@
+module PgEventstore
+  class CommandsHandlerHandlers
+    def self.process_feeder_commands: (Symbol config_name, PgEventstore::SubscriptionFeeder subscription_feeder) -> void
+
+    def self.process_runners_commands: (Symbol config_name, Array[PgEventstore::SubscriptionRunner] runners,
+        PgEventstore::SubscriptionFeeder subscription_feeder) -> void
+
+    def self.restore_runner: (PgEventstore::BasicRunner basic_runner, Integer restart_delay, StandardError error) -> void
+  end
+end

data/sig/pg_eventstore/subscriptions/callback_handlers/events_processor_handlers.rbs

@@ -0,0 +1,11 @@
+module PgEventstore
+  class EventsProcessorHandlers
+    def self.process_event: (PgEventstore::Callbacks callbacks, _RawEventHandler handler, Array[Hash[untyped, untyped]] raw_events) -> void
+
+    def self.after_runner_died: (PgEventstore::Callbacks callbacks, StandardError error) -> void
+
+    def self.before_runner_restored: (PgEventstore::Callbacks callbacks) -> void
+
+    def self.change_state: (PgEventstore::Callbacks callbacks, String state) -> void
+  end
+end

data/sig/pg_eventstore/subscriptions/callback_handlers/subscription_feeder_handlers.rbs

@@ -0,0 +1,31 @@
+module PgEventstore
+  class SubscriptionFeederHandlers
+    include PgEventstore::Extensions::CallbackHandlersExtension
+
+    def self.update_subscriptions_set_state: (PgEventstore::SubscriptionsSetLifecycle subscriptions_set_lifecycle, String state) -> void
+
+    def self.lock_subscriptions: (PgEventstore::SubscriptionsLifecycle subscriptions_lifecycle) -> void
+
+    def self.start_runners: (PgEventstore::SubscriptionsLifecycle subscriptions_lifecycle) -> void
+
+    def self.start_cmds_handler: (PgEventstore::CommandsHandler cmds_handler) -> void
+
+    def self.persist_error_info: (PgEventstore::SubscriptionsSetLifecycle subscriptions_set_lifecycle, StandardError error) -> void
+
+    def self.restart_runner: (PgEventstore::SubscriptionsSetLifecycle subscriptions_set_lifecycle, PgEventstore::BasicRunner basic_runner, StandardError _error) -> void
+
+    def self.ping_subscriptions_set: (PgEventstore::SubscriptionsSetLifecycle subscriptions_set_lifecycle) -> void
+
+    def self.feed_runners: (PgEventstore::SubscriptionsLifecycle subscriptions_lifecycle, Symbol config_name) -> void
+
+    def self.ping_subscriptions: (PgEventstore::SubscriptionsLifecycle subscriptions_lifecycle) -> void
+
+    def self.stop_runners: (PgEventstore::SubscriptionsLifecycle subscriptions_lifecycle) -> void
+
+    def self.reset_subscriptions_set: (PgEventstore::SubscriptionsSetLifecycle subscriptions_set_lifecycle) -> void
+
+    def self.stop_commands_handler: (PgEventstore::CommandsHandler cmds_handler) -> void
+
+    def self.update_subscriptions_set_restarts: (PgEventstore::SubscriptionsSetLifecycle subscriptions_set_lifecycle) -> void
+  end
+end

data/sig/pg_eventstore/subscriptions/callback_handlers/subscription_runner_handlers.rbs

@@ -0,0 +1,19 @@
+module PgEventstore
+  class SubscriptionRunnerHandlers
+    def self.track_exec_time: (PgEventstore::SubscriptionHandlerPerformance stats, ^() -> void, Integer _current_position) -> void
+
+    def self.update_subscription_stats: (PgEventstore::Subscription subscription, PgEventstore::SubscriptionHandlerPerformance stats, Integer current_position) -> void
+
+    def self.update_subscription_error: (PgEventstore::Subscription subscription, StandardError error) -> void
+
+    def self.restart_events_processor: (PgEventstore::Subscription subscription, _RestartTerminator? restart_terminator,
+        _FailedSubscriptionNotifier? failed_subscription_notifier, PgEventstore::EventsProcessor events_processor,
+        StandardError error) -> void
+
+    def self.update_subscription_chunk_stats: (PgEventstore::Subscription subscription, Integer global_position) -> void
+
+    def self.update_subscription_restarts: (PgEventstore::Subscription subscription) -> void
+
+    def self.update_subscription_state: (PgEventstore::Subscription subscription, String state) -> void
+  end
+end

data/sig/pg_eventstore/subscriptions/events_processor.rbs

@@ -4,7 +4,7 @@ module PgEventstore
     extend Forwardable
 
     # _@param_ `handler`
-    %a{rbs:test:skip} def initialize: (_SubscriptionHandler handler) -> void
+    %a{rbs:test:skip} def initialize: (_RawEventHandler handler, graceful_shutdown_timeout: Float | Integer) -> void
 
     # _@param_ `raw_events`
     def feed: (::Array[::Hash[untyped, untyped]] raw_events) -> void

data/sig/pg_eventstore/subscriptions/subscription_feeder.rbs

@@ -1,7 +1,6 @@
 module PgEventstore
   class SubscriptionFeeder
     extend Forwardable
-    HEARTBEAT_INTERVAL: Integer
 
     # _@param_ `config_name`
     #
@@ -17,6 +16,8 @@ module PgEventstore
         retries_interval: Integer
       ) -> void
 
+    def id: () -> Integer
+
     # _@param_ `runner`
     def add: (PgEventstore::SubscriptionRunner runner) -> PgEventstore::SubscriptionRunner
 
@@ -24,41 +25,12 @@ module PgEventstore
 
     def stop_all: () -> void
 
-    def force_lock!: () -> void
-
     def read_only_subscriptions: () -> ::Array[PgEventstore::Subscription]
 
     def read_only_subscriptions_set: () -> PgEventstore::SubscriptionsSet?
 
-    def lock_all: () -> void
-
-    def subscriptions_set: () -> PgEventstore::SubscriptionsSet
-
-    def feeder: () -> PgEventstore::SubscriptionRunnersFeeder
-
     def attach_runner_callbacks: () -> void
 
-    def before_runner_started: () -> void
-
-    # _@param_ `error`
-    def after_runner_died: (StandardError error) -> void
-
-    # _@param_ `_error`
-    def restart_runner: (StandardError _error) -> void
-
-    def update_runner_restarts: () -> void
-
-    def process_async: () -> void
-
-    def ping_subscriptions_set: () -> void
-
-    def ping_subscriptions: () -> void
-
-    def after_runner_stopped: () -> void
-
-    # _@param_ `state`
-    def update_subscriptions_set_state: (String state) -> void
-
     def assert_proper_state!: () -> void
   end
 end

data/sig/pg_eventstore/subscriptions/subscriptions_lifecycle.rbs

@@ -0,0 +1,27 @@
+module PgEventstore
+  class SubscriptionsLifecycle
+    HEARTBEAT_INTERVAL: Integer
+
+    @config_name: Symbol
+
+    @subscriptions_set_lifecycle: PgEventstore::SubscriptionsSetLifecycle
+
+    @subscriptions_pinged_at: Time
+
+    @force_lock: bool
+
+    attr_reader runners: Array[PgEventstore::SubscriptionRunner]
+
+    def initialize: (Symbol config_name, PgEventstore::SubscriptionsSetLifecycle subscriptions_set_lifecycle)-> void
+
+    def force_locked?: -> bool
+
+    def lock_all: -> void
+
+    def ping_subscriptions: -> void
+
+    def subscriptions: -> Array[PgEventstore::Subscription]
+
+    def force_lock!: -> void
+  end
+end

data/sig/pg_eventstore/subscriptions/subscriptions_manager.rbs

@@ -42,7 +42,8 @@ module PgEventstore
         ?max_retries: Integer,
         ?retries_interval: Integer | Float,
         ?restart_terminator: _RestartTerminator?,
-        ?failed_subscription_notifier: _FailedSubscriptionNotifier?
+        ?failed_subscription_notifier: _FailedSubscriptionNotifier?,
+        ?graceful_shutdown_timeout: Integer | Float,
       ) -> void
 
     def subscriptions: () -> ::Array[PgEventstore::Subscription]
@@ -52,7 +53,7 @@ module PgEventstore
     # _@param_ `middlewares`
     #
     # _@param_ `handler`
-    def create_event_handler: (::Array[Symbol]? middlewares, untyped handler) -> Proc
+    def create_raw_event_handler: (::Array[Symbol]? middlewares, _SubscriptionHandler handler) -> _RawEventHandler
 
     # _@param_ `middlewares`
     def select_middlewares: (?::Array[Symbol]? middlewares) -> ::Array[PgEventstore::Middleware]

data/sig/pg_eventstore/subscriptions/subscriptions_set_lifecycle.rbs

@@ -0,0 +1,24 @@
+module PgEventstore
+  class SubscriptionsSetLifecycle
+    HEARTBEAT_INTERVAL: Integer
+
+    type subscriptions_set_attrs_type = { name: String, max_restarts_number: Integer, time_between_restarts: Integer }
+
+    @config_name: Symbol
+
+    @subscriptions_set_attrs: subscriptions_set_attrs_type
+
+    @subscriptions_set_pinged_at: Time
+
+    attr_reader subscriptions_set: PgEventstore::SubscriptionsSet?
+
+
+    def initialize: (Symbol config_name, subscriptions_set_attrs_type subscriptions_set_attrs)-> void
+
+    def ping_subscriptions_set: -> void
+
+    def persisted_subscriptions_set: -> PgEventstore::SubscriptionsSet
+
+    def reset_subscriptions_set: -> void
+  end
+end

data/sig/pg_eventstore/utils.rbs

@@ -16,5 +16,7 @@ module PgEventstore
 
     # _@param_ `str`
     def self.underscore_str: (String str) -> String
+
+    def self.original_global_position: (Hash[untyped, untyped] raw_event) -> Integer
   end
 end

data/sig/pg_eventstore/web/subscriptions/helpers.rbs

@@ -42,7 +42,7 @@ module PgEventstore
         # _@param_ `updated_at`
         #
         # _@return_ — html status
-        def colored_state: (String state, Time updated_at) -> String
+        def colored_state: (String state, Integer interval, Time updated_at) -> String
 
         # _@param_ `ids`
         def delete_all_subscriptions_url: (::Array[Integer] ids) -> String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_eventstore
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Ivan Dzyzenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -106,6 +106,7 @@ files:
 - lib/pg_eventstore/event_class_resolver.rb
 - lib/pg_eventstore/event_deserializer.rb
 - lib/pg_eventstore/event_serializer.rb
+- lib/pg_eventstore/extensions/callback_handlers_extension.rb
 - lib/pg_eventstore/extensions/callbacks_extension.rb
 - lib/pg_eventstore/extensions/options_extension.rb
 - lib/pg_eventstore/extensions/using_connection_extension.rb
@@ -122,6 +123,10 @@ files:
 - lib/pg_eventstore/sql_builder.rb
 - lib/pg_eventstore/stream.rb
 - lib/pg_eventstore/subscriptions/basic_runner.rb
+- lib/pg_eventstore/subscriptions/callback_handlers/commands_handler_handlers.rb
+- lib/pg_eventstore/subscriptions/callback_handlers/events_processor_handlers.rb
+- lib/pg_eventstore/subscriptions/callback_handlers/subscription_feeder_handlers.rb
+- lib/pg_eventstore/subscriptions/callback_handlers/subscription_runner_handlers.rb
 - lib/pg_eventstore/subscriptions/command_handlers/subscription_feeder_commands.rb
 - lib/pg_eventstore/subscriptions/command_handlers/subscription_runners_commands.rb
 - lib/pg_eventstore/subscriptions/commands_handler.rb
@@ -150,8 +155,10 @@ files:
 - lib/pg_eventstore/subscriptions/subscription_runner_commands/start.rb
 - lib/pg_eventstore/subscriptions/subscription_runner_commands/stop.rb
 - lib/pg_eventstore/subscriptions/subscription_runners_feeder.rb
+- lib/pg_eventstore/subscriptions/subscriptions_lifecycle.rb
 - lib/pg_eventstore/subscriptions/subscriptions_manager.rb
 - lib/pg_eventstore/subscriptions/subscriptions_set.rb
+- lib/pg_eventstore/subscriptions/subscriptions_set_lifecycle.rb
 - lib/pg_eventstore/tasks/setup.rake
 - lib/pg_eventstore/utils.rb
 - lib/pg_eventstore/version.rb
@@ -201,6 +208,7 @@ files:
 - pg_eventstore.gemspec
 - rbs_collection.lock.yaml
 - rbs_collection.yaml
+- sig/interfaces/_raw_event_handler.rbs
 - sig/interfaces/callback.rbs
 - sig/interfaces/event_class_resolver.rbs
 - sig/interfaces/event_modifier.rbs
@@ -229,6 +237,7 @@ files:
 - sig/pg_eventstore/event_class_resolver.rbs
 - sig/pg_eventstore/event_deserializer.rbs
 - sig/pg_eventstore/event_serializer.rbs
+- sig/pg_eventstore/extensions/callback_handlers_extension.rbs
 - sig/pg_eventstore/extensions/callbacks_extension.rbs
 - sig/pg_eventstore/extensions/options_extension.rbs
 - sig/pg_eventstore/extensions/using_connection_extension.rbs
@@ -243,6 +252,10 @@ files:
 - sig/pg_eventstore/sql_builder.rbs
 - sig/pg_eventstore/stream.rbs
 - sig/pg_eventstore/subscriptions/basic_runner.rbs
+- sig/pg_eventstore/subscriptions/callback_handlers/commands_handler_handlers.rbs
+- sig/pg_eventstore/subscriptions/callback_handlers/events_processor_handlers.rbs
+- sig/pg_eventstore/subscriptions/callback_handlers/subscription_feeder_handlers.rbs
+- sig/pg_eventstore/subscriptions/callback_handlers/subscription_runner_handlers.rbs
 - sig/pg_eventstore/subscriptions/command_handlers/subscription_feeder_commands.rbs
 - sig/pg_eventstore/subscriptions/command_handlers/subscription_runners_commands.rbs
 - sig/pg_eventstore/subscriptions/commands_handler.rbs
@@ -271,8 +284,10 @@ files:
 - sig/pg_eventstore/subscriptions/subscription_runner_commands/start.rbs
 - sig/pg_eventstore/subscriptions/subscription_runner_commands/stop.rbs
 - sig/pg_eventstore/subscriptions/subscription_runners_feeder.rbs
+- sig/pg_eventstore/subscriptions/subscriptions_lifecycle.rbs
 - sig/pg_eventstore/subscriptions/subscriptions_manager.rbs
 - sig/pg_eventstore/subscriptions/subscriptions_set.rbs
+- sig/pg_eventstore/subscriptions/subscriptions_set_lifecycle.rbs
 - sig/pg_eventstore/utils.rbs
 - sig/pg_eventstore/version.rbs
 - sig/pg_eventstore/web/paginator/base_collection.rbs