qdone 2.0.16-alpha → 2.0.18-alpha

package/commonjs/src/consumer.js

@@ -43,6 +43,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processMessages = exports.getMessages = exports.requestShutdown = void 0;
+var os_1 = require("os");
 var client_sqs_1 = require("@aws-sdk/client-sqs");
 var chalk_1 = __importDefault(require("chalk"));
 var debug_1 = __importDefault(require("debug"));
@@ -117,7 +118,7 @@ exports.getMessages = getMessages;
 //
 function processMessages(queues, callback, options) {
     return __awaiter(this, void 0, void 0, function () {
-        var opt, lastLatency, systemMonitor, jobExecutor, queueManager, delayTimeout, delay, activeQrls, maxReturnCount, listen, allowedJobs, maxLatency, latency, latencyFactor, targetJobs, jobsLeft, _i, _a, _b, qname, qrl, maxMessages;
+        var opt, lastLatency, systemMonitor, jobExecutor, queueManager, delayTimeout, delay, activeQrls, maxReturnCount, listen, allowedJobs, maxLatency, latency, latencyFactor, freememFactor, targetJobs, jobsLeft, _i, _a, _b, qname, qrl, maxMessages;
         var _this = this;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -211,9 +212,10 @@ function processMessages(queues, callback, options) {
                     latency = systemMonitor.getLatency() || 10;
                     latencyFactor = 1 - Math.abs(Math.min(latency / maxLatency, 1)) // 0 if latency is at max, 1 if latency 0
                     ;
-                    targetJobs = Math.round(allowedJobs * latencyFactor);
+                    freememFactor = Math.min(1, Math.max(0, (0, os_1.freemem)() - (0, os_1.totalmem)() / 2) / (0, os_1.totalmem)());
+                    targetJobs = Math.round(allowedJobs * latencyFactor * freememFactor);
                     jobsLeft = targetJobs;
-                    debug({ jobCount: jobExecutor.activeJobCount(), maxReturnCount: maxReturnCount, allowedJobs: allowedJobs, maxLatency: maxLatency, latency: latency, latencyFactor: latencyFactor, targetJobs: targetJobs, activeQrls: activeQrls });
+                    debug({ jobCount: jobExecutor.activeJobCount(), maxReturnCount: maxReturnCount, allowedJobs: allowedJobs, maxLatency: maxLatency, latency: latency, latencyFactor: latencyFactor, freememFactor: freememFactor, targetJobs: targetJobs, activeQrls: activeQrls });
                     for (_i = 0, _a = queueManager.getPairs(); _i < _a.length; _i++) {
                         _b = _a[_i], qname = _b.qname, qrl = _b.qrl;
                         debug({ evaluating: { qname: qname, qrl: qrl, jobsLeft: jobsLeft, activeQrlsHasQrl: activeQrls.has(qrl) } });

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 });