@brandboostinggmbh/observable-workflows 0.16.4 → 0.17.1

package/dist/index.d.ts

@@ -368,6 +368,7 @@ type QueueWorkflowContextOptions = {
   QUEUE: Queue<WorkflowQueueMessage>;
   workflowContext: WorkflowContextInstance;
   idFactory?: () => string;
+  queueIdentifier: string;
 };
 type HandleWorkflowQueueMessageParams = {
   message: WorkflowQueueMessage;
@@ -405,6 +406,7 @@ type WorkflowQueueMessage = {
   tenantId: string;
   input: any;
   triggerId?: string | null;
+  queueIdentifier?: string;
 } | {
   type: 'workflow-retry';
   workflowType: string;
@@ -413,6 +415,7 @@ type WorkflowQueueMessage = {
   triggerId?: string | null;
   /** If true the workflow will attempt to reuse all results from successful steps. Defaults to True */
   reuseSuccessfulSteps?: boolean;
+  queueIdentifier?: string;
 };
 type RetryWorkflowOptions = {
   /** If true the retry will attept to reuse all results from successful steps. Defaults to True */

package/dist/index.js

@@ -1022,7 +1022,8 @@ function createQueueWorkflowContext(options) {
 			workflowName: initialName,
 			input,
 			tenantId,
-			triggerId
+			triggerId,
+			queueIdentifier: options.queueIdentifier
 		});
 	};
 	const enqueueRetryWorkflow = async (workflow, tenantId, oldInstanceId, reuseSuccessfulSteps) => {
@@ -1033,7 +1034,8 @@ function createQueueWorkflowContext(options) {
 			retryInstanceId: oldInstanceId,
 			tenantId,
 			triggerId,
-			reuseSuccessfulSteps: reuseSuccessfulSteps ?? true
+			reuseSuccessfulSteps: reuseSuccessfulSteps ?? true,
+			queueIdentifier: options.queueIdentifier
 		});
 	};
 	const enqueueWorkflowBatch = async (workflows) => {
@@ -1043,12 +1045,14 @@ function createQueueWorkflowContext(options) {
 			workflowName: initialName,
 			input,
 			tenantId,
-			triggerId: idFactory()
+			triggerId: idFactory(),
+			queueIdentifier: options.queueIdentifier
 		} })));
 	};
 	const handleWorkflowQueueMessage = async ({ message, env, workflowResolver }) => {
 		const workflowFunction = workflowResolver(message.workflowType);
 		if (!workflowFunction) throw new Error(`Workflow ${message.workflowType} not found`);
+		if (message.queueIdentifier != null && message.queueIdentifier !== options.queueIdentifier) console.warn(`Workflow ${message.workflowType} is not in the correct queue handler. It should be handled by queue ${message.queueIdentifier}.`);
 		const wfc = options.workflowContext;
 		if (message.type === "workflow-run") {
 			console.log("running workflow", message.input);
@@ -1502,17 +1506,21 @@ const createCleanupManager = (context) => {
 			deletedExternalStorageKeysCount: 0
 		};
 		const deletedWorkflows = await getAffectedWorkflows(config, limit);
+		console.log(`Deleting ${deletedWorkflows.length} old workflows...`);
 		const deletedSteps = await getAffectedSteps(config, limit);
+		console.log(`Deleting ${deletedSteps.length} associated steps...`);
 		let deletedExternalStorageKeysCount = 0;
 		if (config.deleteRefsFromExternalStorage && context.externalBlobStorage) {
 			const externalKeys = collectExternalStorageKeys(deletedWorkflows, deletedSteps);
 			if (externalKeys.length > 0) try {
+				console.log(`Deleting ${externalKeys.length} external storage keys...`);
 				deletedExternalStorageKeysCount = await context.externalBlobStorage.delete(...externalKeys);
 			} catch (error) {
 				console.warn(`Failed to delete some external storage keys: ${error instanceof Error ? error.message : String(error)}`);
 			}
 		}
 		if (deletedWorkflows.length > 0) {
+			console.log(`Proceeding to delete workflows from the database...`);
 			await context.D1.prepare(`PRAGMA foreign_keys = ON`).run();
 			let totalDeletedCount = 0;
 			for (let i = 0; i < deletedWorkflows.length; i += 100) {
@@ -1532,7 +1540,7 @@ const createCleanupManager = (context) => {
 				deletedSteps,
 				deletedExternalStorageKeysCount
 			};
-		}
+		} else console.log(`No workflows matched the deletion criteria.`);
 		return {
 			deletedCount: 0,
 			deletedSteps,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brandboostinggmbh/observable-workflows",
-  "version": "0.16.4",
+  "version": "0.17.1",
   "description": "My awesome typescript library",
   "type": "module",
   "license": "MIT",