@happyvertical/smrt-jobs 0.55.21 → 0.55.24

package/dist/index.d.ts

@@ -43,7 +43,7 @@ export { type CreateMcpTaskInput, createMcpTaskResult, getMcpTaskMarker, MCP_TAS
 export { type BackgroundCapable, type BgOptions, withBackgroundJobs, } from './object-extension.js';
 export { DEFAULT_JOB_RETENTION, DEFAULT_RETENTION_SWEEP_INTERVAL_MS, JOB_EVENTS_RETENTION_TASK, JOBS_RETENTION_TASK, type JobRetentionOptions, type RetentionSweeper, type RetentionSweeperOptions, registerJobRetentionTasks, startRetentionSweeper, unregisterJobRetentionTasks, } from './retention.js';
 export { createTaskRunner, getActiveJobExecutionContext, isRunnerExecutionContext, JobTimeoutError, TaskRunner, type TaskRunnerConfig, type TaskRunnerEvents, } from './runner.js';
-export { createScheduleRunner, getNextCronDate, type ScheduleInfo, ScheduleRunner, type ScheduleRunnerConfig, type ScheduleRunnerEvents, validateCronExpression, } from './schedule-runner.js';
+export { createScheduleRunner, getNextCronDate, SCHEDULED_JOB_QUEUE, type ScheduleInfo, ScheduleRunner, type ScheduleRunnerConfig, type ScheduleRunnerEvents, validateCronExpression, } from './schedule-runner.js';
 export { type ClaimReadyOptions, type JobStatus, type ListReadyOptions, SmrtJob, SmrtJobCollection, type SmrtJobData, type TimeoutBehavior, } from './smrt-job.js';
 export { type JobEventCursor, type ListJobEventsOptions, type ListTerminalOutcomesOptions, SmrtJobEvent, SmrtJobEventCollection, type SmrtJobEventData, type SmrtJobEventLevel, type SmrtJobEventType, type SmrtJobTerminalOutcome, type SmrtJobTerminalOutcomePage, type SmrtJobTerminalStatus, } from './smrt-job-event.js';
 export { type RegisterWorkerInput, SmrtWorker, SmrtWorkerCollection, } from './smrt-worker.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAKH,OAAO,wBAAwB,CAAC;AAYhC,OAAO,EACL,6BAA6B,EAC7B,KAAK,uBAAuB,EAC5B,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,EACtB,4BAA4B,EAC5B,0BAA0B,EAC1B,eAAe,EACf,sBAAsB,EACtB,yBAAyB,GAC1B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,iCAAiC,EACjC,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,GAC7B,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACL,yBAAyB,EACzB,kBAAkB,GACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC9B,aAAa,EACb,uBAAuB,EACvB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,EAC7B,yBAAyB,EACzB,KAAK,sBAAsB,EAC3B,sBAAsB,EACtB,KAAK,6BAA6B,EAClC,KAAK,cAAc,GACpB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,UAAU,EACV,KAAK,QAAQ,EACb,UAAU,EACV,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,SAAS,EACT,KAAK,SAAS,EACd,KAAK,WAAW,GACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,KAAK,UAAU,EACf,gBAAgB,EAChB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,GACtB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,KAAK,kBAAkB,EACvB,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACnB,KAAK,OAAO,EACZ,KAAK,gBAAgB,EACrB,qBAAqB,EACrB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,oBAAoB,EACpB,KAAK,aAAa,EAClB,YAAY,EACZ,qBAAqB,EACrB,0BAA0B,EAC1B,mBAAmB,EACnB,WAAW,GACZ,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,qBAAqB,EACrB,mCAAmC,EACnC,yBAAyB,EACzB,mBAAmB,EACnB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,uBAAuB,EAC5B,yBAAyB,EACzB,qBAAqB,EACrB,2BAA2B,GAC5B,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,gBAAgB,EAChB,4BAA4B,EAC5B,wBAAwB,EACxB,eAAe,EACf,UAAU,EACV,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,GACtB,MAAM,aAAa,CAAC;AAGrB,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,KAAK,YAAY,EACjB,cAAc,EACd,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,sBAAsB,GACvB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,KAAK,gBAAgB,EACrB,OAAO,EACP,iBAAiB,EACjB,KAAK,WAAW,EAChB,KAAK,eAAe,GACrB,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,KAAK,2BAA2B,EAChC,YAAY,EACZ,sBAAsB,EACtB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,KAAK,0BAA0B,EAC/B,KAAK,qBAAqB,GAC3B,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,KAAK,mBAAmB,EACxB,UAAU,EACV,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import { A as SmrtJobCollection, B as isBackgroundEligibleMethod, C as DEFAULT_RETENTION_SWEEP_INTERVAL_MS, D as startRetentionSweeper, E as registerJobRetentionTasks, F as TenantJobCapExceededError, I as assertWithinTenantCreationCap, L as backgroundEligible, M as SmrtJobEventCollection, N as DEFAULT_TENANT_JOB_CAP, O as unregisterJobRetentionTasks, P as MAX_JOB_RETRIES, R as clampRetries, S as DEFAULT_JOB_RETENTION, T as JOB_EVENTS_RETENTION_TASK, V as markBackgroundEligible, _ as requestMcpTaskInput, a as isRunnerExecutionContext, b as redactErrorForPersistence, c as SmrtWorkerCollection, d as McpTaskNotFoundError, f as McpTaskStore, g as requestMcpTaskContinuation, h as getMcpTaskMarker, i as getActiveJobExecutionContext, j as SmrtJobEvent, k as SmrtJob, l as MCP_TASKS_EXTENSION, m as createMcpTaskResult, n as TaskRunner, o as DEFAULT_TASK_HEARTBEAT_INTERVAL_MS, p as McpTaskSuspendedError, r as createTaskRunner, s as SmrtWorker, t as JobTimeoutError, u as McpTaskCancelledError, v as taskFromJob, w as JOBS_RETENTION_TASK, x as redactErrorMessage, y as JobContextLogger, z as getBackgroundEligibleMethods } from "./chunks/runner-B8_TYooy.js";
+import { A as SmrtJobCollection, B as isBackgroundEligibleMethod, C as DEFAULT_RETENTION_SWEEP_INTERVAL_MS, D as startRetentionSweeper, E as registerJobRetentionTasks, F as TenantJobCapExceededError, I as assertWithinTenantCreationCap, L as backgroundEligible, M as SmrtJobEventCollection, N as DEFAULT_TENANT_JOB_CAP, O as unregisterJobRetentionTasks, P as MAX_JOB_RETRIES, R as clampRetries, S as DEFAULT_JOB_RETENTION, T as JOB_EVENTS_RETENTION_TASK, V as markBackgroundEligible, _ as requestMcpTaskInput, a as isRunnerExecutionContext, b as redactErrorForPersistence, c as SmrtWorkerCollection, d as McpTaskNotFoundError, f as McpTaskStore, g as requestMcpTaskContinuation, h as getMcpTaskMarker, i as getActiveJobExecutionContext, j as SmrtJobEvent, k as SmrtJob, l as MCP_TASKS_EXTENSION, m as createMcpTaskResult, n as TaskRunner, o as DEFAULT_TASK_HEARTBEAT_INTERVAL_MS, p as McpTaskSuspendedError, r as createTaskRunner, s as SmrtWorker, t as JobTimeoutError, u as McpTaskCancelledError, v as taskFromJob, w as JOBS_RETENTION_TASK, x as redactErrorMessage, y as JobContextLogger, z as getBackgroundEligibleMethods } from "./chunks/runner-CbKjN2tD.js";
 import { c as unregisterLiveWorker, i as registerLiveWorker, n as isWorkerAlive, t as createWorkerKey } from "./chunks/worker-liveness-C1Gjnhax.js";
 import { ObjectRegistry, SmrtCollection, SmrtObject, detectEngine, field, smrt } from "@happyvertical/smrt-core";
 import { createLogger } from "@happyvertical/logger";
@@ -875,6 +875,7 @@ function withBackgroundJobs(BaseClass) {
 }
 //#endregion
 //#region src/schedule-runner.ts
+var SCHEDULED_JOB_QUEUE = "agents";
 var DEFAULT_CONFIG = {
 	id: "",
 	pollInterval: 6e4,
@@ -1114,7 +1115,22 @@ var ScheduleRunner = class extends EventEmitter {
 			if (schedule.method_args) methodArgs = typeof schedule.method_args === "string" ? JSON.parse(schedule.method_args) : schedule.method_args;
 			let agentConfig = {};
 			if (schedule.agent_config) agentConfig = typeof schedule.agent_config === "string" ? JSON.parse(schedule.agent_config) : schedule.agent_config;
-			const nextRun = getNextCronDate(schedule.cron);
+			const timezone = typeof schedule.timezone === "string" && schedule.timezone.trim() ? schedule.timezone.trim() : "UTC";
+			try {
+				validateCronExpression(schedule.cron);
+				validateCronTimezone(timezone);
+			} catch (error) {
+				await this.db.query(`UPDATE _smrt_agent_schedules
+           SET status = 'error', last_error = ?
+           WHERE id = ?`, redactErrorForPersistence(error), schedule.id);
+				this.emit("schedule:error", scheduleInfo, error);
+				this.logger.error("Schedule has an invalid cron or time zone", {
+					scheduleId: schedule.id,
+					error
+				});
+				return;
+			}
+			const nextRun = getNextCronDate(schedule.cron, timezone);
 			const args = {
 				...methodArgs,
 				_scheduleId: schedule.id
@@ -1122,7 +1138,7 @@ var ScheduleRunner = class extends EventEmitter {
 			if (Object.keys(agentConfig).length > 0) args._agentConfig = agentConfig;
 			const job = await this.jobCollection.enqueueJob({
 				tenantId: typeof schedule.tenant_id === "string" && schedule.tenant_id.length > 0 ? schedule.tenant_id : null,
-				queue: "agents",
+				queue: SCHEDULED_JOB_QUEUE,
 				objectType: canonicalAgentType,
 				objectId: schedule.agent_id,
 				method: schedule.method || "run",
@@ -1223,48 +1239,133 @@ function validateCronExpression(cron) {
 	});
 	return parts;
 }
-function getNextCronDate(cron) {
+var MINUTE_MS = 6e4;
+var DAY_MS = 24 * (60 * MINUTE_MS);
+var CRON_SEARCH_HORIZON_MS = 525600 * MINUTE_MS;
+var zoneFormatters = /* @__PURE__ */ new Map();
+function resolveZoneOffset(timezone) {
+	if (timezone === void 0 || timezone === null) return (epochMs) => -new Date(epochMs).getTimezoneOffset() * MINUTE_MS;
+	let formatter = zoneFormatters.get(timezone);
+	if (!formatter) {
+		try {
+			formatter = new Intl.DateTimeFormat("en-US", {
+				timeZone: timezone,
+				hourCycle: "h23",
+				year: "numeric",
+				month: "numeric",
+				day: "numeric",
+				hour: "numeric",
+				minute: "numeric",
+				second: "numeric"
+			});
+		} catch {
+			throw new Error(`Invalid cron timezone: "${timezone}" is not a recognized IANA time zone`);
+		}
+		zoneFormatters.set(timezone, formatter);
+	}
+	const zoned = formatter;
+	return (epochMs) => {
+		const fields = {};
+		for (const part of zoned.formatToParts(epochMs)) if (part.type !== "literal") fields[part.type] = Number(part.value);
+		return Date.UTC(fields.year, fields.month - 1, fields.day, fields.hour % 24, fields.minute, fields.second) - (epochMs - (epochMs % 1e3 + 1e3) % 1e3);
+	};
+}
+function wallTimeInstants(wallMs, offsetAt) {
+	const offsetBefore = offsetAt(wallMs - DAY_MS);
+	const offsetAfter = offsetAt(wallMs + DAY_MS);
+	const instants = [];
+	for (const offset of /* @__PURE__ */ new Set([offsetBefore, offsetAfter])) {
+		const instant = wallMs - offset;
+		if (offsetAt(instant) === offset) instants.push(instant);
+	}
+	instants.sort((a, b) => a - b);
+	return {
+		instants,
+		offsetBefore,
+		offsetAfter
+	};
+}
+function validateCronTimezone(timezone) {
+	resolveZoneOffset(timezone);
+}
+function getNextCronDate(cron, timezone) {
 	const [minuteExpr, hourExpr, dayExpr, monthExpr, dowExpr] = validateCronExpression(cron);
-	const candidate = /* @__PURE__ */ new Date(/* @__PURE__ */ new Date());
-	candidate.setSeconds(0);
-	candidate.setMilliseconds(0);
-	candidate.setMinutes(candidate.getMinutes() + 1);
+	const offsetAt = resolveZoneOffset(timezone);
 	const dayIsWildcard = dayExpr === "*";
 	const dowIsWildcard = dowExpr === "*";
-	const maxIterations = 525600;
-	for (let i = 0; i < maxIterations; i++) {
-		const dayMatches = matchesCronField(candidate.getDate(), dayExpr);
-		const dow = candidate.getDay();
-		const dowMatches = matchesCronField(dow, dowExpr) || dow === 0 && matchesCronField(7, dowExpr);
-		let dayOfMonthOrWeekMatches;
-		if (!dayIsWildcard && !dowIsWildcard) dayOfMonthOrWeekMatches = dayMatches || dowMatches;
-		else if (!dayIsWildcard) dayOfMonthOrWeekMatches = dayMatches;
-		else if (!dowIsWildcard) dayOfMonthOrWeekMatches = dowMatches;
-		else dayOfMonthOrWeekMatches = true;
-		if (matchesCronField(candidate.getMonth() + 1, monthExpr) && dayOfMonthOrWeekMatches && matchesCronField(candidate.getHours(), hourExpr) && matchesCronField(candidate.getMinutes(), minuteExpr)) return candidate;
-		candidate.setMinutes(candidate.getMinutes() + 1);
+	const fixedTime = !minuteExpr.includes("*") && !hourExpr.includes("*");
+	const dayMatches = (wall) => {
+		const domMatches = matchesCronField(wall.getUTCDate(), dayExpr, CRON_FIELD_RANGES[2]);
+		const dow = wall.getUTCDay();
+		const dowMatches = matchesCronField(dow, dowExpr, CRON_FIELD_RANGES[4]) || dow === 0 && matchesCronField(7, dowExpr, CRON_FIELD_RANGES[4]);
+		if (!dayIsWildcard && !dowIsWildcard) return domMatches || dowMatches;
+		if (!dayIsWildcard) return domMatches;
+		if (!dowIsWildcard) return dowMatches;
+		return true;
+	};
+	const now = Date.now();
+	const threshold = now - (now % MINUTE_MS + MINUTE_MS) % MINUTE_MS + MINUTE_MS;
+	const thresholdOffset = offsetAt(threshold);
+	const thresholdSpread = Math.abs(offsetAt(threshold - DAY_MS) - offsetAt(threshold + DAY_MS));
+	let wallMs = threshold + thresholdOffset - thresholdSpread;
+	const wallEnd = threshold + thresholdOffset + CRON_SEARCH_HORIZON_MS;
+	let best = null;
+	let stopAfterWall = Number.POSITIVE_INFINITY;
+	while (wallMs <= wallEnd && wallMs <= stopAfterWall) {
+		const wall = new Date(wallMs);
+		const year = wall.getUTCFullYear();
+		const month = wall.getUTCMonth();
+		const day = wall.getUTCDate();
+		const hour = wall.getUTCHours();
+		if (!matchesCronField(month + 1, monthExpr, CRON_FIELD_RANGES[3])) {
+			wallMs = Date.UTC(year, month + 1, 1);
+			continue;
+		}
+		if (!dayMatches(wall)) {
+			wallMs = Date.UTC(year, month, day + 1);
+			continue;
+		}
+		if (!matchesCronField(hour, hourExpr, CRON_FIELD_RANGES[1])) {
+			wallMs = Date.UTC(year, month, day, hour + 1);
+			continue;
+		}
+		if (!matchesCronField(wall.getUTCMinutes(), minuteExpr, CRON_FIELD_RANGES[0])) {
+			wallMs += MINUTE_MS;
+			continue;
+		}
+		const { instants, offsetBefore, offsetAfter } = wallTimeInstants(wallMs, offsetAt);
+		let candidates = instants;
+		if (instants.length === 0) candidates = fixedTime ? [wallMs - offsetBefore] : [];
+		else if (instants.length > 1 && fixedTime) candidates = [instants[0]];
+		for (const instant of candidates) if (instant >= threshold && (best === null || instant < best)) {
+			if (best === null) stopAfterWall = wallMs + Math.abs(offsetBefore - offsetAfter);
+			best = instant;
+		}
+		wallMs += MINUTE_MS;
 	}
-	throw new Error(`Could not find next run date for cron: ${cron}`);
+	if (best === null) throw new Error(`Could not find next run date for cron: ${cron}`);
+	return new Date(best);
 }
-function matchesCronField(value, expr) {
+function matchesCronField(value, expr, range) {
 	if (expr === "*") return true;
-	if (expr.includes("/")) {
-		const [range, stepStr] = expr.split("/");
-		const step = parseInt(stepStr, 10);
-		if (range === "*") return value % step === 0;
-		if (range.includes("-")) {
-			const [startStr, endStr] = range.split("-");
-			const start = parseInt(startStr, 10);
-			if (value < start || value > parseInt(endStr, 10)) return false;
-			return (value - start) % step === 0;
+	return expr.split(",").some((term) => {
+		const [body, stepStr] = term.split("/");
+		const step = stepStr === void 0 ? 1 : parseInt(stepStr, 10);
+		let start;
+		let end;
+		if (body === "*") {
+			start = range.min;
+			end = range.max;
+		} else if (body.includes("-")) {
+			const [startStr, endStr] = body.split("-");
+			start = parseInt(startStr, 10);
+			end = parseInt(endStr, 10);
+		} else {
+			start = parseInt(body, 10);
+			end = stepStr === void 0 ? start : range.max;
 		}
-	}
-	if (expr.includes("-")) {
-		const [startStr, endStr] = expr.split("-");
-		return value >= parseInt(startStr, 10) && value <= parseInt(endStr, 10);
-	}
-	if (expr.includes(",")) return expr.split(",").map((v) => parseInt(v.trim(), 10)).includes(value);
-	return value === parseInt(expr, 10);
+		return value >= start && value <= end && (value - start) % step === 0;
+	});
 }
 function createScheduleRunner(config) {
 	return new ScheduleRunner(config);
@@ -1273,6 +1374,6 @@ function createScheduleRunner(config) {
 //#region src/index.ts
 registerJobRetentionTasks();
 //#endregion
-export { DEFAULT_JOB_RETENTION, DEFAULT_RETENTION_SWEEP_INTERVAL_MS, DEFAULT_TENANT_JOB_CAP, ForgeDelivery, ForgeDeliveryCollection, ForgeProjectionCheckpoint, ForgeProjectionRuntime, JOBS_RETENTION_TASK, JOB_EVENTS_RETENTION_TASK, JobBuilder, JobContextLogger, JobHandle, JobTimeoutError, MAX_JOB_RETRIES, MCP_TASKS_EXTENSION, McpTaskCancelledError, McpTaskNotFoundError, McpTaskStore, McpTaskSuspendedError, ScheduleRunner, SmrtJob, SmrtJobCollection, SmrtJobEvent, SmrtJobEventCollection, SmrtWorker, SmrtWorkerCollection, TaskRunner, TenantJobCapExceededError, assertWithinTenantCreationCap, backgroundEligible, clampRetries, createHmacDurableJobPayloadSigner, createMcpTaskResult, createScheduleRunner, createTaskRunner, createWorkerKey, getActiveJobExecutionContext, getBackgroundEligibleMethods, getMcpTaskMarker, getNextCronDate, isBackgroundEligibleMethod, isRunnerExecutionContext, isWorkerAlive, markBackgroundEligible, parseDelay, priorityToNumber, redactErrorForPersistence, redactErrorMessage, registerJobRetentionTasks, registerLiveWorker, requestMcpTaskContinuation, requestMcpTaskInput, startRetentionSweeper, taskFromJob, unregisterJobRetentionTasks, unregisterLiveWorker, validateCronExpression, withBackgroundJobs };
+export { DEFAULT_JOB_RETENTION, DEFAULT_RETENTION_SWEEP_INTERVAL_MS, DEFAULT_TENANT_JOB_CAP, ForgeDelivery, ForgeDeliveryCollection, ForgeProjectionCheckpoint, ForgeProjectionRuntime, JOBS_RETENTION_TASK, JOB_EVENTS_RETENTION_TASK, JobBuilder, JobContextLogger, JobHandle, JobTimeoutError, MAX_JOB_RETRIES, MCP_TASKS_EXTENSION, McpTaskCancelledError, McpTaskNotFoundError, McpTaskStore, McpTaskSuspendedError, SCHEDULED_JOB_QUEUE, ScheduleRunner, SmrtJob, SmrtJobCollection, SmrtJobEvent, SmrtJobEventCollection, SmrtWorker, SmrtWorkerCollection, TaskRunner, TenantJobCapExceededError, assertWithinTenantCreationCap, backgroundEligible, clampRetries, createHmacDurableJobPayloadSigner, createMcpTaskResult, createScheduleRunner, createTaskRunner, createWorkerKey, getActiveJobExecutionContext, getBackgroundEligibleMethods, getMcpTaskMarker, getNextCronDate, isBackgroundEligibleMethod, isRunnerExecutionContext, isWorkerAlive, markBackgroundEligible, parseDelay, priorityToNumber, redactErrorForPersistence, redactErrorMessage, registerJobRetentionTasks, registerLiveWorker, requestMcpTaskContinuation, requestMcpTaskInput, startRetentionSweeper, taskFromJob, unregisterJobRetentionTasks, unregisterLiveWorker, validateCronExpression, withBackgroundJobs };
 
 //# sourceMappingURL=index.js.map