squiss-ts 5.2.0 → 5.2.2

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;
@@ -194,7 +194,10 @@ class Squiss extends events_1.EventEmitter {
         this._inFlight--;
         if (this._paused && this._slotsAvailable()) {
             this._paused = false;
-            this._startPoller();
+            this._startPoller()
+                .catch((e) => {
+                this.emit('error', e);
+            });
         }
         msg.emit('handled');
         this.emit('handled', msg);
@@ -265,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;
@@ -291,6 +295,8 @@ class Squiss extends events_1.EventEmitter {
                 resolve(false);
             }, timeout) : undefined;
         });
+        await this._drainDeleteQueue();
+        return result;
     }
     getS3() {
         if (!this._s3) {
@@ -298,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') {
@@ -439,12 +452,11 @@ class Squiss extends events_1.EventEmitter {
     _startPoller() {
         return this._initTimeoutExtender()
             .then(() => this.getQueueUrl())
-            .then((queueUrl) => this._getBatch(queueUrl))
-            .catch((e) => {
-            this.emit('error', e);
+            .then((queueUrl) => {
+            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 () {
@@ -452,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squiss-ts",
-  "version": "5.2.0",
+  "version": "5.2.2",
   "description": "High-volume SQS poller",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -48,9 +48,9 @@
   },
   "homepage": "https://github.com/PruvoNet/squiss-ts#readme",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.342.0",
-    "@aws-sdk/client-sqs": "^3.342.0",
-    "@aws-sdk/types": "^3.342.0",
+    "@aws-sdk/client-s3": "^3.385.0",
+    "@aws-sdk/client-sqs": "^3.385.0",
+    "@aws-sdk/types": "^3.378.0",
     "linked-list": "2.1.0",
     "ts-type-guards": "^0.7.0",
     "uuid": "^9.0.0"
@@ -60,9 +60,9 @@
     "@types/chai": "^4.3.5",
     "@types/chai-as-promised": "^7.1.5",
     "@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",
+    "@types/uuid": "^9.0.2",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "delay": "5.0.0",
@@ -70,12 +70,12 @@
     "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.0.4"
+    "typescript": "^5.1.6"
   },
   "nyc": {
     "extends": "@istanbuljs/nyc-config-typescript",
@@ -83,7 +83,8 @@
     "all": true,
     "exclude": [
       "src/test/**",
-      "e2e**"
+      "e2e**",
+      "build**"
     ],
     "reporter": [
       "html",