@efebia/sqs-queue-v2 0.0.2 → 0.0.3

package/lib/index.d.ts

@@ -1,33 +1,22 @@
-/// <reference types="node" />
+import { Queue as BaseQueue, Message, QueueOptions } from "@efebia/queue";
 import AWS from "aws-sdk";
-import EventEmitter from "events";
-export type QueueOptions = {
-    sleepTimeout: number;
-    errorCallback: (error: any) => void | Promise<void>;
-};
 export type QueueConstructorOptions = {
     client: AWS.SQS;
     receiveOptions: AWS.SQS.ReceiveMessageRequest;
+    canRead?: () => boolean | Promise<boolean>;
 } & Partial<QueueOptions>;
 export type QueueCallback<TMessage extends object> = (name: string, params: TMessage, state: {
     del: boolean;
 }) => void | Promise<void>;
-export declare class Queue extends EventEmitter {
+export declare class Queue<TMessage extends object> extends BaseQueue<AWS.SQS.Message, TMessage> {
     receiveOptions: AWS.SQS.ReceiveMessageRequest;
     client: AWS.SQS;
-    forever: boolean;
-    options: Omit<QueueOptions, "client" | "receiveOptions">;
-    constructor({ receiveOptions, client, ...otherOptions }: QueueConstructorOptions);
-    start<TMessage extends object>(callback: QueueCallback<TMessage>, canThrow?: boolean): Promise<void>;
+    canRead: () => boolean | Promise<boolean>;
+    constructor({ receiveOptions, client, canRead, ...otherOptions }: QueueConstructorOptions);
+    readMessages(): Promise<AWS.SQS.MessageList | undefined>;
     processMessage<TMessage extends object>(message: AWS.SQS.Message, callback?: QueueCallback<TMessage>): Promise<void>;
     delete(ReceiptHandle: string): Promise<{
         $response: AWS.Response<{}, AWS.AWSError>;
     }>;
-    stop(): void;
-    resume(...args: Parameters<typeof this.start>): Promise<void>;
-    isRunning(): boolean;
-    send(body: {
-        name: string;
-        params: object;
-    }): Promise<import("aws-sdk/lib/request").PromiseResult<AWS.SQS.SendMessageResult, AWS.AWSError>>;
+    sendMessage(body: Message<TMessage>): Promise<void>;
 }

package/lib/index.js

@@ -10,49 +10,30 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Queue = void 0;
-const events_1 = __importDefault(require("events"));
-const packageName = '@efebia/sqs-queue-v2';
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-class Queue extends events_1.default {
+const queue_1 = require("@efebia/queue");
+const packageName = "@efebia/sqs-queue-v2";
+class Queue extends queue_1.Queue {
     constructor(_a) {
-        var { receiveOptions, client } = _a, otherOptions = __rest(_a, ["receiveOptions", "client"]);
-        super();
+        var { receiveOptions, client, canRead } = _a, otherOptions = __rest(_a, ["receiveOptions", "client", "canRead"]);
+        super(otherOptions);
         const options = Object.assign({
             WaitTimeSeconds: 20,
             MaxNumberOfMessages: 1,
         }, receiveOptions);
-        this.forever = true;
         this.receiveOptions = options;
         this.client = client;
-        this.options = Object.assign({
-            sleepTimeout: 5000,
-            errorCallback: (e) => console.error(e)
-        }, otherOptions);
+        this.canRead = canRead !== null && canRead !== void 0 ? canRead : (() => Promise.resolve(true));
     }
-    async start(callback, canThrow = false) {
-        while (this.forever) {
-            try {
-                const { Messages } = await this.client
-                    .receiveMessage(this.receiveOptions)
-                    .promise();
-                if (Messages == undefined)
-                    continue;
-                for (const message of Messages) {
-                    await this.processMessage(message, callback);
-                }
-            }
-            catch (error) {
-                if (canThrow)
-                    throw error;
-                await this.options.errorCallback(error);
-                await sleep(this.options.sleepTimeout);
-            }
-        }
+    async readMessages() {
+        const readable = await this.canRead();
+        if (!readable)
+            return undefined;
+        const { Messages } = await this.client
+            .receiveMessage(this.receiveOptions)
+            .promise();
+        return Messages;
     }
     async processMessage(message, callback) {
         const { ReceiptHandle, Body: stringifiedBody } = message;
@@ -70,14 +51,11 @@ class Queue extends events_1.default {
         }
         const { name, params } = parsedBody;
         const state = { del: true };
-        if (callback) {
-            await callback(name, params, state);
-            if (state.del) {
-                await this.delete(ReceiptHandle);
-            }
-        }
-        else {
-            this.emit(name, params, ReceiptHandle);
+        if (!callback)
+            return;
+        await callback(name, params, state);
+        if (state.del) {
+            await this.delete(ReceiptHandle);
         }
     }
     delete(ReceiptHandle) {
@@ -85,20 +63,13 @@ class Queue extends events_1.default {
             .deleteMessage({ QueueUrl: this.receiveOptions.QueueUrl, ReceiptHandle })
             .promise();
     }
-    stop() {
-        this.forever = false;
-    }
-    resume(...args) {
-        this.forever = true;
-        return this.start(...args);
-    }
-    isRunning() {
-        return this.forever;
-    }
-    send(body) {
-        const updatedBody = Object.assign(Object.assign({}, body), { params: Object.assign(Object.assign({}, body.params), { createdAt: new Date() }) });
-        const MessageBody = JSON.stringify(updatedBody);
-        return this.client.sendMessage({ QueueUrl: this.receiveOptions.QueueUrl, MessageBody }).promise();
+    async sendMessage(body) {
+        await this.client
+            .sendMessage({
+            QueueUrl: this.receiveOptions.QueueUrl,
+            MessageBody: JSON.stringify(body),
+        })
+            .promise();
     }
 }
 exports.Queue = Queue;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@efebia/sqs-queue-v2",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^18.11.18",
     "typescript": "^4.9.4"
   },
   "dependencies": {
+    "@efebia/queue": "^0.0.1",
     "aws-sdk": "^2.1292.0"
   },
   "files": [