@anchan828/nest-cloud-run-queue-worker 3.1.2 → 3.1.4

package/dist/interfaces.d.ts

@@ -16,6 +16,13 @@ export interface QueueWorkerModuleOptions extends ModuleOptions {
      * @memberof QueueWorkerModuleOptions
      */
     maxRetryAttempts?: number;
+    /**
+     * extra config
+     *
+     * @type {QueueWorkerExtraConfig}
+     * @memberof QueueWorkerModuleOptions
+     */
+    extraConfig?: QueueWorkerExtraConfig;
     /**
      * Define a Route for the controller.
      * Default: POST /
@@ -40,6 +47,9 @@ export interface QueueWorkerProcessorMetadata extends QueueWorkerProcessDecorato
     processorName: string;
     processor: QueueWorkerProcessor;
 }
+export type QueueWorkerExtraConfig = {
+    parseReviver?: (key: string, value: any) => any;
+};
 export interface QueueWorkerDecoratorArgs {
     names: QueueWorkerName[];
     /**

package/dist/util.d.ts

@@ -5,7 +5,7 @@ import { QueueWorkerDecodedMessage, QueueWorkerRawMessage } from "./interfaces";
  * JSON.parse has receiver for Date.parse.
  * @param json
  */
-export declare const parseJSON: <T>(json: string) => T;
+export declare const parseJSON: <T>(json: string, reviver?: (key: string, value: any) => any) => T;
 /**
  * sort array by priority prop
  *
@@ -25,6 +25,9 @@ export declare function sortByPriority<T extends {
  * @return {*}  {boolean}
  */
 export declare function isBase64<T = any>(value?: string | null | Message<T>): value is string;
-export declare function decodeMessage<T = any>(message: QueueWorkerRawMessage<T> | Message): QueueWorkerDecodedMessage<T>;
+export declare function decodeMessage<T = any>(message: QueueWorkerRawMessage<T> | Message, reviver?: (key: string, value: any) => any): QueueWorkerDecodedMessage<T>;
 export declare function isDecodedMessage<T = any>(message: QueueWorkerRawMessage<T> | QueueWorkerDecodedMessage<T> | Message<T>): message is QueueWorkerDecodedMessage<T>;
+export declare function isTaskMessage<T>(message?: QueueWorkerRawMessage<T> | Message<T> | null): message is Message<T> & {
+    headers?: Record<string, string>;
+};
 export declare function isMessage<T>(message?: QueueWorkerRawMessage<T> | Message<T> | null): message is Message<T>;

package/dist/util.js

@@ -5,6 +5,7 @@ exports.sortByPriority = sortByPriority;
 exports.isBase64 = isBase64;
 exports.decodeMessage = decodeMessage;
 exports.isDecodedMessage = isDecodedMessage;
+exports.isTaskMessage = isTaskMessage;
 exports.isMessage = isMessage;
 const common_1 = require("@nestjs/common");
 const constants_1 = require("./constants");
@@ -14,18 +15,19 @@ const dateRegExp = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
  * JSON.parse has receiver for Date.parse.
  * @param json
  */
-const parseJSON = (json) => {
-    return JSON.parse(json, (_, value) => {
-        if (typeof value === "string" && value.length === 24 && dateRegExp.test(value)) {
-            const date = new Date(value);
-            if (+date === +date) {
-                return date;
-            }
-        }
-        return value;
-    });
+const parseJSON = (json, reviver) => {
+    return JSON.parse(json, (key, value) => reviver ? reviver(key, parseDate(key, value)) : parseDate(key, value));
 };
 exports.parseJSON = parseJSON;
+function parseDate(key, value) {
+    if (typeof value === "string" && value.length === 24 && dateRegExp.test(value)) {
+        const date = new Date(value);
+        if (+date === +date) {
+            return date;
+        }
+    }
+    return value;
+}
 /**
  * sort array by priority prop
  *
@@ -62,14 +64,18 @@ function isBase64(value) {
     const firstPaddingChar = value.indexOf("=");
     return (firstPaddingChar === -1 || firstPaddingChar === len - 1 || (firstPaddingChar === len - 2 && value[len - 1] === "="));
 }
-function decodeMessage(message) {
+function decodeMessage(message, reviver) {
     let data;
     if (isBase64(message.data)) {
         // pubsub
-        data = decodeData(message.data);
+        data = decodeData(message.data, reviver);
+    }
+    else if (isTaskMessage(message)) {
+        // tasks
+        data = { data: JSON.parse(JSON.stringify(message.data), reviver), name: message.name };
     }
     else {
-        // tasks / http / raw
+        // http / raw
         const _message = isMessage(message) ? message : isMessage(message.data) ? message.data : undefined;
         if (!_message) {
             throw new common_1.BadRequestException(constants_1.ERROR_INVALID_MESSAGE_FORMAT);
@@ -89,12 +95,19 @@ function decodeMessage(message) {
 function isDecodedMessage(message) {
     return "raw" in message;
 }
+function isTaskMessage(message) {
+    if (!message) {
+        return false;
+    }
+    const keys = Object.keys(message);
+    return keys.length <= 3 && keys.includes("name") && keys.includes("headers");
+}
 function isMessage(message) {
     if (!message) {
         return false;
     }
     const keys = Object.keys(message);
-    return keys.length <= 2 && keys.includes("name");
+    return keys.length <= 3 && keys.includes("name");
 }
 function getMessageId(raw) {
     if (!raw) {
@@ -108,7 +121,7 @@ function getMessageId(raw) {
     }
     return "";
 }
-function decodeData(data) {
+function decodeData(data, reviver) {
     if (!data) {
         throw new common_1.BadRequestException(constants_1.ERROR_INVALID_MESSAGE_FORMAT);
     }
@@ -123,7 +136,7 @@ function decodeData(data) {
     }
     try {
         if (typeof data === "string") {
-            return (0, exports.parseJSON)(data);
+            return (0, exports.parseJSON)(data, reviver);
         }
         return data;
     }

package/dist/worker.service.js

@@ -38,7 +38,9 @@ let QueueWorkerService = class QueueWorkerService {
         _QueueWorkerService__allWorkers.set(this, void 0);
     }
     async execute(meessage) {
-        const decodedMessage = (0, util_1.isDecodedMessage)(meessage) ? meessage : (0, util_1.decodeMessage)(meessage);
+        const decodedMessage = (0, util_1.isDecodedMessage)(meessage)
+            ? meessage
+            : (0, util_1.decodeMessage)(meessage, this.options.extraConfig?.parseReviver);
         if (this.options.throwModuleError && !decodedMessage.data.name) {
             throw new common_1.BadRequestException(constants_1.ERROR_QUEUE_WORKER_NAME_NOT_FOUND);
         }
@@ -53,7 +55,9 @@ let QueueWorkerService = class QueueWorkerService {
         return results;
     }
     getWorkers(meessage) {
-        const decodedMessage = (0, util_1.isDecodedMessage)(meessage) ? meessage : (0, util_1.decodeMessage)(meessage);
+        const decodedMessage = (0, util_1.isDecodedMessage)(meessage)
+            ? meessage
+            : (0, util_1.decodeMessage)(meessage, this.options.extraConfig?.parseReviver);
         if (!decodedMessage.data.name) {
             return [];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anchan828/nest-cloud-run-queue-worker",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "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": "^3.1.2"
+    "@anchan828/nest-cloud-run-queue-common": "^3.1.4"
   },
   "devDependencies": {
     "@nestjs/common": "10.3.10",
@@ -46,5 +46,5 @@
     "access": "public"
   },
   "packageManager": "npm@10.8.2",
-  "gitHead": "4977a74e6b471b9d83ea385ade570bf48c27b666"
+  "gitHead": "59b149b8f18577d466b94e4a7ac979bbc6ed7d7b"
 }