idea-aws 4.0.5 → 4.0.7

package/dist/src/dynamoDB.d.ts

@@ -1,5 +1,5 @@
 import * as DDB from '@aws-sdk/lib-dynamodb';
-import { AttributeValue, TransactWriteItem } from '@aws-sdk/client-dynamodb';
+import { TransactWriteItem } from '@aws-sdk/client-dynamodb';
 import * as DDBUtils from '@aws-sdk/util-dynamodb';
 import { Logger } from './logger';
 /**
@@ -16,7 +16,7 @@ export declare class DynamoDB {
      * @data the data in DynamoDB's original format to convert in plain objects
      * @options the options to use to convert the data
      */
-    unmarshall(data: Record<string, AttributeValue>, options?: DDBUtils.unmarshallOptions): Record<string, any>;
+    unmarshall(data: Record<string, any>, options?: DDBUtils.unmarshallOptions): Record<string, any>;
     /**
      * Returns an IUID: IDEA's Unique IDentifier, which is an id unique through an IDEA's AWS account and region.
      * Note: no need of an auth check for external uses: the permissions depend from the context in which it's executed.
@@ -72,8 +72,8 @@ export declare class DynamoDB {
      * @param keys the keys of the objects to retrieve
      * @param ignoreErr if set, ignore the errors and continue the bulk op.
      */
-    batchGet(table: string, keys: Record<string, AttributeValue>[], ignoreErr?: boolean): Promise<any[]>;
-    protected batchGetHelper(table: string, keys: Record<string, AttributeValue>[], resultElements: Record<string, any>[], ignoreErr: boolean, currentChunk?: number, chunkSize?: number): Promise<Record<string, any>[]>;
+    batchGet(table: string, keys: Record<string, any>[], ignoreErr?: boolean): Promise<any[]>;
+    protected batchGetHelper(table: string, keys: Record<string, any>[], resultElements: Record<string, any>[], ignoreErr: boolean, currentChunk?: number, chunkSize?: number): Promise<Record<string, any>[]>;
     /**
      * Put an array of items in a DynamoDB table, avoiding the limits of DynamoDB's BatchWriteItem.
      * In case of errors, it will retry with a random back-off mechanism until the timeout.
@@ -89,8 +89,8 @@ export declare class DynamoDB {
      * @param table the target DynamoDB table
      * @param keys the keys to delete
      */
-    batchDelete(table: string, keys: Record<string, AttributeValue>[]): Promise<void>;
-    protected batchWriteHelper(table: string, itemsOrKeys: Record<string, any>[] | Record<string, AttributeValue>[], isPut: boolean, currentChunk?: number, chunkSize?: number): Promise<void>;
+    batchDelete(table: string, keys: Record<string, any>[]): Promise<void>;
+    protected batchWriteHelper(table: string, itemsOrKeys: Record<string, any>[], isPut: boolean, currentChunk?: number, chunkSize?: number): Promise<void>;
     protected batchWriteChunkWithRetries(table: string, params: DDB.BatchWriteCommandInput): Promise<void>;
     /**
      * Query a DynamoDB table, avoiding the limits of DynamoDB's Query.

package/dist/src/ses.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import * as AWSSES from '@aws-sdk/client-sesv2';
+import * as AWSSESv2 from '@aws-sdk/client-sesv2';
 import { SentMessageInfo as NodemailerSentMessageInfo } from 'nodemailer';
 import { Headers } from 'nodemailer/lib/mailer';
 import { Logger } from './logger';
@@ -7,13 +7,13 @@ import { Logger } from './logger';
  * A wrapper for AWS Simple Email Service.
  */
 export declare class SES {
-    protected ses: AWSSES.SESv2Client;
+    protected ses: AWSSESv2.SESv2Client;
     logger: Logger;
     constructor(options?: {
         region?: string;
         debug: boolean;
     });
-    getTemplate(templateName: string): Promise<AWSSES.EmailTemplateContent>;
+    getTemplate(templateName: string): Promise<AWSSESv2.EmailTemplateContent>;
     setTemplate(templateName: string, subject: string, content: string, isHTML?: boolean): Promise<void>;
     deleteTemplate(templateName: string): Promise<void>;
     testTemplate(templateName: string, data: {
@@ -22,12 +22,12 @@ export declare class SES {
     /**
      * Send a templated email through AWS Simple Email Service.
      */
-    sendTemplatedEmail(emailData: TemplatedEmailData, sesParams: SESParams): Promise<AWSSES.SendEmailCommandOutput>;
+    sendTemplatedEmail(emailData: TemplatedEmailData, sesParams: SESParams): Promise<AWSSESv2.SendEmailCommandOutput>;
     /**
      * Send an email through AWS Simple Email Service.
      * It supports IDEA's teams custom configuration.
      */
-    sendEmail(emailData: EmailData, sesParams: SESParams): Promise<AWSSES.SendEmailResponse | NodemailerSentMessageInfo>;
+    sendEmail(emailData: EmailData, sesParams: SESParams): Promise<AWSSESv2.SendEmailResponse | NodemailerSentMessageInfo>;
     private searchForCustomSESConfigByTeamId;
     private sendEmailWithSES;
     private sendEmailWithNodemailer;

package/dist/src/ses.js

@@ -24,7 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SES = void 0;
-const AWSSES = __importStar(require("@aws-sdk/client-sesv2"));
+const client_ses_1 = require("@aws-sdk/client-ses");
+const AWSSESv2 = __importStar(require("@aws-sdk/client-sesv2"));
 const nodemailer_1 = require("nodemailer");
 const dynamoDB_1 = require("./dynamoDB");
 const logger_1 = require("./logger");
@@ -34,21 +35,21 @@ const logger_1 = require("./logger");
 class SES {
     constructor(options = { debug: true }) {
         this.logger = new logger_1.Logger();
-        this.ses = new AWSSES.SESv2Client({ region: options.region });
+        this.ses = new AWSSESv2.SESv2Client({ region: options.region });
         this.logger.level = options.debug ? 'DEBUG' : 'INFO';
     }
     //
     // CONFIG
     //
     async getTemplate(templateName) {
-        const command = new AWSSES.GetEmailTemplateCommand({ TemplateName: templateName });
+        const command = new AWSSESv2.GetEmailTemplateCommand({ TemplateName: templateName });
         const { TemplateContent } = await this.ses.send(command);
         return TemplateContent;
     }
     async setTemplate(templateName, subject, content, isHTML) {
         let isNew = false;
         try {
-            const command = new AWSSES.GetEmailTemplateCommand({ TemplateName: templateName });
+            const command = new AWSSESv2.GetEmailTemplateCommand({ TemplateName: templateName });
             await this.ses.send(command);
         }
         catch (notFound) {
@@ -64,17 +65,17 @@ class SES {
             template.TemplateContent.Text = content;
         let command;
         if (isNew)
-            command = new AWSSES.CreateEmailTemplateCommand(template);
+            command = new AWSSESv2.CreateEmailTemplateCommand(template);
         else
-            command = new AWSSES.UpdateEmailTemplateCommand(template);
+            command = new AWSSESv2.UpdateEmailTemplateCommand(template);
         await this.ses.send(command);
     }
     async deleteTemplate(templateName) {
-        const command = new AWSSES.DeleteEmailTemplateCommand({ TemplateName: templateName });
+        const command = new AWSSESv2.DeleteEmailTemplateCommand({ TemplateName: templateName });
         await this.ses.send(command);
     }
     async testTemplate(templateName, data) {
-        const command = new AWSSES.TestRenderEmailTemplateCommand({
+        const command = new AWSSESv2.TestRenderEmailTemplateCommand({
             TemplateName: templateName,
             TemplateData: JSON.stringify(data)
         });
@@ -88,7 +89,7 @@ class SES {
      * Send a templated email through AWS Simple Email Service.
      */
     async sendTemplatedEmail(emailData, sesParams) {
-        const command = new AWSSES.SendEmailCommand({
+        const command = new AWSSESv2.SendEmailCommand({
             Destination: this.prepareEmailDestination(emailData),
             Content: {
                 Template: {
@@ -105,7 +106,7 @@ class SES {
         if (this.ses.config.region === sesParams.region)
             ses = this.ses;
         else
-            ses = new AWSSES.SESv2Client({ region: sesParams.region });
+            ses = new AWSSESv2.SESv2Client({ region: sesParams.region });
         this.logger.debug('SES send templated email');
         return await ses.send(command);
     }
@@ -134,7 +135,7 @@ class SES {
         }
     }
     async sendEmailWithSES(emailData, sesParams) {
-        const command = new AWSSES.SendEmailCommand({
+        const command = new AWSSESv2.SendEmailCommand({
             Destination: this.prepareEmailDestination(emailData),
             Content: { Simple: this.prepareEmailMessage(emailData) },
             ReplyToAddresses: emailData.replyToAddresses,
@@ -145,7 +146,7 @@ class SES {
         if (this.ses.config.region === sesParams.region)
             ses = this.ses;
         else
-            ses = new AWSSES.SESv2Client({ region: sesParams.region });
+            ses = new AWSSESv2.SESv2Client({ region: sesParams.region });
         this.logger.debug('SES send email');
         return await ses.send(command);
     }
@@ -165,11 +166,8 @@ class SES {
         if (emailData.text)
             mailOptions.text = emailData.text;
         mailOptions.attachments = emailData.attachments;
-        let ses;
-        if (this.ses.config.region === sesParams.region)
-            ses = this.ses;
-        else
-            ses = new AWSSES.SESv2Client({ region: sesParams.region });
+        // note: Nodemailer doesn't support SESv2 as of August 2023
+        const ses = new client_ses_1.SESClient({ region: sesParams.region });
         this.logger.debug('SES send email (Nodemailer)');
         return await (0, nodemailer_1.createTransport)({ SES: ses }).sendMail(mailOptions);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "idea-aws",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "description": "AWS wrappers to use in IDEA's back-ends",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -52,6 +52,7 @@
     "@aws-sdk/client-lambda": "^3.388.0",
     "@aws-sdk/client-s3": "^3.388.0",
     "@aws-sdk/client-secrets-manager": "^3.389.0",
+    "@aws-sdk/client-ses": "^3.398.0",
     "@aws-sdk/client-sesv2": "^3.388.0",
     "@aws-sdk/client-sns": "^3.388.0",
     "@aws-sdk/client-translate": "^3.388.0",