squiss-ts 4.2.1 → 4.4.0

package/dist/Message.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="node" />
-import { SQS, S3, AWSError } from 'aws-sdk';
+import * as SQS from 'aws-sdk/clients/sqs';
+import * as S3 from 'aws-sdk/clients/s3';
+import { AWSError } from 'aws-sdk/lib/error';
 import { BodyFormat, Squiss } from '.';
 import { IMessageAttributes } from './attributeUtils';
 import { EventEmitter } from 'events';

package/dist/Message.js

@@ -23,7 +23,7 @@ class Message extends events_1.EventEmitter {
         }
         this._squiss = opts.squiss;
         this._handled = false;
-        this.attributes = attributeUtils_1.parseMessageAttributes(opts.msg.MessageAttributes);
+        this.attributes = (0, attributeUtils_1.parseMessageAttributes)(opts.msg.MessageAttributes);
         this.sqsAttributes = opts.msg.Attributes || {};
         this._s3Retriever = opts.s3Retriever;
         this._s3Retain = opts.s3Retain;
@@ -49,7 +49,7 @@ class Message extends events_1.EventEmitter {
             .then((resolvedBody) => {
             if (this.attributes[gzipUtils_1.GZIP_MARKER] === 1) {
                 delete this.attributes[gzipUtils_1.GZIP_MARKER];
-                return gzipUtils_1.decompressMessage(resolvedBody);
+                return (0, gzipUtils_1.decompressMessage)(resolvedBody);
             }
             else {
                 return Promise.resolve(resolvedBody);
@@ -107,13 +107,13 @@ class Message extends events_1.EventEmitter {
     _getBlobMessage() {
         const uploadData = JSON.parse(this.body);
         const s3 = this._s3Retriever();
-        return s3Utils_1.getBlob(s3, uploadData)
+        return (0, s3Utils_1.getBlob)(s3, uploadData)
             .then((resolvedBody) => {
             this.emit('s3Download', uploadData);
             this._squiss.emit('s3Download', { data: uploadData, message: this });
             if (!this._s3Retain) {
                 this._deleteCallback = () => {
-                    return s3Utils_1.deleteBlob(s3, uploadData)
+                    return (0, s3Utils_1.deleteBlob)(s3, uploadData)
                         .then(() => {
                         this.emit('s3Delete', uploadData);
                         this._squiss.emit('s3Delete', { data: uploadData, message: this });

package/dist/Squiss.d.ts

@@ -1,7 +1,8 @@
 import { Message } from './Message';
 import { TimeoutExtender } from './TimeoutExtender';
 import { IMessageAttributes } from './attributeUtils';
-import { SQS, S3 } from 'aws-sdk';
+import * as SQS from 'aws-sdk/clients/sqs';
+import * as S3 from 'aws-sdk/clients/s3';
 import { IMessageToSend, SquissEmitter, ISquissOptions } from './Types';
 declare const Squiss_base: new () => SquissEmitter;
 export declare class Squiss extends Squiss_base {

package/dist/Squiss.js

@@ -7,7 +7,8 @@ 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 aws_sdk_1 = require("aws-sdk");
+const SQS = require("aws-sdk/clients/sqs");
+const S3 = require("aws-sdk/clients/s3");
 const gzipUtils_1 = require("./gzipUtils");
 const s3Utils_1 = require("./s3Utils");
 const messageSizeUtils_1 = require("./messageSizeUtils");
@@ -281,7 +282,7 @@ class Squiss extends events_1.EventEmitter {
             }
         }
         else {
-            return new aws_sdk_1.S3(this._opts.awsConfig);
+            return new S3(this._opts.awsConfig);
         }
     }
     _initOpts() {
@@ -341,7 +342,7 @@ class Squiss extends events_1.EventEmitter {
             this._paused = true;
             return;
         }
-        const params = Utils_1.removeEmptyKeys({
+        const params = (0, Utils_1.removeEmptyKeys)({
             QueueUrl: queueUrl, MaxNumberOfMessages: maxMessagesToGet,
             WaitTimeSeconds: this._opts.receiveWaitTimeSecs,
             MessageAttributeNames: this._opts.receiveAttributes,
@@ -420,7 +421,7 @@ class Squiss extends events_1.EventEmitter {
         this._deleteMessages(delBatch);
     }
     _isLargeMessage(message, minSize) {
-        const messageSize = messageSizeUtils_1.getMessageSize(message);
+        const messageSize = (0, messageSizeUtils_1.getMessageSize)(message);
         if (minSize) {
             return Promise.resolve(messageSize > minSize);
         }
@@ -430,17 +431,17 @@ class Squiss extends events_1.EventEmitter {
         });
     }
     _prepareMessageParams(message, delay, attributes) {
-        const messageStr = ts_type_guards_1.isString(message) ? message : JSON.stringify(message);
+        const messageStr = (0, ts_type_guards_1.isString)(message) ? message : JSON.stringify(message);
         const params = { MessageBody: messageStr, DelaySeconds: delay };
         attributes = Object.assign({}, attributes);
         params.MessageGroupId = attributes.FIFO_MessageGroupId;
         delete attributes.FIFO_MessageGroupId;
         params.MessageDeduplicationId = attributes.FIFO_MessageDeduplicationId;
         delete attributes.FIFO_MessageDeduplicationId;
-        params.MessageAttributes = attributeUtils_1.createMessageAttributes(attributes);
+        params.MessageAttributes = (0, attributeUtils_1.createMessageAttributes)(attributes);
         let getMessagePromise = Promise.resolve(messageStr);
-        if (this._opts.gzip && (!this._opts.minGzipSize || messageSizeUtils_1.getMessageSize(params) >= this._opts.minGzipSize)) {
-            getMessagePromise = gzipUtils_1.compressMessage(messageStr);
+        if (this._opts.gzip && (!this._opts.minGzipSize || (0, messageSizeUtils_1.getMessageSize)(params) >= this._opts.minGzipSize)) {
+            getMessagePromise = (0, gzipUtils_1.compressMessage)(messageStr);
             params.MessageAttributes = params.MessageAttributes || {};
             params.MessageAttributes[gzipUtils_1.GZIP_MARKER] = {
                 StringValue: `1`,
@@ -461,7 +462,7 @@ class Squiss extends events_1.EventEmitter {
             if (!isLarge) {
                 return Promise.resolve(params);
             }
-            return s3Utils_1.uploadBlob(this.getS3(), this._opts.s3Bucket, finalMessage, this._opts.s3Prefix || '')
+            return (0, s3Utils_1.uploadBlob)(this.getS3(), this._opts.s3Bucket, finalMessage, this._opts.s3Prefix || '')
                 .then((uploadData) => {
                 this.emit('s3Upload', uploadData);
                 params.MessageBody = JSON.stringify(uploadData);
@@ -484,7 +485,7 @@ class Squiss extends events_1.EventEmitter {
         return this._prepareMessageParams(message, delay, attributes)
             .then(this._handleLargeMessagePrepare.bind(this))
             .then((params) => {
-            return Utils_1.removeEmptyKeys(params);
+            return (0, Utils_1.removeEmptyKeys)(params);
         });
     }
     _initSqs() {
@@ -497,7 +498,7 @@ class Squiss extends events_1.EventEmitter {
             }
         }
         else {
-            return new aws_sdk_1.SQS(this._opts.awsConfig);
+            return new SQS(this._opts.awsConfig);
         }
     }
     _handleBatchDeleteResults(batch) {
@@ -536,7 +537,7 @@ class Squiss extends events_1.EventEmitter {
             let currentBatchSize = 0;
             let currentBatchLength = 0;
             requests.forEach((message) => {
-                const messageSize = messageSizeUtils_1.getMessageSize(message);
+                const messageSize = (0, messageSizeUtils_1.getMessageSize)(message);
                 if (currentBatchLength % AWS_MAX_SEND_BATCH === 0 ||
                     currentBatchSize + messageSize >= queueMaximumMessageSize) {
                     currentBatchLength = currentBatchSize = 0;

package/dist/Types.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="node" />
 import { Message } from './Message';
-import { AWSError, SQS, S3 } from 'aws-sdk';
+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 { IS3Upload } from './s3Utils';
 import { StrictEventEmitter } from './EventEmitterTypesHelper';

package/dist/attributeUtils.d.ts

@@ -1,4 +1,4 @@
-import { SQS } from 'aws-sdk';
+import * as SQS from 'aws-sdk/clients/sqs';
 export declare type IMessageAttribute = number | string | SQS.Binary | undefined;
 export interface IMessageAttributes {
     FIFO_MessageDeduplicationId?: string;

package/dist/attributeUtils.js

@@ -42,19 +42,19 @@ const createAttributeValue = (unparsedAttribute) => {
     if (unparsedAttribute === undefined || unparsedAttribute === null) {
         unparsedAttribute = '';
     }
-    if (ts_type_guards_1.isNumber(unparsedAttribute)) {
+    if ((0, ts_type_guards_1.isNumber)(unparsedAttribute)) {
         return {
             DataType: NUMBER_TYPE,
             StringValue: String(unparsedAttribute),
         };
     }
-    else if (ts_type_guards_1.isString(unparsedAttribute)) {
+    else if ((0, ts_type_guards_1.isString)(unparsedAttribute)) {
         return {
             DataType: STRING_TYPE,
             StringValue: unparsedAttribute,
         };
     }
-    else if (ts_type_guards_1.isBoolean(unparsedAttribute)) {
+    else if ((0, ts_type_guards_1.isBoolean)(unparsedAttribute)) {
         return {
             DataType: STRING_TYPE,
             StringValue: `${unparsedAttribute}`,

package/dist/gzipUtils.js

@@ -6,7 +6,7 @@ const semver_1 = require("semver");
 let compress;
 let decompress;
 /* istanbul ignore next */
-if (semver_1.gte(process.version, '10.16.0')) {
+if ((0, semver_1.gte)(process.version, '10.16.0')) {
     const { brotliCompress, brotliDecompress } = require('zlib');
     const { promisify } = require('util');
     compress = promisify(brotliCompress);

package/dist/index.d.ts

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

package/dist/index.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Message = exports.Squiss = exports.S3 = exports.SQS = void 0;
 /* istanbul ignore file */
-var aws_sdk_1 = require("aws-sdk");
-Object.defineProperty(exports, "SQS", { enumerable: true, get: function () { return aws_sdk_1.SQS; } });
-Object.defineProperty(exports, "S3", { enumerable: true, get: function () { return aws_sdk_1.S3; } });
+const SQS = require("aws-sdk/clients/sqs");
+exports.SQS = SQS;
+const S3 = require("aws-sdk/clients/s3");
+exports.S3 = 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.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSizeInBytes = exports.getMessageSize = void 0;
 const getMessageSize = (message) => {
     const msgAttributesSize = getMsgAttributesSize(message.MessageAttributes);
-    const msgBodySize = exports.getSizeInBytes(message.MessageBody);
+    const msgBodySize = (0, exports.getSizeInBytes)(message.MessageBody);
     return msgAttributesSize + msgBodySize;
 };
 exports.getMessageSize = getMessageSize;
@@ -16,12 +16,12 @@ const getMsgAttributesSize = (attributes) => {
     attributes = attributes || {};
     for (const attribute in attributes) {
         if (attributes.hasOwnProperty(attribute)) {
-            totalMsgAttributesSize += exports.getSizeInBytes(attribute);
+            totalMsgAttributesSize += (0, exports.getSizeInBytes)(attribute);
             const val = attributes[attribute];
-            totalMsgAttributesSize += exports.getSizeInBytes(val.DataType);
-            totalMsgAttributesSize += exports.getSizeInBytes(val.StringValue);
+            totalMsgAttributesSize += (0, exports.getSizeInBytes)(val.DataType);
+            totalMsgAttributesSize += (0, exports.getSizeInBytes)(val.StringValue);
             // @ts-ignore
-            totalMsgAttributesSize += exports.getSizeInBytes(val.BinaryValue);
+            totalMsgAttributesSize += (0, exports.getSizeInBytes)(val.BinaryValue);
         }
     }
     return totalMsgAttributesSize;

package/dist/s3Utils.d.ts

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

package/dist/s3Utils.js

@@ -5,8 +5,8 @@ const uuid_1 = require("uuid");
 const messageSizeUtils_1 = require("./messageSizeUtils");
 exports.S3_MARKER = '__SQS_S3__';
 const uploadBlob = (s3, bucket, blob, prefix) => {
-    const key = `${prefix}${uuid_1.v4()}`;
-    const size = messageSizeUtils_1.getSizeInBytes(blob);
+    const key = `${prefix}${(0, uuid_1.v4)()}`;
+    const size = (0, messageSizeUtils_1.getSizeInBytes)(blob);
     return s3.putObject({
         Body: blob,
         Bucket: bucket,

package/package.json

@@ -1,21 +1,22 @@
 {
   "name": "squiss-ts",
-  "version": "4.2.1",
+  "version": "4.4.0",
   "description": "High-volume SQS poller",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": "^6 || ^8 || ^10 || ^12 || ^14 || ^16"
+    "node": "^6 || ^8 || ^10 || ^12 || ^14 || ^16 || ^18"
   },
   "scripts": {
-    "postinstall": "node -e \"const semver = require('semver');process.exit(semver.lt(process.version, '10.16.0'));\" || npm install --no-save iltorb@2.4.3",
+    "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",
-    "build": "npm run lint && npm run compile",
+    "build": "yarn lint && yarn compile",
     "compile": "tsc",
-    "test": "npm run lint && npm run mocha",
+    "test": "yarn lint && yarn mocha",
     "mocha": "_mocha --opts src/test/mocha.opts",
-    "cover": "nyc --reporter=lcov --reporter=text-summary npm run test",
-    "lint": "tslint -c tslint.json \"src/**/*.ts\" \"test/**/*.ts\""
+    "cover": "nyc --reporter=lcov --reporter=text-summary npm run mocha",
+    "lint": "tslint -c tslint.json \"src/**/*.ts\" \"test/**/*.ts\"",
+    "benchmark": "tsc --extendedDiagnostics --incremental false"
   },
   "repository": {
     "type": "git",
@@ -47,9 +48,10 @@
   },
   "homepage": "https://github.com/PruvoNet/squiss-ts#readme",
   "dependencies": {
-    "aws-sdk": "^2.720.0",
+    "aws-sdk": "2.814.0",
+    "iltorb": "2.4.3",
     "linked-list": "^2.1.0",
-    "semver": "^7.3.5",
+    "semver": "6.3.0",
     "ts-type-guards": "^0.7.0",
     "uuid": "^8.3.2"
   },
@@ -61,7 +63,7 @@
     "@types/mocha": "^8.0.0",
     "@types/node": "^14.0.26",
     "@types/proxyquire": "^1.3.28",
-    "@types/semver": "^7.3.1",
+    "@types/semver": "7.3.1",
     "@types/uuid": "^8.0.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
@@ -70,11 +72,11 @@
     "mocha": "6.2.2",
     "nyc": "14.1.1",
     "proxyquire": "^2.1.3",
-    "sinon": "^9.0.2",
+    "sinon": "^7.5.0",
     "sinon-chai": "^3.5.0",
     "source-map-support": "^0.5.19",
-    "ts-node": "^9.1.1",
-    "tslint": "^6.1.2",
-    "typescript": "^4.3.5"
+    "ts-node": "^8.10.2",
+    "tslint": "^6.1.3",
+    "typescript": "4.6.4"
   }
 }