event_store_client 1.1.5 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2624a6c8e08a686f5e307eccfb00ac9321eb5e2e32aed9093c0c67e8cb01b9e5
-  data.tar.gz: 0b4ff333a547924f54aa182e0bb1f821a7382db93c5d9304038c43a514ee6d3b
+  metadata.gz: 3f3d458f2e88c538d11031447663da254409d7bd6b84212712f397b89958e34e
+  data.tar.gz: 9defe616729f3acef2163488e9ebd27b3f1e3ea66e803a81a80fde1c4cabff7c
 SHA512:
-  metadata.gz: dfda05e2c763e85977c63a3b0e27034050b37c7ded273750b1aadec42e55fc459475c4a8d50167fe66952bb39c7145242ed017b5548abbece412beaa4e98d37a
-  data.tar.gz: ca27251198df7d78a9b60482ee8dfef7f8b6cfdbda08d3a36f0af1723ee487b85239d0d046a6d777e5c6e5161725faaa4b4fac6aa3b650460eb622a428dc0960
+  metadata.gz: 4e1d867efa61641f5dbf0174c976790c7a08af97ad150902987b7a6d36a041e62f3eccd2bf4676f8f1be81e49dded5f6116c8be681f0291338780c487aaf00db
+  data.tar.gz: f9a0c5fc265ec88c3aedaa45a22671008336f7e0e11d1912322f2f3f197730e66b6980655abd7dd3d6c577528522b4bb40c2e429f900a85d06f464c0b150bc1a

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

@@ -9,6 +9,8 @@ module EventStoreClient
       class Command
         include Configuration
 
+        class GRPCUnavailableRetryFailed < StandardError; end
+
         def self.inherited(klass)
           super
           klass.class_eval do

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

@@ -27,9 +27,9 @@ module EventStoreClient
                 '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: {
@@ -52,7 +52,7 @@ module EventStoreClient
               ]
               service.append(payload, metadata: metadata)
             end
-            Success()
+            Success(events)
           end
         end
       end

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

@@ -44,10 +44,7 @@ module EventStoreClient
             end
 
             skip_decryption = options[:skip_decryption] || false
-            events = service.read(request.new(options: opts), metadata: metadata).map do |res|
-              raise StreamNotFound if res.stream_not_found
-              deserialize_event(res.event.event, skip_decryption: skip_decryption)
-            end
+            events = read_stream(opts, skip_decryption)
             Success(events)
           rescue StreamNotFound
             Failure(:not_found)
@@ -55,6 +52,18 @@ module EventStoreClient
 
           private
 
+          def read_stream(options, skip_decryption)
+            retries ||= 0
+            service.read(request.new(options: options), metadata: metadata).map do |res|
+              raise StreamNotFound if res.stream_not_found
+              deserialize_event(res.event.event, skip_decryption: skip_decryption)
+            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/adapters/grpc/connection.rb

@@ -9,6 +9,8 @@ module EventStoreClient
     class Connection
       include Configuration
 
+      class SocketErrorRetryFailed < StandardError; end
+
       # Initializes the proper stub with the necessary credentials
       # to create working gRPC connection - Refer to generated grpc files
       # @return [Stub] Instance of a given `Stub` klass
@@ -29,6 +31,7 @@ module EventStoreClient
       attr_reader :cert
 
       def initialize
+        retries ||= 0
         @cert =
           Net::HTTP.start(
             config.eventstore_url.host, config.eventstore_url.port,
@@ -36,6 +39,10 @@ module EventStoreClient
             verify_mode: verify_ssl,
             &:peer_cert
           )
+      rescue SocketError
+        sleep config.socket_error_retry_sleep
+        retry if (retries += 1) <= config.socket_error_retry_count
+        raise SocketErrorRetryFailed
       end
 
       def channel_credentials

data/lib/event_store_client/adapters/in_memory.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'dry/monads'
+
 module EventStoreClient
   class InMemory
     Response = Struct.new(:body, :status) do
@@ -22,7 +23,7 @@ module EventStoreClient
           'positionEventNumber' => event_store[stream_name].length
         )
       end
-      Dry::Monads::Success()
+      Dry::Monads::Success(events)
     end
 
     def delete_stream(stream_name, options: {}) # rubocop:disable Lint/UnusedMethodArgument

data/lib/event_store_client/client.rb

@@ -12,6 +12,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?
+      res
     end
 
     def read(stream, options: {})

data/lib/event_store_client/configuration.rb

@@ -32,6 +32,12 @@ module EventStoreClient
 
   setting :logger
 
+  setting :socket_error_retry_sleep, 0.5
+  setting :socket_error_retry_count, 3
+
+  setting :grpc_unavailable_retry_sleep, 0.5
+  setting :grpc_unavailable_retry_count, 3
+
   def self.configure
     yield(config) if block_given?
   end

data/lib/event_store_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.1
 platform: ruby
 authors:
 - Sebastian Wilgosz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -247,7 +247,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby integration for https://eventstore.org
 test_files: []