qdone 2.0.17-alpha → 2.0.18-alpha

package/commonjs/src/idleQueues.js

@@ -85,21 +85,33 @@ var metricNames = [
  */
 function _cheapIdleCheck(qname, qrl, opt) {
     return __awaiter(this, void 0, void 0, function () {
-        var client, cmd, data, result;
+        var client, cmd, data, result_1, e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    _a.trys.push([0, 2, , 3]);
                     client = (0, sqs_js_1.getSQSClient)();
                     cmd = new client_sqs_1.GetQueueAttributesCommand({ AttributeNames: exports.attributeNames, QueueUrl: qrl });
                     return [4 /*yield*/, client.send(cmd)];
                 case 1:
                     data = _a.sent();
                     debug('data', data);
-                    result = data.Attributes;
-                    result.queue = qname.slice(opt.prefix.length);
+                    result_1 = data.Attributes;
+                    result_1.queue = qname.slice(opt.prefix.length);
                     // We are idle if all the messages attributes are zero
-                    result.idle = exports.attributeNames.filter(function (k) { return result[k] === '0'; }).length === exports.attributeNames.length;
-                    return [2 /*return*/, { result: result, SQS: 1 }];
+                    result_1.idle = exports.attributeNames.filter(function (k) { return result_1[k] === '0'; }).length === exports.attributeNames.length;
+                    return [2 /*return*/, { result: result_1, SQS: 1 }];
+                case 2:
+                    e_1 = _a.sent();
+                    if (e_1 instanceof client_sqs_1.QueueDoesNotExist) {
+                        // Count deleted queues as idle
+                        return [2 /*return*/, { idle: true, SQS: 1 }];
+                    }
+                    else {
+                        throw e_1;
+                    }
+                    return [3 /*break*/, 3];
+                case 3: return [2 /*return*/];
             }
         });
     });
@@ -320,7 +332,7 @@ exports.processQueue = processQueue;
  */
 function processQueuePair(qname, qrl, opt) {
     return __awaiter(this, void 0, void 0, function () {
-        var isFifo, normalizeOptions, fqname, fqrl, result, active, fresult, idleCheckResult, factive, _a, dresult, dfresult, e_1, deleteResult, resultIncludingDelete;
+        var isFifo, normalizeOptions, fqname, fqrl, result, active, fresult, idleCheckResult, factive, _a, dresult, dfresult, e_2, deleteResult, resultIncludingDelete;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -385,11 +397,11 @@ function processQueuePair(qname, qrl, opt) {
                             }
                         })];
                 case 5:
-                    e_1 = _b.sent();
+                    e_2 = _b.sent();
                     // Handle the case where the fail queue has been deleted or was never
                     // created for some reason
-                    if (!(e_1 instanceof client_sqs_1.QueueDoesNotExist))
-                        throw e_1;
+                    if (!(e_2 instanceof client_sqs_1.QueueDoesNotExist))
+                        throw e_2;
                     // Fail queue doesn't exist if we get here
                     if (opt.verbose)
                         console.error(chalk_1.default.blue('Queue ') + fqname.slice(opt.prefix.length) + chalk_1.default.blue(' does not exist.'));

package/commonjs/src/scheduler/jobExecutor.js

@@ -269,7 +269,7 @@ var JobExecutor = /** @class */ (function () {
     };
     JobExecutor.prototype.executeJob = function (message, callback, qname, qrl) {
         return __awaiter(this, void 0, void 0, function () {
-            var payload, visibilityTimeout, job, oldJob, e, queue_1, result, err_1;
+            var payload, visibilityTimeout, job, oldJob, e, queue, result, err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -316,8 +316,8 @@ var JobExecutor = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        queue_1 = qname.slice(this.opt.prefix.length);
-                        return [4 /*yield*/, (0, sentry_js_1.withSentry)(function () { return callback(queue_1, payload); }, this.opt, { job: job })];
+                        queue = qname.slice(this.opt.prefix.length);
+                        return [4 /*yield*/, callback(queue, payload)];
                     case 2:
                         result = _a.sent();
                         debug('executeJob callback finished', { payload: payload, result: result });

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "qdone",
-  "version": "2.0.17-alpha",
+  "version": "2.0.18-alpha",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "qdone",
-      "version": "2.0.17-alpha",
+      "version": "2.0.18-alpha",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-cloudwatch": "^3.465.0",

package/package.json

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

package/src/idleQueues.js

@@ -37,15 +37,24 @@ const metricNames = [
  * Actual SQS call, used in conjunction with cache.
  */
 export async function _cheapIdleCheck (qname, qrl, opt) {
-  const client = getSQSClient()
-  const cmd = new GetQueueAttributesCommand({ AttributeNames: attributeNames, QueueUrl: qrl })
-  const data = await client.send(cmd)
-  debug('data', data)
-  const result = data.Attributes
-  result.queue = qname.slice(opt.prefix.length)
-  // We are idle if all the messages attributes are zero
-  result.idle = attributeNames.filter(k => result[k] === '0').length === attributeNames.length
-  return { result, SQS: 1 }
+  try {
+    const client = getSQSClient()
+    const cmd = new GetQueueAttributesCommand({ AttributeNames: attributeNames, QueueUrl: qrl })
+    const data = await client.send(cmd)
+    debug('data', data)
+    const result = data.Attributes
+    result.queue = qname.slice(opt.prefix.length)
+    // We are idle if all the messages attributes are zero
+    result.idle = attributeNames.filter(k => result[k] === '0').length === attributeNames.length
+    return { result, SQS: 1 }
+  } catch (e) {
+    if (e instanceof QueueDoesNotExist) {
+      // Count deleted queues as idle
+      return { idle: true, SQS: 1 }
+    } else {
+      throw e
+    }
+  }
 }
 
 /**

package/src/scheduler/jobExecutor.js

@@ -242,7 +242,7 @@ export class JobExecutor {
     // Execute job
     try {
       const queue = qname.slice(this.opt.prefix.length)
-      const result = await withSentry(() => callback(queue, payload), this.opt, { job })
+      const result = await callback(queue, payload)
       debug('executeJob callback finished', { payload, result })
       if (this.opt.verbose) {
         console.error(chalk.green('SUCCESS'), message.Body)