@rsdk/grpc.server 2.3.1 → 2.4.1-next.0
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
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
|
+
## [2.4.1-next.0](https://github.com/R-Vision/rsdk/compare/v2.4.0...v2.4.1-next.0) (2023-06-15)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rsdk/grpc.server
|
|
9
|
+
|
|
10
|
+
# [2.4.0](https://github.com/R-Vision/rsdk/compare/v2.3.1...v2.4.0) (2023-06-15)
|
|
11
|
+
|
|
12
|
+
**Note:** Version bump only for package @rsdk/grpc.server
|
|
13
|
+
|
|
6
14
|
## [2.3.1](https://github.com/R-Vision/rsdk/compare/v2.3.0...v2.3.1) (2023-06-08)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @rsdk/grpc.server
|
package/dist/grpc.transport.d.ts
CHANGED
|
@@ -6,9 +6,9 @@ import type { Package } from '@rsdk/grpc.loader';
|
|
|
6
6
|
export declare class GrpcTransport implements IMicroserviceTransport {
|
|
7
7
|
private readonly logger;
|
|
8
8
|
private readonly packages;
|
|
9
|
-
private address
|
|
10
|
-
private maxRecv
|
|
11
|
-
private maxSend
|
|
9
|
+
private address?;
|
|
10
|
+
private maxRecv?;
|
|
11
|
+
private maxSend?;
|
|
12
12
|
private isInitialized;
|
|
13
13
|
constructor(...packages: Package[]);
|
|
14
14
|
getProtocol(): string;
|
package/dist/grpc.transport.js
CHANGED
|
@@ -51,10 +51,10 @@ class GrpcTransport {
|
|
|
51
51
|
createMicroserviceOptions() {
|
|
52
52
|
this.checkIsInitialized();
|
|
53
53
|
const packages = [...this.packages];
|
|
54
|
-
if (!packages.
|
|
54
|
+
if (!packages.some((x) => x.name === grpc_health_v1_1.default.name)) {
|
|
55
55
|
packages.push(grpc_health_v1_1.default);
|
|
56
56
|
}
|
|
57
|
-
if (!packages.
|
|
57
|
+
if (!packages.some((x) => x.name === grpc_metrics_v1_1.default.name)) {
|
|
58
58
|
packages.push(grpc_metrics_v1_1.default);
|
|
59
59
|
}
|
|
60
60
|
for (const pkg of packages) {
|
|
@@ -63,6 +63,7 @@ class GrpcTransport {
|
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
return (0, grpc_loader_1.createGrpcOptions)(packages, {
|
|
66
|
+
// FIXME добавить проверку
|
|
66
67
|
address: this.address,
|
|
67
68
|
maxRecv: this.maxRecv,
|
|
68
69
|
maxSend: this.maxSend,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc.transport.js","sourceRoot":"","sources":["../src/grpc.transport.ts"],"names":[],"mappings":";;;;;;AAEA,gGAA2E;AAC3E,kGAA6E;AAQ7E,qCAA+C;AAE/C,mDAAsD;AACtD,2CAA8C;AAE9C,+CAAoE;AACpE,+CAA2C;AAC3C,mEAA8D;AAE9D,MAAa,aAAa;IACP,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC7C,QAAQ,CAAY;IAE7B,OAAO,
|
|
1
|
+
{"version":3,"file":"grpc.transport.js","sourceRoot":"","sources":["../src/grpc.transport.ts"],"names":[],"mappings":";;;;;;AAEA,gGAA2E;AAC3E,kGAA6E;AAQ7E,qCAA+C;AAE/C,mDAAsD;AACtD,2CAA8C;AAE9C,+CAAoE;AACpE,+CAA2C;AAC3C,mEAA8D;AAE9D,MAAa,aAAa;IACP,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC7C,QAAQ,CAAY;IAE7B,OAAO,CAAU;IACjB,OAAO,CAAU;IACjB,OAAO,CAAU;IAEjB,aAAa,GAAG,KAAK,CAAC;IAE9B,YAAY,GAAG,QAAmB;QAChC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,WAAW;QACT,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,2CAAmB,EAAE,CAAC;IACnC,CAAC;IAED,oBAAoB;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,oBAAoB;QAClB,OAAO,+BAAiB,CAAC;IAC3B,CAAC;IAED,mBAAmB;QACjB,OAAO,8BAAgB,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACH,IAAI,CAAC,aAA4B;QAC/B,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,wBAAU,CAAC,CAAC;QAExE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,yBAAyB;QACvB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEpC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,wBAAiB,CAAC,IAAI,CAAC,EAAE;YAC5D,QAAQ,CAAC,IAAI,CAAC,wBAAiB,CAAC,CAAC;SAClC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,yBAAkB,CAAC,IAAI,CAAC,EAAE;YAC7D,QAAQ,CAAC,IAAI,CAAC,yBAAkB,CAAC,CAAC;SACnC;QAED,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;YAC1B,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE;gBAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,GAAG,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC,CAAC;aACjE;SACF;QAED,OAAO,IAAA,+BAAiB,EAAC,QAAQ,EAAE;YACjC,0BAA0B;YAC1B,OAAO,EAAE,IAAI,CAAC,OAAQ;YACtB,OAAO,EAAE,IAAI,CAAC,OAAQ;YACtB,OAAO,EAAE,IAAI,CAAC,OAAQ;SACvB,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACvE,CAAC;IAEO,kBAAkB;QACxB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,MAAM,IAAI,wBAAiB,CAAC,sCAAsC,CAAC,CAAC;SACrE;IACH,CAAC;CACF;AArFD,sCAqFC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/grpc.server",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.1-next.0",
|
|
4
4
|
"description": "Grpc transport for platform, clients and common grpc stuff",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -14,15 +14,15 @@
|
|
|
14
14
|
"@grpc/grpc-js": "^1.8.8",
|
|
15
15
|
"@nestjs/common": "^9.0.0",
|
|
16
16
|
"@nestjs/microservices": "^9.0.0",
|
|
17
|
-
"@rsdk/builtin-contract": "^2.
|
|
18
|
-
"@rsdk/common": "^2.
|
|
19
|
-
"@rsdk/core": "^2.
|
|
20
|
-
"@rsdk/grpc.common": "^2.
|
|
21
|
-
"@rsdk/grpc.loader": "^2.
|
|
22
|
-
"@rsdk/logging": "^2.
|
|
17
|
+
"@rsdk/builtin-contract": "^2.4.1-next.0",
|
|
18
|
+
"@rsdk/common": "^2.4.1-next.0",
|
|
19
|
+
"@rsdk/core": "^2.4.1-next.0",
|
|
20
|
+
"@rsdk/grpc.common": "^2.4.1-next.0",
|
|
21
|
+
"@rsdk/grpc.loader": "^2.4.1-next.0",
|
|
22
|
+
"@rsdk/logging": "^2.4.1-next.0",
|
|
23
23
|
"nice-grpc": "^2.1.4",
|
|
24
24
|
"nice-grpc-opentelemetry": "^0.1.3",
|
|
25
25
|
"rxjs": "^7.0.0"
|
|
26
26
|
},
|
|
27
|
-
"gitHead": "
|
|
27
|
+
"gitHead": "02cbc6be59dcf7d7784b316b315eb746c6d5ac4a"
|
|
28
28
|
}
|
package/src/grpc.transport.ts
CHANGED
|
@@ -22,9 +22,9 @@ export class GrpcTransport implements IMicroserviceTransport {
|
|
|
22
22
|
private readonly logger = LoggerFactory.create(GrpcTransport);
|
|
23
23
|
private readonly packages: Package[];
|
|
24
24
|
|
|
25
|
-
private address
|
|
26
|
-
private maxRecv
|
|
27
|
-
private maxSend
|
|
25
|
+
private address?: string;
|
|
26
|
+
private maxRecv?: number;
|
|
27
|
+
private maxSend?: number;
|
|
28
28
|
|
|
29
29
|
private isInitialized = false;
|
|
30
30
|
|
|
@@ -70,11 +70,11 @@ export class GrpcTransport implements IMicroserviceTransport {
|
|
|
70
70
|
|
|
71
71
|
const packages = [...this.packages];
|
|
72
72
|
|
|
73
|
-
if (!packages.
|
|
73
|
+
if (!packages.some((x) => x.name === HealthGrpcPackage.name)) {
|
|
74
74
|
packages.push(HealthGrpcPackage);
|
|
75
75
|
}
|
|
76
76
|
|
|
77
|
-
if (!packages.
|
|
77
|
+
if (!packages.some((x) => x.name === MetricsGrpcPackage.name)) {
|
|
78
78
|
packages.push(MetricsGrpcPackage);
|
|
79
79
|
}
|
|
80
80
|
|
|
@@ -85,9 +85,10 @@ export class GrpcTransport implements IMicroserviceTransport {
|
|
|
85
85
|
}
|
|
86
86
|
|
|
87
87
|
return createGrpcOptions(packages, {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
88
|
+
// FIXME добавить проверку
|
|
89
|
+
address: this.address!,
|
|
90
|
+
maxRecv: this.maxRecv!,
|
|
91
|
+
maxSend: this.maxSend!,
|
|
91
92
|
});
|
|
92
93
|
}
|
|
93
94
|
|