@rsdk/grpc.clients 4.1.0 → 4.2.0-next.1

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.2.0-next.1](https://github.com/R-Vision/rsdk/compare/v4.2.0-next.0...v4.2.0-next.1) (2024-02-02)
+
+### Features
+
+* rework work with async context ([#201](https://github.com/R-Vision/rsdk/issues/201)) ([26de1a8](https://github.com/R-Vision/rsdk/commit/26de1a814692bcd082c2f1aaedad1215ec0df1a0))
+
+## [4.2.0-next.0](https://github.com/R-Vision/rsdk/compare/v4.1.0...v4.2.0-next.0) (2024-02-02)
+
+**Note:** Version bump only for package @rsdk/grpc.clients
+
 ## [4.1.0](https://github.com/R-Vision/rsdk/compare/v4.1.0-next.1...v4.1.0) (2024-01-24)
 
 **Note:** Version bump only for package @rsdk/grpc.clients

package/dist/middleware/request-metadata.middleware.js

@@ -9,14 +9,13 @@ const nice_grpc_1 = require("nice-grpc");
 const requestMetadataMiddleware = () => 
 // eslint-disable-next-line unicorn/consistent-function-scoping
 async function* (call, options) {
-    const requestMetadata = core_1.RequestMetadataStorage.getInstance()?.getRequestMetadata();
-    if (!requestMetadata) {
+    const requestId = core_1.RequestIdProvider.get();
+    if (requestId === undefined) {
         return yield* call.next(call.request, {
             ...options,
         });
     }
     const metadata = options.metadata ?? new nice_grpc_1.Metadata();
-    const requestId = requestMetadata.requestId;
     if (requestId) {
         metadata.append(core_1.X_REQUEST_ID, requestId);
     }

package/dist/middleware/request-metadata.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-metadata.middleware.js","sourceRoot":"","sources":["../../src/middleware/request-metadata.middleware.ts"],"names":[],"mappings":";;;AAAA,qCAAkE;AAElE,yCAAqC;AAErC;;GAEG;AACI,MAAM,yBAAyB,GAAG,GAAqB,EAAE;AAC9D,+DAA+D;AAC/D,KAAK,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO;IAC5B,MAAM,eAAe,GACnB,6BAAsB,CAAC,WAAW,EAAE,EAAE,kBAAkB,EAAE,CAAC;IAC7D,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACpC,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC;IACD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,oBAAQ,EAAE,CAAC;IAEpD,MAAM,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC;IAC5C,IAAI,SAAS,EAAE,CAAC;QACd,QAAQ,CAAC,MAAM,CAAC,mBAAY,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAE5B,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACpC,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC,CAAC;AAtBS,QAAA,yBAAyB,6BAsBlC"}
+{"version":3,"file":"request-metadata.middleware.js","sourceRoot":"","sources":["../../src/middleware/request-metadata.middleware.ts"],"names":[],"mappings":";;;AAAA,qCAA6D;AAE7D,yCAAqC;AAErC;;GAEG;AACI,MAAM,yBAAyB,GAAG,GAAqB,EAAE;AAC9D,+DAA+D;AAC/D,KAAK,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO;IAC5B,MAAM,SAAS,GAAG,wBAAiB,CAAC,GAAG,EAAE,CAAC;IAC1C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACpC,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC;IACD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,oBAAQ,EAAE,CAAC;IAEpD,IAAI,SAAS,EAAE,CAAC;QACd,QAAQ,CAAC,MAAM,CAAC,mBAAY,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAE5B,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACpC,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC,CAAC;AApBS,QAAA,yBAAyB,6BAoBlC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/grpc.clients",
-  "version": "4.1.0",
+  "version": "4.2.0-next.1",
   "description": "Grpc clients infrastructure",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -17,16 +17,16 @@
     "@nestjs/microservices": "^10.0.0",
     "@opentelemetry/propagator-b3": "1.18.1",
     "@opentelemetry/sdk-node": "0.45.1",
-    "@rsdk/autodoc.protocol": "^4.1.0",
-    "@rsdk/builtin-contract": "^4.1.0",
-    "@rsdk/common": "^4.1.0",
-    "@rsdk/core": "^4.1.0",
-    "@rsdk/grpc.common": "^4.1.0",
-    "@rsdk/logging": "^4.1.0",
-    "@rsdk/metadata": "^4.1.0",
+    "@rsdk/autodoc.protocol": "^4.2.0-next.1",
+    "@rsdk/builtin-contract": "^4.2.0-next.1",
+    "@rsdk/common": "^4.2.0-next.1",
+    "@rsdk/core": "^4.2.0-next.1",
+    "@rsdk/grpc.common": "^4.2.0-next.1",
+    "@rsdk/logging": "^4.2.0-next.1",
+    "@rsdk/metadata": "^4.2.0-next.1",
     "nice-grpc": "^2.1.4",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1"
   },
-  "gitHead": "3215698c567d2eb6018b2e1147217cd305f696c2"
+  "gitHead": "e42244b7badde74fec2badc60a85d53878fe75ae"
 }

package/src/middleware/request-metadata.middleware.ts

@@ -1,4 +1,4 @@
-import { RequestMetadataStorage, X_REQUEST_ID } from '@rsdk/core';
+import { RequestIdProvider, X_REQUEST_ID } from '@rsdk/core';
 import type { ClientMiddleware } from 'nice-grpc';
 import { Metadata } from 'nice-grpc';
 
@@ -8,16 +8,14 @@ import { Metadata } from 'nice-grpc';
 export const requestMetadataMiddleware = (): ClientMiddleware =>
   // eslint-disable-next-line unicorn/consistent-function-scoping
   async function* (call, options) {
-    const requestMetadata =
-      RequestMetadataStorage.getInstance()?.getRequestMetadata();
-    if (!requestMetadata) {
+    const requestId = RequestIdProvider.get();
+    if (requestId === undefined) {
       return yield* call.next(call.request, {
         ...options,
       });
     }
     const metadata = options.metadata ?? new Metadata();
 
-    const requestId = requestMetadata.requestId;
     if (requestId) {
       metadata.append(X_REQUEST_ID, requestId);
     }