qdone 2.0.21-alpha → 2.0.23-alpha

package/commonjs/src/consumer.js

@@ -178,7 +178,7 @@ function processMessages(queues, callback, options) {
                                     if (messages.length) {
                                         for (_i = 0, messages_1 = messages; _i < messages_1.length; _i++) {
                                             message = messages_1[_i];
-                                            jobExecutor.executeJob(message, callback, qname, qrl);
+                                            jobExecutor.executeJob(message, callback, qname, qrl, function () { return queueManager.updateIcehouse(qrl, true); });
                                         }
                                         queueManager.updateIcehouse(qrl, false);
                                     }

package/commonjs/src/scheduler/jobExecutor.js

@@ -266,7 +266,7 @@ var JobExecutor = /** @class */ (function () {
             });
         });
     };
-    JobExecutor.prototype.executeJob = function (message, callback, qname, qrl) {
+    JobExecutor.prototype.executeJob = function (message, callback, qname, qrl, failedCallback) {
         return __awaiter(this, void 0, void 0, function () {
             var payload, visibilityTimeout, job, oldJob, e, queue, result, err_1;
             return __generator(this, function (_a) {
@@ -340,6 +340,9 @@ var JobExecutor = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 3:
                         err_1 = _a.sent();
+                        // Notify caller that we failed
+                        if (failedCallback)
+                            failedCallback(message, qname, qrl);
                         // Fail path for job execution
                         if (this.opt.verbose) {
                             console.error(chalk_1.default.red('FAILED'), message.Body);

package/commonjs/src/scheduler/queueManager.js

@@ -131,11 +131,11 @@ var QueueManager = /** @class */ (function () {
                             var isFailQueue = qname.slice(-suf.length) === suf;
                             return _this.opt.includeFailed ? true : !isFailQueue;
                         })
-                            // first fifo
+                            // next fifo
                             .filter(function (_a) {
                             var qname = _a.qname, qrl = _a.qrl;
                             var isFifo = qname.endsWith('.fifo');
-                            return _this.opt.fifo ? isFifo : !isFifo;
+                            return _this.opt.fifo ? isFifo : true;
                         })
                             // then icehouse
                             .filter(function (_a) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdone",
-  "version": "2.0.21-alpha",
+  "version": "2.0.23-alpha",
   "description": "Language agnostic job queue for SQS",
   "type": "module",
   "main": "./index.js",

package/src/consumer.js

@@ -91,7 +91,7 @@ export async function processMessages (queues, callback, options) {
       const messages = await getMessages(qrl, opt, maxMessages)
       if (messages.length) {
         for (const message of messages) {
-          jobExecutor.executeJob(message, callback, qname, qrl)
+          jobExecutor.executeJob(message, callback, qname, qrl, () => queueManager.updateIcehouse(qrl, true))
         }
         queueManager.updateIcehouse(qrl, false)
       } else {

package/src/scheduler/jobExecutor.js

@@ -193,7 +193,7 @@ export class JobExecutor {
     }, nextCheckInMs)
   }
 
-  async executeJob (message, callback, qname, qrl) {
+  async executeJob (message, callback, qname, qrl, failedCallback) {
     // Create job entry and track it
     const payload = this.opt.json ? JSON.parse(message.Body) : message.Body
     const visibilityTimeout = 60
@@ -261,6 +261,8 @@ export class JobExecutor {
       }
       this.stats.jobsSucceeded++
     } catch (err) {
+      // Notify caller that we failed
+      if (failedCallback) failedCallback(message, qname, qrl)
       // Fail path for job execution
       if (this.opt.verbose) {
         console.error(chalk.red('FAILED'), message.Body)

package/src/scheduler/queueManager.js

@@ -86,10 +86,10 @@ export class QueueManager {
         const isFailQueue = qname.slice(-suf.length) === suf
         return this.opt.includeFailed ? true : !isFailQueue
       })
-      // first fifo
+      // next fifo
       .filter(({ qname, qrl }) => {
         const isFifo = qname.endsWith('.fifo')
-        return this.opt.fifo ? isFifo : !isFifo
+        return this.opt.fifo ? isFifo : true
       })
       // then icehouse
       .filter(({ qname, qrl }) => !this.keepInIcehouse(qrl, now))