qdone 2.0.38-alpha → 2.0.40-alpha

package/commonjs/src/dedup.js

@@ -25,9 +25,7 @@ function getDeduplicationId(dedupContent, opt) {
     dedupContent = dedupContent.trim().replace(/[^a-zA-Z0-9!"#$%&'()*+,-./:;<=>?@[\\\]^_`{|}~]/g, '_');
     const max = 128;
     const sep = '...sha1:';
-    if (dedupContent.length > max) {
-        dedupContent = dedupContent.slice(0, max - sep.length - 40) + '...sha1:' + (0, crypto_1.createHash)('sha1').update(dedupContent).digest('hex');
-    }
+    dedupContent = dedupContent.slice(0, max - sep.length - 42) + '...sha1:{' + (0, crypto_1.createHash)('sha1').update(dedupContent).digest('hex') + '}';
     return dedupContent;
 }
 exports.getDeduplicationId = getDeduplicationId;

package/commonjs/src/enqueue.js

@@ -278,7 +278,7 @@ async function sendMessageBatch(qrl, messages, opt) {
         const results = await Promise.all(promises);
         params.Entries = results.filter(({ shouldEnqueue }) => shouldEnqueue).map(({ m }) => m);
         if (!params.Entries.length)
-            return;
+            return { Failed: [], Successful: [] };
     }
     // Send them
     const client = (0, sqs_js_1.getSQSClient)();

package/commonjs/src/idleQueues.js

@@ -53,7 +53,7 @@ async function _cheapIdleCheck(qname, qrl, opt) {
     catch (e) {
         if (e instanceof client_sqs_1.QueueDoesNotExist) {
             // Count deleted queues as idle
-            return { idle: true, SQS: 1 };
+            return { result: { idle: true }, SQS: 1 };
         }
         else {
             throw e;

package/commonjs/src/scheduler/jobExecutor.js

@@ -217,7 +217,7 @@ class JobExecutor {
                         console.log(JSON.stringify({ event: 'DELETE_MESSAGES', timestamp: start, count, qrl }));
                     }
                     // Mark batch as processed for dedup
-                    await Promise.all(result.Successful.map(e => (0, dedup_js_1.dedupSuccessfullyProcessed)(this.jobsByMessageId[e.Id], this.opt)));
+                    await Promise.all(result.Successful.map(e => (0, dedup_js_1.dedupSuccessfullyProcessed)(this.jobsByMessageId[e.Id].message, this.opt)));
                 }
                 debug('DeleteMessageBatch returned', result);
                 // TODO Sentry

package/package.json

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

package/src/dedup.js

@@ -20,9 +20,7 @@ export function getDeduplicationId (dedupContent, opt) {
   dedupContent = dedupContent.trim().replace(/[^a-zA-Z0-9!"#$%&'()*+,-./:;<=>?@[\\\]^_`{|}~]/g, '_')
   const max = 128
   const sep = '...sha1:'
-  if (dedupContent.length > max) {
-    dedupContent = dedupContent.slice(0, max - sep.length - 40) + '...sha1:' + createHash('sha1').update(dedupContent).digest('hex')
-  }
+  dedupContent = dedupContent.slice(0, max - sep.length - 42) + '...sha1:{' + createHash('sha1').update(dedupContent).digest('hex') + '}'
   return dedupContent
 }
 

package/src/enqueue.js

@@ -276,7 +276,7 @@ export async function sendMessageBatch (qrl, messages, opt) {
     const promises = params.Entries.map(async m => ({ m, shouldEnqueue: await dedupShouldEnqueue(m, opt) }))
     const results = await Promise.all(promises)
     params.Entries = results.filter(({ shouldEnqueue }) => shouldEnqueue).map(({ m }) => m)
-    if (!params.Entries.length) return
+    if (!params.Entries.length) return { Failed: [], Successful: [] }
   }
 
   // Send them

package/src/idleQueues.js

@@ -50,7 +50,7 @@ export async function _cheapIdleCheck (qname, qrl, opt) {
   } catch (e) {
     if (e instanceof QueueDoesNotExist) {
       // Count deleted queues as idle
-      return { idle: true, SQS: 1 }
+      return { result: { idle: true }, SQS: 1 }
     } else {
       throw e
     }

package/src/scheduler/jobExecutor.js

@@ -224,7 +224,7 @@ export class JobExecutor {
           // Mark batch as processed for dedup
           await Promise.all(
             result.Successful.map(
-              e => dedupSuccessfullyProcessed(this.jobsByMessageId[e.Id], this.opt)
+              e => dedupSuccessfullyProcessed(this.jobsByMessageId[e.Id].message, this.opt)
             )
           )
         }