qdone 2.0.41-alpha → 2.0.43-alpha

package/commonjs/src/consumer.js

@@ -37,7 +37,7 @@ async function getMessages(qrl, opt, maxMessages) {
         MaxNumberOfMessages: maxMessages,
         MessageAttributeNames: ['All'],
         QueueUrl: qrl,
-        VisibilityTimeout: 60,
+        VisibilityTimeout: 120,
         WaitTimeSeconds: opt.waitTime
     };
     const response = await (0, sqs_js_1.getSQSClient)().send(new client_sqs_1.ReceiveMessageCommand(params));

package/commonjs/src/dedup.js

@@ -65,6 +65,10 @@ function addDedupParamsToMessage(message, opt, messageOptions) {
         if (!message.MessageDeduplicationId) {
             message.MessageDeduplicationId = getDeduplicationId(message.MessageBody, opt);
         }
+        else {
+            // Transform the incoming ID so that it fits SPS spec and is suitable for Redis
+            message.MessageDeduplicationId = getDeduplicationId(message.MessageDeduplicationId, opt);
+        }
         // Track our own dedup id so we can look it up upon ReceiveMessage
         if (opt.externalDedup) {
             message.MessageAttributes = {

package/commonjs/src/defaults.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupVerbose = exports.setupAWS = exports.getOptionsWithDefaults = exports.validateMessageOptions = exports.defaults = void 0;
+exports.setupVerbose = exports.setupAWS = exports.getOptionsWithDefaults = exports.validateMessageOptions = exports.validateInteger = exports.defaults = void 0;
 /**
  * Default options for qdone. Accepts a command line options object and
  * returns nicely-named options.
@@ -56,6 +56,7 @@ function validateInteger(opt, name) {
         throw new Error(`${name} needs to be an integer.`);
     return parsed;
 }
+exports.validateInteger = validateInteger;
 function validateMessageOptions(messageOptions) {
     const validKeys = ['deduplicationId', 'groupId'];
     if (typeof messageOptions === 'object' &&
@@ -112,7 +113,7 @@ function getOptionsWithDefaults(options) {
         delay: options.delay || exports.defaults.delay,
         sendRetries: options['send-retries'] || exports.defaults.sendRetries,
         failDelay: options.failDelay || options['fail-delay'] || exports.defaults.failDelay,
-        dlq: dlq === false ? false : (dlq || exports.defaults.dlq),
+        dlq: dlq === false ? false : exports.defaults.dlq,
         dlqSuffix: options.dlqSuffix || options['dlq-suffix'] || exports.defaults.dlqSuffix,
         dlqAfter: options.dlqAfter || options['dlq-after'] || exports.defaults.dlqAfter,
         tags: options.tags || undefined,
@@ -149,7 +150,7 @@ function getOptionsWithDefaults(options) {
     // Validate dedup args
     if (opt.externalDedup && !opt.cacheUri)
         throw new Error('--external-dedup requires the --cache-uri argument');
-    if (opt.externalDedup && (!opt.dedupPeriod || opt.dedupPeriod < 1))
+    if (opt.externalDedup && (opt.dedupPeriod < 1))
         throw new Error('--external-dedup of redis requires a --dedup-period > 1 second');
     if (opt.dedupIdPerMessage && opt.deduplicationId)
         throw new Error('Use either --deduplication-id or --dedup-id-per-message but not both');

package/commonjs/src/scheduler/jobExecutor.js

@@ -164,6 +164,8 @@ class JobExecutor {
                     console.error('FAILED_MESSAGES', result.Failed);
                     for (const failed of result.Failed) {
                         console.error('FAILED_TO_EXTEND_JOB', this.jobsByMessageId[failed.Id]);
+                        // ensure that we clean this one up so it doesn't generate api calls
+                        this.jobsbymessageid[failed.id].status = 'failed';
                     }
                 }
                 if (result.Successful) {
@@ -205,6 +207,8 @@ class JobExecutor {
                     console.error('FAILED_MESSAGES', result.Failed);
                     for (const failed of result.Failed) {
                         console.error('FAILED_TO_DELETE_JOB', this.jobsByMessageId[failed.Id]);
+                        // ensure that we clean this one up so it doesn't generate api calls
+                        this.jobsbymessageid[failed.id].status = 'failed';
                     }
                 }
                 if (result.Successful) {
@@ -239,7 +243,7 @@ class JobExecutor {
     }
     addJob(message, callback, qname, qrl) {
         // Create job entry and track it
-        const defaultVisibilityTimeout = 60;
+        const defaultVisibilityTimeout = 120;
         const job = {
             status: 'waiting',
             start: new Date(),