amqp-client 1.0.2 → 1.1.3

data/lib/amqp/client/connection.rb

@@ -3,7 +3,7 @@
 require "socket"
 require "uri"
 require "openssl"
-require_relative "./frames"
+require_relative "./frame_bytes"
 require_relative "./channel"
 require_relative "./errors"
 
@@ -13,47 +13,32 @@ module AMQP
     class Connection
       # Establish a connection to an AMQP broker
       # @param uri [String] URL on the format amqp://username:password@hostname/vhost, use amqps:// for encrypted connection
-      # @param read_loop_thread [Boolean] Set to false if you manually want to run the {#read_loop}
+      # @param read_loop_thread [Boolean] If true run {#read_loop} in a background thread,
+      #   otherwise the user have to run it explicitly, without {#read_loop} the connection won't function
       # @option options [Boolean] connection_name (PROGRAM_NAME) Set a name for the connection to be able to identify
       #   the client from the broker
       # @option options [Boolean] verify_peer (true) Verify broker's TLS certificate, set to false for self-signed certs
+      # @option options [Integer] connect_timeout (30) TCP connection timeout
       # @option options [Integer] heartbeat (0) Heartbeat timeout, defaults to 0 and relies on TCP keepalive instead
       # @option options [Integer] frame_max (131_072) Maximum frame size,
       #    the smallest of the client's and the broker's values will be used
       # @option options [Integer] channel_max (2048) Maxium number of channels the client will be allowed to have open.
       #   Maxium allowed is 65_536.  The smallest of the client's and the broker's value will be used.
+      # @option options [String] keepalive (60:10:3) TCP keepalive setting, 60s idle, 10s interval between probes, 3 probes
       # @return [Connection]
-      def self.connect(uri, read_loop_thread: true, **options)
+      def initialize(uri = "", read_loop_thread: true, **options)
         uri = URI.parse(uri)
         tls = uri.scheme == "amqps"
         port = port_from_env || uri.port || (tls ? 5671 : 5672)
         host = uri.host || "localhost"
         user = uri.user || "guest"
         password = uri.password || "guest"
-        vhost = URI.decode_www_form_component(uri.path[1..-1] || "/")
+        vhost = URI.decode_www_form_component(uri.path[1..] || "/")
         options = URI.decode_www_form(uri.query || "").map! { |k, v| [k.to_sym, v] }.to_h.merge(options)
 
-        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
-          socket.post_connection_check(host) || raise(Error, "TLS certificate hostname doesn't match requested")
-        end
+        socket = open_socket(host, port, tls, options)
         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)
-      end
 
-      # Requires an already established TCP/TLS socket
-      # @api private
-      def initialize(socket, channel_max, frame_max, heartbeat, read_loop_thread: true)
         @socket = socket
         @channel_max = channel_max.zero? ? 65_536 : channel_max
         @frame_max = frame_max
@@ -66,6 +51,13 @@ module AMQP
         Thread.new { read_loop } if read_loop_thread
       end
 
+      # Alias for {#initialize}
+      # @see #initialize
+      # @deprecated
+      def self.connect(uri, read_loop_thread: true, **options)
+        new(uri, read_loop_thread: read_loop_thread, **options)
+      end
+
       # The max frame size negotiated between the client and the broker
       # @return [Integer]
       attr_reader :frame_max
@@ -142,9 +134,13 @@ module AMQP
         warn "AMQP-Client blocked by broker: #{blocked}" if blocked
         @write_lock.synchronize do
           warn "AMQP-Client unblocked by broker" if blocked
-          @socket.write(*bytes)
+          if RUBY_ENGINE == "truffleruby"
+            bytes.each { |b| @socket.write b }
+          else
+            @socket.write(*bytes)
+          end
         end
-      rescue IOError, OpenSSL::OpenSSLError, SystemCallError => e
+      rescue *READ_EXCEPTIONS => e
         raise Error::ConnectionClosed.new(*@closed) if @closed
 
         raise Error, "Could not write to socket, #{e.message}"
@@ -161,12 +157,12 @@ module AMQP
         frame_start = String.new(capacity: 7)
         frame_buffer = String.new(capacity: frame_max)
         loop do
-          socket.read(7, frame_start)
+          socket.read(7, frame_start) || raise(IOError)
           type, channel_id, frame_size = frame_start.unpack("C S> L>")
           frame_max >= frame_size || raise(Error, "Frame size #{frame_size} larger than negotiated max frame size #{frame_max}")
 
           # read the frame content
-          socket.read(frame_size, frame_buffer)
+          socket.read(frame_size, frame_buffer) || raise(IOError)
 
           # make sure that the frame end is correct
           frame_end = socket.readchar.ord
@@ -176,21 +172,26 @@ module AMQP
           parse_frame(type, channel_id, frame_buffer) || return
         end
         nil
-      rescue IOError, OpenSSL::OpenSSLError, SystemCallError => e
+      rescue *READ_EXCEPTIONS => e
         @closed ||= [400, "read error: #{e.message}"]
         nil # ignore read errors
       ensure
         @closed ||= [400, "unknown"]
         @replies.close
         begin
-          @socket.close
-        rescue IOError, OpenSSL::OpenSSLError, SystemCallError
+          @write_lock.synchronize do
+            @socket.close
+          end
+        rescue *READ_EXCEPTIONS
           nil
         end
       end
 
       private
 
+      READ_EXCEPTIONS = [IOError, OpenSSL::OpenSSLError, SystemCallError,
+                         RUBY_ENGINE == "jruby" ? java.lang.NullPointerException : nil].compact.freeze
+
       def parse_frame(type, channel_id, buf)
         case type
         when 1 # method frame
@@ -216,7 +217,7 @@ module AMQP
               @replies.push [:close_ok]
               return false
             when 60 # connection#blocked
-              reason_len = buf.unpack1("@4 C")
+              reason_len = buf.getbyte(4)
               reason = buf.byteslice(5, reason_len).force_encoding("utf-8")
               @blocked = reason
               @write_lock.lock
@@ -256,7 +257,7 @@ module AMQP
           when 50 # queue
             case method_id
             when 11 # declare-ok
-              queue_name_len = buf.unpack1("@4 C")
+              queue_name_len = buf.getbyte(4)
               queue_name = buf.byteslice(5, queue_name_len).force_encoding("utf-8")
               message_count, consumer_count = buf.byteslice(5 + queue_name_len, 8).unpack("L> L>")
               @channels[channel_id].reply [:queue_declare_ok, queue_name, message_count, consumer_count]
@@ -276,17 +277,17 @@ module AMQP
             when 11 # qos-ok
               @channels[channel_id].reply [:basic_qos_ok]
             when 21 # consume-ok
-              tag_len = buf.unpack1("@4 C")
+              tag_len = buf.getbyte(4)
               tag = buf.byteslice(5, tag_len).force_encoding("utf-8")
               @channels[channel_id].reply [:basic_consume_ok, tag]
             when 30 # cancel
-              tag_len = buf.unpack1("@4 C")
+              tag_len = buf.getbyte(4)
               tag = buf.byteslice(5, tag_len).force_encoding("utf-8")
-              no_wait = buf[5 + tag_len].ord == 1
+              no_wait = buf.getbyte(5 + tag_len) == 1
               @channels[channel_id].close_consumer(tag)
               write_bytes FrameBytes.basic_cancel_ok(@id, tag) unless no_wait
             when 31 # cancel-ok
-              tag_len = buf.unpack1("@4 C")
+              tag_len = buf.getbyte(4)
               tag = buf.byteslice(5, tag_len).force_encoding("utf-8")
               @channels[channel_id].reply [:basic_cancel_ok, tag]
             when 50 # return
@@ -294,23 +295,23 @@ module AMQP
               pos = 7
               reply_text = buf.byteslice(pos, reply_text_len).force_encoding("utf-8")
               pos += reply_text_len
-              exchange_len = buf[pos].ord
+              exchange_len = buf.getbyte(pos)
               pos += 1
               exchange = buf.byteslice(pos, exchange_len).force_encoding("utf-8")
               pos += exchange_len
-              routing_key_len = buf[pos].ord
+              routing_key_len = buf.getbyte(pos)
               pos += 1
               routing_key = buf.byteslice(pos, routing_key_len).force_encoding("utf-8")
               @channels[channel_id].message_returned(reply_code, reply_text, exchange, routing_key)
             when 60 # deliver
-              ctag_len = buf[4].ord
+              ctag_len = buf.getbyte(4)
               consumer_tag = buf.byteslice(5, ctag_len).force_encoding("utf-8")
               pos = 5 + ctag_len
               delivery_tag, redelivered, exchange_len = buf.byteslice(pos, 10).unpack("Q> C C")
               pos += 8 + 1 + 1
               exchange = buf.byteslice(pos, exchange_len).force_encoding("utf-8")
               pos += exchange_len
-              rk_len = buf[pos].ord
+              rk_len = buf.getbyte(pos)
               pos += 1
               routing_key = buf.byteslice(pos, rk_len).force_encoding("utf-8")
               @channels[channel_id].message_delivered(consumer_tag, delivery_tag, redelivered == 1, exchange, routing_key)
@@ -319,11 +320,11 @@ module AMQP
               pos = 14
               exchange = buf.byteslice(pos, exchange_len).force_encoding("utf-8")
               pos += exchange_len
-              routing_key_len = buf[pos].ord
+              routing_key_len = buf.getbyte(pos)
               pos += 1
               routing_key = buf.byteslice(pos, routing_key_len).force_encoding("utf-8")
-              pos += routing_key_len
-              _message_count = buf.byteslice(pos, 4).unpack1("L>")
+              # pos += routing_key_len
+              # message_count = buf.byteslice(pos, 4).unpack1("L>")
               @channels[channel_id].message_delivered(nil, delivery_tag, redelivered == 1, exchange, routing_key)
             when 72 # get-empty
               @channels[channel_id].basic_get_empty
@@ -357,7 +358,7 @@ module AMQP
           end
         when 2 # header
           body_size = buf.unpack1("@4 Q>")
-          properties = Properties.decode(buf.byteslice(12, buf.bytesize - 12))
+          properties = Properties.decode(buf, 12)
           @channels[channel_id].header_delivered body_size, properties
         when 3 # body
           @channels[channel_id].body_delivered buf
@@ -377,21 +378,47 @@ module AMQP
         args
       end
 
+      # Connect to the host/port, optionally establish a TLS connection
+      # @return [Socket]
+      # @return [OpenSSL::SSL::SSLSocket]
+      def open_socket(host, port, tls, options)
+        connect_timeout = options.fetch(:connect_timeout, 30).to_i
+        socket = Socket.tcp host, port, connect_timeout: connect_timeout
+        keepalive = options.fetch(:keepalive, "").split(":", 3).map!(&:to_i)
+        enable_tcp_keepalive(socket, *keepalive)
+        if tls
+          cert_store = OpenSSL::X509::Store.new
+          cert_store.set_default_paths
+          context = OpenSSL::SSL::SSLContext.new
+          context.cert_store = cert_store
+          verify_peer = [false, "false", "none"].include? options[:verify_peer]
+          context.verify_mode = OpenSSL::SSL::VERIFY_PEER unless 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
+          socket.post_connection_check(host) || raise(Error, "TLS certificate hostname doesn't match requested")
+        end
+        socket
+      rescue SystemCallError, OpenSSL::OpenSSLError => e
+        raise Error, "Could not open a socket: #{e.message}"
+      end
+
       # Negotiate a connection
       # @return [Array<Integer, Integer, Integer>] channel_max, frame_max, heartbeat
-      def self.establish(socket, user, password, vhost, options)
+      def establish(socket, user, password, vhost, options)
         channel_max, frame_max, heartbeat = nil
         socket.write "AMQP\x00\x00\x09\x01"
         buf = String.new(capacity: 4096)
         loop do
           begin
             socket.readpartial(4096, buf)
-          rescue IOError, OpenSSL::OpenSSLError, SystemCallError => e
+          rescue *READ_EXCEPTIONS => e
             raise Error, "Could not establish AMQP connection: #{e.message}"
           end
 
           type, channel_id, frame_size = buf.unpack("C S> L>")
-          frame_end = buf[frame_size + 7].ord
+          frame_end = buf.getbyte(frame_size + 7)
           raise UnexpectedFrameEndError, frame_end if frame_end != 206
 
           case type
@@ -428,32 +455,42 @@ module AMQP
           else raise Error, "Unexpected frame type: #{type}"
           end
         end
-      rescue StandardError => e
+      rescue Exception => e
         begin
           socket.close
-        rescue IOError, OpenSSL::OpenSSLError, SystemCallError
+        rescue *READ_EXCEPTIONS
           nil
         end
         raise e
       end
 
-      def self.enable_tcp_keepalive(socket)
+      # Enable TCP keepalive, which is prefered to heartbeats
+      # @return [void]
+      def enable_tcp_keepalive(socket, idle = 60, interval = 10, count = 3)
         socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
-        socket.setsockopt(Socket::SOL_TCP, Socket::TCP_KEEPIDLE, 60)
-        socket.setsockopt(Socket::SOL_TCP, Socket::TCP_KEEPINTVL, 10)
-        socket.setsockopt(Socket::SOL_TCP, Socket::TCP_KEEPCNT, 3)
+        if Socket.const_defined?(:TCP_KEEPIDLE) # linux/bsd
+          socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPIDLE, idle)
+        elsif RUBY_PLATFORM.include? "darwin" # os x
+          # https://www.quickhack.net/nom/blog/2018-01-19-enable-tcp-keepalive-of-macos-and-linux-in-ruby.html
+          socket.setsockopt(Socket::IPPROTO_TCP, 0x10, idle)
+        else # windows
+          return
+        end
+        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPINTVL, interval)
+        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPCNT, count)
       rescue StandardError => e
         warn "AMQP-Client could not enable TCP keepalive on socket. #{e.inspect}"
       end
 
-      def self.port_from_env
+      # Fetch the AMQP port number from ENV
+      # @return [Integer] A port number
+      # @return [nil] When the environment variable AMQP_PORT isn't set
+      def port_from_env
         return unless (port = ENV["AMQP_PORT"])
 
         port.to_i
       end
 
-      private_class_method :establish, :enable_tcp_keepalive, :port_from_env
-
       CLIENT_PROPERTIES = {
         capabilities: {
           authentication_failure_close: true,

data/lib/amqp/client/{frames.rb → frame_bytes.rb}

@@ -10,9 +10,7 @@ module AMQP
     # Having a class for each frame type is more expensive in terms of CPU and memory
     # @api private
     module FrameBytes
-      module_function
-
-      def connection_start_ok(response, properties)
+      def self.connection_start_ok(response, properties)
         prop_tbl = Table.encode(properties)
         [
           1, # type: method
@@ -28,7 +26,7 @@ module AMQP
         ].pack("C S> L> S> S> L>a* Ca* L>a* Ca* C")
       end
 
-      def connection_tune_ok(channel_max, frame_max, heartbeat)
+      def self.connection_tune_ok(channel_max, frame_max, heartbeat)
         [
           1, # type: method
           0, # channel id
@@ -42,7 +40,7 @@ module AMQP
         ].pack("CS>L>S>S>S>L>S>C")
       end
 
-      def connection_open(vhost)
+      def self.connection_open(vhost)
         [
           1, # type: method
           0, # channel id
@@ -56,7 +54,7 @@ module AMQP
         ].pack("C S> L> S> S> Ca* CCC")
       end
 
-      def connection_close(code, reason)
+      def self.connection_close(code, reason)
         frame_size = 2 + 2 + 2 + 1 + reason.bytesize + 2 + 2
         [
           1, # type: method
@@ -72,7 +70,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* S> S> C")
       end
 
-      def connection_close_ok
+      def self.connection_close_ok
         [
           1, # type: method
           0, # channel id
@@ -83,7 +81,7 @@ module AMQP
         ].pack("C S> L> S> S> C")
       end
 
-      def channel_open(id)
+      def self.channel_open(id)
         [
           1, # type: method
           id, # channel id
@@ -95,7 +93,7 @@ module AMQP
         ].pack("C S> L> S> S> C C")
       end
 
-      def channel_close(id, reason, code)
+      def self.channel_close(id, reason, code)
         frame_size = 2 + 2 + 2 + 1 + reason.bytesize + 2 + 2
         [
           1, # type: method
@@ -111,7 +109,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* S> S> C")
       end
 
-      def channel_close_ok(id)
+      def self.channel_close_ok(id)
         [
           1, # type: method
           id, # channel id
@@ -122,7 +120,7 @@ module AMQP
         ].pack("C S> L> S> S> C")
       end
 
-      def exchange_declare(id, name, type, passive, durable, auto_delete, internal, arguments)
+      def self.exchange_declare(id, name, type, passive, durable, auto_delete, internal, arguments)
         no_wait = false
         bits = 0
         bits |= (1 << 0) if passive
@@ -147,7 +145,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* Ca* C L>a* C")
       end
 
-      def exchange_delete(id, name, if_unused, no_wait)
+      def self.exchange_delete(id, name, if_unused, no_wait)
         bits = 0
         bits |= (1 << 0) if if_unused
         bits |= (1 << 1) if no_wait
@@ -165,7 +163,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* C C")
       end
 
-      def exchange_bind(id, destination, source, binding_key, no_wait, arguments)
+      def self.exchange_bind(id, destination, source, binding_key, no_wait, arguments)
         tbl = Table.encode(arguments)
         frame_size = 2 + 2 + 2 + 1 + destination.bytesize + 1 + source.bytesize + 1 +
                      binding_key.bytesize + 1 + 4 + tbl.bytesize
@@ -185,7 +183,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* Ca* Ca* C L>a* C")
       end
 
-      def exchange_unbind(id, destination, source, binding_key, no_wait, arguments)
+      def self.exchange_unbind(id, destination, source, binding_key, no_wait, arguments)
         tbl = Table.encode(arguments)
         frame_size = 2 + 2 + 2 + 1 + destination.bytesize + 1 + source.bytesize + 1 +
                      binding_key.bytesize + 1 + 4 + tbl.bytesize
@@ -205,7 +203,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* Ca* Ca* C L>a* C")
       end
 
-      def queue_declare(id, name, passive, durable, exclusive, auto_delete, arguments)
+      def self.queue_declare(id, name, passive, durable, exclusive, auto_delete, arguments)
         no_wait = false
         bits = 0
         bits |= (1 << 0) if passive
@@ -229,7 +227,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* C L>a* C")
       end
 
-      def queue_delete(id, name, if_unused, if_empty, no_wait)
+      def self.queue_delete(id, name, if_unused, if_empty, no_wait)
         bits = 0
         bits |= (1 << 0) if if_unused
         bits |= (1 << 1) if if_empty
@@ -248,7 +246,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* C C")
       end
 
-      def queue_bind(id, queue, exchange, binding_key, no_wait, arguments)
+      def self.queue_bind(id, queue, exchange, binding_key, no_wait, arguments)
         tbl = Table.encode(arguments)
         frame_size = 2 + 2 + 2 + 1 + queue.bytesize + 1 + exchange.bytesize + 1 +
                      binding_key.bytesize + 1 + 4 + tbl.bytesize
@@ -268,7 +266,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* Ca* Ca* C L>a* C")
       end
 
-      def queue_unbind(id, queue, exchange, binding_key, arguments)
+      def self.queue_unbind(id, queue, exchange, binding_key, arguments)
         tbl = Table.encode(arguments)
         frame_size = 2 + 2 + 2 + 1 + queue.bytesize + 1 + exchange.bytesize + 1 +
                      binding_key.bytesize + 4 + tbl.bytesize
@@ -287,7 +285,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* Ca* Ca* L>a* C")
       end
 
-      def queue_purge(id, queue, no_wait)
+      def self.queue_purge(id, queue, no_wait)
         frame_size = 2 + 2 + 2 + 1 + queue.bytesize + 1
         [
           1, # type: method
@@ -302,7 +300,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* C C")
       end
 
-      def basic_get(id, queue, no_ack)
+      def self.basic_get(id, queue, no_ack)
         frame_size = 2 + 2 + 2 + 1 + queue.bytesize + 1
         [
           1, # type: method
@@ -317,7 +315,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* C C")
       end
 
-      def basic_publish(id, exchange, routing_key, mandatory)
+      def self.basic_publish(id, exchange, routing_key, mandatory)
         frame_size = 2 + 2 + 2 + 1 + exchange.bytesize + 1 + routing_key.bytesize + 1
         [
           1, # type: method
@@ -333,8 +331,8 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* Ca* C C")
       end
 
-      def header(id, body_size, properties)
-        props = Properties.new(**properties).encode
+      def self.header(id, body_size, properties)
+        props = Properties.encode(properties)
         frame_size = 2 + 2 + 8 + props.bytesize
         [
           2, # type: header
@@ -348,7 +346,7 @@ module AMQP
         ].pack("C S> L> S> S> Q> a* C")
       end
 
-      def body(id, body_part)
+      def self.body(id, body_part)
         [
           3, # type: body
           id, # channel id
@@ -358,7 +356,7 @@ module AMQP
         ].pack("C S> L> a* C")
       end
 
-      def basic_consume(id, queue, tag, no_ack, exclusive, arguments)
+      def self.basic_consume(id, queue, tag, no_ack, exclusive, arguments)
         no_local = false
         no_wait = false
         bits = 0
@@ -383,7 +381,7 @@ module AMQP
         ].pack("C S> L> S> S> S> Ca* Ca* C L>a* C")
       end
 
-      def basic_cancel(id, consumer_tag, no_wait: false)
+      def self.basic_cancel(id, consumer_tag, no_wait: false)
         frame_size = 2 + 2 + 1 + consumer_tag.bytesize + 1
         [
           1, # type: method
@@ -397,7 +395,7 @@ module AMQP
         ].pack("C S> L> S> S> Ca* C C")
       end
 
-      def basic_cancel_ok(id, consumer_tag)
+      def self.basic_cancel_ok(id, consumer_tag)
         frame_size = 2 + 2 + 1 + consumer_tag.bytesize + 1
         [
           1, # type: method
@@ -410,7 +408,7 @@ module AMQP
         ].pack("C S> L> S> S> Ca* C")
       end
 
-      def basic_ack(id, delivery_tag, multiple)
+      def self.basic_ack(id, delivery_tag, multiple)
         frame_size = 2 + 2 + 8 + 1
         [
           1, # type: method
@@ -424,7 +422,7 @@ module AMQP
         ].pack("C S> L> S> S> Q> C C")
       end
 
-      def basic_nack(id, delivery_tag, multiple, requeue)
+      def self.basic_nack(id, delivery_tag, multiple, requeue)
         bits = 0
         bits |= (1 << 0) if multiple
         bits |= (1 << 1) if requeue
@@ -441,7 +439,7 @@ module AMQP
         ].pack("C S> L> S> S> Q> C C")
       end
 
-      def basic_reject(id, delivery_tag, requeue)
+      def self.basic_reject(id, delivery_tag, requeue)
         frame_size = 2 + 2 + 8 + 1
         [
           1, # type: method
@@ -455,7 +453,7 @@ module AMQP
         ].pack("C S> L> S> S> Q> C C")
       end
 
-      def basic_qos(id, prefetch_size, prefetch_count, global)
+      def self.basic_qos(id, prefetch_size, prefetch_count, global)
         frame_size = 2 + 2 + 4 + 2 + 1
         [
           1, # type: method
@@ -470,7 +468,7 @@ module AMQP
         ].pack("C S> L> S> S> L> S> C C")
       end
 
-      def basic_recover(id, requeue)
+      def self.basic_recover(id, requeue)
         frame_size = 2 + 2 + 1
         [
           1, # type: method
@@ -483,7 +481,7 @@ module AMQP
         ].pack("C S> L> S> S> C C")
       end
 
-      def confirm_select(id, no_wait)
+      def self.confirm_select(id, no_wait)
         [
           1, # type: method
           id, # channel id
@@ -495,7 +493,7 @@ module AMQP
         ].pack("C S> L> S> S> C C")
       end
 
-      def tx_select(id)
+      def self.tx_select(id)
         frame_size = 2 + 2
         [
           1, # type: method
@@ -507,7 +505,7 @@ module AMQP
         ].pack("C S> L> S> S> C")
       end
 
-      def tx_commit(id)
+      def self.tx_commit(id)
         frame_size = 2 + 2
         [
           1, # type: method
@@ -519,7 +517,7 @@ module AMQP
         ].pack("C S> L> S> S> C")
       end
 
-      def tx_rollback(id)
+      def self.tx_rollback(id)
         frame_size = 2 + 2
         [
           1, # type: method