Skip to content

fix(sdk): preserve idempotencyKeyOptions on batch.triggerBy* paths #4422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Ayush7614 wants to merge 1 commit into from
+86 −18
Closed

fix(sdk): preserve idempotencyKeyOptions on batch.triggerBy* paths #4422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/fix-batch-by-idempotency-key-options.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@trigger.dev/sdk": patch
---

Attach idempotencyKeyOptions on batch.triggerBy* and related batch stream paths so scope and original keys are preserved
99 changes: 81 additions & 18 deletions packages/trigger-sdk/src/v3/shared.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,13 @@ export async function batchTriggerById<TTask extends AnyTask>(
flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
);

// Process item-specific idempotency key and extract options for storage
const itemIdempotencyKey = await makeIdempotencyKey(item.options?.idempotencyKey);
const finalIdempotencyKey = itemIdempotencyKey ?? batchItemIdempotencyKey;
const idempotencyKeyOptions = itemIdempotencyKey
? getIdempotencyKeyOptions(itemIdempotencyKey)
: undefined;

return {
index,
task: item.id,
Expand All @@ -739,9 +746,9 @@ export async function batchTriggerById<TTask extends AnyTask>(
maxAttempts: item.options?.maxAttempts,
metadata: item.options?.metadata,
maxDuration: item.options?.maxDuration,
idempotencyKey:
(await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
idempotencyKey: finalIdempotencyKey?.toString(),
idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
idempotencyKeyOptions,
machine: item.options?.machine,
priority: item.options?.priority,
region: item.options?.region,
Expand Down Expand Up @@ -980,6 +987,13 @@ export async function batchTriggerByIdAndWait<TTask extends AnyTask>(
flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
);

// Process item-specific idempotency key and extract options for storage
const itemIdempotencyKey = await makeIdempotencyKey(item.options?.idempotencyKey);
const finalIdempotencyKey = itemIdempotencyKey ?? batchItemIdempotencyKey;
const idempotencyKeyOptions = itemIdempotencyKey
? getIdempotencyKeyOptions(itemIdempotencyKey)
: undefined;

return {
index,
task: item.id,
Expand All @@ -996,9 +1010,9 @@ export async function batchTriggerByIdAndWait<TTask extends AnyTask>(
maxAttempts: item.options?.maxAttempts,
metadata: item.options?.metadata,
maxDuration: item.options?.maxDuration,
idempotencyKey:
(await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
idempotencyKey: finalIdempotencyKey?.toString(),
idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
idempotencyKeyOptions,
machine: item.options?.machine,
priority: item.options?.priority,
region: item.options?.region,
Expand Down Expand Up @@ -1246,6 +1260,13 @@ export async function batchTriggerTasks<TTasks extends readonly AnyTask[]>(
flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
);

// Process item-specific idempotency key and extract options for storage
const itemIdempotencyKey = await makeIdempotencyKey(item.options?.idempotencyKey);
const finalIdempotencyKey = itemIdempotencyKey ?? batchItemIdempotencyKey;
const idempotencyKeyOptions = itemIdempotencyKey
? getIdempotencyKeyOptions(itemIdempotencyKey)
: undefined;

return {
index,
task: item.task.id,
Expand All @@ -1261,9 +1282,9 @@ export async function batchTriggerTasks<TTasks extends readonly AnyTask[]>(
maxAttempts: item.options?.maxAttempts,
metadata: item.options?.metadata,
maxDuration: item.options?.maxDuration,
idempotencyKey:
(await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
idempotencyKey: finalIdempotencyKey?.toString(),
idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
idempotencyKeyOptions,
machine: item.options?.machine,
priority: item.options?.priority,
region: item.options?.region,
Expand Down Expand Up @@ -1507,6 +1528,13 @@ export async function batchTriggerAndWaitTasks<TTasks extends readonly AnyTask[]
flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
);

// Process item-specific idempotency key and extract options for storage
const itemIdempotencyKey = await makeIdempotencyKey(item.options?.idempotencyKey);
const finalIdempotencyKey = itemIdempotencyKey ?? batchItemIdempotencyKey;
const idempotencyKeyOptions = itemIdempotencyKey
? getIdempotencyKeyOptions(itemIdempotencyKey)
: undefined;

return {
index,
task: item.task.id,
Expand All @@ -1523,9 +1551,9 @@ export async function batchTriggerAndWaitTasks<TTasks extends readonly AnyTask[]
maxAttempts: item.options?.maxAttempts,
metadata: item.options?.metadata,
maxDuration: item.options?.maxDuration,
idempotencyKey:
(await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
idempotencyKey: finalIdempotencyKey?.toString(),
idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
idempotencyKeyOptions,
machine: item.options?.machine,
priority: item.options?.priority,
region: item.options?.region,
Expand Down Expand Up @@ -1899,6 +1927,13 @@ async function* transformBatchItemsStream<TTask extends AnyTask>(
flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
);

// Process item-specific idempotency key and extract options for storage
const itemIdempotencyKey = await makeIdempotencyKey(item.options?.idempotencyKey);
const finalIdempotencyKey = itemIdempotencyKey ?? batchItemIdempotencyKey;
const idempotencyKeyOptions = itemIdempotencyKey
? getIdempotencyKeyOptions(itemIdempotencyKey)
: undefined;

yield {
index: index++,
task: item.id,
Expand All @@ -1914,9 +1949,9 @@ async function* transformBatchItemsStream<TTask extends AnyTask>(
maxAttempts: item.options?.maxAttempts,
metadata: item.options?.metadata,
maxDuration: item.options?.maxDuration,
idempotencyKey:
(await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
idempotencyKey: finalIdempotencyKey?.toString(),
idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
idempotencyKeyOptions,
machine: item.options?.machine,
priority: item.options?.priority,
region: item.options?.region,
Expand Down Expand Up @@ -1951,6 +1986,13 @@ async function* transformBatchItemsStreamForWait<TTask extends AnyTask>(
flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
);

// Process item-specific idempotency key and extract options for storage
const itemIdempotencyKey = await makeIdempotencyKey(item.options?.idempotencyKey);
const finalIdempotencyKey = itemIdempotencyKey ?? batchItemIdempotencyKey;
const idempotencyKeyOptions = itemIdempotencyKey
? getIdempotencyKeyOptions(itemIdempotencyKey)
: undefined;

yield {
index: index++,
task: item.id,
Expand All @@ -1967,9 +2009,9 @@ async function* transformBatchItemsStreamForWait<TTask extends AnyTask>(
maxAttempts: item.options?.maxAttempts,
metadata: item.options?.metadata,
maxDuration: item.options?.maxDuration,
idempotencyKey:
(await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
idempotencyKey: finalIdempotencyKey?.toString(),
idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
idempotencyKeyOptions,
machine: item.options?.machine,
priority: item.options?.priority,
region: item.options?.region,
Expand Down Expand Up @@ -2002,6 +2044,13 @@ async function* transformBatchByTaskItemsStream<TTasks extends readonly AnyTask[
flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
);

// Process item-specific idempotency key and extract options for storage
const itemIdempotencyKey = await makeIdempotencyKey(item.options?.idempotencyKey);
const finalIdempotencyKey = itemIdempotencyKey ?? batchItemIdempotencyKey;
const idempotencyKeyOptions = itemIdempotencyKey
? getIdempotencyKeyOptions(itemIdempotencyKey)
: undefined;

yield {
index: index++,
task: item.task.id,
Expand All @@ -2017,9 +2066,9 @@ async function* transformBatchByTaskItemsStream<TTasks extends readonly AnyTask[
maxAttempts: item.options?.maxAttempts,
metadata: item.options?.metadata,
maxDuration: item.options?.maxDuration,
idempotencyKey:
(await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
idempotencyKey: finalIdempotencyKey?.toString(),
idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
idempotencyKeyOptions,
machine: item.options?.machine,
priority: item.options?.priority,
region: item.options?.region,
Expand Down Expand Up @@ -2053,6 +2102,13 @@ async function* transformBatchByTaskItemsStreamForWait<TTasks extends readonly A
flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
);

// Process item-specific idempotency key and extract options for storage
const itemIdempotencyKey = await makeIdempotencyKey(item.options?.idempotencyKey);
const finalIdempotencyKey = itemIdempotencyKey ?? batchItemIdempotencyKey;
const idempotencyKeyOptions = itemIdempotencyKey
? getIdempotencyKeyOptions(itemIdempotencyKey)
: undefined;

yield {
index: index++,
task: item.task.id,
Expand All @@ -2069,9 +2125,9 @@ async function* transformBatchByTaskItemsStreamForWait<TTasks extends readonly A
maxAttempts: item.options?.maxAttempts,
metadata: item.options?.metadata,
maxDuration: item.options?.maxDuration,
idempotencyKey:
(await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
idempotencyKey: finalIdempotencyKey?.toString(),
idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
idempotencyKeyOptions,
machine: item.options?.machine,
priority: item.options?.priority,
region: item.options?.region,
Expand Down Expand Up @@ -2102,6 +2158,13 @@ async function* transformSingleTaskBatchItemsStream<TPayload>(
flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
);

// Process item-specific idempotency key and extract options for storage
const itemIdempotencyKey = await makeIdempotencyKey(item.options?.idempotencyKey);
const finalIdempotencyKey = itemIdempotencyKey ?? batchItemIdempotencyKey;
const idempotencyKeyOptions = itemIdempotencyKey
? getIdempotencyKeyOptions(itemIdempotencyKey)
: undefined;

yield {
index: index++,
task: taskIdentifier,
Expand All @@ -2121,9 +2184,9 @@ async function* transformSingleTaskBatchItemsStream<TPayload>(
maxAttempts: item.options?.maxAttempts,
metadata: item.options?.metadata,
maxDuration: item.options?.maxDuration,
idempotencyKey:
(await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
idempotencyKey: finalIdempotencyKey?.toString(),
idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
idempotencyKeyOptions,
machine: item.options?.machine,
priority: item.options?.priority,
region: item.options?.region,
Expand Down