[FIX] Gmail Upgraded lib version

fixed historyId

Author: jcortes

components/gmail/actions/add-label-to-email/add-label-to-email.mjs

@@ -4,7 +4,7 @@ export default {
   key: "gmail-add-label-to-email",
   name: "Add Label to Email",
   description: "Add label(s) to an email message. [See the docs](https://developers.google.com/gmail/api/reference/rest/v1/users.messages/modify)",
-  version: "0.0.9",
+  version: "0.0.10",
   type: "action",
   props: {
     gmail,

components/gmail/actions/approve-workflow/approve-workflow.mjs

@@ -4,7 +4,7 @@ export default {
   key: "gmail-approve-workflow",
   name: "Approve Workflow",
   description: "Suspend the workflow until approved by email. [See the documentation](https://pipedream.com/docs/code/nodejs/rerun#flowsuspend)",
-  version: "0.0.5",
+  version: "0.0.7",
   type: "action",
   props: {
     gmail,

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

@@ -5,7 +5,7 @@ export default {
   key: "gmail-archive-email",
   name: "Archive Email",
   description: "Archive an email message. [See the documentation](https://developers.google.com/gmail/api/reference/rest/v1/users.messages/modify)",
-  version: "0.0.3",
+  version: "0.0.5",
   type: "action",
   props: {
     gmail,

components/gmail/actions/create-draft/create-draft.mjs

@@ -6,7 +6,7 @@ export default {
   key: "gmail-create-draft",
   name: "Create Draft",
   description: "Create a draft from your Google Workspace email account. [See the documentation](https://developers.google.com/gmail/api/reference/rest/v1/users.drafts/create)",
-  version: "0.1.3",
+  version: "0.1.5",
   type: "action",
   props: {
     gmail,

components/gmail/actions/download-attachment/download-attachment.mjs

@@ -7,7 +7,7 @@ export default {
   key: "gmail-download-attachment",
   name: "Download Attachment",
   description: "Download an attachment by attachmentId to the /tmp directory. [See the documentation](https://developers.google.com/gmail/api/reference/rest/v1/users.messages.attachments/get)",
-  version: "0.0.7",
+  version: "0.0.9",
   type: "action",
   props: {
     gmail,

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

@@ -6,7 +6,7 @@ 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.1",
+  version: "0.1.3",
   type: "action",
   props: {
     gmail,

components/gmail/actions/list-labels/list-labels.mjs

@@ -4,7 +4,7 @@ export default {
   key: "gmail-list-labels",
   name: "List Labels",
   description: "List all the existing labels in the connected account. [See the docs](https://developers.google.com/gmail/api/reference/rest/v1/users.labels/list)",
-  version: "0.0.4",
+  version: "0.0.6",
   type: "action",
   props: {
     gmail,

components/gmail/actions/remove-label-from-email/remove-label-from-email.mjs

@@ -4,7 +4,7 @@ export default {
   key: "gmail-remove-label-from-email",
   name: "Remove Label from Email",
   description: "Remove label(s) from an email message. [See the docs](https://developers.google.com/gmail/api/reference/rest/v1/users.messages/modify)",
-  version: "0.0.6",
+  version: "0.0.8",
   type: "action",
   props: {
     gmail,

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

@@ -6,7 +6,7 @@ export default {
   key: "gmail-send-email",
   name: "Send Email",
   description: "Send an email from your Google Workspace email account. [See the documentation](https://developers.google.com/gmail/api/reference/rest/v1/users.messages/send)",
-  version: "0.1.11",
+  version: "0.1.13",
   type: "action",
   props: {
     gmail,

components/gmail/actions/update-org-signature/update-org-signature.mjs

@@ -8,7 +8,7 @@ export default {
   name: "Update Signature for Email in Organization",
   description: `Update the signature for a specific email address in an organization.
     A Google Cloud service account with delegated domain-wide authority is required for this action. [See the documentation](https://developers.google.com/gmail/api/reference/rest/v1/users.settings.sendAs/update)`,
-  version: "0.0.7",
+  version: "0.0.9",
   type: "action",
   props: {
     gmail,

components/gmail/actions/update-primary-signature/update-primary-signature.mjs

@@ -4,7 +4,7 @@ export default {
   key: "gmail-update-primary-signature",
   name: "Update Signature for Primary Email Address",
   description: "Update the signature for the primary email address. [See the documentation](https://developers.google.com/gmail/api/reference/rest/v1/users.settings.sendAs/update)",
-  version: "0.0.7",
+  version: "0.0.9",
   type: "action",
   props: {
     gmail,

components/gmail/gmail.app.mjs

@@ -397,6 +397,12 @@ export default {
       });
       return data;
     },
+    async getProfile() {
+      const { data } = await this._client().users.getProfile({
+        userId: constants.USER_ID,
+      });
+      return data;
+    },
     async getMessageSubject({ id }) {
       const message = await this.getMessage({
         id,

components/gmail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/gmail",
-  "version": "0.3.4",
+  "version": "1.0.0",
   "description": "Pipedream Gmail Components",
   "main": "gmail.app.mjs",
   "keywords": [
@@ -15,10 +15,9 @@
   "dependencies": {
     "@google-cloud/local-auth": "^2.1.0",
     "@google-cloud/pubsub": "^4.7.0",
-    "@googleapis/gmail": "^0.3.4",
+    "@googleapis/gmail": "^13.0.1",
     "@pipedream/platform": "^3.0.3",
     "google-auth-library": "^8.7.0",
-    "googleapis": "^105.0.0",
     "html-to-text": "^9.0.5",
     "mime": "^3.0.0",
     "nodemailer": "^6.7.8",

components/gmail/sources/common/polling-history.mjs

@@ -26,26 +26,53 @@ export default {
       const params = {
         maxResults: constants.HISTORICAL_EVENTS,
       };
+
+      let allMessages = [];
+
       if (this.labels?.length) {
-        params.labelIds = this.labels;
+        // Make individual calls for each labelId to make it inclusive (OR logic)
+        for (const labelId of this.labels) {
+          const { messages } = await this.gmail.listMessages({
+            ...params,
+            labelIds: [
+              labelId,
+            ],
+          });
+          if (messages?.length) {
+            allMessages.push(...messages);
+          }
+        }
+      } else {
+        // No labels specified, get all messages
+        const { messages } = await this.gmail.listMessages(params);
+        if (messages?.length) {
+          allMessages.push(...messages);
+        }
       }
-      let { messages } = await this.gmail.listMessages({
-        ...params,
-      });
-      if (!messages?.length) {
-        return;
+
+      if (!allMessages.length) {
+        const { historyId } = await this.gmail.getProfile();
+        return historyId;
       }
-      const messageIds = messages.map(({ id }) => id);
-      messages = await this.gmail.getMessages(messageIds);
-      messages = messages.sort((a, b) => (a.internalDate - b.internalDate));
+
+      // Remove duplicates based on message id
+      const uniqueMessages = allMessages.filter((message, index, self) =>
+        index === self.findIndex((m) => m.id === message.id));
+
+      const messageIds = uniqueMessages.map(({ id }) => id);
+      const messagesWithHistoryId = await this.gmail.getMessages(messageIds);
+      const sortedMessages =
+        Array.from(messagesWithHistoryId)
+          .sort((a, b) => (Number(b.historyId) - Number(a.historyId)));
+
       const { historyId } = await this.gmail.getMessage({
-        id: messages[messages.length - 1].id,
+        id: sortedMessages[0].id,
       });
       return historyId;
     },
     async emitHistories(startHistoryId) {
       const opts = {
-        startHistoryId,
+        startHistoryId: String(startHistoryId),
         historyTypes: this.getHistoryTypes(),
       };
 
@@ -59,19 +86,42 @@ export default {
           opts.labelId = this.labels[i];
         }
 
-        const {
-          history, historyId,
-        } = await this.gmail.listHistory(opts);
+        try {
+          const {
+            history, historyId,
+          } = await this.gmail.listHistory(opts);
 
-        if (!history) {
-          continue;
-        }
+          maxHistoryId = Math.max(maxHistoryId, historyId);
 
-        maxHistoryId = Math.max(maxHistoryId, historyId);
-        const responseArray = this.filterHistory(history);
+          if (!history) {
+            continue;
+          }
 
-        for (const item of responseArray) {
-          await this.emitFullMessage(item.messages[0].id);
+          const responseArray = this.filterHistory(history);
+
+          for (const item of responseArray) {
+            await this.emitFullMessage(item.messages[0].id);
+          }
+        } catch (error) {
+          // Handle expired or invalid historyId (HTTP 404)
+          if (error.status === 404 || error.message.includes("Requested entity was not found")) {
+            console.log(`History request failed with expired historyId: ${error.message}`);
+            console.log("Getting fresh historyId from profile");
+
+            // Get fresh historyId from profile
+            const profile = await this.gmail.getProfile();
+            const freshHistoryId = profile.historyId;
+
+            if (freshHistoryId) {
+              this._setLastHistoryId(freshHistoryId);
+            }
+
+            // Skip processing for this run since we're resetting the historyId
+            return;
+          } else {
+            // Re-throw other errors
+            throw error;
+          }
         }
       }
       if (maxHistoryId > 0) {
@@ -82,15 +132,40 @@ export default {
       const opts = {
         maxResults: constants.HISTORICAL_EVENTS,
       };
+
+      let allMessages = [];
+
       if (this.labels?.length) {
-        opts.labelIds = this.labels;
+        // Make individual calls for each labelId to make it inclusive (OR logic)
+        for (const labelId of this.labels) {
+          const { messages } = await this.gmail.listMessages({
+            ...opts,
+            labelIds: [
+              labelId,
+            ],
+          });
+          if (messages?.length) {
+            allMessages.push(...messages);
+          }
+        }
+      } else {
+        // No labels specified, get all messages
+        const { messages } = await this.gmail.listMessages(opts);
+        if (messages?.length) {
+          allMessages.push(...messages);
+        }
       }
-      let { messages } = await this.gmail.listMessages(opts);
-      if (!messages?.length) {
+
+      if (!allMessages.length) {
         return;
       }
-      messages = messages.sort((a, b) => (a.internalDate - b.internalDate));
-      for (const message of messages) {
+
+      // Remove duplicates based on message id
+      const uniqueMessages = allMessages.filter((message, index, self) =>
+        index === self.findIndex((m) => m.id === message.id));
+
+      const sortedMessages = uniqueMessages.sort((a, b) => (a.internalDate - b.internalDate));
+      for (const message of sortedMessages) {
         await this.emitFullMessage(message.id);
       }
     },

components/gmail/sources/new-attachment-received/new-attachment-received.mjs

@@ -6,7 +6,7 @@ export default {
   key: "gmail-new-attachment-received",
   name: "New Attachment Received",
   description: "Emit new event for each attachment in a message received. This source is capped at 100 max new messages per run.",
-  version: "0.0.12",
+  version: "0.0.14",
   type: "source",
   dedupe: "unique",
   props: {

components/gmail/sources/new-email-matching-search/new-email-matching-search.mjs

@@ -6,7 +6,7 @@ export default {
   key: "gmail-new-email-matching-search",
   name: "New Email Matching Search",
   description: "Emit new event when an email matching the search criteria is received. This source is capped at 100 max new messages per run.",
-  version: "0.0.10",
+  version: "0.0.12",
   type: "source",
   dedupe: "unique",
   props: {

components/gmail/sources/new-email-received/new-email-received.mjs

@@ -15,7 +15,7 @@ export default {
   name: "New Email Received",
   description: "Emit new event when a new email is received.",
   type: "source",
-  version: "0.2.5",
+  version: "0.2.7",
   dedupe: "unique",
   props: {
     gmail,

components/gmail/sources/new-labeled-email/new-labeled-email.mjs

@@ -8,7 +8,7 @@ export default {
   name: "New Labeled Email",
   description: "Emit new event when a new email is labeled.",
   type: "source",
-  version: "0.0.12",
+  version: "0.0.13",
   dedupe: "unique",
   props: {
     gmail,

components/gmail/sources/new-sent-email/new-sent-email.mjs

@@ -6,7 +6,7 @@ export default {
   key: "gmail-new-sent-email",
   name: "New Sent Email",
   description: "Emit new event for each new email sent. (Maximum of 100 events emited per execution)",
-  version: "0.0.11",
+  version: "0.0.13",
   type: "source",
   dedupe: "unique",
   props: {