amqp-client 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83f84f34aa2aacb3719e300483d4a874bc54892e12165b74f895a7503fd3c550
-  data.tar.gz: b53ba2a5bdbb1620f839f2cca8d66c1ee3db13549360b04e51d018208c1f7b49
+  metadata.gz: 30006ba97b26d7e73cf9503841e2248744db3d9e86d1a32fe4c9abecd9ee69f7
+  data.tar.gz: a59d667d971da49c2657e57efe385853adbef958fd191a01f0d1f4dbaaa1b8a8
 SHA512:
-  metadata.gz: 62aa1fddfbc285ab34e52b3f0421c2a017e157a1e4e6d7c887da78f55c56bb4717a4466bf0ad1ee08a03b485dd55910d38a1b6809d35e373eda1eb248e4cdd33
-  data.tar.gz: e60e191045e97a268faceb9e3a8112458aa920307e0bf29cdf0d24194c10b0c4254794ab335995019c7b3b41a2fafc383aaee1736584cd618684f6044d760f15
+  metadata.gz: 7ddb8f409abf9e773a6551ff53629b702e8324ea7ff794f6b14f09ef9dd7cb27a752e853bb312a8d9da88b826a7714e84006d5bb01b5efeef7bbaed56f14323a
+  data.tar.gz: 642e332c0a031d27d7f364b66e0ae5beefef4bad402336f24052eef2679e306eec219369d7b8b2c1d8324eabafd0c40d45aa8feb474c3cd11ddc4578203f5bea

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.3.0] - 2021-08-20
+
+- Channel#wait_for_confirms is a smarter way of waiting for publish confirms
+- Default connection_name to $PROGRAM_NAME
 
 ## [0.2.3] - 2021-08-19
 

data/lib/amqp/client/channel.rb

@@ -6,15 +6,16 @@ module AMQP
   # AMQP Channel
   class Channel
     def initialize(connection, id)
-      @replies = ::Queue.new
       @connection = connection
       @id = id
+      @replies = ::Queue.new
       @consumers = {}
-      @confirm = nil
-      @last_confirmed = 0
       @closed = nil
-      @on_return = nil
       @open = false
+      @on_return = nil
+      @confirm = nil
+      @unconfirmed = ::Queue.new
+      @unconfirmed_empty = ::Queue.new
     end
 
     attr_reader :id, :consumers
@@ -124,15 +125,17 @@ module AMQP
     def basic_publish(body, exchange, routing_key, **properties)
       frame_max = @connection.frame_max - 8
       id = @id
+      mandatory = properties.delete(:mandatory) || false
 
       if 0 < body.bytesize && body.bytesize <= frame_max
-        write_bytes FrameBytes.basic_publish(id, exchange, routing_key, properties.delete(:mandatory) || false),
+        write_bytes FrameBytes.basic_publish(id, exchange, routing_key, mandatory),
                     FrameBytes.header(id, body.bytesize, properties),
                     FrameBytes.body(id, body)
-        return @confirm ? @confirm += 1 : nil
+        @unconfirmed.push @confirm += 1 if @confirm
+        return
       end
 
-      write_bytes FrameBytes.basic_publish(id, exchange, routing_key, properties.delete(:mandatory) || false),
+      write_bytes FrameBytes.basic_publish(id, exchange, routing_key, mandatory),
                   FrameBytes.header(id, body.bytesize, properties)
       pos = 0
       while pos < body.bytesize # split body into multiple frame_max frames
@@ -141,13 +144,14 @@ module AMQP
         write_bytes FrameBytes.body(id, body_part)
         pos += len
       end
-      @confirm += 1 if @confirm
+      @unconfirmed.push @confirm += 1 if @confirm
+      nil
     end
 
     def basic_publish_confirm(body, exchange, routing_key, **properties)
       confirm_select(no_wait: true)
-      id = basic_publish(body, exchange, routing_key, **properties)
-      wait_for_confirm(id)
+      basic_publish(body, exchange, routing_key, **properties)
+      wait_for_confirms
     end
 
     # Consume from a queue
@@ -211,20 +215,32 @@ module AMQP
 
       write_bytes FrameBytes.confirm_select(@id, no_wait)
       expect :confirm_select_ok unless no_wait
-      @confirms = ::Queue.new
       @confirm = 0
     end
 
-    def wait_for_confirm(id)
-      raise ArgumentError, "Confirm id has to a positive number" unless id&.positive?
-      return true if @last_confirmed >= id
+    # Block until all publishes messages are confirmed
+    def wait_for_confirms
+      return true if @unconfirmed.empty?
+
+      @unconfirmed_empty.pop
+    end
 
+    def confirm(args)
+      ack_or_nack, delivery_tag, multiple = *args
       loop do
-        ack, delivery_tag, multiple = @confirms.shift || break
-        @last_confirmed = delivery_tag
-        return ack if delivery_tag == id || (delivery_tag > id && multiple)
+        tag = @unconfirmed.pop(true)
+        break if tag == delivery_tag
+        next if multiple && tag < delivery_tag
+
+        @unconfirmed << tag # requeue
+      rescue ThreadError
+        break
+      end
+      return unless @unconfirmed.empty?
+
+      @unconfirmed_empty.num_waiting.times do
+        @unconfirmed_empty << ack_or_nack == :ack
       end
-      false
     end
 
     def tx_select
@@ -246,10 +262,6 @@ module AMQP
       @replies.push(args)
     end
 
-    def confirm(args)
-      @confirms.push(args)
-    end
-
     def message_returned(reply_code, reply_text, exchange, routing_key)
       Thread.new do
         body_size, properties = expect(:header)

data/lib/amqp/client/connection.rb

@@ -164,7 +164,8 @@ module AMQP
             channel = @channels.delete(channel_id)
             channel.closed!(reply_code, reply_text, classid, methodid)
           when 41 # channel#close-ok
-            @channels[channel_id].reply [:channel_close_ok]
+            channel = @channels.delete(channel_id)
+            channel.reply [:channel_close_ok]
           else raise AMQP::Client::UnsupportedMethodFrame, class_id, method_id
           end
         when 40 # exchange
@@ -263,10 +264,7 @@ module AMQP
             @channels[channel_id].reply [:basic_get_empty]
           when 80 # ack
             delivery_tag, multiple = buf.unpack("@11 Q> C")
-            @channels[channel_id].confirm [:ack, delivery_tag, multiple]
-          when 90 # reject
-            delivery_tag, requeue = buf.unpack("@11 Q> C")
-            @channels[channel_id].confirm [:reject, delivery_tag, requeue == 1]
+            @channels[channel_id].confirm [:ack, delivery_tag, multiple == 1]
           when 111 # recover-ok
             @channels[channel_id].reply [:basic_recover_ok]
           when 120 # nack
@@ -334,7 +332,8 @@ module AMQP
 
             case method_id
             when 10 # connection#start
-              properties = CLIENT_PROPERTIES.merge({ connection_name: options[:connection_name] })
+              conn_name = options[:connection_name] || $PROGRAM_NAME
+              properties = CLIENT_PROPERTIES.merge({ connection_name: conn_name })
               socket.write FrameBytes.connection_start_ok "\u0000#{user}\u0000#{password}", properties
             when 30 # connection#tune
               channel_max, frame_max, heartbeat = buf.unpack("@11 S> L> S>")

data/lib/amqp/client/properties.rb

@@ -69,7 +69,8 @@ module AMQP
       end
 
       if expiration
-        expiration.is_a?(String) || raise(ArgumentError, "expiration must be a string")
+        expiration = expiration.to_s if expiration.is_a?(Integer)
+        expiration.is_a?(String) || raise(ArgumentError, "expiration must be a string or integer")
 
         flags |= (1 << 8)
         arr << expiration.bytesize << expiration

data/lib/amqp/client/version.rb

@@ -2,6 +2,6 @@
 
 module AMQP
   class Client
-    VERSION = "0.2.3"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amqp-client
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies: []
 description: Work in progress
 email: