diff --git a/lib/index.d.ts b/lib/index.d.ts index b6df273..993b77f 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -1,8 +1,5 @@ -/// -import AWS, { AWSError } from "aws-sdk"; -import EventEmitter from "events"; -import { QueueAttributeMap, SendMessageBatchResult, SendMessageResult } from "aws-sdk/clients/sqs"; -import { PromiseResult } from "aws-sdk/lib/request"; +import { SendMessageBatchCommandOutput, SendMessageCommandOutput } from "@aws-sdk/client-sqs"; +import { EventEmitter } from "events"; export default class SQS { private name; private emitter; @@ -37,7 +34,7 @@ export default class SQS { * @param {String} opts.FifoQueue='false' [Use FIFO (true) or Standard queue (false)] * @return {Promise} */ - createQueue(name: string, opts?: QueueAttributeMap): Promise; + createQueue(name: string, opts?: Record): Promise; /** * Publish on SQS * @param {string} name @@ -48,7 +45,7 @@ export default class SQS { * @param {Number} [options.delay] [in seconds] * @return {Promise} */ - publish(name: string, content: Record, meta?: Record, handle?: boolean, options?: Record): Promise>; + publish(name: string, content: Record, meta?: Record, handle?: boolean, options?: Record): Promise; /** * Publish on SQS in batch * @param {string} name @@ -59,8 +56,8 @@ export default class SQS { * @param {Number} [options.delay] [in seconds] * @return {Promise} */ - publishBatch(name: string, contentList: Record[], meta?: Record, handle?: boolean, options?: Record): Promise>; - publishFifo(name: string, content: Record, meta: Record, group: Record, handle?: boolean): Promise>; + publishBatch(name: string, contentList: Record[], meta?: Record, handle?: boolean, options?: Record): Promise; + publishFifo(name: string, content: Record, meta: Record, group: Record, handle?: boolean): Promise; getQueueUrl(name: string): string; /** * Subscribe to a queue, using long polling @@ -68,22 +65,14 @@ export default class SQS { subscribe(name: string, cb: (arg1: Record, arg2: Record) => void, opts?: Record): Promise; deleteMessage(name: string, messageId: any, handle: string): Promise; returnMessage(name: string, messageId: any, handle: string): Promise; - fetchMessages(name: string, number?: number): Promise<({ + fetchMessages(name: string, number?: number): Promise<{ data: any; - ack: () => Promise; - nack: () => Promise; - id?: undefined; - handle?: undefined; - queueAttributes?: undefined; - messageAttributes?: undefined; - } | { id: string; handle: string; - queueAttributes: AWS.SQS.MessageSystemAttributeMap; - messageAttributes: AWS.SQS.MessageBodyAttributeMap; - data?: undefined; - ack?: undefined; - nack?: undefined; - })[][]>; + queueAttributes: Partial>; + messageAttributes: Record; + ack: () => Promise; + nack: () => Promise; + }[]>; fetchOne(name: string): Promise; } diff --git a/lib/index.js b/lib/index.js index 77b5e01..fc483e4 100644 --- a/lib/index.js +++ b/lib/index.js @@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -const aws_sdk_1 = __importDefault(require("aws-sdk")); +const client_sqs_1 = require("@aws-sdk/client-sqs"); const safely_parse_json_1 = __importDefault(require("safely-parse-json")); const sqs_consumer_1 = require("sqs-consumer"); const uuid_1 = require("uuid"); @@ -66,7 +66,7 @@ class SQS { ...(region && { region }), ...(accountId && { accountId }) }; - this.client = new aws_sdk_1.default.SQS(this.config); + this.client = new client_sqs_1.SQSClient(this.config); this.log(`Connected on SQS:${this.name}`, this.config); return this; } @@ -95,12 +95,11 @@ class SQS { // FifoQueue: 'false', // use standard by default }, opts); try { - const response = await this.client - .createQueue({ + const command = new client_sqs_1.CreateQueueCommand({ QueueName: name, Attributes: options, - }) - .promise(); + }); + const response = await this.client.send(command); const queueUrl = response.QueueUrl; const message = `Created queue ${name} => ${queueUrl}`; this.log(message, { name, queueUrl }); @@ -130,7 +129,8 @@ class SQS { params.DelaySeconds = options.delay; } try { - const res = await this.client.sendMessage(params).promise(); + const command = new client_sqs_1.SendMessageCommand(params); + const res = await this.client.send(command); return res; } catch (err) { @@ -143,6 +143,8 @@ class SQS { if (handle === false) { throw err; } + // Return empty response when error is handled + return {}; } } /** @@ -169,7 +171,8 @@ class SQS { })), }; try { - const res = await this.client.sendMessageBatch(params).promise(); + const command = new client_sqs_1.SendMessageBatchCommand(params); + const res = await this.client.send(command); return res; } catch (err) { @@ -182,6 +185,8 @@ class SQS { if (handle === false) { throw err; } + // Return empty response when error is handled + return { Successful: [], Failed: [] }; } } async publishFifo(name, content, meta = {}, group, handle = true) { @@ -192,7 +197,8 @@ class SQS { MessageDeduplicationId: group.id, }; try { - const res = await this.client.sendMessage(params).promise(); + const command = new client_sqs_1.SendMessageCommand(params); + const res = await this.client.send(command); return res; } catch (err) { @@ -205,6 +211,8 @@ class SQS { if (handle === false) { throw err; } + // Return empty response when error is handled + return {}; } } getQueueUrl(name) { @@ -259,7 +267,8 @@ class SQS { QueueUrl: queueUrl, ReceiptHandle: handle, }; - await this.client.deleteMessage(params).promise(); + const command = new client_sqs_1.DeleteMessageCommand(params); + await this.client.send(command); } async returnMessage(name, messageId, handle) { const queueUrl = this.getQueueUrl(name); @@ -268,7 +277,8 @@ class SQS { ReceiptHandle: handle, VisibilityTimeout: 0, }; - await this.client.changeMessageVisibility(params).promise(); + const command = new client_sqs_1.ChangeMessageVisibilityCommand(params); + await this.client.send(command); } async fetchMessages(name, number = 10) { const queueUrl = this.getQueueUrl(name); @@ -276,25 +286,23 @@ class SQS { QueueUrl: queueUrl, MaxNumberOfMessages: number, }; - const res = await this.client.receiveMessage(params).promise(); - return res.Messages.map((msg) => { - return [ - { - data: (0, safely_parse_json_1.default)(msg.Body), - ack: () => { - return this.deleteMessage(name, msg.MessageId, msg.ReceiptHandle); - }, - nack: () => { - return this.returnMessage(name, msg.MessageId, msg.ReceiptHandle); - }, + const command = new client_sqs_1.ReceiveMessageCommand(params); + const res = await this.client.send(command); + const messages = res.Messages || []; + return messages.map((msg) => { + return { + data: (0, safely_parse_json_1.default)(msg.Body), + id: msg.MessageId, + handle: msg.ReceiptHandle, + queueAttributes: msg.Attributes, + messageAttributes: msg.MessageAttributes, + ack: () => { + return this.deleteMessage(name, msg.MessageId, msg.ReceiptHandle); }, - { - id: msg.MessageId, - handle: msg.ReceiptHandle, - queueAttributes: msg.Attributes, - messageAttributes: msg.MessageAttributes, + nack: () => { + return this.returnMessage(name, msg.MessageId, msg.ReceiptHandle); }, - ]; + }; }); } async fetchOne(name) { @@ -303,4 +311,4 @@ class SQS { } } exports.default = SQS; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 96c4231..4864604 100644 --- a/package.json +++ b/package.json @@ -33,15 +33,12 @@ "eslint-import-resolver-typescript": "^2.4.0", "eslint-plugin-es5": "^1.5.0", "eslint-plugin-import": "^2.23.4", - "typescript": "^4.4.4" + "typescript": "^5.0.0" }, "dependencies": { "@aws-sdk/client-sqs": "^3.600.0", "safely-parse-json": "0.1.0", "sqs-consumer": "5.8.0", "uuid": "^9.0.0" - }, - "peerDependencies": { - "aws-sdk": "^2.1403.0" } } \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index f185371..2e2c148 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,19 +1,21 @@ -import AWS, { AWSError } from "aws-sdk"; -import safeJSON from "safely-parse-json"; -import { Consumer } from "sqs-consumer"; -import EventEmitter from "events"; import { - QueueAttributeMap, - SendMessageBatchResult, + SQSClient, + CreateQueueCommand, + SendMessageCommand, + SendMessageBatchCommand, + DeleteMessageCommand, + ChangeMessageVisibilityCommand, + ReceiveMessageCommand, + SendMessageBatchCommandOutput, SendMessageRequest, - SendMessageResult, -} from "aws-sdk/clients/sqs"; -import { PromiseResult } from "aws-sdk/lib/request"; -import { + SendMessageCommandOutput, ChangeMessageVisibilityRequest, DeleteMessageRequest, SendMessageBatchRequest, } from "@aws-sdk/client-sqs"; +import safeJSON from "safely-parse-json"; +import { Consumer } from "sqs-consumer"; +import { EventEmitter } from "events"; import { v4 as uuidv4 } from "uuid"; import { Agent } from 'https'; @@ -21,7 +23,7 @@ export default class SQS { private name: string; private emitter: EventEmitter; private config: Record; - private client: AWS.SQS; + private client: SQSClient; private queues: Record; constructor(name: string, emitter: EventEmitter, config: Record = {}) { @@ -83,7 +85,7 @@ export default class SQS { ...(region && { region }), ...(accountId && { accountId }) }; - this.client = new AWS.SQS(this.config); + this.client = new SQSClient(this.config); this.log(`Connected on SQS:${this.name}`, this.config); return this; } catch (err: any) { @@ -107,7 +109,7 @@ export default class SQS { * @param {String} opts.FifoQueue='false' [Use FIFO (true) or Standard queue (false)] * @return {Promise} */ - async createQueue(name: string, opts: QueueAttributeMap = {}): Promise { + async createQueue(name: string, opts: Record = {}): Promise { const options = Object.assign( { // FifoQueue: 'false', // use standard by default @@ -115,12 +117,11 @@ export default class SQS { opts ); try { - const response = await this.client - .createQueue({ - QueueName: name, - Attributes: options, - }) - .promise(); + const command = new CreateQueueCommand({ + QueueName: name, + Attributes: options, + }); + const response = await this.client.send(command); const queueUrl = response.QueueUrl; const message = `Created queue ${name} => ${queueUrl}`; this.log(message, { name, queueUrl }); @@ -147,7 +148,7 @@ export default class SQS { meta: Record = {}, handle: boolean = true, options: Record = {} - ): Promise> { + ): Promise { const params: SendMessageRequest = { QueueUrl: this.getQueueUrl(name), MessageBody: JSON.stringify({ content, meta }), @@ -158,7 +159,8 @@ export default class SQS { } try { - const res = await this.client.sendMessage(params).promise(); + const command = new SendMessageCommand(params); + const res = await this.client.send(command); return res; } catch (err) { this.error(err, { @@ -170,6 +172,8 @@ export default class SQS { if (handle === false) { throw err; } + // Return empty response when error is handled + return {} as SendMessageCommandOutput; } } @@ -189,7 +193,7 @@ export default class SQS { meta: Record = {}, handle: boolean = true, options: Record = {} - ): Promise> { + ): Promise { let DelaySeconds: number | undefined; if (typeof options.delay === "number") { DelaySeconds = options.delay; @@ -205,7 +209,8 @@ export default class SQS { }; try { - const res = await this.client.sendMessageBatch(params).promise(); + const command = new SendMessageBatchCommand(params); + const res = await this.client.send(command); return res; } catch (err) { this.error(err, { @@ -217,6 +222,8 @@ export default class SQS { if (handle === false) { throw err; } + // Return empty response when error is handled + return { Successful: [], Failed: [] } as SendMessageBatchCommandOutput; } } @@ -226,7 +233,7 @@ export default class SQS { meta: Record = {}, group: Record, handle: boolean = true - ): Promise> { + ): Promise { const params: SendMessageRequest = { QueueUrl: this.getQueueUrl(name), MessageBody: JSON.stringify({ content, meta }), @@ -234,7 +241,8 @@ export default class SQS { MessageDeduplicationId: group.id, }; try { - const res = await this.client.sendMessage(params).promise(); + const command = new SendMessageCommand(params); + const res = await this.client.send(command); return res; } catch (err) { this.error(err, { @@ -246,6 +254,8 @@ export default class SQS { if (handle === false) { throw err; } + // Return empty response when error is handled + return {} as SendMessageCommandOutput; } } @@ -316,7 +326,8 @@ export default class SQS { ReceiptHandle: handle, }; - await this.client.deleteMessage(params).promise(); + const command = new DeleteMessageCommand(params); + await this.client.send(command); } async returnMessage(name: string, messageId: any, handle: string) { @@ -326,7 +337,8 @@ export default class SQS { ReceiptHandle: handle, VisibilityTimeout: 0, }; - await this.client.changeMessageVisibility(params).promise(); + const command = new ChangeMessageVisibilityCommand(params); + await this.client.send(command); } async fetchMessages(name: string, number = 10) { @@ -335,25 +347,23 @@ export default class SQS { QueueUrl: queueUrl, MaxNumberOfMessages: number, }; - const res = await this.client.receiveMessage(params).promise(); - return res.Messages.map((msg) => { - return [ - { - data: safeJSON(msg.Body), - ack: () => { - return this.deleteMessage(name, msg.MessageId, msg.ReceiptHandle); - }, - nack: () => { - return this.returnMessage(name, msg.MessageId, msg.ReceiptHandle); - }, + const command = new ReceiveMessageCommand(params); + const res = await this.client.send(command); + const messages = res.Messages || []; + return messages.map((msg) => { + return { + data: safeJSON(msg.Body), + id: msg.MessageId, + handle: msg.ReceiptHandle, + queueAttributes: msg.Attributes, + messageAttributes: msg.MessageAttributes, + ack: () => { + return this.deleteMessage(name, msg.MessageId, msg.ReceiptHandle); }, - { - id: msg.MessageId, - handle: msg.ReceiptHandle, - queueAttributes: msg.Attributes, - messageAttributes: msg.MessageAttributes, + nack: () => { + return this.returnMessage(name, msg.MessageId, msg.ReceiptHandle); }, - ]; + }; }); } diff --git a/test/push.spec.js b/test/push.spec.js index 48f8c5d..8cba7c2 100644 --- a/test/push.spec.js +++ b/test/push.spec.js @@ -2,7 +2,7 @@ const EventEmitter = require('events').EventEmitter; const { v4: uuidv4 } = require('uuid'); -const SQS = require('../src/index'); +const SQS = require('../lib/index').default; const emitter = new EventEmitter(); emitter.on('error', console.error.bind(console)); diff --git a/test/sub.spec.js b/test/sub.spec.js index 4867fe0..ad563e7 100644 --- a/test/sub.spec.js +++ b/test/sub.spec.js @@ -1,9 +1,7 @@ /* eslint no-console: 0 */ - const EventEmitter = require('events').EventEmitter; - -const SQS = require('../src/index'); +const SQS = require('../lib/index').default; const emitter = new EventEmitter(); emitter.on('error', console.error.bind(console)); @@ -15,21 +13,26 @@ process.on('uncaughtExceptionMonitor', console.log); const sqs = new SQS('sqs', emitter); -async function sub() { +async function fetch() { await sqs.init(); await sqs.createQueue('test.fifo', { FifoQueue: 'true', }); - await sqs.subscribe('test.fifo', (msg) => { - console.log(msg); - setTimeout(() => { - msg.ack(); - }, 1000); - }, { - maxInProgress: 2, - }); + // Fetch messages from the queue + const messages = await sqs.fetchMessages('test.fifo', 5); + console.log(`Fetched ${messages.length} messages`); + + // Process each message + for (const msg of messages) { + console.log('Message:', msg.data); + console.log('Message ID:', msg.id); + + // Acknowledge the message after processing + await msg.ack(); + console.log('Message acknowledged'); + } } -sub().then(() => console.log('Subsciption')).catch(console.error.bind(console)); +fetch().then(() => console.log('Fetch completed')).catch(console.error.bind(console));