hanami-events-cloud_pubsub 3.1.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1f785cf3b473394906aadc0906661072aaa1e5721b1a24401fc3333df270e14
-  data.tar.gz: cc270e1411137b1b5bedfbb0b110d8d7dacbdf8f1d217e13b4ae30f9a17f4fa5
+  metadata.gz: de5b89251e969ff280f708bfe2453b6f182b3bca5e50bfd98b9e8be372123562
+  data.tar.gz: d71ccf32872fae21acb045a8786b7935f051f92a25ff47ad6ff1340a0c88d44a
 SHA512:
-  metadata.gz: 178c1973c428c9bbbdb354526f42304d31a38158c6f4816c502c1772d04b3c99c4f60f9121c771c4307d8aeeaaf0f0e79ae5d6ad81c2feb7b9fe1df2c8b00f8e
-  data.tar.gz: 0d17cd8d26d82f4803d501ac876accaa43d4226a22308dbf99752e5cd7ccff66777cba192f3daba79a43360a21289390c2da34379bf09fa4e55f652ce6b64da3
+  metadata.gz: 7740508a3898f859a59fbb39377bb2d6977ec06f48cf2671d177aa647c355945b50209a3b0b3c6815d1222424df7d998a83bb9402b0918118636c8fe053776fb
+  data.tar.gz: dd52a0e85056371712d695c6a2fd9650c49d5dfdaaff2c2afdf41cced04e61b2a12633eb2ee185eaa23dd15c40dcbfebef021ec92e14cdcdfa985de5951e7edd

data/lib/hanami/events/adapter/cloud_pubsub.rb

@@ -11,13 +11,12 @@ module Hanami
       #
       # @api private
       class CloudPubsub
-        attr_reader :subscribers, :listeners, :topic_registry, :middleware
+        attr_reader :listeners, :topic_registry, :middleware
 
         def initialize(params)
           @pubsub = params[:pubsub]
           @logger = params[:logger] || Logger.new($stdout)
           @listen = params[:listen] || false
-          @subscribers = Concurrent::Array.new
           @listeners = Concurrent::Array.new
           @serializer_type = params.fetch(:serializer, :json).to_sym
           @topic_registry = {}
@@ -54,17 +53,16 @@ module Hanami
         # @param id [String] A unique identifier for the subscriber
         # @param subscriber_opts [String] Additional options for the subscriber
         # @param block [Block] to execute when event is broadcasted
-        def subscribe(name, id:, **subscriber_opts, &block)
+        def subscribe(name, id:, auto_ack: true, **subscriber_opts, &block)
           event_name = namespaced(name)
           namespaced_id = namespaced(id)
 
           logger.debug("Subscribed listener \"#{id}\" for event \"#{event_name}\"")
 
           sub = Hanami::Events::CloudPubsub::Subscriber.new(event_name, block, logger)
-          @subscribers << sub
           topic = topic_for event_name
 
-          register_listener(event_name, topic, namespaced_id, subscriber_opts)
+          register_listener(event_name, topic, namespaced_id, auto_ack, subscriber_opts, sub)
         end
 
         def flush_messages
@@ -76,28 +74,31 @@ module Hanami
 
         attr_reader :logger
 
-        def register_listener(event_name, topic, subscriber_id, subscriber_opts)
+        # rubocop:disable Metrics/ParameterLists
+        def register_listener(event_name, topic, subscriber_id, auto_ack, subscriber_opts, sub)
           listener = ::Hanami::Events::CloudPubsub::Listener.new(
             subscriber_id: subscriber_id,
             event_name: event_name,
-            handler: method(:call_subscribers),
+            handler: call_subscriber(sub),
             logger: logger,
             topic: topic,
             subscriber_opts: subscriber_opts,
-            dead_letter_topic: dead_letter_topic
+            dead_letter_topic: dead_letter_topic,
+            auto_ack: auto_ack
           )
 
           @listeners << listener
           listener.register
         end
+        # rubocop:enable Metrics/ParameterLists
 
-        def call_subscribers(message)
-          data = message.data
-          payload = serializer.deserialize(data)
-          event_name = message.attributes['event_name']
+        def call_subscriber(sub)
+          proc do |message|
+            data = message.data
+            payload = serializer.deserialize(data)
+            event_name = message.attributes['event_name']
 
-          @subscribers.each do |subscriber|
-            subscriber.call(event_name, payload, message)
+            sub.call(event_name, payload, message)
           end
         end
 

data/lib/hanami/events/cloud_pubsub.rb

@@ -7,7 +7,6 @@ require 'hanami/events/cloud_pubsub/middleware/stack'
 require 'hanami/events/cloud_pubsub/middleware/logging'
 require 'hanami/events/cloud_pubsub/runner'
 require 'hanami/events/cloud_pubsub/errors'
-require 'google/cloud/pubsub'
 require 'dry-configurable'
 
 module Hanami
@@ -97,6 +96,7 @@ module Hanami
       end
 
       def self.finalize_settings!
+        require 'google/cloud/pubsub'
         conf_hash = config.pubsub
         conf_hash.each { |key, val| Google::Cloud::Pubsub.configure[key] = val }
       end

data/lib/hanami/events/cloud_pubsub/cli.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'hanami/cli'
-require 'hanami/events/cloud_pubsub'
-require 'hanami/events/cloud_pubsub/health_check_server'
 
 module Hanami
   module Events
@@ -55,6 +53,7 @@ module Hanami
             end
 
             def start_server
+              require 'hanami/events/cloud_pubsub/health_check_server'
               server = HealthCheckServer.new(runner, logger)
               on_shutdown = proc { @event_queue << proc { shutdown } }
               server.run_in_background(on_shutdown: on_shutdown)
@@ -77,6 +76,7 @@ module Hanami
             def start_runner
               logger.debug 'Running in emulator mode' if @emulator
               logger.info "Starting worker (pid: #{Process.pid})"
+              GC.compact if GC.respond_to?(:compact)
               runner.start
             end
 
@@ -86,13 +86,14 @@ module Hanami
             end
 
             def build_runner
+              require 'hanami/events/cloud_pubsub'
               Hanami::Components.resolve 'events'
               events = Hanami::Components['events']
               @runner = Runner.new(logger: logger, adapter: events.adapter)
             end
 
             def logger
-              CloudPubsub.logger
+              Hanami::Events::CloudPubsub.logger
             end
 
             def setup_signal_handlers

data/lib/hanami/events/cloud_pubsub/integration.rb

@@ -33,11 +33,10 @@ module Hanami
                   conf.cloud_pubsub.each { |blk| blk.call(config) }
                 end
 
-                ::Hanami::Events.initialize(
-                  :cloud_pubsub,
-                  pubsub: Google::Cloud::Pubsub.new,
-                  logger: Hanami::Components['logger']
-                )
+                require 'google/cloud/pubsub'
+
+                opts = { pubsub: Google::Cloud::Pubsub.new, logger: Hanami::Components['logger'] }
+                ::Hanami::Events.initialize(:cloud_pubsub, **opts)
               end
             end
           end

data/lib/hanami/events/cloud_pubsub/listener.rb

@@ -26,6 +26,7 @@ module Hanami
                        subscriber_id:,
                        subscriber_opts: {},
                        middleware: CloudPubsub.config.middleware,
+                       auto_ack: true,
                        dead_letter_topic: nil)
           @topic = topic
           @logger = logger
@@ -35,12 +36,13 @@ module Hanami
           @input_subscriber_opts = subscriber_opts
           @middleware = middleware
           @dead_letter_topic = dead_letter_topic
+          @auto_ack = auto_ack
         end
         # rubocop:enable Metrics/ParameterLists
 
         def register
           subscription = subscription_for(subscriber_id)
-          apply_retry_options(subscription)
+          apply_subscription_options(subscription)
           listener = subscription.listen(**subscriber_options) { |m| handle_message(m) }
           logger.debug("Registered listener for #{subscriber_id} with: #{subscriber_options}")
 
@@ -86,7 +88,7 @@ module Hanami
 
         def run_handler(message)
           middleware.invoke(message) { handler.call(message) }
-          message.ack!
+          message.ack! if @auto_ack
         rescue StandardError => e
           run_error_handlers(e, message.message_id.to_s)
           message.nack! if CloudPubsub.config.auto_retry.enabled
@@ -133,21 +135,38 @@ module Hanami
           }
         end
 
-        def apply_retry_options(sub)
-          retry_policy = build_retry_policy
+        def apply_subscription_options(sub)
+          apply_deadline_options(sub)
+          apply_retry_options(sub)
+          apply_dead_letter_options(sub)
+        rescue StandardError => e
+          run_error_handlers(e, nil)
+        end
+
+        def apply_deadline_options(sub)
+          sub.deadline = subscriber_options[:deadline] if sub.deadline != subscriber_options[:deadline]
+        rescue StandardError => e
+          run_error_handlers(e, nil)
+        end
+
+        def apply_dead_letter_options(sub)
           attempts = CloudPubsub.config.auto_retry.max_attempts
 
-          sub.retry_policy = retry_policy if sub.retry_policy&.to_grpc != retry_policy&.to_grpc
           sub.dead_letter_topic = dead_letter_topic if sub.dead_letter_topic&.name != dead_letter_topic&.name
           sub.dead_letter_max_delivery_attempts = attempts if sub.dead_letter_topic&.name != dead_letter_topic&.name
+        rescue StandardError => e
+          run_error_handlers(e, nil)
+        end
 
-          sub
+        def apply_retry_options(sub)
+          retry_policy = build_retry_policy
+          sub.retry_policy = retry_policy if sub.retry_policy&.to_grpc != retry_policy&.to_grpc
         rescue StandardError => e
           run_error_handlers(e, nil)
         end
 
         def build_retry_policy
-          return unless CloudPubsub.config.auto_retry.enabled
+          return unless Hanami::Events::CloudPubsub.config.auto_retry.enabled
 
           Google::Cloud::PubSub::RetryPolicy.new(
             minimum_backoff: CloudPubsub.config.auto_retry.minimum_backoff,

data/lib/hanami/events/cloud_pubsub/version.rb

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '3.1.2'
+      VERSION = '3.3.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable