@anchan828/nest-cloud-run-queue-worker 1.0.12 → 1.0.15

package/dist/interfaces.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { QueueWorkerName, ModuleAsyncOptions, ModuleOptions, ModuleOptionsFactory, Message } from "@anchan828/nest-cloud-run-queue-common";
 import { RequestMappingMetadata } from "@nestjs/common";
 import { Injectable } from "@nestjs/common/interfaces";
@@ -72,8 +71,8 @@ export interface QueueWorkerProcessDecoratorArgs {
      */
     priority: number;
 }
-export declare type QueueWorkerRawMessage = {
-    readonly data?: string | Uint8Array | Buffer | null;
+export declare type QueueWorkerRawMessage<T = any> = {
+    readonly data?: string | null | Message<T>;
     readonly headers?: Record<string, string>;
 } & Record<string, any>;
 export declare type QueueWorkerDecodedMessage<T = any> = {

package/dist/util.d.ts

@@ -1,3 +1,4 @@
+import { Message } from "@anchan828/nest-cloud-run-queue-common";
 /**
  * parse json string to javascript object.
  * JSON.parse has receiver for Date.parse.
@@ -15,3 +16,11 @@ export declare const parseJSON: <T>(json: string) => T;
 export declare function sortByPriority<T extends {
     priority: number;
 }>(items: T[]): T[];
+/**
+ * Check if a string is base64 encoded.
+ *
+ * @export
+ * @param {string} value
+ * @return {*}  {boolean}
+ */
+export declare function isBase64(value?: string | null | Message): value is string;

package/dist/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortByPriority = exports.parseJSON = void 0;
+exports.isBase64 = exports.sortByPriority = exports.parseJSON = void 0;
 const dateRegExp = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
 /**
  * parse json string to javascript object.
@@ -31,3 +31,29 @@ function sortByPriority(items) {
     return items.sort((x, y) => x.priority - y.priority);
 }
 exports.sortByPriority = sortByPriority;
+const customBase64Strs = ["e30"];
+/**
+ * Check if a string is base64 encoded.
+ *
+ * @export
+ * @param {string} value
+ * @return {*}  {boolean}
+ */
+function isBase64(value) {
+    if (!value) {
+        return false;
+    }
+    if (typeof value !== "string") {
+        return false;
+    }
+    const len = value.length;
+    if (len <= 4 && customBase64Strs.some((base64Str) => value.startsWith(base64Str))) {
+        return true;
+    }
+    if ((len === 4 && ![2, 3].every((n) => value[n] === "=")) || !len || len % 4 !== 0 || /[^A-Z0-9+\/=]/i.test(value)) {
+        return false;
+    }
+    const firstPaddingChar = value.indexOf("=");
+    return (firstPaddingChar === -1 || firstPaddingChar === len - 1 || (firstPaddingChar === len - 2 && value[len - 1] === "="));
+}
+exports.isBase64 = isBase64;

package/dist/worker.service.js

@@ -35,7 +35,6 @@ var _QueueWorkerService_instances, _QueueWorkerService__allWorkers, _QueueWorker
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueueWorkerService = void 0;
 const common_1 = require("@nestjs/common");
-const class_validator_1 = require("class-validator");
 const constants_1 = require("./constants");
 const explorer_service_1 = require("./explorer.service");
 const interfaces_1 = require("./interfaces");
@@ -55,7 +54,15 @@ let QueueWorkerService = class QueueWorkerService {
         });
     }
     decodeMessage(message) {
-        const data = this.decodeData(message.data);
+        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);
         }
@@ -105,7 +112,7 @@ let QueueWorkerService = class QueueWorkerService {
         if (data instanceof Uint8Array) {
             data = new TextDecoder("utf8").decode(data);
         }
-        if ((0, class_validator_1.isBase64)(data)) {
+        if ((0, util_1.isBase64)(data)) {
             data = Buffer.from(data, "base64").toString();
         }
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anchan828/nest-cloud-run-queue-worker",
-  "version": "1.0.12",
+  "version": "1.0.15",
   "description": "> TODO: description",
   "homepage": "https://github.com/anchan828/nest-cloud-run-queue/tree/master/packages/worker#readme",
   "bugs": {
@@ -33,11 +33,10 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@anchan828/nest-cloud-run-queue-common": "^1.0.12",
-    "class-validator": "0.13.2"
+    "@anchan828/nest-cloud-run-queue-common": "^1.0.15"
   },
   "devDependencies": {
-    "@nestjs/common": "8.4.5",
+    "@nestjs/common": "8.4.6",
     "rxjs": "7.5.5"
   },
   "peerDependencies": {
@@ -46,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4bc729dc2d2db026d22f5d36fe18eceeab6e04c7"
+  "gitHead": "5d07d0162dbf48f0eb3a3f6a8eef0d702c9bf844"
 }