@falcondev-oss/workflow 0.8.9 → 0.9.1

package/dist/index.d.mts

@@ -13,6 +13,7 @@ type WorkflowLogger = {
   success?: (...data: any[]) => void;
   error?: (...data: any[]) => void;
   debug?: (...data: any[]) => void;
+  warn?: (...data: any[]) => void;
 };
 declare const Settings: {
   defaultConnection: (() => Promise<IORedis> | IORedis) | undefined;
@@ -22,7 +23,9 @@ declare const Settings: {
     prefix: string;
   } | undefined;
 };
-declare function createRedis(opts: RedisOptions): Promise<IORedis>;
+declare function createRedis(opts: RedisOptions & {
+  url?: string;
+}): Promise<IORedis>;
 //#endregion
 //#region src/serializer.d.ts
 type Serialized<T> = Tagged<SuperJSONResult, 'data', T>;
@@ -43,11 +46,16 @@ declare class WorkflowStep {
   private workflowJobId;
   private stepNamePrefix;
   private updateStepDataMutex;
+  private meta;
   constructor(opts: {
     queue: WorkflowQueueInternal<unknown>;
     workflowJobId: string;
     workflowId: string;
     stepNamePrefix?: string;
+    meta: {
+      stepPromises: Set<Promise<any>>;
+      isCanceled: boolean;
+    };
   });
   private addNamePrefix;
   do<R>(stepName: string, run: (ctx: {

package/dist/index.mjs

@@ -57,10 +57,11 @@ const defaultRedisConnection = createSingletonPromise(async () => {
 	return redis;
 });
 async function createRedis(opts) {
-	const redis = new IORedis({
+	const redisOpts = {
 		...defaultRedisOptions,
 		...opts
-	});
+	};
+	const redis = opts.url ? new IORedis(opts.url, redisOpts) : new IORedis(redisOpts);
 	await redis.connect();
 	return redis;
 }
@@ -9627,11 +9628,13 @@ var WorkflowStep = class WorkflowStep {
 	workflowJobId;
 	stepNamePrefix;
 	updateStepDataMutex = new Mutex();
+	meta;
 	constructor(opts) {
 		this.queue = opts.queue;
 		this.workflowJobId = opts.workflowJobId;
 		this.workflowId = opts.workflowId;
 		this.stepNamePrefix = opts.stepNamePrefix ? `${opts.stepNamePrefix}|` : "";
+		this.meta = opts.meta;
 	}
 	addNamePrefix(name) {
 		return `${this.stepNamePrefix}${name}`;
@@ -9649,7 +9652,7 @@ var WorkflowStep = class WorkflowStep {
 			attempt: initialAttempt
 		});
 		Settings.logger?.debug?.(`[${this.workflowId}/${this.workflowJobId}] Running step '${name}' (attempt ${initialAttempt + 1})`);
-		return pRetry(async (attempt) => {
+		const promise = pRetry(async (attempt) => {
 			const result = await runWithTracing(`workflow-worker/${this.workflowId}/step/${name}`, { attributes: {
 				"workflow.id": this.workflowId,
 				"workflow.job_id": this.workflowJobId,
@@ -9660,7 +9663,8 @@ var WorkflowStep = class WorkflowStep {
 					queue: this.queue,
 					workflowId: this.workflowId,
 					workflowJobId: this.workflowJobId,
-					stepNamePrefix: name
+					stepNamePrefix: name,
+					meta: this.meta
 				}),
 				span
 			}));
@@ -9681,8 +9685,14 @@ var WorkflowStep = class WorkflowStep {
 					attempt: initialAttempt + ctx.attemptNumber
 				});
 				return options?.retry?.onFailedAttempt?.(ctx);
+			},
+			shouldRetry: async (context$1) => {
+				if (this.meta.isCanceled) return false;
+				return options?.retry?.shouldRetry?.(context$1) ?? true;
 			}
 		});
+		this.meta.stepPromises.add(promise);
+		return promise.finally(() => this.meta.stepPromises.delete(promise));
 	}
 	async wait(stepName, durationMs) {
 		const name = this.addNamePrefix(stepName);
@@ -9757,19 +9767,33 @@ var Workflow = class {
 					},
 					kind: SpanKind.CONSUMER
 				}, async (span) => {
+					const stepMeta = {
+						stepPromises: /* @__PURE__ */ new Set(),
+						isCanceled: false
+					};
 					const start = performance.now();
-					const result = await this.opts.run({
-						input: parsedData?.value,
-						step: new WorkflowStep({
-							queue,
-							workflowJobId: jobId,
-							workflowId: this.opts.id
-						}),
-						span
-					});
-					const end = performance.now();
-					Settings.logger?.success?.(`[${this.opts.id}] Completed job ${job.id} in ${(end - start).toFixed(2)} ms`);
-					return serialize$1(result);
+					try {
+						const result = await this.opts.run({
+							input: parsedData?.value,
+							step: new WorkflowStep({
+								queue,
+								workflowJobId: jobId,
+								workflowId: this.opts.id,
+								meta: stepMeta
+							}),
+							span
+						});
+						const end = performance.now();
+						Settings.logger?.success?.(`[${this.opts.id}] Completed job ${job.id} in ${(end - start).toFixed(2)} ms`);
+						return serialize$1(result);
+					} catch (err) {
+						stepMeta.isCanceled = true;
+						if (stepMeta.stepPromises.size > 0) {
+							Settings.logger?.warn?.(`[${this.opts.id}] Job failed but there are still ${stepMeta.stepPromises.size} running step(s), waiting for them to finish. Be careful when using 'Promise.all([step0, step1, ...])', as running steps are not canceled when one of them fails.`);
+							await Promise.allSettled(stepMeta.stepPromises);
+						}
+						throw err;
+					}
 				}, propagation.extract(ROOT_CONTEXT, deserializedData.tracingHeaders));
 			},
 			queue,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@falcondev-oss/workflow",
   "type": "module",
-  "version": "0.8.9",
+  "version": "0.9.1",
   "description": "Simple type-safe queue worker with durable execution using Redis.",
   "license": "MIT",
   "repository": "github:falcondev-oss/workflow",