@lad-tech/nsc-toolkit 1.15.5 → 1.17.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
-## [1.15.5](https://github.com/lad-tech/nsc-toolkit/compare/v1.15.4...v1.15.5) (2023-09-08)
+# [1.17.0](https://github.com/lad-tech/nsc-toolkit/compare/v1.16.0...v1.17.0) (2023-11-09)
 
 
-### Bug Fixes
+### Features
 
-* add nats error code to error message ([#83](https://github.com/lad-tech/nsc-toolkit/issues/83)) ([a043b5c](https://github.com/lad-tech/nsc-toolkit/commit/a043b5cbd0b71a513d8a6db4cc4305dd4d9182c6))
+* Передача и парсинг json в потоках ([8c40d92](https://github.com/lad-tech/nsc-toolkit/commit/8c40d9211055ea40668f33711f9cec5e4e0064d3)), closes [#85](https://github.com/lad-tech/nsc-toolkit/issues/85)

package/README.md

@@ -316,6 +316,7 @@ npm i
      - Инъекция через декоратор `@service` позволяет использовать функциональность сборки приложения в монолит. 
    * `@instance`:  
      - Используется для инъекции других зависимостей, например, объектов репозиториев. В него можно передать готовый объект с набором асинхронных методов. При вызове этих методов из его логики они будут видны в трассировках. Для получения таких зависимостей рекомендуется использовать DI-контейнеры.
+5.  Для передачи объектов в поток можно использовать встроенные классы `JsonToBufferTransform` и `BufferToJsonTransform`, с помощью которых склейка буфера при передаче и парсинг произойдет в автоматическом режиме
 
 ## Рекомендации
 

package/dist/Root.js

@@ -57,9 +57,12 @@ class Root {
         if (error instanceof Error) {
             message = error.message;
         }
-        else {
+        else if (typeof error === 'string') {
             message = error;
         }
+        else {
+            message = JSON.stringify(error);
+        }
         return {
             payload: null,
             error: {

package/dist/Service.js

@@ -348,11 +348,20 @@ class Service extends Root_1.Root {
         }
         catch (error) {
             logger.debug({ request: payload });
-            logger.error(error);
+            logger.error(this.createErrorMessageForLogger(error));
             this.finishSpan(span, error);
             return this.buildErrorMessage(error);
         }
     }
+    /**
+     * Make error object if error instance of Error object for logger
+     */
+    createErrorMessageForLogger(error) {
+        if (error instanceof Error) {
+            return { name: error.name, message: error.message, stack: error.stack };
+        }
+        return { message: JSON.stringify(error) };
+    }
     /**
      * Start service. Subscribe for subject and up http server
      */

package/dist/StreamOptions/BufferToJsonTransform.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BufferToJsonTransform = void 0;
+const stream_1 = require("stream");
+class BufferToJsonTransform extends stream_1.Transform {
+    constructor(options) {
+        super({ objectMode: true, highWaterMark: 10, ...options });
+        this.head = Buffer.from('');
+        this.logger = options.logger;
+    }
+    async _transform(tail, _, cb) {
+        try {
+            tail = Buffer.concat([this.head, Buffer.from(tail)]);
+            const jsonData = JSON.parse(tail.toString());
+            cb(null, jsonData);
+        }
+        catch (error) {
+            if (error instanceof SyntaxError) {
+                this.head = Buffer.from(tail);
+                this.logger.error(BufferToJsonTransform.errors.CONVERSION_ERROR, tail.toString());
+                cb();
+                return;
+            }
+            cb(error);
+        }
+    }
+}
+exports.BufferToJsonTransform = BufferToJsonTransform;
+BufferToJsonTransform.errors = {
+    CONVERSION_ERROR: 'Не удалось преобразовать данные',
+};
+//# sourceMappingURL=BufferToJsonTransform.js.map

package/dist/StreamOptions/JsonToBufferTransform.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonToBufferTransform = void 0;
+const stream_1 = require("stream");
+class JsonToBufferTransform extends stream_1.Transform {
+    transform(chunk, encoding, cb) {
+        cb(null, Buffer.from(JSON.stringify(chunk)));
+    }
+}
+exports.JsonToBufferTransform = JsonToBufferTransform;
+//# sourceMappingURL=JsonToBufferTransform.js.map

package/dist/StreamOptions/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./JsonToBufferTransform"), exports);
+__exportStar(require("./BufferToJsonTransform"), exports);
+//# sourceMappingURL=index.js.map

package/dist/index.js

@@ -20,4 +20,5 @@ __exportStar(require("./Method"), exports);
 __exportStar(require("./injector"), exports);
 __exportStar(require("./Container"), exports);
 __exportStar(require("./interfaces"), exports);
+__exportStar(require("./StreamOptions"), exports);
 //# sourceMappingURL=index.js.map

package/dist/types/Root.d.ts

@@ -17,7 +17,7 @@ export declare class Root {
      */
     protected getContext(baggage?: Baggage): opentelemetry.Context | undefined;
     protected getExpired(expired?: number, ownTimeout?: number): number;
-    protected buildErrorMessage(error: string | Error, code?: number): {
+    protected buildErrorMessage(error: string | Error | Record<any, any>, code?: number): {
         payload: null;
         error: {
             message: string;

package/dist/types/Service.d.ts

@@ -69,6 +69,10 @@ export declare class Service<E extends Emitter = Emitter> extends Root {
      * Run business logic for request
      */
     private handled;
+    /**
+     * Make error object if error instance of Error object for logger
+     */
+    private createErrorMessageForLogger;
     /**
      * Start service. Subscribe for subject and up http server
      */

package/dist/types/StreamOptions/BufferToJsonTransform.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { Logs } from '@lad-tech/toolbelt';
+import { Transform, TransformCallback, TransformOptions } from 'stream';
+export declare class BufferToJsonTransform<T = any> extends Transform {
+    private head;
+    private static errors;
+    private logger;
+    constructor(options: TransformOptions & {
+        logger: Logs.Logger;
+    });
+    _transform(tail: Buffer, _: BufferEncoding, cb: TransformCallback): Promise<void>;
+}

package/dist/types/StreamOptions/JsonToBufferTransform.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { Transform, TransformCallback } from 'stream';
+export declare class JsonToBufferTransform<T> extends Transform {
+    transform(chunk: T, encoding: BufferEncoding, cb: TransformCallback): void;
+}

package/dist/types/StreamOptions/index.d.ts

@@ -0,0 +1,2 @@
+export * from './JsonToBufferTransform';
+export * from './BufferToJsonTransform';

package/dist/types/index.d.ts

@@ -4,3 +4,4 @@ export * from './Method';
 export * from './injector';
 export * from './Container';
 export * from './interfaces';
+export * from './StreamOptions';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lad-tech/nsc-toolkit",
-  "version": "1.15.5",
+  "version": "1.17.0",
   "description": "Toolkit for create microservices around NATS",
   "main": "dist/index.js",
   "types": "./dist/types/index.d.ts",