@onify/fake-amqplib 3.5.0 → 3.6.0

package/index.d.ts

@@ -1,90 +1,104 @@
-/// <reference types="amqplib" />
 /// <reference types="node" />
 
-import { Options, Connection, Channel, ChannelModel, Replies } from 'amqplib';
-import { Broker } from 'smqp';
+declare module '@onify/fake-amqplib' {
+  import { Options, Channel, ChannelModel, Replies, RecoveryOptions, SocketOptions } from 'amqplib';
+  import { Broker } from 'smqp';
 
-export interface FakeAmqplibChannel extends Channel {
-  /** Channel name and identifier, for faking purposes */
-  _channelName: string;
-  _broker: Broker;
-  _version: number;
-  readonly _closed: boolean;
-}
+  export { RecoveryOptions, SocketOptions };
 
-export const FakeAmqplibChannel: {
-  new (broker: Broker, connection: FakeAmqplibConnection): FakeAmqplibChannel;
-};
+  export interface FakeAmqplibChannel extends Channel {
+    /** Channel name and identifier, for faking purposes */
+    _channelName: string;
+    _broker: Broker;
+    _version: number;
+    readonly _closed: boolean;
+  }
 
-export interface FakeAmqplibConfirmChannel extends FakeAmqplibChannel {
-  publish(
-    exchange: string,
-    routingKey: string,
-    content: Buffer,
-    options?: Options.Publish,
-    callback?: (err: Error | null, ok: Replies.Empty) => void
-  ): boolean;
-  sendToQueue(
-    queue: string,
-    content: Buffer,
-    options?: Options.Publish,
-    callback?: (err: Error | null, ok: Replies.Empty) => void
-  ): boolean;
-  waitForConfirms(callback?: (err: Error | null) => void): Promise<void>;
-}
+  export const FakeAmqplibChannel: {
+    new (broker: Broker, connection: FakeAmqplibConnection): FakeAmqplibChannel;
+  };
 
-export const FakeAmqplibConfirmChannel: {
-  new (broker: Broker, connection: FakeAmqplibConnection): FakeAmqplibConfirmChannel;
-};
+  export interface FakeAmqplibConfirmChannel extends FakeAmqplibChannel {
+    publish(
+      exchange: string,
+      routingKey: string,
+      content: Buffer,
+      options?: Options.Publish,
+      callback?: (err: Error | null, ok: Replies.Empty) => void
+    ): boolean;
+    sendToQueue(
+      queue: string,
+      content: Buffer,
+      options?: Options.Publish,
+      callback?: (err: Error | null, ok: Replies.Empty) => void
+    ): boolean;
+    waitForConfirms(callback?: (err: Error | null) => void): Promise<void>;
+  }
 
-export interface FakeAmqplibConnection extends Connection, ChannelModel {
-  _channels: FakeAmqplibChannel[];
-  _url: URL;
-  /** Connection identifier, for faking purposes */
-  _id: string;
-  _broker: Broker;
-  _version: number;
-  readonly _closed: boolean;
-}
+  export const FakeAmqplibConfirmChannel: {
+    new (broker: Broker, connection: FakeAmqplibConnection): FakeAmqplibConfirmChannel;
+  };
 
-export const FakeAmqplibConnection: {
-  new (broker: Broker, version: number, amqpUrl: string, options?: SocketOptions): FakeAmqplibConnection;
-};
+  export interface FakeAmqplibConnection extends ChannelModel {
+    _channels: FakeAmqplibChannel[];
+    _url: URL;
+    /** Connection identifier, for faking purposes */
+    _id: string;
+    _broker: Broker;
+    _version: number;
+    readonly _closed: boolean;
+  }
 
-export interface SocketOptions {
-  host?: string;
-  keepAlive?: boolean;
-  keepAliveDelay?: number;
-  noDelay?: boolean;
-  port?: number;
-  serverName?: string;
-  timeout?: number;
-  [x: string]: any;
-}
+  export const FakeAmqplibConnection: {
+    new (broker: Broker, version: number, amqpUrl: string, options?: SocketOptions): FakeAmqplibConnection;
+  };
 
-export type ConnectCallback = (err: Error | null, connection: FakeAmqplibConnection) => void;
+  export type ConnectCallback = (err: Error | null, connection: FakeAmqplibConnection) => void;
 
-export interface FakeAmqplib {
-  version: number;
-  connections: FakeAmqplibConnection[];
-  connect(url: string | Options.Connect, socketOptions?: SocketOptions): Promise<FakeAmqplibConnection>;
-  connect(url: string | Options.Connect, socketOptions: SocketOptions, callback: ConnectCallback): void;
-  connect(url: string | Options.Connect, callback: ConnectCallback): void;
-  connectSync(url: string | Options.Connect, socketOptions?: SocketOptions): FakeAmqplibConnection;
-  resetMock(): void;
-  setVersion(minorVersion: number | string): void;
-}
+  export interface FakeAmqplib {
+    version: number;
+    connections: FakeAmqplibConnection[];
+    connect(url: string | Options.Connect, socketOptions?: SocketOptions): Promise<FakeAmqplibConnection>;
+    connect(url: string | Options.Connect, socketOptions: SocketOptions, callback: ConnectCallback): void;
+    connect(url: string | Options.Connect, callback: ConnectCallback): void;
+    connectSync(url: string | Options.Connect, socketOptions?: SocketOptions): FakeAmqplibConnection;
+    connectWithRecoveryPromise(
+      url: string | Options.Connect,
+      recoveryOptions?: RecoveryOptions,
+      socketOptions?: SocketOptions
+    ): Promise<FakeAmqplibConnection>;
+    connectWithRecoveryCallback(
+      url: string | Options.Connect,
+      recoveryOptions: RecoveryOptions,
+      socketOptions: SocketOptions,
+      callback: ConnectCallback
+    ): void;
+    resetMock(): void;
+    setVersion(minorVersion: number | string): void;
+  }
 
-export const FakeAmqplib: {
-  new (minorVersion?: number | string): FakeAmqplib;
-  (minorVersion?: number | string): FakeAmqplib;
-};
+  export const FakeAmqplib: {
+    new (minorVersion?: number | string): FakeAmqplib;
+    (minorVersion?: number | string): FakeAmqplib;
+  };
 
-export const connections: FakeAmqplibConnection[];
+  export const connections: FakeAmqplibConnection[];
 
-export function connect(url: string | Options.Connect, socketOptions?: SocketOptions): Promise<FakeAmqplibConnection>;
-export function connect(url: string | Options.Connect, socketOptions: SocketOptions, callback: ConnectCallback): void;
-export function connect(url: string | Options.Connect, callback: ConnectCallback): void;
-export function connectSync(url: string | Options.Connect, socketOptions?: SocketOptions): FakeAmqplibConnection;
-export function resetMock(): void;
-export function setVersion(minorVersion: number | string): void;
+  export function connect(url: string | Options.Connect, socketOptions?: SocketOptions): Promise<FakeAmqplibConnection>;
+  export function connect(url: string | Options.Connect, socketOptions: SocketOptions, callback: ConnectCallback): void;
+  export function connect(url: string | Options.Connect, callback: ConnectCallback): void;
+  export function connectSync(url: string | Options.Connect, socketOptions?: SocketOptions): FakeAmqplibConnection;
+  export function connectWithRecoveryPromise(
+    url: string | Options.Connect,
+    recoveryOptions?: RecoveryOptions,
+    socketOptions?: SocketOptions
+  ): Promise<FakeAmqplibConnection>;
+  export function connectWithRecoveryCallback(
+    url: string | Options.Connect,
+    recoveryOptions: RecoveryOptions,
+    socketOptions: SocketOptions,
+    callback: ConnectCallback
+  ): void;
+  export function resetMock(): void;
+  export function setVersion(minorVersion: number | string): void;
+}

package/index.js

@@ -437,10 +437,12 @@ export class FakeAmqplibChannel extends EventEmitter {
     return this._callBroker(recoverChannel, ...args);
 
     function recoverChannel() {
+      const snapshot = [];
       let msg;
-      while ((msg = channelQ.get())) {
-        msg.content[kSmqp].reject(true);
-        msg.reject(false);
+      while ((msg = channelQ.get())) snapshot.push(msg);
+      for (const m of snapshot) {
+        m.content[kSmqp].reject(true);
+        m.reject(false);
       }
       return {};
     }
@@ -674,6 +676,8 @@ export function FakeAmqplib(minorVersion = '3.5') {
 
   this.connect = this.connect.bind(this);
   this.connectSync = this.connectSync.bind(this);
+  this.connectWithRecoveryPromise = this.connectWithRecoveryPromise.bind(this);
+  this.connectWithRecoveryCallback = this.connectWithRecoveryCallback.bind(this);
   this.resetMock = this.resetMock.bind(this);
   this.setVersion = this.setVersion.bind(this);
 }
@@ -683,6 +687,19 @@ FakeAmqplib.prototype.connect = function fakeConnect(amqpUrl, ...args) {
   return resolveOrCallback(args.slice(-1)[0], null, connection);
 };
 
+FakeAmqplib.prototype.connectWithRecoveryPromise = function fakeConnectWithRecoveryPromise(amqpUrl, recoveryOptions, socketOptions) {
+  return this.connect(amqpUrl, socketOptions);
+};
+
+FakeAmqplib.prototype.connectWithRecoveryCallback = function fakeConnectWithRecoveryCallback(
+  amqpUrl,
+  recoveryOptions,
+  socketOptions,
+  callback
+) {
+  return this.connect(amqpUrl, socketOptions, callback);
+};
+
 FakeAmqplib.prototype.connectSync = function fakeConnectSync(amqpUrl, ...args) {
   const { _broker } = this.connections.find((conn) => compareConnectionString(conn._url, amqpUrl)) || {};
   const broker = _broker || new AmqplibBroker(this);
@@ -828,6 +845,14 @@ export function connectSync(amqpUrl, ...args) {
   return defaultFake.connectSync(amqpUrl, ...args);
 }
 
+export function connectWithRecoveryPromise(amqpUrl, recoveryOptions, socketOptions) {
+  return defaultFake.connectWithRecoveryPromise(amqpUrl, recoveryOptions, socketOptions);
+}
+
+export function connectWithRecoveryCallback(amqpUrl, recoveryOptions, socketOptions, callback) {
+  return defaultFake.connectWithRecoveryCallback(amqpUrl, recoveryOptions, socketOptions, callback);
+}
+
 export function resetMock() {
   return defaultFake.resetMock();
 }

package/main.cjs

@@ -439,10 +439,12 @@ class FakeAmqplibChannel extends events.EventEmitter {
     return this._callBroker(recoverChannel, ...args);
 
     function recoverChannel() {
+      const snapshot = [];
       let msg;
-      while ((msg = channelQ.get())) {
-        msg.content[kSmqp].reject(true);
-        msg.reject(false);
+      while ((msg = channelQ.get())) snapshot.push(msg);
+      for (const m of snapshot) {
+        m.content[kSmqp].reject(true);
+        m.reject(false);
       }
       return {};
     }
@@ -676,6 +678,8 @@ function FakeAmqplib(minorVersion = '3.5') {
 
   this.connect = this.connect.bind(this);
   this.connectSync = this.connectSync.bind(this);
+  this.connectWithRecoveryPromise = this.connectWithRecoveryPromise.bind(this);
+  this.connectWithRecoveryCallback = this.connectWithRecoveryCallback.bind(this);
   this.resetMock = this.resetMock.bind(this);
   this.setVersion = this.setVersion.bind(this);
 }
@@ -685,6 +689,19 @@ FakeAmqplib.prototype.connect = function fakeConnect(amqpUrl, ...args) {
   return resolveOrCallback(args.slice(-1)[0], null, connection);
 };
 
+FakeAmqplib.prototype.connectWithRecoveryPromise = function fakeConnectWithRecoveryPromise(amqpUrl, recoveryOptions, socketOptions) {
+  return this.connect(amqpUrl, socketOptions);
+};
+
+FakeAmqplib.prototype.connectWithRecoveryCallback = function fakeConnectWithRecoveryCallback(
+  amqpUrl,
+  recoveryOptions,
+  socketOptions,
+  callback
+) {
+  return this.connect(amqpUrl, socketOptions, callback);
+};
+
 FakeAmqplib.prototype.connectSync = function fakeConnectSync(amqpUrl, ...args) {
   const { _broker } = this.connections.find((conn) => compareConnectionString(conn._url, amqpUrl)) || {};
   const broker = _broker || new AmqplibBroker(this);
@@ -830,6 +847,14 @@ function connectSync(amqpUrl, ...args) {
   return defaultFake.connectSync(amqpUrl, ...args);
 }
 
+function connectWithRecoveryPromise(amqpUrl, recoveryOptions, socketOptions) {
+  return defaultFake.connectWithRecoveryPromise(amqpUrl, recoveryOptions, socketOptions);
+}
+
+function connectWithRecoveryCallback(amqpUrl, recoveryOptions, socketOptions, callback) {
+  return defaultFake.connectWithRecoveryCallback(amqpUrl, recoveryOptions, socketOptions, callback);
+}
+
 function resetMock() {
   return defaultFake.resetMock();
 }
@@ -844,6 +869,8 @@ exports.FakeAmqplibConfirmChannel = FakeAmqplibConfirmChannel;
 exports.FakeAmqplibConnection = FakeAmqplibConnection;
 exports.connect = connect;
 exports.connectSync = connectSync;
+exports.connectWithRecoveryCallback = connectWithRecoveryCallback;
+exports.connectWithRecoveryPromise = connectWithRecoveryPromise;
 exports.connections = connections;
 exports.resetMock = resetMock;
 exports.setVersion = setVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onify/fake-amqplib",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "Fake amqplib",
   "type": "module",
   "exports": {
@@ -40,8 +40,8 @@
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@rollup/plugin-commonjs": "^29.0.0",
-    "@types/amqplib": "^0.10.2",
-    "amqplib": "^1.0.3",
+    "@types/node": "^20.19.40",
+    "amqplib": "^1.2.0",
     "c8": "^11.0.0",
     "chai": "^6.2.1",
     "eslint": "^10.3.0",