amqp-client 1.1.7 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b2125fb98c3f0172a05bce1cbf8aa0b6530df76685522c4d25772fa1edd2dc4
-  data.tar.gz: 204891c1da627b813f37b160029ab55ecf58c91481949b02dc5bf3b163288d0c
+  metadata.gz: 8cfb2dd354eeb33334cf6848b168f2a0caa486b40cefcce924910a16a77ffa4f
+  data.tar.gz: 7a7896809e27539ab3395b833038c5b328298c9cf6a25aeff7f706e05657e995
 SHA512:
-  metadata.gz: 290ce1a3d301e1119056e39eeb309b55d7fa0752e7bc4b012777ccab7c506f62eef255bffc7b62258bf8a56a22ea46e19f42c00ad91f4b8441b7ecf414c29c8d
-  data.tar.gz: 22070957cc3c58d77f7d6c15476943a9f23ab34496dfc473618c4625c4f8531eddcfc8fb92086bf566aaf548d650045c65617ac68d73a49ec07c4ad4f971030a
+  metadata.gz: c8d0c1797b3b8a81fbe33a154bb255c452f09d925fdeafdfc03fdbb3342b116d7875d6166f7e9b948232f09d69c16179e0270c752b3afdd955d4ad6fca3b6cd1
+  data.tar.gz: 47c518dee777f61435e748045fb7cfebf808ac5ed9cd53813081b222a9abc81b82f85f436482b25dba1dcd10a96c1d1f9bbf4b5266fc90ece48307b61f03ccfb

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,26 +19,34 @@ 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
         ruby-version: ${{ matrix.ruby }}
+    - name: Run tests (excluding TLS tests) (JRuby)
+      if: ${{ matrix.ruby == 'jruby' }}
+      continue-on-error: ${{ matrix.allow-failure || false }}
+      run: bundle exec rake
+      env:
+        JAVA_OPTS: "-Djava.net.preferIPv4Stack=true"
     - name: Run tests (excluding TLS tests)
+      if: ${{ matrix.ruby != 'jruby' }}
       continue-on-error: ${{ matrix.allow-failure || false }}
       run: bundle exec rake
       env:
@@ -55,6 +63,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 +93,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 +124,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 +133,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

@@ -12,8 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       id-token: write # for trusted publishing
+      contents: write # for creating releases
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
@@ -24,3 +25,30 @@ jobs:
       - run: gem build *.gemspec
       - run: gem install *.gem
       - run: gem push *.gem
+
+      # create GitHub release
+      - name: Extract release notes
+        id: extract_release_notes
+        run: |
+          # Extract version from tag (remove 'v' prefix)
+          VERSION=${GITHUB_REF#refs/tags/v}
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+          # Extract changelog section for this version with better handling
+          if grep -q "## \[$VERSION\]" CHANGELOG.md; then
+            awk "/^## \[$VERSION\]/ {flag=1; next} /^## \[/ && flag {exit} flag && /\S/ {print}" CHANGELOG.md > release_notes.md
+            echo "Release notes extracted for version $VERSION:"
+            cat release_notes.md
+          else
+            echo "No changelog entry found for version $VERSION" > release_notes.md
+            echo "Warning: No changelog entry found for version $VERSION"
+          fi
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          name: Release ${{ steps.extract_release_notes.outputs.version }}
+          body_path: release_notes.md
+          draft: false
+          prerelease: false
+          files: '*.gem'

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.1] - 2025-09-15
+
+- Added: Convenience methods for creating exchange types: `fanout()`, `direct()`, `topic()`, and `headers()`
+- Added: Support for binding with high level objects (Exchange and Queue objects can now be passed as binding sources)
+- Fixed: Bug where a client without any connection could not be closed properly
+
+## [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
@@ -48,7 +59,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

@@ -1 +1 @@
-* @84codes/customer
+* @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 preparation process. The actual gem building and publishing is handled automatically by GitHub Actions when a tag is pushed.
+
+#### Quick Release (Patch Version)
+
+```bash
+rake release:prepare
+```
+
+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. Push commits and tags to the remote repository
+6. GitHub Actions will automatically build and publish the gem to RubyGems
+
+#### Custom Version Bump
+
+For minor or major version bumps:
+
+```bash
+# Minor version bump (e.g., 1.2.0 → 1.3.0)
+rake release:prepare[minor]
+
+# Major version bump (e.g., 1.2.0 → 2.0.0)
+rake release:prepare[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 with changelog entries
+rake release:tag
+
+# Push tag to remote (handles conflicts)
+rake release:push_tag
+```
+
+#### 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. GitHub Actions will automatically build and publish the gem when the tag is pushed
 
 ## Contributing
 

data/Rakefile

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
@@ -18,12 +17,181 @@ 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 extract_changelog_for_version(version)
+  changelog = File.read("CHANGELOG.md")
+
+  # Find the section for this version
+  version_pattern = /^## \[#{Regexp.escape(version)}\][^\n]*\n(.*?)(?=^## \[|\z)/m
+  match = changelog.match(version_pattern)
+
+  if match
+    # Clean up the changelog entries
+    entries = match[1].strip
+    # Remove empty lines at the start and end
+    entries.gsub(/\A\s*\n+/, "").gsub(/\n+\s*\z/, "")
+  else
+    "No changelog entries found for version #{version}"
+  end
+end
+
+def push_tag_to_remote(version)
+  # Check if tag exists on remote
+  remote_tag_exists = system("git ls-remote --tags origin | grep -q refs/tags/v#{version}")
+
+  if remote_tag_exists
+    puts "Tag v#{version} already exists on remote. Force pushing updated tag..."
+    system("git push origin v#{version} --force")
+  else
+    puts "Pushing new tag v#{version} to remote..."
+    system("git push origin v#{version}")
+  end
+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 locally and remove it if it does
+  if system("git tag -l v#{version} | grep -q v#{version}")
+    puts "Tag v#{version} already exists locally, removing it..."
+    system("git tag -d v#{version}")
+  end
+
+  # Extract changelog entries for this version
+  changelog_entries = extract_changelog_for_version(version)
+
+  # Create tag message with version and changelog
+  tag_message = "Release #{version}\n\n#{changelog_entries}"
+
+  # Create annotated tag with the changelog
+  system("git", "tag", "-a", "v#{version}", "-m", tag_message)
+
+  puts "Created git tag v#{version} with changelog entries"
+end
+
+def prepare_release_process(version_type)
+  puts "Preparing 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
+
+  # Push to git
+  system("git push origin")
+
+  # Handle tag push with potential conflicts
+  version = current_version
+  push_tag_to_remote(version)
+
+  puts "Successfully prepared release #{version}!"
+  puts "The CI will automatically build and publish the gem when the tag is pushed."
+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 "Push tag to remote (handles conflicts)"
+  task :push_tag do
+    version = current_version
+    push_tag_to_remote(version)
+  end
+
+  desc "Prepare release (bump version, update changelog, create tag, push to git)"
+  task :prepare, [:type] => %i[test rubocop] do |_t, args|
+    prepare_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)

data/lib/amqp/client/connection.rb

@@ -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
@@ -175,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
@@ -206,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
@@ -232,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
@@ -277,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
@@ -406,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
@@ -454,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
@@ -483,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
@@ -508,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/exchange.rb

@@ -4,6 +4,8 @@ module AMQP
   class Client
     # High level representation of an exchange
     class Exchange
+      attr_reader :name
+
       # Should only be initialized from the Client
       # @api private
       def initialize(client, name)
@@ -14,7 +16,7 @@ module AMQP
       # Publish to the exchange
       # @param body [String] The message body
       # @param routing_key [String] The routing key of the message,
-      #   the exchange may use this when routing the message to bound queues
+      #   the exchange may use this when routing the message to bound queues (defaults to empty string)
       # @param properties [Properties]
       # @option properties [String] content_type Content type of the message body
       # @option properties [String] content_encoding Content encoding of the body
@@ -30,28 +32,30 @@ module AMQP
       # @option properties [String] user_id Can be used to verify that this is the user that published the message
       # @option properties [String] app_id Can be used to indicates which app that generated the message
       # @return [Exchange] self
-      def publish(body, routing_key, **properties)
+      def publish(body, routing_key = "", **properties)
         @client.publish(body, @name, routing_key, **properties)
         self
       end
 
       # Bind to another exchange
-      # @param exchange [String] Name of the exchange to bind to
-      # @param binding_key [String] Binding key on which messages that match might be routed (depending on exchange type)
+      # @param source [String, Exchange] Name of the exchange to bind to, or the exchange object itself
+      # @param binding_key [String] Binding key on which messages that match might be routed (defaults to empty string)
       # @param arguments [Hash] Message headers to match on (only relevant for header exchanges)
       # @return [Exchange] self
-      def bind(exchange, binding_key, arguments: {})
-        @client.exchange_bind(@name, exchange, binding_key, arguments: arguments)
+      def bind(source, binding_key = "", arguments: {})
+        source = source.is_a?(String) ? source : source.name
+        @client.exchange_bind(@name, source, binding_key, arguments: arguments)
         self
       end
 
       # Unbind from another exchange
-      # @param exchange [String] Name of the exchange to unbind from
-      # @param binding_key [String] Binding key which the queue is bound to the exchange with
+      # @param source [String, Exchange] Name of the exchange to unbind from, or the exchange object itself
+      # @param binding_key [String] Binding key which the queue is bound to the exchange with (defaults to empty string)
       # @param arguments [Hash] Arguments matching the binding that's being removed
       # @return [Exchange] self
-      def unbind(exchange, binding_key, arguments: {})
-        @client.exchange_unbind(@name, exchange, binding_key, arguments: arguments)
+      def unbind(source, binding_key = "", arguments: {})
+        source = source.is_a?(String) ? source : source.name
+        @client.exchange_unbind(@name, source, binding_key, arguments: arguments)
         self
       end
 

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)
         [
@@ -542,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/queue.rb

@@ -4,6 +4,8 @@ module AMQP
   class Client
     # Queue abstraction
     class Queue
+      attr_reader :name
+
       # Should only be initialized from the Client
       # @api private
       def initialize(client, name)
@@ -35,21 +37,23 @@ module AMQP
       end
 
       # Bind the queue to an exchange
-      # @param exchange [String] Name of the exchange to bind to
+      # @param exchange [String, Exchange] Name of the exchange to bind to, or the exchange object itself
       # @param binding_key [String] Binding key on which messages that match might be routed (depending on exchange type)
       # @param arguments [Hash] Message headers to match on (only relevant for header exchanges)
       # @return [self]
       def bind(exchange, binding_key, arguments: {})
+        exchange = exchange.is_a?(String) ? exchange : exchange.name
         @client.bind(@name, exchange, binding_key, arguments: arguments)
         self
       end
 
       # Unbind the queue from an exchange
-      # @param exchange [String] Name of the exchange to unbind from
+      # @param exchange [String, Exchange] Name of the exchange to unbind from, or the exchange object itself
       # @param binding_key [String] Binding key which the queue is bound to the exchange with
       # @param arguments [Hash] Arguments matching the binding that's being removed
       # @return [self]
       def unbind(exchange, binding_key, arguments: {})
+        exchange = exchange.is_a?(String) ? exchange : exchange.name
         @client.unbind(@name, exchange, binding_key, arguments: arguments)
         self
       end

data/lib/amqp/client/version.rb

@@ -3,6 +3,6 @@
 module AMQP
   class Client
     # Version of the client library
-    VERSION = "1.1.7"
+    VERSION = "1.2.1"
   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
 
@@ -84,6 +83,8 @@ module AMQP
       return if @stopped
 
       @stopped = true
+      return unless @connq.size.positive?
+
       conn = @connq.pop
       conn.close
       nil
@@ -116,6 +117,12 @@ module AMQP
     end
 
     # Declare an exchange and return a high level Exchange object
+    # @param name [String] Name of the exchange
+    # @param type [String] Type of the exchange, one of "direct", "fanout", "topic", "headers" or custom exchange type
+    # @param durable [Boolean] If true the exchange will survive broker restarts
+    # @param auto_delete [Boolean] If true the exchange will be deleted when the last queue is unbound
+    # @param internal [Boolean] If true the exchange will not accept directly published messages
+    # @param arguments [Hash] Custom arguments such as alternate-exchange etc.
     # @return [Exchange]
     # @example
     #   amqp = AMQP::Client.new.start
@@ -131,6 +138,42 @@ module AMQP
       end
     end
 
+    # Declare a fanout exchange and return a high level Exchange object
+    # @param name [String] Name of the exchange (defaults to "amq.fanout")
+    # @see {#exchange} for other parameters
+    # @return [Exchange]
+    def fanout(name = "amq.fanout", **kwargs)
+      exchange(name, "fanout", **kwargs)
+    end
+
+    # Declare a direct exchange and return a high level Exchange object
+    # @param name [String] Name of the exchange (defaults to "" for the default direct exchange)
+    # @see {#exchange} for other parameters
+    # @return [Exchange]
+    def direct(name = "", **kwargs)
+      return exchange(name, "direct", **kwargs) unless name.empty?
+
+      @exchanges.fetch(name) do
+        @exchanges[name] = Exchange.new(self, name)
+      end
+    end
+
+    # Declare a topic exchange and return a high level Exchange object
+    # @param name [String] Name of the exchange (defaults to "amq.topic")
+    # @see {#exchange} for other parameters
+    # @return [Exchange]
+    def topic(name = "amq.topic", **kwargs)
+      exchange(name, "topic", **kwargs)
+    end
+
+    # Declare a headers exchange and return a high level Exchange object
+    # @param name [String] Name of the exchange (defaults to "amq.headers")
+    # @see {#exchange} for other parameters
+    # @return [Exchange]
+    def headers(name = "amq.headers", **kwargs)
+      exchange(name, "headers", **kwargs)
+    end
+
     # @!endgroup
     # @!group Publish
 

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: amqp-client
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.1
 platform: ruby
 authors:
-- Carl Hörberg
-autorequire: 
+- CloudAMQP
 bindir: exe
 cert_chain: []
-date: 2024-05-12 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: []
@@ -53,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
@@ -61,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.9
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: AMQP 0-9-1 client
 test_files: []