@trayio/cdk-runtime 5.24.0 → 5.25.0

package/dist/connector/operation/CompositeOperationExecution.unit.test.js

@@ -15,11 +15,15 @@ const fakePollingContext = () => ({
     connectorName: 'salesforce',
     connectorVersion: '7.2.0',
     executionToken: 'exec-jwt',
-    publicUrl: 'https://trigger.example.test/tab-123',
     organizationId: 'org-uuid',
     workspaceId: 'ws-uuid',
     projectId: '7fa00000-1111-2222-3333-444455556666',
 });
+const PUBLIC_URL = 'https://trigger.example.test/tab-123';
+const fakePollingInput = (overrides = {}) => ({
+    publicUrl: PUBLIC_URL,
+    ...overrides,
+});
 const createFakePollingServiceClient = () => {
     const registerCalls = [];
     const deregisterCalls = [];
@@ -42,13 +46,12 @@ describe('CompositeOperationExecution polling lifecycle branch', () => {
         const handler = new CompositeOperationHandler_1.CompositeOperationHandler(handlerFunction);
         const execution = new CompositeOperationExecution_1.CompositeOperationExecution(noopHandlerInvocationFactory, handler, OperationHandler_1.OperationHandlerType.TriggerPollCreate, 'new_records', client);
         const input = {
+            publicUrl: PUBLIC_URL,
             pollingInterval: { value: 15, unit: PollingTypes_1.PollingIntervalUnit.Minutes },
             maxFailureCount: 50,
             initialCursor: { since: 't0' },
-            operationInput: {
-                soqlQuery: 'SELECT Id, Name FROM Account',
-                objectType: 'Account',
-            },
+            soqlQuery: 'SELECT Id, Name FROM Account',
+            objectType: 'Account',
         };
         const result = await execution.execute(fakePollingContext(), input);
         expect(result.isSuccess).toBe(true);
@@ -63,7 +66,7 @@ describe('CompositeOperationExecution polling lifecycle branch', () => {
             organizationId: 'org-uuid',
             workspaceId: 'ws-uuid',
             projectId: '7fa00000-1111-2222-3333-444455556666',
-            publicUrl: 'https://trigger.example.test/tab-123',
+            publicUrl: PUBLIC_URL,
             pollingInterval: {
                 value: 15,
                 unit: PollingTypes_1.PollingIntervalUnit.Minutes,
@@ -82,7 +85,7 @@ describe('CompositeOperationExecution polling lifecycle branch', () => {
         const handlerFunction = jest.fn();
         const handler = new CompositeOperationHandler_1.CompositeOperationHandler(handlerFunction);
         const execution = new CompositeOperationExecution_1.CompositeOperationExecution(noopHandlerInvocationFactory, handler, OperationHandler_1.OperationHandlerType.TriggerPollDestroy, 'new_records_destroy', client);
-        const result = await execution.execute(fakePollingContext(), {});
+        const result = await execution.execute(fakePollingContext(), fakePollingInput());
         expect(result.isSuccess).toBe(true);
         expect(handlerFunction).not.toHaveBeenCalled();
         expect(deregisterCalls).toHaveLength(1);
@@ -91,7 +94,7 @@ describe('CompositeOperationExecution polling lifecycle branch', () => {
             connectorName: 'salesforce',
             connectorVersion: '7.2.0',
             registeredHandlerName: 'new_records_destroy',
-            publicUrl: 'https://trigger.example.test/tab-123',
+            publicUrl: PUBLIC_URL,
             preserveCursor: true,
         });
         expect(token).toBe('exec-jwt');
@@ -107,7 +110,6 @@ describe('CompositeOperationExecution polling lifecycle branch', () => {
         expect(error).toMatch(/ctx\.connectorName/);
         expect(error).toMatch(/ctx\.connectorVersion/);
         expect(error).toMatch(/ctx\.executionToken/);
-        expect(error).toMatch(/ctx\.publicUrl/);
     });
     it('fails register when org/workspace/project ctx fields are missing (auth is optional)', async () => {
         const { client, registerCalls } = createFakePollingServiceClient();
@@ -120,7 +122,6 @@ describe('CompositeOperationExecution polling lifecycle branch', () => {
             connectorName: 'x',
             connectorVersion: '1',
             executionToken: 'tok',
-            publicUrl: 'u',
         };
         const result = await execution.execute(incompleteCtx, {});
         expect(registerCalls).toHaveLength(0);
@@ -135,17 +136,59 @@ describe('CompositeOperationExecution polling lifecycle branch', () => {
         const { client, deregisterCalls } = createFakePollingServiceClient();
         const handler = new CompositeOperationHandler_1.CompositeOperationHandler(jest.fn());
         const execution = new CompositeOperationExecution_1.CompositeOperationExecution(noopHandlerInvocationFactory, handler, OperationHandler_1.OperationHandlerType.TriggerPollDestroy, 'new_records_destroy', client);
-        // Only the base four ctx fields; auth / org / workspace / project absent.
+        // Only the base three ctx fields; auth / org / workspace / project absent.
         const destroyOnlyCtx = {
             connectorName: 'x',
             connectorVersion: '1',
             executionToken: 'tok',
-            publicUrl: 'u',
         };
-        const result = await execution.execute(destroyOnlyCtx, {});
+        const result = await execution.execute(destroyOnlyCtx, fakePollingInput());
         expect(result.isSuccess).toBe(true);
         expect(deregisterCalls).toHaveLength(1);
     });
+    it('passes connector-defined input fields through to PS as operationInput, stripping platform fields', async () => {
+        const { client, registerCalls } = createFakePollingServiceClient();
+        const handler = new CompositeOperationHandler_1.CompositeOperationHandler(jest.fn());
+        const execution = new CompositeOperationExecution_1.CompositeOperationExecution(noopHandlerInvocationFactory, handler, OperationHandler_1.OperationHandlerType.TriggerPollCreate, 'new_records', client);
+        const input = {
+            publicUrl: PUBLIC_URL,
+            pollingInterval: { value: 5, unit: PollingTypes_1.PollingIntervalUnit.Minutes },
+            maxFailureCount: 10,
+            initialCursor: 'cur-1',
+            soqlQuery: 'SELECT Id FROM Account',
+            objectType: 'Account',
+            nested: { folderId: 'fld_1', tags: ['a', 'b'] },
+        };
+        const result = await execution.execute(fakePollingContext(), input);
+        expect(result.isSuccess).toBe(true);
+        expect(registerCalls).toHaveLength(1);
+        const [payload] = registerCalls[0];
+        expect(payload.operationInput).toEqual({
+            soqlQuery: 'SELECT Id FROM Account',
+            objectType: 'Account',
+            nested: { folderId: 'fld_1', tags: ['a', 'b'] },
+        });
+    });
+    it('fails register when input.publicUrl is missing', async () => {
+        const { client, registerCalls } = createFakePollingServiceClient();
+        const handler = new CompositeOperationHandler_1.CompositeOperationHandler(jest.fn());
+        const execution = new CompositeOperationExecution_1.CompositeOperationExecution(noopHandlerInvocationFactory, handler, OperationHandler_1.OperationHandlerType.TriggerPollCreate, 'new_records', client);
+        const result = await execution.execute(fakePollingContext(), {});
+        expect(registerCalls).toHaveLength(0);
+        expect(result.isFailure).toBe(true);
+        const error = result._tag === 'Failure' ? result.error.message : '';
+        expect(error).toMatch(/input\.publicUrl/);
+    });
+    it('fails deregister when input.publicUrl is missing', async () => {
+        const { client, deregisterCalls } = createFakePollingServiceClient();
+        const handler = new CompositeOperationHandler_1.CompositeOperationHandler(jest.fn());
+        const execution = new CompositeOperationExecution_1.CompositeOperationExecution(noopHandlerInvocationFactory, handler, OperationHandler_1.OperationHandlerType.TriggerPollDestroy, 'new_records_destroy', client);
+        const result = await execution.execute(fakePollingContext(), {});
+        expect(deregisterCalls).toHaveLength(0);
+        expect(result.isFailure).toBe(true);
+        const error = result._tag === 'Failure' ? result.error.message : '';
+        expect(error).toMatch(/input\.publicUrl/);
+    });
     it('maps a PollingServiceClient error into an OperationHandlerResult failure', async () => {
         const client = {
             register: jest.fn(() => Promise.reject(new Error('boom'))),
@@ -153,7 +196,7 @@ describe('CompositeOperationExecution polling lifecycle branch', () => {
         };
         const handler = new CompositeOperationHandler_1.CompositeOperationHandler(jest.fn());
         const execution = new CompositeOperationExecution_1.CompositeOperationExecution(noopHandlerInvocationFactory, handler, OperationHandler_1.OperationHandlerType.TriggerPollCreate, 'new_records', client);
-        const result = await execution.execute(fakePollingContext(), {});
+        const result = await execution.execute(fakePollingContext(), fakePollingInput());
         expect(result.isFailure).toBe(true);
         const message = result._tag === 'Failure' ? result.error.message : '';
         expect(message).toBe('boom');

package/dist/connector/operation/CompositeOperationExecutionPolling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompositeOperationExecutionPolling.d.ts","sourceRoot":"","sources":["../../../src/connector/operation/CompositeOperationExecutionPolling.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,oBAAoB,EACpB,uBAAuB,EAEvB,sBAAsB,EAEtB,oBAAoB,EAEpB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AAEvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAExF,MAAM,MAAM,6BAA6B,GAAG,mBAAmB,GAAG;IACjE,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC;AAsEF,eAAO,MAAM,kBAAkB,gBACjB,oBAAoB,KAC/B,OAEqD,CAAC;AAoCzD;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACxC,IAAI,SAAS,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,EACnD,EAAE,EACF,GAAG,EACF,IAAI,EAAE;IACP,GAAG,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC;IACnC,KAAK,EAAE,EAAE,CAAC;IACV,OAAO,EAAE,yBAAyB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAClD,wBAAwB,EAAE,iCAAiC,CAAC;IAC5D,yBAAyB,EAAE,CAAC,CAAC,EAAE,sBAAsB,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IACpE,cAAc,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,sBAAsB,CAAC,GAAG,CAAC,CAAC;CAC5D,GAAG,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAiCvC;AAED,wBAAgB,8BAA8B,CAC7C,IAAI,SAAS,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClD,IAAI,EAAE;IACP,GAAG,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC;IACnC,WAAW,EACR,oBAAoB,CAAC,iBAAiB,GACtC,oBAAoB,CAAC,kBAAkB,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,6BAA6B,CAAC;IAC5C,oBAAoB,EAAE,oBAAoB,CAAC;CAC3C,GAAG,OAAO,CAAC,IAAI,CAAC,CAkDhB"}
+{"version":3,"file":"CompositeOperationExecutionPolling.d.ts","sourceRoot":"","sources":["../../../src/connector/operation/CompositeOperationExecutionPolling.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,oBAAoB,EACpB,uBAAuB,EAEvB,sBAAsB,EAEtB,oBAAoB,EAEpB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAEN,mBAAmB,EACnB,MAAM,kDAAkD,CAAC;AAE1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAExF,MAAM,MAAM,6BAA6B,GAAG,mBAAmB,GAAG;IACjE,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC;AA4GF,eAAO,MAAM,kBAAkB,gBACjB,oBAAoB,KAC/B,OAEqD,CAAC;AAoCzD;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACxC,IAAI,SAAS,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,EACnD,EAAE,EACF,GAAG,EACF,IAAI,EAAE;IACP,GAAG,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC;IACnC,KAAK,EAAE,EAAE,CAAC;IACV,OAAO,EAAE,yBAAyB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAClD,wBAAwB,EAAE,iCAAiC,CAAC;IAC5D,yBAAyB,EAAE,CAAC,CAAC,EAAE,sBAAsB,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IACpE,cAAc,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,sBAAsB,CAAC,GAAG,CAAC,CAAC;CAC5D,GAAG,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAiCvC;AAED,wBAAgB,8BAA8B,CAC7C,IAAI,SAAS,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClD,IAAI,EAAE;IACP,GAAG,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC;IACnC,WAAW,EACR,oBAAoB,CAAC,iBAAiB,GACtC,oBAAoB,CAAC,kBAAkB,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,6BAA6B,CAAC;IAC5C,oBAAoB,EAAE,oBAAoB,CAAC;CAC3C,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDhB"}

package/dist/connector/operation/CompositeOperationExecutionPolling.js

@@ -2,6 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runPollingRegisterOrDeregister = exports.runTriggerPollDedup = exports.isPollingLifecycle = void 0;
 const OperationHandler_1 = require("@trayio/cdk-dsl/connector/operation/OperationHandler");
+const PollingTypes_1 = require("@trayio/cdk-dsl/connector/operation/PollingTypes");
+/**
+ * Field names on a polling trigger input that the runtime owns and must not
+ * leak into the `operationInput` blob forwarded to the Polling Service.
+ * Mirrors `PLATFORM_POLLING_INPUT_KEYS` from cdk-dsl plus the runtime-only
+ * `initialCursor` field that lives on `PollingTriggerInvocationInput`.
+ */
+const RUNTIME_POLLING_INPUT_KEYS = new Set([
+    ...PollingTypes_1.PLATFORM_POLLING_INPUT_KEYS,
+    'initialCursor',
+]);
+/**
+ * Computes the `operationInput` blob the Polling Service persists for a poll
+ * subscription. Connector-specific config (e.g. SOQL query, object type) is
+ * authored as top-level fields on the connector's `IN extends
+ * PollingTriggerInput`; this strips the platform-managed keys so PS only
+ * sees the connector's own config.
+ */
+const extractOperationInput = (pollingInput) => {
+    const result = {};
+    for (const [key, value] of Object.entries(pollingInput)) {
+        if (!RUNTIME_POLLING_INPUT_KEYS.has(key)) {
+            result[key] = value;
+        }
+    }
+    return result;
+};
 const requirePollingCtxFields = (ctx) => {
     const missing = [];
     if (!ctx.connectorName)
@@ -10,8 +37,6 @@ const requirePollingCtxFields = (ctx) => {
         missing.push('ctx.connectorVersion');
     if (!ctx.executionToken)
         missing.push('ctx.executionToken');
-    if (!ctx.publicUrl)
-        missing.push('ctx.publicUrl');
     if (missing.length > 0) {
         throw new Error(`polling lifecycle is missing required context fields: ${missing.join(', ')}`);
     }
@@ -19,7 +44,6 @@ const requirePollingCtxFields = (ctx) => {
         connectorName: ctx.connectorName,
         connectorVersion: ctx.connectorVersion,
         executionToken: ctx.executionToken,
-        publicUrl: ctx.publicUrl,
     };
 };
 const requirePollingRegisterCtxFields = (ctx) => {
@@ -42,6 +66,12 @@ const requirePollingRegisterCtxFields = (ctx) => {
         projectId: ctx.projectId,
     };
 };
+const requirePollingPublicUrl = (pollingInput) => {
+    if (!pollingInput.publicUrl) {
+        throw new Error('polling lifecycle is missing required input field: input.publicUrl');
+    }
+    return pollingInput.publicUrl;
+};
 const isPollingLifecycle = (handlerType) => handlerType === OperationHandler_1.OperationHandlerType.TriggerPollCreate ||
     handlerType === OperationHandler_1.OperationHandlerType.TriggerPollDestroy;
 exports.isPollingLifecycle = isPollingLifecycle;
@@ -109,6 +139,7 @@ function runPollingRegisterOrDeregister(args) {
     switch (handlerType) {
         case OperationHandler_1.OperationHandlerType.TriggerPollCreate: {
             const registerCtx = requirePollingRegisterCtxFields(ctx);
+            const publicUrl = requirePollingPublicUrl(pollingInput);
             return pollingServiceClient.register({
                 connectorName: registerCtx.connectorName,
                 connectorVersion: registerCtx.connectorVersion,
@@ -117,20 +148,21 @@ function runPollingRegisterOrDeregister(args) {
                 organizationId: registerCtx.organizationId,
                 workspaceId: registerCtx.workspaceId,
                 projectId: registerCtx.projectId,
-                publicUrl: registerCtx.publicUrl,
+                publicUrl,
                 pollingInterval: pollingInput.pollingInterval,
                 maxFailureCount: pollingInput.maxFailureCount,
                 initialCursor: pollingInput.initialCursor,
-                operationInput: pollingInput.operationInput,
+                operationInput: extractOperationInput(pollingInput),
             }, registerCtx.executionToken);
         }
         case OperationHandler_1.OperationHandlerType.TriggerPollDestroy: {
             const destroyCtx = requirePollingCtxFields(ctx);
+            const publicUrl = requirePollingPublicUrl(pollingInput);
             return pollingServiceClient.deregister({
                 connectorName: destroyCtx.connectorName,
                 connectorVersion: destroyCtx.connectorVersion,
                 registeredHandlerName,
-                publicUrl: destroyCtx.publicUrl,
+                publicUrl,
                 preserveCursor: true,
             }, destroyCtx.executionToken);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/cdk-runtime",
-  "version": "5.24.0",
+  "version": "5.25.0",
   "description": "A Runtime that executes connector operations defined using the CDK DSL",
   "exports": {
     "./*": "./dist/*.js"
@@ -14,10 +14,10 @@
     "node": ">=18.x"
   },
   "dependencies": {
-    "@trayio/axios": "5.24.0",
-    "@trayio/cdk-dsl": "5.24.0",
-    "@trayio/express": "5.24.0",
-    "@trayio/winston": "5.24.0",
+    "@trayio/axios": "5.25.0",
+    "@trayio/cdk-dsl": "5.25.0",
+    "@trayio/express": "5.25.0",
+    "@trayio/winston": "5.25.0",
     "mime": "3.0.0",
     "uuid": "9.0.0"
   },