@8ms/helpers 2.1.0 → 2.1.3

package/aws/ses/AwsSesNamespace.d.ts

@@ -1,9 +1,9 @@
 import { BaseNamespace } from "../../_class";
 import { AwsConfig } from "../server";
-import type { SendEmailCommandInput, SESClient } from "@aws-sdk/client-ses";
+import { SendEmailCommandInput, SendRawEmailCommandInput, SESClient } from "@aws-sdk/client-ses";
 export declare class AwsSesNamespace extends BaseNamespace {
     client: SESClient;
     config: AwsConfig;
     ensureInit: () => Promise<void>;
-    send: (input: SendEmailCommandInput) => Promise<any>;
+    send: (input: SendEmailCommandInput | SendRawEmailCommandInput) => Promise<any>;
 }

package/aws/ses/AwsSesNamespace.js

@@ -51,14 +51,28 @@ class AwsSesNamespace extends _class_1.BaseNamespace {
         };
         this.send = async (input) => {
             await this.ensureInit();
-            const { SendEmailCommand } = await Promise.resolve().then(() => __importStar(require("@aws-sdk/client-ses")));
             let response;
-            const command = new SendEmailCommand(input);
-            try {
-                response = await this.client.send(command);
+            // For a simple message
+            if (input?.Message?.Body?.Html?.Data) {
+                try {
+                    const { SendEmailCommand } = await Promise.resolve().then(() => __importStar(require("@aws-sdk/client-ses")));
+                    const command = new SendEmailCommand(input);
+                    response = await this.client.send(command);
+                }
+                catch (exception) {
+                    response = exception;
+                }
             }
-            catch (exception) {
-                response = exception;
+            // For a message with attachments
+            else {
+                try {
+                    const { SendRawEmailCommand } = await Promise.resolve().then(() => __importStar(require("@aws-sdk/client-ses")));
+                    const command = new SendRawEmailCommand(input);
+                    response = await this.client.send(command);
+                }
+                catch (exception) {
+                    response = exception;
+                }
             }
             return response;
         };

package/aws/ses/SimpleEmail.d.ts

@@ -2,7 +2,7 @@ import { BaseClass } from "../../_class";
 type AttachmentSource = {
     filename: string;
     contentType?: string;
-    data64?: string;
+    data?: string;
     url?: string;
 };
 type ConstructorProps = {
@@ -31,7 +31,7 @@ export declare class SimpleEmail extends BaseClass {
     setSubject: (subject: string) => this;
     setAttachments: (attachments: AttachmentSource[]) => this;
     addAttachment: (attachment: AttachmentSource) => this;
-    addAttachmentFromData64: (filename: string, data64: string, contentType?: string) => this;
+    addAttachmentFromdata: (filename: string, data: string, contentType?: string) => this;
     addAttachmentFromUrl: (filename: string, url: string, contentType?: string) => this;
     clearAttachments: () => this;
     pushBcc: (recipient: string | string[]) => this;
@@ -71,7 +71,10 @@ export declare class SimpleEmail extends BaseClass {
         Source: string;
     }>;
     private _getRawEmailParams;
+    private _isTextFile;
+    private _getAttachmentTextData;
     private _getAttachmentData;
+    private _isBase64;
     private _getContentTypeFromFilename;
     private _filterRecipients;
 }

package/aws/ses/SimpleEmail.js

@@ -65,10 +65,10 @@ class SimpleEmail extends _class_1.BaseClass {
             this.attachments.push(attachment);
             return this;
         };
-        this.addAttachmentFromData64 = (filename, data64, contentType) => {
+        this.addAttachmentFromdata = (filename, data, contentType) => {
             return this.addAttachment({
                 filename,
-                data64,
+                data,
                 contentType: contentType || this._getContentTypeFromFilename(filename)
             });
         };
@@ -164,12 +164,20 @@ class SimpleEmail extends _class_1.BaseClass {
             rawMessage += `${this.html}\r\n\r\n`;
             // Add attachments
             for (const attachment of this.attachments) {
-                const attachmentData = await this._getAttachmentData(attachment);
+                const isTextFile = this._isTextFile(attachment.contentType || this._getContentTypeFromFilename(attachment.filename));
                 rawMessage += `--${boundary}\r\n`;
                 rawMessage += `Content-Type: ${attachment.contentType || "application/octet-stream"}\r\n`;
                 rawMessage += `Content-Disposition: attachment; filename="${attachment.filename}"\r\n`;
-                rawMessage += `Content-Transfer-Encoding: base64\r\n\r\n`;
-                rawMessage += `${attachmentData}\r\n\r\n`;
+                if (isTextFile) {
+                    rawMessage += `Content-Transfer-Encoding: 7bit\r\n\r\n`;
+                    const textData = await this._getAttachmentTextData(attachment);
+                    rawMessage += `${textData}\r\n\r\n`;
+                }
+                else {
+                    rawMessage += `Content-Transfer-Encoding: base64\r\n\r\n`;
+                    const attachmentData = await this._getAttachmentData(attachment);
+                    rawMessage += `${attachmentData}\r\n\r\n`;
+                }
             }
             rawMessage += `--${boundary}--\r\n`;
             return {
@@ -180,11 +188,50 @@ class SimpleEmail extends _class_1.BaseClass {
                 Source: this.from
             };
         };
+        this._isTextFile = (contentType) => {
+            const textTypes = [
+                "text/csv",
+                "text/plain",
+                "text/html",
+                "application/json",
+                "application/xml",
+                "text/xml"
+            ];
+            return textTypes.some(type => contentType.startsWith(type));
+        };
+        this._getAttachmentTextData = async (attachment) => {
+            // If data is already provided as base64, decode it first
+            if (attachment.data) {
+                // Remove data URL prefix if present (e.g., "data:text/csv;base64,")
+                const base64Data = attachment.data.replace(/^data:[^;]+;base64,/, "");
+                // Check if it's actually base64 encoded
+                if (this._isBase64(base64Data)) {
+                    return Buffer.from(base64Data, "base64")
+                        .toString("utf-8");
+                }
+                // If not base64, assume it's already plain text
+                return attachment.data;
+            }
+            // If URL is provided, fetch the data as text
+            if (attachment.url) {
+                const fetch = await Promise.resolve().then(() => __importStar(require("node-fetch"))).then(mod => mod.default);
+                const response = await fetch(attachment.url);
+                return await response.text();
+            }
+            throw new Error(`No valid data source provided for attachment: ${attachment.filename}`);
+        };
         this._getAttachmentData = async (attachment) => {
             // If data is already provided as base64
-            if (attachment.data64) {
+            if (attachment.data) {
                 // Remove data URL prefix if present (e.g., "data:image/png;base64,")
-                return attachment.data64.replace(/^data:[^;]+;base64,/, "");
+                const cleanData = attachment.data.replace(/^data:[^;]+;base64,/, "");
+                // Check if it's actually base64 encoded
+                if (this._isBase64(cleanData)) {
+                    return cleanData;
+                }
+                // If not base64, encode it
+                return Buffer.from(attachment.data, "utf-8")
+                    .toString("base64");
             }
             // If URL is provided, fetch the data
             if (attachment.url) {
@@ -195,6 +242,15 @@ class SimpleEmail extends _class_1.BaseClass {
             }
             throw new Error(`No valid data source provided for attachment: ${attachment.filename}`);
         };
+        this._isBase64 = (str) => {
+            try {
+                return Buffer.from(str, "base64")
+                    .toString("base64") === str;
+            }
+            catch {
+                return false;
+            }
+        };
         this._getContentTypeFromFilename = (filename) => {
             const extension = filename.split(".")
                 .pop()

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@8ms/helpers",
 	"license": "UNLICENSED",
-	"version": "2.1.0",
+	"version": "2.1.3",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"