fix: propagate channel errors to connection and handle channel close properly

carlhoerberg · claude · baelter · commit 1bb9fe6db1fc · 2025-09-09T13:20:14.000+02:00
- Modify onerror handler in AMQPChannel to propagate errors to the connection level - Ensure channel errors are properly handled regardless of closure reason - Prevent propagation from connection channel (id=0) to avoid recursion 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/src/amqp-channel.ts b/src/amqp-channel.ts
@@ -28,7 +28,13 @@ export class AMQPChannel {
   constructor(connection: AMQPBaseClient, id: number) {
     this.connection = connection
     this.id = id
-    this.onerror = (reason: string) => this.logger?.error(`channel ${this.id} closed: ${reason}`)
+    this.onerror = (reason: string) => {
+      this.logger?.error(`channel ${this.id} closed: ${reason}`)
+      // Propagate channel errors to the connection's onerror handler
+      if (this.id !== 0) { // Don't propagate for connection channel (id=0)
+        this.connection.onerror(new AMQPError(reason, this.connection))
+      }
+    }
   }
 
   private get logger() {
@@ -760,7 +766,6 @@ export class AMQPChannel {
    * @param [err] - why the channel was closed
    */
   setClosed(err?: Error): void {
-    const closedByServer = err !== undefined
     err ||= new Error("Connection closed by client")
     if (!this.closed) {
       this.closed = true
@@ -770,7 +775,11 @@ export class AMQPChannel {
       // Reject and clear all unconfirmed publishes
       this.unconfirmedPublishes.forEach(([, , reject]) => reject(err))
       this.unconfirmedPublishes.length = 0
-      if (closedByServer) this.onerror(err.message)
+      
+      // Call onerror for any error, whether from server or from a channel operation
+      if (err.message !== "Connection closed by client") {
+        this.onerror(err.message)
+      }
     }
   }
 
