@stacksjs/email 0.58.59 → 0.58.61

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/email",
   "type": "module",
-  "version": "0.58.59",
+  "version": "0.58.61",
   "description": "The Stacks Email integration. Painlessly create & manage your inboxes, templates, and send emails.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -71,6 +71,7 @@
     "@stacksjs/error-handling": "latest",
     "@stacksjs/types": "latest",
     "@types/mailparser": "^3.4.4",
+    "aws-sdk": "^2.1555.0",
     "mailparser": "^3.6.7",
     "mime": "^4.0.1",
     "moment": "^2.30.1",

package/src/server/converter.ts

@@ -12,7 +12,7 @@ const s3 = new AWS.S3({
 
 // This lambda will read RAW emails and convert them in easy to read formats
 // like: HTML and text
-exports.handler = (event) => {
+exports.handler = (event: any) => {
   // 1. We need to process the path received by S3 since AWS dose escape the
   // string in a special way. They escape the string in a HTML style
   // but for whatever reason they convert spaces in to +ses.
@@ -57,7 +57,7 @@ exports.handler = (event) => {
 }
 
 // Load the email that triggered the function from S3
-function load_the_email(container) {
+function load_the_email(container: any) {
   return new Promise((resolve, reject) => {
     console.info('load_the_email')
 
@@ -68,7 +68,7 @@ function load_the_email(container) {
     }
 
     // ->	Execute the query
-    s3.getObject(params, (error, data) => {
+    s3.getObject(params, (error: any, data: any) => {
       // 1. Check for internal errors
       if (error)
         return reject(error)
@@ -84,7 +84,7 @@ function load_the_email(container) {
 
 // Since the raw email is saved with an extension we need to remove it
 // before we can save other converted versions.
-function remove_extension(container) {
+function remove_extension(container: any) {
   return new Promise((resolve, reject) => {
     console.info('remove_extension')
 
@@ -105,11 +105,11 @@ function remove_extension(container) {
 }
 
 // Convert the raw email in to HTML and Text, and extract also the attachments
-function parse_the_email(container) {
+function parse_the_email(container: any) {
   return new Promise((resolve, reject) => {
-    // 1. Parse the email and extract all the it necessary.
-    parser(container.raw_email, (error, parsed) => {
-      // 1. Check for internal errors.
+    // 1. Parse the email and extract all the necessary
+    parser(container.raw_email, (error: any, parsed: any) => {
+      // 1. Check for internal errors
       if (error)
         return reject(error)
 
@@ -125,7 +125,7 @@ function parse_the_email(container) {
 }
 
 // After the conversion we save the Text version to S3.
-function save_text(container) {
+function save_text(container: any) {
   return new Promise((resolve, reject) => {
     console.info('save_text')
 
@@ -137,7 +137,7 @@ function save_text(container) {
     }
 
     // ->	Execute the query.
-    s3.putObject(params, (error, data) => {
+    s3.putObject(params, (error: any, data: any) => {
       // 1. Check for internal errors.
       if (error)
         return reject(error)
@@ -149,10 +149,10 @@ function save_text(container) {
 }
 
 // Then if we have a HTML version we try to save that.
-function save_html(container) {
+function save_html(container: any) {
   return new Promise((resolve, reject) => {
     // <>> When the body of an email have only one version, meaning it
-    // dose have only the pure text version and no HTML.
+    // does have only the pure text version and no HTML.
     // Nodemailer won't generate the HTML for you, it just grabs
     // what is in the Email body.
     // So, this value will be false, when there is no HTML content in
@@ -174,7 +174,7 @@ function save_html(container) {
     }
 
     // ->	Execute the query.
-    s3.putObject(params, (error, data) => {
+    s3.putObject(params, (error: any, data: any) => {
       // 1. Check for internal errors.
       if (error)
         return reject(error)
@@ -187,12 +187,12 @@ function save_html(container) {
 
 // Last thing to do is to save the attachments if there are any. If the
 // array is empty the loop will skip itself.
-function save_attachments(container) {
+function save_attachments(container: any) {
   return new Promise((resolve, reject) => {
     console.info('save_attachments')
 
     // Start the loop which save all the attachments.
-    loop(1, (error) => {
+    loop(1, (error: any) => {
       // <<> Check if there was an error.
       if (error) {
         // ->	Stop everything and surface the error.
@@ -204,7 +204,7 @@ function save_attachments(container) {
     })
 
     // This loop will upload all the individual attachments found in a email
-    function loop(count, callback) {
+    function loop(count: any, callback: any) {
       // 1. Pop the last element in the array if any.
       const file = container.parsed.attachments.pop()
 
@@ -213,7 +213,7 @@ function save_attachments(container) {
         return callback()
 
       // 3. Get the file name which also contain the file extension.
-      file_name = file.filename
+      let file_name = file.filename
 
       // 4. An email attachment is not required to have a name, this
       // mean we need to check if we have a file name and, if not
@@ -258,7 +258,7 @@ function save_attachments(container) {
       }
 
       // 8. Then save the buffer of the attachment.
-      file_body = file.content
+      const file_body = file.content
 
       // 9. Split the S3 Key (path) so we can remove the last element. Since
       // we don't want the object name, we care only about the path.
@@ -292,7 +292,7 @@ function save_attachments(container) {
       }
 
       // ->	Execute the query.
-      s3.putObject(params, (error, data) => {
+      s3.putObject(params, (error: any, data: any) => {
         // 1. Check for internal errors.
         if (error)
           return callback(error)

package/src/server/inbound.ts

@@ -55,7 +55,7 @@ interface S3Event {
 }
 
 // This Lambda will filter all the incoming emails based on their From and To field
-export function handler(event: S3Event): Promise<boolean> {
+export function handler(event: S3Event): Promise<any> {
   // if (!event.Records.length)
   //   throw new Error('No records in the event')
 
@@ -96,6 +96,8 @@ export function handler(event: S3Event): Promise<boolean> {
 
       return false
     })
+
+  return Promise.resolve()
 }
 
 // List all the emails added to SES, so we can use them to decided where to
@@ -202,7 +204,8 @@ function parse_the_email(container: Container): Promise<Container> {
       // Save the parsed email for the next promise.
       container.date = data.date
       container.from = data.from?.value[0]?.address
-      container.to = data.to?.value[0]?.address
+      // container.to = data.to?.value[0]?.address
+      container.to = data.from?.value[0]?.address
       container.subject = data.subject || 'No Subject'
       container.message_id = data.messageId
 
@@ -236,13 +239,26 @@ function extract_data(container: Container): Promise<Container> {
     // Since the email string can come in a form of:
     //  Name Last <name@example.com>
     // We have to extract just the email address, and discard the rest
-    const tmp_to = container.to
-      .match(/(?:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21\x23-\x5B\x5D-\x7F]|\\[\x01-\x09\x0B\x0C\x0E-\x7F])*")@(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-zA-Z0-9-]*[a-zA-Z0-9]:(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21-\x5A\x53-\x7F]|\\[\x01-\x09\x0B\x0C\x0E-\x7F])+)\])/gm)[0]
-      .split('@')
+    let tmp_to
+    if (container?.to) {
+      const matchResult = container.to.match(/(?:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21\x23-\x5B\x5D-\x7F]|\\[\x01-\x09\x0B\x0C\x0E-\x7F])*")@(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-zA-Z0-9-]*[a-zA-Z0-9]:(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21-\x5A\x53-\x7F]|\\[\x01-\x09\x0B\x0C\x0E-\x7F])+)\])/gm);
+      if (matchResult) {
+        tmp_to = matchResult[0].split('@');
+        // Continue with your logic using tmp_to
+      }
+    }
+
+    let tmp_from
+    if (container?.from) {
+      const matchResult = container.from.match(/(?:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21\x23-\x5B\x5D-\x7F]|\\[\x01-\x09\x0B\x0C\x0E-\x7F])*")@(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-zA-Z0-9-]*[a-zA-Z0-9]:(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21-\x5A\x53-\x7F]|\\[\x01-\x09\x0B\x0C\x0E-\x7F])+)\])/gm)
+      if (matchResult) {
+        tmp_from = matchResult[0].split('@');
+        // Continue with your logic using tmp_to
+      }
+    }
 
-    const tmp_from = 	container.from
-      .match(/(?:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21\x23-\x5B\x5D-\x7F]|\\[\x01-\x09\x0B\x0C\x0E-\x7F])*")@(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-zA-Z0-9-]*[a-zA-Z0-9]:(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21-\x5A\x53-\x7F]|\\[\x01-\x09\x0B\x0C\x0E-\x7F])+)\])/gm)[0]
-      .split('@')
+    if (!tmp_to || !tmp_from)
+      return reject(Error('No To or From field in the email'))
 
     // Get the domain name of the receiving end, so we can group
     // emails by all the domain that were added to SES.

package/src/server/outbound.ts

@@ -18,7 +18,7 @@ const ses = new AWS.SES({
 
 // This lambda will read outgoing emails formatted in JSON, convert them
 // in to a raw email, send them using SES, and store them in S3.
-exports.handler = (event) => {
+exports.handler = (event: any) => {
   // This JS object will contain all the data within the chain
   const container = {
     bucket: event.Records[0].s3.bucket.name,
@@ -56,7 +56,7 @@ exports.handler = (event) => {
 }
 
 // Load the JSON email that triggered this Lambda.
-function load_the_email(container) {
+function load_the_email(container: any) {
   return new Promise((resolve, reject) => {
     console.info('load_the_email')
 
@@ -67,7 +67,7 @@ function load_the_email(container) {
     }
 
     // ->	Execute the query.
-    s3.getObject(params, (error, data) => {
+    s3.getObject(params, (error: any, data: any) => {
       // 1. Check for internal errors.
       if (error)
         return reject(error)
@@ -82,7 +82,7 @@ function load_the_email(container) {
 }
 
 // Extract all the data necessary to organize the incoming emails.
-function extract_data(container) {
+function extract_data(container: any) {
   return new Promise((resolve, reject) => {
     console.info('extract_data')
 
@@ -116,7 +116,7 @@ function extract_data(container) {
 
     // 6. Create a human readable time stamp that matches the format
     // 	S3 Provides in its Event.
-    date = moment().format('ddd, DD MMM YYYY HH:MM:SS ZZ')
+    const date = moment().format('ddd, DD MMM YYYY HH:MM:SS ZZ')
 
     // 7. Create the path where the email needs to be moved
     // 	so it is properly organized.
@@ -145,7 +145,7 @@ function extract_data(container) {
 
 // From the JSON file that we loaded in to memory we generate a RAW version that
 // can be used by SES, and later on stored and converted in multiple formats
-function generate_the_raw_email(container, callback) {
+function generate_the_raw_email(container: any) {
   return new Promise((resolve, reject) => {
     console.info('generate_the_raw_email')
 
@@ -154,7 +154,7 @@ function generate_the_raw_email(container, callback) {
     const mail = new MailComposer(container.email.json)
 
     // 2. Take the email and compile it down to its text form for storage.
-    mail.compile().build((error, raw_message) => {
+    mail.compile().build((error: any, raw_message: any) => {
       // 1. Check if there was an error
       if (error)
         return reject(error)
@@ -169,7 +169,7 @@ function generate_the_raw_email(container, callback) {
 }
 
 // Use the newly generated RAW email and send it using SES.
-function send_email(container) {
+function send_email(container: any) {
   return new Promise((resolve, reject) => {
     console.info('send_email')
 
@@ -181,7 +181,7 @@ function send_email(container) {
     }
 
     // -> Send the email out
-    ses.sendRawEmail(params, (error, data) => {
+    ses.sendRawEmail(params, (error: any, data: any) => {
       // 1. Check if there was an error
       if (error)
         return reject(error)
@@ -202,7 +202,7 @@ function send_email(container) {
 // and then we copy the object to the final destination, which triggers
 // the Convert action, and once the convert action makes a PUT nothing else
 // happens.
-function save_raw_email(container) {
+function save_raw_email(container: any) {
   return new Promise((resolve, reject) => {
     console.info('save_raw_email')
 
@@ -214,7 +214,7 @@ function save_raw_email(container) {
     }
 
     // ->	Execute the query.
-    s3.putObject(params, (error, data) => {
+    s3.putObject(params, (error: any, data: any) => {
       // 1. Check for internal errors.
       if (error)
         return reject(error)
@@ -226,7 +226,7 @@ function save_raw_email(container) {
 }
 
 // Now that we have our RAW email saved we do a copy event so it will trigger the Conversion Lambda
-function copy_raw_email(container) {
+function copy_raw_email(container: any) {
   return new Promise((resolve, reject) => {
     console.info('copy_raw_email')
 
@@ -238,7 +238,7 @@ function copy_raw_email(container) {
     }
 
     // ->	Execute the query.
-    s3.copyObject(params, (error, data) => {
+    s3.copyObject(params, (error: any, data: any) => {
       // 1. Check for internal errors.
       if (error)
         return reject(error)
@@ -250,7 +250,7 @@ function copy_raw_email(container) {
 }
 
 // And before we finish we clean up the environment by deleting the JSON email,
-function delete_json_email(container) {
+function delete_json_email(container: any) {
   return new Promise((resolve, reject) => {
     console.info('delete_json_email')
 
@@ -261,7 +261,7 @@ function delete_json_email(container) {
     }
 
     // ->	Execute the query.
-    s3.deleteObject(params, (error, data) => {
+    s3.deleteObject(params, (error: any, data: any) => {
       // 1. Check for internal errors.
       if (error)
         return reject(error)
@@ -273,7 +273,7 @@ function delete_json_email(container) {
 }
 
 // And the temporary RAW email.
-function delete_raw_email(container) {
+function delete_raw_email(container: any) {
   return new Promise((resolve, reject) => {
     console.info('delete_raw_email')
 
@@ -284,7 +284,7 @@ function delete_raw_email(container) {
     }
 
     // ->	Execute the query.
-    s3.deleteObject(params, (error, data) => {
+    s3.deleteObject(params, (error: any, data: any) => {
       // 1. Check for internal errors.
       if (error)
         return reject(error)