squiss-ts 4.4.1 → 5.1.0

package/README.md

@@ -4,15 +4,13 @@
 [![Test Coverage](https://api.codeclimate.com/v1/badges/177b18abdb55fdf90cf8/test_coverage)](https://codeclimate.com/github/PruvoNet/squiss-ts/test_coverage)
 [![Maintainability](https://api.codeclimate.com/v1/badges/177b18abdb55fdf90cf8/maintainability)](https://codeclimate.com/github/PruvoNet/squiss-ts/maintainability)
 [![Known Vulnerabilities](https://snyk.io/test/github/PruvoNet/squiss-ts/badge.svg?targetFile=package.json)](https://snyk.io/test/github/PruvoNet/squiss-ts?targetFile=package.json)
-[![dependencies Status](https://david-dm.org/PruvoNet/squiss-ts/status.svg)](https://david-dm.org/PruvoNet/squiss-ts)
-[![devDependencies Status](https://david-dm.org/PruvoNet/squiss-ts/dev-status.svg)](https://david-dm.org/PruvoNet/squiss-ts?type=dev)
 
 <p align="center">
   <a href="https://squiss-ts.pruvo.com"><img src="https://github.com/PruvoNet/squiss-ts/blob/docs/source/images/logo.png?raw=true" /></a>
 </p>
 
 # Squiss-TS 
-High-volume Amazon SQS Poller and single-queue client for Node.js 6 and up with full typescript support  
+High-volume Amazon SQS Poller and single-queue client for Node.js 16 and up with full typescript support  
 The library is production ready and is being stress used in a full blown production environment
 
 ## Main features
@@ -33,8 +31,10 @@ Please see full documentation <a href="https://squiss-ts.pruvo.com">here</a>
 import {Squiss, Message} from 'squiss-ts';
 
 const awsConfig = {
-  accessKeyId: '<accessKeyId>',
-  secretAccessKey: '<secretAccessKey>',
+  credentials: {
+    accessKeyId: 'accessKeyId',
+    secretAccessKey: 'secretAccessKey',
+  },
   region: '<region>',
 };
 
@@ -58,7 +58,7 @@ const messageToSend = {
         a: 1,
         b: 2,
     },
-}
+};
 
 const propsToSend = {
     p1: 1,

package/dist/EventEmitterTypesHelper.d.ts

@@ -4,9 +4,9 @@ interface TypeRecord<T, U, V> {
     ' _eventsType'?: U;
     ' _emitType'?: V;
 }
-declare type InnerEEMethodReturnType<T, TValue, FValue> = T extends (...args: any[]) => any ? ReturnType<T> extends void | undefined ? FValue : TValue : FValue;
-declare type EEMethodReturnType<T, S extends string, TValue, FValue = void> = S extends keyof T ? InnerEEMethodReturnType<T[S], TValue, FValue> : FValue;
-declare type ListenerType<T> = [T] extends [(...args: infer U) => any] ? U : [T] extends [void] ? [] : [T];
+type InnerEEMethodReturnType<T, TValue, FValue> = T extends (...args: any[]) => any ? ReturnType<T> extends void | undefined ? FValue : TValue : FValue;
+type EEMethodReturnType<T, S extends string, TValue, FValue = void> = S extends keyof T ? InnerEEMethodReturnType<T[S], TValue, FValue> : FValue;
+type ListenerType<T> = [T] extends [(...args: infer U) => any] ? U : [T] extends [void] ? [] : [T];
 interface OverriddenMethods<TEmitter, TEventRecord, TEmitRecord = TEventRecord> {
     on<P extends keyof TEventRecord, T>(this: T, event: P, listener: (...args: ListenerType<TEventRecord[P]>) => void): EEMethodReturnType<TEmitter, 'on', T>;
     on(event: typeof assignmentCompatibilityHack, listener: (...args: any[]) => any): void;
@@ -23,6 +23,6 @@ interface OverriddenMethods<TEmitter, TEventRecord, TEmitRecord = TEventRecord>
     emit<P extends keyof TEmitRecord, T>(this: T, event: P, ...args: ListenerType<TEmitRecord[P]>): EEMethodReturnType<TEmitter, 'emit', T>;
     emit(event: typeof assignmentCompatibilityHack, ...args: any[]): void;
 }
-declare type OverriddenKeys = keyof OverriddenMethods<any, any, any>;
-export declare type StrictEventEmitter<TEmitterType, TEventRecord, TEmitRecord = TEventRecord, UnneededMethods extends Exclude<OverriddenKeys, keyof TEmitterType> = Exclude<OverriddenKeys, keyof TEmitterType>, NeededMethods extends Exclude<OverriddenKeys, UnneededMethods> = Exclude<OverriddenKeys, UnneededMethods>> = TypeRecord<TEmitterType, TEventRecord, TEmitRecord> & Pick<TEmitterType, Exclude<keyof TEmitterType, OverriddenKeys>> & Pick<OverriddenMethods<TEmitterType, TEventRecord, TEmitRecord>, NeededMethods>;
+type OverriddenKeys = keyof OverriddenMethods<any, any, any>;
+export type StrictEventEmitter<TEmitterType, TEventRecord, TEmitRecord = TEventRecord, UnneededMethods extends Exclude<OverriddenKeys, keyof TEmitterType> = Exclude<OverriddenKeys, keyof TEmitterType>, NeededMethods extends Exclude<OverriddenKeys, UnneededMethods> = Exclude<OverriddenKeys, UnneededMethods>> = TypeRecord<TEmitterType, TEventRecord, TEmitRecord> & Pick<TEmitterType, Exclude<keyof TEmitterType, OverriddenKeys>> & Pick<OverriddenMethods<TEmitterType, TEventRecord, TEmitRecord>, NeededMethods>;
 export {};

package/dist/EventEmitterTypesHelper.js

@@ -1,3 +1,4 @@
-'use strict';
+"use strict";
+// https://github.com/bterlson/strict-event-emitter-types
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=EventEmitterTypesHelper.js.map

package/dist/Message.d.ts

@@ -1,15 +1,13 @@
 /// <reference types="node" />
-import * as SQS from 'aws-sdk/clients/sqs';
-import * as S3 from 'aws-sdk/clients/s3';
-import { AWSError } from 'aws-sdk/lib/error';
+import { BatchResultErrorEntry, Message as SQSMessage, SQSServiceException } from '@aws-sdk/client-sqs';
+import { S3 } from '@aws-sdk/client-s3';
 import { BodyFormat, Squiss } from '.';
 import { IMessageAttributes } from './attributeUtils';
 import { EventEmitter } from 'events';
 import { IS3Upload } from './s3Utils';
-import { BatchResultErrorEntry } from 'aws-sdk/clients/sqs';
 import { StrictEventEmitter } from './EventEmitterTypesHelper';
 export interface IMessageOpts {
-    msg: SQS.Message;
+    msg: SQSMessage;
     unwrapSns?: boolean;
     bodyFormat?: BodyFormat;
     squiss: Squiss;
@@ -26,16 +24,16 @@ interface IMessageEvents {
     keep: void;
     delError: BatchResultErrorEntry;
     deleted: string;
-    autoExtendFail: AWSError;
-    autoExtendError: AWSError;
+    autoExtendFail: SQSServiceException;
+    autoExtendError: SQSServiceException;
     s3Download: IS3Upload;
     s3Delete: IS3Upload;
 }
-declare type MessageEmitter = StrictEventEmitter<EventEmitter, IMessageEvents>;
+type MessageEmitter = StrictEventEmitter<EventEmitter, IMessageEvents>;
 declare const Message_base: new () => MessageEmitter;
 export declare class Message extends Message_base {
     private static formatMessage;
-    raw: SQS.Message;
+    raw: SQSMessage;
     body?: string | any;
     subject?: string;
     topicArn?: string;

package/dist/Message.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Message = void 0;
 const attributeUtils_1 = require("./attributeUtils");
@@ -7,6 +7,14 @@ const gzipUtils_1 = require("./gzipUtils");
 const s3Utils_1 = require("./s3Utils");
 const EMPTY_BODY = '{}';
 class Message extends events_1.EventEmitter {
+    static formatMessage(msg, format) {
+        if (format === 'json') {
+            return JSON.parse(msg || EMPTY_BODY);
+        }
+        else {
+            return msg;
+        }
+    }
     constructor(opts) {
         super();
         this._opts = opts;
@@ -28,14 +36,6 @@ class Message extends events_1.EventEmitter {
         this._s3Retriever = opts.s3Retriever;
         this._s3Retain = opts.s3Retain;
     }
-    static formatMessage(msg, format) {
-        if (format === 'json') {
-            return JSON.parse(msg || EMPTY_BODY);
-        }
-        else {
-            return msg;
-        }
-    }
     parse() {
         if (this.body === undefined || this.body === null) {
             return Promise.resolve();
@@ -95,7 +95,7 @@ class Message extends events_1.EventEmitter {
         if (!this._handled) {
             this._handled = true;
             return this._squiss.releaseMessage(this)
-                .catch((e) => {
+                .catch(() => {
                 this._handled = false;
             });
         }

package/dist/Squiss.d.ts

@@ -1,8 +1,8 @@
 import { Message } from './Message';
 import { TimeoutExtender } from './TimeoutExtender';
 import { IMessageAttributes } from './attributeUtils';
-import * as SQS from 'aws-sdk/clients/sqs';
-import * as S3 from 'aws-sdk/clients/s3';
+import { SendMessageBatchResult, SQS, SendMessageCommandOutput } from '@aws-sdk/client-sqs';
+import { S3 } from '@aws-sdk/client-s3';
 import { IMessageToSend, SquissEmitter, ISquissOptions } from './Types';
 declare const Squiss_base: new () => SquissEmitter;
 export declare class Squiss extends Squiss_base {
@@ -32,8 +32,8 @@ export declare class Squiss extends Squiss_base {
     handledMessage(msg: Message): void;
     releaseMessage(msg: Message): Promise<void>;
     purgeQueue(): Promise<void>;
-    sendMessage(message: IMessageToSend, delay?: number, attributes?: IMessageAttributes): Promise<SQS.Types.SendMessageResult>;
-    sendMessages(messages: IMessageToSend[] | IMessageToSend, delay?: number, attributes?: IMessageAttributes | IMessageAttributes[]): Promise<SQS.Types.SendMessageBatchResult>;
+    sendMessage(message: IMessageToSend, delay?: number, attributes?: IMessageAttributes): Promise<SendMessageCommandOutput>;
+    sendMessages(messages: IMessageToSend[] | IMessageToSend, delay?: number, attributes?: IMessageAttributes | IMessageAttributes[]): Promise<SendMessageBatchResult>;
     start(): Promise<void>;
     stop(soft?: boolean, timeout?: number): Promise<boolean>;
     getS3(): S3;

package/dist/Squiss.js

@@ -1,21 +1,27 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Squiss = void 0;
-const url = require("url");
 const events_1 = require("events");
 const Message_1 = require("./Message");
 const TimeoutExtender_1 = require("./TimeoutExtender");
 const attributeUtils_1 = require("./attributeUtils");
 const ts_type_guards_1 = require("ts-type-guards");
-const SQS = require("aws-sdk/clients/sqs");
-const S3 = require("aws-sdk/clients/s3");
+const client_sqs_1 = require("@aws-sdk/client-sqs");
+const client_s3_1 = require("@aws-sdk/client-s3");
 const gzipUtils_1 = require("./gzipUtils");
 const s3Utils_1 = require("./s3Utils");
 const messageSizeUtils_1 = require("./messageSizeUtils");
 const Types_1 = require("./Types");
 const Utils_1 = require("./Utils");
+const url_1 = require("url");
 const AWS_MAX_SEND_BATCH = 10;
 class Squiss extends events_1.EventEmitter {
+    get inFlight() {
+        return this._inFlight;
+    }
+    get running() {
+        return this._running;
+    }
     constructor(opts) {
         super();
         this._running = false;
@@ -29,12 +35,6 @@ class Squiss extends events_1.EventEmitter {
         this._queueUrl = this._opts.queueUrl || '';
         this.sqs = this._initSqs();
     }
-    get inFlight() {
-        return this._inFlight;
-    }
-    get running() {
-        return this._running;
-    }
     changeMessageVisibility(msg, timeoutInSeconds) {
         let receiptHandle;
         if (msg instanceof Message_1.Message) {
@@ -49,7 +49,7 @@ class Squiss extends events_1.EventEmitter {
                 QueueUrl: queueUrl,
                 ReceiptHandle: receiptHandle,
                 VisibilityTimeout: timeoutInSeconds,
-            }).promise();
+            });
         })
             .then(() => {
             return Promise.resolve();
@@ -74,7 +74,7 @@ class Squiss extends events_1.EventEmitter {
         if (this._opts.queuePolicy) {
             params.Attributes.Policy = this._opts.queuePolicy;
         }
-        return this.sqs.createQueue(params).promise().then((res) => {
+        return this.sqs.createQueue(params).then((res) => {
             this._queueUrl = res.QueueUrl;
             return res.QueueUrl;
         });
@@ -107,7 +107,7 @@ class Squiss extends events_1.EventEmitter {
     deleteQueue() {
         return this.getQueueUrl()
             .then((queueUrl) => {
-            return this.sqs.deleteQueue({ QueueUrl: queueUrl }).promise();
+            return this.sqs.deleteQueue({ QueueUrl: queueUrl });
         })
             .then(() => {
             return Promise.resolve();
@@ -121,13 +121,35 @@ class Squiss extends events_1.EventEmitter {
         if (this._opts.accountNumber) {
             params.QueueOwnerAWSAccountId = this._opts.accountNumber.toString();
         }
-        return this.sqs.getQueueUrl(params).promise().then((data) => {
+        return this.sqs.getQueueUrl(params).then(async (data) => {
             this._queueUrl = data.QueueUrl;
             if (this._opts.correctQueueUrl) {
-                const newUrl = url.parse(this.sqs.config.endpoint);
-                const parsedQueueUrl = url.parse(this._queueUrl);
+                let newUrl;
+                const endpoint = this.sqs.config.endpoint;
+                /* istanbul ignore else  */
+                if (typeof endpoint === 'string') {
+                    newUrl = new url_1.URL(endpoint);
+                }
+                else if (typeof endpoint === 'function') {
+                    const retrievedEndpoint = await endpoint();
+                    if (retrievedEndpoint && typeof retrievedEndpoint === 'object') {
+                        if ('url' in retrievedEndpoint) {
+                            newUrl = new url_1.URL(retrievedEndpoint.url.toString());
+                        }
+                        if ('hostname' in retrievedEndpoint) {
+                            const { protocol, hostname, port, path } = retrievedEndpoint;
+                            // query params are ignored in setting endpoint.
+                            newUrl = new url_1.URL(`${protocol}//${hostname}${port ? ':' + port : ''}${path}`);
+                        }
+                    }
+                }
+                /* istanbul ignore if */
+                if (!newUrl) {
+                    throw new Error(`Failed to get configured SQQ endpoint`);
+                }
+                const parsedQueueUrl = new url_1.URL(this._queueUrl);
                 newUrl.pathname = parsedQueueUrl.pathname;
-                this._queueUrl = url.format(newUrl);
+                this._queueUrl = newUrl.toString();
             }
             return this._queueUrl;
         });
@@ -140,7 +162,7 @@ class Squiss extends events_1.EventEmitter {
             return this.sqs.getQueueAttributes({
                 AttributeNames: ['VisibilityTimeout'],
                 QueueUrl: queueUrl,
-            }).promise();
+            });
         }).then((res) => {
             if (!res.Attributes || !res.Attributes.VisibilityTimeout) {
                 throw new Error('SQS.GetQueueAttributes call did not return expected shape. Response: ' +
@@ -158,7 +180,7 @@ class Squiss extends events_1.EventEmitter {
             return this.sqs.getQueueAttributes({
                 AttributeNames: ['MaximumMessageSize'],
                 QueueUrl: queueUrl,
-            }).promise();
+            });
         }).then((res) => {
             if (!res.Attributes || !res.Attributes.MaximumMessageSize) {
                 throw new Error('SQS.GetQueueAttributes call did not return expected shape. Response: ' +
@@ -192,7 +214,7 @@ class Squiss extends events_1.EventEmitter {
     purgeQueue() {
         return this.getQueueUrl()
             .then((queueUrl) => {
-            return this.sqs.purgeQueue({ QueueUrl: queueUrl }).promise();
+            return this.sqs.purgeQueue({ QueueUrl: queueUrl });
         })
             .then(() => {
             this._inFlight = 0;
@@ -209,8 +231,11 @@ class Squiss extends events_1.EventEmitter {
             .then((data) => {
             const rawParams = data[0];
             const queueUrl = data[1];
-            const params = Object.assign({ QueueUrl: queueUrl }, rawParams);
-            return this.sqs.sendMessage(params).promise();
+            const params = {
+                QueueUrl: queueUrl,
+                ...rawParams,
+            };
+            return this.sqs.sendMessage(params);
         });
     }
     sendMessages(messages, delay, attributes) {
@@ -224,12 +249,13 @@ class Squiss extends events_1.EventEmitter {
             }));
         })
             .then((results) => {
-            const merged = { Successful: [], Failed: [] };
+            const successful = [];
+            const failed = [];
             results.forEach((res) => {
-                res.Successful.forEach((elem) => merged.Successful.push(elem));
-                res.Failed.forEach((elem) => merged.Failed.push(elem));
+                res.Successful?.forEach((elem) => successful.push(elem));
+                res.Failed?.forEach((elem) => failed.push(elem));
             });
-            return merged;
+            return { Successful: successful, Failed: failed };
         });
     }
     start() {
@@ -275,14 +301,15 @@ class Squiss extends events_1.EventEmitter {
     _initS3() {
         if (this._opts.S3) {
             if (typeof this._opts.S3 === 'function') {
-                return new this._opts.S3(this._opts.awsConfig);
+                return new this._opts.S3(this._opts.awsConfig || {});
             }
             else {
                 return this._opts.S3;
             }
         }
         else {
-            return new S3(this._opts.awsConfig);
+            /* istanbul ignore next */
+            return new client_s3_1.S3(this._opts.awsConfig || {});
         }
     }
     _initOpts() {
@@ -306,7 +333,7 @@ class Squiss extends events_1.EventEmitter {
                         ReceiptHandle: item.ReceiptHandle,
                     };
                 }),
-            }).promise();
+            });
         }).then(this._handleBatchDeleteResults(batch))
             .catch((err) => {
             this.emit('error', err);
@@ -349,10 +376,13 @@ class Squiss extends events_1.EventEmitter {
             AttributeNames: this._opts.receiveSqsAttributes,
             VisibilityTimeout: this._opts.visibilityTimeoutSecs,
         });
-        this._activeReq = this.sqs.receiveMessage(params);
-        this._activeReq.promise().then(this._handleGetBatchResult(queueUrl)).catch((err) => {
+        const controller = new AbortController();
+        this._activeReq = controller;
+        this.sqs.receiveMessage(params, {
+            abortSignal: controller.signal,
+        }).then(this._handleGetBatchResult(queueUrl)).catch((err) => {
             this._activeReq = undefined;
-            if (err.code && err.code === 'RequestAbortedError') {
+            if (err.name === 'AbortError') {
                 this.emit('aborted', err);
             }
             else {
@@ -384,18 +414,22 @@ class Squiss extends events_1.EventEmitter {
     _sendMessageBatch(messages, delay, startIndex) {
         const start = startIndex || 0;
         return this.getQueueUrl().then((queueUrl) => {
+            const entries = [];
             const params = {
                 QueueUrl: queueUrl,
-                Entries: [],
+                Entries: entries,
             };
             const promises = [];
             messages.forEach((msg, idx) => {
-                const entry = Object.assign({ Id: (start + idx).toString() }, msg);
-                params.Entries.push(entry);
+                const entry = {
+                    Id: (start + idx).toString(),
+                    ...msg,
+                };
+                entries.push(entry);
             });
             return Promise.all(promises)
                 .then(() => {
-                return this.sqs.sendMessageBatch(params).promise();
+                return this.sqs.sendMessageBatch(params);
             });
         });
     }
@@ -491,14 +525,14 @@ class Squiss extends events_1.EventEmitter {
     _initSqs() {
         if (this._opts.SQS) {
             if (typeof this._opts.SQS === 'function') {
-                return new this._opts.SQS(this._opts.awsConfig);
+                return new this._opts.SQS(this._opts.awsConfig || {});
             }
             else {
                 return this._opts.SQS;
             }
         }
         else {
-            return new SQS(this._opts.awsConfig);
+            return new client_sqs_1.SQS(this._opts.awsConfig || {});
         }
     }
     _handleBatchDeleteResults(batch) {
@@ -507,19 +541,24 @@ class Squiss extends events_1.EventEmitter {
             return prevByValue;
         }, {});
         return (data) => {
-            if (data.Failed && data.Failed.length) {
+            if (data.Failed?.length) {
                 data.Failed.forEach((fail) => {
-                    this.emit('delError', { error: fail, message: itemById[fail.Id].msg });
-                    itemById[fail.Id].msg.emit('delError', fail);
-                    itemById[fail.Id].reject(fail);
+                    /* istanbul ignore next */
+                    const item = itemById[fail.Id ?? ''];
+                    this.emit('delError', { error: fail, message: item.msg });
+                    item.msg.emit('delError', fail);
+                    item.reject(fail);
                 });
             }
-            if (data.Successful && data.Successful.length) {
+            if (data.Successful?.length) {
                 data.Successful.forEach((success) => {
-                    const msg = itemById[success.Id].msg;
-                    this.emit('deleted', { msg, successId: success.Id });
-                    msg.emit('deleted', success.Id);
-                    itemById[success.Id].resolve();
+                    /* istanbul ignore next */
+                    const id = success.Id ?? '';
+                    const item = itemById[id];
+                    const msg = item.msg;
+                    this.emit('deleted', { msg, successId: id });
+                    msg.emit('deleted', id);
+                    item.resolve();
                 });
             }
         };

package/dist/TimeoutExtender.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimeoutExtender = void 0;
 const LinkedList = require("linked-list");
@@ -96,7 +96,8 @@ class TimeoutExtender {
             this._squiss.emit('timeoutExtended', node.message);
         })
             .catch((err) => {
-            if (err.message.match(/Message does not exist or is not available/)) {
+            if (err.name === 'ReceiptHandleIsInvalid' || err.name === 'MessageNotInflight' ||
+                err.message.match(/Message does not exist or is not available/)) {
                 this._deleteNode(node);
                 node.message.emit('autoExtendFail', err);
                 this._squiss.emit('autoExtendFail', { message: node.message, error: err });

package/dist/Types.d.ts

@@ -1,9 +1,7 @@
 /// <reference types="node" />
 import { Message } from './Message';
-import * as SQS from 'aws-sdk/clients/sqs';
-import * as S3 from 'aws-sdk/clients/s3';
-import { AWSError } from 'aws-sdk/lib/error';
-import { BatchResultErrorEntry } from 'aws-sdk/clients/sqs';
+import { SQSClientConfig, BatchResultErrorEntry, SQS, SQSServiceException, MessageAttributeValue } from '@aws-sdk/client-sqs';
+import { S3, S3ClientConfig } from '@aws-sdk/client-s3';
 import { IS3Upload } from './s3Utils';
 import { StrictEventEmitter } from './EventEmitterTypesHelper';
 import { EventEmitter } from 'events';
@@ -13,7 +11,7 @@ export interface IMessageDeletedEventPayload {
 }
 export interface IMessageErrorEventPayload {
     message: Message;
-    error: AWSError;
+    error: SQSServiceException;
 }
 export interface IMessageDeleteErrorEventPayload {
     message: Message;
@@ -23,18 +21,19 @@ export interface IMessageS3EventPayload {
     message: Message;
     data: IS3Upload;
 }
+export type MessageBodyAttributeMap = Record<string, MessageAttributeValue>;
 export interface ISendMessageRequest {
     MessageBody: string;
     DelaySeconds?: number;
-    MessageAttributes?: SQS.MessageBodyAttributeMap;
+    MessageAttributes?: MessageBodyAttributeMap;
     MessageDeduplicationId?: string;
     MessageGroupId?: string;
 }
 export interface IObject {
     [k: string]: any;
 }
-export declare type IMessageToSend = IObject | string;
-export declare type BodyFormat = 'json' | 'plain' | undefined;
+export type IMessageToSend = IObject | string;
+export type BodyFormat = 'json' | 'plain' | undefined;
 export interface ISquissOptions {
     receiveBatchSize?: number;
     receiveAttributes?: string[];
@@ -58,7 +57,7 @@ export interface ISquissOptions {
     autoExtendTimeout?: boolean;
     SQS?: SQS | typeof SQS;
     S3?: S3 | typeof S3;
-    awsConfig?: SQS.Types.ClientConfiguration;
+    awsConfig?: SQSClientConfig & S3ClientConfig;
     queueUrl?: string;
     queueName?: string;
     visibilityTimeoutSecs?: number;
@@ -98,7 +97,7 @@ export interface ISquissEvents {
     deleted: IMessageDeletedEventPayload;
     gotMessages: number;
     error: Error;
-    aborted: AWSError;
+    aborted: SQSServiceException;
     delError: IMessageDeleteErrorEventPayload;
     autoExtendFail: IMessageErrorEventPayload;
     autoExtendError: IMessageErrorEventPayload;
@@ -106,4 +105,4 @@ export interface ISquissEvents {
     s3Delete: IMessageS3EventPayload;
     s3Upload: IS3Upload;
 }
-export declare type SquissEmitter = StrictEventEmitter<EventEmitter, ISquissEvents>;
+export type SquissEmitter = StrictEventEmitter<EventEmitter, ISquissEvents>;

package/dist/Types.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.optDefaults = void 0;
 exports.optDefaults = {

package/dist/Utils.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeEmptyKeys = void 0;
 const removeEmptyKeys = (obj) => {

package/dist/attributeUtils.d.ts

@@ -1,9 +1,9 @@
-import * as SQS from 'aws-sdk/clients/sqs';
-export declare type IMessageAttribute = number | string | SQS.Binary | undefined;
+import { MessageBodyAttributeMap } from './Types';
+export type IMessageAttribute = number | string | Uint8Array | undefined | boolean;
 export interface IMessageAttributes {
     FIFO_MessageDeduplicationId?: string;
     FIFO_MessageGroupId?: string;
     [k: string]: IMessageAttribute;
 }
-export declare const parseMessageAttributes: (messageAttributes: SQS.MessageBodyAttributeMap | undefined) => IMessageAttributes;
-export declare const createMessageAttributes: (messageAttributes: IMessageAttributes) => SQS.MessageBodyAttributeMap | undefined;
+export declare const parseMessageAttributes: (messageAttributes: MessageBodyAttributeMap | undefined) => IMessageAttributes;
+export declare const createMessageAttributes: (messageAttributes: IMessageAttributes) => MessageBodyAttributeMap | undefined;

package/dist/attributeUtils.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMessageAttributes = exports.parseMessageAttributes = void 0;
 const ts_type_guards_1 = require("ts-type-guards");

package/dist/gzipUtils.js

@@ -1,22 +1,10 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decompressMessage = exports.compressMessage = exports.GZIP_MARKER = void 0;
-// tslint:disable:no-var-requires
-const semver_1 = require("semver");
-let compress;
-let decompress;
-/* istanbul ignore next */
-if ((0, semver_1.gte)(process.version, '10.16.0')) {
-    const { brotliCompress, brotliDecompress } = require('zlib');
-    const { promisify } = require('util');
-    compress = promisify(brotliCompress);
-    decompress = promisify(brotliDecompress);
-}
-else {
-    const iltorb = require('iltorb');
-    compress = iltorb.compress;
-    decompress = iltorb.decompress;
-}
+const zlib_1 = require("zlib");
+const util_1 = require("util");
+const compress = (0, util_1.promisify)(zlib_1.brotliCompress);
+const decompress = (0, util_1.promisify)(zlib_1.brotliDecompress);
 exports.GZIP_MARKER = '__SQS_GZIP__';
 const compressMessage = (message) => {
     return compress(Buffer.from(message))

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import * as SQS from 'aws-sdk/clients/sqs';
+import { SQS } from '@aws-sdk/client-sqs';
 export { SQS };
-import * as S3 from 'aws-sdk/clients/s3';
+import { S3 } from '@aws-sdk/client-s3';
 export { S3 };
 export { Squiss } from './Squiss';
 export { BodyFormat, IMessageDeletedEventPayload, IMessageDeleteErrorEventPayload, IMessageErrorEventPayload, IMessageS3EventPayload, IMessageToSend, IObject, ISendMessageRequest, ISquissOptions, } from './Types';

package/dist/index.js

@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Message = exports.Squiss = exports.S3 = exports.SQS = void 0;
 /* istanbul ignore file */
-const SQS = require("aws-sdk/clients/sqs");
-exports.SQS = SQS;
-const S3 = require("aws-sdk/clients/s3");
-exports.S3 = S3;
+const client_sqs_1 = require("@aws-sdk/client-sqs");
+Object.defineProperty(exports, "SQS", { enumerable: true, get: function () { return client_sqs_1.SQS; } });
+const client_s3_1 = require("@aws-sdk/client-s3");
+Object.defineProperty(exports, "S3", { enumerable: true, get: function () { return client_s3_1.S3; } });
 var Squiss_1 = require("./Squiss");
 Object.defineProperty(exports, "Squiss", { enumerable: true, get: function () { return Squiss_1.Squiss; } });
 var Message_1 = require("./Message");

package/dist/messageSizeUtils.d.ts

@@ -1,4 +1,9 @@
 /// <reference types="node" />
+/// <reference types="mocha" />
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { ISendMessageRequest } from './index';
 export declare const getMessageSize: (message: ISendMessageRequest) => number;
-export declare const getSizeInBytes: (obj?: string | ArrayBuffer | SharedArrayBuffer | DataView | NodeJS.TypedArray | undefined) => number;
+export declare const getSizeInBytes: (obj?: string | NodeJS.TypedArray | DataView | ArrayBuffer | SharedArrayBuffer) => number;

package/dist/messageSizeUtils.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSizeInBytes = exports.getMessageSize = void 0;
 const getMessageSize = (message) => {

package/dist/s3Utils.d.ts

@@ -1,4 +1,4 @@
-import * as S3 from 'aws-sdk/clients/s3';
+import { S3 } from '@aws-sdk/client-s3';
 export declare const S3_MARKER = "__SQS_S3__";
 export interface IS3Upload {
     bucket: string;

package/dist/s3Utils.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteBlob = exports.getBlob = exports.uploadBlob = exports.S3_MARKER = void 0;
 const uuid_1 = require("uuid");
@@ -12,7 +12,7 @@ const uploadBlob = (s3, bucket, blob, prefix) => {
         Bucket: bucket,
         Key: key,
         ContentLength: size,
-    }).promise()
+    })
         .then(() => {
         return Promise.resolve({
             uploadSize: size,
@@ -22,16 +22,19 @@ const uploadBlob = (s3, bucket, blob, prefix) => {
     });
 };
 exports.uploadBlob = uploadBlob;
-const getBlob = (s3, uploadData) => {
+const getBlob = async (s3, uploadData) => {
     const key = uploadData.key;
     const bucket = uploadData.bucket;
-    return s3.getObject({
+    const s3Result = await s3.getObject({
         Key: key,
         Bucket: bucket,
-    }).promise()
-        .then((s3Result) => {
-        return s3Result.Body.toString('utf-8');
     });
+    const s3ResponseStream = s3Result.Body;
+    const chunks = [];
+    for await (const chunk of s3ResponseStream) {
+        chunks.push(chunk);
+    }
+    return Buffer.concat(chunks).toString('utf-8');
 };
 exports.getBlob = getBlob;
 const deleteBlob = (s3, uploadData) => {
@@ -40,7 +43,7 @@ const deleteBlob = (s3, uploadData) => {
     return s3.deleteObject({
         Key: key,
         Bucket: bucket,
-    }).promise()
+    })
         .then(() => {
         return Promise.resolve();
     });

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "squiss-ts",
-  "version": "4.4.1",
+  "version": "5.1.0",
   "description": "High-volume SQS poller",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": "^6 || ^8 || ^10 || ^12 || ^14 || ^16 || ^18"
+    "node": "^16 || ^18 || ^20"
   },
   "scripts": {
-    "postinstall": " node -e \"const semver = require('semver');const relevant = semver.lt(process.version, '10.16.0');if (relevant == false) {process.exit(0);}try {require('iltorb'); process.exit(0);} catch (err){process.exit(1);}\" || yarn add --pure-lockfile --ignore-engines iltorb@2.4.3",
-    "clean": "rm -rf node_modules build coverage dist",
+    "clean": "rm -rf .nyc_output coverage dist",
     "build": "yarn lint && yarn compile",
     "compile": "tsc",
     "test": "yarn lint && yarn mocha",
-    "mocha": "_mocha --opts src/test/mocha.opts",
-    "cover": "nyc --reporter=lcov --reporter=text-summary npm run mocha",
+    "cover": "yarn clean && yarn nyc yarn mocha",
     "lint": "tslint -c tslint.json \"src/**/*.ts\" \"test/**/*.ts\"",
-    "benchmark": "tsc --extendedDiagnostics --incremental false"
+    "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 &"
   },
   "repository": {
     "type": "git",
@@ -48,34 +48,51 @@
   },
   "homepage": "https://github.com/PruvoNet/squiss-ts#readme",
   "dependencies": {
-    "aws-sdk": "2.814.0",
+    "@aws-sdk/client-s3": "^3.312.0",
+    "@aws-sdk/client-sqs": "^3.312.0",
+    "@aws-sdk/types": "^3.310.0",
     "linked-list": "^2.1.0",
-    "semver": "6.3.0",
+    "semver": "7.4.0",
     "ts-type-guards": "^0.7.0",
-    "uuid": "^8.3.2"
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@istanbuljs/nyc-config-typescript": "0.1.3",
-    "@types/chai": "^4.2.12",
-    "@types/chai-as-promised": "^7.1.3",
-    "@types/iltorb": "^2.3.2",
-    "@types/mocha": "^8.0.0",
-    "@types/node": "^14.0.26",
+    "@istanbuljs/nyc-config-typescript": "1.0.2",
+    "@types/chai": "^4.3.4",
+    "@types/chai-as-promised": "^7.1.5",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^14.18.42",
     "@types/proxyquire": "^1.3.28",
-    "@types/semver": "7.3.1",
-    "@types/uuid": "^8.0.0",
-    "chai": "^4.2.0",
+    "@types/semver": "^7.3.13",
+    "@types/uuid": "^9.0.1",
+    "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "delay": "^4.4.0",
+    "delay": "^5.0.0",
     "dirty-chai": "^2.0.1",
-    "mocha": "6.2.2",
-    "nyc": "14.1.1",
+    "mocha": "^10.2.0",
+    "nyc": "^15.1.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^7.5.0",
-    "sinon-chai": "^3.5.0",
-    "source-map-support": "^0.5.19",
-    "ts-node": "^8.10.2",
+    "sinon": "^15.0.3",
+    "sinon-chai": "^3.7.0",
+    "source-map-support": "^0.5.21",
+    "ts-node": "^10.9.1",
     "tslint": "^6.1.3",
-    "typescript": "4.6.4"
+    "typescript": "^5.0.4"
+  },
+  "nyc": {
+    "extends": "@istanbuljs/nyc-config-typescript",
+    "check-coverage": true,
+    "all": true,
+    "exclude": [
+      "src/test/**",
+      "e2e**"
+    ],
+    "reporter": [
+      "html",
+      "lcov",
+      "text",
+      "text-summary"
+    ],
+    "report-dir": "coverage"
   }
 }