fix: direct invocation

Author: solaris007

src/index.js

@@ -13,9 +13,14 @@ import wrap from '@adobe/helix-shared-wrap';
 import { helixStatus } from '@adobe/helix-status';
 import secrets from '@adobe/helix-shared-secrets';
 import dataAccess from '@adobe/spacecat-shared-data-access';
-import { sqsEventAdapter } from '@adobe/spacecat-shared-utils';
-import { internalServerError, notFound, ok } from '@adobe/spacecat-shared-http-utils';
+import {
+  internalServerError,
+  notFound,
+  ok,
+  badRequest,
+} from '@adobe/spacecat-shared-http-utils';
 import { imsClientWrapper } from '@adobe/spacecat-shared-ims-client';
+import { isNonEmptyObject, sqsEventAdapter } from '@adobe/spacecat-shared-utils';
 
 import { runOpportunityStatusProcessor as opportunityStatusProcessor } from './tasks/opportunity-status-processor/handler.js';
 import { runDisableImportAuditProcessor as disableImportAuditProcessor } from './tasks/disable-import-audit-processor/handler.js';
@@ -31,7 +36,7 @@ const HANDLERS = {
   'agent-executor': agentExecutor,
   'slack-notify': slackNotify,
   'cwv-demo-suggestions-processor': cwvDemoSuggestionsProcessor,
-  dummy: (message) => ok(message),
+  dummy: (message) => ok(message), // for tests
 };
 
 // Custom secret name resolver to use the correct secret path
@@ -98,10 +103,15 @@ function isSqsEvent(event) {
 }
 
 export const main = async (event, context) => {
-  const { log } = context;
-  // const isSQSEvent = Array.isArray(context.invocation?.event?.Records);
-  log.debug(JSON.stringify(event, null, 2));
-  log.debug(JSON.stringify(context, null, 2));
-  const handler = isSqsEvent(event) ? runSQS : runDirect;
-  return handler(event, context);
+  if (isSqsEvent(event)) {
+    return runSQS(event, context);
+  }
+
+  const payload = context?.invocation?.event;
+  if (!isNonEmptyObject(payload)) {
+    context?.log?.warn?.('Direct invocation missing payload');
+    return badRequest('Event does not contain a valid message body');
+  }
+
+  return runDirect(payload, context);
 };

test/index.test.js

@@ -182,50 +182,25 @@ describe('Index Tests', () => {
     expect(context.log.error.calledWithMatch(sinon.match('demo-url-processor task for test-site failed after'))).to.be.true;
   });
 
-  it('processes direct invocation events without SQS adapter', async () => {
-    const directContext = {
-      ...context,
-      invocation: undefined,
-    };
-    const directEvent = {
-      type: 'dummy',
-      siteId: 'direct-site',
-    };
-
-    const resp = await main(directEvent, directContext);
-    expect(resp.status).to.equal(200);
-    expect(directContext.log.info.calledWith('Found task handler for type: dummy')).to.be.true;
-  });
+  describe('direct invocation detection', () => {
+    it('falls back to badRequest when no payload is provided', async () => {
+      const resp = await main({ random: 'value' }, { ...context, invocation: undefined });
+      expect(resp.status).to.equal(400);
+    });
 
-  it('treats direct invocation with context invocation records as direct', async () => {
-    const directContext = {
-      ...context,
-      invocation: {
-        event: {
-          Records: [{
-            body: JSON.stringify({ fake: 'value' }),
-          }],
+    it('uses payload from context invocation when present', async () => {
+      const directContext = {
+        ...context,
+        invocation: {
+          event: {
+            type: 'dummy',
+            siteId: 'direct-site',
+          },
         },
-      },
-    };
-    const directEvent = {
-      type: 'dummy',
-      siteId: 'direct-site',
-    };
-
-    const resp = await main(directEvent, directContext);
-    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;
+      };
+      const resp = await main({}, directContext);
+      expect(resp.status).to.equal(200);
+      expect(directContext.log.info.calledWith('Found task handler for type: dummy')).to.be.true;
+    });
   });
 });