artery 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66026b7e5dd81edcbb4fc03956531d781f06387846c23cc6a88c7047da24000d
-  data.tar.gz: 8177b56b29b22a7c09324c4d5a8915b9c697a73aba69f937d4870f1664a0dcb2
+  metadata.gz: 6fc6ee867a6031d7ad94fa40630261f079c23664833cb79a40d7100445967d27
+  data.tar.gz: 38bc318bbc6d76c4ac86138c0fa60e2f61001cc9e869a36f2931243bac208780
 SHA512:
-  metadata.gz: e33b8a5fafbf2f56651a85b43636ad62ad68a4e34c219979a171cdf2dcdef1b68372ff17f4f07be256ea1524f5a5b3d999cd8685687ecfdc4eb4afbf7143f40d
-  data.tar.gz: 39b1c29831cef207fabf34c0c52d8889c4695c0a99ea81f13565538c65a733f4d3aa19cdf5625e4d67a5ef549c02ce3999b19893b696afb5bd5d6493bc4b0ffa
+  metadata.gz: '09d04bc9c56091cb5f9092c882b9127e5362092ccee797cba608dc3dd59131277a283dc85a852bd5e1ff5bdebb6276c5f1c415417cfc1eb3679d854c8754b8d7'
+  data.tar.gz: dcd7b59c4288f0669aff6141b21e46aaaef2e7e5467b41d98d1d108a5f83729d6aea1bbe96c9e2d6c1cec501cd318cd59bd09c00c979234dfb8f598133118695

data/lib/artery/active_record/message.rb

@@ -20,7 +20,10 @@ module Artery
         end
 
         def latest_index(model)
-          where(model: model).maximum(:id).to_i
+          last_message_id = where(model: model).maximum(:id).to_i
+          return last_message_id unless last_message_id.zero?
+
+          Artery.model_info_class.last_published_id_for(model)
         end
 
         def delete_old

data/lib/artery/active_record/model_info.rb

@@ -31,6 +31,10 @@ module Artery
 
         row
       end
+
+      def self.last_published_id_for(model_name)
+        where(model: model_name).limit(1).pluck(:last_published_id).first.to_i
+      end
     end
   end
 end

data/lib/artery/model/subscriptions.rb

@@ -48,7 +48,22 @@ module Artery
           model  ||= artery_model_name
           action ||= '*'
 
-          artery_add_subscription Routing.uri(service: service, model: model, action: action), kwargs, &blk
+          artery_add_subscription Routing.uri(service: service, model: model, action: action), **kwargs, client: true,
+                                  &blk
+        end
+
+        def artery_rewind_message_counter!(service: nil) # rubocop:disable Naming/PredicateMethod
+          return false if artery_source_model?
+
+          subscriptions = artery[:subscriptions]&.select do |subscription|
+            next false unless subscription.rewindable?
+
+            service.nil? || subscription.uri.service.to_sym == service.to_sym
+          end
+          return false if subscriptions.blank?
+
+          subscriptions.each(&:rewind_message_counter!)
+          true
         end
 
         # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity

data/lib/artery/subscription/synchronization.rb

@@ -97,8 +97,54 @@ module Artery
         end
       end
 
+      def rewind_message_counter! # rubocop:disable Naming/PredicateMethod
+        return false unless rewindable?
+
+        local_index = latest_message_index
+        return false unless local_index.positive?
+
+        remote_index = request_publisher_latest_index!
+        return false unless remote_index.positive?
+        return false if remote_index >= local_index
+
+        Artery.logger.info(
+          "Rewinding #{uri} latest_index from #{local_index} to #{remote_index}"
+        )
+        info.update!(latest_index: remote_index)
+        true
+      end
+
       private
 
+      def request_publisher_latest_index!
+        route = Routing.uri(
+          service: uri.service,
+          model: uri.model,
+          plural: true,
+          action: :get_all
+        ).to_route
+
+        remote_index = nil
+
+        Artery.request(
+          route,
+          representation: representation_name,
+          scope: synchronize_updates_scope,
+          page: 0,
+          per_page: 1
+        ) do |on|
+          on.success do |data|
+            remote_index = data[:_index].to_i
+          end
+
+          on.error do |error|
+            raise Error, "Failed to fetch artery index for #{uri}: #{error.message}"
+          end
+        end
+
+        remote_index.to_i
+      end
+
       def run_synchronization_heartbeat
         return if @heartbeat_thread
 

data/lib/artery/subscription.rb

@@ -28,6 +28,11 @@ module Artery
       @info ||= Artery.subscription_info_class.find_for_subscription(self)
     end
 
+    def reset_info!
+      @info = nil
+      self
+    end
+
     def representation_name
       options[:representation]
     end
@@ -40,6 +45,14 @@ module Artery
       @subscriber.artery[:source]
     end
 
+    def client?
+      options[:client]
+    end
+
+    def rewindable?
+      client? && synchronize_updates?
+    end
+
     def latest_outgoing_message_index
       return unless source?
 

data/lib/artery/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Artery
-  VERSION = '1.4.2'
+  VERSION = '1.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artery
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Sergey Gnuskov