@anchan828/nest-cloud-run-queue-worker 2.1.18 → 2.2.0

package/dist/util.d.ts

@@ -1,4 +1,5 @@
 import { Message } from "@anchan828/nest-cloud-run-queue-common";
+import { QueueWorkerDecodedMessage, QueueWorkerRawMessage } from "./interfaces";
 /**
  * parse json string to javascript object.
  * JSON.parse has receiver for Date.parse.
@@ -24,3 +25,4 @@ export declare function sortByPriority<T extends {
  * @return {*}  {boolean}
  */
 export declare function isBase64(value?: string | null | Message): value is string;
+export declare function decodeMessage<T = any>(message: QueueWorkerRawMessage | Message): QueueWorkerDecodedMessage<T>;

package/dist/util.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseJSON = void 0;
 exports.sortByPriority = sortByPriority;
 exports.isBase64 = isBase64;
+exports.decodeMessage = decodeMessage;
+const common_1 = require("@nestjs/common");
+const constants_1 = require("./constants");
 const dateRegExp = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
 /**
  * parse json string to javascript object.
@@ -57,3 +60,45 @@ function isBase64(value) {
     const firstPaddingChar = value.indexOf("=");
     return (firstPaddingChar === -1 || firstPaddingChar === len - 1 || (firstPaddingChar === len - 2 && value[len - 1] === "="));
 }
+function decodeMessage(message) {
+    let data;
+    if (isBase64(message.data)) {
+        // pubsub
+        data = decodeData(message.data);
+    }
+    else {
+        // tasks / http
+        data = message;
+    }
+    if (!data.name) {
+        throw new common_1.BadRequestException(constants_1.ERROR_QUEUE_WORKER_NAME_NOT_FOUND);
+    }
+    return {
+        data,
+        headers: "headers" in message ? message.headers : undefined,
+        raw: message,
+    };
+}
+function decodeData(data) {
+    if (!data) {
+        throw new common_1.BadRequestException(constants_1.ERROR_INVALID_MESSAGE_FORMAT);
+    }
+    if (Buffer.isBuffer(data)) {
+        data = data.toString();
+    }
+    if (data instanceof Uint8Array) {
+        data = new TextDecoder("utf8").decode(data);
+    }
+    if (isBase64(data)) {
+        data = Buffer.from(data, "base64").toString();
+    }
+    try {
+        if (typeof data === "string") {
+            return (0, exports.parseJSON)(data);
+        }
+        return data;
+    }
+    catch {
+        throw new common_1.BadRequestException(constants_1.ERROR_INVALID_MESSAGE_FORMAT);
+    }
+}

package/dist/worker.controller.js

@@ -23,6 +23,7 @@ function getWorkerController(metadata) {
             this.service = service;
         }
         async execute(body, headers) {
+            this.service.execute({});
             await this.service.execute({ ...body.message, headers });
         }
     };

package/dist/worker.service.d.ts

@@ -1,17 +1,21 @@
 import { Logger } from "@nestjs/common";
-import { QueueWorkerDecodedMessage, QueueWorkerModuleOptions } from "./interfaces";
+import { Message } from "@anchan828/nest-cloud-run-queue-common";
 import { QueueWorkerExplorerService } from "./explorer.service";
-import { QueueWorkerRawMessage } from "./interfaces";
+import { QueueWorkerDecodedMessage, QueueWorkerModuleOptions, QueueWorkerRawMessage } from "./interfaces";
 export declare class QueueWorkerService {
     #private;
     private readonly options;
     private readonly logger;
     private readonly explorerService;
     constructor(options: QueueWorkerModuleOptions, logger: Logger, explorerService: QueueWorkerExplorerService);
-    execute(rawMessage: QueueWorkerRawMessage | QueueWorkerDecodedMessage): Promise<void>;
-    decodeMessage<T = any>(message: QueueWorkerRawMessage): QueueWorkerDecodedMessage<T>;
+    execute<T = any>(meessage: Message<T>): Promise<void>;
+    execute<T = any>(meessage: QueueWorkerDecodedMessage<T>): Promise<void>;
+    execute<T = any>(meessage: QueueWorkerRawMessage<T>): Promise<void>;
+    /**
+     * @deprecated Use `decodeMessage` function instead.
+     */
+    decodeMessage<T = any>(message: QueueWorkerRawMessage | Message): QueueWorkerDecodedMessage<T>;
     private runWorkers;
     private isDecodedMessage;
-    private decodeData;
     private execProcessor;
 }

package/dist/worker.service.js

@@ -38,28 +38,14 @@ let QueueWorkerService = class QueueWorkerService {
         this.explorerService = explorerService;
         _QueueWorkerService__allWorkers.set(this, void 0);
     }
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    async execute(rawMessage) {
-        await this.runWorkers(this.isDecodedMessage(rawMessage) ? rawMessage : this.decodeMessage(rawMessage));
+    async execute(meessage) {
+        await this.runWorkers(this.isDecodedMessage(meessage) ? meessage : (0, util_1.decodeMessage)(meessage));
     }
+    /**
+     * @deprecated Use `decodeMessage` function instead.
+     */
     decodeMessage(message) {
-        let data;
-        if ((0, util_1.isBase64)(message.data)) {
-            // pubsub
-            data = this.decodeData(message.data);
-        }
-        else {
-            // tasks / http
-            data = message;
-        }
-        if (!data.name) {
-            throw new common_1.BadRequestException(constants_1.ERROR_QUEUE_WORKER_NAME_NOT_FOUND);
-        }
-        return {
-            data,
-            headers: message.headers,
-            raw: message,
-        };
+        return (0, util_1.decodeMessage)(message);
     }
     async runWorkers(decodedMessage) {
         const maxRetryAttempts = this.options.maxRetryAttempts ?? 1;
@@ -86,30 +72,7 @@ let QueueWorkerService = class QueueWorkerService {
         await this.options.extraConfig?.postProcessor?.(decodedMessage.data.name, decodedMessage.data.data, decodedMessage.raw);
     }
     isDecodedMessage(message) {
-        return !!message.raw;
-    }
-    decodeData(data) {
-        if (!data) {
-            throw new common_1.BadRequestException(constants_1.ERROR_INVALID_MESSAGE_FORMAT);
-        }
-        if (Buffer.isBuffer(data)) {
-            data = data.toString();
-        }
-        if (data instanceof Uint8Array) {
-            data = new TextDecoder("utf8").decode(data);
-        }
-        if ((0, util_1.isBase64)(data)) {
-            data = Buffer.from(data, "base64").toString();
-        }
-        try {
-            if (typeof data === "string") {
-                return (0, util_1.parseJSON)(data);
-            }
-            return data;
-        }
-        catch {
-            throw new common_1.BadRequestException(constants_1.ERROR_INVALID_MESSAGE_FORMAT);
-        }
+        return "raw" in message;
     }
     async execProcessor(processor, maxRetryAttempts, data, raw) {
         for (let i = 0; i < maxRetryAttempts; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anchan828/nest-cloud-run-queue-worker",
-  "version": "2.1.18",
+  "version": "2.2.0",
   "description": "> TODO: description",
   "homepage": "https://github.com/anchan828/nest-cloud-run-queue/tree/master/packages/worker#readme",
   "bugs": {
@@ -33,7 +33,7 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@anchan828/nest-cloud-run-queue-common": "^2.1.18"
+    "@anchan828/nest-cloud-run-queue-common": "^2.2.0"
   },
   "devDependencies": {
     "@nestjs/common": "10.3.9",
@@ -45,6 +45,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "packageManager": "npm@10.7.0",
-  "gitHead": "d478a53bcb9e31b1a6c42fbe6fe0cfdadcbfad6f"
+  "packageManager": "npm@10.8.1",
+  "gitHead": "9e50ec5859b0fb64fbcd5c19f3d13605d22850c8"
 }