qdone 2.0.42-alpha → 2.0.44-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/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(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdone",
-  "version": "2.0.42-alpha",
+  "version": "2.0.44-alpha",
   "description": "A distributed scheduler for SQS",
   "type": "module",
   "main": "./index.js",

package/src/consumer.js

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

package/src/defaults.js

@@ -53,7 +53,7 @@ export const defaults = Object.freeze({
   create: false
 })
 
-function validateInteger (opt, name) {
+export function validateInteger (opt, name) {
   const parsed = parseInt(opt[name], 10)
   if (isNaN(parsed)) throw new Error(`${name} needs to be an integer.`)
   return parsed
@@ -117,7 +117,7 @@ export function getOptionsWithDefaults (options) {
     delay: options.delay || defaults.delay,
     sendRetries: options['send-retries'] || defaults.sendRetries,
     failDelay: options.failDelay || options['fail-delay'] || defaults.failDelay,
-    dlq: dlq === false ? false : (dlq || defaults.dlq),
+    dlq: dlq === false ? false : defaults.dlq,
     dlqSuffix: options.dlqSuffix || options['dlq-suffix'] || defaults.dlqSuffix,
     dlqAfter: options.dlqAfter || options['dlq-after'] || defaults.dlqAfter,
     tags: options.tags || undefined,
@@ -159,7 +159,7 @@ export 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)) throw new Error('--external-dedup of redis requires a --dedup-period > 1 second')
+  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')
 
   return opt

package/src/scheduler/jobExecutor.js

@@ -168,6 +168,8 @@ export 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) {
@@ -210,6 +212,8 @@ export 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) {
@@ -250,7 +254,7 @@ export 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(),