@falcondev-oss/workflow 0.5.0 → 0.6.1

package/dist/index.d.mts

@@ -1,6 +1,6 @@
-import { ConnectionOptions, Job, JobsOptions, Queue, QueueEvents, QueueEventsOptions, QueueOptions, UnrecoverableError, WorkerOptions } from "bullmq";
+import { ConnectionOptions, Job, JobSchedulerTemplateOptions, JobsOptions, Queue, QueueEvents, QueueEventsOptions, QueueOptions, UnrecoverableError, WorkerOptions } from "bullmq";
 import "@antfu/utils";
-import IORedis from "ioredis";
+import IORedis, { RedisOptions } from "ioredis";
 import { Span } from "@opentelemetry/api";
 import { SuperJSONResult } from "superjson";
 import { Options } from "p-retry";
@@ -20,10 +20,11 @@ type WorkflowLogger = {
 };
 declare const Settings: {
   defaultPrefix: string;
-  defaultConnection: IORedis | undefined;
+  defaultConnection: (() => Promise<IORedis> | IORedis) | undefined;
   defaultCronTimezone: string | undefined;
   logger: WorkflowLogger | undefined;
 };
+declare function createRedisConnection(opts: RedisOptions): Promise<IORedis>;
 //#endregion
 //#region src/serializer.d.ts
 type Serialized<T> = Tagged<SuperJSONResult, 'data', T>;
@@ -66,7 +67,7 @@ interface WorkflowStepOptions {
 //#endregion
 //#region src/types.d.ts
 type WorkflowJobInternal<Input, Output> = Job<Serialized<{
-  input: Input;
+  input: Input | undefined;
   stepData: Record<string, WorkflowStepData>;
   tracingHeaders: unknown;
 }>, Serialized<Output>, string>;
@@ -102,7 +103,10 @@ declare class Workflow<RunInput, Input, Output> {
   run(input: RunInput, opts?: JobsOptions): Promise<WorkflowJob<Output>>;
   runIn(input: RunInput, delayMs: number, opts?: Except<JobsOptions, 'delay'>): Promise<WorkflowJob<Output>>;
   runAt(input: RunInput, date: Date, opts?: Except<JobsOptions, 'delay'>): Promise<WorkflowJob<Output>>;
-  repeat(input: RunInput, cronOrInterval: string | number, opts?: Except<JobsOptions, 'repeat'>): Promise<WorkflowJob<Output>>;
+  private runSchedule;
+  runCron(schedulerId: string, cron: string, input: RunInput, opts?: JobSchedulerTemplateOptions): Promise<void>;
+  runEvery(schedulerId: string, everyMs: number, input: RunInput, opts?: JobSchedulerTemplateOptions): Promise<void>;
+  exportPrometheusMetrics(globalVariables?: Record<string, string>): Promise<string>;
   private getOrCreateQueue;
   private getOrCreateQueueEvents;
 }
@@ -112,4 +116,4 @@ interface WorkflowRunContext<Input> {
   span: Span;
 }
 //#endregion
-export { Settings, Workflow, WorkflowInputError, WorkflowOptions, WorkflowRunContext };
+export { Settings, Workflow, WorkflowInputError, WorkflowOptions, WorkflowRunContext, createRedisConnection };

package/dist/index.mjs

@@ -2,6 +2,7 @@ import { Queue, QueueEvents, UnrecoverableError, Worker } from "bullmq";
 import { createSingletonPromise } from "@antfu/utils";
 import IORedis from "ioredis";
 import { ROOT_CONTEXT, SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
+import { asyncExitHook } from "exit-hook";
 import { deserialize, serialize } from "superjson";
 import { setTimeout } from "node:timers/promises";
 import pRetry from "p-retry";
@@ -23,15 +24,26 @@ const Settings = {
 	defaultCronTimezone: void 0,
 	logger: void 0
 };
+const defaultRedisOptions = {
+	lazyConnect: true,
+	maxRetriesPerRequest: null,
+	retryStrategy: (times) => Math.max(Math.min(Math.exp(times), 2e4), 1e3),
+	enableOfflineQueue: false
+};
 const defaultRedisConnection = createSingletonPromise(async () => {
-	if (Settings.defaultConnection) return Settings.defaultConnection;
+	if (Settings.defaultConnection) return Settings.defaultConnection();
+	const redis = new IORedis(defaultRedisOptions);
+	await redis.connect();
+	return redis;
+});
+async function createRedisConnection(opts) {
 	const redis = new IORedis({
-		lazyConnect: true,
-		maxRetriesPerRequest: null
+		...defaultRedisOptions,
+		...opts
 	});
 	await redis.connect();
 	return redis;
-});
+}
 
 //#endregion
 //#region src/serializer.ts
@@ -110,7 +122,7 @@ var WorkflowStep = class WorkflowStep {
 			attempt: initialAttempt
 		});
 		return pRetry(async (attempt) => {
-			const result = await runWithTracing(`step:${name}`, { attributes: {
+			const result = await runWithTracing(`workflow-worker/${this.workflowId}/step/${name}`, { attributes: {
 				"workflow.id": this.workflowId,
 				"workflow.job_id": this.workflowJobId,
 				"workflow.step_name": name,
@@ -153,7 +165,7 @@ var WorkflowStep = class WorkflowStep {
 			startedAt: now
 		};
 		await this.updateStepData(name, stepData);
-		await runWithTracing(`step:${name}`, { attributes: {
+		await runWithTracing(`workflow-worker/${this.workflowId}/step/${name}`, { attributes: {
 			"workflow.id": this.workflowId,
 			"workflow.job_id": this.workflowJobId,
 			"workflow.step_name": name
@@ -203,14 +215,14 @@ var Workflow = class {
 	}
 	async work(opts) {
 		const queue = await this.getOrCreateQueue();
-		await new Worker(this.opts.id, async (job) => {
+		const worker = new Worker(this.opts.id, async (job) => {
 			Settings.logger?.info?.(`Processing workflow job ${job.id} of workflow ${this.opts.id}`);
 			const jobId = job.id;
 			if (!jobId) throw new Error("Job ID is missing");
 			const deserializedData = deserialize$1(job.data);
 			const parsedData = this.opts.schema && await this.opts.schema["~standard"].validate(deserializedData.input);
 			if (parsedData?.issues) throw new WorkflowInputError("Invalid workflow input", parsedData.issues);
-			return runWithTracing(`workflow:work:${this.opts.id}`, {
+			return runWithTracing(`workflow-worker/${this.opts.id}`, {
 				attributes: {
 					"workflow.id": this.opts.id,
 					"workflow.job_id": jobId
@@ -235,15 +247,20 @@ var Workflow = class {
 			connection: this.opts.connection ?? await defaultRedisConnection(),
 			prefix: Settings.defaultPrefix,
 			...opts
-		}).waitUntilReady();
+		});
+		await worker.waitUntilReady();
 		Settings.logger?.info?.(`Worker started for workflow ${this.opts.id}`);
+		asyncExitHook(async (signal) => {
+			Settings.logger?.info?.(`Received ${signal}, shutting down worker for workflow ${this.opts.id}...`);
+			await worker.close();
+		}, { wait: 1e4 });
 		return this;
 	}
 	async run(input, opts) {
 		const parsedInput = this.opts.schema && await this.opts.schema["~standard"].validate(input);
 		if (parsedInput?.issues) throw new WorkflowInputError("Invalid workflow input", parsedInput.issues);
 		const queue = await this.getOrCreateQueue();
-		return runWithTracing(`workflow:run:${this.opts.id}`, {
+		return runWithTracing(`workflow-producer/${this.opts.id}`, {
 			attributes: { "workflow.id": this.opts.id },
 			kind: SpanKind.PRODUCER
 		}, async () => {
@@ -269,19 +286,41 @@ var Workflow = class {
 		const now = Date.now();
 		return date.getTime() < now ? this.run(input, opts) : this.runIn(input, date.getTime() - Date.now(), opts);
 	}
-	async repeat(input, cronOrInterval, opts) {
-		return this.run(input, {
-			repeat: {
-				tz: Settings.defaultCronTimezone,
-				...typeof cronOrInterval === "string" ? { pattern: cronOrInterval } : { every: cronOrInterval }
-			},
-			...opts
+	async runSchedule(schedulerId, repeatOpts, input, opts) {
+		const parsedInput = this.opts.schema && await this.opts.schema["~standard"].validate(input);
+		if (parsedInput?.issues) throw new WorkflowInputError("Invalid workflow input", parsedInput.issues);
+		await (await this.getOrCreateQueue()).upsertJobScheduler(schedulerId, repeatOpts, {
+			name: "workflow-job",
+			data: serialize$1({
+				input: parsedInput?.value,
+				stepData: {},
+				tracingHeaders: {}
+			}),
+			opts
+		});
+	}
+	async runCron(schedulerId, cron, input, opts) {
+		return this.runSchedule(schedulerId, { pattern: cron }, input, opts);
+	}
+	async runEvery(schedulerId, everyMs, input, opts) {
+		return this.runSchedule(schedulerId, { every: everyMs }, input, opts);
+	}
+	async exportPrometheusMetrics(globalVariables) {
+		return (await this.getOrCreateQueue()).exportPrometheusMetrics({
+			workflowId: this.id,
+			workflowPrefix: Settings.defaultPrefix,
+			...globalVariables
 		});
 	}
 	async getOrCreateQueue() {
 		if (!this.queue) this.queue = new Queue(this.opts.id, {
 			prefix: Settings.defaultPrefix,
 			connection: this.opts.connection ?? await defaultRedisConnection(),
+			defaultJobOptions: {
+				removeOnComplete: true,
+				removeOnFail: { age: 1440 * 60 },
+				...this.opts.queueOptions?.defaultJobOptions
+			},
 			...this.opts.queueOptions
 		});
 		await this.queue.waitUntilReady();
@@ -299,4 +338,4 @@ var Workflow = class {
 };
 
 //#endregion
-export { Settings, Workflow, WorkflowInputError };
+export { Settings, Workflow, WorkflowInputError, createRedisConnection };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@falcondev-oss/workflow",
   "type": "module",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Simple type-safe queue worker with durable execution based on BullMQ.",
   "license": "MIT",
   "repository": "github:falcondev-oss/workflow",
@@ -39,6 +39,7 @@
     "@standard-schema/spec": "^1.1.0",
     "@types/node": "^25.0.3",
     "bullmq": "^5.66.4",
+    "exit-hook": "^5.0.1",
     "ioredis": "^5.8.2",
     "p-retry": "^7.1.1",
     "superjson": "^2.2.6",