squiss-ts 5.2.1 → 5.2.3

package/dist/Squiss.d.ts

@@ -37,6 +37,7 @@ export declare class Squiss extends Squiss_base {
     start(): Promise<void>;
     stop(soft?: boolean, timeout?: number): Promise<boolean>;
     getS3(): S3;
+    private _drainDeleteQueue;
     private _initS3;
     private _initOpts;
     private _deleteMessages;

package/dist/Squiss.js

@@ -79,9 +79,9 @@ class Squiss extends events_1.EventEmitter {
             return res.QueueUrl;
         });
     }
-    deleteMessage(msg) {
+    async deleteMessage(msg) {
         if (!msg.raw) {
-            return Promise.reject(new Error('Squiss.deleteMessage requires a Message object'));
+            throw new Error('Squiss.deleteMessage requires a Message object');
         }
         const promise = new Promise((resolve, reject) => {
             this._delQueue.set(msg.raw.MessageId, { msg, Id: msg.raw.MessageId, ReceiptHandle: msg.raw.ReceiptHandle, resolve, reject });
@@ -94,12 +94,12 @@ class Squiss extends events_1.EventEmitter {
                 clearTimeout(this._delTimer);
                 this._delTimer = undefined;
             }
-            this._deleteXMessages(this._opts.deleteBatchSize);
+            await this._deleteXMessages(this._opts.deleteBatchSize);
         }
         else if (!this._delTimer) {
-            this._delTimer = setTimeout(() => {
+            this._delTimer = setTimeout(async () => {
                 this._delTimer = undefined;
-                this._deleteXMessages();
+                await this._deleteXMessages();
             }, this._opts.deleteWaitMs);
         }
         return promise;
@@ -145,7 +145,7 @@ class Squiss extends events_1.EventEmitter {
                 }
                 /* istanbul ignore if */
                 if (!newUrl) {
-                    throw new Error(`Failed to get configured SQQ endpoint`);
+                    throw new Error('Failed to get configured SQQ endpoint');
                 }
                 const parsedQueueUrl = new url_1.URL(this._queueUrl);
                 newUrl.pathname = parsedQueueUrl.pathname;
@@ -268,17 +268,18 @@ class Squiss extends events_1.EventEmitter {
         this._running = true;
         return this._startPoller();
     }
-    stop(soft, timeout) {
+    async stop(soft, timeout) {
         if (!soft && this._activeReq) {
             this._activeReq.abort();
         }
         this._running = this._paused = false;
         if (!this._inFlight) {
-            return Promise.resolve(true);
+            await this._drainDeleteQueue();
+            return true;
         }
         let resolved = false;
         let timer;
-        return new Promise((resolve) => {
+        const result = await new Promise(async (resolve) => {
             this.on('drained', () => {
                 if (!resolved) {
                     resolved = true;
@@ -294,6 +295,8 @@ class Squiss extends events_1.EventEmitter {
                 resolve(false);
             }, timeout) : undefined;
         });
+        await this._drainDeleteQueue();
+        return result;
     }
     getS3() {
         if (!this._s3) {
@@ -301,6 +304,13 @@ class Squiss extends events_1.EventEmitter {
         }
         return this._s3;
     }
+    async _drainDeleteQueue() {
+        if (this._delTimer) {
+            clearTimeout(this._delTimer);
+            this._delTimer = undefined;
+        }
+        await this._deleteXMessages();
+    }
     _initS3() {
         if (this._opts.S3) {
             if (typeof this._opts.S3 === 'function') {
@@ -446,7 +456,7 @@ class Squiss extends events_1.EventEmitter {
             this._getBatch(queueUrl);
         });
     }
-    _deleteXMessages(x) {
+    async _deleteXMessages(x) {
         const delQueue = this._delQueue;
         const iterator = delQueue.entries();
         const delBatch = Array.from({ length: x || delQueue.size }, function () {
@@ -454,7 +464,7 @@ class Squiss extends events_1.EventEmitter {
             delQueue.delete(element[0]);
             return element[1];
         }, iterator);
-        this._deleteMessages(delBatch);
+        await this._deleteMessages(delBatch);
     }
     _isLargeMessage(message, minSize) {
         const messageSize = (0, messageSizeUtils_1.getMessageSize)(message);
@@ -480,7 +490,7 @@ class Squiss extends events_1.EventEmitter {
             getMessagePromise = (0, gzipUtils_1.compressMessage)(messageStr);
             params.MessageAttributes = params.MessageAttributes || {};
             params.MessageAttributes[gzipUtils_1.GZIP_MARKER] = {
-                StringValue: `1`,
+                StringValue: '1',
                 DataType: 'Number',
             };
         }

package/dist/TimeoutExtender.js

@@ -97,7 +97,9 @@ class TimeoutExtender {
         })
             .catch((err) => {
             if (err.name === 'ReceiptHandleIsInvalid' || err.name === 'MessageNotInflight' ||
-                err.message.match(/Message does not exist or is not available/)) {
+                err.message.match(/message does not exist or is not available/i) ||
+                err.message.match(/the receipt handle has expired/i) ||
+                err.message.match(/not a valid receipt handle/i)) {
                 this._deleteNode(node);
                 node.message.emit('autoExtendFail', err);
                 this._squiss.emit('autoExtendFail', { message: node.message, error: err });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squiss-ts",
-  "version": "5.2.1",
+  "version": "5.2.3",
   "description": "High-volume SQS poller",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "compile": "tsc",
     "test": "yarn lint && yarn mocha",
     "cover": "yarn clean && yarn nyc yarn mocha",
-    "lint": "tslint -c tslint.json \"src/**/*.ts\" \"test/**/*.ts\"",
+    "lint": "eslint -c .eslintrc.js --ext .ts \"src/**/*.ts\"",
     "benchmark": "tsc --extendedDiagnostics --incremental false",
     "e2e:start": "docker compose -f e2e/docker-compose.yml up &",
     "e2e:stop": "docker compose -f e2e/docker-compose.yml down &"
@@ -48,34 +48,40 @@
   },
   "homepage": "https://github.com/PruvoNet/squiss-ts#readme",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.359.0",
-    "@aws-sdk/client-sqs": "^3.359.0",
-    "@aws-sdk/types": "^3.357.0",
+    "@aws-sdk/client-s3": "^3.410.0",
+    "@aws-sdk/client-sqs": "^3.410.0",
+    "@aws-sdk/types": "^3.410.0",
     "linked-list": "2.1.0",
     "ts-type-guards": "^0.7.0",
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "1.0.2",
-    "@types/chai": "^4.3.5",
-    "@types/chai-as-promised": "^7.1.5",
+    "@types/chai": "^4.3.6",
+    "@types/chai-as-promised": "^7.1.6",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^14.18.48",
+    "@types/node": "^16.18.39",
     "@types/proxyquire": "^1.3.28",
-    "@types/uuid": "^9.0.1",
-    "chai": "^4.3.7",
+    "@types/uuid": "^9.0.3",
+    "@typescript-eslint/eslint-plugin": "^6.7.0",
+    "@typescript-eslint/parser": "^6.7.0",
+    "chai": "^4.3.8",
     "chai-as-promised": "^7.1.1",
     "delay": "5.0.0",
     "dirty-chai": "^2.0.1",
+    "eslint": "^8.49.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-jsdoc": "^46.6.0",
+    "eslint-plugin-prefer-arrow": "^1.2.3",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^15.1.0",
+    "sinon": "^15.2.0",
     "sinon-chai": "^3.7.0",
     "source-map-support": "^0.5.21",
     "ts-node": "^10.9.1",
-    "tslint": "^6.1.3",
-    "typescript": "^5.1.3"
+    "typescript": "^5.2.2"
   },
   "nyc": {
     "extends": "@istanbuljs/nyc-config-typescript",
@@ -83,7 +89,9 @@
     "all": true,
     "exclude": [
       "src/test/**",
-      "e2e**"
+      "e2e**",
+      "build**",
+      ".eslintrc.js"
     ],
     "reporter": [
       "html",