core-services-sdk 1.3.34 → 1.3.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-services-sdk",
-  "version": "1.3.34",
+  "version": "1.3.36",
   "main": "src/index.js",
   "type": "module",
   "types": "types/index.d.ts",
@@ -25,7 +25,7 @@
   "homepage": "https://github.com/haim-rubin/core-services-sdk#readme",
   "description": "",
   "dependencies": {
-    "@aws-sdk/client-ses": "^3.862.0",
+    "@aws-sdk/client-sesv2": "^3.901.0",
     "@aws-sdk/credential-provider-node": "^3.862.0",
     "@sendgrid/mail": "^8.1.5",
     "amqplib": "^0.10.8",

package/src/mailer/transport.factory.js

@@ -1,7 +1,7 @@
 import nodemailer from 'nodemailer'
 import sgMail from '@sendgrid/mail'
 import { defaultProvider } from '@aws-sdk/credential-provider-node'
-import { SESClient, SendRawEmailCommand } from '@aws-sdk/client-ses'
+import { SESv2Client, SendEmailCommand } from '@aws-sdk/client-sesv2'
 
 /**
  * Factory for creating email transporters based on configuration.
@@ -57,7 +57,7 @@ export class TransportFactory {
         return sgMail // Not a Nodemailer transport, but SendGrid's mail API
 
       case 'ses': {
-        const sesClient = new SESClient({
+        const sesClient = new SESv2Client({
           region: config.region,
           credentials:
             config.accessKeyId && config.secretAccessKey
@@ -70,8 +70,8 @@ export class TransportFactory {
 
         return nodemailer.createTransport({
           SES: {
-            ses: sesClient,
-            aws: { SendRawEmailCommand },
+            sesClient,
+            SendEmailCommand,
           },
         })
       }

package/src/rabbit-mq/rabbit-mq.js

@@ -46,7 +46,7 @@ export const connectQueueService = async ({ host, log }) => {
  * Creates a channel from a RabbitMQ connection.
  *
  * @param {{ host: string, log: import('pino').Logger }} options
- * @returns {Promise<amqp.Channel>}
+ * @returns {Promise<{ channel: amqp.Channel, connection: amqp.Connection }>}
  */
 export const createChannel = async ({ host, log }) => {
   const t0 = Date.now()
@@ -65,7 +65,7 @@ export const createChannel = async ({ host, log }) => {
       ms: Date.now() - t0,
     })
 
-    return channel
+    return { channel, connection }
   } catch (err) {
     logger.error(err, {
       event: 'error',
@@ -96,7 +96,7 @@ const parseMessage = (msgInfo) => {
  * @param {boolean} [options.nackOnError=false] - Whether to nack the message on error (default: false)
  * @param {number} [options.prefetch=1] - Max unacked messages per consumer (default: 1)
  *
- * @returns {Promise<void>}
+ * @returns {Promise<string>} Returns the consumer tag for later cancellation
  */
 export const subscribeToQueue = async ({
   log,
@@ -112,7 +112,7 @@ export const subscribeToQueue = async ({
     await channel.assertQueue(queue, { durable: true })
     !!prefetch && (await channel.prefetch(prefetch))
 
-    channel.consume(queue, async (msgInfo) => {
+    const { consumerTag } = await channel.consume(queue, async (msgInfo) => {
       if (!msgInfo) {
         return
       }
@@ -143,6 +143,9 @@ export const subscribeToQueue = async ({
         return
       }
     })
+
+    logger.debug({ consumerTag }, 'consumer-started')
+    return consumerTag
   } catch (err) {
     logger.error(err, {
       event: 'error',
@@ -164,12 +167,14 @@ export const subscribeToQueue = async ({
  *     queue: string,
  *     onReceive: (data: any, correlationId?: string) => Promise<void>,
  *     nackOnError?: boolean
- *   }) => Promise<void>,
- *   channel: amqp.Channel
+ *   }) => Promise<string>,
+ *   channel: amqp.Channel,
+ *   connection: amqp.Connection,
+ *   close: () => Promise<void>
  * }>}
  */
 export const initializeQueue = async ({ host, log }) => {
-  const channel = await createChannel({ host, log })
+  const { channel, connection } = await createChannel({ host, log })
   const logger = log.child({ op: 'initializeQueue', host: mask(host) })
 
   /**
@@ -224,16 +229,45 @@ export const initializeQueue = async ({ host, log }) => {
    *   onReceive: (data: any, correlationId?: string) => Promise<void>,
    *   nackOnError?: boolean
    * }} options
-   * @returns {Promise<void>}
+   * @returns {Promise<string>} Returns the consumer tag for later cancellation
    */
   const subscribe = async ({ queue, onReceive, nackOnError = false }) => {
     return subscribeToQueue({ channel, queue, onReceive, log, nackOnError })
   }
 
+  /**
+   * Gracefully closes the RabbitMQ channel and connection.
+   *
+   * @returns {Promise<void>}
+   */
+  const close = async () => {
+    const t0 = Date.now()
+    const logChild = logger.child({ op: 'close' })
+
+    try {
+      logChild.debug('closing-channel-and-connection')
+      await channel.close()
+      await connection.close()
+
+      logChild.info({
+        event: 'ok',
+        ms: Date.now() - t0,
+      })
+    } catch (err) {
+      logChild.error(err, {
+        event: 'error',
+        ms: Date.now() - t0,
+      })
+      throw err
+    }
+  }
+
   return {
     channel,
+    connection,
     publish,
     subscribe,
+    close,
   }
 }
 

package/tests/mailer/transport.factory.unit.test.js

@@ -1,8 +1,8 @@
 // @ts-nocheck
 import nodemailer from 'nodemailer'
-
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 
+// ---------------- Mock Nodemailer ----------------
 vi.mock('nodemailer', () => {
   const createTransport = vi.fn((options) => ({
     type: 'mock-transport',
@@ -15,6 +15,7 @@ vi.mock('nodemailer', () => {
   }
 })
 
+// ---------------- Mock SendGrid ----------------
 vi.mock('@sendgrid/mail', () => {
   const setApiKey = vi.fn()
   const send = vi.fn()
@@ -26,23 +27,31 @@ vi.mock('@sendgrid/mail', () => {
   }
 })
 
-vi.mock('@aws-sdk/client-ses', () => {
+// ---------------- Mock AWS SESv2 ----------------
+vi.mock('@aws-sdk/client-sesv2', () => {
   const mockSesInstance = { mocked: true }
-  const SESClient = vi.fn(() => mockSesInstance)
-  globalThis.__mockedSesClient__ = SESClient
-  globalThis.__mockedSesInstance__ = mockSesInstance
+  const SESv2Client = vi.fn(() => mockSesInstance)
+  const SendEmailCommand = vi.fn(() => 'mocked-command')
+
+  globalThis.__mockedSesv2Client__ = SESv2Client
+  globalThis.__mockedSesv2Instance__ = mockSesInstance
+  globalThis.__mockedSendEmailCommand__ = SendEmailCommand
+
   return {
-    SESClient,
-    SendRawEmailCommand: 'mocked-command',
+    __esModule: true,
+    SESv2Client,
+    SendEmailCommand,
   }
 })
 
+// ---------------- Mock AWS Default Provider ----------------
 vi.mock('@aws-sdk/credential-provider-node', () => {
   const defaultProvider = vi.fn(() => 'mocked-default-provider')
   globalThis.__mockedDefaultProvider__ = defaultProvider
-  return { defaultProvider }
+  return { __esModule: true, defaultProvider }
 })
 
+// ---------------- Import the module under test ----------------
 import { TransportFactory } from '../../src/mailer/transport.factory.js'
 
 describe('TransportFactory', () => {
@@ -50,6 +59,7 @@ describe('TransportFactory', () => {
     vi.clearAllMocks()
   })
 
+  // ---------- SMTP ----------
   it('should create smtp transport', () => {
     const config = {
       type: 'smtp',
@@ -70,6 +80,7 @@ describe('TransportFactory', () => {
     expect(transport.type).toBe('mock-transport')
   })
 
+  // ---------- GMAIL ----------
   it('should create gmail transport', () => {
     const config = {
       type: 'gmail',
@@ -85,6 +96,7 @@ describe('TransportFactory', () => {
     expect(transport.type).toBe('mock-transport')
   })
 
+  // ---------- SENDGRID ----------
   it('should create sendgrid transport', () => {
     const config = {
       type: 'sendgrid',
@@ -105,17 +117,18 @@ describe('TransportFactory', () => {
     }).toThrow('Missing SendGrid API key')
   })
 
-  it('should create ses transport with credentials', () => {
+  // ---------- SESv2 ----------
+  it('should create sesv2 transport with explicit credentials', () => {
     const config = {
       type: 'ses',
       accessKeyId: 'AKIA...',
       secretAccessKey: 'secret',
-      region: 'us-west-2',
+      region: 'eu-central-1',
     }
 
     const transport = TransportFactory.create(config)
 
-    expect(globalThis.__mockedSesClient__).toHaveBeenCalledWith({
+    expect(globalThis.__mockedSesv2Client__).toHaveBeenCalledWith({
       region: config.region,
       credentials: {
         accessKeyId: config.accessKeyId,
@@ -126,15 +139,15 @@ describe('TransportFactory', () => {
     const args = nodemailer.createTransport.mock.calls[0][0]
     expect(args).toEqual({
       SES: {
-        ses: globalThis.__mockedSesInstance__,
-        aws: { SendRawEmailCommand: 'mocked-command' },
+        sesClient: globalThis.__mockedSesv2Instance__,
+        SendEmailCommand: globalThis.__mockedSendEmailCommand__,
       },
     })
 
     expect(transport.type).toBe('mock-transport')
   })
 
-  it('should create ses transport with defaultProvider fallback', () => {
+  it('should create sesv2 transport with defaultProvider fallback', () => {
     const config = {
       type: 'ses',
       region: 'us-east-1',
@@ -143,7 +156,7 @@ describe('TransportFactory', () => {
     const transport = TransportFactory.create(config)
 
     expect(globalThis.__mockedDefaultProvider__).toHaveBeenCalled()
-    expect(globalThis.__mockedSesClient__).toHaveBeenCalledWith({
+    expect(globalThis.__mockedSesv2Client__).toHaveBeenCalledWith({
       region: config.region,
       credentials: 'mocked-default-provider',
     })
@@ -151,14 +164,15 @@ describe('TransportFactory', () => {
     const args = nodemailer.createTransport.mock.calls[0][0]
     expect(args).toEqual({
       SES: {
-        ses: globalThis.__mockedSesInstance__,
-        aws: { SendRawEmailCommand: 'mocked-command' },
+        sesClient: globalThis.__mockedSesv2Instance__,
+        SendEmailCommand: globalThis.__mockedSendEmailCommand__,
       },
     })
 
     expect(transport.type).toBe('mock-transport')
   })
 
+  // ---------- INVALID ----------
   it('should throw error for unsupported type', () => {
     expect(() => {
       TransportFactory.create({ type: 'invalid' })