event_store_client 0.2.8 → 1.0.0

data/lib/event_store_client/broker.rb

@@ -2,21 +2,32 @@
 
 module EventStoreClient
   class Broker
-    def call(subscriptions)
+    include Configuration
+
+    # Distributes known subscriptions to multiple threads
+    # @param [EventStoreClient::Subscriptions]
+    # @param wait [Boolean] (Optional) Controls if broker shold block
+    #   main app process (useful for debugging)
+    #
+    def call(subscriptions, wait: false)
       subscriptions.each do |subscription|
-        res = connection.consume_feed(subscription.stream, subscription.name) || { events: [] }
-        next if res[:events].none?
-        res[:events].each { |event| subscription.subscriber.call(event) }
-        connection.ack(res[:ack_uri])
+        threads << Thread.new do
+          connection.listen(subscription, options: { interval: 1, count: 10 }) do |event|
+            subscription.subscriber.call(event)
+          end
+        end
       end
+      threads.each(&:join) if wait
     end
 
     private
 
     attr_reader :connection
+    attr_accessor :threads
 
     def initialize(connection:)
       @connection = connection
+      @threads = []
     end
   end
 end

data/lib/event_store_client/client.rb

@@ -4,81 +4,42 @@ require 'dry-struct'
 
 module EventStoreClient
   class Client
+    include Configuration
+
     NoCallMethodOnSubscriber = Class.new(StandardError)
     WrongExpectedEventVersion = Class.new(StandardError)
 
-    def publish(stream:, events:, expected_version: nil)
-      connection.append_to_stream(stream, events, expected_version: expected_version)
-    rescue StoreAdapter::Api::Client::WrongExpectedEventVersion => e
+    def publish(stream:, events:, options: {})
+      connection.append_to_stream(stream, events, options: options)
+    rescue HTTP::Client::WrongExpectedEventVersion => e
       raise WrongExpectedEventVersion.new(e.message)
     end
 
-    def read(stream, direction: 'forward', start: 0, all: false, resolve_links: true)
-      if all
-        connection.read_all_from_stream(
-          stream, start: start, direction: direction, resolve_links: resolve_links
-        )
+    def read(stream, options: {})
+      if options[:all]
+        connection.read_all_from_stream(stream, options: options)
       else
-        connection.read(
-          stream, start: start, direction: direction, resolve_links: resolve_links
-        )
+        connection.read(stream, options: options)
       end
     end
 
-    def subscribe(subscriber, to: [], polling: true)
+    def subscribe(subscriber, to: [])
       raise NoCallMethodOnSubscriber unless subscriber.respond_to?(:call)
       @subscriptions.create(subscriber, to)
-      poll if polling
     end
 
-    def poll(interval: 5)
-      return if @polling_started
-      @polling_started = true
-      thread1 = Thread.new do
-        loop do
-          create_pid_file
-          Thread.handle_interrupt(Interrupt => :never) do
-            begin # rubocop:disable Style/RedundantBegin
-              Thread.handle_interrupt(Interrupt => :immediate) do
-                broker.call(subscriptions)
-              end
-            rescue Exception => e # rubocop:disable Lint/RescueException
-              # When the thread had been interrupted or broker.call returned an error
-              sleep(interval) # wait for events to be processed
-              delete_pid_file
-              error_handler&.call(e)
-            ensure
-              # this code is run always
-              Thread.stop
-            end
-          end
-        end
-      end
-      thread2 = Thread.new do
-        loop do
-          sleep 1
-          break unless thread1.alive?
-          thread1.run
-        end
-      end
-      @threads = [thread1, thread2]
-      nil
-    end
-
-    def stop_polling
-      return if @threads.none?
-      @threads.each(&:kill)
-      @polling_started = false
-      nil
+    def listen(wait: false)
+      broker.call(@subscriptions, wait: wait)
     end
 
     # rubocop:disable Metrics/CyclomaticComplexity
-    def link_to(stream:, events:, expected_version: nil)
+    def link_to(stream:, events:, options: {})
       raise ArgumentError if !stream || stream == ''
       raise ArgumentError if events.nil? || (events.is_a?(Array) && events.empty?)
-      connection.link_to(stream, events, expected_version: expected_version)
-    rescue StoreAdapter::Api::Client::WrongExpectedEventVersion => e
-      raise WrongExpectedEventVersion.new(e.message)
+      res = connection.link_to(stream, events, options: options)
+      raise WrongExpectedEventVersion.new(e.message) if res.failure?
+
+      res.success?
     end
     # rubocop:enable Metrics/CyclomaticComplexity
 
@@ -88,10 +49,6 @@ module EventStoreClient
 
     attr_reader :subscriptions, :broker, :error_handler
 
-    def config
-      EventStoreClient.config
-    end
-
     def initialize
       @threads = []
       @connection ||= EventStoreClient.adapter
@@ -100,14 +57,5 @@ module EventStoreClient
       @broker ||= Broker.new(connection: connection)
       @subscriptions ||= Subscriptions.new(connection: connection, service: config.service_name)
     end
-
-    def create_pid_file
-      Dir.mkdir('tmp') unless File.exist?('tmp')
-      File.open(config.pid_path, 'w') { |file| file.write(Process.pid) }
-    end
-
-    def delete_pid_file
-      File.delete(config.pid_path) if File.exist?(config.pid_path)
-    end
   end
 end

data/lib/event_store_client/configuration.rb

@@ -5,9 +5,10 @@ require 'dry-configurable'
 module EventStoreClient
   extend Dry::Configurable
 
-  # Supported adapters: %i[api in_memory]
+  # Supported adapters: %i[api in_memory grpc]
   #
-  setting :adapter, :api
+  setting :adapter, :grpc
+  setting :verify_ssl, true
 
   setting :error_handler
   setting :eventstore_url, 'http://localhost:2113' do |value|
@@ -31,18 +32,31 @@ module EventStoreClient
   end
 
   def self.adapter
-    case config.adapter
-    when :api
-      StoreAdapter::Api::Client.new(
-        config.eventstore_url,
-        per_page: config.per_page,
-        mapper: config.mapper,
-        connection_options: {}
-      )
-    else
-      StoreAdapter::InMemory.new(
-        mapper: config.mapper, per_page: config.per_page
-      )
+    @adapter =
+      case config.adapter
+      when :http
+        require 'event_store_client/adapters/http'
+        HTTP::Client.new
+      when :grpc
+        require 'event_store_client/adapters/grpc'
+        GRPC::Client.new
+      else
+        require 'event_store_client/adapters/in_memory'
+        InMemory.new(
+          mapper: config.mapper, per_page: config.per_page
+        )
+      end
+  end
+
+  # Configuration module to be included in classes required configured variables
+  # Usage: include EventStore::Configuration
+  # config.eventstore_url
+  #
+  module Configuration
+    # An instance of the EventStoreClient's configuration
+    #
+    def config
+      EventStoreClient.config
     end
   end
 end

data/lib/event_store_client/data_decryptor.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require 'event_store_client/configuration'
+
 module EventStoreClient
   class DataDecryptor
+    include Configuration
+
     KeyNotFoundError = Class.new(StandardError)
 
     def call
@@ -26,12 +30,13 @@ module EventStoreClient
       @encryption_metadata = schema&.transform_keys(&:to_s) || {}
     end
 
-    def decrypt_attributes(key:, data:, attributes:)
-      decrypted_text = key_repository.decrypt(
-        key_id: key.id, text: data['es_encrypted'], cipher: key.cipher, iv: key.iv
-      )
-      decrypted = JSON.parse(decrypted_text).transform_keys(&:to_s)
-      decrypted.each { |key, value| data[key] = value if data.key?(key) }
+    def decrypt_attributes(key:, data:, attributes: {}) # rubocop:disable Lint/UnusedMethodArgument
+      res = key_repository.decrypt(key: key, message: data['es_encrypted'])
+      return data if res.failure?
+
+      decrypted_text = res.value!
+      decrypted = JSON.parse(decrypted_text.attributes[:message]).transform_keys(&:to_s)
+      decrypted.each { |k, value| data[k] = value if data.key?(k) }
       data.delete('es_encrypted')
       data
     end
@@ -45,9 +50,9 @@ module EventStoreClient
     def find_key(identifier)
       key =
         begin
-          key_repository.find(identifier)
+          key_repository.find(identifier).value!
         rescue StandardError => e
-          nil
+          config.error_handler&.call(e)
         end
       raise KeyNotFoundError unless key
 

data/lib/event_store_client/data_encryptor.rb

@@ -6,8 +6,11 @@ module EventStoreClient
       return encrypted_data if encryption_metadata.empty?
 
       key_id = encryption_metadata[:key]
-      key = key_repository.find(key_id) || key_repository.create(key_id)
-      encryption_metadata[:iv] = key.iv
+      res = key_repository.find(key_id)
+      res = res.failure? ? key_repository.create(key_id) : res
+      key = res.value!
+
+      encryption_metadata[:iv] = key.attributes[:iv]
       encrypt_attributes(
         key: key,
         data: encrypted_data,
@@ -29,11 +32,9 @@ module EventStoreClient
 
     def encrypt_attributes(key:, data:, attributes:)
       text = JSON.generate(data.select { |hash_key, _value| attributes.include?(hash_key.to_s) })
-      encrypted = key_repository.encrypt(
-        key_id: key.id, text: text, cipher: key.cipher, iv: key.iv
-      )
+      encrypted = key_repository.encrypt(key: key, message: text).value!
       attributes.each { |att| data[att.to_s] = 'es_encrypted' if data.key?(att.to_s) }
-      data['es_encrypted'] = encrypted
+      data['es_encrypted'] = encrypted.attributes[:message]
       data
     end
 

data/lib/event_store_client/deserialized_event.rb

@@ -22,7 +22,10 @@ module EventStoreClient
       raise InvalidDataError.new(message: validation.errors.to_h) if validation.errors.any?
 
       @data = args.fetch(:data) { {} }
-      @metadata = args.fetch(:metadata) { {} }
+      @metadata = args.fetch(:metadata) { {} }.merge(
+        'type' => self.class.name,
+        'content-type' => 'application/vnd.eventstore.events+json'
+      )
       @type = args[:type] || self.class.name
       @title = args[:title]
       @id = args[:id]

data/lib/event_store_client/event.rb

@@ -9,8 +9,8 @@ module EventStoreClient
     attribute :id, Types::Strict::String.optional.default(nil)
     attribute :type, Types::Strict::String
     attribute :title, Types::Strict::String.optional.default(nil)
-    attribute :data, Types::Coercible::String.default('{}')
-    attribute :metadata, Types::Coercible::String.default('{}')
+    attribute :data, Types::Strict::String.default('{}')
+    attribute :metadata, Types::Strict::String.default('{}')
 
     private
 

data/lib/event_store_client/mapper/default.rb

@@ -22,7 +22,6 @@ module EventStoreClient
           rescue NameError
             EventStoreClient::DeserializedEvent
           end
-
         event_class.new(
           id: event.id,
           type: event.type,

data/lib/event_store_client/serializer/json.rb

@@ -6,6 +6,8 @@ module Serializer
       return data if data.is_a?(Hash)
 
       JSON.parse(data)
+    rescue JSON::ParserError
+      { 'message' => data }
     end
 
     def self.serialize(data)

data/lib/event_store_client/subscriptions.rb

@@ -4,12 +4,13 @@ module EventStoreClient
   class Subscriptions
     def create(subscriber, event_types)
       subscription = Subscription.new(subscriber, event_types: event_types, service: service)
-      connection.join_streams(subscriber.class.name, subscription.observed_streams)
+
       unless @subscriptions.detect { |sub| sub.name == subscription.name }
-        create_subscription(subscription)
+        connection.subscribe_to_stream(subscription)
+        subscriptions << subscription
       end
 
-      subscriptions << subscription
+      subscription
     end
 
     def each
@@ -18,18 +19,8 @@ module EventStoreClient
       end
     end
 
-    def get_updates(subscription)
-      connection.consume_feed(subscription.stream, subscription.name)
-    end
-
     private
 
-    def create_subscription(subscription)
-      # store position somewhere.
-      connection.join_streams(subscription.name, subscription.observed_streams)
-      connection.subscribe_to_stream(subscription.stream, subscription.name)
-    end
-
     attr_reader :connection, :subscriptions, :service
 
     def initialize(connection:, service: 'default')

data/lib/event_store_client/types.rb

@@ -4,7 +4,9 @@ require 'dry-types'
 
 module EventStoreClient
   module Types
-    UUID_REGEXP = /\A[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}\z/i
+    UUID_REGEXP =
+      /\A[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}\z/i.
+        freeze
 
     include Dry.Types()
 

data/lib/event_store_client/value_objects/read_direction.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module EventStoreClient
+  class ReadDirection
+    Invalid = Class.new(StandardError)
+
+    def to_sym
+      value
+    end
+
+    def to_s
+      value.to_s
+    end
+
+    private
+
+    attr_reader :value
+
+    def initialize(str)
+      schema = Schema.new(direction: str)
+
+      unless %w[forwards backwards].include?(schema.direction)
+        raise Invalid.new('Allowed values: "forwards", "backwards"')
+      end
+
+      @value = schema.direction.capitalize.to_sym
+    end
+
+
+    class Schema < Dry::Struct
+      schema schema.strict
+
+      # resolve default types on nil
+      transform_types do |type|
+        type.constructor do |value|
+          value.is_a?(String) ? value.downcase : value
+        end
+      end
+
+      attribute :direction, Dry::Types['string']
+    end
+  end
+end

data/lib/event_store_client/version.rb

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

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: dry-monads
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: dry-schema
   requirement: !ruby/object:Gem::Requirement
@@ -53,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rss
+  name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
+  name: rss
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +147,64 @@ files:
 - README.md
 - Rakefile
 - lib/event_store_client.rb
+- lib/event_store_client/adapters/grpc.rb
+- lib/event_store_client/adapters/grpc/Protos/cluster.proto
+- lib/event_store_client/adapters/grpc/Protos/gossip.proto
+- lib/event_store_client/adapters/grpc/Protos/operations.proto
+- lib/event_store_client/adapters/grpc/Protos/persistent.proto
+- lib/event_store_client/adapters/grpc/Protos/projections.proto
+- lib/event_store_client/adapters/grpc/Protos/shared.proto
+- lib/event_store_client/adapters/grpc/Protos/streams.proto
+- lib/event_store_client/adapters/grpc/Protos/users.proto
+- lib/event_store_client/adapters/grpc/client.rb
+- lib/event_store_client/adapters/grpc/command_registrar.rb
+- lib/event_store_client/adapters/grpc/commands/command.rb
+- lib/event_store_client/adapters/grpc/commands/persistent_subscriptions/create.rb
+- lib/event_store_client/adapters/grpc/commands/persistent_subscriptions/delete.rb
+- lib/event_store_client/adapters/grpc/commands/persistent_subscriptions/read.rb
+- lib/event_store_client/adapters/grpc/commands/persistent_subscriptions/settings_schema.rb
+- lib/event_store_client/adapters/grpc/commands/persistent_subscriptions/update.rb
+- lib/event_store_client/adapters/grpc/commands/projections/create.rb
+- lib/event_store_client/adapters/grpc/commands/projections/delete.rb
+- lib/event_store_client/adapters/grpc/commands/projections/update.rb
+- lib/event_store_client/adapters/grpc/commands/streams/append.rb
+- lib/event_store_client/adapters/grpc/commands/streams/delete.rb
+- 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/tombstone.rb
+- lib/event_store_client/adapters/grpc/connection.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/gossip_pb.rb
+- lib/event_store_client/adapters/grpc/generated/gossip_services_pb.rb
+- lib/event_store_client/adapters/grpc/generated/operations_pb.rb
+- lib/event_store_client/adapters/grpc/generated/operations_services_pb.rb
+- lib/event_store_client/adapters/grpc/generated/persistent_pb.rb
+- lib/event_store_client/adapters/grpc/generated/persistent_services_pb.rb
+- lib/event_store_client/adapters/grpc/generated/projections_pb.rb
+- lib/event_store_client/adapters/grpc/generated/projections_services_pb.rb
+- lib/event_store_client/adapters/grpc/generated/shared_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
+- lib/event_store_client/adapters/grpc/generated/users_services_pb.rb
+- lib/event_store_client/adapters/http.rb
+- lib/event_store_client/adapters/http/README.md
+- lib/event_store_client/adapters/http/client.rb
+- lib/event_store_client/adapters/http/commands/command.rb
+- lib/event_store_client/adapters/http/commands/persistent_subscriptions/ack.rb
+- 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/streams/append.rb
+- lib/event_store_client/adapters/http/commands/streams/delete.rb
+- lib/event_store_client/adapters/http/commands/streams/link_to.rb
+- lib/event_store_client/adapters/http/commands/streams/read.rb
+- lib/event_store_client/adapters/http/commands/streams/tombstone.rb
+- lib/event_store_client/adapters/http/connection.rb
+- 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/client.rb
 - lib/event_store_client/configuration.rb
@@ -131,14 +217,10 @@ files:
 - lib/event_store_client/mapper/default.rb
 - lib/event_store_client/mapper/encrypted.rb
 - lib/event_store_client/serializer/json.rb
-- lib/event_store_client/store_adapter.rb
-- lib/event_store_client/store_adapter/api/client.rb
-- lib/event_store_client/store_adapter/api/connection.rb
-- lib/event_store_client/store_adapter/api/request_method.rb
-- lib/event_store_client/store_adapter/in_memory.rb
 - lib/event_store_client/subscription.rb
 - lib/event_store_client/subscriptions.rb
 - lib/event_store_client/types.rb
+- lib/event_store_client/value_objects/read_direction.rb
 - lib/event_store_client/version.rb
 homepage: https://github.com/yousty/event_store_client
 licenses: