Action enhancement - Gmail - Find email

components/gmail/actions/find-email/find-email.mjs

@@ -1,11 +1,12 @@
 import { convert } from "html-to-text";
 import gmail from "../../gmail.app.mjs";
+import utils from "../../common/utils.mjs";
 
 export default {
   key: "gmail-find-email",
   name: "Find Email",
   description: "Find an email using Google's Search Engine. [See the docs](https://developers.google.com/gmail/api/reference/rest/v1/users.messages/list)",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     gmail,
@@ -58,14 +59,31 @@ export default {
 
     for await (const message of messagesToEmit) {
       let newPayload = "";
-      for (const part of message.payload?.parts || []) {
-        if (part.body.data) {
-          const payload = Buffer.from(part.body.data, "base64").toString("utf-8");
-          this.withTextPayload
-            ? newPayload += convert(payload)
-            : part.body.text = payload;
+
+      const messageIdHeader = message.payload?.headers?.find(
+        (h) => h.name.toLowerCase() === "message-id",
+      );
+      if (messageIdHeader) {
+        message.message_id = messageIdHeader.value;
+      }
+
+      if (message.payload?.body?.data && !Array.isArray(message.payload.parts)) {
+        const decodedBody = utils.decodeBase64Url(message.payload.body.data);
+        if (this.withTextPayload) {
+          newPayload += convert(decodedBody);
+        } else {
+          message.payload.body.text = decodedBody;
         }
       }
+
+      if (Array.isArray(message.payload?.parts)) {
+        if (this.withTextPayload) {
+          newPayload += utils.extractTextFromParts(message.payload.parts);
+        } else {
+          utils.attachTextToParts(message.payload.parts);
+        }
+      }
+
       if (this.withTextPayload) {
         message.payload = newPayload;
       }

components/gmail/common/utils.mjs

@@ -1,3 +1,5 @@
+import { convert } from "html-to-text";
+
 function parseArray(arr) {
   if (!arr) {
     return undefined;
@@ -7,6 +9,46 @@ function parseArray(arr) {
     : arr;
 }
 
+function decodeBase64Url(data) {
+  const base64 = data.replace(/-/g, "+").replace(/_/g, "/");
+  return Buffer.from(base64, "base64").toString("utf-8");
+};
+
+function extractTextFromParts(parts) {
+  let text = "";
+  for (const part of parts) {
+    if (Array.isArray(part.parts)) {
+      text += extractTextFromParts(part.parts);
+    }
+    if (part.mimeType === "text/plain" && part.body?.data) {
+      text += decodeBase64Url(part.body.data);
+    }
+    else if (part.mimeType === "text/html" && part.body?.data) {
+      const html = decodeBase64Url(part.body.data);
+      text += convert(html);
+    }
+  }
+  return text;
+};
+
+function attachTextToParts(parts) {
+  for (const part of parts) {
+    if (Array.isArray(part.parts)) {
+      attachTextToParts(part.parts);
+    }
+    if (part.mimeType === "text/html" && part.body?.data) {
+      const html = decodeBase64Url(part.body.data);
+      part.body.text = convert(html);
+    }
+    else if (part.mimeType === "text/plain" && part.body?.data) {
+      part.body.text = decodeBase64Url(part.body.data);
+    }
+  }
+};
+
 export default {
   parseArray,
+  decodeBase64Url,
+  extractTextFromParts,
+  attachTextToParts,
 };

components/gmail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/gmail",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Pipedream Gmail Components",
   "main": "gmail.app.mjs",
   "keywords": [