@pristine-ts/express 1.0.432 → 1.0.433
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.
|
@@ -14,10 +14,11 @@ const tsyringe_1 = require("tsyringe");
|
|
|
14
14
|
const http_headers_mapper_1 = require("./http-headers.mapper");
|
|
15
15
|
const method_mapper_1 = require("./method.mapper");
|
|
16
16
|
const common_1 = require("@pristine-ts/common");
|
|
17
|
-
const
|
|
17
|
+
const core_1 = require("@pristine-ts/core");
|
|
18
18
|
let RequestMapper = class RequestMapper {
|
|
19
|
-
constructor(httpHeadersMapper, methodMapper) {
|
|
19
|
+
constructor(httpHeadersMapper, eventIdManager, methodMapper) {
|
|
20
20
|
this.httpHeadersMapper = httpHeadersMapper;
|
|
21
|
+
this.eventIdManager = eventIdManager;
|
|
21
22
|
this.methodMapper = methodMapper;
|
|
22
23
|
}
|
|
23
24
|
/**
|
|
@@ -27,7 +28,7 @@ let RequestMapper = class RequestMapper {
|
|
|
27
28
|
map(expressRequest) {
|
|
28
29
|
const requestId = expressRequest.header("x-pristine-request-id");
|
|
29
30
|
const requestGroupId = expressRequest.header("x-pristine-event-group-id");
|
|
30
|
-
const request = new common_1.Request(this.methodMapper.map(expressRequest.method), expressRequest.url, requestId !== null && requestId !== void 0 ? requestId :
|
|
31
|
+
const request = new common_1.Request(this.methodMapper.map(expressRequest.method), expressRequest.url, requestId !== null && requestId !== void 0 ? requestId : this.eventIdManager.generateEventId());
|
|
31
32
|
request.groupId = requestGroupId;
|
|
32
33
|
request.setHeaders(this.httpHeadersMapper.map(expressRequest.headers));
|
|
33
34
|
request.body = expressRequest.body;
|
|
@@ -39,6 +40,7 @@ exports.RequestMapper = RequestMapper;
|
|
|
39
40
|
exports.RequestMapper = RequestMapper = __decorate([
|
|
40
41
|
(0, tsyringe_1.injectable)(),
|
|
41
42
|
__metadata("design:paramtypes", [http_headers_mapper_1.HttpHeadersMapper,
|
|
43
|
+
core_1.EventIdManager,
|
|
42
44
|
method_mapper_1.MethodMapper])
|
|
43
45
|
], RequestMapper);
|
|
44
46
|
//# sourceMappingURL=request.mapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.mapper.js","sourceRoot":"","sources":["../../../../src/mappers/request.mapper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAoC;AAEpC,+DAAwD;AACxD,mDAA6C;AAC7C,gDAA4C;AAC5C
|
|
1
|
+
{"version":3,"file":"request.mapper.js","sourceRoot":"","sources":["../../../../src/mappers/request.mapper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAoC;AAEpC,+DAAwD;AACxD,mDAA6C;AAC7C,gDAA4C;AAC5C,4CAAiD;AAI1C,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YAA6B,iBAAoC,EACpC,cAA8B,EAC9B,YAA0B;QAF1B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAAc;IACvD,CAAC;IAED;;;OAGG;IACH,GAAG,CAAC,cAA8B;QAChC,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAA;QAChE,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAA;QAEzE,MAAM,OAAO,GAAG,IAAI,gBAAO,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,GAAG,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC;QAClJ,OAAO,CAAC,OAAO,GAAG,cAAc,CAAC;QACjC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QACvE,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;QACnC,OAAO,CAAC,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC;QAEtC,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAA;AAtBY,sCAAa;wBAAb,aAAa;IADzB,IAAA,qBAAU,GAAE;qCAEqC,uCAAiB;QACpB,qBAAc;QAChB,4BAAY;GAH5C,aAAa,CAsBzB"}
|
|
@@ -11,10 +11,11 @@ import { injectable } from "tsyringe";
|
|
|
11
11
|
import { HttpHeadersMapper } from "./http-headers.mapper";
|
|
12
12
|
import { MethodMapper } from "./method.mapper";
|
|
13
13
|
import { Request } from "@pristine-ts/common";
|
|
14
|
-
import {
|
|
14
|
+
import { EventIdManager } from "@pristine-ts/core";
|
|
15
15
|
let RequestMapper = class RequestMapper {
|
|
16
|
-
constructor(httpHeadersMapper, methodMapper) {
|
|
16
|
+
constructor(httpHeadersMapper, eventIdManager, methodMapper) {
|
|
17
17
|
this.httpHeadersMapper = httpHeadersMapper;
|
|
18
|
+
this.eventIdManager = eventIdManager;
|
|
18
19
|
this.methodMapper = methodMapper;
|
|
19
20
|
}
|
|
20
21
|
/**
|
|
@@ -24,7 +25,7 @@ let RequestMapper = class RequestMapper {
|
|
|
24
25
|
map(expressRequest) {
|
|
25
26
|
const requestId = expressRequest.header("x-pristine-request-id");
|
|
26
27
|
const requestGroupId = expressRequest.header("x-pristine-event-group-id");
|
|
27
|
-
const request = new Request(this.methodMapper.map(expressRequest.method), expressRequest.url, requestId !== null && requestId !== void 0 ? requestId :
|
|
28
|
+
const request = new Request(this.methodMapper.map(expressRequest.method), expressRequest.url, requestId !== null && requestId !== void 0 ? requestId : this.eventIdManager.generateEventId());
|
|
28
29
|
request.groupId = requestGroupId;
|
|
29
30
|
request.setHeaders(this.httpHeadersMapper.map(expressRequest.headers));
|
|
30
31
|
request.body = expressRequest.body;
|
|
@@ -35,6 +36,7 @@ let RequestMapper = class RequestMapper {
|
|
|
35
36
|
RequestMapper = __decorate([
|
|
36
37
|
injectable(),
|
|
37
38
|
__metadata("design:paramtypes", [HttpHeadersMapper,
|
|
39
|
+
EventIdManager,
|
|
38
40
|
MethodMapper])
|
|
39
41
|
], RequestMapper);
|
|
40
42
|
export { RequestMapper };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.mapper.js","sourceRoot":"","sources":["../../../../src/mappers/request.mapper.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"request.mapper.js","sourceRoot":"","sources":["../../../../src/mappers/request.mapper.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAI1C,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YAA6B,iBAAoC,EACpC,cAA8B,EAC9B,YAA0B;QAF1B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAAc;IACvD,CAAC;IAED;;;OAGG;IACH,GAAG,CAAC,cAA8B;QAChC,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAA;QAChE,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAA;QAEzE,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,GAAG,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC;QAClJ,OAAO,CAAC,OAAO,GAAG,cAAc,CAAC;QACjC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QACvE,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;QACnC,OAAO,CAAC,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC;QAEtC,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAA;AAtBY,aAAa;IADzB,UAAU,EAAE;qCAEqC,iBAAiB;QACpB,cAAc;QAChB,YAAY;GAH5C,aAAa,CAsBzB"}
|
|
@@ -2,10 +2,12 @@ import { Request as ExpressRequest } from "express";
|
|
|
2
2
|
import { HttpHeadersMapper } from "./http-headers.mapper";
|
|
3
3
|
import { MethodMapper } from "./method.mapper";
|
|
4
4
|
import { Request } from "@pristine-ts/common";
|
|
5
|
+
import { EventIdManager } from "@pristine-ts/core";
|
|
5
6
|
export declare class RequestMapper {
|
|
6
7
|
private readonly httpHeadersMapper;
|
|
8
|
+
private readonly eventIdManager;
|
|
7
9
|
private readonly methodMapper;
|
|
8
|
-
constructor(httpHeadersMapper: HttpHeadersMapper, methodMapper: MethodMapper);
|
|
10
|
+
constructor(httpHeadersMapper: HttpHeadersMapper, eventIdManager: EventIdManager, methodMapper: MethodMapper);
|
|
9
11
|
/**
|
|
10
12
|
* Maps an http expressRequest from express to a Pristine expressRequest.
|
|
11
13
|
* @param expressRequest The http expressRequest from express.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pristine-ts/express",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.433",
|
|
4
4
|
"description": "",
|
|
5
5
|
"module": "dist/lib/esm/express.module.js",
|
|
6
6
|
"main": "dist/lib/cjs/express.module.js",
|
|
@@ -20,9 +20,9 @@
|
|
|
20
20
|
"access": "public"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@pristine-ts/common": "^1.0.
|
|
24
|
-
"@pristine-ts/core": "^1.0.
|
|
25
|
-
"@pristine-ts/networking": "^1.0.
|
|
23
|
+
"@pristine-ts/common": "^1.0.433",
|
|
24
|
+
"@pristine-ts/core": "^1.0.433",
|
|
25
|
+
"@pristine-ts/networking": "^1.0.433",
|
|
26
26
|
"@types/express": "^4.17.20",
|
|
27
27
|
"express": "^4.18.2",
|
|
28
28
|
"reflect-metadata": "^0.1.13"
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"src/*.{js,ts}"
|
|
62
62
|
]
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "69a01cacfffcc4bb94ac203553ef9ee7b5450363",
|
|
65
65
|
"repository": {
|
|
66
66
|
"type": "git",
|
|
67
67
|
"url": "https://github.com/magieno/pristine-ts.git",
|