Skip to content

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

fix(ts/core): address cursorbot

jkomyno07c909b3573f
diff --git a/ts/packages/core/src/models/Triggers.ts b/ts/packages/core/src/models/Triggers.ts
index 7da7fc3c6..c57afb080 100644
--- a/ts/packages/core/src/models/Triggers.ts
+++ b/ts/packages/core/src/models/Triggers.ts
@@ -49,6 +49,20 @@ import { ComposioConfig } from '../composio';
import { BaseComposioProvider } from '../provider/BaseProvider';
import { hmacSha256Base64, timingSafeEqual } from '../utils/crypto';
import { CONFIG_DEFAULTS } from '../utils/config-defaults';
+
+/**
+ * Safely converts a value to a string, returning the default if the value is null, undefined, or empty.
+ * This prevents runtime crashes when calling string methods like `.toLowerCase()` on non-string values.
+ * @private
+ */
+const toStringOrDefault = (value: unknown, defaultValue: string): string => {
+ if (value === null || value === undefined) {
+ return defaultValue;
+ }
+ const str = String(value);
+ return str.length > 0 ? str : defaultValue;
+};
+
/**
* Trigger (Instance) class
* /api/v3/trigger_instances
@@ -452,6 +466,7 @@ export class Triggers<TProvider extends BaseComposioProvider<unknown, unknown, u
/**
* Tries to parse data as V1, V2, or V3 webhook payload format.
* Returns the parsed result with version info, or null if no format matches.
+ * Also returns any schema validation errors for debugging purposes.
* @private
*/
private tryParseVersionedPayload(data: unknown):
@@ -531,19 +546,33 @@ export class Triggers<TProvider extends BaseComposioProvider<unknown, unknown, u
logger.warn('Unknown Pusher payload format. Payload keys: ' + Object.keys(data).join(', '));
// Return a minimal payload structure to avoid breaking the subscription
+ // Use toStringOrDefault to safely convert values and prevent crashes when
+ // non-string values are passed (e.g., numbers, objects) and .toLowerCase() is called later
+ const id = toStringOrDefault(data.id, toStringOrDefault(data.trigger_id, 'unknown'));
+ const uuid = toStringOrDefault(data.uuid, toStringOrDefault(data.id, 'unknown'));
+ const triggerSlug = toStringOrDefault(
+ data.triggerSlug,
+ toStringOrDefault(data.trigger_name, 'UNKNOWN')
+ );
+ const toolkitSlug = toStringOrDefault(
+ data.toolkitSlug,
+ toStringOrDefault(data.appName, 'UNKNOWN')
+ );
+ const userId = toStringOrDefault(data.userId, '');
+
return {
- id: (data.id as string) || (data.trigger_id as string) || 'unknown',
- uuid: (data.uuid as string) || (data.id as string) || 'unknown',
- triggerSlug: (data.triggerSlug as string) || (data.trigger_name as string) || 'UNKNOWN',
- toolkitSlug: (data.toolkitSlug as string) || (data.appName as string) || 'UNKNOWN',
- userId: (data.userId as string) || '',
+ id,
+ uuid,
+ triggerSlug,
+ toolkitSlug,
+ userId,
payload: (data.payload as Record<string, unknown>) || data,
originalPayload: (data.originalPayload as Record<string, unknown>) || data,
metadata: {
- id: (data.id as string) || 'unknown',
- uuid: (data.uuid as string) || 'unknown',
- toolkitSlug: (data.toolkitSlug as string) || 'UNKNOWN',
- triggerSlug: (data.triggerSlug as string) || 'UNKNOWN',
+ id,
+ uuid,
+ triggerSlug,
+ toolkitSlug,
triggerConfig: {},
connectedAccount: {
id: '',
diff --git a/ts/packages/core/test/models/triggers.test.ts b/ts/packages/core/test/models/triggers.test.ts
index 4edcb2df7..57a05a0b2 100644
--- a/ts/packages/core/test/models/triggers.test.ts
+++ b/ts/packages/core/test/models/triggers.test.ts
@@ -1144,6 +1144,67 @@ describe('Triggers', () => {
);
});
+ it('should handle non-string values in fallback payload without crashing', async () => {
+ const malformedPayload = {
+ toolkitSlug: 123, // number instead of string
+ triggerSlug: { foo: 1 }, // object instead of string
+ id: null,
+ userId: undefined,
+ trigger_name: 456, // number instead of string for fallback field
+ };
+
+ await triggers.subscribe(mockCallback);
+ const subscribeCall = vi.mocked(mockPusherService.subscribe).mock.calls[0];
+ const filterCallback = subscribeCall[0];
+
+ // Should not throw, even with non-string values
+ expect(() => filterCallback(malformedPayload)).not.toThrow();
+ expect(mockCallback).toHaveBeenCalledTimes(1);
+
+ // The callback should receive a payload with string values that are safe to use with string methods
+ const receivedPayload = mockCallback.mock.calls[0][0];
+ expect(typeof receivedPayload.toolkitSlug).toBe('string');
+ expect(typeof receivedPayload.triggerSlug).toBe('string');
+ expect(typeof receivedPayload.id).toBe('string');
+ expect(typeof receivedPayload.userId).toBe('string');
+
+ // Verify that calling toLowerCase() doesn't crash (this is what shouldSendTriggerAfterFilters does)
+ expect(() => receivedPayload.toolkitSlug.toLowerCase()).not.toThrow();
+ expect(() => receivedPayload.triggerSlug.toLowerCase()).not.toThrow();
+ });
+
+ it('should safely convert various non-string types in fallback payload', async () => {
+ const payloadWithVariousTypes = {
+ id: 12345, // number
+ uuid: true, // boolean
+ toolkitSlug: ['array'], // array
+ triggerSlug: { nested: 'object' }, // object
+ userId: Symbol('symbol'), // symbol - will convert to 'Symbol(symbol)'
+ appName: null, // null
+ trigger_name: undefined, // undefined
+ };
+
+ await triggers.subscribe(mockCallback);
+ const subscribeCall = vi.mocked(mockPusherService.subscribe).mock.calls[0];
+ const filterCallback = subscribeCall[0];
+
+ // Should not throw
+ expect(() => filterCallback(payloadWithVariousTypes)).not.toThrow();
+ expect(mockCallback).toHaveBeenCalledTimes(1);
+
+ const receivedPayload = mockCallback.mock.calls[0][0];
+
+ // All values should be strings
+ expect(typeof receivedPayload.id).toBe('string');
+ expect(typeof receivedPayload.uuid).toBe('string');
+ expect(typeof receivedPayload.toolkitSlug).toBe('string');
+ expect(typeof receivedPayload.triggerSlug).toBe('string');
+ expect(typeof receivedPayload.userId).toBe('string');
+
+ // Numeric ID should be converted to string
+ expect(receivedPayload.id).toBe('12345');
+ });
+
it('should filter V3 payloads correctly by triggerId', async () => {
const filters = { triggerId: 'trigger-456' };
await triggers.subscribe(mockCallback, filters);
diff --git a/ts/packages/core/test/models/verifyWebhook.test.ts b/ts/packages/core/test/models/verifyWebhook.test.ts
index 58fd5b17d..be8a2ba4b 100644
--- a/ts/packages/core/test/models/verifyWebhook.test.ts
+++ b/ts/packages/core/test/models/verifyWebhook.test.ts
@@ -503,6 +503,30 @@ describe('Triggers.verifyWebhook', () => {
})
).rejects.toThrow('does not match any known version');
});
+
+ it('should include detailed schema errors when payload does not match any version', async () => {
+ const invalidPayload = JSON.stringify({ invalid: 'data' });
+ const signature = createSignature(testWebhookId, testTimestamp, invalidPayload, testSecret);
+
+ try {
+ await triggers.verifyWebhook({
+ payload: invalidPayload,
+ signature,
+ secret: testSecret,
+ id: testWebhookId,
+ timestamp: testTimestamp,
+ });
+ expect.fail('Should have thrown');
+ } catch (error) {
+ expect(error).toBeInstanceOf(ComposioWebhookPayloadError);
+ const webhookError = error as ComposioWebhookPayloadError;
+ expect(webhookError.cause).toBeDefined();
+ // The cause should contain v1Error, v2Error, and v3Error with schema validation messages
+ expect((webhookError.cause as any).v1Error).toBeDefined();
+ expect((webhookError.cause as any).v2Error).toBeDefined();
+ expect((webhookError.cause as any).v3Error).toBeDefined();
+ }
+ });
});
describe('timestamp validation', () => {