message_bus_client_worker 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e11858a4762c2a446881b531dc10c0f5d74490a01b61697a3fe9100bf399553
-  data.tar.gz: 364a0bbdcc1f7a3906ac4a3d2343ab16b7c518afe8fde6a408b6b0b4651f2f73
+  metadata.gz: 179ba68462fe0138eee3e10ca73e946a13c33f0a581357f40176b9cedd356202
+  data.tar.gz: f1013d26918dd42bbfb8fa54bbefe681f7dc581f1038ba315b5880e6baf71303
 SHA512:
-  metadata.gz: 511394ec3c064c50e616625b2ba1baf0b7b05bf047eb75b66110ef9e5132ebb398bffa0cf7f34a308965dca583cd8e2e9bc0fc78db99a8a7df94801337b3928f
-  data.tar.gz: 65c0a9f3eec5b469fec84450fac71db37d011d261b06ba934bb1ddcc8013579a485d6f5bb801eae6ed43889fb91035117e3813999d16e8186af95f95ffed67a0
+  metadata.gz: d1cad80bb3cea5a2561812c64df1bbcece2bdf5c972db229cfe3972f4ec0d5fefb623b61d11d6693fd0706c1d3be8513d4b766627b65eec7c03d3d4af23d7598
+  data.tar.gz: 227baabfa7186ebc2297ae5597e251735369f69feec6562e9967d984f0187c4c72f7cae48a485c261f6ff7c7d787691fe8696245e858dc11bd72aeb4cd49b077

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.2.1] - 2019-06-11
+### Fixed
+- conflicting last id when differentiating with headers
+
 ## [1.2.0] - 2018-02-24
 ### Added
 - Add ability to customise client_id

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    message_bus_client_worker (1.2.0)
+    message_bus_client_worker (1.2.1)
       activesupport
       addressable
       excon
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -24,12 +24,11 @@ GEM
     concurrent-ruby (1.0.5)
     connection_pool (2.2.2)
     diff-lcs (1.3)
-    excon (0.62.0)
+    excon (0.64.0)
     gem_config (0.3.1)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    light-service (0.11.0)
-      activesupport (>= 3.0)
+    light-service (0.12.0)
     method_source (0.9.0)
     minitest (5.11.3)
     pry (0.11.3)
@@ -38,7 +37,7 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    public_suffix (3.0.3)
+    public_suffix (3.1.0)
     rack (2.0.6)
     rack-protection (2.0.3)
       rack

data/README.md

@@ -7,6 +7,8 @@ Subscribe to [MessageBus](https://github.com/SamSaffron/message_bus) using Sidek
 - do not unnecessarily add noise when starting the console like `rails console`
 - recover from downtime by keeping track of the last message it processed per channel
 
+This gem does **not** promise that the message are processed only once. You must put safeguards in place if it is imperative that messages are not processed more than once.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/message_bus_client_worker.rb

@@ -1,4 +1,5 @@
 require "addressable"
+require "digest"
 require "excon"
 require "gem_config"
 require "light-service"

data/lib/message_bus_client_worker/services/polling/gen_last_id_key.rb

@@ -2,8 +2,13 @@ module MessageBusClientWorker
   module Polling
     class GenLastIdKey
 
-      def self.call(host, channel)
-        [host, channel].join("-")
+      def self.call(host:, channel:, headers: {})
+        key_parts = [host, channel]
+        (headers || {}).each do |key, value|
+          key_parts << [key, value].join("_")
+        end
+
+        Digest::SHA256.hexdigest(key_parts.join("-"))
       end
 
     end

data/lib/message_bus_client_worker/services/polling/generate_params.rb

@@ -3,7 +3,7 @@ module MessageBusClientWorker
     class GenerateParams
       extend LightService::Action
 
-      expects :host, :subscriptions
+      expects :host, :subscriptions, :headers
       promises :params, :form_params
 
       DEFAULT_MESSAGE_ID = "-1".freeze
@@ -13,8 +13,16 @@ module MessageBusClientWorker
 
         c.params = { dlp: 't' }
         c.form_params = channels.each_with_object({}) do |sub, hash|
+          channel = sub[0]
           custom_message_id = sub[1][:message_id] ? sub[1][:message_id].to_s : nil
-          hash[sub[0]] = GetLastId.(c.host, sub[0]) ||
+
+          last_id_in_memory = GetLastId.(
+            host: c.host,
+            channel: channel,
+            headers: c.headers,
+          )
+
+          hash[channel] = last_id_in_memory ||
             custom_message_id ||
             DEFAULT_MESSAGE_ID
         end

data/lib/message_bus_client_worker/services/polling/get_last_id.rb

@@ -2,8 +2,8 @@ module MessageBusClientWorker
   module Polling
     class GetLastId
 
-      def self.call(host, channel)
-        hash_key = GenLastIdKey.(host, channel)
+      def self.call(host:, channel:, headers: {})
+        hash_key = GenLastIdKey.(host: host, channel: channel, headers: headers)
         Sidekiq.redis { |r| r.hget(SetLastId::CHANNEL_INDICES_NAME, hash_key) }
       end
 

data/lib/message_bus_client_worker/services/polling/process_payload.rb

@@ -21,7 +21,12 @@ module MessageBusClientWorker
         next c if channel_config.nil?
 
         processor_class = Kernel.const_get(channel_config[:processor])
-        SetLastId.(c.host, channel, payload["message_id"])
+        SetLastId.(
+          host: c.host,
+          channel: channel,
+          message_id: payload["message_id"],
+          headers: c.headers,
+        )
 
         data = payload["data"]
 

data/lib/message_bus_client_worker/services/polling/set_last_id.rb

@@ -3,8 +3,8 @@ module MessageBusClientWorker
     class SetLastId
 
       CHANNEL_INDICES_NAME = "message_bus_client_worker_channel_indices".freeze
-      def self.call(host, channel, message_id)
-        hash_key = GenLastIdKey.(host, channel)
+      def self.call(host:, channel:, message_id:, headers:)
+        hash_key = GenLastIdKey.(host: host, channel: channel, headers: headers)
 
         id = Sidekiq.redis do |r|
           r.hset(CHANNEL_INDICES_NAME, hash_key, message_id)

data/lib/message_bus_client_worker/version.rb

@@ -1,3 +1,3 @@
 module MessageBusClientWorker
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus_client_worker
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Subscribe to MessageBus using Sidekiq workers