pg_eventstore 1.9.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c0936a5580f6340a43f65d5b1b3362855b30e78fb25bdd498bf21c759458fcb
-  data.tar.gz: d18a05c7c6917e66c83de05013afcf6b9f25aaf7027e32fb1345553f5398a120
+  metadata.gz: 402dc90a012b5e1ee934da4f62c4af4ba62e69693a45dac1a84d461950da5717
+  data.tar.gz: 6c5d1fdc2e9475eca72b5ef27d0081e0aec6331f76639b7172e676d8b6e63e3d
 SHA512:
-  metadata.gz: b11fcbc08f2853a69c288dcd08498a5e40277cdeaf32ccba71ade48eac03cf3fd0c157abe0058daedb27aca945406afa8f3078f149e045ff63d89a47ca12da36
-  data.tar.gz: c021e192cfd8f61364235fa7ccdd2d97a37c39fe304f9167fe7cda508acd7c65b84bc2d168687a1cec185cf07870183b70fc849508a434ea13935398687cbea4
+  metadata.gz: b20c1124f2108b671bd28f3677fb3b2ae88f3b19d2470eb5a31102eb597d4bd5af1080f9bd337b1528107eef2e4bce6b882d434aa8536abc0a5a80b373bfe3a3
+  data.tar.gz: 9fd5af079cedc277e278b2e0b50e628601880a81ec5bf7c94700595f6472be389b2fa3d3a2ba2f5d311c8844da40de2c4a52e4dc6c2bda2ca3559e94b267f7f2

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [1.11.0]
+
+- Add a global position that caused an error to the subscription's error JSON info. This will help you understand what event caused your subscription to fail.
+- Improve long payloads in JSON preview in admin web UI in the way it does not moves content out of the visible area.
+- Admin UI: adjust events filtering and displaying of stream context, stream name, stream id and event type when values of them contain empty strings or non-displayable characters
+
+## [1.10.0]
+- Admin UI: Adjust `SubscriptionSet` "Stop"/"Delete" buttons appearance. Now if `SubscriptionsSet` is not alive anymore(the related process is dead or does not exist anymore) - "Delete" button is shown. If `SubscriptionSet` is alive - "Stop" button is shown
+- Admin IU: fixed several potential XSS vulnerabilities
+- Admin IU: Add "Copy to clipboard" button near stream id that copies ruby stream definition
+- Admin UI: allow deletion of streams with empty attribute values
+
 ## [1.9.0]
 
 - Implement an ability to delete a stream

data/lib/pg_eventstore/errors.rb

@@ -243,4 +243,14 @@ module PgEventstore
       "Too many records of #{stream.to_hash.inspect} stream to lock: #{number_of_records}"
     end
   end
+
+  class WrappedException < Error
+    attr_reader :original_exception
+    attr_reader :extra
+
+    def initialize(original_exception, extra)
+      @original_exception = original_exception
+      @extra = extra
+    end
+  end
 end

data/lib/pg_eventstore/subscriptions/callback_handlers/events_processor_handlers.rb

@@ -16,9 +16,9 @@ module PgEventstore
         callbacks.run_callbacks(:process, Utils.original_global_position(raw_event)) do
           handler.call(raw_event)
         end
-      rescue
+      rescue => exception
         raw_events.unshift(raw_event)
-        raise
+        raise Utils.wrap_exception(exception, global_position: Utils.original_global_position(raw_event))
       end
 
       # @param callbacks [PgEventstore::Callbacks]

data/lib/pg_eventstore/subscriptions/callback_handlers/subscription_runner_handlers.rb

@@ -26,7 +26,7 @@ module PgEventstore
       end
 
       # @param subscription [PgEventstore::Subscription]
-      # @param error [StandardError]
+      # @param error [PgEventstore::WrappedException]
       # @return [void]
       def update_subscription_error(subscription, error)
         subscription.update(last_error: Utils.error_info(error), last_error_occurred_at: Time.now.utc)
@@ -36,13 +36,13 @@ module PgEventstore
       # @param restart_terminator [#call, nil]
       # @param failed_subscription_notifier [#call, nil]
       # @param events_processor [PgEventstore::EventsProcessor]
-      # @param error [StandardError]
+      # @param error [PgEventstore::WrappedException]
       # @return [void]
       def restart_events_processor(subscription, restart_terminator, failed_subscription_notifier, events_processor,
                                    error)
         return if restart_terminator&.call(subscription.dup)
         if subscription.restart_count >= subscription.max_restarts_number
-          return failed_subscription_notifier&.call(subscription.dup, error)
+          return failed_subscription_notifier&.call(subscription.dup, Utils.unwrap_exception(error))
         end
 
         Thread.new do

data/lib/pg_eventstore/subscriptions/subscription.rb

@@ -6,6 +6,9 @@ module PgEventstore
     include Extensions::UsingConnectionExtension
     include Extensions::OptionsExtension
 
+    # @return [Time]
+    DEFAULT_TIMESTAMP = Time.at(0).utc.freeze
+
     # @!attribute id
     #   @return [Integer, nil]
     attribute(:id)
@@ -164,7 +167,7 @@ module PgEventstore
         last_restarted_at: nil,
         max_restarts_number: max_restarts_number,
         chunk_query_interval: chunk_query_interval,
-        last_chunk_fed_at: Time.at(0).utc,
+        last_chunk_fed_at: DEFAULT_TIMESTAMP,
         last_chunk_greatest_position: nil,
         last_error: nil,
         last_error_occurred_at: nil,

data/lib/pg_eventstore/utils.rb

@@ -46,11 +46,14 @@ module PgEventstore
       # @param error [StandardError]
       # @return [Hash]
       def error_info(error)
+        original_error = unwrap_exception(error)
         {
-          class: error.class,
-          message: error.message,
-          backtrace: error.backtrace
-        }
+          class: original_error.class,
+          message: original_error.message,
+          backtrace: original_error.backtrace
+        }.tap do |attrs|
+          attrs.merge!(error.extra) if error.is_a?(WrappedException)
+        end
       end
 
       # @param str [String]
@@ -101,6 +104,21 @@ module PgEventstore
         end
       rescue Errno::ENOENT
       end
+
+      # @param exception [StandardError]
+      # @param extra [Hash] additional exception info
+      # @return [PgEventstore::WrappedException]
+      def wrap_exception(exception, **extra)
+        WrappedException.new(exception, extra)
+      end
+
+      # @param wrapped_exception [StandardError, PgEventstore::WrappedException]
+      # @return [StandardError]
+      def unwrap_exception(wrapped_exception)
+        return wrapped_exception.original_exception if wrapped_exception.is_a?(WrappedException)
+
+        wrapped_exception
+      end
     end
   end
 end

data/lib/pg_eventstore/version.rb

@@ -2,5 +2,5 @@
 
 module PgEventstore
   # @return [String]
-  VERSION = "1.9.0"
+  VERSION = "1.11.0"
 end

data/lib/pg_eventstore/web/application.rb

@@ -13,6 +13,11 @@ module PgEventstore
       # @return [String]
       COOKIES_FLASH_MESSAGE_KEY = 'flash_message'
 
+      # Defines a replacement for empty string value in a stream attributes filter or in an event type filter. This
+      # replacement is needed to differentiate a user selection vs default placeholder value.
+      # @return [String]
+      EMPTY_STRING_SIGN = "\x00".freeze
+
       set :static_cache_control, [:private, max_age: 86400]
       set :environment, -> { (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || ENV['APP_ENV'])&.to_sym || :development }
       set :logging, -> { environment == :development || environment == :test }
@@ -69,8 +74,11 @@ module PgEventstore
         # @param collection [PgEventstore::Web::Paginator::BaseCollection]
         # @return [void]
         def paginated_json_response(collection)
+          results = collection.collection.map do |attrs|
+            attrs.transform_values { escape_empty_string(_1) }
+          end
           halt 200, {
-            results: collection.collection,
+            results: results,
             pagination: { more: !collection.next_page_starting_id.nil?, starting_id: collection.next_page_starting_id }
           }.to_json
         end
@@ -108,9 +116,25 @@ module PgEventstore
             COOKIES_FLASH_MESSAGE_KEY, { value: val, http_only: false, same_site: :lax, path: '/' }
           )
         end
+
+        # @param string [String, nil]
+        # @return [String, nil]
+        def escape_empty_string(string)
+          string == '' ? EMPTY_STRING_SIGN : string
+        end
+
+        # @param string [String, nil]
+        # @return [String, nil]
+        def unescape_empty_string(string)
+          string == EMPTY_STRING_SIGN ? '' : string
+        end
       end
 
       get '/' do
+        streams_filter = self.streams_filter&.map do |attrs|
+          attrs.transform_values { unescape_empty_string(_1) }
+        end
+        events_filter = self.events_filter&.map(&method(:unescape_empty_string))
         @collection = Paginator::EventsCollection.new(
           current_config,
           starting_id: params[:starting_id]&.to_i,
@@ -169,7 +193,7 @@ module PgEventstore
       get '/stream_contexts_filtering', provides: :json do
         collection = Paginator::StreamContextsCollection.new(
           current_config,
-          starting_id: params[:starting_id],
+          starting_id: unescape_empty_string(params[:starting_id]),
           per_page: Paginator::StreamContextsCollection::PER_PAGE,
           order: :asc,
           options: { query: params[:term] }
@@ -180,10 +204,10 @@ module PgEventstore
       get '/stream_names_filtering', provides: :json do
         collection = Paginator::StreamNamesCollection.new(
           current_config,
-          starting_id: params[:starting_id],
+          starting_id: unescape_empty_string(params[:starting_id]),
           per_page: Paginator::StreamNamesCollection::PER_PAGE,
           order: :asc,
-          options: { query: params[:term], context: params[:context] }
+          options: { query: params[:term], context: unescape_empty_string(params[:context]) }
         )
         paginated_json_response(collection)
       end
@@ -191,10 +215,14 @@ module PgEventstore
       get '/stream_ids_filtering', provides: :json do
         collection = Paginator::StreamIdsCollection.new(
           current_config,
-          starting_id: params[:starting_id],
+          starting_id: unescape_empty_string(params[:starting_id]),
           per_page: Paginator::StreamIdsCollection::PER_PAGE,
           order: :asc,
-          options: { query: params[:term], context: params[:context], stream_name: params[:stream_name] }
+          options: {
+            query: params[:term],
+            context: unescape_empty_string(params[:context]),
+            stream_name: unescape_empty_string(params[:stream_name])
+          }
         )
         paginated_json_response(collection)
       end
@@ -202,7 +230,7 @@ module PgEventstore
       get '/event_types_filtering', provides: :json do
         collection = Paginator::EventTypesCollection.new(
           current_config,
-          starting_id: params[:starting_id],
+          starting_id: unescape_empty_string(params[:starting_id]),
           per_page: Paginator::EventTypesCollection::PER_PAGE,
           order: :asc,
           options: { query: params[:term] }
@@ -282,14 +310,35 @@ module PgEventstore
         redirect(redirect_back_url(fallback_url: '/'))
       end
 
-      post '/delete_stream/:context/:stream_name/:stream_id' do
-        attrs = Hash[params.slice(:context, :stream_name, :stream_id)].transform_keys(&:to_sym)
-        stream = PgEventstore::Stream.new(**attrs)
-        PgEventstore.maintenance(current_config).delete_stream(stream)
-        self.flash_message = {
-          message: "Stream #{stream.to_hash} has been successfully deleted.",
-          kind: 'success'
+      post '/delete_stream' do
+        attrs = {
+          context: params[:context]&.to_s,
+          stream_name: params[:stream_name]&.to_s,
+          stream_id: params[:stream_id]&.to_s,
         }
+
+        err_message = ->(attrs) {
+          self.flash_message = {
+            message: "Could not delete #{attrs}. It is not valid stream for deletion.",
+            kind: 'error'
+          }
+        }
+
+        if attrs.values.none?(&:nil?)
+          stream = PgEventstore::Stream.new(**attrs)
+          if stream.system?
+            err_message.call(stream.to_hash)
+          else
+            PgEventstore.maintenance(current_config).delete_stream(stream)
+            self.flash_message = {
+              message: "Stream #{stream.to_hash} has been successfully deleted.",
+              kind: 'success'
+            }
+          end
+        else
+          err_message.call(attrs)
+        end
+
         redirect(redirect_back_url(fallback_url: '/'))
       end
     end

data/lib/pg_eventstore/web/paginator/helpers.rb

@@ -88,9 +88,9 @@ module PgEventstore
               filter: {
                 streams: [
                   {
-                    context: event.stream.context,
-                    stream_name: event.stream.stream_name,
-                    stream_id: event.stream.stream_id
+                    context: escape_empty_string(event.stream.context),
+                    stream_name: escape_empty_string(event.stream.stream_name),
+                    stream_id: escape_empty_string(event.stream.stream_id)
                   }
                 ]
               }
@@ -98,6 +98,14 @@ module PgEventstore
           )
         end
 
+        # @param str [String]
+        # @return [String]
+        def empty_characters_fallback(str)
+          return str unless str.strip == ''
+
+          '<i>Non-printable characters</i>'
+        end
+
         private
 
         # @param starting_id [String, Integer, nil]

data/lib/pg_eventstore/web/public/javascripts/pg_eventstore.js

@@ -1,6 +1,30 @@
 $(function(){
     "use strict";
 
+    const EMPTY_STRING_SIGN = "\x00";
+
+    let templateSelection = function(state){
+        if (!state.id)
+            return state.text;
+
+        return filterValueToHuman(state.element && state.element.value, state.text);
+    }
+
+    let templateResult = function(item){
+        return filterValueToHuman(item.text);
+    }
+
+    let filterValueToHuman = function(str, alternativeStr){
+        if(str === EMPTY_STRING_SIGN)
+            return $("<i>Empty String</i>");
+
+        let result = alternativeStr || str;
+        if($.trim(result.replaceAll(EMPTY_STRING_SIGN, '')) === '')
+            return $("<i>Non-printable characters</i>");
+
+        return result;
+    }
+
     let initStreamFilterAutocomplete = function($filter) {
         let $contextSelect = $filter.find('select[name*="context"]');
         let $streamNameSelect = $filter.find('select[name*="stream_name"]');
@@ -22,7 +46,9 @@ $(function(){
                     return data;
                 },
             },
-            allowClear: true
+            allowClear: true,
+            templateSelection: templateSelection,
+            templateResult: templateResult,
         });
         $streamNameSelect.select2({
             ajax: {
@@ -41,7 +67,9 @@ $(function(){
                     return data;
                 },
             },
-            allowClear: true
+            allowClear: true,
+            templateSelection: templateSelection,
+            templateResult: templateResult,
         });
         $streamIdSelect.select2({
             ajax: {
@@ -61,7 +89,9 @@ $(function(){
                     return data;
                 },
             },
-            allowClear: true
+            allowClear: true,
+            templateSelection: templateSelection,
+            templateResult: templateResult,
         });
         $contextSelect.on('change.select2', removeDeleteBtn);
         $streamNameSelect.on('change.select2', removeDeleteBtn);
@@ -89,7 +119,9 @@ $(function(){
                     return data;
                 },
             },
-            allowClear: true
+            allowClear: true,
+            templateSelection: templateSelection,
+            templateResult: templateResult,
         });
     }
 
@@ -130,6 +162,11 @@ $(function(){
         initEventTypeFilterAutocomplete($filtersForm.find('.event-filters').children().last());
     });
 
+    // Because zero-byte character can't be rendered into HTML properly - loop through each option, marked as containing
+    // zero-byte value and assign zero-byte value explicitly. This must be done before we initialize select2 plugin.
+    $('option.zero-byte-val').each(function(){
+        this.value = EMPTY_STRING_SIGN;
+    });
     // Init select2 for stream filters which were initially rendered
     $filtersForm.find('.stream-filters').children().each(function(){
         initStreamFilterAutocomplete($(this));
@@ -196,14 +233,14 @@ $(function(){
     let $confirmationModal = $('#confirmation-modal');
 
     $confirmationModal.on('hide.bs.modal', function(){
-        $(this).find('.modal-title').html('');
-        $(this).find('.modal-body').html('');
+        $(this).find('.modal-title').text('');
+        $(this).find('.modal-body').text('');
         $(this).find('.confirm').off();
     });
     let showConfirmation = function(el, callback){
         let $el = $(el);
-        $confirmationModal.find('.modal-body').html($el.data('confirm'));
-        $confirmationModal.find('.modal-title').html($el.data('confirm-title'));
+        $confirmationModal.find('.modal-body').text($el.data('confirm'));
+        $confirmationModal.find('.modal-title').text($el.data('confirm-title'));
         $confirmationModal.modal('show');
         $confirmationModal.one('click', '.confirm', callback);
     }
@@ -323,3 +360,32 @@ $(function () {
     $flashMessage.addClass(alertClass).removeClass('d-none');
     Cookies.remove(window.flashMessageCookie);
 });
+
+// Copy to clipboard with a tooltip implementation
+$(function () {
+    "use strict";
+
+    let $selector = $(".copy-to-clipboard");
+
+    $selector.tooltip({
+        container: "body",
+        title: function(){
+            let $this = $(this);
+
+            return $this.data("temp-title") || $this.data("title");
+        }
+    });
+
+    $selector.click(function () {
+        let $this = $(this);
+
+        navigator.clipboard.writeText($this.data("clipboard-content"));
+
+        $this.data("temp-title", "Copied!");
+        $this.data("bs.tooltip").hide();
+        $this.one("shown.bs.tooltip", function(){
+            $this.data("temp-title", null);
+        });
+        $this.data("bs.tooltip").show();
+    });
+});

data/lib/pg_eventstore/web/public/stylesheets/pg_eventstore.css

@@ -4,6 +4,18 @@ tr.collapsing {
     display: none;
 }
 
+td.json-cell {
+    max-width: 1px;
+}
+
+td.json-cell pre {
+    display: block;
+    width: 100%;
+    box-sizing: border-box;
+    overflow-x: auto;
+    white-space: pre;
+}
+
 #confirmation-modal .modal-body {
     font-size: 1.2rem;
 }

data/lib/pg_eventstore/web/subscriptions/helpers.rb

@@ -79,28 +79,41 @@ module PgEventstore
         # @param updated_at [Time]
         # @return [String] html status
         def colored_state(state, interval, updated_at)
-          if state == RunnerState::STATES[:running]
-            # -1 is added as a margin to prevent false-positive result
-            if updated_at < Time.now.utc - interval - 1
-              title = <<~TEXT
-                Something is wrong. Last update was more than #{interval} seconds ago(#{updated_at}).
-              TEXT
-              <<~HTML
-                <span class="text-warning text-nowrap">
-                  #{state}
-                  <i class="fa fa-question-circle" data-toggle="tooltip" title="#{title}"></i>
-                </span>              
-              HTML
+          text_class =
+            case state
+            when RunnerState::STATES[:running]
+              alive?(interval, updated_at) ? 'text-success' : 'text-warning'
+            when RunnerState::STATES[:dead]
+              'text-danger'
             else
-              "<span class=\"text-success\">#{state}</span>"
+              'text-info'
             end
-          elsif state == RunnerState::STATES[:dead]
-            "<span class=\"text-danger\">#{state}</span>"
+
+          if alive?(interval, updated_at)
+            <<~HTML
+              <span class="#{text_class}">#{state}</span>
+            HTML
           else
-            "<span class=\"text-info\">#{state}</span>"
+            title = <<~TEXT
+              Something is wrong. Last update was more than #{interval} seconds ago(#{updated_at}).
+            TEXT
+            <<~HTML
+              <span class="#{text_class} text-nowrap">
+                #{state}
+                <i class="fa fa-question-circle" data-toggle="tooltip" title="#{title}"></i>
+              </span>
+            HTML
           end
         end
 
+        # @param interval [Integer]
+        # @param last_updated_at [Time]
+        # @return [Boolean]
+        def alive?(interval, last_updated_at)
+          # -1 is added as a margin to prevent false-positive result
+          last_updated_at > Time.now.utc - interval - 1
+        end
+
         # @param ids [Array<Integer>]
         # @return [String]
         def delete_all_subscriptions_url(ids)
@@ -117,7 +130,8 @@ module PgEventstore
         # @param stream_attrs [Hash]
         # @return [String]
         def delete_stream_url(stream_attrs)
-          url("/delete_stream/#{stream_attrs[:context]}/#{stream_attrs[:stream_name]}/#{stream_attrs[:stream_id]}")
+          encoded_params = Rack::Utils.build_nested_query(stream_attrs)
+          url("/delete_stream?#{encoded_params}")
         end
       end
     end

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

@@ -3,7 +3,11 @@
     <select name="filter[events][]" class="form-control mb-2" data-placeholder="Event type" data-url="<%= url('/event_types_filtering') %>" autocomplete="off">
       <option></option>
       <% if event_type %>
-        <option value="<%= h event_type %>" selected><%= h event_type %></option>
+        <% if event_type == PgEventstore::Web::Application::EMPTY_STRING_SIGN %>
+          <option class="zero-byte-val" selected></option>
+        <% else %>
+          <option value="<%= h event_type %>" selected><%= h event_type %></option>
+        <% end %>
       <% end %>
     </select>
   </div>

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

@@ -2,11 +2,17 @@
   <tr>
     <td><%= event.global_position %></td>
     <td><%= event.stream_revision %></td>
-    <td><%= h event.stream.context %></td>
-    <td><%= h event.stream.stream_name %></td>
-    <td><a href="<%= stream_path(event) %>"><%= event.stream.stream_id %></a></td>
+    <td><%= empty_characters_fallback(h event.stream.context) %></td>
+    <td><%= empty_characters_fallback(h event.stream.stream_name) %></td>
     <td>
-      <p class="float-left"><%= h event.type %></p>
+      <a href="<%= stream_path(event) %>"><%= empty_characters_fallback(h event.stream.stream_id) %></a>
+      <a role="button" href="#" data-title="Copy stream definition." class="copy-to-clipboard"
+         data-clipboard-content="<%= h "PgEventstore::Stream.new(context: #{event.stream.context.inspect}, stream_name: #{event.stream.stream_name.inspect}, stream_id: #{event.stream.stream_id.inspect})" %>">
+        <i class="fa fa-clipboard"></i>
+      </a>
+    </td>
+    <td>
+      <p class="float-left"><%= empty_characters_fallback(h event.type) %></p>
       <% if event.link %>
         <p class="float-left ml-2">
           <i class="fa fa-link"></i>
@@ -26,7 +32,7 @@
     </td>
   </tr>
   <tr class="event-payload d-none">
-    <td colspan="8">
+    <td colspan="9" class="json-cell">
       <strong>Data:</strong>
       <pre><%= h JSON.pretty_generate(event.data) %></pre>
       <strong>Metadata:</strong>

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

@@ -3,7 +3,11 @@
     <select name="filter[streams][][context]" class="form-control mb-2" data-placeholder="Context" data-url="<%= url('/stream_contexts_filtering') %>" autocomplete="off">
       <option></option>
       <% if stream[:context] %>
-        <option value="<%= h stream[:context] %>" selected><%= h stream[:context] %></option>
+        <% if stream[:context] == PgEventstore::Web::Application::EMPTY_STRING_SIGN %>
+          <option class="zero-byte-val" selected></option>
+        <% else %>
+          <option value="<%= h stream[:context] %>" selected><%= h stream[:context] %></option>
+        <% end %>
       <% end %>
     </select>
   </div>
@@ -11,7 +15,11 @@
     <select name="filter[streams][][stream_name]" class="form-control mb-2" data-placeholder="Stream name" data-url="<%= url('/stream_names_filtering') %>" autocomplete="off">
       <option></option>
       <% if stream[:stream_name] %>
-        <option value="<%= h stream[:stream_name] %>" selected><%= h stream[:stream_name] %></option>
+        <% if stream[:stream_name] == PgEventstore::Web::Application::EMPTY_STRING_SIGN %>
+          <option class="zero-byte-val" selected></option>
+        <% else %>
+          <option value="<%= h stream[:stream_name] %>" selected><%= h stream[:stream_name] %></option>
+        <% end %>
       <% end %>
     </select>
   </div>
@@ -19,7 +27,11 @@
     <select name="filter[streams][][stream_id]" class="form-control mb-2" data-placeholder="Stream ID" data-url="<%= url('/stream_ids_filtering') %>" autocomplete="off">
       <option></option>
       <% if stream[:stream_id] %>
-        <option value="<%= h stream[:stream_id] %>" selected><%= h stream[:stream_id] %></option>
+        <% if stream[:stream_id] == PgEventstore::Web::Application::EMPTY_STRING_SIGN %>
+          <option class="zero-byte-val" selected></option>
+        <% else %>
+          <option value="<%= h stream[:stream_id] %>" selected><%= h stream[:stream_id] %></option>
+        <% end %>
       <% end %>
     </select>
   </div>

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

@@ -85,14 +85,16 @@
                                   Restore
                                 </a>
                               <% end %>
-                              <% if PgEventstore::RunnerState::STATES.values_at(:running, :dead).include?(subscriptions_set.state) %>
+                              <% if PgEventstore::RunnerState::STATES.values_at(:running, :dead).include?(subscriptions_set.state) && alive?(PgEventstore::SubscriptionsSetLifecycle::HEARTBEAT_INTERVAL, subscriptions_set.updated_at) %>
                                 <a class="btn btn-warning" data-confirm="You are about to stop SubscriptionsSet#<%= subscriptions_set.id %>. This will also delete it and will result in stopping all related Subscriptions. If you used pg_eventstore CLI to start subscriptions - the related process will also be stopped.  Continue?" data-confirm-title="Stop SubscriptionsSet" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmd('Stop')) %>" data-toggle="tooltip" title="This action will delete Subscriptions Set and release all related Subscriptions.">
                                   Stop
                                 </a>
                               <% end %>
-                              <a class="btn btn-danger" data-confirm="You are about to delete SubscriptionsSet#<%= subscriptions_set.id %>. Continue?" data-confirm-title="Delete SubscriptionsSet" data-method="post" href="<%= url("/delete_subscriptions_set/#{subscriptions_set.id}") %>" data-toggle="tooltip" title="Use this action only on stuck Subscriptions Set - to clean it up.">
-                                Delete
-                              </a>
+                              <% unless alive?(PgEventstore::SubscriptionsSetLifecycle::HEARTBEAT_INTERVAL, subscriptions_set.updated_at) %>
+                                <a class="btn btn-danger" data-confirm="You are about to delete SubscriptionsSet#<%= subscriptions_set.id %>. Continue?" data-confirm-title="Delete SubscriptionsSet" data-method="post" href="<%= url("/delete_subscriptions_set/#{subscriptions_set.id}") %>" data-toggle="tooltip" title="Use this action only on stuck Subscriptions Set - to clean it up.">
+                                  Delete
+                                </a>
+                              <% end %>
                             </td>
                           </tr>
                           <% if subscriptions_set.last_error %>
@@ -160,7 +162,7 @@
                             </td>
                             <td><%= subscription.current_position %></td>
                             <td><%= subscription.chunk_query_interval %>s</td>
-                            <td><%= subscription.last_chunk_fed_at %></td>
+                            <td><%= subscription.last_chunk_fed_at if subscription.last_chunk_fed_at > PgEventstore::Subscription::DEFAULT_TIMESTAMP %></td>
                             <td><%= colored_state(subscription.state, PgEventstore::SubscriptionsLifecycle::HEARTBEAT_INTERVAL, subscription.updated_at) %></td>
                             <td>
                               <% if subscription.average_event_processing_time %>
@@ -208,13 +210,13 @@
                             </td>
                           </tr>
                           <tr class="collapse" id="options-<%= subscription.id %>">
-                            <td colspan="16">
+                            <td colspan="16" class="json-cell">
                               <pre><%= h JSON.pretty_generate(subscription.options) %></pre>
                             </td>
                           </tr>
                           <% if subscription.last_error %>
                             <tr class="collapse" id="last-error-<%= subscription.id %>">
-                              <td colspan="16">
+                              <td colspan="16" class="json-cell">
                                 <pre><%= h JSON.pretty_generate(subscription.last_error) %></pre>
                               </td>
                             </tr>

data/sig/pg_eventstore/errors.rbs

@@ -123,4 +123,12 @@ module PgEventstore
 
     def user_friendly_message: -> String
   end
+
+  class WrappedException < PgEventstore::Error
+    def initialize: (StandardError original_exception, Hash[Symbol, untyped] extra) -> void
+
+    attr_accessor original_exception: StandardError
+
+    attr_accessor extra: Hash[Symbol, untyped]
+  end
 end

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

@@ -4,11 +4,11 @@ module PgEventstore
 
     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.update_subscription_error: (PgEventstore::Subscription subscription, PgEventstore::WrappedException error) -> void
 
     def self.restart_events_processor: (PgEventstore::Subscription subscription, _RestartTerminator? restart_terminator,
         _FailedSubscriptionNotifier? failed_subscription_notifier, PgEventstore::EventsProcessor events_processor,
-        StandardError error) -> void
+        PgEventstore::WrappedException error) -> void
 
     def self.update_subscription_chunk_stats: (PgEventstore::Subscription subscription, Integer global_position) -> void
 

data/sig/pg_eventstore/subscriptions/subscription.rbs

@@ -1,5 +1,7 @@
 module PgEventstore
   class Subscription
+    DEFAULT_TIMESTAMP: Time
+
     include PgEventstore::Extensions::UsingConnectionExtension
     include PgEventstore::Extensions::OptionsExtension
 

data/sig/pg_eventstore/utils.rbs

@@ -20,5 +20,9 @@ module PgEventstore
     def self.underscore_str: (String str) -> String
 
     def self.original_global_position: (Hash[untyped, untyped] raw_event) -> Integer
+
+    def self.unwrap_exception: (PgEventstore::WrappedException | StandardError wrapped_exception)-> StandardError
+
+    def self.wrap_exception: (StandardError exception, **untyped extra)-> PgEventstore::WrappedException
   end
 end

data/sig/pg_eventstore/web/application.rbs

@@ -5,6 +5,8 @@ module PgEventstore
       COOKIES_FLASH_MESSAGE_KEY: String
       DEFAULT_ADMIN_UI_CONFIG: Symbol
 
+      EMPTY_STRING_SIGN: String
+
       def asset_url: (String path) -> String
 
       def connection: -> PgEventstore::Connection
@@ -13,6 +15,8 @@ module PgEventstore
 
       def current_config=: (untyped val) -> void
 
+      def escape_empty_string: (String? string) -> String?
+
       def events_filter: -> Array[String]?
 
       def flash_message=: (({ message: String, kind: String }) val)-> String
@@ -30,6 +34,8 @@ module PgEventstore
       def streams_filter: -> Array[Hash[untyped, untyped]]?
 
       def system_stream: -> String?
+
+      def unescape_empty_string: (String? string) -> String?
     end
   end
 end

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

@@ -2,6 +2,8 @@ module PgEventstore
   module Web
     module Paginator
       module Helpers
+        def empty_characters_fallback: (String str)-> String
+
         # _@param_ `collection`
         def previous_page_link: (PgEventstore::Web::Paginator::BaseCollection collection) -> String
 

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

@@ -2,6 +2,8 @@ module PgEventstore
   module Web
     module Subscriptions
       module Helpers
+        def alive?: (Integer interval, Time last_updated_at)-> bool
+
         def delete_event_url: (Integer global_position)-> String
 
         def delete_stream_url: (({ context: String, stream_name: String, stream_id: String }) stream_attrs)-> String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_eventstore
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Ivan Dzyzenko
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-14 00:00:00.000000000 Z
+date: 2025-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -368,7 +368,7 @@ metadata:
   homepage_uri: https://github.com/yousty/pg_eventstore
   source_code_uri: https://github.com/yousty/pg_eventstore
   changelog_uri: https://github.com/yousty/pg_eventstore/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -383,8 +383,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: EventStore implementation using PostgreSQL
 test_files: []