@rsdk/graphql 5.0.0-next.1 → 5.0.0-next.3

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.0-next.3](https://github.com/R-Vision/rsdk/compare/v5.0.0-next.2...v5.0.0-next.3) (2024-07-11)
+
+### ⚠ BREAKING CHANGES
+
+* generalize tracing headers (#247)
+
+### Features
+
+* generalize tracing headers ([#247](https://github.com/R-Vision/rsdk/issues/247)) ([cee2ea6](https://github.com/R-Vision/rsdk/commit/cee2ea65c964705faf133397e285c051672c7512)), closes [#2](https://github.com/R-Vision/rsdk/issues/2) [#3](https://github.com/R-Vision/rsdk/issues/3) [#4](https://github.com/R-Vision/rsdk/issues/4) [#5](https://github.com/R-Vision/rsdk/issues/5)
+
+## [5.0.0-next.2](https://github.com/R-Vision/rsdk/compare/v5.0.0-next.1...v5.0.0-next.2) (2024-07-10)
+
+**Note:** Version bump only for package @rsdk/graphql
+
 ## [5.0.0-next.1](https://github.com/R-Vision/rsdk/compare/v5.0.0-next.0...v5.0.0-next.1) (2024-07-10)
 
 **Note:** Version bump only for package @rsdk/graphql

package/dist/gql.headers.d.ts

@@ -0,0 +1,7 @@
+import type { ExecutionContext } from '@nestjs/common';
+import type { GenericHeaders } from '@rsdk/core';
+export declare class GqlHeaders implements GenericHeaders {
+    private normalizedHeaders;
+    constructor(ctx: ExecutionContext);
+    get(key: string): string | undefined;
+}

package/dist/gql.headers.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GqlHeaders = void 0;
+class GqlHeaders {
+    normalizedHeaders;
+    constructor(ctx) {
+        const req = ctx.getArgs()[2]?.req;
+        /**
+         * При работе с подписки через веб сокет, заголовки передаются через connectionParams
+         * и мы перегоняем эти данные в request заголовки
+         */
+        const headers = {
+            ...req?.headers,
+            ...req?.connectionParams?.headers,
+        };
+        this.normalizedHeaders = Object.fromEntries(Object.entries(headers).map(([k, v]) => [k.toLowerCase(), v]));
+    }
+    get(key) {
+        return this.normalizedHeaders[key.toLowerCase()];
+    }
+}
+exports.GqlHeaders = GqlHeaders;
+//# sourceMappingURL=gql.headers.js.map

package/dist/gql.headers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gql.headers.js","sourceRoot":"","sources":["../src/gql.headers.ts"],"names":[],"mappings":";;;AAGA,MAAa,UAAU;IACb,iBAAiB,CAAyB;IAElD,YAAY,GAAqB;QAC/B,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;QAElC;;;WAGG;QACH,MAAM,OAAO,GAA2B;YACtC,GAAG,GAAG,EAAE,OAAO;YACf,GAAG,GAAG,EAAE,gBAAgB,EAAE,OAAO;SAClC,CAAC;QAEF,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,WAAW,CACzC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAC9D,CAAC;IACJ,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;IACnD,CAAC;CACF;AAvBD,gCAuBC"}

package/dist/graphql.plugin.d.ts

@@ -1,5 +1,5 @@
 import type { MiddlewareConsumer } from '@nestjs/common';
-import type { IErrorsFormatter, IErrorsSender, NestModuleDefinitions, PlatformAppPlugin, ProtocolTracingHeadersExtractor } from '@rsdk/core';
+import type { IErrorsFormatter, IErrorsSender, NestModuleDefinitions, PlatformAppPlugin, WithGenericHeaders } from '@rsdk/core';
 export type Approach = 'schema-first' | 'code-first';
 export interface GraphQLPluginOptions<T extends Approach> {
     approach: T;
@@ -16,12 +16,12 @@ export interface GraphQLPluginCodeFirstOptions extends GraphQLPluginOptions<'cod
 export declare const isCodeFirst: (options: GraphQLPluginOptions<Approach>) => options is GraphQLPluginCodeFirstOptions;
 export declare class GraphQLPlugin implements PlatformAppPlugin {
     private readonly options;
+    private readonly path;
+    constructor(options: GraphQLPluginCodeFirstOptions | GraphQLPluginSchemaFirstOptions);
     tracingHeadersExtractors(): {
         protocol: string;
-        extractor: ProtocolTracingHeadersExtractor;
+        extractor: WithGenericHeaders;
     }[];
-    private readonly path;
-    constructor(options: GraphQLPluginCodeFirstOptions | GraphQLPluginSchemaFirstOptions);
     forTransports(): Readonly<string[]>;
     modules(): NestModuleDefinitions;
     configureMiddleware(consumer: MiddlewareConsumer): void;

package/dist/graphql.plugin.js

@@ -10,7 +10,7 @@ const logging_1 = require("@rsdk/logging");
 const apollo_logger_adapter_1 = require("./apollo-logger.adapter");
 const config_1 = require("./config");
 const error_handling_1 = require("./error-handling");
-const gql_tracing_extractor_1 = require("./gql.tracing-extractor");
+const gql_headers_1 = require("./gql.headers");
 const graphql_logger_interceptor_1 = require("./graphql-logger.interceptor");
 const onConnect = (connectionParams) => {
     const out = connectionParams ?? {};
@@ -28,14 +28,6 @@ const isCodeFirst = (options) => options.approach === 'code-first';
 exports.isCodeFirst = isCodeFirst;
 class GraphQLPlugin {
     options;
-    tracingHeadersExtractors() {
-        return [
-            {
-                protocol: 'graphql',
-                extractor: new gql_tracing_extractor_1.GqlTracingExtractor(),
-            },
-        ];
-    }
     path;
     constructor(options) {
         this.options = options;
@@ -44,6 +36,16 @@ class GraphQLPlugin {
             this.path = '/' + this.path;
         }
     }
+    tracingHeadersExtractors() {
+        return [
+            {
+                protocol: 'graphql',
+                extractor: {
+                    extractHeaders: (ctx) => new gql_headers_1.GqlHeaders(ctx),
+                },
+            },
+        ];
+    }
     forTransports() {
         return ['http'];
     }

package/dist/graphql.plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.plugin.js","sourceRoot":"","sources":["../src/graphql.plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graphql.plugin.js","sourceRoot":"","sources":["../src/graphql.plugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/graphql",
-  "version": "5.0.0-next.1",
+  "version": "5.0.0-next.3",
   "description": "Plugin for graphql",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -29,5 +29,5 @@
     "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.8.1"
   },
-  "gitHead": "782da71b758d4e477d970b285774a435580b4dc2"
+  "gitHead": "c75ce1d8983ba69a6f855ba19536d28be0a9c519"
 }

package/src/gql.headers.ts

@@ -0,0 +1,27 @@
+import type { ExecutionContext } from '@nestjs/common';
+import type { GenericHeaders } from '@rsdk/core';
+
+export class GqlHeaders implements GenericHeaders {
+  private normalizedHeaders: Record<string, string>;
+
+  constructor(ctx: ExecutionContext) {
+    const req = ctx.getArgs()[2]?.req;
+
+    /**
+     * При работе с подписки через веб сокет, заголовки передаются через connectionParams
+     * и мы перегоняем эти данные в request заголовки
+     */
+    const headers: Record<string, string> = {
+      ...req?.headers,
+      ...req?.connectionParams?.headers,
+    };
+
+    this.normalizedHeaders = Object.fromEntries(
+      Object.entries(headers).map(([k, v]) => [k.toLowerCase(), v]),
+    );
+  }
+
+  get(key: string): string | undefined {
+    return this.normalizedHeaders[key.toLowerCase()];
+  }
+}

package/src/graphql.plugin.ts

@@ -10,14 +10,14 @@ import type {
   IErrorsSender,
   NestModuleDefinitions,
   PlatformAppPlugin,
-  ProtocolTracingHeadersExtractor,
+  WithGenericHeaders,
 } from '@rsdk/core';
 import { LoggerFactory } from '@rsdk/logging';
 
 import { ApolloLoggerAdapter } from './apollo-logger.adapter';
 import { GraphqlConfig, Playground } from './config';
 import { GraphQLErrorsFormatter, GraphQLErrorsSender } from './error-handling';
-import { GqlTracingExtractor } from './gql.tracing-extractor';
+import { GqlHeaders } from './gql.headers';
 import { GraphqlLoggerInterceptor } from './graphql-logger.interceptor';
 
 const onConnect = (connectionParams: any): any => {
@@ -67,18 +67,6 @@ export const isCodeFirst = (
   options.approach === 'code-first';
 
 export class GraphQLPlugin implements PlatformAppPlugin {
-  tracingHeadersExtractors(): {
-    protocol: string;
-    extractor: ProtocolTracingHeadersExtractor;
-  }[] {
-    return [
-      {
-        protocol: 'graphql',
-        extractor: new GqlTracingExtractor(),
-      },
-    ];
-  }
-
   private readonly path: string;
 
   constructor(
@@ -92,6 +80,20 @@ export class GraphQLPlugin implements PlatformAppPlugin {
     }
   }
 
+  tracingHeadersExtractors(): {
+    protocol: string;
+    extractor: WithGenericHeaders;
+  }[] {
+    return [
+      {
+        protocol: 'graphql',
+        extractor: {
+          extractHeaders: (ctx) => new GqlHeaders(ctx),
+        },
+      },
+    ];
+  }
+
   forTransports(): Readonly<string[]> {
     return ['http'];
   }

package/dist/gql.tracing-extractor.d.ts

@@ -1,6 +0,0 @@
-import type { ExecutionContext } from '@nestjs/common';
-import type { ProtocolTracingHeadersExtractor } from '@rsdk/core';
-import { TracingHeaders } from '@rsdk/core/dist/tracing/types';
-export declare class GqlTracingExtractor implements ProtocolTracingHeadersExtractor {
-    extract(executionContext: ExecutionContext): TracingHeaders;
-}

package/dist/gql.tracing-extractor.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GqlTracingExtractor = void 0;
-const types_1 = require("@rsdk/core/dist/tracing/types");
-const http_server_1 = require("@rsdk/http.server");
-class GqlTracingExtractor {
-    extract(executionContext) {
-        const req = executionContext.getArgs()[2]?.req; // аналог GqlExecutionContext.create(executionContext).getContext().req
-        /**
-         * При работе с сабскрипшен через веб сокет, заголовки передаются в опции подключения к сабскрипшен в переменную connectionParams
-         * и мы перегоняем эти данные в request заголовки
-         */
-        const headers = {
-            ...req?.headers,
-            ...req?.connectionParams?.headers,
-        };
-        const tracingHeaders = new http_server_1.HttpHeaders(headers).getHeaders();
-        return new types_1.TracingHeaders({
-            ...tracingHeaders,
-        });
-    }
-}
-exports.GqlTracingExtractor = GqlTracingExtractor;
-//# sourceMappingURL=gql.tracing-extractor.js.map

package/dist/gql.tracing-extractor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"gql.tracing-extractor.js","sourceRoot":"","sources":["../src/gql.tracing-extractor.ts"],"names":[],"mappings":";;;AAEA,yDAA+D;AAC/D,mDAAgD;AAEhD,MAAa,mBAAmB;IAC9B,OAAO,CAAC,gBAAkC;QACxC,MAAM,GAAG,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,uEAAuE;QAEvH;;;WAGG;QACH,MAAM,OAAO,GAAG;YACd,GAAG,GAAG,EAAE,OAAO;YACf,GAAG,GAAG,EAAE,gBAAgB,EAAE,OAAO;SAClC,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,yBAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;QAE7D,OAAO,IAAI,sBAAc,CAAC;YACxB,GAAG,cAAc;SAClB,CAAC,CAAC;IACL,CAAC;CACF;AAnBD,kDAmBC"}

package/src/gql.tracing-extractor.ts

@@ -1,25 +0,0 @@
-import type { ExecutionContext } from '@nestjs/common';
-import type { ProtocolTracingHeadersExtractor } from '@rsdk/core';
-import { TracingHeaders } from '@rsdk/core/dist/tracing/types';
-import { HttpHeaders } from '@rsdk/http.server';
-
-export class GqlTracingExtractor implements ProtocolTracingHeadersExtractor {
-  extract(executionContext: ExecutionContext): TracingHeaders {
-    const req = executionContext.getArgs()[2]?.req; // аналог GqlExecutionContext.create(executionContext).getContext().req
-
-    /**
-     * При работе с сабскрипшен через веб сокет, заголовки передаются в опции подключения к сабскрипшен в переменную connectionParams
-     * и мы перегоняем эти данные в request заголовки
-     */
-    const headers = {
-      ...req?.headers,
-      ...req?.connectionParams?.headers,
-    };
-
-    const tracingHeaders = new HttpHeaders(headers).getHeaders();
-
-    return new TracingHeaders({
-      ...tracingHeaders,
-    });
-  }
-}