amqp-client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 337f82d8ebaf862fd8fd1acd17f9b71be2aaee6de02f0c7c59786b222d5c5c0c
-  data.tar.gz: 040adffbda90616864a845517a1904efa5c1dbb25e30e63febe3f34b3cf4f752
+  metadata.gz: 30006ba97b26d7e73cf9503841e2248744db3d9e86d1a32fe4c9abecd9ee69f7
+  data.tar.gz: a59d667d971da49c2657e57efe385853adbef958fd191a01f0d1f4dbaaa1b8a8
 SHA512:
-  metadata.gz: 5700b885356d0c36060ffb4a9ad819bc26672a3d89fef6283cb5c4789ae3ddeafeaa57917f3001947fbdc38954eabfb138b8a98ed4a187a66912e5fb47bb3200
-  data.tar.gz: 034c2aa88d93bf45063d41b87e92cb20545deadf7c98930a7b6626e448a84036d234274c8c1066a85e6fd35a1274dfb392128a037f6fac7a330aee0af9907a74
+  metadata.gz: 7ddb8f409abf9e773a6551ff53629b702e8324ea7ff794f6b14f09ef9dd7cb27a752e853bb312a8d9da88b826a7714e84006d5bb01b5efeef7bbaed56f14323a
+  data.tar.gz: 642e332c0a031d27d7f364b66e0ae5beefef4bad402336f24052eef2679e306eec219369d7b8b2c1d8324eabafd0c40d45aa8feb474c3cd11ddc4578203f5bea

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## [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
+
+- Improved TLS/AMQPS support
+
+## [0.2.2] - 2021-08-19
+
+- TLS port issue fixed
+
+## [0.2.1] - 2021-08-19
+
+- More arguments to be passed to AMQP::Client::Queue
+- Can require with 'amqp-client'
 
 ## [0.2.0] - 2021-08-19
 

data/lib/amqp-client.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "amqp/client"

data/lib/amqp/client.rb

@@ -123,8 +123,8 @@ module AMQP
         self
       end
 
-      def subscribe(prefetch: 1, arguments: {}, &blk)
-        @client.subscribe(@name, prefetch: prefetch, arguments: arguments, &blk)
+      def subscribe(no_ack: false, prefetch: 1, worker_threads: 1, arguments: {}, &blk)
+        @client.subscribe(@name, no_ack: no_ack, prefetch: prefetch, worker_threads: worker_threads, arguments: arguments, &blk)
         self
       end
 

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

@@ -15,7 +15,7 @@ module AMQP
 
       uri = URI.parse(uri)
       tls = uri.scheme == "amqps"
-      port = port_from_env || uri.port || (@tls ? 5671 : 5672)
+      port = port_from_env || uri.port || (tls ? 5671 : 5672)
       host = uri.host || "localhost"
       user = uri.user || "guest"
       password = uri.password || "guest"
@@ -25,10 +25,15 @@ module AMQP
       socket = Socket.tcp host, port, connect_timeout: 20, resolv_timeout: 5
       enable_tcp_keepalive(socket)
       if tls
+        cert_store = OpenSSL::X509::Store.new
+        cert_store.set_default_paths
         context = OpenSSL::SSL::SSLContext.new
+        context.cert_store = cert_store
         context.verify_mode = OpenSSL::SSL::VERIFY_PEER unless [false, "false", "none"].include? options[:verify_peer]
         socket = OpenSSL::SSL::SSLSocket.new(socket, context)
         socket.sync_close = true # closing the TLS socket also closes the TCP socket
+        socket.hostname = host # SNI host
+        socket.connect
       end
       channel_max, frame_max, heartbeat = establish(socket, user, password, vhost, **options)
       Connection.new(socket, channel_max, frame_max, heartbeat, read_loop_thread: read_loop_thread)
@@ -159,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
@@ -258,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
@@ -329,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.0"
+    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.0
+  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:
@@ -29,6 +29,7 @@ files:
 - amqp-client.gemspec
 - bin/console
 - bin/setup
+- lib/amqp-client.rb
 - lib/amqp/client.rb
 - lib/amqp/client/channel.rb
 - lib/amqp/client/connection.rb