fix: direct invocation

Author: solaris007

src/index.js

@@ -93,14 +93,13 @@ const runDirect = wrap(processTask)
   .with(secrets, { name: getSecretName })
   .with(helixStatus);
 
-function isDirectInvocation(event) {
-  return event
-    && typeof event === 'object'
-    && !Array.isArray(event?.Records)
-    && typeof event?.type === 'string';
+function isSqsEvent(event) {
+  return Array.isArray(event?.Records);
 }
 
 export const main = async (event, context) => {
-  const handler = isDirectInvocation(event) ? runDirect : runSQS;
+  const { log } = context;
+  log.debug(JSON.stringify(event.Records, null, 2));
+  const handler = isSqsEvent(event) ? runSQS : runDirect;
   return handler(event, context);
 };

test/index.test.js

@@ -15,7 +15,6 @@
 import { expect, use } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
-import { Request } from '@adobe/fetch';
 import esmock from 'esmock';
 import { main, getSecretName } from '../src/index.js';
 
@@ -24,7 +23,7 @@ use(sinonChai);
 const sandbox = sinon.createSandbox();
 
 describe('Index Tests', () => {
-  const request = new Request('https://space.cat');
+  let sqsEvent;
   let context;
   let messageBodyJson;
 
@@ -37,6 +36,12 @@ describe('Index Tests', () => {
         key: 'value',
       },
     };
+    sqsEvent = {
+      Records: [{
+        body: JSON.stringify(messageBodyJson),
+      }],
+    };
+
     context = {
       dataAccess: {},
       log: {
@@ -63,11 +68,7 @@ describe('Index Tests', () => {
         region: 'us-east-1',
       },
       invocation: {
-        event: {
-          Records: [{
-            body: JSON.stringify(messageBodyJson),
-          }],
-        },
+        event: sqsEvent,
       },
     };
   });
@@ -78,7 +79,7 @@ describe('Index Tests', () => {
 
   it('requests without a valid event payload are rejected', async () => {
     delete context.invocation;
-    const resp = await main(request, context);
+    const resp = await main(sqsEvent, context);
 
     expect(resp.status).to.equal(400);
     expect(resp.headers.get('x-error')).to.equal('Event does not contain any records');
@@ -87,7 +88,7 @@ describe('Index Tests', () => {
   it('returns 404 for unknown handler type', async () => {
     messageBodyJson.type = 'unknown-type';
     context.invocation.event.Records[0].body = JSON.stringify(messageBodyJson);
-    const resp = await main(request, context);
+    const resp = await main(sqsEvent, context);
     expect(resp.status).to.equal(404);
     // Verify the error message was logged
     expect(context.log.error.calledWith('no such task type: unknown-type')).to.be.true;
@@ -119,14 +120,14 @@ describe('Index Tests', () => {
       }),
     };
 
-    const resp = await main(request, context);
+    const resp = await main(sqsEvent, context);
     expect(resp.status).to.equal(200); // Handler should handle the error gracefully
     // Verify the task handler was found
     expect(context.log.info.calledWith('Found task handler for type: demo-url-processor')).to.be.true;
   });
 
   it('happy path', async () => {
-    const resp = await main(request, context);
+    const resp = await main(sqsEvent, context);
     expect(resp.status).to.equal(200);
     // Verify the task handler was found
     expect(context.log.info.calledWith('Found task handler for type: dummy')).to.be.true;
@@ -155,7 +156,7 @@ describe('Index Tests', () => {
       },
     };
 
-    const resp = await main(request, context);
+    const resp = await main(sqsEvent, context);
     expect(resp.status).to.equal(200); // Handler catches the error internally
     // Verify the task handler was found
     expect(context.log.info.calledWith('Found task handler for type: opportunity-status-processor')).to.be.true;
@@ -176,7 +177,7 @@ describe('Index Tests', () => {
       },
     });
 
-    const resp = await mockedMain(request, context);
+    const resp = await mockedMain(sqsEvent, context);
     expect(resp.status).to.equal(500); // Should return internal server error
     expect(context.log.error.calledWithMatch(sinon.match('demo-url-processor task for test-site failed after'))).to.be.true;
   });
@@ -216,4 +217,15 @@ describe('Index Tests', () => {
     expect(resp.status).to.equal(200);
     expect(directContext.log.info.calledWith('Found task handler for type: dummy')).to.be.true;
   });
+
+  it('processes direct invocation events even when context contains invocation records', async () => {
+    const directEvent = {
+      type: 'dummy',
+      siteId: 'direct-site',
+    };
+
+    const resp = await main(directEvent, context);
+    expect(resp.status).to.equal(200);
+    expect(context.log.info.calledWith('Found task handler for type: dummy')).to.be.true;
+  });
 });