@brandboostinggmbh/observable-workflows 0.19.0-beta.3 → 0.20.0-beta.4

package/README.md

@@ -358,6 +358,48 @@ The library provides comprehensive error handling:
 - **Workflow Failures**: Marked with appropriate status and error information
 - **Retry Logic**: Failed workflows can be retried with step result reuse
 - **Validation**: Input validation and type checking
+- **Automatic D1 Retry**: Built-in retry logic with exponential backoff for transient D1 network errors
+
+### D1 Network Error Retry
+
+The library automatically retries D1 database operations that fail due to transient network errors (e.g., "D1_ERROR: Network connection lost"). This makes workflows more resilient to temporary network issues.
+
+**Default Retry Configuration:**
+- Maximum retry attempts: 3
+- Initial delay: 100ms
+- Maximum delay: 5000ms
+- Exponential backoff multiplier: 2
+- Jitter: Enabled
+
+**Custom Retry Configuration:**
+
+You can customize the retry behavior when creating the workflow context:
+
+```typescript
+const workflowContext = createWorkflowContext({
+  D1: env.D1,
+  retryConfig: {
+    maxAttempts: 5,        // Retry up to 5 times
+    initialDelayMs: 200,   // Start with 200ms delay
+    maxDelayMs: 10000,     // Cap delay at 10 seconds
+    backoffMultiplier: 3,  // Triple the delay each time
+    useJitter: true,       // Add randomization to prevent thundering herd
+  },
+})
+```
+
+**Manual Retry for Custom Operations:**
+
+You can also use the retry utility directly for custom D1 operations:
+
+```typescript
+import { retryD1Operation } from '@brandboostinggmbh/observable-workflows'
+
+const result = await retryD1Operation(
+  () => db.prepare("SELECT * FROM custom_table").first(),
+  { maxAttempts: 3, initialDelayMs: 100 }
+)
+```
 
 ## Best Practices
 

package/dist/index.d.ts

@@ -18,6 +18,38 @@ declare function createStepContext(context: StepContextOptions): Promise<{
 declare function ensureTables(db: D1Database): Promise<void>;
 //#endregion
 //#region src/observableWorkflows/helperFunctions.d.ts
+/**
+ * Configuration for retry behavior on D1 operations
+ */
+interface RetryConfig$1 {
+  /** Maximum number of retry attempts (default: 3) */
+  maxAttempts?: number;
+  /** Initial delay in milliseconds (default: 100) */
+  initialDelayMs?: number;
+  /** Maximum delay in milliseconds (default: 5000) */
+  maxDelayMs?: number;
+  /** Multiplier for exponential backoff (default: 2) */
+  backoffMultiplier?: number;
+  /** Whether to add jitter to delays (default: true) */
+  useJitter?: boolean;
+}
+/**
+ * Retry a D1 operation with exponential backoff for transient network errors
+ *
+ * @param operation - The async operation to retry
+ * @param config - Retry configuration options
+ * @returns The result of the operation
+ * @throws The last error if all retry attempts fail
+ *
+ * @example
+ * ```typescript
+ * const result = await retryD1Operation(
+ *   () => db.prepare("SELECT * FROM table").first(),
+ *   { maxAttempts: 5, initialDelayMs: 200 }
+ * )
+ * ```
+ */
+declare function retryD1Operation<T>(operation: () => Promise<T>, config?: RetryConfig$1): Promise<T>;
 declare function finalizeWorkflowRecord(options: InternalWorkflowContextOptions, {
   workflowStatus,
   endTime,
@@ -605,11 +637,25 @@ type ExternalBlobStorage = {
   get: (id: string) => Promise<string>;
   delete: (...keys: string[]) => Promise<number>;
 };
+type RetryConfig = {
+  /** Maximum number of retry attempts (default: 3) */
+  maxAttempts?: number;
+  /** Initial delay in milliseconds (default: 100) */
+  initialDelayMs?: number;
+  /** Maximum delay in milliseconds (default: 5000) */
+  maxDelayMs?: number;
+  /** Multiplier for exponential backoff (default: 2) */
+  backoffMultiplier?: number;
+  /** Whether to add jitter to delays (default: true) */
+  useJitter?: boolean;
+};
 type WorkflowContextOptions = {
   D1: D1Database;
   idFactory?: () => string;
   serializer?: Serializer;
   externalBlobStorage?: ExternalBlobStorage;
+  /** Optional retry configuration for D1 operations (defaults: maxAttempts: 3, initialDelayMs: 100, maxDelayMs: 5000, backoffMultiplier: 2, useJitter: true) */
+  retryConfig?: RetryConfig;
 };
 type InternalWorkflowContextOptions = WorkflowContextOptions & Required<Pick<WorkflowContextOptions, 'serializer' | 'idFactory'>>;
 type WorkflowContextInstance = {
@@ -906,4 +952,4 @@ type R2ExternalBlobStorageOptions = {
  */
 declare function createR2ExternalBlobStorage(options: R2ExternalBlobStorageOptions): ExternalBlobStorage;
 //#endregion
-export { ConsoleWrapper, DateRangeFilter, ExternalBlobStorage, HandleWorkflowQueueMessageParams, InternalWorkflowContextOptions, Log, PossibleValueTypeNames, PossibleValueTypes, PropertyFilter, QueueWorkflowContextOptions, R2ExternalBlobStorageOptions, Serializer, Step, StepContextOptions, StepCtx, StepWorkflowStatus, StringFilter, ValueTypeMap, WorkflowContext, WorkflowContextInstance, WorkflowContextOptions, WorkflowEnqueueBatchItem, WorkflowFilter, WorkflowFunction, WorkflowProperty, WorkflowPropertyDefinition, WorkflowQueueMessage, WorkflowRun, WorkflowStatus, createCleanupManager, createLogAccessor, createQueueWorkflowContext, createR2ExternalBlobStorage, createStepContext, createWorkflowContext, createWorkflowDependencies, createWorkflowDependency, defaultIdFactory, defaultSerializer, defineWorkflow, deleteWorkflowDependency, deserializeWithExternalStorage, ensureTables, finalizeWorkflowRecord, insertStepRecordFull, insertWorkflowRecord, pushLogToDB, serializeWithExternalStorage, tryDeserializeObj, updateWorkflow, updateWorkflowName, upsertWorkflowProperty, workflowTableRowToWorkflowRun };
+export { ConsoleWrapper, DateRangeFilter, ExternalBlobStorage, HandleWorkflowQueueMessageParams, InternalWorkflowContextOptions, Log, PossibleValueTypeNames, PossibleValueTypes, PropertyFilter, QueueWorkflowContextOptions, R2ExternalBlobStorageOptions, RetryConfig, Serializer, Step, StepContextOptions, StepCtx, StepWorkflowStatus, StringFilter, ValueTypeMap, WorkflowContext, WorkflowContextInstance, WorkflowContextOptions, WorkflowEnqueueBatchItem, WorkflowFilter, WorkflowFunction, WorkflowProperty, WorkflowPropertyDefinition, WorkflowQueueMessage, WorkflowRun, WorkflowStatus, createCleanupManager, createLogAccessor, createQueueWorkflowContext, createR2ExternalBlobStorage, createStepContext, createWorkflowContext, createWorkflowDependencies, createWorkflowDependency, defaultIdFactory, defaultSerializer, defineWorkflow, deleteWorkflowDependency, deserializeWithExternalStorage, ensureTables, finalizeWorkflowRecord, insertStepRecordFull, insertWorkflowRecord, pushLogToDB, retryD1Operation, serializeWithExternalStorage, tryDeserializeObj, updateWorkflow, updateWorkflowName, upsertWorkflowProperty, workflowTableRowToWorkflowRun };

package/dist/index.js

@@ -3,7 +3,7 @@
 * Detect the current schema version for each table
 */
 async function detectSchemaVersion(db) {
-	const workflowTableInfo = await db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='WorkflowTable'`).first();
+	const workflowTableInfo = await retryD1Operation(() => db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='WorkflowTable'`).first());
 	let workflowTable = "missing";
 	if (workflowTableInfo) {
 		const hasInputRef = workflowTableInfo.sql.includes("inputRef");
@@ -16,7 +16,7 @@ async function detectSchemaVersion(db) {
 		else if (!hasInputRef && inputHasNotNull) workflowTable = "v1";
 		else workflowTable = "v1";
 	}
-	const stepTableInfo = await db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='StepTable'`).first();
+	const stepTableInfo = await retryD1Operation(() => db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='StepTable'`).first());
 	let stepTable = "missing";
 	if (stepTableInfo) {
 		const hasResultRef = stepTableInfo.sql.includes("resultRef");
@@ -26,7 +26,7 @@ async function detectSchemaVersion(db) {
 		else if (hasResultRef && hasErrorRef) stepTable = "v2";
 		else stepTable = "v1";
 	}
-	const logTableInfo = await db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='LogTable'`).first();
+	const logTableInfo = await retryD1Operation(() => db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='LogTable'`).first());
 	let logTable = "missing";
 	if (logTableInfo) {
 		const hasStepTableCascadeFK = logTableInfo.sql.includes("FOREIGN KEY (instanceId, stepName) REFERENCES StepTable(instanceId, stepName) ON DELETE CASCADE");
@@ -34,7 +34,7 @@ async function detectSchemaVersion(db) {
 		if (hasStepTableCascadeFK && hasWorkflowTableFK) logTable = "v5";
 		else logTable = "v1";
 	}
-	const workflowPropertiesInfo = await db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='WorkflowProperties'`).first();
+	const workflowPropertiesInfo = await retryD1Operation(() => db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='WorkflowProperties'`).first());
 	let workflowProperties = "missing";
 	if (workflowPropertiesInfo) workflowProperties = "v1";
 	const workflowDependenciesInfo = await db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='WorkflowDependencies'`).first();
@@ -53,10 +53,10 @@ async function detectSchemaVersion(db) {
 * Adds inputRef column and makes input nullable
 */
 async function migrateWorkflowTableV1ToV2(db) {
-	const workflowTableInfo = await db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='WorkflowTable'`).first();
+	const workflowTableInfo = await retryD1Operation(() => db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='WorkflowTable'`).first());
 	const hasInputRef = workflowTableInfo.sql.includes("inputRef");
 	const inputHasNotNull = workflowTableInfo.sql.includes("input TEXT NOT NULL");
-	if (!hasInputRef || inputHasNotNull) await db.batch([
+	if (!hasInputRef || inputHasNotNull) await retryD1Operation(() => db.batch([
 		db.prepare(`CREATE TABLE WorkflowTable_new (
         instanceId TEXT NOT NULL,
         workflowType TEXT NOT NULL,
@@ -78,16 +78,16 @@ async function migrateWorkflowTableV1ToV2(db) {
         FROM WorkflowTable`),
 		db.prepare(`DROP TABLE WorkflowTable`),
 		db.prepare(`ALTER TABLE WorkflowTable_new RENAME TO WorkflowTable`)
-	]);
+	]));
 }
 /**
 * Migrate WorkflowTable from V2/V3 to V4 schema
 * Adds triggerId column with UNIQUE constraint
 */
 async function migrateWorkflowTableV2V3ToV4(db) {
-	const workflowTableInfo = await db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='WorkflowTable'`).first();
+	const workflowTableInfo = await retryD1Operation(() => db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='WorkflowTable'`).first());
 	const hasTriggerId = workflowTableInfo.sql.includes("triggerId");
-	if (!hasTriggerId) await db.batch([
+	if (!hasTriggerId) await retryD1Operation(() => db.batch([
 		db.prepare(`CREATE TABLE WorkflowTable_new (
         instanceId TEXT NOT NULL,
         workflowType TEXT NOT NULL,
@@ -111,7 +111,7 @@ async function migrateWorkflowTableV2V3ToV4(db) {
         FROM WorkflowTable`),
 		db.prepare(`DROP TABLE WorkflowTable`),
 		db.prepare(`ALTER TABLE WorkflowTable_new RENAME TO WorkflowTable`)
-	]);
+	]));
 }
 /**
 * Migrate WorkflowTable from V4 to V6 schema
@@ -127,7 +127,7 @@ async function migrateWorkflowTableV4ToV6(db) {
 */
 async function migrateWorkflowTable(db, currentVersion) {
 	if (currentVersion === "missing") {
-		await db.prepare(`CREATE TABLE WorkflowTable (
+		await retryD1Operation(() => db.prepare(`CREATE TABLE WorkflowTable (
           instanceId TEXT NOT NULL,
           workflowType TEXT NOT NULL,
           workflowName TEXT NOT NULL,
@@ -144,7 +144,7 @@ async function migrateWorkflowTable(db, currentVersion) {
           triggerId TEXT,
           PRIMARY KEY (instanceId),
           UNIQUE (triggerId)
-        )`).run();
+        )`).run());
 		return;
 	}
 	if (currentVersion === "v1") {
@@ -168,7 +168,7 @@ async function migrateWorkflowTable(db, currentVersion) {
 */
 async function migrateStepTable(db, currentVersion) {
 	if (currentVersion === "missing") {
-		await db.prepare(`CREATE TABLE StepTable (
+		await retryD1Operation(() => db.prepare(`CREATE TABLE StepTable (
           instanceId TEXT NOT NULL,
           stepName TEXT NOT NULL,
           stepStatus TEXT NOT NULL,
@@ -182,15 +182,15 @@ async function migrateStepTable(db, currentVersion) {
           tenantId TEXT NOT NULL,
           PRIMARY KEY (instanceId, stepName),
           FOREIGN KEY (instanceId) REFERENCES WorkflowTable(instanceId) ON DELETE CASCADE
-        )`).run();
+        )`).run());
 		return;
 	}
 	if (currentVersion === "v1") {
-		const stepTableInfo = await db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='StepTable'`).first();
+		const stepTableInfo = await retryD1Operation(() => db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='StepTable'`).first());
 		const hasResultRef = stepTableInfo.sql.includes("resultRef");
 		const hasErrorRef = stepTableInfo.sql.includes("errorRef");
-		if (!hasResultRef) await db.prepare(`ALTER TABLE StepTable ADD COLUMN resultRef TEXT`).run();
-		if (!hasErrorRef) await db.prepare(`ALTER TABLE StepTable ADD COLUMN errorRef TEXT`).run();
+		if (!hasResultRef) await retryD1Operation(() => db.prepare(`ALTER TABLE StepTable ADD COLUMN resultRef TEXT`).run());
+		if (!hasErrorRef) await retryD1Operation(() => db.prepare(`ALTER TABLE StepTable ADD COLUMN errorRef TEXT`).run());
 	}
 }
 /**
@@ -198,7 +198,7 @@ async function migrateStepTable(db, currentVersion) {
 */
 async function migrateLogTable(db, currentVersion) {
 	if (currentVersion === "missing") {
-		await db.prepare(`CREATE TABLE LogTable (
+		await retryD1Operation(() => db.prepare(`CREATE TABLE LogTable (
           instanceId TEXT NOT NULL,
           stepName TEXT,
           log TEXT NOT NULL,
@@ -208,7 +208,7 @@ async function migrateLogTable(db, currentVersion) {
           tenantId TEXT NOT NULL,
           FOREIGN KEY (instanceId, stepName) REFERENCES StepTable(instanceId, stepName) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
           FOREIGN KEY (instanceId) REFERENCES WorkflowTable(instanceId) ON DELETE CASCADE
-        )`).run();
+        )`).run());
 		return;
 	}
 }
@@ -217,7 +217,7 @@ async function migrateLogTable(db, currentVersion) {
 */
 async function migrateWorkflowPropertiesTable(db, currentVersion) {
 	if (currentVersion === "missing") {
-		await db.prepare(`CREATE TABLE WorkflowProperties (
+		await retryD1Operation(() => db.prepare(`CREATE TABLE WorkflowProperties (
           instanceId TEXT NOT NULL,
           key TEXT NOT NULL,
           value TEXT NOT NULL,
@@ -226,7 +226,7 @@ async function migrateWorkflowPropertiesTable(db, currentVersion) {
           PRIMARY KEY (instanceId, key),
           FOREIGN KEY (instanceId) REFERENCES WorkflowTable(instanceId)
           ON DELETE CASCADE
-        )`).run();
+        )`).run());
 		return;
 	}
 }
@@ -251,13 +251,17 @@ async function migrateWorkflowDependenciesTable(db, currentVersion) {
 * Create necessary indexes
 */
 async function createIndexes(db) {
-	const existingIndexes = await db.prepare(`SELECT name FROM sqlite_master WHERE type='index' AND name LIKE 'idx_%'`).all();
+	const existingIndexes = await retryD1Operation(() => db.prepare(`SELECT name FROM sqlite_master WHERE type='index' AND name LIKE 'idx_%'`).all());
 	const existingIndexNames = new Set(existingIndexes.results?.map((row) => row.name) || []);
 	const indexes = [
 		{
 			name: "idx_workflows_parent_instance_id",
 			sql: `CREATE INDEX idx_workflows_parent_instance_id ON WorkflowTable (parentInstanceId)`
 		},
+		{
+			name: "idx_workflows_parent_tenant",
+			sql: `CREATE INDEX idx_workflows_parent_tenant ON WorkflowTable (parentInstanceId, tenantId)`
+		},
 		{
 			name: "idx_workflows_trigger_id",
 			sql: `CREATE INDEX idx_workflows_trigger_id ON WorkflowTable (triggerId)`
@@ -337,7 +341,7 @@ async function createIndexes(db) {
 	];
 	const preparedStatements = [];
 	for (const index of indexes) if (!existingIndexNames.has(index.name)) preparedStatements.push(db.prepare(index.sql));
-	if (preparedStatements.length > 0) await db.batch(preparedStatements);
+	if (preparedStatements.length > 0) await retryD1Operation(() => db.batch(preparedStatements));
 }
 /**
 * Main migration function that ensures all tables exist and are up-to-date.
@@ -346,7 +350,7 @@ async function createIndexes(db) {
 * @param db - D1Database instance
 */
 async function ensureTables(db) {
-	await db.prepare(`PRAGMA foreign_keys = ON`).run();
+	await retryD1Operation(() => db.prepare(`PRAGMA foreign_keys = ON`).run());
 	const schemaVersion = await detectSchemaVersion(db);
 	await migrateWorkflowTable(db, schemaVersion.workflowTable);
 	await migrateStepTable(db, schemaVersion.stepTable);
@@ -358,16 +362,85 @@ async function ensureTables(db) {
 
 //#endregion
 //#region src/observableWorkflows/helperFunctions.ts
+/**
+* Default retry configuration for D1 operations
+*/
+const DEFAULT_RETRY_CONFIG = {
+	maxAttempts: 3,
+	initialDelayMs: 100,
+	maxDelayMs: 5e3,
+	backoffMultiplier: 2,
+	useJitter: true
+};
+/**
+* Check if an error is a transient D1 network error that should be retried
+*/
+function isRetriableD1Error(error) {
+	if (!error) return false;
+	const errorMessage = error.message || String(error);
+	const errorString = errorMessage.toLowerCase();
+	return errorString.includes("network connection lost") || errorString.includes("d1_error") || errorString.includes("connection reset") || errorString.includes("econnreset") || errorString.includes("timeout") || errorString.includes("etimedout");
+}
+/**
+* Calculate delay with exponential backoff and optional jitter
+*/
+function calculateDelay(attempt, config) {
+	const exponentialDelay = Math.min(config.initialDelayMs * Math.pow(config.backoffMultiplier, attempt), config.maxDelayMs);
+	if (config.useJitter) return Math.floor(Math.random() * exponentialDelay);
+	return exponentialDelay;
+}
+/**
+* Sleep for the specified number of milliseconds
+*/
+function sleep(ms) {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/**
+* Retry a D1 operation with exponential backoff for transient network errors
+* 
+* @param operation - The async operation to retry
+* @param config - Retry configuration options
+* @returns The result of the operation
+* @throws The last error if all retry attempts fail
+* 
+* @example
+* ```typescript
+* const result = await retryD1Operation(
+*   () => db.prepare("SELECT * FROM table").first(),
+*   { maxAttempts: 5, initialDelayMs: 200 }
+* )
+* ```
+*/
+async function retryD1Operation(operation, config = {}) {
+	const finalConfig = {
+		...DEFAULT_RETRY_CONFIG,
+		...config
+	};
+	let lastError;
+	for (let attempt = 0; attempt < finalConfig.maxAttempts; attempt++) try {
+		return await operation();
+	} catch (error) {
+		lastError = error;
+		if (!isRetriableD1Error(error)) throw error;
+		if (attempt < finalConfig.maxAttempts - 1) {
+			const delay = calculateDelay(attempt, finalConfig);
+			console.warn(`D1 operation failed with retriable error (attempt ${attempt + 1}/${finalConfig.maxAttempts}), retrying in ${delay}ms:`, error instanceof Error ? error.message : String(error));
+			await sleep(delay);
+		}
+	}
+	console.error(`D1 operation failed after ${finalConfig.maxAttempts} attempts:`, lastError instanceof Error ? lastError.message : String(lastError));
+	throw lastError;
+}
 async function finalizeWorkflowRecord(options, { workflowStatus, endTime, instanceId, result }) {
 	if (result !== void 0) {
 		const { data: resultData, externalRef: resultRef } = await serializeWithExternalStorage(result, options.serializer, options.externalBlobStorage);
-		return options.D1.prepare(`UPDATE WorkflowTable
+		return retryD1Operation(() => options.D1.prepare(`UPDATE WorkflowTable
             SET workflowStatus = ?, endTime = ?, result = ?, resultRef = ?
-            WHERE instanceId = ?`).bind(workflowStatus, endTime, resultData, resultRef, instanceId).run();
+            WHERE instanceId = ?`).bind(workflowStatus, endTime, resultData, resultRef, instanceId).run());
 	}
-	return options.D1.prepare(`UPDATE WorkflowTable
+	return retryD1Operation(() => options.D1.prepare(`UPDATE WorkflowTable
             SET workflowStatus = ?, endTime = ?
-            WHERE instanceId = ?`).bind(workflowStatus, endTime, instanceId).run();
+            WHERE instanceId = ?`).bind(workflowStatus, endTime, instanceId).run());
 }
 /**
 * Insert a new workflow record into the database.
@@ -398,7 +471,7 @@ async function insertWorkflowRecord(options, { instanceId, workflowType, workflo
         (instanceId, workflowType, workflowName, workflowMetadata, input, inputRef, tenantId, workflowStatus, startTime, endTime, parentInstanceId, triggerId)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).bind(instanceId, workflowType, workflowName, options.serializer.serialize(workflowMetadata), inputData, inputRef, tenantId, workflowStatus, startTime, endTime ?? null, parentInstanceId ?? null, triggerId ?? null);
 	if (!dependencies || dependencies.length === 0) {
-		const result = await insertWorkflowStatement.run();
+		const result = await retryD1Operation(() => insertWorkflowStatement.run());
 		return {
 			success: result.success,
 			meta: result.meta
@@ -412,7 +485,7 @@ async function insertWorkflowRecord(options, { instanceId, workflowType, workflo
 		tenantId,
 		createdAt
 	}));
-	const results = await options.D1.batch([insertWorkflowStatement, ...dependencyStatements]);
+	const results = await retryD1Operation(() => options.D1.batch([insertWorkflowStatement, ...dependencyStatements]));
 	const allSucceeded = results.every((result) => result.success);
 	return {
 		success: allSucceeded,
@@ -420,12 +493,12 @@ async function insertWorkflowRecord(options, { instanceId, workflowType, workflo
 	};
 }
 function insertStepRecordFull(context, { instanceId, name, status, metadata, startTime, endTime, result, error, resultRef, errorRef }) {
-	return context.D1.prepare(`INSERT INTO StepTable
+	return retryD1Operation(() => context.D1.prepare(`INSERT INTO StepTable
             (instanceId, stepName, stepStatus, stepMetadata, startTime, endTime, result, error, resultRef, errorRef, tenantId)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).bind(instanceId, name, status, metadata, startTime, endTime, result, error, resultRef ?? null, errorRef ?? null, context.tenantId).run();
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).bind(instanceId, name, status, metadata, startTime, endTime, result, error, resultRef ?? null, errorRef ?? null, context.tenantId).run());
 }
 async function getStepRecord(context, stepName, instanceId) {
-	const existingStep = await context.D1.prepare(`SELECT * FROM StepTable WHERE instanceId = ? AND stepName = ? AND tenantId = ?`).bind(instanceId, stepName, context.tenantId).first();
+	const existingStep = await retryD1Operation(() => context.D1.prepare(`SELECT * FROM StepTable WHERE instanceId = ? AND stepName = ? AND tenantId = ?`).bind(instanceId, stepName, context.tenantId).first());
 	const row = existingStep;
 	if (row) {
 		const result = await deserializeWithExternalStorage(row.result, row.resultRef, context.serializer, context.externalBlobStorage);
@@ -499,9 +572,9 @@ function truncateLogMessage(message) {
 }
 function pushLogToDB(options, { instanceId, stepName, message, timestamp, type, logOrder, tenantId }) {
 	const truncatedMessage = truncateLogMessage(message);
-	return options.D1.prepare(`INSERT INTO LogTable
+	return retryD1Operation(() => options.D1.prepare(`INSERT INTO LogTable
            (instanceId, stepName, log, timestamp, type, logOrder, tenantId)
-           VALUES (?, ?, ?, ?, ?, ?, ?)`).bind(instanceId, stepName, truncatedMessage, timestamp, type, logOrder, tenantId).run();
+           VALUES (?, ?, ?, ?, ?, ?, ?)`).bind(instanceId, stepName, truncatedMessage, timestamp, type, logOrder, tenantId).run());
 }
 var LogBatcher = class {
 	batch = [];
@@ -536,10 +609,12 @@ var LogBatcher = class {
 		if (this.batch.length === 0) return;
 		const logsToFlush = this.batch.splice(0);
 		try {
-			const statements = logsToFlush.map((entry) => this.options.D1.prepare(`INSERT INTO LogTable
+			await retryD1Operation(async () => {
+				const statements = logsToFlush.map((entry) => this.options.D1.prepare(`INSERT INTO LogTable
                  (instanceId, stepName, log, timestamp, type, logOrder, tenantId)
                  VALUES (?, ?, ?, ?, ?, ?, ?)`).bind(entry.instanceId, entry.stepName, entry.message, entry.timestamp, entry.type, entry.logOrder, entry.tenantId));
-			await this.options.D1.batch(statements);
+				return await this.options.D1.batch(statements);
+			});
 		} catch (error) {
 			console.error("Batch log insert failed, falling back to individual inserts:", error);
 			await Promise.all(logsToFlush.map((entry) => pushLogToDB(this.options, entry)));
@@ -667,9 +742,9 @@ async function workflowTableRowToWorkflowRun({ row, serializer, externalBlobStor
 	};
 }
 async function updateWorkflowName(context, instanceId, newWorkflowName) {
-	return await context.D1.prepare(`UPDATE WorkflowTable
+	return await retryD1Operation(() => context.D1.prepare(`UPDATE WorkflowTable
           SET workflowName = ?
-          WHERE instanceId = ?`).bind(newWorkflowName, instanceId).run();
+          WHERE instanceId = ?`).bind(newWorkflowName, instanceId).run());
 }
 /**
 * Update workflow fields by instanceId. Only provided fields will be updated.
@@ -746,7 +821,7 @@ async function updateWorkflow(context, instanceId, updates) {
 	};
 	bindings.push(instanceId);
 	const sql = `UPDATE WorkflowTable SET ${setClauses.join(", ")} WHERE instanceId = ?`;
-	return await context.D1.prepare(sql).bind(...bindings).run();
+	return await retryD1Operation(() => context.D1.prepare(sql).bind(...bindings).run());
 }
 /**
 * Serialize a workflow property value for storage
@@ -779,9 +854,9 @@ function deserializeWorkflowPropertyValue(serializedValue, valueType) {
 }
 async function upsertWorkflowProperty({ context, instanceId, key, value, tenantId }) {
 	const { serializedValue, valueType } = serializeWorkflowPropertyValue(value);
-	const res = await context.D1.prepare(`INSERT OR REPLACE INTO WorkflowProperties
+	const res = await retryD1Operation(() => context.D1.prepare(`INSERT OR REPLACE INTO WorkflowProperties
           (instanceId, key, value, valueType, tenantId)
-          VALUES (?, ?, ?, ?, ?)`).bind(instanceId, key, serializedValue, valueType, tenantId).run();
+          VALUES (?, ?, ?, ?, ?)`).bind(instanceId, key, serializedValue, valueType, tenantId).run());
 	if (res.error) {
 		console.error("Error inserting workflow property:", res.error);
 		return false;
@@ -837,12 +912,12 @@ function prepareWorkflowDependencyStatement({ D1, dependencyWorkflowId, dependen
 * ```
 */
 async function createWorkflowDependency({ context, dependencyWorkflowId, dependentWorkflowId, tenantId }) {
-	return await prepareWorkflowDependencyStatement({
+	return await retryD1Operation(() => prepareWorkflowDependencyStatement({
 		D1: context.D1,
 		dependencyWorkflowId,
 		dependentWorkflowId,
 		tenantId
-	}).run();
+	}).run());
 }
 /**
 * Create multiple workflow dependencies in a single transaction.
@@ -875,7 +950,7 @@ async function createWorkflowDependencies({ context, dependencies, tenantId }) {
 		tenantId,
 		createdAt
 	}));
-	return await context.D1.batch(statements);
+	return await retryD1Operation(() => context.D1.batch(statements));
 }
 /**
 * Delete a specific workflow dependency relationship.
@@ -892,8 +967,8 @@ async function createWorkflowDependencies({ context, dependencies, tenantId }) {
 * ```
 */
 async function deleteWorkflowDependency({ context, dependencyWorkflowId, dependentWorkflowId, tenantId }) {
-	return await context.D1.prepare(`DELETE FROM WorkflowDependencies
-          WHERE dependencyWorkflowId = ? AND dependentWorkflowId = ? AND tenantId = ?`).bind(dependencyWorkflowId, dependentWorkflowId, tenantId).run();
+	return await retryD1Operation(() => context.D1.prepare(`DELETE FROM WorkflowDependencies
+          WHERE dependencyWorkflowId = ? AND dependentWorkflowId = ? AND tenantId = ?`).bind(dependencyWorkflowId, dependentWorkflowId, tenantId).run());
 }
 
 //#endregion
@@ -913,7 +988,7 @@ const createCleanupManager = (context) => {
 	const getAffectedWorkflows = async (config, limit) => {
 		const { statuses, statusPlaceholders } = buildStatusesAndPlaceholders(config);
 		if (statuses.length === 0) return [];
-		const result = await context.D1.prepare(`
+		const result = await retryD1Operation(() => context.D1.prepare(`
       SELECT instanceId, inputRef
       FROM WorkflowTable
       WHERE tenantId = ? 
@@ -921,13 +996,13 @@ const createCleanupManager = (context) => {
         AND workflowStatus IN (${statusPlaceholders})
       ORDER BY instanceId
       LIMIT ?
-    `).bind(context.tenantId, config.deleteWorkflowsOlderThanDays, ...statuses, limit).all();
+    `).bind(context.tenantId, config.deleteWorkflowsOlderThanDays, ...statuses, limit).all());
 		return result.results;
 	};
 	const getAffectedSteps = async (config, limit) => {
 		const { statuses, statusPlaceholders } = buildStatusesAndPlaceholders(config);
 		if (statuses.length === 0) return [];
-		const result = await context.D1.prepare(`
+		const result = await retryD1Operation(() => context.D1.prepare(`
       SELECT s.instanceId, s.stepName, s.stepStatus, s.errorRef, s.resultRef
       FROM StepTable s
       WHERE s.instanceId IN (
@@ -940,7 +1015,7 @@ const createCleanupManager = (context) => {
         LIMIT ?
       )
       ORDER BY s.instanceId, s.stepName
-    `).bind(context.tenantId, config.deleteWorkflowsOlderThanDays, ...statuses, limit).all();
+    `).bind(context.tenantId, config.deleteWorkflowsOlderThanDays, ...statuses, limit).all());
 		return result.results;
 	};
 	const collectExternalStorageKeys = (workflows, steps) => {
@@ -993,15 +1068,15 @@ const createCleanupManager = (context) => {
 		}
 		if (deletedWorkflows.length > 0) {
 			console.log(`Proceeding to delete workflows from the database...`);
-			await context.D1.prepare(`PRAGMA foreign_keys = ON`).run();
+			await retryD1Operation(() => context.D1.prepare(`PRAGMA foreign_keys = ON`).run());
 			let totalDeletedCount = 0;
 			for (let i = 0; i < deletedWorkflows.length; i += 100) {
 				const batch = deletedWorkflows.slice(i, i + 100);
 				const workflowIds = batch.map(() => "?").join(", ");
-				const result = await context.D1.prepare(`
+				const result = await retryD1Operation(() => context.D1.prepare(`
           DELETE FROM WorkflowTable 
           WHERE instanceId IN (${workflowIds})
-        `).bind(...batch.map((w) => w.instanceId)).run();
+        `).bind(...batch.map((w) => w.instanceId)).run());
 				totalDeletedCount += result.meta.changes || 0;
 			}
 			return {
@@ -1017,8 +1092,8 @@ const createCleanupManager = (context) => {
 		};
 	};
 	const cleanupOrphanedSteps = async (config, limit) => {
-		await context.D1.prepare(`PRAGMA foreign_keys = ON`).run();
-		const orphanedSteps = await context.D1.prepare(`
+		await retryD1Operation(() => context.D1.prepare(`PRAGMA foreign_keys = ON`).run());
+		const orphanedSteps = await retryD1Operation(() => context.D1.prepare(`
       SELECT s.instanceId, s.stepName, s.errorRef, s.resultRef
       FROM StepTable s
       WHERE s.tenantId = ?
@@ -1028,7 +1103,7 @@ const createCleanupManager = (context) => {
         )
       ORDER BY s.instanceId, s.stepName
       LIMIT ?
-    `).bind(context.tenantId, context.tenantId, limit).all();
+    `).bind(context.tenantId, context.tenantId, limit).all());
 		const orphanedStepResults = orphanedSteps.results;
 		let deletedExternalStorageKeysCount = 0;
 		if (config.deleteRefsFromExternalStorage && context.externalBlobStorage && orphanedStepResults.length > 0) {
@@ -1044,11 +1119,11 @@ const createCleanupManager = (context) => {
 			for (let i = 0; i < orphanedStepResults.length; i += 99) {
 				const batch = orphanedStepResults.slice(i, i + 99);
 				const instanceIds = batch.map(() => "?").join(", ");
-				const deletedStepsResult = await context.D1.prepare(`
+				const deletedStepsResult = await retryD1Operation(() => context.D1.prepare(`
           DELETE FROM StepTable 
           WHERE tenantId = ?
             AND instanceId IN (${instanceIds})
-        `).bind(context.tenantId, ...batch.map((s) => s.instanceId)).run();
+        `).bind(context.tenantId, ...batch.map((s) => s.instanceId)).run());
 				totalDeletedSteps += deletedStepsResult.meta.changes || 0;
 			}
 			return {
@@ -1064,8 +1139,8 @@ const createCleanupManager = (context) => {
 		};
 	};
 	const cleanupOrphanedLogs = async (limit) => {
-		await context.D1.prepare(`PRAGMA foreign_keys = ON`).run();
-		const deletedLogsResult = await context.D1.prepare(`
+		await retryD1Operation(() => context.D1.prepare(`PRAGMA foreign_keys = ON`).run());
+		const deletedLogsResult = await retryD1Operation(() => context.D1.prepare(`
       DELETE FROM LogTable
       WHERE tenantId = ?
         AND (
@@ -1080,7 +1155,7 @@ const createCleanupManager = (context) => {
           ))
         )
       LIMIT ?
-    `).bind(context.tenantId, context.tenantId, context.tenantId, limit).run();
+    `).bind(context.tenantId, context.tenantId, context.tenantId, limit).run());
 		return { deletedOrphanedLogs: deletedLogsResult.meta.changes || 0 };
 	};
 	return {
@@ -1268,7 +1343,7 @@ const createLogAccessor = (context) => {
 		const limitClause = limit !== void 0 && actualOffset !== void 0 ? "LIMIT ? OFFSET ?" : "";
 		const sql = `SELECT * FROM StepTable ${whereClause} ORDER BY startTime ASC ${limitClause}`;
 		if (limit !== void 0 && actualOffset !== void 0) bindings.push(limit, actualOffset);
-		result = await context.D1.prepare(sql).bind(...bindings).all();
+		result = await retryD1Operation(() => context.D1.prepare(sql).bind(...bindings).all());
 		if (result.results) {
 			const steps = await Promise.all(result.results.map(async (row) => {
 				let deserializedResult = null;
@@ -1295,7 +1370,7 @@ const createLogAccessor = (context) => {
 	const listWorkflows = async (limit, offset, filter, options) => {
 		const { sql, bindings } = buildFilteredWorkflowQuery(filter, { ignoreTenant: options?.ignoreTenant });
 		if (options?.debugLogs) console.log("listWorkflows SQL:", sql, "Bindings:", JSON.stringify(bindings));
-		const result = await context.D1.prepare(sql).bind(...bindings, limit, offset).all();
+		const result = await retryD1Operation(() => context.D1.prepare(sql).bind(...bindings, limit, offset).all());
 		if (options?.debugLogs) console.log("listWorkflows SQL Query executed");
 		if (result.results) {
 			const workflows = await Promise.all(result.results.map((row) => workflowTableRowToWorkflowRun({
@@ -1312,7 +1387,7 @@ const createLogAccessor = (context) => {
 				for (let i = 0; i < instanceIds.length; i += BATCH_SIZE) {
 					const batchIds = instanceIds.slice(i, i + BATCH_SIZE);
 					const placeholders = batchIds.map(() => "?").join(", ");
-					const propertiesResult = await context.D1.prepare(`SELECT * FROM WorkflowProperties WHERE instanceId IN (${placeholders})`).bind(...batchIds).all();
+					const propertiesResult = await retryD1Operation(() => context.D1.prepare(`SELECT * FROM WorkflowProperties WHERE instanceId IN (${placeholders})`).bind(...batchIds).all());
 					if (propertiesResult.results) for (const row of propertiesResult.results) {
 						const property = {
 							key: row.key,
@@ -1333,10 +1408,10 @@ const createLogAccessor = (context) => {
 				for (let i = 0; i < instanceIds.length; i += BATCH_SIZE) {
 					const batchIds = instanceIds.slice(i, i + BATCH_SIZE);
 					const placeholders = batchIds.map(() => "?").join(", ");
-					const dependenciesResult = await context.D1.prepare(`SELECT w.*, wd.createdAt, wd.dependentWorkflowId
+					const dependenciesResult = await retryD1Operation(() => context.D1.prepare(`SELECT w.*, wd.createdAt, wd.dependentWorkflowId
                        FROM WorkflowDependencies wd
                        JOIN WorkflowTable w ON wd.dependencyWorkflowId = w.instanceId
-                       WHERE wd.dependentWorkflowId IN (${placeholders})`).bind(...batchIds).all();
+                       WHERE wd.dependentWorkflowId IN (${placeholders})`).bind(...batchIds).all());
 					if (dependenciesResult.results) for (const row of dependenciesResult.results) {
 						const depWorkflow = await workflowTableRowToWorkflowRun({
 							row,
@@ -1363,10 +1438,10 @@ const createLogAccessor = (context) => {
 				for (let i = 0; i < instanceIds.length; i += BATCH_SIZE) {
 					const batchIds = instanceIds.slice(i, i + BATCH_SIZE);
 					const placeholders = batchIds.map(() => "?").join(", ");
-					const dependentsResult = await context.D1.prepare(`SELECT w.*, wd.createdAt, wd.dependencyWorkflowId
+					const dependentsResult = await retryD1Operation(() => context.D1.prepare(`SELECT w.*, wd.createdAt, wd.dependencyWorkflowId
                        FROM WorkflowDependencies wd
                        JOIN WorkflowTable w ON wd.dependentWorkflowId = w.instanceId
-                       WHERE wd.dependencyWorkflowId IN (${placeholders})`).bind(...batchIds).all();
+                       WHERE wd.dependencyWorkflowId IN (${placeholders})`).bind(...batchIds).all());
 					if (dependentsResult.results) for (const row of dependentsResult.results) {
 						const depWorkflow = await workflowTableRowToWorkflowRun({
 							row,
@@ -1391,7 +1466,7 @@ const createLogAccessor = (context) => {
 		return [];
 	};
 	const getWorkflowByParentId = async (parentInstanceId) => {
-		const result = await context.D1.prepare(`SELECT * FROM WorkflowTable WHERE parentInstanceId = ? AND tenantId = ?`).bind(parentInstanceId, context.tenantId).all();
+		const result = await retryD1Operation(() => context.D1.prepare(`SELECT * FROM WorkflowTable WHERE parentInstanceId = ? AND tenantId = ?`).bind(parentInstanceId, context.tenantId).all());
 		if (result.results) {
 			const workflows = await Promise.all(result.results.map((row) => workflowTableRowToWorkflowRun({
 				row,
@@ -1403,7 +1478,7 @@ const createLogAccessor = (context) => {
 		return null;
 	};
 	const getWorkflowByTriggerId = async (triggerId) => {
-		const result = await context.D1.prepare(`SELECT * FROM WorkflowTable WHERE triggerId = ? AND tenantId = ?`).bind(triggerId, context.tenantId).first();
+		const result = await retryD1Operation(() => context.D1.prepare(`SELECT * FROM WorkflowTable WHERE triggerId = ? AND tenantId = ?`).bind(triggerId, context.tenantId).first());
 		if (result) {
 			const workflow = await workflowTableRowToWorkflowRun({
 				row: result,
@@ -1415,12 +1490,12 @@ const createLogAccessor = (context) => {
 		return null;
 	};
 	const getWorkflowTypesByTenantId = async (tenantId) => {
-		const result = await context.D1.prepare(`SELECT DISTINCT workflowType FROM WorkflowTable WHERE tenantId = ?`).bind(tenantId).all();
+		const result = await retryD1Operation(() => context.D1.prepare(`SELECT DISTINCT workflowType FROM WorkflowTable WHERE tenantId = ?`).bind(tenantId).all());
 		if (!result.results) return [];
 		return result.results.map((row) => row.workflowType);
 	};
 	const getWorkflowProperties = async (instanceId) => {
-		const result = await context.D1.prepare(`SELECT * FROM WorkflowProperties WHERE instanceId = ?`).bind(instanceId).all();
+		const result = await retryD1Operation(() => context.D1.prepare(`SELECT * FROM WorkflowProperties WHERE instanceId = ?`).bind(instanceId).all());
 		if (!result.results) return [];
 		return result.results.map((row) => ({
 			key: row.key,
@@ -1430,7 +1505,7 @@ const createLogAccessor = (context) => {
 	};
 	/** This function gets the basic data of a workflow, without populating any of it's complex fields */
 	const getWorkflowShallow = async (instanceId, options) => {
-		const result = await context.D1.prepare(`SELECT * FROM WorkflowTable WHERE instanceId = ? AND tenantId = ?`).bind(instanceId, context.tenantId).first();
+		const result = await retryD1Operation(() => context.D1.prepare(`SELECT * FROM WorkflowTable WHERE instanceId = ? AND tenantId = ?`).bind(instanceId, context.tenantId).first());
 		if (!result) return null;
 		const workflow = await workflowTableRowToWorkflowRun({
 			row: result,
@@ -1461,7 +1536,7 @@ const createLogAccessor = (context) => {
 			retryWorkflow.isRetryOf = workflow;
 		});
 		workflow.isRetryOf = parentWorkflow;
-		const allLogs = await context.D1.prepare(`SELECT * FROM LogTable WHERE instanceId = ? ORDER BY timestamp ASC, logOrder ASC`).bind(instanceId).all();
+		const allLogs = await retryD1Operation(() => context.D1.prepare(`SELECT * FROM LogTable WHERE instanceId = ? ORDER BY timestamp ASC, logOrder ASC`).bind(instanceId).all());
 		const logs = allLogs.results?.map((logRow) => ({
 			instanceId: logRow.instanceId,
 			stepName: logRow.stepName,
@@ -1477,10 +1552,10 @@ const createLogAccessor = (context) => {
 		const properties = await getWorkflowProperties(instanceId);
 		workflow.properties = properties;
 		if (populateDependencies) {
-			const dependenciesResult = await context.D1.prepare(`SELECT w.*, wd.createdAt 
+			const dependenciesResult = await retryD1Operation(() => context.D1.prepare(`SELECT w.*, wd.createdAt 
                    FROM WorkflowDependencies wd
                    JOIN WorkflowTable w ON wd.dependencyWorkflowId = w.instanceId
-                   WHERE wd.dependentWorkflowId = ? AND wd.tenantId = ?`).bind(instanceId, context.tenantId).all();
+                   WHERE wd.dependentWorkflowId = ? AND wd.tenantId = ?`).bind(instanceId, context.tenantId).all());
 			if (dependenciesResult.results) workflow.dependencies = await Promise.all(dependenciesResult.results.map(async (row) => {
 				const depWorkflow = await workflowTableRowToWorkflowRun({
 					row,
@@ -1496,10 +1571,10 @@ const createLogAccessor = (context) => {
 			}));
 		}
 		if (populateDependents) {
-			const dependentsResult = await context.D1.prepare(`SELECT w.*, wd.createdAt 
+			const dependentsResult = await retryD1Operation(() => context.D1.prepare(`SELECT w.*, wd.createdAt 
                    FROM WorkflowDependencies wd
                    JOIN WorkflowTable w ON wd.dependentWorkflowId = w.instanceId
-                   WHERE wd.dependencyWorkflowId = ? AND wd.tenantId = ?`).bind(instanceId, context.tenantId).all();
+                   WHERE wd.dependencyWorkflowId = ? AND wd.tenantId = ?`).bind(instanceId, context.tenantId).all());
 			if (dependentsResult.results) workflow.dependents = await Promise.all(dependentsResult.results.map(async (row) => {
 				const depWorkflow = await workflowTableRowToWorkflowRun({
 					row,
@@ -1517,7 +1592,7 @@ const createLogAccessor = (context) => {
 		return workflow;
 	};
 	const getStep = async (instanceId, stepName) => {
-		const result = await context.D1.prepare(`SELECT * FROM StepTable WHERE instanceId = ? AND stepName = ? AND tenantId = ?`).bind(instanceId, stepName, context.tenantId).all();
+		const result = await retryD1Operation(() => context.D1.prepare(`SELECT * FROM StepTable WHERE instanceId = ? AND stepName = ? AND tenantId = ?`).bind(instanceId, stepName, context.tenantId).all());
 		if (!result.results || result.results.length === 0) return null;
 		const row = result.results[0];
 		if (!row) return null;
@@ -1534,7 +1609,7 @@ const createLogAccessor = (context) => {
 			error: deserializedError,
 			logs: []
 		};
-		const logResult = await context.D1.prepare(`SELECT * FROM LogTable WHERE instanceId = ? AND stepName = ? ORDER BY logOrder ASC`).bind(instanceId, stepName).all();
+		const logResult = await retryD1Operation(() => context.D1.prepare(`SELECT * FROM LogTable WHERE instanceId = ? AND stepName = ? ORDER BY logOrder ASC`).bind(instanceId, stepName).all());
 		if (logResult.results) step.logs = logResult.results.map((logRow) => ({
 			instanceId: logRow.instanceId,
 			stepName: logRow.stepName,
@@ -1545,10 +1620,10 @@ const createLogAccessor = (context) => {
 		return step;
 	};
 	const getPropertiesKeys = async (instanceId) => {
-		const result = await context.D1.prepare(`
+		const result = await retryD1Operation(() => context.D1.prepare(`
       SELECT DISTINCT key, valueType FROM WorkflowProperties
       WHERE tenantId = ? AND (? IS NULL OR instanceId = ?)  
-      `).bind(context.tenantId, instanceId ?? null, instanceId ?? null).all();
+      `).bind(context.tenantId, instanceId ?? null, instanceId ?? null).all());
 		console.log(`debug getPropertiesKeys: ${JSON.stringify(result)}`);
 		if (!result.results) return [];
 		return result.results.map((row) => ({
@@ -1571,7 +1646,7 @@ const createLogAccessor = (context) => {
 			bindings.push(toTime);
 		}
 		const whereClause = whereConditions.length > 0 ? `WHERE ${whereConditions.join(" AND ")}` : "";
-		const result = await context.D1.prepare(`
+		const result = await retryD1Operation(() => context.D1.prepare(`
       SELECT 
         workflowType,
         COUNT(*) as workflowCount,
@@ -1614,7 +1689,7 @@ const createLogAccessor = (context) => {
       ${whereClause}
       GROUP BY workflowType
       ORDER BY workflowCount DESC
-    `).bind(...bindings).all();
+    `).bind(...bindings).all());
 		if (!result.results) return [];
 		return result.results.map((row) => ({
 			workflowType: row.workflowType,
@@ -1927,9 +2002,9 @@ async function createStepContext(context) {
 			const stepStatus$1 = "completed";
 			const { data: resultData, externalRef: resultRef } = await serializeWithExternalStorage(result, context.serializer, context.externalBlobStorage);
 			const stepError$1 = null;
-			await context.D1.prepare(`UPDATE StepTable
+			await retryD1Operation(() => context.D1.prepare(`UPDATE StepTable
           SET stepStatus = ?, endTime = ?, result = ?, error = ?, resultRef = ?, errorRef = ?
-          WHERE instanceId = ? AND stepName = ?`).bind(stepStatus$1, endTime, resultData, stepError$1, resultRef, null, instanceId, stepName).run();
+          WHERE instanceId = ? AND stepName = ?`).bind(stepStatus$1, endTime, resultData, stepError$1, resultRef, null, instanceId, stepName).run());
 			await logBatcher.destroy();
 			return result;
 		} catch (error) {
@@ -1937,9 +2012,9 @@ async function createStepContext(context) {
 			const stepStatus$1 = "failed";
 			const stepResult$1 = null;
 			const { data: errorData, externalRef: errorRef } = await serializeWithExternalStorage(error, context.serializer, context.externalBlobStorage);
-			await context.D1.prepare(`UPDATE StepTable
+			await retryD1Operation(() => context.D1.prepare(`UPDATE StepTable
           SET stepStatus = ?, endTime = ?, result = ?, error = ?, resultRef = ?, errorRef = ?
-          WHERE instanceId = ? AND stepName = ?`).bind(stepStatus$1, endTime, stepResult$1, errorData, null, errorRef, instanceId, stepName).run();
+          WHERE instanceId = ? AND stepName = ?`).bind(stepStatus$1, endTime, stepResult$1, errorData, null, errorRef, instanceId, stepName).run());
 			await logBatcher.destroy();
 			throw error;
 		}
@@ -2094,7 +2169,7 @@ function createWorkflowContext(options) {
 			await ensureTables(options.D1);
 			ensuredTables = true;
 		}
-		const oldRun = await options.D1.prepare(`SELECT input, workflowName, tenantId, inputRef FROM WorkflowTable WHERE instanceId = ? `).bind(retryInstanceId).first();
+		const oldRun = await retryD1Operation(() => options.D1.prepare(`SELECT input, workflowName, tenantId, inputRef FROM WorkflowTable WHERE instanceId = ? `).bind(retryInstanceId).first());
 		const oldWorkflowName = oldRun?.workflowName;
 		const tenantId = oldRun?.tenantId;
 		if (!tenantId) throw new Error(`No tenantId found for instanceId ${retryInstanceId}`);
@@ -2200,4 +2275,4 @@ function createR2ExternalBlobStorage(options) {
 }
 
 //#endregion
-export { createCleanupManager, createLogAccessor, createQueueWorkflowContext, createR2ExternalBlobStorage, createStepContext, createWorkflowContext, createWorkflowDependencies, createWorkflowDependency, defaultIdFactory, defaultSerializer, defineWorkflow, deleteWorkflowDependency, deserializeWithExternalStorage, ensureTables, finalizeWorkflowRecord, insertStepRecordFull, insertWorkflowRecord, pushLogToDB, serializeWithExternalStorage, tryDeserializeObj, updateWorkflow, updateWorkflowName, upsertWorkflowProperty, workflowTableRowToWorkflowRun };
+export { createCleanupManager, createLogAccessor, createQueueWorkflowContext, createR2ExternalBlobStorage, createStepContext, createWorkflowContext, createWorkflowDependencies, createWorkflowDependency, defaultIdFactory, defaultSerializer, defineWorkflow, deleteWorkflowDependency, deserializeWithExternalStorage, ensureTables, finalizeWorkflowRecord, insertStepRecordFull, insertWorkflowRecord, pushLogToDB, retryD1Operation, serializeWithExternalStorage, tryDeserializeObj, updateWorkflow, updateWorkflowName, upsertWorkflowProperty, workflowTableRowToWorkflowRun };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brandboostinggmbh/observable-workflows",
-  "version": "0.19.0-beta.3",
+  "version": "0.20.0-beta.4",
   "description": "My awesome typescript library",
   "type": "module",
   "license": "MIT",