Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions packages/serverless-offline-sqs/src/sqs.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class SQS {
}

async _sqsEvent(functionKey, sqsEvent) {
const {enabled, arn, queueName, batchSize = 10} = sqsEvent;
const {enabled, arn, queueName, batchSize = 10, functionResponseType} = sqsEvent;

if (!enabled) return;

Expand All @@ -109,6 +109,18 @@ class SQS {
return getMessages(size - Messages.length, [...messages, ...Messages]);
};

const getSuccessfullyProcessedMessages = (messages, result) => {
if (functionResponseType !== 'ReportBatchItemFailures') {
return messages;
}

const failedMessageIds = new Set(
result?.batchItemFailures?.map(message => message?.itemIdentifier) ?? []
);

return messages.filter(({MessageId}) => !failedMessageIds.has(MessageId));
};

const job = async () => {
const messages = await getMessages(batchSize);

Expand All @@ -119,12 +131,13 @@ class SQS {
const event = new SQSEvent(messages, this.region, arn);
lambdaFunction.setEvent(event);

await lambdaFunction.runHandler();
const result = await lambdaFunction.runHandler();
const messagesToDelete = getSuccessfullyProcessedMessages(messages, result);

await Promise.all(
chunk(
10,
(messages || []).map(({MessageId: Id, ReceiptHandle}) => ({
(messagesToDelete || []).map(({MessageId: Id, ReceiptHandle}) => ({
Id,
ReceiptHandle
}))
Expand Down