event_store_client 1.0.17 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5eebe6985468ff2cd381dd397f0e30ff5459f3cc783f2f24ec3af8e489e52cd
-  data.tar.gz: 2d6654fcf4aede64b32f6ae9a9b9390f09ed714917d3cb87157581791f4b97f1
+  metadata.gz: 301a92ed47fa04e52d45989042f82571e30eeba810c73b7c0f73af55a95304f0
+  data.tar.gz: 0a58c9b4dc19bb56a2f2082b06552de05f39e0983f5c7379a1e058cbe5c65332
 SHA512:
-  metadata.gz: 7c08741b831569f05bc6016484ef4f22d36a371c63d57d76ad29fc9ed9ae1fed82e06abd9e511705c9585ef7d5e4868ad41de488822e4b9ade066272f26f4334
-  data.tar.gz: d7141f9192166b232fbe73f47dfa994ea79f4b155b75ae436f13b2d979b1460341f2829bed97dd3e7388c7f0daf36fad4c08813b823ba90d9bebf10026972754
+  metadata.gz: f87b1b7516fdae3a51a23970485ad6d492a50b91550208eee10d3d01530cbda57641941c0dc7a9c2696f25c2f442b87bfc02dc70149fdea499dbb11e02bc8d73
+  data.tar.gz: 903f6f6b64725911be55f7d4730f988f1a4596b4f4c8de05c226a77fb6ac477f90063854c0ae2b0981abba5cc78928feebc3aff52c38f6b5863f12408f8bcc84

data/lib/event_store_client.rb

@@ -15,5 +15,7 @@ require 'event_store_client/deserialized_event'
 
 require 'event_store_client/subscription'
 require 'event_store_client/subscriptions'
+require 'event_store_client/catch_up_subscription'
+require 'event_store_client/catch_up_subscriptions'
 require 'event_store_client/broker'
 require 'event_store_client/client'

data/lib/event_store_client/adapters/grpc.rb

@@ -7,6 +7,7 @@ require 'event_store_client/adapters/grpc/commands/streams/delete'
 require 'event_store_client/adapters/grpc/commands/streams/link_to'
 require 'event_store_client/adapters/grpc/commands/streams/read'
 require 'event_store_client/adapters/grpc/commands/streams/read_all'
+require 'event_store_client/adapters/grpc/commands/streams/subscribe'
 require 'event_store_client/adapters/grpc/commands/streams/tombstone'
 
 require 'event_store_client/adapters/grpc/commands/persistent_subscriptions/create'

data/lib/event_store_client/adapters/grpc/client.rb

@@ -90,6 +90,18 @@ module EventStoreClient
         config.error_handler&.call(e)
       end
 
+      # Subscribe to a stream
+      # @param options [Hash] additional options to the request
+      # @return - Nothing, it is a blocking operation, yields the given block with event instead
+      #
+      def subscribe(options = {})
+        Commands::Streams::Subscribe.new.call(options) do |event|
+          yield event if block_given?
+        end
+      rescue StandardError => e
+        config.error_handler&.call(e)
+      end
+
       private
 
       # Joins multiple streams into the new one under the given name
@@ -98,10 +110,7 @@ module EventStoreClient
       # @return Dry::Monads::Result::Success or Dry::Monads::Result::Failure
       #
       def join_streams(name, streams)
-        res = Commands::Projections::Create.new.call(name, streams)
-        return if res.success?
-
-        Commands::Projections::Update.new.call(name, streams)
+        Commands::Projections::Create.new.call(name, streams)
       end
 
       # @api private

data/lib/event_store_client/adapters/grpc/commands/command.rb

@@ -12,7 +12,7 @@ module EventStoreClient
         def self.inherited(klass)
           super
           klass.class_eval do
-            include Dry::Monads[:try, :result]
+            include Dry::Monads[:result]
 
             def self.use_request(request_klass)
               CommandRegistrar.register_request(self, request: request_klass)

data/lib/event_store_client/adapters/grpc/commands/projections/create.rb

@@ -33,11 +33,8 @@ module EventStoreClient
                 }
               }
 
-            res = Try do
-              service.create(request.new(options: options), metadata: metadata)
-            end
-
-            res.error? ? res.to_result : Success()
+            service.create(request.new(options: options), metadata: metadata)
+            Success()
           rescue ::GRPC::Unknown => e
             Failure(:conflict) if e.message.include?('Conflict')
           end

data/lib/event_store_client/adapters/grpc/commands/projections/update.rb

@@ -30,9 +30,7 @@ module EventStoreClient
                 name: name,
                 emit_enabled: true
               }
-
             service.update(request.new(options: options), metadata: metadata)
-
             Success()
           rescue ::GRPC::AlreadyExists
             Failure(:conflict)

data/lib/event_store_client/adapters/grpc/commands/streams/subscribe.rb

@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+require 'grpc'
+require 'event_store_client/adapters/grpc/generated/streams_pb.rb'
+require 'event_store_client/adapters/grpc/generated/streams_services_pb.rb'
+
+require 'event_store_client/configuration'
+require 'event_store_client/adapters/grpc/commands/command'
+
+module EventStoreClient
+  module GRPC
+    module Commands
+      module Streams
+        class Subscribe < Command
+          include Configuration
+
+          use_request EventStore::Client::Streams::ReadReq
+          use_service EventStore::Client::Streams::Streams::Stub
+
+          StreamNotFound = Class.new(StandardError)
+
+          def call(options = {})
+            opts = options_with_defaults(options)
+
+            service.read(request.new(options: opts), metadata: metadata).map do |res|
+              raise StreamNotFound if res.stream_not_found
+
+              yield prepared_response(res) if block_given?
+            end
+          rescue StreamNotFound
+            Failure(:not_found)
+          end
+
+          private
+
+          def prepared_response(res)
+            if res.event
+              event = res.event.event
+              [position(event), deserialize_event(event)] rescue event
+            elsif res.checkpoint
+              [position(res.checkpoint), nil]
+            elsif res.confirmation
+              res.confirmation
+            end
+          end
+
+          def position(event_or_checkpoint)
+            {
+              prepare_position: event_or_checkpoint.prepare_position,
+              commit_position: event_or_checkpoint.commit_position
+            }
+          end
+
+          def read_direction(direction)
+            EventStoreClient::ReadDirection.new(direction || 'forwards').to_sym
+          end
+
+          def options_with_defaults(options)
+            options[:without_system_events] = true unless options[:without_system_events] == false
+            opts = {
+              subscription: {},
+              read_direction: read_direction(options[:direction]),
+              resolve_links: options[:resolve_links] || true,
+              uuid_option: {
+                string: {}
+              }
+            }
+            if options[:stream]
+              opts[:stream] = {
+                stream_identifier: {
+                  streamName: stream
+                }
+              }
+            else
+              opts[:all] = options[:all] || default_all_options
+            end
+            if options[:filter]
+              opts[:filter] = options[:filter]
+            elsif options[:without_system_events]
+              opts[:filter] = {
+                event_type: { regex: '^[^$].*' },
+                max: 32,
+                checkpointIntervalMultiplier: 1000
+              }
+            else
+              opts[:no_filter] = {}
+            end
+
+            options[:start] ||= 0
+
+            return opts unless options[:stream]
+
+            if options[:start].zero?
+              opts[:stream][:start] = {}
+            else
+              opts[:stream][:revision] = options[:start]
+            end
+            opts
+          end
+
+          def default_all_options
+            {
+              position: {
+                commit_position: 0,
+                prepare_position: 0
+              }
+            }
+          end
+
+          def deserialize_event(entry)
+            data = (entry.data.nil? || entry.data.empty?) ? '{}' : entry.data
+
+            metadata =
+              JSON.parse(entry.custom_metadata || '{}').merge(
+                entry.metadata.to_h || {}
+              ).to_json
+
+            event = EventStoreClient::Event.new(
+              id: entry.id.string,
+              title: "#{entry.stream_revision}@#{entry.stream_identifier.streamName}",
+              type: entry.metadata['type'],
+              data: data,
+              metadata: metadata
+            )
+
+            config.mapper.deserialize(event)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_store_client/adapters/http.rb

@@ -6,7 +6,6 @@ require 'event_store_client/adapters/http/commands/persistent_subscriptions/crea
 require 'event_store_client/adapters/http/commands/persistent_subscriptions/read'
 
 require 'event_store_client/adapters/http/commands/projections/create'
-require 'event_store_client/adapters/http/commands/projections/update'
 
 require 'event_store_client/adapters/http/commands/streams/append'
 require 'event_store_client/adapters/http/commands/streams/delete'

data/lib/event_store_client/adapters/http/client.rb

@@ -137,10 +137,7 @@ module EventStoreClient
       # @return Dry::Monads::Result::Success or Dry::Monads::Result::Failure
       #
       def join_streams(name, streams, options: {})
-        res = Commands::Projections::Create.new(connection).call(name, streams, options: options)
-        return res if res.success?
-
-        Commands::Projections::Update.new(connection).call(name, streams, options: options)
+        Commands::Projections::Create.new(connection).call(name, streams, options: options)
       end
 
       # @api private

data/lib/event_store_client/adapters/http/commands/projections/create.rb

@@ -16,15 +16,12 @@ module EventStoreClient
                 })
               STRING
 
-
-            res = connection.call(
+            connection.call(
               :post,
               "/projections/continuous?name=#{name}&type=js&enabled=yes&emit=true&trackemittedstreams=true", # rubocop:disable Metrics/LineLength
               body: data,
               headers: {}
             )
-
-            (200...300).cover?(res.status) ? Success() : Failure(res)
           end
         end
       end

data/lib/event_store_client/broker.rb

@@ -6,15 +6,13 @@ module EventStoreClient
 
     # Distributes known subscriptions to multiple threads
     # @param [EventStoreClient::Subscriptions]
-    # @param wait [Boolean] (Optional) Controls if broker shold block
+    # @param wait [Boolean] (Optional) Controls if broker should block
     #   main app process (useful for debugging)
     #
     def call(subscriptions, wait: false)
       subscriptions.each do |subscription|
         threads << Thread.new do
-          connection.listen(subscription, options: { interval: 1, count: 10 }) do |event|
-            subscription.subscriber.call(event)
-          end
+          subscriptions.listen(subscription)
         end
       end
       threads.each(&:join) if wait

data/lib/event_store_client/catch_up_subscription.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module EventStoreClient
+  class CatchUpSubscription
+    attr_reader :subscriber, :filter
+    attr_accessor :position
+
+    def options
+      {
+        filter: @filter,
+        without_system_events: @without_system_events,
+        all: {
+          position: {
+            commit_position: position[:commit_position],
+            prepare_position: position[:prepare_position]
+          }
+        }
+      }.compact
+    end
+
+    def name
+      self.class.name(subscriber)
+    end
+
+    def self.name(subscriber)
+      subscriber.class.to_s
+    end
+
+    private
+
+    def initialize(subscriber, filter: nil, position: nil)
+      @filter = filter
+      @subscriber = subscriber
+      @position = position
+      @position ||= {
+        commit_position: 0,
+        prepare_position: 0
+      }
+      @without_system_events = true
+    end
+  end
+end

data/lib/event_store_client/catch_up_subscriptions.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module EventStoreClient
+  class CatchUpSubscriptions
+    FILTER_DEFAULT_MAX = 32
+    FILTER_DEFAULT_CHECKPOINT_INTERVAL_MULTIPLIER = 10000
+
+    def create_or_load(subscriber, filter: {})
+      filter_options = prepare_filter_options(filter)
+      position = subscription_store.load_all_position(CatchUpSubscription.name(subscriber))
+
+      subscription = CatchUpSubscription.new(subscriber, position: position, filter: filter_options)
+      subscription_store.add(subscription) unless position
+
+      subscriptions << subscription unless @subscriptions.find { |s| s.name == subscription.name }
+      subscription
+    end
+
+    def each
+      subscriptions.each { |subscription| yield(subscription) }
+    end
+
+    def listen(subscription)
+      connection.subscribe(subscription.options) do |event_data|
+        next if recorded_event?(event_data)
+        next if confirmation?(event_data)
+
+        new_position = event_data[0]
+        event = event_data[1]
+
+        old_position = subscription.position
+        subscription.position = new_position
+        subscription_store.update_position(subscription)
+        next unless event
+
+        subscription.subscriber.call(event)
+      rescue StandardError
+        subscription.position = old_position
+        subscription_store.update_position(subscription)
+        raise
+      end
+    end
+
+    def clean_unused
+      subscription_store.clean_unused(subscriptions.map(&:name))
+    end
+
+    private
+
+    attr_reader :connection, :subscriptions, :subscription_store
+
+    def initialize(connection:, subscription_store:)
+      @connection = connection
+      @subscription_store = subscription_store
+      @subscriptions = []
+    end
+
+    def confirmation?(event_data)
+      event_data.is_a? EventStore::Client::Streams::ReadResp::SubscriptionConfirmation
+    end
+
+    def recorded_event?(event_data)
+      event_data.is_a? EventStore::Client::Streams::ReadResp::ReadEvent::RecordedEvent
+    end
+
+    def prepare_filter_options(filter)
+      return if filter.nil? || filter.empty?
+
+      {
+        event_type: filter[:event_type],
+        stream_identifier: filter[:stream_identifier],
+        max: FILTER_DEFAULT_MAX,
+        checkpointIntervalMultiplier: FILTER_DEFAULT_CHECKPOINT_INTERVAL_MULTIPLIER
+      }.compact
+    end
+  end
+end

data/lib/event_store_client/client.rb

@@ -27,6 +27,12 @@ module EventStoreClient
       @subscriptions.create(subscriber, to, options: options)
     end
 
+    def subscribe_to_all(subscriber, filter=nil)
+      raise NoCallMethodOnSubscriber unless subscriber.respond_to?(:call)
+
+      @subscriptions.create_or_load(subscriber, filter: filter)
+    end
+
     def listen(wait: false)
       broker.call(@subscriptions, wait: wait)
     end
@@ -50,9 +56,10 @@ module EventStoreClient
 
     def initialize
       @threads = []
-      @connection ||= EventStoreClient.adapter
-      @error_handler ||= config.error_handler
-      @broker ||= Broker.new(connection: connection)
+      @connection = EventStoreClient.adapter
+      @error_handler = config.error_handler
+      @broker = Broker.new(connection: connection)
+      @subscriptions = config.subscriptions_repo
       @subscriptions ||= Subscriptions.new(connection: connection, service: config.service_name)
     end
   end

data/lib/event_store_client/configuration.rb

@@ -2,6 +2,7 @@
 
 require 'dry-configurable'
 require 'event_store_client/error_handler'
+
 module EventStoreClient
   extend Dry::Configurable
 
@@ -27,6 +28,8 @@ module EventStoreClient
 
   setting :mapper, Mapper::Default.new
 
+  setting :subscriptions_repo
+
   def self.configure
     yield(config) if block_given?
   end

data/lib/event_store_client/subscriptions.rb

@@ -19,6 +19,12 @@ module EventStoreClient
       end
     end
 
+    def listen(subscription)
+      connection.listen(subscription, options: { interval: 1, count: 10 }) do |event|
+        subscription.subscriber.call(event)
+      end
+    end
+
     private
 
     attr_reader :connection, :subscriptions, :service

data/lib/event_store_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EventStoreClient
-  VERSION = '1.0.17'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.1.0
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -173,6 +173,7 @@ files:
 - lib/event_store_client/adapters/grpc/commands/streams/link_to.rb
 - lib/event_store_client/adapters/grpc/commands/streams/read.rb
 - lib/event_store_client/adapters/grpc/commands/streams/read_all.rb
+- lib/event_store_client/adapters/grpc/commands/streams/subscribe.rb
 - lib/event_store_client/adapters/grpc/commands/streams/tombstone.rb
 - lib/event_store_client/adapters/grpc/connection.rb
 - lib/event_store_client/adapters/grpc/generated/cluster_pb.rb
@@ -198,7 +199,6 @@ files:
 - lib/event_store_client/adapters/http/commands/persistent_subscriptions/create.rb
 - lib/event_store_client/adapters/http/commands/persistent_subscriptions/read.rb
 - lib/event_store_client/adapters/http/commands/projections/create.rb
-- lib/event_store_client/adapters/http/commands/projections/update.rb
 - lib/event_store_client/adapters/http/commands/streams/append.rb
 - lib/event_store_client/adapters/http/commands/streams/delete.rb
 - lib/event_store_client/adapters/http/commands/streams/link_to.rb
@@ -208,6 +208,8 @@ files:
 - lib/event_store_client/adapters/http/request_method.rb
 - lib/event_store_client/adapters/in_memory.rb
 - lib/event_store_client/broker.rb
+- lib/event_store_client/catch_up_subscription.rb
+- lib/event_store_client/catch_up_subscriptions.rb
 - lib/event_store_client/client.rb
 - lib/event_store_client/configuration.rb
 - lib/event_store_client/data_decryptor.rb
@@ -245,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.4
 signing_key:
 specification_version: 4
 summary: Ruby integration for https://eventstore.org

data/lib/event_store_client/adapters/http/commands/projections/update.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module EventStoreClient
-  module HTTP
-    module Commands
-      module Projections
-        class Update < Command
-          def call(name, streams, options: {})
-            data =
-              <<~STRING
-                fromStreams(#{streams})
-                .when({
-                  $any: function(s,e) {
-                    linkTo("#{name}", e)
-                  }
-                })
-              STRING
-            res = connection.call(
-              :put,
-              "/projection/#{name}/query?type=js&enabled=yes&emit=true&trackemittedstreams=true", # rubocop:disable Metrics/LineLength
-              body: data,
-              headers: {}
-            )
-
-            (200...300).cover?(res.status) ? Success() : Failure(res)
-          end
-        end
-      end
-    end
-  end
-end