From a807c247b5d7f4636a41f1367bc8f93b53df40d9 Mon Sep 17 00:00:00 2001 From: aarontravass Date: Sat, 20 Jan 2024 12:24:37 -0500 Subject: [PATCH] refactor: moved types to a new file --- src/index.ts | 15 +++++++-------- src/types.ts | 9 +++++++++ src/utils.ts | 8 -------- 3 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 src/types.ts diff --git a/src/index.ts b/src/index.ts index 4abf25f..b1d009c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,8 +1,7 @@ import { DequeuedMessageItem, QueueClient, QueueServiceClient } from '@azure/storage-queue' -import { HandlerFunction, QueueError, QueueOptions } from './utils' +import { QueueError, QueueOptions } from './utils' import { QueueEventEmitter } from './events' - -type QueueConnection = string | QueueServiceClient +import { HandlerFunction, QueueConnection } from './types' /** * The Main Queue Consumer class @@ -36,7 +35,7 @@ export class AzureQueueConsumer extends QueueEventEmitter { this.#createQueueAsync() } - #createQueueAsync = async () => { + async #createQueueAsync() { await this.#queueClient .createIfNotExists() .then((res) => { @@ -52,7 +51,7 @@ export class AzureQueueConsumer extends QueueEventEmitter { * the supplied handler function * @property */ - listen = () => { + listen() { this.#queueClient .receiveMessages() .then(async (result) => { @@ -83,7 +82,7 @@ export class AzureQueueConsumer extends QueueEventEmitter { }) } - #deleteMessages = async (messages: DequeuedMessageItem[]) => { + async #deleteMessages(messages: DequeuedMessageItem[]) { for (const message of messages) { this.emit('message::preDelete', message.messageId, message.popReceipt) await this.#queueClient.deleteMessage(message.messageId, message.popReceipt).then((res) => { @@ -97,12 +96,12 @@ export class AzureQueueConsumer extends QueueEventEmitter { * running handler functions are completed and messages deleted * @property */ - stop = () => { + stop() { this.#shouldShutdown = true this.emit('queue::shutdown') } - #getQueueClient = (connection: QueueConnection, queueName: string) => { + #getQueueClient(connection: QueueConnection, queueName: string) { let queueServiceClient: QueueServiceClient if (typeof connection == 'string') { queueServiceClient = QueueServiceClient.fromConnectionString(connection, { diff --git a/src/types.ts b/src/types.ts new file mode 100644 index 0000000..1a559a3 --- /dev/null +++ b/src/types.ts @@ -0,0 +1,9 @@ +import { DequeuedMessageItem, QueueServiceClient } from '@azure/storage-queue' + +/** + * @type {Function} + * @param {DequeuedMessageItem[]} messages + */ +export type HandlerFunction = (messages: DequeuedMessageItem[]) => void + +export type QueueConnection = string | QueueServiceClient diff --git a/src/utils.ts b/src/utils.ts index e83fc9e..fa23d6d 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,5 +1,3 @@ -import { DequeuedMessageItem } from '@azure/storage-queue' - /** * QueueOptions interface * @interface @@ -31,9 +29,3 @@ export class QueueError extends Error { this.message = message } } - -/** - * @type {Function} - * @param {DequeuedMessageItem[]} messages - */ -export type HandlerFunction = (messages: DequeuedMessageItem[]) => void