@cedarjs/jobs 7.0.1-next.312 → 7.0.1-next.333

package/dist/adapters/BaseAdapter/BaseAdapter.d.ts

@@ -49,7 +49,7 @@ export interface CancelOptions {
  * be used to configure your custom adapter. If `options.logger` is included
  * you can access it via `this.logger`
  */
-export declare abstract class BaseAdapter<TOptions extends BaseAdapterOptions = BaseAdapterOptions, TScheduleReturn = void | Promise<void>> {
+export declare abstract class BaseAdapter<TOptions extends BaseAdapterOptions = BaseAdapterOptions, TScheduleReturn = unknown> {
     options: TOptions;
     logger: NonNullable<TOptions['logger']>;
     constructor(options: TOptions);

package/dist/adapters/BaseAdapter/BaseAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/BaseAdapter/BaseAdapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAG3E,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,OAAO,EAAE,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,KAAK,EAAE,IAAI,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED,MAAM,WAAW,cAAc,CAAC,IAAI,SAAS,OAAO,GAAG,OAAO;IAC5D,GAAG,EAAE,IAAI,CAAA;IACT,KAAK,EAAE,IAAI,GAAG,SAAS,CAAA;IACvB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,MAAM,WAAW,YAAY,CAAC,IAAI,SAAS,OAAO,GAAG,OAAO;IAC1D,GAAG,EAAE,IAAI,CAAA;IACT,KAAK,EAAE,IAAI,CAAA;IACX,KAAK,EAAE,KAAK,CAAA;CACb;AAED,MAAM,WAAW,cAAc,CAAC,IAAI,SAAS,OAAO,GAAG,OAAO;IAC5D,GAAG,EAAE,IAAI,CAAA;IACT,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,KAAK,CAAA;CACd;AAED,MAAM,WAAW,aAAa;IAC5B,+DAA+D;IAC/D,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CACvB;AAED;;;;;;;GAOG;AACH,8BAAsB,WAAW,CAC/B,QAAQ,SAAS,kBAAkB,GAAG,kBAAkB,EACxD,eAAe,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAEtC,OAAO,EAAE,QAAQ,CAAA;IACjB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;gBAE3B,OAAO,EAAE,QAAQ;IAU7B,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,eAAe;IAE5D;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAEzE;;OAEG;IACH,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAE/D;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3D;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAE/D;;OAEG;IACH,QAAQ,CAAC,KAAK,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAEtC;;;;;;;;OAQG;IACH,MAAM,CAAC,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAC5D"}
+{"version":3,"file":"BaseAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/BaseAdapter/BaseAdapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAG3E,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,OAAO,EAAE,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,KAAK,EAAE,IAAI,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED,MAAM,WAAW,cAAc,CAAC,IAAI,SAAS,OAAO,GAAG,OAAO;IAC5D,GAAG,EAAE,IAAI,CAAA;IACT,KAAK,EAAE,IAAI,GAAG,SAAS,CAAA;IACvB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,MAAM,WAAW,YAAY,CAAC,IAAI,SAAS,OAAO,GAAG,OAAO;IAC1D,GAAG,EAAE,IAAI,CAAA;IACT,KAAK,EAAE,IAAI,CAAA;IACX,KAAK,EAAE,KAAK,CAAA;CACb;AAED,MAAM,WAAW,cAAc,CAAC,IAAI,SAAS,OAAO,GAAG,OAAO;IAC5D,GAAG,EAAE,IAAI,CAAA;IACT,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,KAAK,CAAA;CACd;AAED,MAAM,WAAW,aAAa;IAC5B,+DAA+D;IAC/D,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CACvB;AAED;;;;;;;GAOG;AACH,8BAAsB,WAAW,CAC/B,QAAQ,SAAS,kBAAkB,GAAG,kBAAkB,EACxD,eAAe,GAAG,OAAO;IAEzB,OAAO,EAAE,QAAQ,CAAA;IACjB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;gBAE3B,OAAO,EAAE,QAAQ;IAY7B,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,eAAe;IAE5D;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAEzE;;OAEG;IACH,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAE/D;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3D;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAE/D;;OAEG;IACH,QAAQ,CAAC,KAAK,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAEtC;;;;;;;;OAQG;IACH,MAAM,CAAC,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAC5D"}

package/dist/consts.d.ts

@@ -12,6 +12,15 @@ export declare const DEFAULT_MAX_RUNTIME = 14400;
 export declare const MAX_RUNTIME_GRACE_PERIOD = 60;
 /** 5 seconds */
 export declare const DEFAULT_SLEEP_DELAY = 5;
+/**
+ * Upper bound, in milliseconds, for the delay before a failed job is retried
+ * (7 days). The backoff grows with the fourth power of the number of attempts,
+ * so without a cap a job with a very high `maxAttempts` would get a `runAt` so
+ * far in the future that it can't be represented as a `Date`. The cap is above
+ * the longest delay reached with the default `maxAttempts` (23 ** 4 seconds,
+ * about 3.2 days), so it only affects jobs with a higher `maxAttempts`
+ */
+export declare const MAX_BACKOFF_MS: number;
 export declare const DEFAULT_DELETE_SUCCESSFUL_JOBS = true;
 export declare const DEFAULT_DELETE_FAILED_JOBS = false;
 export declare const DEFAULT_LOGGER: Console;

package/dist/consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,KAAK,CAAA;AACtC,yBAAyB;AACzB,eAAO,MAAM,mBAAmB,QAAS,CAAA;AACzC;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,KAAK,CAAA;AAC1C,gBAAgB;AAChB,eAAO,MAAM,mBAAmB,IAAI,CAAA;AAEpC,eAAO,MAAM,8BAA8B,OAAO,CAAA;AAClD,eAAO,MAAM,0BAA0B,QAAQ,CAAA;AAC/C,eAAO,MAAM,cAAc,SAAU,CAAA;AACrC,eAAO,MAAM,aAAa,YAAY,CAAA;AACtC,eAAO,MAAM,kBAAkB,MAAM,CAAA;AACrC,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAClC,eAAO,MAAM,YAAY,IAAI,CAAA;AAC7B,eAAO,MAAM,kBAAkB,MAAO,CAAA;AACtC,eAAO,MAAM,oBAAoB,sBAAsB,CAAA;AAEvD,eAAO,MAAM,kBAAkB,kBAAkB,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,YAAY,CAAA;AAC7C;;;GAGG;AACH,eAAO,MAAM,mBAAmB,WAAW,CAAA"}
+{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,KAAK,CAAA;AACtC,yBAAyB;AACzB,eAAO,MAAM,mBAAmB,QAAS,CAAA;AACzC;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,KAAK,CAAA;AAC1C,gBAAgB;AAChB,eAAO,MAAM,mBAAmB,IAAI,CAAA;AACpC;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,QAA0B,CAAA;AAErD,eAAO,MAAM,8BAA8B,OAAO,CAAA;AAClD,eAAO,MAAM,0BAA0B,QAAQ,CAAA;AAC/C,eAAO,MAAM,cAAc,SAAU,CAAA;AACrC,eAAO,MAAM,aAAa,YAAY,CAAA;AACtC,eAAO,MAAM,kBAAkB,MAAM,CAAA;AACrC,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAClC,eAAO,MAAM,YAAY,IAAI,CAAA;AAC7B,eAAO,MAAM,kBAAkB,MAAO,CAAA;AACtC,eAAO,MAAM,oBAAoB,sBAAsB,CAAA;AAEvD,eAAO,MAAM,kBAAkB,kBAAkB,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,YAAY,CAAA;AAC7C;;;GAGG;AACH,eAAO,MAAM,mBAAmB,WAAW,CAAA"}

package/dist/consts.js

@@ -3,6 +3,7 @@ const DEFAULT_MAX_ATTEMPTS = 24;
 const DEFAULT_MAX_RUNTIME = 14400;
 const MAX_RUNTIME_GRACE_PERIOD = 60;
 const DEFAULT_SLEEP_DELAY = 5;
+const MAX_BACKOFF_MS = 7 * 24 * 60 * 60 * 1e3;
 const DEFAULT_DELETE_SUCCESSFUL_JOBS = true;
 const DEFAULT_DELETE_FAILED_JOBS = false;
 const DEFAULT_LOGGER = console;
@@ -30,6 +31,7 @@ export {
   DEFAULT_WAIT,
   DEFAULT_WAIT_UNTIL,
   DEFAULT_WORK_QUEUE,
+  MAX_BACKOFF_MS,
   MAX_RUNTIME_GRACE_PERIOD,
   PROCESS_TITLE_PREFIX
 };

package/dist/core/Executor.d.ts

@@ -24,6 +24,7 @@ export declare const DEFAULTS: {
     deleteSuccessfulJobs: boolean;
 };
 export declare class Executor {
+    #private;
     options: Required<ExecutorOptions>;
     adapter: ExecutorOptions['adapter'];
     logger: NonNullable<ExecutorOptions['logger']>;
@@ -34,7 +35,20 @@ export declare class Executor {
     deleteSuccessfulJobs: NonNullable<ExecutorOptions['deleteSuccessfulJobs']>;
     constructor(options: ExecutorOptions);
     get jobIdentifier(): string;
-    perform(): Promise<void>;
+    /**
+     * Runs the job and records its outcome with the adapter.
+     *
+     * Resolves to `false` if the adapter threw while recording the outcome of a
+     * failed attempt. The job can then still be locked by this worker, and the
+     * adapter may hand the same job straight back, so the caller should wait
+     * before looking for its next job
+     */
+    perform(): Promise<boolean>;
+    /**
+     * The number of milliseconds to wait before retrying a job that has been
+     * attempted `attempts` times: `attempts ** 4` seconds, capped at
+     * `MAX_BACKOFF_MS`
+     */
     backoffMilliseconds(attempts: number): number;
 }
 //# sourceMappingURL=Executor.d.ts.map

package/dist/core/Executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Executor.d.ts","sourceRoot":"","sources":["../../src/core/Executor.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AAczE,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAIvD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,WAAW,CAAA;IACpB,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,6CAA6C;IAC7C,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,iDAAiD;IACjD,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,eAAO,MAAM,QAAQ;;;;;;CAMpB,CAAA;AAED,qBAAa,QAAQ;IACnB,OAAO,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAA;IAClC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IACnC,MAAM,EAAE,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC9C,GAAG,EAAE,OAAO,CAAA;IACZ,WAAW,EAAE,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAAA;IACxD,UAAU,EAAE,WAAW,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAA;IACtD,gBAAgB,EAAE,WAAW,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAA;IAClE,oBAAoB,EAAE,WAAW,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;gBAE9D,OAAO,EAAE,eAAe;IAsBpC,IAAI,aAAa,WAEhB;IAEK,OAAO;IAuGb,mBAAmB,CAAC,QAAQ,EAAE,MAAM;CAGrC"}
+{"version":3,"file":"Executor.d.ts","sourceRoot":"","sources":["../../src/core/Executor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AAezE,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAKvD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,WAAW,CAAA;IACpB,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,6CAA6C;IAC7C,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,iDAAiD;IACjD,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,eAAO,MAAM,QAAQ;;;;;;CAMpB,CAAA;AAED,qBAAa,QAAQ;;IACnB,OAAO,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAA;IAClC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IACnC,MAAM,EAAE,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC9C,GAAG,EAAE,OAAO,CAAA;IACZ,WAAW,EAAE,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAAA;IACxD,UAAU,EAAE,WAAW,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAA;IACtD,gBAAgB,EAAE,WAAW,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAA;IAClE,oBAAoB,EAAE,WAAW,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;gBAE9D,OAAO,EAAE,eAAe;IAsBpC,IAAI,aAAa,WAEhB;IAED;;;;;;;OAOG;IACG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAqJjC;;;;OAIG;IACH,mBAAmB,CAAC,QAAQ,EAAE,MAAM;CAGrC"}

package/dist/core/Executor.js

@@ -1,11 +1,11 @@
 import { setTimeout, clearTimeout } from "node:timers";
-import { CronExpressionParser } from "cron-parser";
 import {
   DEFAULT_MAX_ATTEMPTS,
   DEFAULT_MAX_RUNTIME,
   DEFAULT_DELETE_FAILED_JOBS,
   DEFAULT_DELETE_SUCCESSFUL_JOBS,
-  DEFAULT_LOGGER
+  DEFAULT_LOGGER,
+  MAX_BACKOFF_MS
 } from "../consts.js";
 import {
   AdapterRequiredError,
@@ -13,6 +13,7 @@ import {
   JobTimeoutError
 } from "../errors.js";
 import { loadJob } from "../loaders.js";
+import { nextCronRunAt } from "../util.js";
 import { executionContext } from "./executionContext.js";
 const DEFAULTS = {
   logger: DEFAULT_LOGGER,
@@ -49,6 +50,14 @@ class Executor {
   get jobIdentifier() {
     return `${this.job.id} (${this.job.path}:${this.job.name})`;
   }
+  /**
+   * Runs the job and records its outcome with the adapter.
+   *
+   * Resolves to `false` if the adapter threw while recording the outcome of a
+   * failed attempt. The job can then still be locked by this worker, and the
+   * adapter may hand the same job straight back, so the caller should wait
+   * before looking for its next job
+   */
   async perform() {
     this.logger.info(`[CedarJS Jobs] Started job ${this.jobIdentifier}`);
     const abortController = new AbortController();
@@ -68,12 +77,13 @@ class Executor {
         );
       })();
       await Promise.race([performPromise, timeoutPromise]);
-      const runAt = this.job.cron ? CronExpressionParser.parse(this.job.cron).next().toDate() : void 0;
+      const runAt = this.job.cron ? nextCronRunAt(this.job.cron) : void 0;
       await this.adapter.success({
         job: this.job,
         runAt,
         deleteJob: !runAt && this.deleteSuccessfulJobs
       });
+      return true;
     } catch (rawError) {
       const error = rawError instanceof Error ? rawError : new Error(String(rawError));
       const timedOut = error instanceof JobTimeoutError;
@@ -85,41 +95,78 @@ class Executor {
       const errorMessage = `[CedarJS Jobs] Error in job ${this.jobIdentifier}: ${error.message}`;
       this.logger.error(errorMessage);
       this.logger.error(error.stack);
-      if (timedOut) {
-        this.logger.warn(
-          this.job,
-          `[CedarJS Jobs] Failed job ${this.jobIdentifier}: exceeded max runtime (${this.maxRuntime} seconds)`
-        );
-        await this.adapter.failure({
+      return await this.#recordError(error, timedOut);
+    } finally {
+      clearTimeout(timeoutId);
+    }
+  }
+  /**
+   * Records the outcome of a failed attempt with the adapter. Resolves to
+   * `false` if any of the adapter calls threw
+   */
+  async #recordError(error, timedOut) {
+    if (timedOut) {
+      this.logger.warn(
+        this.job,
+        `[CedarJS Jobs] Failed job ${this.jobIdentifier}: exceeded max runtime (${this.maxRuntime} seconds)`
+      );
+      return this.#adapterWrite(
+        () => this.adapter.failure({
           job: this.job,
           deleteJob: this.deleteFailedJobs,
           error
-        });
-      } else {
-        await this.adapter.error({
-          job: this.job,
-          runAt: new Date(
-            (/* @__PURE__ */ new Date()).getTime() + this.backoffMilliseconds(this.job.attempts)
-          ),
-          error
-        });
-        if (this.job.attempts >= this.maxAttempts) {
-          this.logger.warn(
-            this.job,
-            `[CedarJS Jobs] Failed job ${this.jobIdentifier}: reached max attempts (${this.maxAttempts})`
-          );
-          await this.adapter.failure({
-            job: this.job,
-            deleteJob: this.deleteFailedJobs
-          });
-        }
-      }
-    } finally {
-      clearTimeout(timeoutId);
+        })
+      );
+    }
+    const errorRecorded = await this.#adapterWrite(
+      () => this.adapter.error({
+        job: this.job,
+        runAt: new Date(
+          (/* @__PURE__ */ new Date()).getTime() + this.backoffMilliseconds(this.job.attempts)
+        ),
+        error
+      })
+    );
+    if (this.job.attempts < this.maxAttempts) {
+      return errorRecorded;
+    }
+    this.logger.warn(
+      this.job,
+      `[CedarJS Jobs] Failed job ${this.jobIdentifier}: reached max attempts (${this.maxAttempts})`
+    );
+    const failureRecorded = await this.#adapterWrite(
+      () => this.adapter.failure({
+        job: this.job,
+        deleteJob: this.deleteFailedJobs
+      })
+    );
+    return errorRecorded && failureRecorded;
+  }
+  /**
+   * Runs a single adapter write. An error thrown by the write is logged
+   * rather than rethrown, so a failing write can't crash the worker. Resolves
+   * to `false` if the write threw
+   */
+  async #adapterWrite(write) {
+    try {
+      await write();
+      return true;
+    } catch (rawAdapterError) {
+      const adapterError = rawAdapterError instanceof Error ? rawAdapterError : new Error(String(rawAdapterError));
+      this.logger.error(
+        `[CedarJS Jobs] Could not record the error for job ${this.jobIdentifier}: ${adapterError.message}`
+      );
+      this.logger.error(adapterError.stack);
+      return false;
     }
   }
+  /**
+   * The number of milliseconds to wait before retrying a job that has been
+   * attempted `attempts` times: `attempts ** 4` seconds, capped at
+   * `MAX_BACKOFF_MS`
+   */
   backoffMilliseconds(attempts) {
-    return 1e3 * attempts ** 4;
+    return Math.min(1e3 * attempts ** 4, MAX_BACKOFF_MS);
   }
 }
 export {

package/dist/core/JobManager.d.ts

@@ -13,7 +13,7 @@ export declare class JobManager<TAdapters extends Adapters, TQueues extends Queu
     logger: TLogger;
     workers: WorkerConfig<TAdapters, TQueues>[];
     constructor(config: JobManagerConfig<TAdapters, TQueues extends string[] ? never : TQueues, TLogger>);
-    createScheduler<TAdapterName extends keyof TAdapters>(schedulerConfig: CreateSchedulerConfig<TAdapters, TAdapterName>): (<TJob extends Job<TQueues, any[]>>(job: TJob, ...argsAndOptions: CreateSchedulerArgs<TJob>) => Promise<void>) & {
+    createScheduler<TAdapterName extends keyof TAdapters>(schedulerConfig: CreateSchedulerConfig<TAdapters, TAdapterName>): (<TJob extends Job<TQueues, any[]>>(job: TJob, ...argsAndOptions: CreateSchedulerArgs<TJob>) => Promise<Awaited<ReturnType<TAdapters[TAdapterName]["schedule"]>>>) & {
         cancel: (jobId: string | number) => Promise<boolean>;
     };
     createJob<TArgs extends unknown[]>(jobDefinition: JobDefinition<TQueues, TArgs>): Job<TQueues, TArgs>;

package/dist/core/Scheduler.d.ts

@@ -21,7 +21,7 @@ export declare class Scheduler<TAdapter extends BaseAdapter> {
         job: TJob;
         args: Parameters<TJob['perform']> | never[];
         options?: ScheduleJobOptions;
-    }): Promise<void>;
+    }): Promise<Awaited<ReturnType<TAdapter['schedule']>>>;
     /**
      * Cancel a scheduled job so that it will not be run (if it's still queued)
      * or not be retried (if it's currently running). Requires an adapter that

package/dist/core/Scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Scheduler.d.ts","sourceRoot":"","sources":["../../src/core/Scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,eAAe,EAChB,MAAM,wCAAwC,CAAA;AAa/C,OAAO,KAAK,EACV,WAAW,EACX,GAAG,EACH,UAAU,EACV,kBAAkB,EACnB,MAAM,aAAa,CAAA;AAEpB,UAAU,eAAe,CAAC,QAAQ,SAAS,WAAW;IACpD,OAAO,EAAE,QAAQ,CAAA;IACjB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,SAAS,CAAC,QAAQ,SAAS,WAAW;IACjD,OAAO,EAAE,QAAQ,CAAA;IACjB,MAAM,EAAE,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;gBAE5C,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC;IAS1D,YAAY,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,IAAI,GAAG,IAAI,CAAA;KAAE;IAU1E,YAAY,CAAC,IAAI,SAAS,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,EAAE,EACpD,GAAG,EACH,IAAI,EACJ,OAAO,GACR,EAAE;QACD,GAAG,EAAE,IAAI,CAAA;QACT,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,EAAE,CAAA;QAC3C,OAAO,CAAC,EAAE,kBAAkB,CAAA;KAC7B,GAAG,eAAe;IA4Bb,QAAQ,CAAC,IAAI,SAAS,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,EAAE,EACtD,GAAG,EACH,IAAI,EACJ,OAAO,GACR,EAAE;QACD,GAAG,EAAE,IAAI,CAAA;QACT,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,EAAE,CAAA;QAC3C,OAAO,CAAC,EAAE,kBAAkB,CAAA;KAC7B;IAqBD;;;;;;;;OAQG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CASpC"}
+{"version":3,"file":"Scheduler.d.ts","sourceRoot":"","sources":["../../src/core/Scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,eAAe,EAChB,MAAM,wCAAwC,CAAA;AAa/C,OAAO,KAAK,EACV,WAAW,EACX,GAAG,EACH,UAAU,EACV,kBAAkB,EACnB,MAAM,aAAa,CAAA;AAGpB,UAAU,eAAe,CAAC,QAAQ,SAAS,WAAW;IACpD,OAAO,EAAE,QAAQ,CAAA;IACjB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,SAAS,CAAC,QAAQ,SAAS,WAAW;IACjD,OAAO,EAAE,QAAQ,CAAA;IACjB,MAAM,EAAE,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;gBAE5C,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC;IAS1D,YAAY,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,IAAI,GAAG,IAAI,CAAA;KAAE;IAU1E,YAAY,CAAC,IAAI,SAAS,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,EAAE,EACpD,GAAG,EACH,IAAI,EACJ,OAAO,GACR,EAAE;QACD,GAAG,EAAE,IAAI,CAAA;QACT,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,EAAE,CAAA;QAC3C,OAAO,CAAC,EAAE,kBAAkB,CAAA;KAC7B,GAAG,eAAe;IAgCb,QAAQ,CAAC,IAAI,SAAS,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,EAAE,EACtD,GAAG,EACH,IAAI,EACJ,OAAO,GACR,EAAE;QACD,GAAG,EAAE,IAAI,CAAA;QACT,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,EAAE,CAAA;QAC3C,OAAO,CAAC,EAAE,kBAAkB,CAAA;KAC7B,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IA+BtD;;;;;;;;OAQG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CASpC"}

package/dist/core/Scheduler.js

@@ -10,6 +10,7 @@ import {
   QueueNotDefinedError,
   SchedulingError
 } from "../errors.js";
+import { nextCronRunAt } from "../util.js";
 class Scheduler {
   adapter;
   logger;
@@ -52,7 +53,9 @@ class Scheduler {
       path: job.path,
       args: args ?? [],
       cron,
-      runAt: this.computeRunAt({ wait, waitUntil }),
+      // A recurring job's first run happens the next time its cron schedule
+      // matches, just like all following runs
+      runAt: cron ? nextCronRunAt(cron) : this.computeRunAt({ wait, waitUntil }),
       queue,
       priority
     };
@@ -69,7 +72,8 @@ class Scheduler {
     });
     this.logger.info(payload, `[CedarJS Jobs] Scheduling ${job.name}`);
     try {
-      return await this.adapter.schedule(payload);
+      const scheduled = this.adapter.schedule(payload);
+      return await Promise.resolve(scheduled);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
       throw new SchedulingError(

package/dist/core/Worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Worker.d.ts","sourceRoot":"","sources":["../../src/core/Worker.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AAUzE,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAInE,MAAM,WAAW,aAAc,SAAQ,mBAAmB;IAGxD,OAAO,EAAE,WAAW,CAAA;IACpB,uDAAuD;IACvD,WAAW,EAAE,MAAM,CAAA;IACnB,oEAAoE;IACpE,MAAM,EAAE,MAAM,EAAE,CAAA;IAIhB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,8DAA8D;IAC9D,KAAK,CAAC,EAAE,OAAO,CAAA;IAEf;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,KAAK,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAA;AAc9C,qBAAa,MAAM;;IACjB,OAAO,EAAE,eAAe,CAAA;IACxB,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IACnC,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAA;IACjC,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAA;IAC/B,WAAW,EAAE,eAAe,CAAC,aAAa,CAAC,CAAA;IAC3C,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAA;IACjC,WAAW,EAAE,eAAe,CAAC,aAAa,CAAC,CAAA;IAC3C,UAAU,EAAE,eAAe,CAAC,YAAY,CAAC,CAAA;IACzC,oBAAoB,EAAE,eAAe,CAAC,sBAAsB,CAAC,CAAA;IAC7D,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAA;IACrD,UAAU,EAAE,eAAe,CAAC,YAAY,CAAC,CAAA;IACzC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IACnC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IACnC,aAAa,EAAE,IAAI,CAAA;gBAEP,OAAO,EAAE,aAAa;IA2ElC,GAAG;IAQH,IAAI,UAAU,WAMb;CAmDF"}
+{"version":3,"file":"Worker.d.ts","sourceRoot":"","sources":["../../src/core/Worker.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AAUzE,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAInE,MAAM,WAAW,aAAc,SAAQ,mBAAmB;IAGxD,OAAO,EAAE,WAAW,CAAA;IACpB,uDAAuD;IACvD,WAAW,EAAE,MAAM,CAAA;IACnB,oEAAoE;IACpE,MAAM,EAAE,MAAM,EAAE,CAAA;IAIhB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,8DAA8D;IAC9D,KAAK,CAAC,EAAE,OAAO,CAAA;IAEf;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,KAAK,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAA;AAc9C,qBAAa,MAAM;;IACjB,OAAO,EAAE,eAAe,CAAA;IACxB,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IACnC,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAA;IACjC,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAA;IAC/B,WAAW,EAAE,eAAe,CAAC,aAAa,CAAC,CAAA;IAC3C,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAA;IACjC,WAAW,EAAE,eAAe,CAAC,aAAa,CAAC,CAAA;IAC3C,UAAU,EAAE,eAAe,CAAC,YAAY,CAAC,CAAA;IACzC,oBAAoB,EAAE,eAAe,CAAC,sBAAsB,CAAC,CAAA;IAC7D,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAA;IACrD,UAAU,EAAE,eAAe,CAAC,YAAY,CAAC,CAAA;IACzC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IACnC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IACnC,aAAa,EAAE,IAAI,CAAA;gBAEP,OAAO,EAAE,aAAa;IA2ElC,GAAG;IAQH,IAAI,UAAU,WAMb;CAyDF"}

package/dist/core/Worker.js

@@ -97,8 +97,9 @@ class Worker {
         maxRuntime: this.maxRuntime,
         queues: this.queues
       });
+      let outcomeRecorded = true;
       if (job) {
-        await new Executor({
+        outcomeRecorded = await new Executor({
           adapter: this.adapter,
           logger: this.logger,
           job,
@@ -110,7 +111,7 @@ class Worker {
       } else if (this.workoff) {
         break;
       }
-      if (!job && this.forever) {
+      if ((!job || !outcomeRecorded) && this.forever) {
         const millsSinceLastCheck = (/* @__PURE__ */ new Date()).getTime() - this.lastCheckTime.getTime();
         if (millsSinceLastCheck < this.sleepDelay) {
           await this.#wait(this.sleepDelay - millsSinceLastCheck);

package/dist/util.d.ts

@@ -1,2 +1,8 @@
 export declare function makeFilePath(path: string): string;
+/**
+ * Returns the next time after now that the given cron expression matches.
+ * Used both when a recurring job is first scheduled and when it's rescheduled
+ * after a successful run, so that both line up with its cron schedule.
+ */
+export declare function nextCronRunAt(cron: string): Date;
 //# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAGA,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,UAExC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAKA,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,UAExC;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,QAEzC"}

package/dist/util.js

@@ -1,7 +1,12 @@
 import { pathToFileURL } from "node:url";
+import { CronExpressionParser } from "cron-parser";
 function makeFilePath(path) {
   return pathToFileURL(path).href;
 }
+function nextCronRunAt(cron) {
+  return CronExpressionParser.parse(cron).next().toDate();
+}
 export {
-  makeFilePath
+  makeFilePath,
+  nextCronRunAt
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/jobs",
-  "version": "7.0.1-next.312",
+  "version": "7.0.1-next.333",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -37,13 +37,13 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@cedarjs/cli-helpers": "7.0.1-next.312",
-    "@cedarjs/project-config": "7.0.1-next.312",
+    "@cedarjs/cli-helpers": "7.0.1-next.333",
+    "@cedarjs/project-config": "7.0.1-next.333",
     "cron-parser": "5.10.1",
     "type-fest": "5.10.0"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.0.1-next.312",
+    "@cedarjs/framework-tools": "7.0.1-next.333",
     "@prisma/client": "7.10.0",
     "concurrently": "9.2.4",
     "publint": "0.3.24",