event_store_client 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f3d458f2e88c538d11031447663da254409d7bd6b84212712f397b89958e34e
-  data.tar.gz: 9defe616729f3acef2163488e9ebd27b3f1e3ea66e803a81a80fde1c4cabff7c
+  metadata.gz: 308f1684d09b0b00ca5639074c5f1b79d4e689d5d42d44e4a33412db43a2b3c4
+  data.tar.gz: 67c2d8dd1bbf6070f9c6938c88577a5aa57bda35399586e75af30476c50488e3
 SHA512:
-  metadata.gz: 4e1d867efa61641f5dbf0174c976790c7a08af97ad150902987b7a6d36a041e62f3eccd2bf4676f8f1be81e49dded5f6116c8be681f0291338780c487aaf00db
-  data.tar.gz: f9a0c5fc265ec88c3aedaa45a22671008336f7e0e11d1912322f2f3f197730e66b6980655abd7dd3d6c577528522b4bb40c2e429f900a85d06f464c0b150bc1a
+  metadata.gz: 87eea741c382403a0ccd8904a689dfae713180c8a03198c4bbedf82dfc22d4a3e463cfd518d0f9fca678fffb54b521fa100d928b515a048ec13daffb1d9077dd
+  data.tar.gz: b380b64c37b959821178d7cdfcb887f6ed2f6fdb7b72f5a36b39ba81ac14660c0453c9f4fd03b422e284a36f1edd346ae9b4375c81531ac6e3284aee072dfd74

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

@@ -11,7 +11,7 @@ module EventStoreClient
       #
       def append_to_stream(stream_name, events, options: {})
         Commands::Streams::Append.new.call(
-          stream_name, events, options: {}
+          stream_name, events, options: options
         )
       end
 

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

@@ -1,8 +1,8 @@
 # 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/adapters/grpc/generated/streams_pb'
+require 'event_store_client/adapters/grpc/generated/streams_services_pb'
 
 require 'event_store_client/adapters/grpc/commands/command'
 
@@ -14,45 +14,94 @@ module EventStoreClient
           use_request EventStore::Client::Streams::AppendReq
           use_service EventStore::Client::Streams::Streams::Stub
 
+          ALLOWED_EVENT_METADATA = %w[type content-type created_at].freeze
+
           # @api private
-          # TODO: Add support to verify the expected version
-          def call(stream, events, options: {}) # rubocop:disable Lint/UnusedMethodArgument,Metrics/LineLength
+          def call(stream, events, options: {})
+            return unless events.any?
+
             serialized_events = events.map { |event| config.mapper.serialize(event) }
 
-            serialized_events.each do |event|
-              event_metadata = JSON.parse(event.metadata)
-              custom_metadata = {
-                "type": event.type,
-                "created_at": Time.now,
-                'content-type': event_metadata['content-type']
-              }
-              custom_metadata['encryption'] = event_metadata['encryption'] unless event_metadata['encryption'].nil?
-              custom_metadata['transaction'] = event_metadata['transaction'] unless event_metadata['transaction'].nil?
-              event_metadata = event_metadata.select { |k| ['type', 'content-type', 'created_at'].include?(k) }
-
-              payload = [
-                request.new(
-                  options: {
-                    stream_identifier: {
-                      streamName: stream
-                    },
-                    any: {}
-                  }
-                ),
-                request.new(
-                  proposed_message: {
-                    id: {
-                      string: SecureRandom.uuid
-                    },
-                    data: event.data.b,
-                    custom_metadata: JSON.generate(custom_metadata),
-                    metadata: event_metadata
-                  }
-                )
-              ]
-              service.append(payload, metadata: metadata)
+            expected_version = options[:expected_version]
+
+            res = nil
+            serialized_events.each_with_index do |event, i|
+              expected_version += i if expected_version
+              res = append(stream, event, expected_version)
+              break if res.failure?
             end
-            Success(events)
+
+            res.success? ? Success(events) : Failure(res.failure)
+          end
+
+          private
+
+          def append(stream, event, expected_version)
+            event_metadata = JSON.parse(event.metadata)
+
+            payload = append_request_payload(
+              options(stream, expected_version),
+              message(
+                data: event.data.b,
+                event_metadata: event_metadata.select { |k| ALLOWED_EVENT_METADATA.include?(k) },
+                custom_metadata: custom_metadata(event.type, event_metadata)
+              )
+            )
+
+            resp = service.append(payload, metadata: metadata)
+
+            validate_response(resp)
+          end
+
+          def custom_metadata(event_type, event_metadata)
+            {
+              type: event_type,
+              created_at: Time.current,
+              encryption: event_metadata['encryption'],
+              'content-type': event_metadata['content-type'],
+              transaction: event_metadata['transaction']
+            }.compact
+          end
+
+          def append_request_payload(options, message)
+            [
+              request.new(
+                options: options
+              ),
+              request.new(
+                proposed_message: message
+              )
+            ]
+          end
+
+          def options(stream, expected_version)
+            {
+              stream_identifier: {
+                streamName: stream
+              },
+              revision: expected_version,
+              any: (expected_version ? nil : {})
+            }.compact
+          end
+
+          def message(data:, event_metadata:, custom_metadata:)
+            {
+              id: {
+                string: SecureRandom.uuid
+              },
+              data: data,
+              custom_metadata: JSON.generate(custom_metadata),
+              metadata: event_metadata
+            }
+          end
+
+          def validate_response(resp)
+            return Success() if resp.success
+
+            Failure(
+              "current version: #{resp.wrong_expected_version.current_revision} | "\
+              "expected: #{resp.wrong_expected_version.expected_revision}"
+            )
           end
         end
       end

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

@@ -44,7 +44,12 @@ module EventStoreClient
             end
 
             skip_decryption = options[:skip_decryption] || false
-            events = read_stream(opts, skip_decryption)
+            events =
+              if options[:skip_deserialization]
+                read_stream_raw(opts)
+              else
+                read_stream(opts, skip_decryption)
+              end
             Success(events)
           rescue StreamNotFound
             Failure(:not_found)
@@ -64,6 +69,18 @@ module EventStoreClient
             raise GRPCUnavailableRetryFailed
           end
 
+          def read_stream_raw(options)
+            retries ||= 0
+            service.read(request.new(options: options), metadata: metadata).map do |res|
+              raise StreamNotFound if res.stream_not_found
+              res.event.event
+            end
+          rescue ::GRPC::Unavailable
+            sleep config.grpc_unavailable_retry_sleep
+            retry if (retries += 1) <= config.grpc_unavailable_retry_count
+            raise GRPCUnavailableRetryFailed
+          end
+
           def deserialize_event(entry, skip_decryption: false)
             data = (entry.data.nil? || entry.data.empty?) ? '{}' : entry.data
 

data/lib/event_store_client/catch_up_subscriptions.rb

@@ -5,6 +5,8 @@ module EventStoreClient
     FILTER_DEFAULT_MAX = 32
     FILTER_DEFAULT_CHECKPOINT_INTERVAL_MULTIPLIER = 10000
 
+    include Configuration
+
     def create_or_load(subscriber, filter: {})
       filter_options = prepare_filter_options(filter)
       position = subscription_store.load_all_position(CatchUpSubscription.name(subscriber))
@@ -41,10 +43,10 @@ module EventStoreClient
           logger&.info(msg)
           break
         end
-      rescue StandardError
+      rescue StandardError => e
         subscription.position = old_position
         subscription_store.update_position(subscription)
-        raise
+        config.error_handler&.call(e)
       end
     end
 

data/lib/event_store_client/client.rb

@@ -11,7 +11,7 @@ module EventStoreClient
 
     def publish(stream:, events:, options: {})
       res = connection.append_to_stream(stream, events, options: options)
-      raise WrongExpectedEventVersion.new(e.message) if res.failure?
+      raise WrongExpectedEventVersion.new(res.failure) if res.failure?
       res
     end
 

data/lib/event_store_client/configuration.rb

@@ -8,35 +8,35 @@ module EventStoreClient
 
   # Supported adapters: %i[api in_memory grpc]
   #
-  setting :adapter, :grpc
-  setting :verify_ssl, true
+  setting :adapter, default: :grpc
+  setting :verify_ssl, default: true
 
-  setting :error_handler, ErrorHandler.new
-  setting :eventstore_url, 'http://localhost:2113' do |value|
+  setting :error_handler, default: ErrorHandler.new
+  setting :eventstore_url, default: 'http://localhost:2113' do |value|
     value.is_a?(URI) ? value : URI(value)
   end
 
-  setting :eventstore_user, 'admin'
-  setting :eventstore_password, 'changeit'
+  setting :eventstore_user, default: 'admin'
+  setting :eventstore_password, default: 'changeit'
 
-  setting :db_port, 2113
+  setting :db_port, default: 2113
 
-  setting :per_page, 20
-  setting :pid_path, 'tmp/poll.pid'
+  setting :per_page, default: 20
+  setting :pid_path, default: 'tmp/poll.pid'
 
-  setting :service_name, 'default'
+  setting :service_name, default: 'default'
 
-  setting :mapper, Mapper::Default.new
+  setting :mapper, default: Mapper::Default.new
 
   setting :subscriptions_repo
 
   setting :logger
 
-  setting :socket_error_retry_sleep, 0.5
-  setting :socket_error_retry_count, 3
+  setting :socket_error_retry_sleep, default: 0.5
+  setting :socket_error_retry_count, default: 3
 
-  setting :grpc_unavailable_retry_sleep, 0.5
-  setting :grpc_unavailable_retry_count, 3
+  setting :grpc_unavailable_retry_sleep, default: 0.5
+  setting :grpc_unavailable_retry_count, default: 3
 
   def self.configure
     yield(config) if block_given?

data/lib/event_store_client/deserialized_event.rb

@@ -4,34 +4,53 @@ require 'dry/schema'
 
 module EventStoreClient
   class DeserializedEvent
-    attr_reader :id
-    attr_reader :type
-    attr_reader :title
-    attr_reader :data
-    attr_reader :metadata
-
-    def schema
-      Dry::Schema.Params do
-      end
-    end
+    InvalidDataError = Class.new(StandardError)
+    private_constant :InvalidDataError
+
+    attr_reader :id, :type, :title, :data, :metadata
+
+    # @args [Hash] opts
+    # @option opts [Boolean] :skip_validation
+    # @option opts [Hash] :data
+    # @option opts [Hash] :metadata
+    # @option opts [String] :type
+    # @option opts [String] :title
+    # @option opts [UUID] :id
+    #
+    def initialize(args = {})
+      validate(args[:data]) unless args[:skip_validation]
 
-    def initialize(**args)
-      validation = schema.call(args[:data] || {})
       @data = args.fetch(:data) { {} }
-      @metadata = args.fetch(:metadata) { {} }.merge(
-        'type' => self.class.name,
-        'content-type' => content_type
-      )
-      @metadata.merge!('validation-errors' => validation.errors.to_h) if validation.errors.any?
+      @metadata =
+        args.fetch(:metadata) { {} }
+            .merge(
+              'type' => self.class.name,
+              'content-type' => payload_content_type
+            )
+
       @type = args[:type] || self.class.name
       @title = args[:title]
       @id = args[:id]
     end
 
-    def content_type
+    # event schema
+    def schema; end
+
+    # content type of the event data
+    def payload_content_type
       return 'application/json' if EventStoreClient.config.adapter == :grpc
 
       'application/vnd.eventstore.events+json'
     end
+
+    private
+
+    def validate(data)
+      validation = schema.call(data || {})
+
+      retun unless validation.errors.any?
+
+      raise(InvalidDataError.new(message: "#{schema.class.name} #{validation.errors.to_h}"))
+    end
   end
 end

data/lib/event_store_client/event.rb

@@ -14,7 +14,7 @@ module EventStoreClient
 
     private
 
-    def initialize(**args)
+    def initialize(args = {})
       args[:id] = SecureRandom.uuid if args[:id].nil?
       hash_meta = JSON.parse(args[:metadata] || '{}')
       hash_meta['created_at'] ||= Time.now

data/lib/event_store_client/mapper/default.rb

@@ -23,6 +23,7 @@ module EventStoreClient
             EventStoreClient::DeserializedEvent
           end
         event_class.new(
+          skip_validation: true,
           id: event.id,
           type: event.type,
           title: event.title,

data/lib/event_store_client/mapper/encrypted.rb

@@ -51,7 +51,7 @@ module EventStoreClient
 
       def deserialize(event, skip_decryption: false)
         metadata = serializer.deserialize(event.metadata)
-        encryption_schema = serializer.deserialize(event.metadata)['encryption']
+        encryption_schema = metadata['encryption']
 
         decrypted_data =
           if skip_decryption
@@ -72,6 +72,7 @@ module EventStoreClient
           end
 
         event_class.new(
+          skip_validation: true,
           id: event.id,
           type: event.type,
           title: event.title,

data/lib/event_store_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.0.pre1
 signing_key:
 specification_version: 4
 summary: Ruby integration for https://eventstore.org