@amqp-contract/core 0.5.0 → 0.6.0

package/dist/index.cjs

@@ -112,12 +112,23 @@ async function setupAmqpTopology(channel, contract) {
 		arguments: exchange.arguments
 	})))).filter((result) => result.status === "rejected");
 	if (exchangeErrors.length > 0) throw new AggregateError(exchangeErrors.map(({ reason }) => reason), "Failed to setup exchanges");
-	const queueErrors = (await Promise.allSettled(Object.values(contract.queues ?? {}).map((queue) => channel.assertQueue(queue.name, {
-		durable: queue.durable,
-		exclusive: queue.exclusive,
-		autoDelete: queue.autoDelete,
-		arguments: queue.arguments
-	})))).filter((result) => result.status === "rejected");
+	for (const queue of Object.values(contract.queues ?? {})) if (queue.deadLetter) {
+		const dlxName = queue.deadLetter.exchange.name;
+		if (!Object.values(contract.exchanges ?? {}).some((exchange) => exchange.name === dlxName)) throw new Error(`Queue "${queue.name}" references dead letter exchange "${dlxName}" which is not declared in the contract. Add the exchange to contract.exchanges to ensure it is created before the queue.`);
+	}
+	const queueErrors = (await Promise.allSettled(Object.values(contract.queues ?? {}).map((queue) => {
+		const queueArguments = { ...queue.arguments };
+		if (queue.deadLetter) {
+			queueArguments["x-dead-letter-exchange"] = queue.deadLetter.exchange.name;
+			if (queue.deadLetter.routingKey) queueArguments["x-dead-letter-routing-key"] = queue.deadLetter.routingKey;
+		}
+		return channel.assertQueue(queue.name, {
+			durable: queue.durable,
+			exclusive: queue.exclusive,
+			autoDelete: queue.autoDelete,
+			arguments: queueArguments
+		});
+	}))).filter((result) => result.status === "rejected");
 	if (queueErrors.length > 0) throw new AggregateError(queueErrors.map(({ reason }) => reason), "Failed to setup queues");
 	const bindingErrors = (await Promise.allSettled(Object.values(contract.bindings ?? {}).map((binding) => {
 		if (binding.type === "queue") return channel.bindQueue(binding.queue.name, binding.exchange.name, binding.routingKey ?? "", binding.arguments);

package/dist/index.mjs

@@ -84,12 +84,23 @@ async function setupAmqpTopology(channel, contract) {
 		arguments: exchange.arguments
 	})))).filter((result) => result.status === "rejected");
 	if (exchangeErrors.length > 0) throw new AggregateError(exchangeErrors.map(({ reason }) => reason), "Failed to setup exchanges");
-	const queueErrors = (await Promise.allSettled(Object.values(contract.queues ?? {}).map((queue) => channel.assertQueue(queue.name, {
-		durable: queue.durable,
-		exclusive: queue.exclusive,
-		autoDelete: queue.autoDelete,
-		arguments: queue.arguments
-	})))).filter((result) => result.status === "rejected");
+	for (const queue of Object.values(contract.queues ?? {})) if (queue.deadLetter) {
+		const dlxName = queue.deadLetter.exchange.name;
+		if (!Object.values(contract.exchanges ?? {}).some((exchange) => exchange.name === dlxName)) throw new Error(`Queue "${queue.name}" references dead letter exchange "${dlxName}" which is not declared in the contract. Add the exchange to contract.exchanges to ensure it is created before the queue.`);
+	}
+	const queueErrors = (await Promise.allSettled(Object.values(contract.queues ?? {}).map((queue) => {
+		const queueArguments = { ...queue.arguments };
+		if (queue.deadLetter) {
+			queueArguments["x-dead-letter-exchange"] = queue.deadLetter.exchange.name;
+			if (queue.deadLetter.routingKey) queueArguments["x-dead-letter-routing-key"] = queue.deadLetter.routingKey;
+		}
+		return channel.assertQueue(queue.name, {
+			durable: queue.durable,
+			exclusive: queue.exclusive,
+			autoDelete: queue.autoDelete,
+			arguments: queueArguments
+		});
+	}))).filter((result) => result.status === "rejected");
 	if (queueErrors.length > 0) throw new AggregateError(queueErrors.map(({ reason }) => reason), "Failed to setup queues");
 	const bindingErrors = (await Promise.allSettled(Object.values(contract.bindings ?? {}).map((binding) => {
 		if (binding.type === "queue") return channel.bindQueue(binding.queue.name, binding.exchange.name, binding.routingKey ?? "", binding.arguments);

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["result: Record<string, unknown>","contract: ContractDefinition","channelOpts: CreateChannelOpts"],"sources":["../src/connection-manager.ts","../src/setup.ts","../src/amqp-client.ts"],"sourcesContent":["import amqp, {\n  AmqpConnectionManager,\n  AmqpConnectionManagerOptions,\n  ConnectionUrl,\n} from \"amqp-connection-manager\";\n\n/**\n * Connection manager singleton for sharing connections across clients\n */\nexport class ConnectionManagerSingleton {\n  private static instance: ConnectionManagerSingleton;\n  private connections: Map<string, AmqpConnectionManager> = new Map();\n  private refCounts: Map<string, number> = new Map();\n\n  private constructor() {}\n\n  static getInstance(): ConnectionManagerSingleton {\n    if (!ConnectionManagerSingleton.instance) {\n      ConnectionManagerSingleton.instance = new ConnectionManagerSingleton();\n    }\n    return ConnectionManagerSingleton.instance;\n  }\n\n  /**\n   * Get or create a connection for the given URLs and options\n   */\n  getConnection(\n    urls: ConnectionUrl[],\n    connectionOptions?: AmqpConnectionManagerOptions,\n  ): AmqpConnectionManager {\n    // Create a key based on URLs and connection options\n    const key = this.createConnectionKey(urls, connectionOptions);\n\n    if (!this.connections.has(key)) {\n      const connection = amqp.connect(urls, connectionOptions);\n      this.connections.set(key, connection);\n      this.refCounts.set(key, 0);\n    }\n\n    // Increment reference count\n    this.refCounts.set(key, (this.refCounts.get(key) ?? 0) + 1);\n\n    return this.connections.get(key)!;\n  }\n\n  /**\n   * Release a connection reference. If no more references exist, close the connection.\n   */\n  async releaseConnection(\n    urls: ConnectionUrl[],\n    connectionOptions?: AmqpConnectionManagerOptions,\n  ): Promise<void> {\n    const key = this.createConnectionKey(urls, connectionOptions);\n    const refCount = this.refCounts.get(key) ?? 0;\n\n    if (refCount <= 1) {\n      // Last reference - close and remove connection\n      const connection = this.connections.get(key);\n      if (connection) {\n        await connection.close();\n        this.connections.delete(key);\n        this.refCounts.delete(key);\n      }\n    } else {\n      // Decrement reference count\n      this.refCounts.set(key, refCount - 1);\n    }\n  }\n\n  private createConnectionKey(\n    urls: ConnectionUrl[],\n    connectionOptions?: AmqpConnectionManagerOptions,\n  ): string {\n    // Create a deterministic key from URLs and options\n    // Use JSON.stringify for URLs to avoid ambiguity (e.g., ['a,b'] vs ['a', 'b'])\n    const urlsStr = JSON.stringify(urls);\n    // Sort object keys for deterministic serialization of connection options\n    const optsStr = connectionOptions ? this.serializeOptions(connectionOptions) : \"\";\n    return `${urlsStr}::${optsStr}`;\n  }\n\n  private serializeOptions(options: AmqpConnectionManagerOptions): string {\n    // Create a deterministic string representation by deeply sorting all object keys\n    const sorted = this.deepSort(options);\n    return JSON.stringify(sorted);\n  }\n\n  private deepSort(value: unknown): unknown {\n    if (Array.isArray(value)) {\n      return value.map((item) => this.deepSort(item));\n    }\n\n    if (value !== null && typeof value === \"object\") {\n      const obj = value as Record<string, unknown>;\n      const sortedKeys = Object.keys(obj).sort();\n      const result: Record<string, unknown> = {};\n\n      for (const key of sortedKeys) {\n        result[key] = this.deepSort(obj[key]);\n      }\n\n      return result;\n    }\n\n    return value;\n  }\n\n  /**\n   * Reset all cached connections (for testing purposes)\n   * @internal\n   */\n  async _resetForTesting(): Promise<void> {\n    // Close all connections before clearing\n    const closePromises = Array.from(this.connections.values()).map((conn) => conn.close());\n    await Promise.all(closePromises);\n    this.connections.clear();\n    this.refCounts.clear();\n  }\n}\n","import type { Channel } from \"amqplib\";\nimport type { ContractDefinition } from \"@amqp-contract/contract\";\n\n/**\n * Setup AMQP topology (exchanges, queues, and bindings) from a contract definition\n */\nexport async function setupAmqpTopology(\n  channel: Channel,\n  contract: ContractDefinition,\n): Promise<void> {\n  // Setup exchanges\n  const exchangeResults = await Promise.allSettled(\n    Object.values(contract.exchanges ?? {}).map((exchange) =>\n      channel.assertExchange(exchange.name, exchange.type, {\n        durable: exchange.durable,\n        autoDelete: exchange.autoDelete,\n        internal: exchange.internal,\n        arguments: exchange.arguments,\n      }),\n    ),\n  );\n  const exchangeErrors = exchangeResults.filter(\n    (result): result is PromiseRejectedResult => result.status === \"rejected\",\n  );\n  if (exchangeErrors.length > 0) {\n    throw new AggregateError(\n      exchangeErrors.map(({ reason }) => reason),\n      \"Failed to setup exchanges\",\n    );\n  }\n\n  // Setup queues\n  const queueResults = await Promise.allSettled(\n    Object.values(contract.queues ?? {}).map((queue) =>\n      channel.assertQueue(queue.name, {\n        durable: queue.durable,\n        exclusive: queue.exclusive,\n        autoDelete: queue.autoDelete,\n        arguments: queue.arguments,\n      }),\n    ),\n  );\n  const queueErrors = queueResults.filter(\n    (result): result is PromiseRejectedResult => result.status === \"rejected\",\n  );\n  if (queueErrors.length > 0) {\n    throw new AggregateError(\n      queueErrors.map(({ reason }) => reason),\n      \"Failed to setup queues\",\n    );\n  }\n\n  // Setup bindings\n  const bindingResults = await Promise.allSettled(\n    Object.values(contract.bindings ?? {}).map((binding) => {\n      if (binding.type === \"queue\") {\n        return channel.bindQueue(\n          binding.queue.name,\n          binding.exchange.name,\n          binding.routingKey ?? \"\",\n          binding.arguments,\n        );\n      }\n\n      return channel.bindExchange(\n        binding.destination.name,\n        binding.source.name,\n        binding.routingKey ?? \"\",\n        binding.arguments,\n      );\n    }),\n  );\n  const bindingErrors = bindingResults.filter(\n    (result): result is PromiseRejectedResult => result.status === \"rejected\",\n  );\n  if (bindingErrors.length > 0) {\n    throw new AggregateError(\n      bindingErrors.map(({ reason }) => reason),\n      \"Failed to setup bindings\",\n    );\n  }\n}\n","import type {\n  AmqpConnectionManager,\n  AmqpConnectionManagerOptions,\n  ChannelWrapper,\n  ConnectionUrl,\n  CreateChannelOpts,\n} from \"amqp-connection-manager\";\nimport type { Channel } from \"amqplib\";\nimport { ConnectionManagerSingleton } from \"./connection-manager.js\";\nimport type { ContractDefinition } from \"@amqp-contract/contract\";\nimport { setupAmqpTopology } from \"./setup.js\";\n\nexport type AmqpClientOptions = {\n  urls: ConnectionUrl[];\n  connectionOptions?: AmqpConnectionManagerOptions | undefined;\n  channelOptions?: Partial<CreateChannelOpts> | undefined;\n};\n\nexport class AmqpClient {\n  private readonly connection: AmqpConnectionManager;\n  public readonly channel: ChannelWrapper;\n  private readonly urls: ConnectionUrl[];\n  private readonly connectionOptions?: AmqpConnectionManagerOptions;\n\n  constructor(\n    private readonly contract: ContractDefinition,\n    options: AmqpClientOptions,\n  ) {\n    // Store for cleanup\n    this.urls = options.urls;\n    if (options.connectionOptions !== undefined) {\n      this.connectionOptions = options.connectionOptions;\n    }\n\n    // Always use singleton to get/create connection\n    const singleton = ConnectionManagerSingleton.getInstance();\n    this.connection = singleton.getConnection(options.urls, options.connectionOptions);\n\n    // Create default setup function that calls setupAmqpTopology\n    const defaultSetup = (channel: Channel) => setupAmqpTopology(channel, this.contract);\n\n    // Destructure setup from channelOptions to handle it separately\n    const { setup: userSetup, ...otherChannelOptions } = options.channelOptions ?? {};\n\n    // Merge user-provided channel options with defaults\n    const channelOpts: CreateChannelOpts = {\n      json: true,\n      setup: defaultSetup,\n      ...otherChannelOptions,\n    };\n\n    // If user provided a custom setup, wrap it to call both\n    if (userSetup) {\n      channelOpts.setup = async (channel: Channel) => {\n        // First run the topology setup\n        await defaultSetup(channel);\n        // Then run user's setup - check arity to determine if it expects a callback\n        if (userSetup.length === 2) {\n          // Callback-based setup function\n          await new Promise<void>((resolve, reject) => {\n            (userSetup as (channel: Channel, callback: (error?: Error) => void) => void)(\n              channel,\n              (error?: Error) => {\n                if (error) reject(error);\n                else resolve();\n              },\n            );\n          });\n        } else {\n          // Promise-based setup function\n          await (userSetup as (channel: Channel) => Promise<void>)(channel);\n        }\n      };\n    }\n\n    this.channel = this.connection.createChannel(channelOpts);\n  }\n\n  /**\n   * Get the underlying connection manager\n   *\n   * This method exposes the AmqpConnectionManager instance that this client uses.\n   * The connection is automatically shared across all AmqpClient instances that\n   * use the same URLs and connection options.\n   *\n   * @returns The AmqpConnectionManager instance used by this client\n   */\n  getConnection(): AmqpConnectionManager {\n    return this.connection;\n  }\n\n  async close(): Promise<void> {\n    await this.channel.close();\n    // Release connection reference - will close connection if this was the last reference\n    const singleton = ConnectionManagerSingleton.getInstance();\n    await singleton.releaseConnection(this.urls, this.connectionOptions);\n  }\n\n  /**\n   * Reset connection singleton cache (for testing only)\n   * @internal\n   */\n  static async _resetConnectionCacheForTesting(): Promise<void> {\n    await ConnectionManagerSingleton.getInstance()._resetForTesting();\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"index.mjs","names":["result: Record<string, unknown>","contract: ContractDefinition","channelOpts: CreateChannelOpts"],"sources":["../src/connection-manager.ts","../src/setup.ts","../src/amqp-client.ts"],"sourcesContent":["import amqp, {\n  AmqpConnectionManager,\n  AmqpConnectionManagerOptions,\n  ConnectionUrl,\n} from \"amqp-connection-manager\";\n\n/**\n * Connection manager singleton for sharing connections across clients\n */\nexport class ConnectionManagerSingleton {\n  private static instance: ConnectionManagerSingleton;\n  private connections: Map<string, AmqpConnectionManager> = new Map();\n  private refCounts: Map<string, number> = new Map();\n\n  private constructor() {}\n\n  static getInstance(): ConnectionManagerSingleton {\n    if (!ConnectionManagerSingleton.instance) {\n      ConnectionManagerSingleton.instance = new ConnectionManagerSingleton();\n    }\n    return ConnectionManagerSingleton.instance;\n  }\n\n  /**\n   * Get or create a connection for the given URLs and options\n   */\n  getConnection(\n    urls: ConnectionUrl[],\n    connectionOptions?: AmqpConnectionManagerOptions,\n  ): AmqpConnectionManager {\n    // Create a key based on URLs and connection options\n    const key = this.createConnectionKey(urls, connectionOptions);\n\n    if (!this.connections.has(key)) {\n      const connection = amqp.connect(urls, connectionOptions);\n      this.connections.set(key, connection);\n      this.refCounts.set(key, 0);\n    }\n\n    // Increment reference count\n    this.refCounts.set(key, (this.refCounts.get(key) ?? 0) + 1);\n\n    return this.connections.get(key)!;\n  }\n\n  /**\n   * Release a connection reference. If no more references exist, close the connection.\n   */\n  async releaseConnection(\n    urls: ConnectionUrl[],\n    connectionOptions?: AmqpConnectionManagerOptions,\n  ): Promise<void> {\n    const key = this.createConnectionKey(urls, connectionOptions);\n    const refCount = this.refCounts.get(key) ?? 0;\n\n    if (refCount <= 1) {\n      // Last reference - close and remove connection\n      const connection = this.connections.get(key);\n      if (connection) {\n        await connection.close();\n        this.connections.delete(key);\n        this.refCounts.delete(key);\n      }\n    } else {\n      // Decrement reference count\n      this.refCounts.set(key, refCount - 1);\n    }\n  }\n\n  private createConnectionKey(\n    urls: ConnectionUrl[],\n    connectionOptions?: AmqpConnectionManagerOptions,\n  ): string {\n    // Create a deterministic key from URLs and options\n    // Use JSON.stringify for URLs to avoid ambiguity (e.g., ['a,b'] vs ['a', 'b'])\n    const urlsStr = JSON.stringify(urls);\n    // Sort object keys for deterministic serialization of connection options\n    const optsStr = connectionOptions ? this.serializeOptions(connectionOptions) : \"\";\n    return `${urlsStr}::${optsStr}`;\n  }\n\n  private serializeOptions(options: AmqpConnectionManagerOptions): string {\n    // Create a deterministic string representation by deeply sorting all object keys\n    const sorted = this.deepSort(options);\n    return JSON.stringify(sorted);\n  }\n\n  private deepSort(value: unknown): unknown {\n    if (Array.isArray(value)) {\n      return value.map((item) => this.deepSort(item));\n    }\n\n    if (value !== null && typeof value === \"object\") {\n      const obj = value as Record<string, unknown>;\n      const sortedKeys = Object.keys(obj).sort();\n      const result: Record<string, unknown> = {};\n\n      for (const key of sortedKeys) {\n        result[key] = this.deepSort(obj[key]);\n      }\n\n      return result;\n    }\n\n    return value;\n  }\n\n  /**\n   * Reset all cached connections (for testing purposes)\n   * @internal\n   */\n  async _resetForTesting(): Promise<void> {\n    // Close all connections before clearing\n    const closePromises = Array.from(this.connections.values()).map((conn) => conn.close());\n    await Promise.all(closePromises);\n    this.connections.clear();\n    this.refCounts.clear();\n  }\n}\n","import type { Channel } from \"amqplib\";\nimport type { ContractDefinition } from \"@amqp-contract/contract\";\n\n/**\n * Setup AMQP topology (exchanges, queues, and bindings) from a contract definition\n */\nexport async function setupAmqpTopology(\n  channel: Channel,\n  contract: ContractDefinition,\n): Promise<void> {\n  // Setup exchanges\n  const exchangeResults = await Promise.allSettled(\n    Object.values(contract.exchanges ?? {}).map((exchange) =>\n      channel.assertExchange(exchange.name, exchange.type, {\n        durable: exchange.durable,\n        autoDelete: exchange.autoDelete,\n        internal: exchange.internal,\n        arguments: exchange.arguments,\n      }),\n    ),\n  );\n  const exchangeErrors = exchangeResults.filter(\n    (result): result is PromiseRejectedResult => result.status === \"rejected\",\n  );\n  if (exchangeErrors.length > 0) {\n    throw new AggregateError(\n      exchangeErrors.map(({ reason }) => reason),\n      \"Failed to setup exchanges\",\n    );\n  }\n\n  // Validate dead letter exchanges before setting up queues\n  for (const queue of Object.values(contract.queues ?? {})) {\n    if (queue.deadLetter) {\n      const dlxName = queue.deadLetter.exchange.name;\n      const exchangeExists = Object.values(contract.exchanges ?? {}).some(\n        (exchange) => exchange.name === dlxName,\n      );\n\n      if (!exchangeExists) {\n        throw new Error(\n          `Queue \"${queue.name}\" references dead letter exchange \"${dlxName}\" which is not declared in the contract. ` +\n            `Add the exchange to contract.exchanges to ensure it is created before the queue.`,\n        );\n      }\n    }\n  }\n\n  // Setup queues\n  const queueResults = await Promise.allSettled(\n    Object.values(contract.queues ?? {}).map((queue) => {\n      // Build queue arguments, merging dead letter configuration if present\n      const queueArguments = { ...queue.arguments };\n      if (queue.deadLetter) {\n        queueArguments[\"x-dead-letter-exchange\"] = queue.deadLetter.exchange.name;\n        if (queue.deadLetter.routingKey) {\n          queueArguments[\"x-dead-letter-routing-key\"] = queue.deadLetter.routingKey;\n        }\n      }\n\n      return channel.assertQueue(queue.name, {\n        durable: queue.durable,\n        exclusive: queue.exclusive,\n        autoDelete: queue.autoDelete,\n        arguments: queueArguments,\n      });\n    }),\n  );\n  const queueErrors = queueResults.filter(\n    (result): result is PromiseRejectedResult => result.status === \"rejected\",\n  );\n  if (queueErrors.length > 0) {\n    throw new AggregateError(\n      queueErrors.map(({ reason }) => reason),\n      \"Failed to setup queues\",\n    );\n  }\n\n  // Setup bindings\n  const bindingResults = await Promise.allSettled(\n    Object.values(contract.bindings ?? {}).map((binding) => {\n      if (binding.type === \"queue\") {\n        return channel.bindQueue(\n          binding.queue.name,\n          binding.exchange.name,\n          binding.routingKey ?? \"\",\n          binding.arguments,\n        );\n      }\n\n      return channel.bindExchange(\n        binding.destination.name,\n        binding.source.name,\n        binding.routingKey ?? \"\",\n        binding.arguments,\n      );\n    }),\n  );\n  const bindingErrors = bindingResults.filter(\n    (result): result is PromiseRejectedResult => result.status === \"rejected\",\n  );\n  if (bindingErrors.length > 0) {\n    throw new AggregateError(\n      bindingErrors.map(({ reason }) => reason),\n      \"Failed to setup bindings\",\n    );\n  }\n}\n","import type {\n  AmqpConnectionManager,\n  AmqpConnectionManagerOptions,\n  ChannelWrapper,\n  ConnectionUrl,\n  CreateChannelOpts,\n} from \"amqp-connection-manager\";\nimport type { Channel } from \"amqplib\";\nimport { ConnectionManagerSingleton } from \"./connection-manager.js\";\nimport type { ContractDefinition } from \"@amqp-contract/contract\";\nimport { setupAmqpTopology } from \"./setup.js\";\n\nexport type AmqpClientOptions = {\n  urls: ConnectionUrl[];\n  connectionOptions?: AmqpConnectionManagerOptions | undefined;\n  channelOptions?: Partial<CreateChannelOpts> | undefined;\n};\n\nexport class AmqpClient {\n  private readonly connection: AmqpConnectionManager;\n  public readonly channel: ChannelWrapper;\n  private readonly urls: ConnectionUrl[];\n  private readonly connectionOptions?: AmqpConnectionManagerOptions;\n\n  constructor(\n    private readonly contract: ContractDefinition,\n    options: AmqpClientOptions,\n  ) {\n    // Store for cleanup\n    this.urls = options.urls;\n    if (options.connectionOptions !== undefined) {\n      this.connectionOptions = options.connectionOptions;\n    }\n\n    // Always use singleton to get/create connection\n    const singleton = ConnectionManagerSingleton.getInstance();\n    this.connection = singleton.getConnection(options.urls, options.connectionOptions);\n\n    // Create default setup function that calls setupAmqpTopology\n    const defaultSetup = (channel: Channel) => setupAmqpTopology(channel, this.contract);\n\n    // Destructure setup from channelOptions to handle it separately\n    const { setup: userSetup, ...otherChannelOptions } = options.channelOptions ?? {};\n\n    // Merge user-provided channel options with defaults\n    const channelOpts: CreateChannelOpts = {\n      json: true,\n      setup: defaultSetup,\n      ...otherChannelOptions,\n    };\n\n    // If user provided a custom setup, wrap it to call both\n    if (userSetup) {\n      channelOpts.setup = async (channel: Channel) => {\n        // First run the topology setup\n        await defaultSetup(channel);\n        // Then run user's setup - check arity to determine if it expects a callback\n        if (userSetup.length === 2) {\n          // Callback-based setup function\n          await new Promise<void>((resolve, reject) => {\n            (userSetup as (channel: Channel, callback: (error?: Error) => void) => void)(\n              channel,\n              (error?: Error) => {\n                if (error) reject(error);\n                else resolve();\n              },\n            );\n          });\n        } else {\n          // Promise-based setup function\n          await (userSetup as (channel: Channel) => Promise<void>)(channel);\n        }\n      };\n    }\n\n    this.channel = this.connection.createChannel(channelOpts);\n  }\n\n  /**\n   * Get the underlying connection manager\n   *\n   * This method exposes the AmqpConnectionManager instance that this client uses.\n   * The connection is automatically shared across all AmqpClient instances that\n   * use the same URLs and connection options.\n   *\n   * @returns The AmqpConnectionManager instance used by this client\n   */\n  getConnection(): AmqpConnectionManager {\n    return this.connection;\n  }\n\n  async close(): Promise<void> {\n    await this.channel.close();\n    // Release connection reference - will close connection if this was the last reference\n    const singleton = ConnectionManagerSingleton.getInstance();\n    await singleton.releaseConnection(this.urls, this.connectionOptions);\n  }\n\n  /**\n   * Reset connection singleton cache (for testing only)\n   * @internal\n   */\n  static async _resetConnectionCacheForTesting(): Promise<void> {\n    await ConnectionManagerSingleton.getInstance()._resetForTesting();\n  }\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amqp-contract/core",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Core utilities for AMQP setup and management in amqp-contract",
   "keywords": [
     "amqp",
@@ -43,19 +43,22 @@
   "dependencies": {
     "amqp-connection-manager": "5.0.0",
     "amqplib": "0.10.9",
-    "@amqp-contract/contract": "0.5.0"
+    "@amqp-contract/contract": "0.6.0"
   },
   "devDependencies": {
     "@types/amqplib": "0.10.8",
     "@vitest/coverage-v8": "4.0.16",
     "tsdown": "0.18.3",
+    "typedoc": "0.28.15",
     "typescript": "5.9.3",
     "vitest": "4.0.16",
-    "@amqp-contract/testing": "0.5.0",
-    "@amqp-contract/tsconfig": "0.0.0"
+    "@amqp-contract/testing": "0.6.0",
+    "@amqp-contract/tsconfig": "0.0.0",
+    "@amqp-contract/typedoc": "0.0.1"
   },
   "scripts": {
     "build": "tsdown src/index.ts --format cjs,esm --dts --clean",
+    "build:docs": "typedoc",
     "dev": "tsdown src/index.ts --format cjs,esm --dts --watch",
     "test": "vitest run --project unit",
     "test:integration": "vitest run --project integration",