Adjust to new AMQP types

packages/amqp/lib/AbstractAmqpConsumer.ts

@@ -11,7 +11,7 @@ import type {
   TransactionObservabilityManager,
 } from '@message-queue-toolkit/core'
 import { HandlerContainer, isMessageError, parseMessage } from '@message-queue-toolkit/core'
-import type { Connection, Message } from 'amqplib'
+import type { ChannelModel, Message } from 'amqplib'
 
 import type {
   AMQPConsumerDependencies,
@@ -123,7 +123,7 @@ export abstract class AbstractAmqpConsumer<
     await super.init()
   }
 
-  async receiveNewConnection(connection: Connection): Promise<void> {
+  async receiveNewConnection(connection: ChannelModel): Promise<void> {
     await super.receiveNewConnection(connection)
     await this.consume()
   }

packages/amqp/lib/AbstractAmqpService.ts

@@ -5,7 +5,7 @@ import type {
   QueueOptions,
 } from '@message-queue-toolkit/core'
 import { AbstractQueueService } from '@message-queue-toolkit/core'
-import type { Channel, Connection, Message } from 'amqplib'
+import type { Channel, ChannelModel, Message } from 'amqplib'
 import type { Options } from 'amqplib/properties'
 
 import type { AmqpConnectionManager, ConnectionReceiver } from './AmqpConnectionManager'
@@ -60,7 +60,7 @@ export abstract class AbstractAmqpService<
   >
   implements ConnectionReceiver
 {
-  protected connection?: Connection
+  protected connection?: ChannelModel
   private connectionManager: AmqpConnectionManager
   // @ts-ignore
   protected channel: Channel
@@ -78,7 +78,7 @@ export abstract class AbstractAmqpService<
     this.connectionManager.subscribeConnectionReceiver(this)
   }
 
-  async receiveNewConnection(connection: Connection) {
+  async receiveNewConnection(connection: ChannelModel) {
     this.connection = connection
 
     this.isShuttingDown = false

packages/amqp/lib/AmqpConnectionManager.ts

@@ -1,19 +1,19 @@
-import type { Connection } from 'amqplib'
+import type { ChannelModel } from 'amqplib'
 
 import type { CommonLogger } from '@lokalise/node-core'
 import type { AmqpConfig } from './amqpConnectionResolver'
 import { resolveAmqpConnection } from './amqpConnectionResolver'
 
 export type ConnectionReceiver = {
-  receiveNewConnection(connection: Connection): Promise<void>
+  receiveNewConnection(connection: ChannelModel): Promise<void>
   close(): Promise<void>
 }
 
 export class AmqpConnectionManager {
   private readonly config: AmqpConfig
   private readonly logger: CommonLogger
   private readonly connectionReceivers: ConnectionReceiver[]
-  private connection?: Connection
+  private connection?: ChannelModel
   public reconnectsActive: boolean
 
   public isReconnecting: boolean
@@ -26,7 +26,7 @@ export class AmqpConnectionManager {
     this.logger = logger
   }
 
-  private async createConnection() {
+  private async createConnection(): Promise<ChannelModel> {
     const connection = await resolveAmqpConnection(this.config)
     connection.on('error', (err) => {
       this.logger.error(`AmqpConnectionManager: Connection error: ${err.message}`)
@@ -61,7 +61,7 @@ export class AmqpConnectionManager {
     return this.connection
   }
 
-  async getConnection(): Promise<Connection> {
+  async getConnection(): Promise<ChannelModel> {
     if (!this.connection) {
       this.connection = await this.createConnection()
     }

packages/amqp/lib/amqpConnectionResolver.ts

@@ -1,7 +1,7 @@
 import { setTimeout } from 'node:timers/promises'
 
 import { globalLogger } from '@lokalise/node-core'
-import { connect } from 'amqplib'
+import { type ChannelModel, connect } from 'amqplib'
 
 const CONNECT_RETRY_SECONDS = 10
 const MAX_RETRY_ATTEMPTS = 10
@@ -15,7 +15,7 @@ export type AmqpConfig = {
   useTls: boolean
 }
 
-export async function resolveAmqpConnection(config: AmqpConfig) {
+export async function resolveAmqpConnection(config: AmqpConfig): Promise<ChannelModel> {
   const protocol = config.useTls ? 'amqps' : 'amqp'
   let counter = 0
   while (true) {

packages/amqp/lib/utils/amqpQueueUtils.ts

@@ -1,6 +1,6 @@
 import type { DeletionConfig } from '@message-queue-toolkit/core'
 import { isProduction } from '@message-queue-toolkit/core'
-import type { Channel, Connection } from 'amqplib'
+import type { Channel, ChannelModel } from 'amqplib'
 
 import type {
   AMQPQueueCreationConfig,
@@ -11,7 +11,7 @@ import type {
 } from '../AbstractAmqpService'
 
 export async function checkQueueExists(
-  connection: Connection,
+  connection: ChannelModel,
   locatorConfig: AMQPQueueLocator,
 ): Promise<void> {
   // queue check breaks channel if not successful
@@ -28,7 +28,7 @@ export async function checkQueueExists(
 }
 
 export async function checkExchangeExists(
-  connection: Connection,
+  connection: ChannelModel,
   locatorConfig: AMQPTopicPublisherConfig,
 ): Promise<void> {
   // exchange check breaks channel if not successful
@@ -45,7 +45,7 @@ export async function checkExchangeExists(
 }
 
 export async function ensureAmqpQueue(
-  connection: Connection,
+  connection: ChannelModel,
   channel: Channel,
   creationConfig?: AMQPQueueCreationConfig,
   locatorConfig?: AMQPQueueLocator,
@@ -61,7 +61,7 @@ export async function ensureAmqpQueue(
 }
 
 export async function ensureAmqpTopicSubscription(
-  connection: Connection,
+  connection: ChannelModel,
   channel: Channel,
   creationConfig?: AMQPTopicCreationConfig,
   locatorConfig?: AMQPTopicLocator,
@@ -84,7 +84,7 @@ export async function ensureAmqpTopicSubscription(
 }
 
 export async function ensureExchange(
-  connection: Connection,
+  connection: ChannelModel,
   channel: Channel,
   creationConfig?: AMQPTopicPublisherConfig,
   locatorConfig?: AMQPTopicPublisherConfig,

packages/amqp/package.json

@@ -25,27 +25,27 @@
     "prepublishOnly": "npm run build:release"
   },
   "dependencies": {
-    "@lokalise/node-core": "^13.3.0",
-    "zod": "^3.23.8"
+    "@lokalise/node-core": "^13.6.0",
+    "zod": "^3.24.2"
   },
   "peerDependencies": {
     "@message-queue-toolkit/core": ">=20.0.0",
     "@message-queue-toolkit/schemas": ">=2.0.0",
-    "amqplib": "^0.10.3"
+    "amqplib": "^0.10.5"
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
     "@kibertoad/biome-config": "^1.2.1",
     "@message-queue-toolkit/core": "*",
-    "@types/amqplib": "0.10.6",
+    "@types/amqplib": "0.10.7",
     "@types/node": "^22.7.5",
-    "@vitest/coverage-v8": "^3.0.7",
-    "amqplib": "^0.10.4",
-    "awilix": "^12.0.1",
-    "awilix-manager": "^6.0.0",
+    "@vitest/coverage-v8": "^3.0.9",
+    "amqplib": "^0.10.5",
+    "awilix": "^12.0.5",
+    "awilix-manager": "^6.1.0",
     "del-cli": "^6.0.0",
-    "typescript": "^5.7.2",
-    "vitest": "^3.0.7"
+    "typescript": "^5.8.2",
+    "vitest": "^3.0.9"
   },
   "homepage": "https://github.com/kibertoad/message-queue-toolkit",
   "repository": {