@amqp-contract/core 0.3.4 → 0.4.0

package/dist/index.cjs

@@ -28,22 +28,113 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 let amqp_connection_manager = require("amqp-connection-manager");
 amqp_connection_manager = __toESM(amqp_connection_manager);
 
-//#region src/index.ts
+//#region src/amqp-client.ts
+/**
+* Connection manager singleton for sharing connections across clients
+*/
+var ConnectionManagerSingleton = class ConnectionManagerSingleton {
+	static instance;
+	connections = /* @__PURE__ */ new Map();
+	refCounts = /* @__PURE__ */ new Map();
+	constructor() {}
+	static getInstance() {
+		if (!ConnectionManagerSingleton.instance) ConnectionManagerSingleton.instance = new ConnectionManagerSingleton();
+		return ConnectionManagerSingleton.instance;
+	}
+	/**
+	* Get or create a connection for the given URLs and options
+	*/
+	getConnection(urls, connectionOptions) {
+		const key = this.createConnectionKey(urls, connectionOptions);
+		if (!this.connections.has(key)) {
+			const connection = amqp_connection_manager.default.connect(urls, connectionOptions);
+			this.connections.set(key, connection);
+			this.refCounts.set(key, 0);
+		}
+		this.refCounts.set(key, (this.refCounts.get(key) ?? 0) + 1);
+		return this.connections.get(key);
+	}
+	/**
+	* Release a connection reference. If no more references exist, close the connection.
+	*/
+	async releaseConnection(urls, connectionOptions) {
+		const key = this.createConnectionKey(urls, connectionOptions);
+		const refCount = this.refCounts.get(key) ?? 0;
+		if (refCount <= 1) {
+			const connection = this.connections.get(key);
+			if (connection) {
+				await connection.close();
+				this.connections.delete(key);
+				this.refCounts.delete(key);
+			}
+		} else this.refCounts.set(key, refCount - 1);
+	}
+	createConnectionKey(urls, connectionOptions) {
+		return `${JSON.stringify(urls)}::${connectionOptions ? this.serializeOptions(connectionOptions) : ""}`;
+	}
+	serializeOptions(options) {
+		const sorted = this.deepSort(options);
+		return JSON.stringify(sorted);
+	}
+	deepSort(value) {
+		if (Array.isArray(value)) return value.map((item) => this.deepSort(item));
+		if (value !== null && typeof value === "object") {
+			const obj = value;
+			const sortedKeys = Object.keys(obj).sort();
+			const result = {};
+			for (const key of sortedKeys) result[key] = this.deepSort(obj[key]);
+			return result;
+		}
+		return value;
+	}
+	/**
+	* Reset all cached connections (for testing purposes)
+	* @internal
+	*/
+	async _resetForTesting() {
+		const closePromises = Array.from(this.connections.values()).map((conn) => conn.close());
+		await Promise.all(closePromises);
+		this.connections.clear();
+		this.refCounts.clear();
+	}
+};
 var AmqpClient = class {
 	connection;
 	channel;
+	urls;
+	connectionOptions;
 	constructor(contract, options) {
 		this.contract = contract;
-		this.options = options;
-		this.connection = amqp_connection_manager.default.connect(this.options.urls, this.options.connectionOptions);
+		this.urls = options.urls;
+		if (options.connectionOptions !== void 0) this.connectionOptions = options.connectionOptions;
+		this.connection = ConnectionManagerSingleton.getInstance().getConnection(options.urls, options.connectionOptions);
 		this.channel = this.connection.createChannel({
 			json: true,
 			setup: (channel) => this.setup(channel)
 		});
 	}
+	/**
+	* Get the underlying connection manager
+	*
+	* This method exposes the AmqpConnectionManager instance that this client uses.
+	* The connection is automatically shared across all AmqpClient instances that
+	* use the same URLs and connection options.
+	*
+	* @returns The AmqpConnectionManager instance used by this client
+	*/
+	getConnection() {
+		return this.connection;
+	}
 	async close() {
 		await this.channel.close();
-		await this.connection.close();
+		await ConnectionManagerSingleton.getInstance().releaseConnection(this.urls, this.connectionOptions);
+	}
+	/**
+	* Reset connection singleton cache (for testing only)
+	* @internal
+	*/
+	static async _resetConnectionCacheForTesting() {
+		await ConnectionManagerSingleton.getInstance()._resetForTesting();
 	}
 	async setup(channel) {
 		const exchangeErrors = (await Promise.allSettled(Object.values(this.contract.exchanges ?? {}).map((exchange) => channel.assertExchange(exchange.name, exchange.type, {

package/dist/index.d.cts

@@ -1,5 +1,5 @@
+import { AmqpConnectionManager, AmqpConnectionManagerOptions, ChannelWrapper, ConnectionUrl } from "amqp-connection-manager";
 import { ContractDefinition } from "@amqp-contract/contract";
-import { AmqpConnectionManagerOptions, ChannelWrapper, ConnectionUrl } from "amqp-connection-manager";
 
 //#region src/logger.d.ts
 
@@ -31,7 +31,7 @@ type LoggerContext = Record<string, unknown> & {
  * };
  * ```
  */
-interface Logger {
+type Logger = {
   /**
    * Log debug level messages
    * @param message - The log message
@@ -56,22 +56,38 @@ interface Logger {
    * @param context - Optional context to include with the log
    */
   error(message: string, context?: LoggerContext): void;
-}
+};
 //#endregion
-//#region src/index.d.ts
+//#region src/amqp-client.d.ts
 type AmqpClientOptions = {
   urls: ConnectionUrl[];
   connectionOptions?: AmqpConnectionManagerOptions | undefined;
 };
 declare class AmqpClient {
   private readonly contract;
-  private readonly options;
   private readonly connection;
   readonly channel: ChannelWrapper;
+  private readonly urls;
+  private readonly connectionOptions?;
   constructor(contract: ContractDefinition, options: AmqpClientOptions);
+  /**
+   * Get the underlying connection manager
+   *
+   * This method exposes the AmqpConnectionManager instance that this client uses.
+   * The connection is automatically shared across all AmqpClient instances that
+   * use the same URLs and connection options.
+   *
+   * @returns The AmqpConnectionManager instance used by this client
+   */
+  getConnection(): AmqpConnectionManager;
   close(): Promise<void>;
+  /**
+   * Reset connection singleton cache (for testing only)
+   * @internal
+   */
+  static _resetConnectionCacheForTesting(): Promise<void>;
   private setup;
 }
 //#endregion
-export { AmqpClient, AmqpClientOptions, type Logger, type LoggerContext };
+export { AmqpClient, type AmqpClientOptions, type Logger, type LoggerContext };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","names":[],"sources":["../src/logger.ts","../src/index.ts"],"sourcesContent":[],"mappings":";;;;;;;;;AAQA;AAqBA;;;AAoBkC,KAzCtB,aAAA,GAAgB,MAyCM,CAAA,MAAA,EAAA,OAAA,CAAA,GAAA;EAOC,KAAA,CAAA,EAAA,OAAA;CAAa;;;;AC7ChD;AAKA;;;;;;;;;;;;;UDaiB,MAAA;;;;;;mCAMkB;;;;;;kCAOD;;;;;;kCAOA;;;;;;mCAOC;;;;KC7CvB,iBAAA;EDHA,IAAA,ECIJ,aDJiB,EAAA;EAqBR,iBAAM,CAAA,EChBD,4BDgBC,GAAA,SAAA;CAMY;AAOD,cC1BrB,UAAA,CD0BqB;EAOA,iBAAA,QAAA;EAOC,iBAAA,OAAA;EAAa,iBAAA,UAAA;oBCtCrB;wBAGI,6BACD;WASb;EApBL,QAAA,KAAA;AAKZ"}
+{"version":3,"file":"index.d.cts","names":[],"sources":["../src/logger.ts","../src/amqp-client.ts"],"sourcesContent":[],"mappings":";;;;;;;;;AAQA;AAqBA;;;AAoBkC,KAzCtB,aAAA,GAAgB,MAyCM,CAAA,MAAA,EAAA,OAAA,CAAA,GAAA;EAOC,KAAA,CAAA,EAAA,OAAA;CAAa;;;;AC/ChD;AAuHA;;;;;;;;;;;;;KDnGY,MAAA;;;;;;mCAMuB;;;;;;kCAOD;;;;;;kCAOA;;;;;;mCAOC;;;;KC/CvB,iBAAA;QACJ;EDFI,iBAAa,CAAA,ECGH,4BDHY,GAAA,SAAA;AAqBlC,CAAA;AAMmC,cC6FtB,UAAA,CD7FsB;EAOD,iBAAA,QAAA;EAOA,iBAAA,UAAA;EAOC,SAAA,OAAA,EC0ER,cD1EQ;EAAa,iBAAA,IAAA;;wBC+EjB,6BAClB;;AA/Hb;AAuHA;;;;;;;EAkDyD,aAAA,CAAA,CAAA,EAftC,qBAesC;WAXxC;;;;;4CAWiC"}

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { AmqpConnectionManagerOptions, ChannelWrapper, ConnectionUrl } from "amqp-connection-manager";
+import { AmqpConnectionManager, AmqpConnectionManagerOptions, ChannelWrapper, ConnectionUrl } from "amqp-connection-manager";
 import { ContractDefinition } from "@amqp-contract/contract";
 
 //#region src/logger.d.ts
@@ -31,7 +31,7 @@ type LoggerContext = Record<string, unknown> & {
  * };
  * ```
  */
-interface Logger {
+type Logger = {
   /**
    * Log debug level messages
    * @param message - The log message
@@ -56,22 +56,38 @@ interface Logger {
    * @param context - Optional context to include with the log
    */
   error(message: string, context?: LoggerContext): void;
-}
+};
 //#endregion
-//#region src/index.d.ts
+//#region src/amqp-client.d.ts
 type AmqpClientOptions = {
   urls: ConnectionUrl[];
   connectionOptions?: AmqpConnectionManagerOptions | undefined;
 };
 declare class AmqpClient {
   private readonly contract;
-  private readonly options;
   private readonly connection;
   readonly channel: ChannelWrapper;
+  private readonly urls;
+  private readonly connectionOptions?;
   constructor(contract: ContractDefinition, options: AmqpClientOptions);
+  /**
+   * Get the underlying connection manager
+   *
+   * This method exposes the AmqpConnectionManager instance that this client uses.
+   * The connection is automatically shared across all AmqpClient instances that
+   * use the same URLs and connection options.
+   *
+   * @returns The AmqpConnectionManager instance used by this client
+   */
+  getConnection(): AmqpConnectionManager;
   close(): Promise<void>;
+  /**
+   * Reset connection singleton cache (for testing only)
+   * @internal
+   */
+  static _resetConnectionCacheForTesting(): Promise<void>;
   private setup;
 }
 //#endregion
-export { AmqpClient, AmqpClientOptions, type Logger, type LoggerContext };
+export { AmqpClient, type AmqpClientOptions, type Logger, type LoggerContext };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/logger.ts","../src/index.ts"],"sourcesContent":[],"mappings":";;;;;;;;;AAQA;AAqBA;;;AAoBkC,KAzCtB,aAAA,GAAgB,MAyCM,CAAA,MAAA,EAAA,OAAA,CAAA,GAAA;EAOC,KAAA,CAAA,EAAA,OAAA;CAAa;;;;AC7ChD;AAKA;;;;;;;;;;;;;UDaiB,MAAA;;;;;;mCAMkB;;;;;;kCAOD;;;;;;kCAOA;;;;;;mCAOC;;;;KC7CvB,iBAAA;EDHA,IAAA,ECIJ,aDJiB,EAAA;EAqBR,iBAAM,CAAA,EChBD,4BDgBC,GAAA,SAAA;CAMY;AAOD,cC1BrB,UAAA,CD0BqB;EAOA,iBAAA,QAAA;EAOC,iBAAA,OAAA;EAAa,iBAAA,UAAA;oBCtCrB;wBAGI,6BACD;WASb;EApBL,QAAA,KAAA;AAKZ"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/logger.ts","../src/amqp-client.ts"],"sourcesContent":[],"mappings":";;;;;;;;;AAQA;AAqBA;;;AAoBkC,KAzCtB,aAAA,GAAgB,MAyCM,CAAA,MAAA,EAAA,OAAA,CAAA,GAAA;EAOC,KAAA,CAAA,EAAA,OAAA;CAAa;;;;AC/ChD;AAuHA;;;;;;;;;;;;;KDnGY,MAAA;;;;;;mCAMuB;;;;;;kCAOD;;;;;;kCAOA;;;;;;mCAOC;;;;KC/CvB,iBAAA;QACJ;EDFI,iBAAa,CAAA,ECGH,4BDHY,GAAA,SAAA;AAqBlC,CAAA;AAMmC,cC6FtB,UAAA,CD7FsB;EAOD,iBAAA,QAAA;EAOA,iBAAA,UAAA;EAOC,SAAA,OAAA,EC0ER,cD1EQ;EAAa,iBAAA,IAAA;;wBC+EjB,6BAClB;;AA/Hb;AAuHA;;;;;;;EAkDyD,aAAA,CAAA,CAAA,EAftC,qBAesC;WAXxC;;;;;4CAWiC"}

package/dist/index.mjs

@@ -1,21 +1,112 @@
 import amqp from "amqp-connection-manager";
 
-//#region src/index.ts
+//#region src/amqp-client.ts
+/**
+* Connection manager singleton for sharing connections across clients
+*/
+var ConnectionManagerSingleton = class ConnectionManagerSingleton {
+	static instance;
+	connections = /* @__PURE__ */ new Map();
+	refCounts = /* @__PURE__ */ new Map();
+	constructor() {}
+	static getInstance() {
+		if (!ConnectionManagerSingleton.instance) ConnectionManagerSingleton.instance = new ConnectionManagerSingleton();
+		return ConnectionManagerSingleton.instance;
+	}
+	/**
+	* Get or create a connection for the given URLs and options
+	*/
+	getConnection(urls, connectionOptions) {
+		const key = this.createConnectionKey(urls, connectionOptions);
+		if (!this.connections.has(key)) {
+			const connection = amqp.connect(urls, connectionOptions);
+			this.connections.set(key, connection);
+			this.refCounts.set(key, 0);
+		}
+		this.refCounts.set(key, (this.refCounts.get(key) ?? 0) + 1);
+		return this.connections.get(key);
+	}
+	/**
+	* Release a connection reference. If no more references exist, close the connection.
+	*/
+	async releaseConnection(urls, connectionOptions) {
+		const key = this.createConnectionKey(urls, connectionOptions);
+		const refCount = this.refCounts.get(key) ?? 0;
+		if (refCount <= 1) {
+			const connection = this.connections.get(key);
+			if (connection) {
+				await connection.close();
+				this.connections.delete(key);
+				this.refCounts.delete(key);
+			}
+		} else this.refCounts.set(key, refCount - 1);
+	}
+	createConnectionKey(urls, connectionOptions) {
+		return `${JSON.stringify(urls)}::${connectionOptions ? this.serializeOptions(connectionOptions) : ""}`;
+	}
+	serializeOptions(options) {
+		const sorted = this.deepSort(options);
+		return JSON.stringify(sorted);
+	}
+	deepSort(value) {
+		if (Array.isArray(value)) return value.map((item) => this.deepSort(item));
+		if (value !== null && typeof value === "object") {
+			const obj = value;
+			const sortedKeys = Object.keys(obj).sort();
+			const result = {};
+			for (const key of sortedKeys) result[key] = this.deepSort(obj[key]);
+			return result;
+		}
+		return value;
+	}
+	/**
+	* Reset all cached connections (for testing purposes)
+	* @internal
+	*/
+	async _resetForTesting() {
+		const closePromises = Array.from(this.connections.values()).map((conn) => conn.close());
+		await Promise.all(closePromises);
+		this.connections.clear();
+		this.refCounts.clear();
+	}
+};
 var AmqpClient = class {
 	connection;
 	channel;
+	urls;
+	connectionOptions;
 	constructor(contract, options) {
 		this.contract = contract;
-		this.options = options;
-		this.connection = amqp.connect(this.options.urls, this.options.connectionOptions);
+		this.urls = options.urls;
+		if (options.connectionOptions !== void 0) this.connectionOptions = options.connectionOptions;
+		this.connection = ConnectionManagerSingleton.getInstance().getConnection(options.urls, options.connectionOptions);
 		this.channel = this.connection.createChannel({
 			json: true,
 			setup: (channel) => this.setup(channel)
 		});
 	}
+	/**
+	* Get the underlying connection manager
+	*
+	* This method exposes the AmqpConnectionManager instance that this client uses.
+	* The connection is automatically shared across all AmqpClient instances that
+	* use the same URLs and connection options.
+	*
+	* @returns The AmqpConnectionManager instance used by this client
+	*/
+	getConnection() {
+		return this.connection;
+	}
 	async close() {
 		await this.channel.close();
-		await this.connection.close();
+		await ConnectionManagerSingleton.getInstance().releaseConnection(this.urls, this.connectionOptions);
+	}
+	/**
+	* Reset connection singleton cache (for testing only)
+	* @internal
+	*/
+	static async _resetConnectionCacheForTesting() {
+		await ConnectionManagerSingleton.getInstance()._resetForTesting();
 	}
 	async setup(channel) {
 		const exchangeErrors = (await Promise.allSettled(Object.values(this.contract.exchanges ?? {}).map((exchange) => channel.assertExchange(exchange.name, exchange.type, {

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["contract: ContractDefinition","options: AmqpClientOptions"],"sources":["../src/index.ts"],"sourcesContent":["import type { Channel } from \"amqplib\";\nimport type { ContractDefinition } from \"@amqp-contract/contract\";\nimport amqp, {\n  AmqpConnectionManager,\n  AmqpConnectionManagerOptions,\n  ChannelWrapper,\n  ConnectionUrl,\n} from \"amqp-connection-manager\";\n\nexport type { Logger, LoggerContext } from \"./logger.js\";\n\nexport type AmqpClientOptions = {\n  urls: ConnectionUrl[];\n  connectionOptions?: AmqpConnectionManagerOptions | undefined;\n};\n\nexport class AmqpClient {\n  private readonly connection: AmqpConnectionManager;\n  public readonly channel: ChannelWrapper;\n\n  constructor(\n    private readonly contract: ContractDefinition,\n    private readonly options: AmqpClientOptions,\n  ) {\n    this.connection = amqp.connect(this.options.urls, this.options.connectionOptions);\n    this.channel = this.connection.createChannel({\n      json: true,\n      setup: (channel: Channel) => this.setup(channel),\n    });\n  }\n\n  async close(): Promise<void> {\n    await this.channel.close();\n    await this.connection.close();\n  }\n\n  private async setup(channel: Channel): Promise<void> {\n    // Setup exchanges\n    const exchangeResults = await Promise.allSettled(\n      Object.values(this.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(this.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(this.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}\n"],"mappings":";;;AAgBA,IAAa,aAAb,MAAwB;CACtB,AAAiB;CACjB,AAAgB;CAEhB,YACE,AAAiBA,UACjB,AAAiBC,SACjB;EAFiB;EACA;AAEjB,OAAK,aAAa,KAAK,QAAQ,KAAK,QAAQ,MAAM,KAAK,QAAQ,kBAAkB;AACjF,OAAK,UAAU,KAAK,WAAW,cAAc;GAC3C,MAAM;GACN,QAAQ,YAAqB,KAAK,MAAM,QAAQ;GACjD,CAAC;;CAGJ,MAAM,QAAuB;AAC3B,QAAM,KAAK,QAAQ,OAAO;AAC1B,QAAM,KAAK,WAAW,OAAO;;CAG/B,MAAc,MAAM,SAAiC;EAYnD,MAAM,kBAVkB,MAAM,QAAQ,WACpC,OAAO,OAAO,KAAK,SAAS,aAAa,EAAE,CAAC,CAAC,KAAK,aAChD,QAAQ,eAAe,SAAS,MAAM,SAAS,MAAM;GACnD,SAAS,SAAS;GAClB,YAAY,SAAS;GACrB,UAAU,SAAS;GACnB,WAAW,SAAS;GACrB,CAAC,CACH,CACF,EACsC,QACpC,WAA4C,OAAO,WAAW,WAChE;AACD,MAAI,eAAe,SAAS,EAC1B,OAAM,IAAI,eACR,eAAe,KAAK,EAAE,aAAa,OAAO,EAC1C,4BACD;EAcH,MAAM,eAVe,MAAM,QAAQ,WACjC,OAAO,OAAO,KAAK,SAAS,UAAU,EAAE,CAAC,CAAC,KAAK,UAC7C,QAAQ,YAAY,MAAM,MAAM;GAC9B,SAAS,MAAM;GACf,WAAW,MAAM;GACjB,YAAY,MAAM;GAClB,WAAW,MAAM;GAClB,CAAC,CACH,CACF,EACgC,QAC9B,WAA4C,OAAO,WAAW,WAChE;AACD,MAAI,YAAY,SAAS,EACvB,OAAM,IAAI,eACR,YAAY,KAAK,EAAE,aAAa,OAAO,EACvC,yBACD;EAuBH,MAAM,iBAnBiB,MAAM,QAAQ,WACnC,OAAO,OAAO,KAAK,SAAS,YAAY,EAAE,CAAC,CAAC,KAAK,YAAY;AAC3D,OAAI,QAAQ,SAAS,QACnB,QAAO,QAAQ,UACb,QAAQ,MAAM,MACd,QAAQ,SAAS,MACjB,QAAQ,cAAc,IACtB,QAAQ,UACT;AAGH,UAAO,QAAQ,aACb,QAAQ,YAAY,MACpB,QAAQ,OAAO,MACf,QAAQ,cAAc,IACtB,QAAQ,UACT;IACD,CACH,EACoC,QAClC,WAA4C,OAAO,WAAW,WAChE;AACD,MAAI,cAAc,SAAS,EACzB,OAAM,IAAI,eACR,cAAc,KAAK,EAAE,aAAa,OAAO,EACzC,2BACD"}
+{"version":3,"file":"index.mjs","names":["result: Record<string, unknown>","contract: ContractDefinition"],"sources":["../src/amqp-client.ts"],"sourcesContent":["import amqp, {\n  AmqpConnectionManager,\n  AmqpConnectionManagerOptions,\n  ChannelWrapper,\n  ConnectionUrl,\n} from \"amqp-connection-manager\";\nimport type { Channel } from \"amqplib\";\nimport type { ContractDefinition } from \"@amqp-contract/contract\";\n\nexport type AmqpClientOptions = {\n  urls: ConnectionUrl[];\n  connectionOptions?: AmqpConnectionManagerOptions | undefined;\n};\n\n/**\n * Connection manager singleton for sharing connections across clients\n */\nclass 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\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    this.channel = this.connection.createChannel({\n      json: true,\n      setup: (channel: Channel) => this.setup(channel),\n    });\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  private async setup(channel: Channel): Promise<void> {\n    // Setup exchanges\n    const exchangeResults = await Promise.allSettled(\n      Object.values(this.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(this.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(this.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}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amqp-contract/core",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "description": "Core utilities for AMQP setup and management in amqp-contract",
   "keywords": [
     "amqp",
@@ -43,7 +43,7 @@
   "dependencies": {
     "amqp-connection-manager": "5.0.0",
     "amqplib": "0.10.9",
-    "@amqp-contract/contract": "0.3.4"
+    "@amqp-contract/contract": "0.4.0"
   },
   "devDependencies": {
     "@types/amqplib": "0.10.8",