amqp-client 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10119835607b70ee73dd581f9bef3211a26fc18bb6fb7fa2f6e6bfe913076b16
-  data.tar.gz: a30989dab30c2dea294c0310bbfd211a36fa7453d935200c6b7783553f5e816c
+  metadata.gz: f0abeedd581cdc09eac6afaf690fb8a50fbaef0146e4c22be43d7cad90d8d9b6
+  data.tar.gz: 16161d756ce7d68ba24debc60eda941243bb951cd17262f1c148ef1039595e88
 SHA512:
-  metadata.gz: 2658a0f4e151ab9fd0a56d1096e8d6b191b5e5164e27eadb8dc922651664440149fd1eef7b9d410fbcdf781eba3ef046b141c017b3b5d317b241ec7afa2d8150
-  data.tar.gz: 73695493c9f72619279a5552bdea275f6aa781da3da1dadebb788eaff249f68e088b3eb9fc5cc7c3afab1d6df0b44bd83e18ce2aa3605ace83a00035dfd84890
+  metadata.gz: 272c099f3158572304b30bbf67227343ce5456b90e5b4a08ccaf9c2da0f9b3a42ffb02913431b7d98cc0b7f1d5d36ef2c61bd492cdabf4411b0d2f941c616f04
+  data.tar.gz: a2000478882d0e630d88fb67e09675b087981498ac9a5b7f7a80f69a092c082415530156136cca1fa2e1bf88874468437fd3dbc600ee354110fb0c6af59e1373

data/.github/workflows/codeql-analysis.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

data/.github/workflows/docs.yml

@@ -12,7 +12,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/main.yml

@@ -19,21 +19,22 @@ jobs:
       matrix:
         sudo: [true]
         ruby:
-          - "2.6"
-          - "2.7"
-          - "3.0"
-          - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
         include:
-          - { ruby: jruby, allow-failure: true, sudo: false }
-          - { ruby: truffleruby, allow-failure: true, sudo: false }
+          - { ruby: jruby, allow-failure: false, sudo: false }
+          - { ruby: truffleruby, allow-failure: false, sudo: false }
     steps:
+    - name: Configure dpkg to skip building man pages
+      run: |
+        echo 'path-exclude /usr/share/doc/*' | sudo tee -a /etc/dpkg/dpkg.cfg.d/01_nodoc
+        echo 'path-exclude /usr/share/man/*' | sudo tee -a /etc/dpkg/dpkg.cfg.d/01_nodoc
     - name: Install RabbitMQ
       run: sudo apt-get update && sudo apt-get install -y rabbitmq-server
     - name: Verify RabbitMQ started correctly
       run: while true; do sudo rabbitmq-diagnostics status 2>/dev/null && break; echo -n .; sleep 2; done
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
@@ -55,6 +56,10 @@ jobs:
           - "jruby"
           - "truffleruby"
     steps:
+    - name: Configure dpkg to skip building man pages
+      run: |
+        echo 'path-exclude /usr/share/doc/*' | sudo tee -a /etc/dpkg/dpkg.cfg.d/01_nodoc
+        echo 'path-exclude /usr/share/man/*' | sudo tee -a /etc/dpkg/dpkg.cfg.d/01_nodoc
     - name: Install RabbitMQ
       run: sudo apt-get update && sudo apt-get install -y rabbitmq-server
     - name: Stop RabbitMQ
@@ -81,12 +86,20 @@ jobs:
       run: sudo systemctl start rabbitmq-server
     - name: Verify RabbitMQ started correctly
       run: while true; do sudo rabbitmq-diagnostics status 2>/dev/null && break; echo -n .; sleep 2; done
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}
+    - name: Run TLS tests (JRuby)
+      if: ${{ matrix.ruby == 'jruby' }}
+      run: bundle exec rake
+      env:
+        JAVA_OPTS: "-Djava.net.preferIPv4Stack=true"
+        TEST_AMQP_HOST: "localhost"
+        TESTOPTS: --name=/_tls$/
     - name: Run TLS tests
+      if: ${{ matrix.ruby != 'jruby' }}
       run: bundle exec rake
       env:
         TESTOPTS: --name=/_tls$/
@@ -104,7 +117,7 @@ jobs:
       run: brew install rabbitmq
     - name: Start RabbitMQ
       run: brew services start rabbitmq
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
@@ -113,3 +126,15 @@ jobs:
       run: while true; do rabbitmq-diagnostics status 2>/dev/null && break; echo -n .; sleep 2; done
     - name: Run tests (excluding TLS tests)
       run: bundle exec rake
+
+  lint:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+    - uses: actions/checkout@v5
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: ruby
+    - name: Run RuboCop
+      run: bundle exec rake rubocop

data/.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       id-token: write # for trusted publishing
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true

data/.rubocop.yml

@@ -1,8 +1,10 @@
 inherit_from: .rubocop_todo.yml
+plugins:
+  - rubocop-minitest
 
 AllCops:
   NewCops: disable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.2
   SuggestExtensions: false
 
 Style/StringLiterals:
@@ -18,11 +20,11 @@ Layout/LineLength:
 
 Naming/FileName:
   Exclude:
-    - 'lib/amqp-client.rb'
+    - "lib/amqp-client.rb"
 
 Metrics/PerceivedComplexity:
   Exclude:
-    - 'lib/amqp/client/properties.rb'
+    - "lib/amqp/client/properties.rb"
 
 Metrics/ParameterLists:
   Max: 8

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## [Unreleased]
 
+## [1.2.0] - 2025-09-10
+
+- Fixed: `Connection#channel` wasn't thread-safe
+- Added: Support for heartbeats
+
+## [1.1.7] - 2024-05-12
+
+- Support for Connection.update-secret
+- Allow sub-second connect_timeout
+- Fixed: undefinied variable if message was returned and no on_return block was set
+
 ## [1.1.6] - 2024-03-26
 
 - Fixed: Channel#wait_for_confirms now waits for all confirms, in a thread safe way
@@ -42,7 +53,7 @@
 
 ## [1.0.1] - 2021-09-06
 
-- The API is fully documented! https://cloudamqp.github.io/amqp-client.rb/
+- The API is fully documented! <https://cloudamqp.github.io/amqp-client.rb/>
 - Fixed: Socket writing is now thread-safe
 - Change: Block while waiting for basic_cancel by default
 - Added: Can specify channel_max, heartbeat and frame_max as options to the Client/Connection

data/CODEOWNERS

@@ -0,0 +1 @@
+* @carlhoerberg @spuun @dentarg @baelter @walro

data/README.md

@@ -8,7 +8,7 @@ It's safe by default, messages are published as persistent, and is waiting for c
 
 ## Support
 
-The library is fully supported by [CloudAMQP](https://www.cloudamqp.com), the largest RabbitMQ hosting provider in the world. Open [an issue](https://github.com/cloudamqp/amqp-client.rb/issues) or [email our support](mailto:support@cloudamqp.com) if you have problems or questions.
+The library is fully supported by [CloudAMQP](https://www.cloudamqp.com), the largest LavinMQ and RabbitMQ hosting provider in the world. Open [an issue](https://github.com/cloudamqp/amqp-client.rb/issues) or [email our support](mailto:support@cloudamqp.com) if you have problems or questions.
 
 ## Documentation
 
@@ -113,17 +113,76 @@ gem 'amqp-client'
 
 And then execute:
 
-    $ bundle install
+    bundle install
 
 Or install it yourself as:
 
-    $ gem install amqp-client
+    gem install amqp-client
 
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the changelog and version number in `version.rb`, make a commit, and then run `bundle exec rake release:source_control_push`, which will create a git tag for the version, push git commits and the created tag. GitHub Actions will then push the `.gem` file to [rubygems.org](https://rubygems.org/gems/amqp-client).
+To install this gem onto your local machine, run `bundle exec rake install`.
+
+### Release Process
+
+The gem uses rake tasks to automate the release process. Make sure your working directory is clean before starting a release.
+
+#### Quick Release (Patch Version)
+
+```bash
+rake release:full
+```
+
+This will:
+
+1. Run tests and RuboCop to ensure code quality
+2. Bump the patch version (e.g., 1.2.0 → 1.2.1)
+3. Update the CHANGELOG.md with the new version and current date
+4. Create a git commit and tag for the release
+5. Build and push the gem to RubyGems
+6. Push commits and tags to the remote repository
+
+#### Custom Version Bump
+
+For minor or major version bumps:
+
+```bash
+# Minor version bump (e.g., 1.2.0 → 1.3.0)
+rake release:full[minor]
+
+# Major version bump (e.g., 1.2.0 → 2.0.0)
+rake release:full[major]
+```
+
+#### Individual Release Steps
+
+You can also run individual steps if needed:
+
+```bash
+# Bump version only
+rake release:bump[patch]  # or [minor] or [major]
+
+# Update changelog with current version
+rake release:changelog
+
+# Create git tag
+rake release:tag
+
+# Build and push to RubyGems
+rake release:push
+```
+
+#### Manual Release Steps
+
+If you prefer manual control:
+
+1. Update the version number in `lib/amqp/client/version.rb`
+2. Update the CHANGELOG.md with the new version and release notes
+3. Commit your changes: `git add . && git commit -m "Release X.Y.Z"`
+4. Create and push a tag: `git tag vX.Y.Z && git push origin vX.Y.Z`
+5. Build and push: `rake build && gem push amqp-client-X.Y.Z.gem`
 
 ## Contributing
 

data/Rakefile

@@ -18,12 +18,163 @@ end
 
 require "rubocop/rake_task"
 
-RuboCop::RakeTask.new do |task|
-  task.requires << "rubocop-minitest"
-end
+RuboCop::RakeTask.new
 
 require "yard"
 
 YARD::Rake::YardocTask.new
 
-task default: [:test, *(:rubocop if RUBY_ENGINE == "ruby")]
+# Release helper methods
+def current_version
+  version_file = "lib/amqp/client/version.rb"
+  content = File.read(version_file)
+  content.match(/VERSION = "(.+)"/)[1]
+end
+
+def bump_version(version_type)
+  unless %w[major minor patch].include?(version_type)
+    puts "Invalid version type. Use: major, minor, or patch"
+    exit 1
+  end
+
+  version_file = "lib/amqp/client/version.rb"
+  content = File.read(version_file)
+
+  current_version = content.match(/VERSION = "(.+)"/)[1]
+  major, minor, patch = current_version.split(".").map(&:to_i)
+
+  case version_type
+  when "major"
+    major += 1
+    minor = 0
+    patch = 0
+  when "minor"
+    minor += 1
+    patch = 0
+  when "patch"
+    patch += 1
+  end
+
+  new_version = "#{major}.#{minor}.#{patch}"
+  new_content = content.gsub(/VERSION = ".+"/, %(VERSION = "#{new_version}"))
+
+  File.write(version_file, new_content)
+  puts "Bumped version from #{current_version} to #{new_version}"
+end
+
+def update_changelog
+  version = current_version
+  date = Time.now.strftime("%Y-%m-%d")
+
+  changelog = File.read("CHANGELOG.md")
+
+  if changelog.include?("## [#{version}]")
+    puts "Version #{version} already exists in CHANGELOG.md"
+  else
+    updated_changelog = changelog.sub(
+      "## [Unreleased]",
+      "## [Unreleased]\n\n## [#{version}] - #{date}"
+    )
+
+    File.write("CHANGELOG.md", updated_changelog)
+    puts "Updated CHANGELOG.md with version #{version}"
+  end
+end
+
+def create_git_tag
+  version = current_version
+
+  system("git add .")
+  system("git commit -m 'Release #{version}'")
+
+  # Check if tag already exists and remove it if it does
+  if system("git tag -l v#{version} | grep -q v#{version}")
+    puts "Tag v#{version} already exists, removing it..."
+    system("git tag -d v#{version}")
+  end
+
+  system("git tag v#{version}")
+
+  puts "Created git tag v#{version}"
+end
+
+def push_gem_to_rubygems
+  version = current_version
+
+  # Look for gem file in both current directory and pkg directory
+  gem_file = "amqp-client-#{version}.gem"
+  pkg_gem_file = "pkg/amqp-client-#{version}.gem"
+
+  if File.exist?(pkg_gem_file)
+    system("gem push #{pkg_gem_file}")
+    puts "Pushed #{pkg_gem_file} to RubyGems"
+  elsif File.exist?(gem_file)
+    system("gem push #{gem_file}")
+    puts "Pushed #{gem_file} to RubyGems"
+  else
+    puts "Gem file #{gem_file} not found in current directory or pkg/. Make sure to build first."
+    exit 1
+  end
+end
+
+def full_release_process(version_type)
+  puts "Starting release process..."
+
+  # Ensure working directory is clean
+  unless system("git diff --quiet && git diff --cached --quiet")
+    puts "Working directory is not clean. Please commit or stash changes first."
+    exit 1
+  end
+
+  # Bump version
+  Rake::Task["release:bump"].invoke(version_type)
+  Rake::Task["release:bump"].reenable
+
+  # Update changelog
+  Rake::Task["release:changelog"].invoke
+  Rake::Task["release:changelog"].reenable
+
+  # Create tag and push
+  Rake::Task["release:tag"].invoke
+  Rake::Task["release:tag"].reenable
+
+  # Build and push gem
+  Rake::Task["release:push"].invoke
+  Rake::Task["release:push"].reenable
+
+  # Push to git
+  system("git push origin")
+  system("git push origin --tags")
+
+  version = current_version
+  puts "Successfully released version #{version}!"
+end
+
+namespace :release do
+  desc "Bump version (usage: rake release:bump[major|minor|patch])"
+  task :bump, [:type] do |_t, args|
+    bump_version(args[:type] || "patch")
+  end
+
+  desc "Update changelog with current version"
+  task :changelog do
+    update_changelog
+  end
+
+  desc "Create git tag for current version"
+  task :tag do
+    create_git_tag
+  end
+
+  desc "Build and push gem to RubyGems"
+  task push: :build do
+    push_gem_to_rubygems
+  end
+
+  desc "Full release process (bump version, update changelog, tag, build and push)"
+  task :full, [:type] => %i[test rubocop] do |_t, args|
+    full_release_process(args[:type] || "patch")
+  end
+end
+
+task default: [:test, *(:rubocop if ENV["CI"] != "true")]

data/amqp-client.gemspec

@@ -5,14 +5,14 @@ require_relative "lib/amqp/client/version"
 Gem::Specification.new do |spec|
   spec.name          = "amqp-client"
   spec.version       = AMQP::Client::VERSION
-  spec.authors       = ["Carl Hörberg"]
-  spec.email         = ["carl@cloudamqp.com"]
+  spec.authors       = ["CloudAMQP"]
+  spec.email         = ["team@cloudamqp.com"]
 
   spec.summary       = "AMQP 0-9-1 client"
   spec.description   = "Modern AMQP 0-9-1 Ruby client"
   spec.homepage      = "https://github.com/cloudamqp/amqp-client.rb"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "#{spec.homepage}.git"

data/lib/amqp/client/channel.rb

@@ -251,7 +251,7 @@ module AMQP
         # @option properties [Hash<String, Object>] headers Custom headers
         # @option properties [Integer] delivery_mode 2 for persisted message, transient messages for all other values
         # @option properties [Integer] priority A priority of the message (between 0 and 255)
-        # @option properties [Integer] correlation_id A correlation id, most often used used for RPC communication
+        # @option properties [String] correlation_id A correlation id, most often used used for RPC communication
         # @option properties [String] reply_to Queue to reply RPC responses to
         # @option properties [Integer, String] expiration Number of seconds the message will stay in the queue
         # @option properties [String] message_id Can be used to uniquely identify the message, e.g. for deduplication
@@ -345,8 +345,8 @@ module AMQP
         end
 
         # Specify how many messages to prefetch for consumers with `no_ack: false`
-        # @param prefetch_count [Integer] Number of messages to maxium keep in flight
-        # @param prefetch_size [Integer] Number of bytes to maxium keep in flight
+        # @param prefetch_count [Integer] Number of messages to maximum keep in flight
+        # @param prefetch_size [Integer] Number of bytes to maximum keep in flight
         # @param global [Boolean] If true the limit will apply to channel rather than the consumer
         # @return [nil]
         def basic_qos(prefetch_count, prefetch_size: 0, global: false)
@@ -522,7 +522,7 @@ module AMQP
             if @on_return
               Thread.new { @on_return.call(next_msg) }
             else
-              warn "AMQP-Client message returned: #{msg.inspect}"
+              warn "AMQP-Client message returned: #{next_msg.inspect}"
             end
           elsif next_msg.consumer_tag.nil?
             @basic_gets.push next_msg

data/lib/amqp/client/connection.rb

@@ -18,7 +18,7 @@ module AMQP
       # @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 [Float] 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
@@ -44,6 +44,7 @@ module AMQP
         @frame_max = frame_max
         @heartbeat = heartbeat
         @channels = {}
+        @channels_lock = Mutex.new
         @closed = nil
         @replies = ::Queue.new
         @write_lock = Mutex.new
@@ -51,6 +52,9 @@ module AMQP
         @on_blocked = ->(reason) { warn "AMQP-Client blocked by broker: #{reason}" }
         @on_unblocked = -> { warn "AMQP-Client unblocked by broker" }
 
+        # Only used with heartbeats
+        @last_activity_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
         Thread.new { read_loop } if read_loop_thread
       end
 
@@ -89,15 +93,17 @@ module AMQP
         raise ArgumentError, "Channel ID cannot be 0" if id&.zero?
         raise ArgumentError, "Channel ID higher than connection's channel max #{@channel_max}" if id && id > @channel_max
 
-        if id
-          ch = @channels[id] ||= Channel.new(self, id)
-        else
-          1.upto(@channel_max) do |i|
-            break id = i unless @channels.key? i
-          end
-          raise Error, "Max channels reached" if id.nil?
+        ch = @channels_lock.synchronize do
+          if id
+            @channels[id] ||= Channel.new(self, id)
+          else
+            1.upto(@channel_max) do |i|
+              break id = i unless @channels.key? i
+            end
+            raise Error, "Max channels reached" if id.nil?
 
-          ch = @channels[id] = Channel.new(self, id)
+            @channels[id] = Channel.new(self, id)
+          end
         end
         ch.open
       end
@@ -132,6 +138,16 @@ module AMQP
         nil
       end
 
+      # Update authentication secret, for example when an OAuth backend is used
+      # @param secret [String] The new secret
+      # @param reason [String] A reason to update it
+      # @return [nil]
+      def update_secret(secret, reason)
+        write_bytes FrameBytes.update_secret(secret, reason)
+        expect(:update_secret_ok)
+        nil
+      end
+
       # True if the connection is closed
       # @return [Boolean]
       def closed?
@@ -165,6 +181,7 @@ module AMQP
       def write_bytes(*bytes)
         @write_lock.synchronize do
           @socket.write(*bytes)
+          update_last_activity
         end
       rescue *READ_EXCEPTIONS => e
         raise Error::ConnectionClosed.new(*@closed) if @closed
@@ -196,6 +213,7 @@ module AMQP
 
           # parse the frame, will return false if a close frame was received
           parse_frame(type, channel_id, frame_buffer) || return
+          update_last_activity
         end
         nil
       rescue *READ_EXCEPTIONS => e
@@ -222,7 +240,7 @@ module AMQP
       READ_EXCEPTIONS = [IOError, OpenSSL::OpenSSLError, SystemCallError,
                          RUBY_ENGINE == "jruby" ? java.lang.NullPointerException : nil].compact.freeze
 
-      def parse_frame(type, channel_id, buf) # rubocop:disable Metrics/MethodLength
+      def parse_frame(type, channel_id, buf) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
         channel = @channels[channel_id]
         case type
         when 1 # method frame
@@ -255,6 +273,8 @@ module AMQP
             when 61 # connection#unblocked
               @blocked = nil
               @on_unblocked.call
+            when 71 # connection#update_secret_ok
+              @replies.push [:update_secret_ok]
             else raise Error::UnsupportedMethodFrame, class_id, method_id
             end
           when 20 # channel
@@ -265,11 +285,11 @@ module AMQP
               reply_code, reply_text_len = buf.unpack("@4 S> C")
               reply_text = buf.byteslice(7, reply_text_len).force_encoding("utf-8")
               classid, methodid = buf.byteslice(7 + reply_text_len, 4).unpack("S> S>")
-              channel = @channels.delete(channel_id)
+              channel = @channels_lock.synchronize { @channels.delete(channel_id) }
               channel.closed!(:channel, reply_code, reply_text, classid, methodid)
               write_bytes FrameBytes.channel_close_ok(channel_id)
             when 41 # channel#close-ok
-              channel = @channels.delete(channel_id)
+              channel = @channels_lock.synchronize { @channels.delete(channel_id) }
               channel.reply [:channel_close_ok]
             else raise Error::UnsupportedMethodFrame, class_id, method_id
             end
@@ -394,17 +414,61 @@ module AMQP
           channel.header_delivered body_size, properties
         when 3 # body
           channel.body_delivered buf
+        when 8 # heartbeat
+          handle_server_heartbeat(channel_id)
         else raise Error::UnsupportedFrameType, type
         end
         true
       end
 
+      def update_last_activity
+        return unless @heartbeat&.positive?
+
+        @last_activity_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+
+      def handle_server_heartbeat(channel_id)
+        return if channel_id.zero?
+
+        raise Error::ConnectionClosed.new(501, "Heartbeat frame received on non-zero channel #{channel_id}")
+      end
+
+      # Start the heartbeat background thread (called from connection#tune)
+      def start_heartbeats(period)
+        Thread.new do
+          Thread.current.abort_on_exception = true # Raising an unhandled exception is a bug
+          interval = period / 2.0
+          loop do
+            sleep interval
+            break if @closed
+            next if @socket.nil?
+
+            now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            # If we haven't sent anything recently, send a heartbeat
+            next unless now - @last_activity_time >= interval
+
+            begin
+              send_heartbeat
+            rescue Error => e
+              warn "AMQP-Client heartbeat send failed: #{e.inspect}"
+              break
+            end
+          end
+        end
+      end
+
+      def send_heartbeat
+        write_bytes FrameBytes.heartbeat
+      end
+
       def expect(expected_frame_type)
         frame_type, args = @replies.pop
         if frame_type.nil?
           return if expected_frame_type == :close_ok
 
-          raise(Error::ConnectionClosed, "while waiting for #{expected_frame_type}")
+          raise Error::ConnectionClosed.new(*@closed) if @closed
+
+          raise Error, "Connection closed while waiting for #{expected_frame_type}"
         end
         frame_type == expected_frame_type || raise(Error::UnexpectedFrame.new(expected_frame_type, frame_type))
         args
@@ -414,7 +478,7 @@ module AMQP
       # @return [Socket]
       # @return [OpenSSL::SSL::SSLSocket]
       def open_socket(host, port, tls, options)
-        connect_timeout = options.fetch(:connect_timeout, 30).to_i
+        connect_timeout = options.fetch(:connect_timeout, 30).to_f
         socket = Socket.tcp host, port, connect_timeout: connect_timeout
         keepalive = options.fetch(:keepalive, "").split(":", 3).map!(&:to_i)
         enable_tcp_keepalive(socket, *keepalive)
@@ -442,7 +506,7 @@ module AMQP
         channel_max, frame_max, heartbeat = nil
         socket.write "AMQP\x00\x00\x09\x01"
         buf = String.new(capacity: 4096)
-        loop do
+        loop do # rubocop:disable Metrics/BlockLength
           begin
             socket.readpartial(4096, buf)
           rescue *READ_EXCEPTIONS => e
@@ -471,6 +535,7 @@ module AMQP
                 channel_max = [channel_max, options.fetch(:channel_max, 2048).to_i].min
                 frame_max = [frame_max, options.fetch(:frame_max, 131_072).to_i].min
                 heartbeat = [heartbeat, options.fetch(:heartbeat, 0).to_i].min
+                start_heartbeats(heartbeat) if heartbeat.positive?
                 socket.write FrameBytes.connection_tune_ok(channel_max, frame_max, heartbeat)
                 socket.write FrameBytes.connection_open(vhost)
               when 41 # connection#open-ok
@@ -496,7 +561,7 @@ module AMQP
         raise e
       end
 
-      # Enable TCP keepalive, which is prefered to heartbeats
+      # Enable TCP keepalive, which is preferred to heartbeats
       # @return [void]
       def enable_tcp_keepalive(socket, idle = 60, interval = 10, count = 3)
         socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)

data/lib/amqp/client/frame_bytes.rb

@@ -9,7 +9,7 @@ module AMQP
     # Each frame type implemented as a method
     # Having a class for each frame type is more expensive in terms of CPU and memory
     # @api private
-    module FrameBytes
+    module FrameBytes # rubocop:disable Metrics/ModuleLength
       def self.connection_start_ok(response, properties)
         prop_tbl = Table.encode(properties)
         [
@@ -81,6 +81,20 @@ module AMQP
         ].pack("C S> L> S> S> C")
       end
 
+      def self.update_secret(secret, reason)
+        frame_size = 4 + 4 + secret.bytesize + 1 + reason.bytesize
+        [
+          1, # type: method
+          0, # channel id
+          frame_size, # frame size
+          10, # class: connection
+          70, # method: close-ok
+          secret.bytesize, secret,
+          reason.bytesize, reason,
+          206 # frame end
+        ].pack("C S> L> S> S> L>a* Ca* C")
+      end
+
       def self.channel_open(id)
         [
           1, # type: method
@@ -528,6 +542,15 @@ module AMQP
           206 # frame end
         ].pack("C S> L> S> S> C")
       end
+
+      def self.heartbeat
+        [
+          8, # type: heartbeat
+          0, # channel id
+          0, # frame size
+          206 # frame end
+        ].pack("C S> L> C")
+      end
     end
   end
 end

data/lib/amqp/client/version.rb

@@ -3,6 +3,6 @@
 module AMQP
   class Client
     # Version of the client library
-    VERSION = "1.1.6"
+    VERSION = "1.2.0"
   end
 end

data/lib/amqp/client.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require_relative "client/version"
 require_relative "client/connection"
 require_relative "client/exchange"
@@ -52,7 +51,7 @@ module AMQP
     def start
       @stopped = false
       Thread.new(connect(read_loop_thread: false)) do |conn|
-        Thread.abort_on_exception = true # Raising an unhandled exception is a bug
+        Thread.current.abort_on_exception = true # Raising an unhandled exception is a bug
         loop do
           break if @stopped
 

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: amqp-client
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
-- Carl Hörberg
-autorequire: 
+- CloudAMQP
 bindir: exe
 cert_chain: []
-date: 2024-03-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Modern AMQP 0-9-1 Ruby client
 email:
-- carl@cloudamqp.com
+- team@cloudamqp.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -26,6 +25,7 @@ files:
 - ".rubocop_todo.yml"
 - ".yardopts"
 - CHANGELOG.md
+- CODEOWNERS
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -52,7 +52,6 @@ metadata:
   homepage_uri: https://github.com/cloudamqp/amqp-client.rb
   source_code_uri: https://github.com/cloudamqp/amqp-client.rb.git
   changelog_uri: https://github.com/cloudamqp/amqp-client.rb/blob/main/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -60,15 +59,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: AMQP 0-9-1 client
 test_files: []