@brandboostinggmbh/observable-workflows 0.5.0 → 0.6.0

package/dist/index.d.ts

@@ -205,6 +205,105 @@ type WorkflowPropertyDefinition = {
   key: string;
   valueType: 'string' | 'number' | 'boolean' | 'object';
 };
+/**
+ * Date range filter for filtering workflows by time periods
+ */
+type DateRangeFilter = {
+  /** Greater than or equal to (inclusive) */
+  gte?: number;
+  /** Less than or equal to (inclusive) */
+  lte?: number;
+  /** Greater than (exclusive) */
+  gt?: number;
+  /** Less than (exclusive) */
+  lt?: number;
+};
+/**
+ * String filter supporting exact match or substring matching
+ */
+type StringFilter = string | {
+  equals: string;
+} | {
+  contains: string;
+};
+/**
+ * Property filter supporting various comparison operators for custom workflow properties
+ */
+type PropertyFilter = {
+  /** Exact match */
+  equals?: any;
+  /** Substring match (for string values) */
+  contains?: string;
+  /** Greater than (for numeric values) */
+  gt?: number;
+  /** Greater than or equal to (for numeric values) */
+  gte?: number;
+  /** Less than (for numeric values) */
+  lt?: number;
+  /** Less than or equal to (for numeric values) */
+  lte?: number;
+  /** Match any value in the array */
+  in?: any[];
+};
+/**
+ * Comprehensive filter object for workflow listing with support for:
+ * - Text search across workflow names and types
+ * - Direct field filtering with various operators
+ * - Date range filtering
+ * - Custom property filtering with joins
+ *
+ * @example
+ * ```typescript
+ * // Text search
+ * const workflows = await listWorkflows(10, 0, { search: "payment" })
+ *
+ * // Status and type filtering
+ * const workflows = await listWorkflows(10, 0, {
+ *   workflowStatus: ["completed", "failed"],
+ *   workflowType: "PaymentWorkflow"
+ * })
+ *
+ * // Date range filtering
+ * const workflows = await listWorkflows(10, 0, {
+ *   startTime: { gte: Date.now() - 86400000 } // Last 24 hours
+ * })
+ *
+ * // Property filtering
+ * const workflows = await listWorkflows(10, 0, {
+ *   properties: {
+ *     amount: { gt: 100, lte: 1000 },
+ *     currency: { equals: "USD" },
+ *     customer: { contains: "acme" }
+ *   }
+ * })
+ *
+ * // Combined filtering
+ * const workflows = await listWorkflows(10, 0, {
+ *   search: "payment",
+ *   workflowStatus: "completed",
+ *   startTime: { gte: Date.now() - 86400000 },
+ *   properties: { amount: { gt: 100 } }
+ * })
+ * ```
+ */
+type WorkflowFilter = {
+  /** Text search across workflow name and type */
+  search?: string;
+  /** Filter by workflow type (exact match) */
+  workflowType?: string | string[];
+  /** Filter by workflow status */
+  workflowStatus?: StepWorkflowStatus | StepWorkflowStatus[];
+  /** Filter by workflow name with string matching */
+  workflowName?: StringFilter;
+  /** Filter by workflow start time */
+  startTime?: DateRangeFilter;
+  /** Filter by workflow end time */
+  endTime?: DateRangeFilter;
+  /** Filter by custom workflow properties */
+  properties?: {
+    [key: string]: PropertyFilter;
+  };
+};
 type StepContext = Awaited<ReturnType<typeof createStepContext>>;
 type Serializer = {
   serialize: (data: any) => string;
@@ -263,28 +362,6 @@ type RetryWorkflowOptions = {
   reuseSuccessfulSteps?: boolean;
 };
 
-//#endregion
-//#region src/observableWorkflows/defineWorkflow.d.ts
-declare function defineWorkflow<I extends {} | null>(workflow: {
-  workflowType: string;
-  metadata?: Record<string, any>;
-}, callback: (input: I, ctx: WorkflowContext) => Promise<any>): WorkflowFunction<I>;
-declare function defineWorkflow<I extends {} | null>(workflowType: string, callback: (input: I, ctx: WorkflowContext) => Promise<any>): WorkflowFunction<I>;
-
-//#endregion
-//#region src/observableWorkflows/createWorkflowContext.d.ts
-declare function createWorkflowContext(options: WorkflowContextOptions): WorkflowContextInstance;
-
-//#endregion
-//#region src/observableWorkflows/createQueueWorkflowContext.d.ts
-declare function createQueueWorkflowContext(options: QueueWorkflowContextOptions): {
-  enqueueWorkflow: <I>(workflow: WorkflowFunction<I>, tenantId: string, input: I, initialName: string) => Promise<void>;
-  enqueueRetryWorkflow: <I>(workflow: WorkflowFunction<I>, tenantId: string, oldInstanceId: string) => Promise<void>;
-  handleWorkflowQueueMessage: (message: WorkflowQueueMessage, env: {
-    LOG_DB: D1Database;
-  }, workflowResolver: (workflowType: string) => WorkflowFunction<any> | undefined) => Promise<void>;
-};
-
 //#endregion
 //#region src/observableWorkflows/createLogAccessor.d.ts
 declare const createLogAccessor: (context: {
@@ -294,12 +371,26 @@ declare const createLogAccessor: (context: {
 }) => {
   listSteps: (limit: number, offset: number, instanceId?: string | undefined) => Promise<Step[]>;
   getStep: (instanceId: string, stepName: string) => Promise<Step | null>;
-  listWorkflows: (limit: number, offset: number) => Promise<WorkflowRun[]>;
+  listWorkflows: (limit: number, offset: number, filter?: WorkflowFilter) => Promise<WorkflowRun[]>;
   getWorkflow: (instanceId: string) => Promise<WorkflowRun | null>;
   getWorkflowTypesByTenantId: (tenantId: string) => Promise<string[]>;
   getPropertiesKeys: (instanceId?: string) => Promise<WorkflowPropertyDefinition[]>;
 };
 
+//#endregion
+//#region src/observableWorkflows/createQueueWorkflowContext.d.ts
+declare function createQueueWorkflowContext(options: QueueWorkflowContextOptions): {
+  enqueueWorkflow: <I>(workflow: WorkflowFunction<I>, tenantId: string, input: I, initialName: string) => Promise<void>;
+  enqueueRetryWorkflow: <I>(workflow: WorkflowFunction<I>, tenantId: string, oldInstanceId: string) => Promise<void>;
+  handleWorkflowQueueMessage: (message: WorkflowQueueMessage, env: {
+    LOG_DB: D1Database;
+  }, workflowResolver: (workflowType: string) => WorkflowFunction<any> | undefined) => Promise<void>;
+};
+
+//#endregion
+//#region src/observableWorkflows/createWorkflowContext.d.ts
+declare function createWorkflowContext(options: WorkflowContextOptions): WorkflowContextInstance;
+
 //#endregion
 //#region src/observableWorkflows/defaultImplementations.d.ts
 declare const defaultSerializer: {
@@ -312,4 +403,12 @@ declare const defaultSerializer: {
 declare const defaultIdFactory: () => string;
 
 //#endregion
-export { ConsoleWrapper, InternalWorkflowContextOptions, Log, PossibleValueTypeNames, PossibleValueTypes, QueueWorkflowContextOptions, Serializer, Step, StepContextOptions, StepCtx, StepWorkflowStatus, ValueTypeMap, WorkflowContext, WorkflowContextInstance, WorkflowContextOptions, WorkflowFunction, WorkflowProperty, WorkflowPropertyDefinition, WorkflowQueueMessage, WorkflowRun, createLogAccessor, createQueueWorkflowContext, createStepContext, createWorkflowContext, defaultIdFactory, defaultSerializer, defineWorkflow, ensureTables, finalizeWorkflowRecord, insertStepRecordFull, insertWorkflowRecord, pushLogToDB, tryDeserializeObj, updateWorkflowName, upsertWorkflowProperty, workflowTableRowToWorkflowRun };
+//#region src/observableWorkflows/defineWorkflow.d.ts
+declare function defineWorkflow<I extends {} | null>(workflow: {
+  workflowType: string;
+  metadata?: Record<string, any>;
+}, callback: (input: I, ctx: WorkflowContext) => Promise<any>): WorkflowFunction<I>;
+declare function defineWorkflow<I extends {} | null>(workflowType: string, callback: (input: I, ctx: WorkflowContext) => Promise<any>): WorkflowFunction<I>;
+
+//#endregion
+export { ConsoleWrapper, DateRangeFilter, InternalWorkflowContextOptions, Log, PossibleValueTypeNames, PossibleValueTypes, PropertyFilter, QueueWorkflowContextOptions, Serializer, Step, StepContextOptions, StepCtx, StepWorkflowStatus, StringFilter, ValueTypeMap, WorkflowContext, WorkflowContextInstance, WorkflowContextOptions, WorkflowFilter, WorkflowFunction, WorkflowProperty, WorkflowPropertyDefinition, WorkflowQueueMessage, WorkflowRun, createLogAccessor, createQueueWorkflowContext, createStepContext, createWorkflowContext, defaultIdFactory, defaultSerializer, defineWorkflow, ensureTables, finalizeWorkflowRecord, insertStepRecordFull, insertWorkflowRecord, pushLogToDB, tryDeserializeObj, updateWorkflowName, upsertWorkflowProperty, workflowTableRowToWorkflowRun };

package/dist/index.js

@@ -221,14 +221,340 @@ async function upsertWorkflowProperty({ context, instanceId, key, value, tenantI
 }
 
 //#endregion
-//#region src/observableWorkflows/defineWorkflow.ts
-function defineWorkflow(workflow, callback) {
-	const metadata = typeof workflow === "string" ? void 0 : workflow.metadata;
-	const workflowType = typeof workflow === "string" ? workflow : workflow.workflowType;
+//#region src/observableWorkflows/defaultImplementations.ts
+const defaultSerializer = {
+	serialize: JSON.stringify,
+	deserialize: JSON.parse
+};
+const defaultIdFactory = () => crypto.randomUUID();
+
+//#endregion
+//#region src/observableWorkflows/createLogAccessor.ts
+const createLogAccessor = (context) => {
+	const internalSerializer = context.serializer ?? defaultSerializer;
+	const buildFilteredWorkflowQuery = (filter) => {
+		const bindings = [];
+		const whereConditions = [];
+		let joinClause = "";
+		const selectClause = "SELECT DISTINCT w.*";
+		const fromClause = "FROM WorkflowTable w";
+		const propertyWhereConditions = [];
+		if (filter) {
+			if (filter.properties && Object.keys(filter.properties).length > 0) {
+				let propIndex = 0;
+				for (const [key, propertyFilter] of Object.entries(filter.properties)) {
+					const propAlias = `p${propIndex}`;
+					joinClause += ` LEFT JOIN WorkflowProperties ${propAlias} ON w.instanceId = ${propAlias}.instanceId AND ${propAlias}.key = ? AND ${propAlias}.tenantId = ?`;
+					bindings.push(key, context.tenantId);
+					if (propertyFilter.equals !== void 0) propertyWhereConditions.push({
+						condition: `${propAlias}.value = ?`,
+						binding: String(propertyFilter.equals)
+					});
+					if (propertyFilter.contains !== void 0) propertyWhereConditions.push({
+						condition: `${propAlias}.value LIKE ?`,
+						binding: `%${propertyFilter.contains}%`
+					});
+					if (propertyFilter.gt !== void 0) propertyWhereConditions.push({
+						condition: `CAST(${propAlias}.value AS REAL) > ?`,
+						binding: propertyFilter.gt
+					});
+					if (propertyFilter.gte !== void 0) propertyWhereConditions.push({
+						condition: `CAST(${propAlias}.value AS REAL) >= ?`,
+						binding: propertyFilter.gte
+					});
+					if (propertyFilter.lt !== void 0) propertyWhereConditions.push({
+						condition: `CAST(${propAlias}.value AS REAL) < ?`,
+						binding: propertyFilter.lt
+					});
+					if (propertyFilter.lte !== void 0) propertyWhereConditions.push({
+						condition: `CAST(${propAlias}.value AS REAL) <= ?`,
+						binding: propertyFilter.lte
+					});
+					if (propertyFilter.in !== void 0 && Array.isArray(propertyFilter.in)) {
+						const placeholders = propertyFilter.in.map(() => "?").join(", ");
+						propertyWhereConditions.push({
+							condition: `${propAlias}.value IN (${placeholders})`,
+							bindings: propertyFilter.in.map(String)
+						});
+					}
+					propIndex++;
+				}
+			}
+		}
+		propertyWhereConditions.forEach((item) => {
+			whereConditions.push(item.condition);
+			if (item.bindings) bindings.push(...item.bindings);
+			else if (item.binding !== void 0) bindings.push(item.binding);
+		});
+		whereConditions.push("w.tenantId = ?");
+		bindings.push(context.tenantId);
+		if (filter) {
+			if (filter.search) {
+				whereConditions.push("(w.workflowName LIKE ? OR w.workflowType LIKE ?)");
+				bindings.push(`%${filter.search}%`, `%${filter.search}%`);
+			}
+			if (filter.workflowType) if (Array.isArray(filter.workflowType)) {
+				const placeholders = filter.workflowType.map(() => "?").join(", ");
+				whereConditions.push(`w.workflowType IN (${placeholders})`);
+				bindings.push(...filter.workflowType);
+			} else {
+				whereConditions.push("w.workflowType = ?");
+				bindings.push(filter.workflowType);
+			}
+			if (filter.workflowStatus) if (Array.isArray(filter.workflowStatus)) {
+				const placeholders = filter.workflowStatus.map(() => "?").join(", ");
+				whereConditions.push(`w.workflowStatus IN (${placeholders})`);
+				bindings.push(...filter.workflowStatus);
+			} else {
+				whereConditions.push("w.workflowStatus = ?");
+				bindings.push(filter.workflowStatus);
+			}
+			if (filter.workflowName) {
+				if (typeof filter.workflowName === "string") {
+					whereConditions.push("w.workflowName = ?");
+					bindings.push(filter.workflowName);
+				} else if (typeof filter.workflowName === "object") {
+					if ("equals" in filter.workflowName) {
+						whereConditions.push("w.workflowName = ?");
+						bindings.push(filter.workflowName.equals);
+					} else if ("contains" in filter.workflowName) {
+						whereConditions.push("w.workflowName LIKE ?");
+						bindings.push(`%${filter.workflowName.contains}%`);
+					}
+				}
+			}
+			if (filter.startTime) {
+				if (filter.startTime.gte !== void 0) {
+					whereConditions.push("w.startTime >= ?");
+					bindings.push(filter.startTime.gte);
+				}
+				if (filter.startTime.lte !== void 0) {
+					whereConditions.push("w.startTime <= ?");
+					bindings.push(filter.startTime.lte);
+				}
+				if (filter.startTime.gt !== void 0) {
+					whereConditions.push("w.startTime > ?");
+					bindings.push(filter.startTime.gt);
+				}
+				if (filter.startTime.lt !== void 0) {
+					whereConditions.push("w.startTime < ?");
+					bindings.push(filter.startTime.lt);
+				}
+			}
+			if (filter.endTime) {
+				if (filter.endTime.gte !== void 0) {
+					whereConditions.push("w.endTime >= ?");
+					bindings.push(filter.endTime.gte);
+				}
+				if (filter.endTime.lte !== void 0) {
+					whereConditions.push("w.endTime <= ?");
+					bindings.push(filter.endTime.lte);
+				}
+				if (filter.endTime.gt !== void 0) {
+					whereConditions.push("w.endTime > ?");
+					bindings.push(filter.endTime.gt);
+				}
+				if (filter.endTime.lt !== void 0) {
+					whereConditions.push("w.endTime < ?");
+					bindings.push(filter.endTime.lt);
+				}
+			}
+		}
+		const whereClause = whereConditions.length > 0 ? `WHERE ${whereConditions.join(" AND ")}` : "";
+		const sql = `${selectClause} ${fromClause}${joinClause} ${whereClause} ORDER BY w.startTime DESC LIMIT ? OFFSET ?`;
+		return {
+			sql,
+			bindings
+		};
+	};
+	const listSteps = async (limit, offset, instanceId) => {
+		const result = await context.D1.prepare(
+			/* sql */
+			`SELECT * FROM StepTable 
+    WHERE tenantId = ? AND (? IS NULL OR instanceId = ?)
+    ORDER BY startTime ASC LIMIT ? OFFSET ?`
+).bind(context.tenantId, instanceId ?? null, instanceId ?? null, limit, offset).all();
+		return result.results ? result.results.map((row) => ({
+			instanceId: row.instanceId,
+			name: row.stepName,
+			metadata: tryDeserializeObj(row.stepMetadata, internalSerializer),
+			status: row.stepStatus,
+			startTime: row.startTime,
+			endTime: row.endTime,
+			result: row.result ? tryDeserializeObj(row.result, internalSerializer) : null,
+			error: row.error ? tryDeserializeObj(row.error, internalSerializer) : null
+		})) : [];
+	};
+	const listWorkflows = async (limit, offset, filter) => {
+		const { sql, bindings } = buildFilteredWorkflowQuery(filter);
+		const result = await context.D1.prepare(sql).bind(...bindings, limit, offset).all();
+		return result.results ? result.results.map((row) => workflowTableRowToWorkflowRun(row, internalSerializer)) : [];
+	};
+	const getWorkflowByParentId = async (parentInstanceId) => {
+		const result = await context.D1.prepare(
+			/* sql */
+			`SELECT * FROM WorkflowTable WHERE parentInstanceId = ? AND tenantId = ?`
+).bind(parentInstanceId, context.tenantId).all();
+		return result.results ? result.results.map((row) => workflowTableRowToWorkflowRun(row, internalSerializer)) : null;
+	};
+	const getWorkflowTypesByTenantId = async (tenantId) => {
+		const result = await context.D1.prepare(
+			/* sql */
+			`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(
+			/* sql */
+			`SELECT * FROM WorkflowProperties WHERE instanceId = ?`
+).bind(instanceId).all();
+		if (!result.results) return [];
+		return result.results.map((row) => ({
+			key: row.key,
+			valueType: row.valueType,
+			value: tryDeserializeObj(row.value, internalSerializer)
+		}));
+	};
+	/** This function gets the basic data of a workflow, without populating any of it's complex fields */
+	const getWorkflowShallow = async (instanceId) => {
+		const result = await context.D1.prepare(
+			/* sql */
+			`SELECT * FROM WorkflowTable WHERE instanceId = ? AND tenantId = ?`
+).bind(instanceId, context.tenantId).first();
+		if (!result) return null;
+		const workflow = workflowTableRowToWorkflowRun(result, internalSerializer);
+		return workflow;
+	};
+	const getWorkflow = async (instanceId) => {
+		const workflow = await getWorkflowShallow(instanceId);
+		if (!workflow) return null;
+		const steps = await listSteps(100, 0, instanceId);
+		const retryWorkflows = await getWorkflowByParentId(instanceId);
+		const parentWorkflow = workflow.parentInstanceId ? await getWorkflowShallow(workflow.parentInstanceId) : null;
+		workflow.retries = retryWorkflows;
+		retryWorkflows?.forEach((retryWorkflow) => {
+			retryWorkflow.isRetryOf = workflow;
+		});
+		workflow.isRetryOf = parentWorkflow;
+		const allLogs = await context.D1.prepare(
+			/* sql */
+			`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,
+			log: logRow.log,
+			timestamp: logRow.timestamp,
+			type: logRow.type
+		}));
+		steps.forEach((step) => {
+			step.logs = logs?.filter((log) => log.stepName === step.name) ?? [];
+		});
+		workflow.steps = steps;
+		workflow.logs = logs;
+		const properties = await getWorkflowProperties(instanceId);
+		workflow.properties = properties;
+		return workflow;
+	};
+	const getStep = async (instanceId, stepName) => {
+		const result = await context.D1.prepare(
+			/* sql */
+			`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;
+		const step = {
+			instanceId: row.instanceId,
+			name: row.stepName,
+			metadata: tryDeserializeObj(row.stepMetadata, internalSerializer),
+			status: row.stepStatus,
+			startTime: row.startTime,
+			endTime: row.endTime,
+			result: row.result ? tryDeserializeObj(row.result, internalSerializer) : null,
+			error: row.error ? tryDeserializeObj(row.error, internalSerializer) : null,
+			logs: []
+		};
+		const logResult = await context.D1.prepare(
+			/* sql */
+			`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,
+			log: logRow.log,
+			timestamp: logRow.timestamp,
+			type: logRow.type
+		}));
+		return step;
+	};
+	const getPropertiesKeys = async (instanceId) => {
+		const result = await context.D1.prepare(
+			/* sql */
+			`
+      SELECT DISTINCT key, valueType FROM PropertiesTable
+      WHERE tenantId = ? AND (? IS NULL OR instanceId = ?)  
+      `
+).bind(context.tenantId, instanceId ?? null, instanceId ?? null).all();
+		if (!result.results) return [];
+		return result.results.map((row) => ({
+			key: row.key,
+			valueType: row.valueType
+		}));
+	};
 	return {
-		workflowType,
-		metadata: metadata || {},
-		_callback: callback
+		listSteps,
+		getStep,
+		listWorkflows,
+		getWorkflow,
+		getWorkflowTypesByTenantId,
+		getPropertiesKeys
+	};
+};
+
+//#endregion
+//#region src/observableWorkflows/createQueueWorkflowContext.ts
+function createQueueWorkflowContext(options) {
+	const enqueueWorkflow = async (workflow, tenantId, input, initialName) => {
+		await options.QUEUE.send({
+			type: "workflow-run",
+			workflowType: workflow.workflowType,
+			workflowName: initialName,
+			input,
+			tenantId
+		});
+	};
+	const enqueueRetryWorkflow = async (workflow, tenantId, oldInstanceId) => {
+		await options.QUEUE.send({
+			type: "workflow-retry",
+			workflowType: workflow.workflowType,
+			retryInstanceId: oldInstanceId,
+			tenantId
+		});
+	};
+	const handleWorkflowQueueMessage = async (message, env, workflowResolver) => {
+		const workflowFunction = workflowResolver(message.workflowType);
+		if (!workflowFunction) throw new Error(`Workflow ${message.workflowType} not found`);
+		const wfc = options.workflowContext;
+		if (message.type === "workflow-run") {
+			console.log("running workflow", message.input);
+			await wfc.call({
+				input: message.input,
+				workflow: workflowFunction,
+				workflowName: message.workflowName,
+				tenantId: message.tenantId
+			});
+		} else if (message.type === "workflow-retry") {
+			console.log("retrying workflow", message.retryInstanceId);
+			await wfc.retry(workflowFunction, message.retryInstanceId);
+		}
+	};
+	return {
+		enqueueWorkflow,
+		enqueueRetryWorkflow,
+		handleWorkflowQueueMessage
 	};
 }
 
@@ -263,7 +589,7 @@ async function createStepContext(context) {
 				} else console.warn("temp: found existing step with different status", row);
 			} else console.warn("temp: no existing step found");
 		} else console.warn("temp: not trying to reuse successful steps");
-		let waitFor = [];
+		const waitFor = [];
 		const startTime = Date.now();
 		const stepStatus = "pending";
 		const stepMetadata = context.serializer.serialize(stepMetadataParam || {});
@@ -351,14 +677,6 @@ async function createStepContext(context) {
 	return step;
 }
 
-//#endregion
-//#region src/observableWorkflows/defaultImplementations.ts
-const defaultSerializer = {
-	serialize: JSON.stringify,
-	deserialize: JSON.parse
-};
-const defaultIdFactory = () => crypto.randomUUID();
-
 //#endregion
 //#region src/observableWorkflows/createWorkflowContext.ts
 function createWorkflowContext(options) {
@@ -387,7 +705,7 @@ function createWorkflowContext(options) {
 			parentInstanceId,
 			tenantId
 		});
-		let waitFor = [];
+		const waitFor = [];
 		let logOrder = 0;
 		const log = (message, type = "info") => {
 			logOrder++;
@@ -494,204 +812,16 @@ function createWorkflowContext(options) {
 }
 
 //#endregion
-//#region src/observableWorkflows/createQueueWorkflowContext.ts
-function createQueueWorkflowContext(options) {
-	const enqueueWorkflow = async (workflow, tenantId, input, initialName) => {
-		await options.QUEUE.send({
-			type: "workflow-run",
-			workflowType: workflow.workflowType,
-			workflowName: initialName,
-			input,
-			tenantId
-		});
-	};
-	const enqueueRetryWorkflow = async (workflow, tenantId, oldInstanceId) => {
-		await options.QUEUE.send({
-			type: "workflow-retry",
-			workflowType: workflow.workflowType,
-			retryInstanceId: oldInstanceId,
-			tenantId
-		});
-	};
-	const handleWorkflowQueueMessage = async (message, env, workflowResolver) => {
-		const workflowFunction = workflowResolver(message.workflowType);
-		if (!workflowFunction) throw new Error(`Workflow ${message.workflowType} not found`);
-		const wfc = options.workflowContext;
-		if (message.type === "workflow-run") {
-			console.log("running workflow", message.input);
-			await wfc.call({
-				input: message.input,
-				workflow: workflowFunction,
-				workflowName: message.workflowName,
-				tenantId: message.tenantId
-			});
-		} else if (message.type === "workflow-retry") {
-			console.log("retrying workflow", message.retryInstanceId);
-			await wfc.retry(workflowFunction, message.retryInstanceId);
-		}
-	};
+//#region src/observableWorkflows/defineWorkflow.ts
+function defineWorkflow(workflow, callback) {
+	const metadata = typeof workflow === "string" ? void 0 : workflow.metadata;
+	const workflowType = typeof workflow === "string" ? workflow : workflow.workflowType;
 	return {
-		enqueueWorkflow,
-		enqueueRetryWorkflow,
-		handleWorkflowQueueMessage
+		workflowType,
+		metadata: metadata || {},
+		_callback: callback
 	};
 }
 
-//#endregion
-//#region src/observableWorkflows/createLogAccessor.ts
-const createLogAccessor = (context) => {
-	const internalSerializer = context.serializer ?? defaultSerializer;
-	const listSteps = async (limit, offset, instanceId) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`SELECT * FROM StepTable 
-    WHERE tenantId = ? AND (? IS NULL OR instanceId = ?)
-    ORDER BY startTime ASC LIMIT ? OFFSET ?`
-).bind(context.tenantId, instanceId ?? null, instanceId ?? null, limit, offset).all();
-		return result.results ? result.results.map((row) => ({
-			instanceId: row.instanceId,
-			name: row.stepName,
-			metadata: tryDeserializeObj(row.stepMetadata, internalSerializer),
-			status: row.stepStatus,
-			startTime: row.startTime,
-			endTime: row.endTime,
-			result: row.result ? tryDeserializeObj(row.result, internalSerializer) : null,
-			error: row.error ? tryDeserializeObj(row.error, internalSerializer) : null
-		})) : [];
-	};
-	const listWorkflows = async (limit, offset) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`SELECT * 
-      FROM WorkflowTable
-      WHERE tenantId = ?
-      ORDER BY startTime DESC LIMIT ? OFFSET ?`
-).bind(context.tenantId, limit, offset).all();
-		return result.results ? result.results.map((row) => workflowTableRowToWorkflowRun(row, internalSerializer)) : [];
-	};
-	const getWorkflowByParentId = async (parentInstanceId) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`SELECT * FROM WorkflowTable WHERE parentInstanceId = ? AND tenantId = ?`
-).bind(parentInstanceId, context.tenantId).all();
-		return result.results ? result.results.map((row) => workflowTableRowToWorkflowRun(row, internalSerializer)) : null;
-	};
-	const getWorkflowTypesByTenantId = async (tenantId) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`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(
-			/* sql */
-			`SELECT * FROM WorkflowProperties WHERE instanceId = ?`
-).bind(instanceId).all();
-		if (!result.results) return [];
-		return result.results.map((row) => ({
-			key: row.key,
-			valueType: row.valueType,
-			value: tryDeserializeObj(row.value, internalSerializer)
-		}));
-	};
-	/** This function gets the basic data of a workflow, without populating any of it's complex fields */
-	const getWorkflowShallow = async (instanceId) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`SELECT * FROM WorkflowTable WHERE instanceId = ? AND tenantId = ?`
-).bind(instanceId, context.tenantId).first();
-		if (!result) return null;
-		const workflow = workflowTableRowToWorkflowRun(result, internalSerializer);
-		return workflow;
-	};
-	const getWorkflow = async (instanceId) => {
-		const workflow = await getWorkflowShallow(instanceId);
-		if (!workflow) return null;
-		const steps = await listSteps(100, 0, instanceId);
-		const retryWorkflows = await getWorkflowByParentId(instanceId);
-		const parentWorkflow = workflow.parentInstanceId ? await getWorkflowShallow(workflow.parentInstanceId) : null;
-		workflow.retries = retryWorkflows;
-		retryWorkflows?.forEach((retryWorkflow) => {
-			retryWorkflow.isRetryOf = workflow;
-		});
-		workflow.isRetryOf = parentWorkflow;
-		const allLogs = await context.D1.prepare(
-			/* sql */
-			`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,
-			log: logRow.log,
-			timestamp: logRow.timestamp,
-			type: logRow.type
-		}));
-		steps.forEach((step) => {
-			step.logs = logs?.filter((log) => log.stepName === step.name) ?? [];
-		});
-		workflow.steps = steps;
-		workflow.logs = logs;
-		const properties = await getWorkflowProperties(instanceId);
-		workflow.properties = properties;
-		return workflow;
-	};
-	const getStep = async (instanceId, stepName) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`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;
-		const step = {
-			instanceId: row.instanceId,
-			name: row.stepName,
-			metadata: tryDeserializeObj(row.stepMetadata, internalSerializer),
-			status: row.stepStatus,
-			startTime: row.startTime,
-			endTime: row.endTime,
-			result: row.result ? tryDeserializeObj(row.result, internalSerializer) : null,
-			error: row.error ? tryDeserializeObj(row.error, internalSerializer) : null,
-			logs: []
-		};
-		const logResult = await context.D1.prepare(
-			/* sql */
-			`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,
-			log: logRow.log,
-			timestamp: logRow.timestamp,
-			type: logRow.type
-		}));
-		return step;
-	};
-	const getPropertiesKeys = async (instanceId) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`
-      SELECT DISTINCT key, valueType FROM PropertiesTable
-      WHERE tenantId = ? AND (? IS NULL OR instanceId = ?)  
-      `
-).bind(context.tenantId, instanceId ?? null, instanceId ?? null).all();
-		if (!result.results) return [];
-		return result.results.map((row) => ({
-			key: row.key,
-			valueType: row.valueType
-		}));
-	};
-	return {
-		listSteps,
-		getStep,
-		listWorkflows,
-		getWorkflow,
-		getWorkflowTypesByTenantId,
-		getPropertiesKeys
-	};
-};
-
 //#endregion
 export { createLogAccessor, createQueueWorkflowContext, createStepContext, createWorkflowContext, defaultIdFactory, defaultSerializer, defineWorkflow, ensureTables, finalizeWorkflowRecord, insertStepRecordFull, insertWorkflowRecord, pushLogToDB, tryDeserializeObj, updateWorkflowName, upsertWorkflowProperty, workflowTableRowToWorkflowRun };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brandboostinggmbh/observable-workflows",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "My awesome typescript library",
   "type": "module",
   "license": "MIT",
@@ -27,6 +27,7 @@
     "access": "public"
   },
   "devDependencies": {
+    "@cloudflare/vitest-pool-workers": "^0.8.36",
     "@cloudflare/workers-types": "^4.20250515.0",
     "@sxzz/eslint-config": "^7.0.1",
     "@sxzz/prettier-config": "^2.2.1",
@@ -37,7 +38,8 @@
     "tsdown": "^0.11.8",
     "tsx": "^4.19.4",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.3"
+    "vitest": "^3.1.3",
+    "wrangler": "^4.19.1"
   },
   "engines": {
     "node": ">=20.18.0"