@joystick.js/node-canary 0.0.0-canary.292 → 0.0.0-canary.293

package/dist/app/queues/index.js

@@ -97,45 +97,42 @@ class Queue {
       setInterval(async () => {
         const okayToRunJobs = await this._checkIfOkayToRunJobs();
         if (okayToRunJobs && !process.env.HALT_QUEUES) {
-          const nextJob = await this.db.getNextJobToRun();
-          this.handleNextJob(nextJob);
+          const nextJob2 = await this.db.getNextJobToRun();
+          this.handleNextJob(nextJob2);
         }
       }, 300);
     });
   }
-  async handleNextJob(nextJob = {}) {
-    const job_definition = this.options.jobs[nextJob?.job];
-    if (nextJob && nextJob?.job && job_definition && typeof job_definition?.run === "function") {
+  async handleNextJob(nextJob2 = {}) {
+    const job_definition = this.options.jobs[nextJob2?.job];
+    if (nextJob2 && nextJob2?.job && job_definition && typeof job_definition?.run === "function") {
       try {
         if (typeof job_definition?.preflight?.okayToRun === "function") {
-          const okay_to_run = await job_definition?.preflight?.okayToRun(nextJob?.payload, nextJob);
+          const okay_to_run = await job_definition?.preflight?.okayToRun(nextJob2?.payload, nextJob2);
           if (!okay_to_run) {
-            return this._handleRequeueJob(nextJob, timestamps.get_future_time("seconds", job_definition?.preflight?.requeueDelayInSeconds || 10));
+            return this._handleRequeueJob(nextJob2, timestamps.get_future_time("seconds", job_definition?.preflight?.requeueDelayInSeconds || 10));
           }
         }
         if (!isNaN(job_definition?.maxAttempts)) {
           console.log({
-            ...nextJob,
+            ...nextJob2,
             maxAttempts: job_definition?.maxAttempts
           });
-          if (nextJob?.attempts >= parseInt(job_definition?.maxAttempts, 10)) {
-            return this._handleDeleteJob(nextJob?._id);
+          if (nextJob2?.attempts >= parseInt(job_definition?.maxAttempts, 10)) {
+            return this._handleDeleteJob(nextJob2?._id);
           }
         }
-        await this._logAttempt(nextJob?._id);
-        await job_definition.run(nextJob?.payload, {
-          ...nextJob,
+        await this._logAttempt(nextJob2?._id);
+        await job_definition.run(nextJob2?.payload, {
+          ...nextJob2,
           queue: this,
-          completed: () => this._handleJobCompleted(nextJob?._id),
-          failed: (error) => this._handleJobFailed(nextJob?._id, error),
-          delete: () => this._handleDeleteJob(nextJob?._id),
-          requeue: (nextRunAt = "") => this._handleRequeueJob(nextJob, nextRunAt)
+          completed: () => this._handleJobCompleted(nextJob2?._id),
+          failed: (error) => this._handleJobFailed(nextJob2?._id, job_definition, error),
+          delete: () => this._handleDeleteJob(nextJob2?._id),
+          requeue: (nextRunAt = "") => this._handleRequeueJob(nextJob2, nextRunAt)
         });
       } catch (exception) {
-        this._handleJobFailed(nextJob?._id, exception);
-        if (job_definition?.requeueOnFailure) {
-          this._handleRequeueJob(nextJob?.nextRunAt, dayjs().add(10, "seconds").format());
-        }
+        this._handleJobFailed(nextJob2?._id, job_definition, exception);
       }
     }
   }
@@ -145,7 +142,10 @@ class Queue {
   _handleJobCompleted(jobId = "") {
     return this.db.setJobCompleted(jobId);
   }
-  _handleJobFailed(jobId = "", error = "") {
+  _handleJobFailed(jobId = "", job_definition = {}, error = "") {
+    if (job_definition?.requeueOnFailure) {
+      return this._handleRequeueJob(nextJob?.nextRunAt, timestamps.get_future_time("seconds", 10));
+    }
     return this.db.setJobFailed(jobId, error);
   }
   _handleDeleteJob(jobId = "") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystick.js/node-canary",
-  "version": "0.0.0-canary.292",
+  "version": "0.0.0-canary.293",
   "type": "module",
   "description": "A Node.js framework for building web apps.",
   "main": "./dist/index.js",