Skip to content

AI Agents & MCPs & AI Workflow Automation • (~400 MCP servers for AI agents) • AI Automation / AI Agent with MCPs • AI Workflows & AI Agents • MCPs for AI Agents

fix(pieces): keep polling state on republish for gmail, google-contacts and wonderchat (#16694)

Amr Elmohamadyfa675853c455
diff --git a/packages/pieces/community/gmail/package.json b/packages/pieces/community/gmail/package.json
index 785c7d95be7..7d7e317b585 100644
--- a/packages/pieces/community/gmail/package.json
+++ b/packages/pieces/community/gmail/package.json
@@ -1,6 +1,6 @@
{
"name": "@activepieces/piece-gmail",
- "version": "0.18.1",
+ "version": "0.18.2",
"main": "./dist/src/index.js",
"types": "./dist/src/index.d.ts",
"dependencies": {
diff --git a/packages/pieces/community/gmail/src/lib/triggers/new-labeled-email.ts b/packages/pieces/community/gmail/src/lib/triggers/new-labeled-email.ts
index f38836c9589..f72aee67fb9 100644
--- a/packages/pieces/community/gmail/src/lib/triggers/new-labeled-email.ts
+++ b/packages/pieces/community/gmail/src/lib/triggers/new-labeled-email.ts
@@ -2,6 +2,7 @@ import {
createTrigger,
TriggerStrategy,
FilesService,
+ tryCatch,
} from '@activepieces/pieces-framework';
import { GmailProps } from '../common/props';
import { gmailAuth, createGoogleClient } from '../auth';
@@ -9,6 +10,15 @@ import { gmail as googleGmail } from '@googleapis/gmail';
import { parseStream, convertAttachment } from '../common/data';
import { newLabeledEmailTriggerOutputSchema } from '../output-schemas';
+function isExpiredHistoryIdError(error: unknown): boolean {
+ return (
+ typeof error === 'object' &&
+ error !== null &&
+ 'code' in error &&
+ Number(error.code) === 404
+ );
+}
+
async function enrichGmailMessage({
gmail,
messageId,
@@ -92,12 +102,22 @@ export const gmailNewLabeledEmailTrigger = createTrigger({
const lastHistoryId = await context.store.get('lastHistoryId');
- const historyResponse = await gmail.users.history.list({
- userId: 'me',
- startHistoryId: lastHistoryId as string,
- labelId: context.propsValue.label.id,
- historyTypes: ['labelAdded', 'messageAdded'],
- });
+ const { data: historyResponse, error } = await tryCatch(() =>
+ gmail.users.history.list({
+ userId: 'me',
+ startHistoryId: lastHistoryId as string,
+ labelId: context.propsValue.label.id,
+ historyTypes: ['labelAdded', 'messageAdded'],
+ })
+ );
+ if (error) {
+ if (!isExpiredHistoryIdError(error)) {
+ throw error;
+ }
+ const profile = await gmail.users.getProfile({ userId: 'me' });
+ await context.store.put('lastHistoryId', profile.data.historyId);
+ return [];
+ }
const labeledMessages = new Map<string, string>();
const results = [];
diff --git a/packages/pieces/community/gmail/test/new-labeled-email.test.ts b/packages/pieces/community/gmail/test/new-labeled-email.test.ts
new file mode 100644
index 00000000000..827603ea0e5
--- /dev/null
+++ b/packages/pieces/community/gmail/test/new-labeled-email.test.ts
@@ -0,0 +1,71 @@
+/// <reference types="vitest/globals" />
+
+import { Store } from '@activepieces/pieces-framework';
+
+const historyListMock = vi.fn();
+const getProfileMock = vi.fn().mockResolvedValue({ data: { historyId: 'current-history-id' } });
+
+vi.mock('@googleapis/gmail', () => ({
+ gmail: () => ({
+ users: {
+ history: { list: historyListMock },
+ getProfile: getProfileMock,
+ },
+ }),
+}));
+
+vi.mock('../src/lib/auth', () => ({
+ gmailAuth: {},
+ createGoogleClient: vi.fn().mockResolvedValue({}),
+}));
+
+import { gmailNewLabeledEmailTrigger } from '../src/lib/triggers/new-labeled-email';
+
+describe('gmailNewLabeledEmailTrigger.run', () => {
+ beforeEach(() => {
+ historyListMock.mockReset();
+ });
+
+ it('resets to the current history id when the stored one has expired', async () => {
+ historyListMock.mockRejectedValue(Object.assign(new Error('Requested entity was not found.'), { code: 404 }));
+ const store = memoryStore({ lastHistoryId: 'expired-history-id' });
+
+ const result = await gmailNewLabeledEmailTrigger.run(makeContext(store));
+
+ expect(result).toEqual([]);
+ expect(await store.get('lastHistoryId')).toBe('current-history-id');
+ });
+
+ it('rethrows errors that are not an expired history id', async () => {
+ historyListMock.mockRejectedValue(Object.assign(new Error('Backend Error'), { code: 500 }));
+ const store = memoryStore({ lastHistoryId: 'some-history-id' });
+
+ await expect(gmailNewLabeledEmailTrigger.run(makeContext(store))).rejects.toThrow('Backend Error');
+ expect(await store.get('lastHistoryId')).toBe('some-history-id');
+ });
+});
+
+function makeContext(store: Store): Parameters<typeof gmailNewLabeledEmailTrigger.run>[0] {
+ return {
+ auth: {},
+ propsValue: { label: { id: 'Label_1', name: 'Invoices' } },
+ store,
+ files: {},
+ } as unknown as Parameters<typeof gmailNewLabeledEmailTrigger.run>[0];
+}
+
+function memoryStore(initial: Record<string, unknown>): Store {
+ const data = new Map<string, unknown>(Object.entries(initial));
+ return {
+ async put<T>(key: string, value: T): Promise<T> {
+ data.set(key, value);
+ return value;
+ },
+ async get<T>(key: string): Promise<T | null> {
+ return (data.get(key) as T) ?? null;
+ },
+ async delete(key: string): Promise<void> {
+ data.delete(key);
+ },
+ };
+}
diff --git a/packages/pieces/community/google-contacts/package.json b/packages/pieces/community/google-contacts/package.json
index 2db30fb5975..c983137316d 100644
--- a/packages/pieces/community/google-contacts/package.json
+++ b/packages/pieces/community/google-contacts/package.json
@@ -1,6 +1,6 @@
{
"name": "@activepieces/piece-google-contacts",
- "version": "0.5.4",
+ "version": "0.5.5",
"main": "./dist/src/index.js",
"types": "./dist/src/index.d.ts",
"dependencies": {
diff --git a/packages/pieces/community/google-contacts/src/lib/trigger/new-contact.ts b/packages/pieces/community/google-contacts/src/lib/trigger/new-contact.ts
index 03c314adbc5..6244a633b2a 100644
--- a/packages/pieces/community/google-contacts/src/lib/trigger/new-contact.ts
+++ b/packages/pieces/community/google-contacts/src/lib/trigger/new-contact.ts
@@ -151,33 +151,15 @@ export const googleContactNewOrUpdatedContact = createTrigger({
type: TriggerStrategy.POLLING,
async onEnable(ctx) {
- return await pollingHelper.onEnable(polling, {
- store: ctx.store,
- auth: ctx.auth,
- propsValue: {},
- });
+ return await pollingHelper.onEnable(polling, ctx);
},
async onDisable(ctx) {
- return await pollingHelper.onEnable(polling, {
- store: ctx.store,
- auth: ctx.auth,
- propsValue: {},
- });
+ return await pollingHelper.onDisable(polling, ctx);
},
async run(ctx) {
- return await pollingHelper.poll(polling, {
- store: ctx.store,
- auth: ctx.auth,
- propsValue: {},
- files: ctx.files,
- });
+ return await pollingHelper.poll(polling, ctx);
},
test: async (ctx) => {
- return await pollingHelper.test(polling, {
- store: ctx.store,
- auth: ctx.auth,
- propsValue: {},
- files: ctx.files,
- });
+ return await pollingHelper.test(polling, ctx);
},
});
diff --git a/packages/pieces/community/wonderchat/package.json b/packages/pieces/community/wonderchat/package.json
index d1f7c5593c8..82359161dc0 100644
--- a/packages/pieces/community/wonderchat/package.json
+++ b/packages/pieces/community/wonderchat/package.json
@@ -1,6 +1,6 @@
{
"name": "@activepieces/piece-wonderchat",
- "version": "0.1.7",
+ "version": "0.1.8",
"type": "commonjs",
"main": "./dist/src/index.js",
"types": "./dist/src/index.d.ts",
diff --git a/packages/pieces/community/wonderchat/src/lib/triggers/new-user-message.ts b/packages/pieces/community/wonderchat/src/lib/triggers/new-user-message.ts
index c5a6269918a..f4146445f31 100644
--- a/packages/pieces/community/wonderchat/src/lib/triggers/new-user-message.ts
+++ b/packages/pieces/community/wonderchat/src/lib/triggers/new-user-message.ts
@@ -77,17 +77,15 @@ export const newUserMessage = createTrigger({
type: TriggerStrategy.POLLING,
async test(context) {
- return await pollingHelper.poll(polling, context);
+ return await pollingHelper.test(polling, context);
},
async onEnable(context) {
- const { store, auth, propsValue } = context;
- await pollingHelper.onEnable(polling, { store, auth, propsValue });
+ await pollingHelper.onEnable(polling, context);
},
async onDisable(context) {
- const { store, auth, propsValue } = context;
- await pollingHelper.onEnable(polling, { store, auth, propsValue });
+ await pollingHelper.onDisable(polling, context);
},
async run(context) {