event_store_client 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4e812b6d0afb6200592432fd8561b9eb4a82eb35f3c97341996b2c57f8eb370
-  data.tar.gz: bb704ed3eea51dd21b422e736d1aa793394d075a45ea6620b6f5b455bca712a4
+  metadata.gz: 700f420a0fa9e3fb0352784f3bc0431cac18216130ba397897dfb77c98a4f7c6
+  data.tar.gz: e408f3a666dd7f1e95634591923bf8df51ce30c6b521cd9042072f551e5ff645
 SHA512:
-  metadata.gz: b099f9683c7e804bc89f89da3d2725abab47452a1dd52edc06b0a94a90ad3e5fc93eb19a296f2a4ea0f45cd4dc0553231a10a4679ae0ab3f8a2f3a80b34c6fb2
-  data.tar.gz: a2986ef2a17e00a28c9745d237870071c8bad0851e931dbccafad88b9e38c5ff6958412682a90f565d275176af816d91ffa05cdaabf1459be1a803d0679cefa9
+  metadata.gz: 2232248c19c04924effd9bab97271f5a0bf3e7b4cf4e56e5453fc32a27c56d587777239b48d0aafc026c265b1086691aa5e8c04e7863209d9bb1e07c046946e6
+  data.tar.gz: 2db191ee47dae6f22b5858ab85bde4d3129af6220f534d9b11e502150058c7211285afa2562aae70ae08877e21c8d2205c8d1400ec8365e10567e7c5295b7afc

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

@@ -84,10 +84,12 @@ module EventStoreClient
       #
       def listen(subscription, options: {})
         consume_feed(subscription, options: options) do |event|
-          yield event if block_given?
+          begin
+            yield event if block_given?
+          rescue StandardError => e
+            config.error_handler&.call(e)
+          end
         end
-      rescue StandardError => e
-        config.error_handler&.call(e)
       end
 
       # Subscribe to a stream

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/deserialized_event.rb

@@ -15,14 +15,16 @@ module EventStoreClient
       end
     end
 
-    def initialize(**args)
-      validation = schema.call(args[:data] || {})
+    def initialize(args = {})
+      validation = schema.call(args[:data] || {}) unless args[:skip_validation]
       @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?
+      if !args[:skip_validation] && validation.errors.any?
+        @metadata.merge!('validation-errors' => validation.errors.to_h)
+      end
       @type = args[:type] || self.class.name
       @title = args[:title]
       @id = args[:id]

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.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-08-09 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