event_store_client 2.1.3 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf7ad41170584cd3dbe64ba7afff6e8e3af7a51277cf60e5732b6187e18e8170
-  data.tar.gz: 2cb382ee414a9d00373954e05f6a931e9bec042a84491dd58d2d96f4fd47559c
+  metadata.gz: a4b94342dbb48eeba88c4f87758497bf3604ec01d1954163af2d9add2e88e46f
+  data.tar.gz: 195564b4fded0a7c5986b4f3b5b76a19ad97018113238389a26254df27191f49
 SHA512:
-  metadata.gz: adec2fceef915b4383e694f299e91963bd27bebcf6b3bcf5a25d8549bc6b6038a2d58ab1937444a8ffa3fd8785ed6f8351ec9b9960537a4d4000d3f7ce80d6c0
-  data.tar.gz: ad2b082b49f5c6d40f6f74bf5e31543878b1d09787650381687eb1b9367aecbc80121d277f929a242e26e7f82d15dede426dc0da983ced71712b87497a3ede36
+  metadata.gz: 62c2faaed828d92add77f8c8af76f7bae5fe3fa990e9820e4fc5dd6b74ad7b3fbe0e84aa7d2975c6903e91e959d6969d5ae30aa3d2916300086d2cfa81fce8b0
+  data.tar.gz: 5b282b014013149ecb61531ad02fe654321765f15da09fc4ffeadabc2fbefc21c919a769d657cfc0fe7922d80338dab6908bf1a00a21b672d9128603062e448f

data/docs/configuration.md

@@ -83,3 +83,11 @@ Possible options:
 | grpcRetryAttempts    | Integer                                         | `3`           | Number of times to retry GRPC requests. Does not apply to discovery requests. Final number of requests in cases of error will be initial request + grpcRetryAttempts.                                                                                  |
 | grpcRetryInterval    | Integer                                         | `100`         | Milliseconds. Delay between GRPC requests. retries.                                                                                                                                                                                                      |
 | throwOnAppendFailure | Boolean                                         | `true`        | Defines if append requests should immediately raise an error. If set to `false`, request will be retried in case of a server error.                                                                                                                       |
+
+Examples:
+
+```
+esdb://localhost:2113/?tls=false
+esdb+discover://localhost:2113/?grpcRetryAttempts=3&grpcRetryInterval=300&discoverInterval=200
+esdb://localhost:2113,localhost:2114,localhost:2115/?gossipTimeout=500&maxDiscoverAttempts=3
+```

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

@@ -117,7 +117,7 @@ module EventStoreClient
           # @param stream_name [String]
           # @return [Integer]
           def calc_next_position(raw_events, direction, stream_name)
-            events = meaningful_events(raw_events).map { |e| e.event.event }
+            events = meaningful_events(raw_events).map(&:event)
 
             return next_position_for_all(events, direction) if stream_name == '$all'
 
@@ -128,18 +128,18 @@ module EventStoreClient
           # @param direction [Symbol] :Backwards or :Forwards
           # @return [Integer]
           def next_position_for_all(events, direction)
-            return events.last.commit_position if direction == DEFAULT_READ_DIRECTION
+            return event_or_link(events.last).commit_position if direction == DEFAULT_READ_DIRECTION
 
-            events.first.commit_position
+            event_or_link(events.first).commit_position
           end
 
           # @param events [Array<EventStore::Client::Streams::ReadResp::ReadEvent::RecordedEvent>]
           # @param direction [Symbol] :Backwards or :Forwards
           # @return [Integer]
           def next_position_for_regular(events, direction)
-            return events.last.stream_revision + 1 if direction == DEFAULT_READ_DIRECTION
+            return event_or_link(events.last).stream_revision + 1 if direction == DEFAULT_READ_DIRECTION
 
-            events.last.stream_revision - 1
+            event_or_link(events.last).stream_revision - 1
           end
 
           # @param raw_events [Array<EventStore::Client::Streams::ReadResp>]
@@ -166,6 +166,17 @@ module EventStoreClient
               "Current value is `#{max_count}'."
             )
           end
+
+          # Picks the correct object for later resolving of stream_revision from it. In case if we
+          # deal with links - we should prefer a link over a linked event, because exactly it
+          # contains correct stream revision of the stream we are reading from. Because if we pick
+          # a linked event's stream_revision, then it will be a revision from the stream that event
+          # belongs to - this can potentially create an infinite loop.
+          # @param event [EventStore::Client::Streams::ReadResp::ReadEvent]
+          # @return [EventStore::Client::Streams::ReadResp::ReadEvent::RecordedEvent]
+          def event_or_link(event)
+            event.link ? event.link : event.event
+          end
         end
       end
     end

data/lib/event_store_client/adapters/grpc/generated/shared_pb.rb

@@ -4,6 +4,7 @@
 require 'google/protobuf'
 
 require 'google/protobuf/empty_pb'
+require 'google/protobuf/any_pb'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("shared.proto", :syntax => :proto3) do
@@ -55,6 +56,30 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     add_message "event_store.client.BadRequest" do
       optional :message, :string, 1
     end
+    add_message "event_store.client.Status" do
+      optional :code, :enum, 1, "event_store.client.Code"
+      optional :message, :string, 2
+      optional :details, :message, 3, "google.protobuf.Any"
+    end
+    add_enum "event_store.client.Code" do
+      value :OK, 0
+      value :CANCELLED, 1
+      value :UNKNOWN, 2
+      value :INVALID_ARGUMENT, 3
+      value :DEADLINE_EXCEEDED, 4
+      value :NOT_FOUND, 5
+      value :ALREADY_EXISTS, 6
+      value :PERMISSION_DENIED, 7
+      value :UNAUTHENTICATED, 16
+      value :RESOURCE_EXHAUSTED, 8
+      value :FAILED_PRECONDITION, 9
+      value :ABORTED, 10
+      value :OUT_OF_RANGE, 11
+      value :UNIMPLEMENTED, 12
+      value :INTERNAL, 13
+      value :UNAVAILABLE, 14
+      value :DATA_LOSS, 15
+    end
   end
 end
 
@@ -73,5 +98,7 @@ module EventStore
     InvalidTransaction = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("event_store.client.InvalidTransaction").msgclass
     MaximumAppendSizeExceeded = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("event_store.client.MaximumAppendSizeExceeded").msgclass
     BadRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("event_store.client.BadRequest").msgclass
+    Status = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("event_store.client.Status").msgclass
+    Code = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("event_store.client.Code").enummodule
   end
 end

data/lib/event_store_client/adapters/grpc/generated/streams_pb.rb

@@ -4,7 +4,6 @@
 require 'google/protobuf'
 
 require_relative 'shared_pb'
-require_relative 'status_pb'
 require 'google/protobuf/duration_pb'
 require 'google/protobuf/empty_pb'
 require 'google/protobuf/timestamp_pb'
@@ -211,7 +210,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :correlation_id, :message, 1, "event_store.client.UUID"
       optional :stream_identifier, :message, 4, "event_store.client.StreamIdentifier"
       oneof :result do
-        optional :error, :message, 2, "google.rpc.Status"
+        optional :error, :message, 2, "event_store.client.Status"
         optional :success, :message, 3, "event_store.client.streams.BatchAppendResp.Success"
       end
       oneof :expected_stream_position do

data/lib/event_store_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.5
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-26 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -191,7 +191,6 @@ files:
 - lib/event_store_client/adapters/grpc/discover.rb
 - lib/event_store_client/adapters/grpc/generated/cluster_pb.rb
 - lib/event_store_client/adapters/grpc/generated/cluster_services_pb.rb
-- lib/event_store_client/adapters/grpc/generated/code_pb.rb
 - lib/event_store_client/adapters/grpc/generated/gossip_pb.rb
 - lib/event_store_client/adapters/grpc/generated/gossip_services_pb.rb
 - lib/event_store_client/adapters/grpc/generated/monitoring_pb.rb
@@ -205,7 +204,6 @@ files:
 - lib/event_store_client/adapters/grpc/generated/serverfeatures_pb.rb
 - lib/event_store_client/adapters/grpc/generated/serverfeatures_services_pb.rb
 - lib/event_store_client/adapters/grpc/generated/shared_pb.rb
-- lib/event_store_client/adapters/grpc/generated/status_pb.rb
 - lib/event_store_client/adapters/grpc/generated/streams_pb.rb
 - lib/event_store_client/adapters/grpc/generated/streams_services_pb.rb
 - lib/event_store_client/adapters/grpc/generated/users_pb.rb

data/lib/event_store_client/adapters/grpc/generated/code_pb.rb

@@ -1,34 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: code.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("code.proto", :syntax => :proto3) do
-    add_enum "google.rpc.Code" do
-      value :OK, 0
-      value :CANCELLED, 1
-      value :UNKNOWN, 2
-      value :INVALID_ARGUMENT, 3
-      value :DEADLINE_EXCEEDED, 4
-      value :NOT_FOUND, 5
-      value :ALREADY_EXISTS, 6
-      value :PERMISSION_DENIED, 7
-      value :UNAUTHENTICATED, 16
-      value :RESOURCE_EXHAUSTED, 8
-      value :FAILED_PRECONDITION, 9
-      value :ABORTED, 10
-      value :OUT_OF_RANGE, 11
-      value :UNIMPLEMENTED, 12
-      value :INTERNAL, 13
-      value :UNAVAILABLE, 14
-      value :DATA_LOSS, 15
-    end
-  end
-end
-
-module Google
-  module Rpc
-    Code = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.rpc.Code").enummodule
-  end
-end

data/lib/event_store_client/adapters/grpc/generated/status_pb.rb

@@ -1,23 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: status.proto
-
-require 'google/protobuf'
-
-require 'google/protobuf/any_pb'
-require_relative 'code_pb'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("status.proto", :syntax => :proto3) do
-    add_message "google.rpc.Status" do
-      optional :code, :enum, 1, "google.rpc.Code"
-      optional :message, :string, 2
-      optional :details, :message, 3, "google.protobuf.Any"
-    end
-  end
-end
-
-module Google
-  module Rpc
-    Status = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.rpc.Status").msgclass
-  end
-end