@anchan828/nest-cloud-run-queue-worker 1.0.10 → 1.0.13

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { ALL_WORKERS_QUEUE_WORKER_NAME as ALL_QUEUE_WORKERS, UNHANDLED_QUEUE_WORKER_NAME as UNHANDLED_QUEUE_WORKER, } from "./constants";
 export { QueueWorker, QueueWorkerProcess } from "./decorators";
-export { QueueWorkerModuleAsyncOptions, QueueWorkerModuleOptions, QueueWorkerModuleOptionsFactory, QueueWorkerProcessor, QueueWorkerProcessorStatus, QueueWorkerExtraConfig, QueueWorkerRawMessage, QueueWorkerControllerInterface, QueueWorkerControllerMetadata, QueueWorkerReceivedMessage, } from "./interfaces";
+export { QueueWorkerModuleAsyncOptions, QueueWorkerModuleOptions, QueueWorkerModuleOptionsFactory, QueueWorkerProcessor, QueueWorkerProcessorStatus, QueueWorkerExtraConfig, QueueWorkerRawMessage, QueueWorkerControllerInterface, QueueWorkerControllerMetadata, QueueWorkerReceivedMessage, QueueWorkerDecodedMessage, } from "./interfaces";
 export { QueueWorkerModule } from "./worker.module";
 export { QueueWorkerService } from "./worker.service";

package/dist/interfaces.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" />
-import { QueueWorkerName, ModuleAsyncOptions, ModuleOptions, ModuleOptionsFactory } from "@anchan828/nest-cloud-run-queue-common";
+import { QueueWorkerName, ModuleAsyncOptions, ModuleOptions, ModuleOptionsFactory, Message } from "@anchan828/nest-cloud-run-queue-common";
 import { RequestMappingMetadata } from "@nestjs/common";
 import { Injectable } from "@nestjs/common/interfaces";
 export interface QueueWorkerModuleOptions extends ModuleOptions {
@@ -35,7 +34,7 @@ export interface QueueWorkerModuleOptions extends ModuleOptions {
 }
 export declare type QueueWorkerModuleAsyncOptions = ModuleAsyncOptions<Omit<QueueWorkerModuleOptions, "workerController">> & Pick<QueueWorkerModuleOptions, "workerController">;
 export declare type QueueWorkerModuleOptionsFactory = ModuleOptionsFactory<Omit<QueueWorkerModuleOptions, "workerController">> & Pick<QueueWorkerModuleOptions, "workerController">;
-export declare type QueueWorkerProcessor = <T>(message: T, rawMessage: QueueWorkerRawMessage) => Promise<void> | void;
+export declare type QueueWorkerProcessor = <T>(message: T, raw: QueueWorkerRawMessage) => Promise<void> | void;
 export interface QueueWorkerMetadata {
     instance: Injectable;
     processors: QueueWorkerProcessorMetadata[];
@@ -72,10 +71,15 @@ export interface QueueWorkerProcessDecoratorArgs {
      */
     priority: number;
 }
-export declare type QueueWorkerRawMessage<T = Record<string, any>> = {
-    readonly data?: string | Uint8Array | Buffer | null;
+export declare type QueueWorkerRawMessage<T = any> = {
+    readonly data?: string | null | Message<T>;
     readonly headers?: Record<string, string>;
-} & T;
+} & Record<string, any>;
+export declare type QueueWorkerDecodedMessage<T = any> = {
+    readonly data: Message<T>;
+    readonly headers?: Record<string, string>;
+    readonly raw: QueueWorkerRawMessage;
+};
 export declare type QueueWorkerReceivedMessage = {
     readonly message: QueueWorkerRawMessage;
 };

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.d.ts

@@ -1,5 +1,5 @@
 import { Logger } from "@nestjs/common";
-import { QueueWorkerModuleOptions } from "./interfaces";
+import { QueueWorkerDecodedMessage, QueueWorkerModuleOptions } from "./interfaces";
 import { QueueWorkerExplorerService } from "./explorer.service";
 import { QueueWorkerRawMessage } from "./interfaces";
 export declare class QueueWorkerService {
@@ -8,7 +8,10 @@ export declare class QueueWorkerService {
     private readonly logger;
     private readonly explorerService;
     constructor(options: QueueWorkerModuleOptions, logger: Logger, explorerService: QueueWorkerExplorerService);
-    execute(message: QueueWorkerRawMessage): Promise<void>;
-    private execProcessor;
+    execute(rawMessage: QueueWorkerRawMessage | QueueWorkerDecodedMessage): Promise<void>;
+    decodeMessage<T = any>(message: QueueWorkerRawMessage): QueueWorkerDecodedMessage<T>;
+    private runWorkers;
+    private isDecodedMessage;
     private decodeData;
+    private execProcessor;
 }

package/dist/worker.service.js

@@ -31,11 +31,10 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _QueueWorkerService_allWorkers;
+var _QueueWorkerService_instances, _QueueWorkerService__allWorkers, _QueueWorkerService_allWorkers_get, _QueueWorkerService_spetialWorkers_get;
 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");
@@ -45,70 +44,67 @@ let QueueWorkerService = class QueueWorkerService {
         this.options = options;
         this.logger = logger;
         this.explorerService = explorerService;
-        _QueueWorkerService_allWorkers.set(this, void 0);
+        _QueueWorkerService_instances.add(this);
+        _QueueWorkerService__allWorkers.set(this, void 0);
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    execute(message) {
+    execute(rawMessage) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.runWorkers(this.isDecodedMessage(rawMessage) ? rawMessage : this.decodeMessage(rawMessage));
+        });
+    }
+    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,
+        };
+    }
+    runWorkers(decodedMessage) {
         var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!__classPrivateFieldGet(this, _QueueWorkerService_allWorkers, "f")) {
-                __classPrivateFieldSet(this, _QueueWorkerService_allWorkers, this.explorerService.explore(), "f");
-            }
             const maxRetryAttempts = (_a = this.options.maxRetryAttempts) !== null && _a !== void 0 ? _a : 1;
             const workers = [];
-            const spetialWorkers = [];
-            let data = { name: "" };
-            try {
-                data = this.decodeData(message.data);
-                if (!data.name) {
-                    throw new Error(constants_1.ERROR_QUEUE_WORKER_NAME_NOT_FOUND);
-                }
-                workers.push(...__classPrivateFieldGet(this, _QueueWorkerService_allWorkers, "f").filter((worker) => data.name === worker.name));
-                spetialWorkers.push(...__classPrivateFieldGet(this, _QueueWorkerService_allWorkers, "f").filter((worker) => [constants_1.ALL_WORKERS_QUEUE_WORKER_NAME, constants_1.UNHANDLED_QUEUE_WORKER_NAME].includes(worker.name)));
-                if (workers.length === 0) {
-                    throw new Error((0, constants_1.ERROR_WORKER_NOT_FOUND)(data.name));
-                }
-            }
-            catch (error) {
-                this.logger.error(error.message);
-                if (((_b = this.options) === null || _b === void 0 ? void 0 : _b.throwModuleError) && spetialWorkers.length === 0) {
-                    throw new common_1.BadRequestException(error.message);
-                }
+            workers.push(...__classPrivateFieldGet(this, _QueueWorkerService_instances, "a", _QueueWorkerService_allWorkers_get).filter((worker) => decodedMessage.data.name === worker.name));
+            if (((_b = this.options) === null || _b === void 0 ? void 0 : _b.throwModuleError) && workers.length === 0 && __classPrivateFieldGet(this, _QueueWorkerService_instances, "a", _QueueWorkerService_spetialWorkers_get).length === 0) {
+                throw new common_1.BadRequestException((0, constants_1.ERROR_WORKER_NOT_FOUND)(decodedMessage.data.name));
             }
             const processors = (0, util_1.sortByPriority)(workers)
                 .map((w) => (0, util_1.sortByPriority)(w.processors))
                 .flat();
-            const spetialProcessors = (0, util_1.sortByPriority)(spetialWorkers)
+            const spetialProcessors = (0, util_1.sortByPriority)(__classPrivateFieldGet(this, _QueueWorkerService_instances, "a", _QueueWorkerService_spetialWorkers_get))
                 .map((w) => (0, util_1.sortByPriority)(w.processors))
                 .flat();
-            const processorStatus = yield ((_d = (_c = this.options.extraConfig) === null || _c === void 0 ? void 0 : _c.preProcessor) === null || _d === void 0 ? void 0 : _d.call(_c, data.name, data.data, message));
+            const processorStatus = yield ((_d = (_c = this.options.extraConfig) === null || _c === void 0 ? void 0 : _c.preProcessor) === null || _d === void 0 ? void 0 : _d.call(_c, decodedMessage.data.name, decodedMessage.data.data, decodedMessage.raw));
             if (processorStatus !== interfaces_1.QueueWorkerProcessorStatus.SKIP) {
                 for (const processor of processors) {
-                    yield this.execProcessor(processor.processor, maxRetryAttempts, data.data, message);
+                    yield this.execProcessor(processor.processor, maxRetryAttempts, decodedMessage.data.data, decodedMessage.raw);
                 }
                 for (const processor of spetialProcessors) {
-                    yield this.execProcessor(processor.processor, maxRetryAttempts, data, message);
+                    yield this.execProcessor(processor.processor, maxRetryAttempts, decodedMessage.data, decodedMessage.raw);
                 }
             }
-            yield ((_f = (_e = this.options.extraConfig) === null || _e === void 0 ? void 0 : _e.postProcessor) === null || _f === void 0 ? void 0 : _f.call(_e, data.name, data.data, message));
+            yield ((_f = (_e = this.options.extraConfig) === null || _e === void 0 ? void 0 : _e.postProcessor) === null || _f === void 0 ? void 0 : _f.call(_e, decodedMessage.data.name, decodedMessage.data.data, decodedMessage.raw));
         });
     }
-    execProcessor(processor, maxRetryAttempts, data, rawMessage) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (let i = 0; i < maxRetryAttempts; i++) {
-                try {
-                    yield processor(data, rawMessage);
-                    i = maxRetryAttempts;
-                }
-                catch (error) {
-                    this.logger.error(error.message);
-                }
-            }
-        });
+    isDecodedMessage(message) {
+        return !!message.raw;
     }
     decodeData(data) {
         if (!data) {
-            throw new Error(constants_1.ERROR_INVALID_MESSAGE_FORMAT);
+            throw new common_1.BadRequestException(constants_1.ERROR_INVALID_MESSAGE_FORMAT);
         }
         if (Buffer.isBuffer(data)) {
             data = data.toString();
@@ -116,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 {
@@ -126,11 +122,31 @@ let QueueWorkerService = class QueueWorkerService {
             return data;
         }
         catch (_a) {
-            throw new Error(constants_1.ERROR_INVALID_MESSAGE_FORMAT);
+            throw new common_1.BadRequestException(constants_1.ERROR_INVALID_MESSAGE_FORMAT);
         }
     }
+    execProcessor(processor, maxRetryAttempts, data, raw) {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (let i = 0; i < maxRetryAttempts; i++) {
+                try {
+                    yield processor(data, raw);
+                    i = maxRetryAttempts;
+                }
+                catch (error) {
+                    this.logger.error(error.message);
+                }
+            }
+        });
+    }
+};
+_QueueWorkerService__allWorkers = new WeakMap(), _QueueWorkerService_instances = new WeakSet(), _QueueWorkerService_allWorkers_get = function _QueueWorkerService_allWorkers_get() {
+    if (!__classPrivateFieldGet(this, _QueueWorkerService__allWorkers, "f")) {
+        __classPrivateFieldSet(this, _QueueWorkerService__allWorkers, this.explorerService.explore(), "f");
+    }
+    return __classPrivateFieldGet(this, _QueueWorkerService__allWorkers, "f");
+}, _QueueWorkerService_spetialWorkers_get = function _QueueWorkerService_spetialWorkers_get() {
+    return (__classPrivateFieldGet(this, _QueueWorkerService__allWorkers, "f") || []).filter((worker) => [constants_1.ALL_WORKERS_QUEUE_WORKER_NAME, constants_1.UNHANDLED_QUEUE_WORKER_NAME].includes(worker.name));
 };
-_QueueWorkerService_allWorkers = new WeakMap();
 QueueWorkerService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)(constants_1.QUEUE_WORKER_MODULE_OPTIONS)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anchan828/nest-cloud-run-queue-worker",
-  "version": "1.0.10",
+  "version": "1.0.13",
   "description": "> TODO: description",
   "homepage": "https://github.com/anchan828/nest-cloud-run-queue/tree/master/packages/worker#readme",
   "bugs": {
@@ -33,8 +33,7 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@anchan828/nest-cloud-run-queue-common": "^1.0.10",
-    "class-validator": "0.13.2"
+    "@anchan828/nest-cloud-run-queue-common": "^1.0.13"
   },
   "devDependencies": {
     "@nestjs/common": "8.4.5",
@@ -46,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6d7b6c1abb9408cffa16aea7c4eb07f4f381a4fa"
+  "gitHead": "54936c9f95780c7c389cbacb4d824f4dedcb6678"
 }