@rsdk/http.server 4.3.1 → 4.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/dist/http-adapter/abstract-rsdk-http-adapter.js +1 -1
- package/dist/http-adapter/abstract-rsdk-http-adapter.js.map +1 -1
- package/dist/http.headers.d.ts +2 -10
- package/dist/http.headers.js +4 -20
- package/dist/http.headers.js.map +1 -1
- package/dist/http.tracing-extractor.js +1 -1
- package/dist/http.tracing-extractor.js.map +1 -1
- package/package.json +5 -5
- package/src/http-adapter/abstract-rsdk-http-adapter.ts +1 -1
- package/src/http.headers.ts +5 -26
- package/src/http.tracing-extractor.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [4.3.2](https://github.com/R-Vision/rsdk/compare/v4.3.2-next.0...v4.3.2) (2024-03-26)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rsdk/http.server
|
|
9
|
+
|
|
10
|
+
## [4.3.2-next.0](https://github.com/R-Vision/rsdk/compare/v4.3.1...v4.3.2-next.0) (2024-03-26)
|
|
11
|
+
|
|
12
|
+
**Note:** Version bump only for package @rsdk/http.server
|
|
13
|
+
|
|
6
14
|
## [4.3.1](https://github.com/R-Vision/rsdk/compare/v4.3.1-next.0...v4.3.1) (2024-03-25)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @rsdk/http.server
|
|
@@ -17,7 +17,7 @@ class AbstractRsdkHttpTransport {
|
|
|
17
17
|
extract(executionContext) {
|
|
18
18
|
// TODO:
|
|
19
19
|
const req = executionContext.switchToHttp().getRequest();
|
|
20
|
-
return new http_headers_1.HttpHeaders(req.headers).getTracingHeaders(
|
|
20
|
+
return new http_headers_1.HttpHeaders(req.headers).getTracingHeaders();
|
|
21
21
|
},
|
|
22
22
|
};
|
|
23
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-rsdk-http-adapter.js","sourceRoot":"","sources":["../../src/http-adapter/abstract-rsdk-http-adapter.ts"],"names":[],"mappings":";;;AAIA,uCAA+C;AAC/C,6CAAgD;AAChD,4EAAmG;AAYnG,qCAAoE;AAEpE,qCAAwC;AAExC,gDAA6E;AAC7E,sDAI2B;AAC3B,gDAA4C;AAC5C,kDAA8C;AAE9C,wEAAmE;AAEnE,MAAsB,yBAAyB;IAC7C,kBAAkB;QAChB,OAAO;YACL,OAAO,CAAC,gBAA+B;gBACrC,QAAQ;gBACR,MAAM,GAAG,GAAG,gBAAgB,CAAC,YAAY,EAAE,CAAC,UAAU,EAAO,CAAC;gBAE9D,OAAO,IAAI,0BAAW,CACpB,GAAG,CAAC,OAAiC,CACtC,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"abstract-rsdk-http-adapter.js","sourceRoot":"","sources":["../../src/http-adapter/abstract-rsdk-http-adapter.ts"],"names":[],"mappings":"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"}
|
package/dist/http.headers.d.ts
CHANGED
|
@@ -4,20 +4,12 @@ import { TracingHeaders } from '@rsdk/core/dist/tracing/types';
|
|
|
4
4
|
* @description хелпер для нормализованного извлечения заголовков из http запроса
|
|
5
5
|
*/
|
|
6
6
|
export declare class HttpHeaders {
|
|
7
|
-
private headers;
|
|
8
7
|
constructor(headers: Record<string, string>);
|
|
9
8
|
get<K extends string>(key: MaybeReadonlyArray<K>): Record<K, string | undefined>;
|
|
10
9
|
get(key: string): string | undefined;
|
|
11
|
-
getTracingHeaders(
|
|
12
|
-
getHeaders(
|
|
13
|
-
'x-b3-parentspanid'?: string;
|
|
14
|
-
'x-b3-spanid'?: string;
|
|
15
|
-
'x-b3-traceid'?: string;
|
|
16
|
-
attributes: {
|
|
17
|
-
[p: string]: any;
|
|
18
|
-
};
|
|
10
|
+
getTracingHeaders(): TracingHeaders;
|
|
11
|
+
getHeaders(): {
|
|
19
12
|
'x-requestid'?: string;
|
|
20
|
-
spanName: string;
|
|
21
13
|
};
|
|
22
14
|
private normalizedHeaders;
|
|
23
15
|
}
|
package/dist/http.headers.js
CHANGED
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.HttpHeaders = void 0;
|
|
4
|
-
const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
|
|
5
4
|
const types_1 = require("@rsdk/core/dist/tracing/types");
|
|
6
5
|
/**
|
|
7
6
|
* @description хелпер для нормализованного извлечения заголовков из http запроса
|
|
8
7
|
*/
|
|
9
8
|
class HttpHeaders {
|
|
10
|
-
headers;
|
|
11
9
|
constructor(headers) {
|
|
12
|
-
this.headers = headers;
|
|
13
10
|
this.normalizedHeaders = Object.fromEntries(Object.entries(headers).map(([k, v]) => [k.toLowerCase(), v]));
|
|
14
11
|
}
|
|
15
12
|
get(key) {
|
|
@@ -18,24 +15,11 @@ class HttpHeaders {
|
|
|
18
15
|
}
|
|
19
16
|
return this.normalizedHeaders[key.toLowerCase()];
|
|
20
17
|
}
|
|
21
|
-
getTracingHeaders(
|
|
22
|
-
return new types_1.TracingHeaders(this.getHeaders(
|
|
18
|
+
getTracingHeaders() {
|
|
19
|
+
return new types_1.TracingHeaders(this.getHeaders());
|
|
23
20
|
}
|
|
24
|
-
getHeaders(
|
|
25
|
-
|
|
26
|
-
req.routeOptions?.url ||
|
|
27
|
-
req.routerPath ||
|
|
28
|
-
req.originalUrl;
|
|
29
|
-
const headers = this.get(types_1.tracingHeaders);
|
|
30
|
-
return {
|
|
31
|
-
spanName: req.method + ' ' + httpRoute,
|
|
32
|
-
...headers,
|
|
33
|
-
attributes: {
|
|
34
|
-
[semantic_conventions_1.SemanticAttributes.HTTP_METHOD]: req.method,
|
|
35
|
-
[semantic_conventions_1.SemanticAttributes.HTTP_ROUTE]: httpRoute,
|
|
36
|
-
[semantic_conventions_1.SemanticAttributes.HTTP_URL]: req.originalUrl || req.url,
|
|
37
|
-
},
|
|
38
|
-
};
|
|
21
|
+
getHeaders() {
|
|
22
|
+
return this.get(types_1.tracingHeaders);
|
|
39
23
|
}
|
|
40
24
|
normalizedHeaders;
|
|
41
25
|
}
|
package/dist/http.headers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.headers.js","sourceRoot":"","sources":["../src/http.headers.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"http.headers.js","sourceRoot":"","sources":["../src/http.headers.ts"],"names":[],"mappings":";;;AACA,yDAIuC;AAEvC;;GAEG;AACH,MAAa,WAAW;IACtB,YAAY,OAA+B;QACzC,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;IAQD,GAAG,CACD,GAAwC;QAExC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAE,GAAc,CAAC,WAAW,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,sBAAc,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,UAAU;QAGR,OAAO,IAAI,CAAC,GAAG,CAAC,sBAAc,CAAqB,CAAC;IACtD,CAAC;IAEO,iBAAiB,CAAyB;CACnD;AAjCD,kCAiCC"}
|
|
@@ -6,7 +6,7 @@ class HttpTracingExtractor {
|
|
|
6
6
|
extract(executionContext) {
|
|
7
7
|
// TODO:
|
|
8
8
|
const req = executionContext.switchToHttp().getRequest();
|
|
9
|
-
return new http_headers_1.HttpHeaders(req.headers).getTracingHeaders(
|
|
9
|
+
return new http_headers_1.HttpHeaders(req.headers).getTracingHeaders();
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
12
|
exports.HttpTracingExtractor = HttpTracingExtractor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.tracing-extractor.js","sourceRoot":"","sources":["../src/http.tracing-extractor.ts"],"names":[],"mappings":";;;AAIA,iDAA6C;AAE7C,MAAa,oBAAoB;IAC/B,OAAO,CAAC,gBAA+B;QACrC,QAAQ;QACR,MAAM,GAAG,GAAG,gBAAgB,CAAC,YAAY,EAAE,CAAC,UAAU,EAAO,CAAC;QAE9D,OAAO,IAAI,0BAAW,CACpB,GAAG,CAAC,OAAiC,CACtC,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"http.tracing-extractor.js","sourceRoot":"","sources":["../src/http.tracing-extractor.ts"],"names":[],"mappings":";;;AAIA,iDAA6C;AAE7C,MAAa,oBAAoB;IAC/B,OAAO,CAAC,gBAA+B;QACrC,QAAQ;QACR,MAAM,GAAG,GAAG,gBAAgB,CAAC,YAAY,EAAE,CAAC,UAAU,EAAO,CAAC;QAE9D,OAAO,IAAI,0BAAW,CACpB,GAAG,CAAC,OAAiC,CACtC,CAAC,iBAAiB,EAAE,CAAC;IACxB,CAAC;CACF;AATD,oDASC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/http.server",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.2",
|
|
4
4
|
"description": "HTTP transport for rsdk apps (needs some of HTTP adapters)",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -15,13 +15,13 @@
|
|
|
15
15
|
"@nestjs/core": "^10.0.0",
|
|
16
16
|
"@nestjs/swagger": "^7.0.0",
|
|
17
17
|
"@opentelemetry/semantic-conventions": "1.18.1",
|
|
18
|
-
"@rsdk/common": "^4.3.
|
|
19
|
-
"@rsdk/core": "^4.3.
|
|
20
|
-
"@rsdk/logging": "^4.3.
|
|
18
|
+
"@rsdk/common": "^4.3.2",
|
|
19
|
+
"@rsdk/core": "^4.3.2",
|
|
20
|
+
"@rsdk/logging": "^4.3.2",
|
|
21
21
|
"body-parser": "^1.20.1",
|
|
22
22
|
"cookie-parser": "^1.4.6",
|
|
23
23
|
"reflect-metadata": "^0.1.12 || ^0.2.0",
|
|
24
24
|
"rxjs": "^7.8.1"
|
|
25
25
|
},
|
|
26
|
-
"gitHead": "
|
|
26
|
+
"gitHead": "59132a84f7f50871f3905de360f14ecd6b3ebf3d"
|
|
27
27
|
}
|
package/src/http.headers.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
|
|
2
1
|
import type { MaybeReadonlyArray } from '@rsdk/common.node';
|
|
3
2
|
import {
|
|
4
3
|
type Headers,
|
|
@@ -10,7 +9,7 @@ import {
|
|
|
10
9
|
* @description хелпер для нормализованного извлечения заголовков из http запроса
|
|
11
10
|
*/
|
|
12
11
|
export class HttpHeaders {
|
|
13
|
-
constructor(
|
|
12
|
+
constructor(headers: Record<string, string>) {
|
|
14
13
|
this.normalizedHeaders = Object.fromEntries(
|
|
15
14
|
Object.entries(headers).map(([k, v]) => [k.toLowerCase(), v]),
|
|
16
15
|
);
|
|
@@ -31,34 +30,14 @@ export class HttpHeaders {
|
|
|
31
30
|
return this.normalizedHeaders[(key as string).toLowerCase()];
|
|
32
31
|
}
|
|
33
32
|
|
|
34
|
-
getTracingHeaders(
|
|
35
|
-
return new TracingHeaders(this.getHeaders(
|
|
33
|
+
getTracingHeaders(): TracingHeaders {
|
|
34
|
+
return new TracingHeaders(this.getHeaders());
|
|
36
35
|
}
|
|
37
36
|
|
|
38
|
-
getHeaders(
|
|
39
|
-
'x-b3-parentspanid'?: string;
|
|
40
|
-
'x-b3-spanid'?: string;
|
|
41
|
-
'x-b3-traceid'?: string;
|
|
42
|
-
attributes: { [p: string]: any };
|
|
37
|
+
getHeaders(): {
|
|
43
38
|
'x-requestid'?: string;
|
|
44
|
-
spanName: string;
|
|
45
39
|
} {
|
|
46
|
-
|
|
47
|
-
req.route?.path ||
|
|
48
|
-
req.routeOptions?.url ||
|
|
49
|
-
req.routerPath ||
|
|
50
|
-
req.originalUrl;
|
|
51
|
-
const headers = this.get(tracingHeaders) as Partial<Headers>;
|
|
52
|
-
|
|
53
|
-
return {
|
|
54
|
-
spanName: req.method! + ' ' + httpRoute,
|
|
55
|
-
...headers,
|
|
56
|
-
attributes: {
|
|
57
|
-
[SemanticAttributes.HTTP_METHOD]: req.method!,
|
|
58
|
-
[SemanticAttributes.HTTP_ROUTE]: httpRoute,
|
|
59
|
-
[SemanticAttributes.HTTP_URL]: req.originalUrl || req.url,
|
|
60
|
-
},
|
|
61
|
-
};
|
|
40
|
+
return this.get(tracingHeaders) as Partial<Headers>;
|
|
62
41
|
}
|
|
63
42
|
|
|
64
43
|
private normalizedHeaders: Record<string, string>;
|