Skip to content
Merged
Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions .changeset/extract-queue-triggers.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@workflow/builders": patch
"@workflow/cli": patch
"@workflow/next": patch
---

Extract queue trigger configuration constants
25 changes: 25 additions & 0 deletions packages/builders/src/constants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/**
* Queue trigger configuration for workflow step execution.
* Steps are queued to the __wkf_step_* topic.
*/
export const STEP_QUEUE_TRIGGER = {
type: 'queue/v1beta' as const,
topic: '__wkf_step_*',
consumer: 'default',
maxDeliveries: 64, // Maximum number of delivery attempts (default: 3)
retryAfterSeconds: 5, // Delay between retries (default: 60)
initialDelaySeconds: 0, // Initial delay before first delivery (default: 0)
};

/**
* Queue trigger configuration for workflow orchestration.
* Workflows are queued to the __wkf_workflow_* topic.
*/
export const WORKFLOW_QUEUE_TRIGGER = {
type: 'queue/v1beta' as const,
topic: '__wkf_workflow_*',
consumer: 'default',
maxDeliveries: 64, // Maximum number of delivery attempts (default: 3)
retryAfterSeconds: 5, // Delay between retries (default: 60)
initialDelaySeconds: 0, // Initial delay before first delivery (default: 0)
};
1 change: 1 addition & 0 deletions packages/builders/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ export { applySwcTransform } from './apply-swc-transform.js';
export { createDiscoverEntriesPlugin } from './discover-entries-esbuild-plugin.js';
export { createNodeModuleErrorPlugin } from './node-module-esbuild-plugin.js';
export { createSwcPlugin } from './swc-esbuild-plugin.js';
export { STEP_QUEUE_TRIGGER, WORKFLOW_QUEUE_TRIGGER } from './constants.js';
23 changes: 3 additions & 20 deletions packages/builders/src/vercel-build-output-api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { mkdir, writeFile } from 'node:fs/promises';
import { join, resolve } from 'node:path';
import { BaseBuilder } from './base-builder.js';
import { STEP_QUEUE_TRIGGER, WORKFLOW_QUEUE_TRIGGER } from './constants.js';

export class VercelBuildOutputAPIBuilder extends BaseBuilder {
async build(): Promise<void> {
Expand Down Expand Up @@ -67,16 +68,7 @@ export class VercelBuildOutputAPIBuilder extends BaseBuilder {
architecture: 'arm64',
shouldAddHelpers: true,
shouldAddSourcemapSupport: true,
experimentalTriggers: [
{
type: 'queue/v1beta',
topic: '__wkf_step_*',
consumer: 'default',
maxDeliveries: 64, // Optional: Maximum number of delivery attempts (default: 3)
retryAfterSeconds: 5, // Optional: Delay between retries (default: 60)
initialDelaySeconds: 0, // Optional: Initial delay before first delivery (default: 0)
},
],
experimentalTriggers: [STEP_QUEUE_TRIGGER],
};

await writeFile(
Expand Down Expand Up @@ -123,16 +115,7 @@ export class VercelBuildOutputAPIBuilder extends BaseBuilder {
launcherType: 'Nodejs',
architecture: 'arm64',
shouldAddHelpers: true,
experimentalTriggers: [
{
type: 'queue/v1beta',
topic: '__wkf_workflow_*',
consumer: 'default',
maxDeliveries: 64, // Optional: Maximum number of delivery attempts (default: 3)
retryAfterSeconds: 5, // Optional: Delay between retries (default: 60)
initialDelaySeconds: 0, // Optional: Initial delay before first delivery (default: 0)
},
],
experimentalTriggers: [WORKFLOW_QUEUE_TRIGGER],
};

await writeFile(
Expand Down
28 changes: 7 additions & 21 deletions packages/cli/src/lib/builders/vercel-build-output-api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { mkdir, writeFile } from 'node:fs/promises';
import { join, resolve } from 'node:path';
import { BaseBuilder } from '@workflow/builders';
import {
BaseBuilder,
STEP_QUEUE_TRIGGER,
WORKFLOW_QUEUE_TRIGGER,
} from '@workflow/builders';

export class VercelBuildOutputAPIBuilder extends BaseBuilder {
async build(): Promise<void> {
Expand Down Expand Up @@ -67,16 +71,7 @@ export class VercelBuildOutputAPIBuilder extends BaseBuilder {
architecture: 'arm64',
shouldAddHelpers: true,
shouldAddSourcemapSupport: true,
experimentalTriggers: [
{
type: 'queue/v1beta',
topic: '__wkf_step_*',
consumer: 'default',
maxDeliveries: 64, // Optional: Maximum number of delivery attempts (default: 3)
retryAfterSeconds: 5, // Optional: Delay between retries (default: 60)
initialDelaySeconds: 0, // Optional: Initial delay before first delivery (default: 0)
},
],
experimentalTriggers: [STEP_QUEUE_TRIGGER],
};

await writeFile(
Expand Down Expand Up @@ -123,16 +118,7 @@ export class VercelBuildOutputAPIBuilder extends BaseBuilder {
launcherType: 'Nodejs',
architecture: 'arm64',
shouldAddHelpers: true,
experimentalTriggers: [
{
type: 'queue/v1beta',
topic: '__wkf_workflow_*',
consumer: 'default',
maxDeliveries: 64, // Optional: Maximum number of delivery attempts (default: 3)
retryAfterSeconds: 5, // Optional: Delay between retries (default: 60)
initialDelaySeconds: 0, // Optional: Initial delay before first delivery (default: 0)
},
],
experimentalTriggers: [WORKFLOW_QUEUE_TRIGGER],
};

await writeFile(
Expand Down
28 changes: 7 additions & 21 deletions packages/next/src/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ import { constants } from 'node:fs';
import { access, mkdir, stat, writeFile } from 'node:fs/promises';
import { extname, join, resolve } from 'node:path';
import Watchpack from 'watchpack';
import { BaseBuilder } from '@workflow/builders';
import {
BaseBuilder,
STEP_QUEUE_TRIGGER,
WORKFLOW_QUEUE_TRIGGER,
} from '@workflow/builders';

export class NextBuilder extends BaseBuilder {
async build() {
Expand Down Expand Up @@ -333,28 +337,10 @@ export class NextBuilder extends BaseBuilder {
const generatedConfig = {
version: '0',
steps: {
experimentalTriggers: [
{
type: 'queue/v1beta',
topic: '__wkf_step_*',
consumer: 'default',
maxDeliveries: 64,
retryAfterSeconds: 5,
initialDelaySeconds: 0,
},
],
experimentalTriggers: [STEP_QUEUE_TRIGGER],
},
workflows: {
experimentalTriggers: [
{
type: 'queue/v1beta',
topic: '__wkf_workflow_*',
consumer: 'default',
maxDeliveries: 64,
retryAfterSeconds: 5,
initialDelaySeconds: 0,
},
],
experimentalTriggers: [WORKFLOW_QUEUE_TRIGGER],
},
};

Expand Down