bmx-event_hook_client_server 1.0.14 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f94818f045fc39ccfa040260d12e48ec2c9e6a62
-  data.tar.gz: 4b8eab2970ef138fa742a2f3be228a3fe4320c72
+SHA256:
+  metadata.gz: 63a2c9b7d294adc003637890075284e79795cf9622ece24e9d2016680a3c9e73
+  data.tar.gz: 313d800a4cfc2030511b1c1209d73bc7578844f943133f56c496560f18584279
 SHA512:
-  metadata.gz: a72784c0984e1e06c35fa49fb6d6e42b69d2ca092e357bda760564981165ec59232ed579ab436d317b7b4f6a2a43ac554bf2988f215477c360f79cfac2d7b536
-  data.tar.gz: 4921ecc47b6eefbc10a4120f17e3573d2d3f98f021b5dbc49c92add14484bf9b8b357de90c39c1ee6d320ac080772426619c21faaef12951be1f656a183bba97
+  metadata.gz: e12ace1b7f12d12482ae2201c558d9c02897f02f797dfb9442df58c7e1f176c057ebbb87a02126b726ac98648e8c8af73d9ac08ddf598f171c9c1e5a19d74237
+  data.tar.gz: 7c83b0702aec04828459c4a8fc3dd67f9757a0ca1979484cd98c8042b59870ae3ededd808ae065a6fd4b112321b4d39057574ac799d91fc5b76ef9ceb26c6f66

data/Gemfile.lock

@@ -1,50 +1,48 @@
 PATH
   remote: .
   specs:
-    bmx-event_hook_client_server (1.0.13)
+    bmx-event_hook_client_server (1.1.1)
       dry-struct (~> 1.0)
-      google-protobuf (~> 3.11.4)
-      grpc (~> 1.27.0)
+      google-protobuf (~> 3.14)
+      grpc (~> 1.34)
       retriable (~> 3.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
-    dry-configurable (0.11.2)
+    dry-configurable (0.12.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+    dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-logic (1.0.6)
+    dry-logic (1.1.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5)
     dry-struct (1.3.0)
       dry-core (~> 0.4, >= 0.4.4)
       dry-equalizer (~> 0.3)
       dry-types (~> 1.3)
       ice_nine (~> 0.11)
-    dry-types (1.3.1)
+    dry-types (1.4.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
       dry-equalizer (~> 0.3)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    google-protobuf (3.11.4)
-    googleapis-common-protos-types (1.0.4)
-      google-protobuf (~> 3.0)
-    grpc (1.27.0)
+    google-protobuf (3.14.0)
+    googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
+    grpc (1.34.0)
+      google-protobuf (~> 3.13)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.27.0)
     ice_nine (0.11.2)

data/event_hook_client_server.gemspec

@@ -57,9 +57,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dry-struct', '~> 1.0'
-  spec.add_dependency 'google-protobuf', '~> 3.11.4'
-  spec.add_dependency 'grpc', '~> 1.27.0'
+  spec.add_dependency 'google-protobuf', '~> 3.14'
+  spec.add_dependency 'grpc', '~> 1.34'
   spec.add_dependency 'retriable', '~> 3.1.2'
+  # spec.add_dependency 'zeitwerk'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/event_hook_client_server/client.rb

@@ -40,10 +40,14 @@ module EventHookClientServer
         'grpc.http2.max_ping_strikes': 0,
         'grpc.http2.min_time_between_pings_ms': 75 * 100,
         'grpc.http2.min_ping_interval_without_data_ms': 75 * 100
-      }
+      },
+      interceptors: []
     }.freeze
     private_constant :DEFAULT_CONFIG
 
+    NON_STUB_OPTIONS = %i[host channel_mode].freeze
+    private_constant :NON_STUB_OPTIONS
+
     RETRIABLE_ERRORS = [
       GRPC::DeadlineExceeded, GRPC::Unavailable, GRPC::ResourceExhausted,
       GRPC::Unknown
@@ -58,7 +62,11 @@ module EventHookClientServer
     end
 
     def self.default_config
-      @default_config ||= DEFAULT_CONFIG.dup
+      @default_config ||= DEFAULT_CONFIG.dup.tap do |config|
+        if defined?(ElasticAPM::GRPC::ClientInterceptor)
+          config[:interceptors] << ElasticAPM::GRPC::ClientInterceptor.new
+        end
+      end
     end
 
     attr_reader :hosts
@@ -91,11 +99,12 @@ module EventHookClientServer
     end
 
     def recreate_grpc_client!
+      grpc_options = options.reject { |k, _| NON_STUB_OPTIONS.include?(k) }
+
       @grpc_client = GRPC_CLIENT_CLASS.new(
         hosts.next,
         options[:channel_mode],
-        timeout: options[:timeout],
-        channel_args: options[:channel_args]
+        grpc_options
       )
     end
 
@@ -211,7 +220,7 @@ module EventHookClientServer
 
     def retry_on_failure(&block)
       Retriable
-        .retriable(on: RETRIABLE_ERRORS, on_retry: method(:rotate_host!)) do
+        .retriable(on: RETRIABLE_ERRORS, on_retry: proc { rotate_host! }) do
           block.call
         end
     end

data/lib/event_hook_client_server/client/models/integration.rb

@@ -17,6 +17,7 @@ module EventHookClientServer
       attribute :building_id, Types::Strict::String.optional
       attribute :tenant_id, Types::Strict::String.optional
       attribute :company_id, Types::Strict::String.optional
+      attribute :unit_id, Types::Strict::String.optional
       attribute :integrator, Types::Strict::Symbol
       attribute :config, Types::Strict::Hash
       attribute :bindings, Types::Array.of(Binding)

data/lib/event_hook_client_server/protobuf/event_hook_client_server/v1/enums/integrator_pb.rb

@@ -8,6 +8,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     add_enum "event_hook_client_server.v1.enums.Integrator" do
       value :WEBHOOK, 0
       value :PDK, 9
+      value :AIRBNB, 1
     end
   end
 end

data/lib/event_hook_client_server/protobuf/event_hook_client_server/v1/messages/integration_pb.rb

@@ -18,6 +18,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :building_id, :message, 10, "google.protobuf.StringValue"
       optional :tenant_id, :message, 11, "google.protobuf.StringValue"
       optional :company_id, :message, 12, "google.protobuf.StringValue"
+      optional :unit_id, :message, 13, "google.protobuf.StringValue"
     end
     add_message "event_hook_client_server.v1.messages.IntegrationConfiguration" do
       optional :type, :enum, 1, "event_hook_client_server.v1.enums.Integrator"
@@ -34,6 +35,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :building_id, :message, 10, "google.protobuf.StringValue"
       optional :tenant_id, :message, 11, "google.protobuf.StringValue"
       optional :company_id, :message, 12, "google.protobuf.StringValue"
+      optional :unit_id, :message, 13, "google.protobuf.StringValue"
     end
     add_message "event_hook_client_server.v1.messages.IntegrationInputConfiguration" do
       optional :type, :enum, 1, "event_hook_client_server.v1.enums.Integrator"
@@ -80,6 +82,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :building_id, :message, 10, "google.protobuf.StringValue"
       optional :tenant_id, :message, 11, "google.protobuf.StringValue"
       optional :company_id, :message, 12, "google.protobuf.StringValue"
+      optional :unit_id, :message, 13, "google.protobuf.StringValue"
     end
   end
 end

data/lib/event_hook_client_server/server.rb

@@ -28,12 +28,17 @@ module EventHookClientServer
         'grpc.http2.max_ping_strikes': 0,
         'grpc.http2.min_time_between_pings_ms': 75 * 100,
         'grpc.http2.min_ping_interval_without_data_ms': 75 * 100
-      }
+      },
+      interceptors: []
     }.freeze
     private_constant :DEFAULT_CONFIG
 
     def self.default_config
-      @default_config ||= DEFAULT_CONFIG.dup
+      @default_config ||= DEFAULT_CONFIG.dup.tap do |config|
+        if defined?(ElasticAPM::GRPC::ClientInterceptor)
+          config[:interceptors] << ElasticAPM::GRPC::ClientInterceptor.new
+        end
+      end
     end
 
     attr_writer :logger
@@ -71,6 +76,8 @@ module EventHookClientServer
     # Defines SHOW, INDEX, CREATE, UPDATE and DELETE methods
     generic_rpc :integration
 
+    attr_accessor :find_integration_from_headers_handler
+
     def find_integration_from_headers(input, request)
       process_request(__method__, input, request)
     end

data/lib/event_hook_client_server/version.rb

@@ -2,7 +2,7 @@
 
 module EventHookClientServer
   MAJOR = 1
-  MINOR = 0
-  PATCH = 14
+  MINOR = 1
+  PATCH = 1
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmx-event_hook_client_server
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.1
 platform: ruby
 authors:
 - Stanko K.R.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.4
+        version: '3.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.4
+        version: '3.14'
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: '1.34'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: '1.34'
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
@@ -165,8 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Client and server implementation for the Webhook Configurator service.