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
8 changes: 8 additions & 0 deletions src/appConfiguration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
chaosTargets: string[];
chaosProbability: number;
circuitBreaker: CircuitBreakerConfig;
webhookRetry: WebhookRetryConfig;
/**
* Per-provider circuit-breaker configuration for outbound webhook delivery.
* Thresholds are intentionally separate from the RPC circuit breaker so
Expand Down Expand Up @@ -81,7 +82,7 @@
.filter(Boolean);
}

function parseAssets(value: string | undefined): string[] {

Check warning on line 85 in src/appConfiguration.ts

View workflow job for this annotation

GitHub Actions / Lint

'parseAssets' is defined but never used. Allowed unused vars must match /^_/u
if (!value) {
return ['USDC', 'XLM', 'BTC', 'ETH']; // Default assets
}
Expand Down Expand Up @@ -117,6 +118,13 @@
successThreshold: clamp(toNumber(env.CB_SUCCESS_THRESHOLD, 1), 1, 20),
timeoutMs: clamp(toNumber(env.CB_TIMEOUT_MS, 30_000), 1_000, 300_000),
},
webhookRetry: {
maxAttempts: clamp(toNumber(env.WEBHOOK_RETRY_MAX_ATTEMPTS, 5), 1, 20),
initialDelayMs: clamp(toNumber(env.WEBHOOK_RETRY_INITIAL_DELAY_MS, 1_000), 100, 60_000),
maxDelayMs: clamp(toNumber(env.WEBHOOK_RETRY_MAX_DELAY_MS, 30_000), 1_000, 600_000),
multiplier: clamp(toNumber(env.WEBHOOK_RETRY_MULTIPLIER, 2), 1, 10),
jitterFactor: clamp(toNumber(env.WEBHOOK_RETRY_JITTER_FACTOR, 0.1), 0, 1),
},
webhookCircuitBreaker: {
failureThreshold: clamp(toNumber(env.WEBHOOK_CB_FAILURE_THRESHOLD, 5), 1, 100),
successThreshold: clamp(toNumber(env.WEBHOOK_CB_SUCCESS_THRESHOLD, 1), 1, 20),
Expand Down
27 changes: 21 additions & 6 deletions src/webhookDelivery.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,28 @@ function makeRegistry() {
function makeService(
registry: Registry,
breakerConfig: { failureThreshold?: number; successThreshold?: number; timeoutMs?: number } = {},
retryConfigOrCallback?: Partial<WebhookRetryConfig> | ((entry: DLQEntry) => Promise<void> | void),
dlqCallback?: (entry: DLQEntry) => Promise<void> | void,
) {
return new WebhookDeliveryService(registry, {
failureThreshold: 3,
successThreshold: 1,
timeoutMs: 50, // short cooldown so HALF_OPEN tests don't need real timers
...breakerConfig,
});
const isRetryConfig =
typeof retryConfigOrCallback === 'object' &&
retryConfigOrCallback !== null &&
('maxAttempts' in retryConfigOrCallback || 'initialDelayMs' in retryConfigOrCallback);

const retryConfig = isRetryConfig ? (retryConfigOrCallback as Partial<WebhookRetryConfig>) : undefined;
const callback = isRetryConfig ? dlqCallback : (retryConfigOrCallback as ((entry: DLQEntry) => Promise<void> | void) | undefined);

return new WebhookDeliveryService(
registry,
{
failureThreshold: 3,
successThreshold: 1,
timeoutMs: 50,
...breakerConfig,
},
retryConfig,
callback,
);
}

const basePayload: DeliveryPayload = {
Expand Down
Loading
Loading