@russ-b/nestjs-common-tools 1.1.18 → 1.1.20
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/dist/grpc/providers/grpc-options.provider.d.ts +6 -6
- package/dist/grpc/providers/grpc-options.provider.js +11 -14
- package/dist/grpc/providers/grpc-options.provider.js.map +1 -1
- package/dist/grpc/services/grpc-package-definition.service.js +9 -3
- package/dist/grpc/services/grpc-package-definition.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { GrpcOptions } from '@nestjs/microservices';
|
|
2
|
-
import { ConfigService } from '@nestjs/config';
|
|
3
2
|
import { GrpcPackageDefinitionService } from '../services';
|
|
4
3
|
interface IOptions {
|
|
5
|
-
usePackageDefinitionService
|
|
6
|
-
useReflectionService
|
|
4
|
+
usePackageDefinitionService?: boolean;
|
|
5
|
+
useReflectionService?: boolean;
|
|
6
|
+
protoDir: string;
|
|
7
|
+
packageName: string;
|
|
8
|
+
url: string;
|
|
7
9
|
}
|
|
8
10
|
export declare class GrpcOptionsProvider {
|
|
9
|
-
private readonly configService;
|
|
10
11
|
private readonly grpcPackageDefinitionService;
|
|
11
|
-
constructor(
|
|
12
|
+
constructor(grpcPackageDefinitionService: GrpcPackageDefinitionService);
|
|
12
13
|
getOptions(options?: IOptions): GrpcOptions;
|
|
13
|
-
private getProtoDir;
|
|
14
14
|
private getProtoPath;
|
|
15
15
|
}
|
|
16
16
|
export {};
|
|
@@ -13,20 +13,21 @@ exports.GrpcOptionsProvider = void 0;
|
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const microservices_1 = require("@nestjs/microservices");
|
|
15
15
|
const reflection_1 = require("@grpc/reflection");
|
|
16
|
-
const config_1 = require("@nestjs/config");
|
|
17
16
|
const node_fs_1 = require("node:fs");
|
|
18
17
|
const node_path_1 = require("node:path");
|
|
19
18
|
const services_1 = require("../services");
|
|
20
19
|
let GrpcOptionsProvider = class GrpcOptionsProvider {
|
|
21
|
-
constructor(
|
|
22
|
-
this.configService = configService;
|
|
20
|
+
constructor(grpcPackageDefinitionService) {
|
|
23
21
|
this.grpcPackageDefinitionService = grpcPackageDefinitionService;
|
|
24
22
|
}
|
|
25
23
|
getOptions(options = {
|
|
26
24
|
usePackageDefinitionService: false,
|
|
27
25
|
useReflectionService: true,
|
|
26
|
+
protoDir: (0, node_path_1.join)(__dirname, '../../proto'),
|
|
27
|
+
packageName: '',
|
|
28
|
+
url: '0.0.0.0:50051',
|
|
28
29
|
}) {
|
|
29
|
-
const packageName =
|
|
30
|
+
const packageName = options.packageName;
|
|
30
31
|
return {
|
|
31
32
|
transport: microservices_1.Transport.GRPC,
|
|
32
33
|
options: {
|
|
@@ -34,12 +35,12 @@ let GrpcOptionsProvider = class GrpcOptionsProvider {
|
|
|
34
35
|
longs: Number,
|
|
35
36
|
arrays: true,
|
|
36
37
|
objects: true,
|
|
37
|
-
includeDirs: [
|
|
38
|
+
includeDirs: [options.protoDir],
|
|
38
39
|
},
|
|
39
40
|
gracefulShutdown: true,
|
|
40
|
-
url:
|
|
41
|
+
url: options.url,
|
|
41
42
|
package: packageName,
|
|
42
|
-
protoPath: this.getProtoPath(packageName),
|
|
43
|
+
protoPath: this.getProtoPath(packageName, options.protoDir),
|
|
43
44
|
onLoadPackageDefinition: (pkg, server) => {
|
|
44
45
|
if (options.usePackageDefinitionService) {
|
|
45
46
|
this.grpcPackageDefinitionService.setPackageDefinition(pkg, packageName);
|
|
@@ -51,11 +52,8 @@ let GrpcOptionsProvider = class GrpcOptionsProvider {
|
|
|
51
52
|
},
|
|
52
53
|
};
|
|
53
54
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
}
|
|
57
|
-
getProtoPath(packageName) {
|
|
58
|
-
const fullPath = (0, node_path_1.join)(this.getProtoDir(), packageName);
|
|
55
|
+
getProtoPath(packageName, protoDir) {
|
|
56
|
+
const fullPath = (0, node_path_1.join)(protoDir, packageName);
|
|
59
57
|
return (0, node_fs_1.readdirSync)(fullPath)
|
|
60
58
|
.filter((f) => f.endsWith('proto'))
|
|
61
59
|
.map((f) => (0, node_path_1.join)(fullPath, f));
|
|
@@ -64,7 +62,6 @@ let GrpcOptionsProvider = class GrpcOptionsProvider {
|
|
|
64
62
|
exports.GrpcOptionsProvider = GrpcOptionsProvider;
|
|
65
63
|
exports.GrpcOptionsProvider = GrpcOptionsProvider = __decorate([
|
|
66
64
|
(0, common_1.Injectable)(),
|
|
67
|
-
__metadata("design:paramtypes", [
|
|
68
|
-
services_1.GrpcPackageDefinitionService])
|
|
65
|
+
__metadata("design:paramtypes", [services_1.GrpcPackageDefinitionService])
|
|
69
66
|
], GrpcOptionsProvider);
|
|
70
67
|
//# sourceMappingURL=grpc-options.provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc-options.provider.js","sourceRoot":"","sources":["../../../src/grpc/providers/grpc-options.provider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yDAA+D;AAC/D,iDAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"grpc-options.provider.js","sourceRoot":"","sources":["../../../src/grpc/providers/grpc-options.provider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yDAA+D;AAC/D,iDAAqD;AACrD,qCAAsC;AACtC,yCAAiC;AAEjC,0CAA2D;AAWpD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,4BAA0D;QAA1D,iCAA4B,GAA5B,4BAA4B,CAA8B;IAC1E,CAAC;IAEJ,UAAU,CACR,UAAoB;QAClB,2BAA2B,EAAE,KAAK;QAClC,oBAAoB,EAAE,IAAI;QAC1B,QAAQ,EAAE,IAAA,gBAAI,EAAC,SAAS,EAAE,aAAa,CAAC;QACxC,WAAW,EAAE,EAAE;QACf,GAAG,EAAE,eAAe;KACrB;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QAExC,OAAO;YACL,SAAS,EAAE,yBAAS,CAAC,IAAI;YACzB,OAAO,EAAE;gBACP,MAAM,EAAE;oBACN,KAAK,EAAE,MAAM;oBACb,MAAM,EAAE,IAAI;oBACZ,OAAO,EAAE,IAAI;oBACb,WAAW,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;iBAChC;gBACD,gBAAgB,EAAE,IAAI;gBACtB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,OAAO,EAAE,WAAW;gBACpB,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC;gBAC3D,uBAAuB,EAAE,CAAC,GAAsB,EAAE,MAAM,EAAE,EAAE;oBAC1D,IAAI,OAAO,CAAC,2BAA2B,EAAE,CAAC;wBACxC,IAAI,CAAC,4BAA4B,CAAC,oBAAoB,CACpD,GAAG,EACH,WAAW,CACZ,CAAC;oBACJ,CAAC;oBAED,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;wBACjC,IAAI,8BAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;oBACjD,CAAC;gBACH,CAAC;aACF;SACF,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,WAAmB,EAAE,QAAgB;QACxD,MAAM,QAAQ,GAAG,IAAA,gBAAI,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAE7C,OAAO,IAAA,qBAAW,EAAC,QAAQ,CAAC;aACzB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,gBAAI,EAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;CACF,CAAA;AApDY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAGsC,uCAA4B;GAFlE,mBAAmB,CAoD/B"}
|
|
@@ -61,12 +61,18 @@ let GrpcPackageDefinitionService = class GrpcPackageDefinitionService {
|
|
|
61
61
|
return definition?.type?.field || [];
|
|
62
62
|
}
|
|
63
63
|
findFieldsByType(fields, typeName) {
|
|
64
|
-
return fields
|
|
64
|
+
return fields
|
|
65
|
+
.filter((f) => f.type === 'TYPE_MESSAGE')
|
|
66
|
+
.map((f) => {
|
|
65
67
|
if (f.typeName === typeName) {
|
|
66
68
|
return { name: f.name };
|
|
67
69
|
}
|
|
68
|
-
return {
|
|
69
|
-
|
|
70
|
+
return {
|
|
71
|
+
name: f.name,
|
|
72
|
+
fields: this.findFieldsByType(this.getFields(this.getMessageDefinition(f.typeName)), typeName),
|
|
73
|
+
};
|
|
74
|
+
})
|
|
75
|
+
.filter((f) => f.fields === undefined || f.fields.length > 0);
|
|
70
76
|
}
|
|
71
77
|
};
|
|
72
78
|
exports.GrpcPackageDefinitionService = GrpcPackageDefinitionService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc-package-definition.service.js","sourceRoot":"","sources":["../../../src/grpc/services/grpc-package-definition.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAmD;
|
|
1
|
+
{"version":3,"file":"grpc-package-definition.service.js","sourceRoot":"","sources":["../../../src/grpc/services/grpc-package-definition.service.ts"],"names":[],"mappings":"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"}
|