@hodfords/nestjs-grpc-helper 12.4.0 → 12.6.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/README.md +83 -5
- package/constants/sdk-toolchain.const.d.ts +1 -0
- package/constants/sdk-toolchain.const.js +1 -0
- package/constants/sdk-toolchain.const.js.map +1 -1
- package/documents/microservice-document.controller.d.ts +1 -1
- package/dto/sort.dto.d.ts +1 -1
- package/dto/sort.dto.js +1 -1
- package/dto/sort.dto.js.map +1 -1
- package/helpers/generate.helper.d.ts +1 -1
- package/helpers/generate.helper.js +0 -15
- package/helpers/generate.helper.js.map +1 -1
- package/helpers/grpc-method.helper.js +1 -3
- package/helpers/grpc-method.helper.js.map +1 -1
- package/helpers/wire-response.helper.d.ts +8 -0
- package/helpers/wire-response.helper.js +23 -0
- package/helpers/wire-response.helper.js.map +1 -0
- package/index.d.ts +3 -0
- package/index.js +3 -0
- package/index.js.map +1 -1
- package/package.json +1 -1
- package/sdk-stub/helpers/grpc.helper.d.ts +1 -0
- package/sdk-stub/helpers/grpc.helper.js +11 -13
- package/sdk-stub/helpers/grpc.helper.js.map +1 -1
- package/sdk-stub/helpers/grpc.helper.spec.ts +46 -0
- package/sdk-stub/helpers/grpc.helper.ts +19 -12
- package/services/generate-proto.service.js +4 -16
- package/services/generate-proto.service.js.map +1 -1
- package/services/go-sdk-generator.service.js +4 -0
- package/services/go-sdk-generator.service.js.map +1 -1
- package/services/rust-sdk-generator.service.js +7 -0
- package/services/rust-sdk-generator.service.js.map +1 -1
- package/services/sdk-descriptor.service.js +9 -38
- package/services/sdk-descriptor.service.js.map +1 -1
- package/templates/go/client.hbs +8 -0
- package/templates/rust/call.hbs +203 -0
- package/templates/rust/cargo-toml.hbs +1 -0
- package/templates/rust/client.hbs +36 -16
- package/templates/rust/lib.hbs +2 -0
- package/types/sdk-descriptor.type.d.ts +1 -2
package/README.md
CHANGED
|
@@ -98,8 +98,30 @@ export class UserMicroservice {
|
|
|
98
98
|
@ResponseModel(UserResponse, true) // array of objects
|
|
99
99
|
@ResponseModel(String) // primitive (String, Number, Boolean)
|
|
100
100
|
@ResponseModel(UserResponse, { isAllowEmpty: true }) // object or null
|
|
101
|
+
@ResponseModel(String, false, true) // primitive or null
|
|
101
102
|
```
|
|
102
103
|
|
|
104
|
+
For a nullable result the generated TypeScript method returns `Promise<UserResponse | null>` /
|
|
105
|
+
`Promise<string | null>`.
|
|
106
|
+
|
|
107
|
+
> **Upgrading to 12.5:** an rpc that returns a nullable primitive (`@ResponseModel(String, false, true)`, also with
|
|
108
|
+
> `Number` or `Boolean`) now declares `NullableGrpcClassResponseOfNative*Value` in the proto instead of
|
|
109
|
+
> `Native*Value`. Before, the proto could not carry "no value" and every SDK decoded such a response wrongly. The
|
|
110
|
+
> return type of these rpcs changed on the wire, so regenerate the SDK and release the service together with the
|
|
111
|
+
> consumers that call them. No other rpc is affected.
|
|
112
|
+
>
|
|
113
|
+
> The generated TypeScript methods of nullable rpcs (objects and primitives) are now typed `T | null`, which is what
|
|
114
|
+
> they already returned. A consumer compiled with `strictNullChecks` gets a compile error wherever such a result is
|
|
115
|
+
> used without a null check.
|
|
116
|
+
>
|
|
117
|
+
> The Rust `ClientOptions` struct gained two fields. Code that builds it with a full struct literal
|
|
118
|
+
> (`ClientOptions { timeout: Some(..) }`) stops compiling after the SDK is regenerated; add `..Default::default()`.
|
|
119
|
+
|
|
120
|
+
> **Upgrading to 12.6:** the Rust `ClientOptions` struct gained `retry` and `hook` (see
|
|
121
|
+
> [Retry and call hooks in Rust](#retry-and-call-hooks-in-rust)); a full struct literal needs `..Default::default()`.
|
|
122
|
+
> Rust methods now take `options: impl Into<CallOptions>`, so a call that passes `Default::default()` as the options no
|
|
123
|
+
> longer infers its type; pass `CallOptions::default()`. The crate now depends on `tokio` (feature `time`).
|
|
124
|
+
|
|
103
125
|
### 3. Generate the proto file and start the gRPC server
|
|
104
126
|
|
|
105
127
|
Generate the proto file before the application starts, then connect the gRPC microservice:
|
|
@@ -456,9 +478,64 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|
|
456
478
|
}
|
|
457
479
|
```
|
|
458
480
|
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
`
|
|
481
|
+
`ClientOptions` also takes `max_decoding_message_size` and `max_encoding_message_size` (in bytes). Responses larger
|
|
482
|
+
than tonic's default of 4 MiB are rejected unless the first one is raised; build the options with
|
|
483
|
+
`ClientOptions { max_decoding_message_size: Some(16 * 1024 * 1024), ..Default::default() }` so that fields added later
|
|
484
|
+
do not break your code. In Go the limit belongs to the connection:
|
|
485
|
+
`grpc.NewClient(address, grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(16 * 1024 * 1024)), ...)`.
|
|
486
|
+
|
|
487
|
+
The crate root re-exports `pb`, `SdkError`, `SdkStream`, `ClientOptions`, `CallOptions`, `RetryPolicy`, `CallHook`,
|
|
488
|
+
`CallGuard`, `Rpc` and every client; the enum types live in `sdk_name::enums`. A crate name with hyphens is imported
|
|
489
|
+
with underscores, and the consuming crate needs `tokio` (with the `macros` and `rt-multi-thread` features) for the
|
|
490
|
+
example above. A `MetadataMap` converts into `CallOptions`, so `client.find_many(request, metadata)` works too.
|
|
491
|
+
|
|
492
|
+
#### Retry and call hooks in Rust
|
|
493
|
+
|
|
494
|
+
`ClientOptions.retry` retries unary calls like the gRPC retry policy: at most `max_attempts` attempts in all, while the
|
|
495
|
+
status is one of `retryable_codes`, waiting a random time up to the current backoff between attempts. The timeout of
|
|
496
|
+
the call (or the client default) bounds all attempts and waits together, and no attempt starts once it has expired.
|
|
497
|
+
Business errors (`SdkError::Service`) and streams are never retried. `RetryPolicy::default()` is 3 attempts on
|
|
498
|
+
`UNAVAILABLE`, backoff 200 ms doubling up to 1 s; only list codes for which sending the request again is safe.
|
|
499
|
+
|
|
500
|
+
`ClientOptions.hook` runs around every call, unary or stream, for tracing, logging or metadata every call needs. `start`
|
|
501
|
+
receives the rpc (`Rpc { service: "sdkName.AppMicroservice", method: "findMany" }`, the wire names) and the metadata
|
|
502
|
+
before the first attempt, and returns a guard whose `finish` receives the outcome once the call ends: after the last
|
|
503
|
+
attempt of a unary call, or when a stream opened or failed to open.
|
|
504
|
+
|
|
505
|
+
```rust
|
|
506
|
+
use std::sync::Arc;
|
|
507
|
+
use sdk_name::{AppMicroserviceClient, CallGuard, CallHook, ClientOptions, RetryPolicy, Rpc, SdkError};
|
|
508
|
+
use tonic::metadata::MetadataMap;
|
|
509
|
+
|
|
510
|
+
#[derive(Debug)]
|
|
511
|
+
struct Logging;
|
|
512
|
+
|
|
513
|
+
struct LoggingGuard(Rpc);
|
|
514
|
+
|
|
515
|
+
impl CallHook for Logging {
|
|
516
|
+
fn start(&self, rpc: Rpc, metadata: &mut MetadataMap) -> Box<dyn CallGuard> {
|
|
517
|
+
metadata.insert("x-caller", "billing".parse().unwrap());
|
|
518
|
+
Box::new(LoggingGuard(rpc))
|
|
519
|
+
}
|
|
520
|
+
}
|
|
521
|
+
|
|
522
|
+
impl CallGuard for LoggingGuard {
|
|
523
|
+
fn finish(self: Box<Self>, outcome: Result<(), &SdkError>) {
|
|
524
|
+
if let Err(error) = outcome {
|
|
525
|
+
println!("{} failed: {error}", self.0);
|
|
526
|
+
}
|
|
527
|
+
}
|
|
528
|
+
}
|
|
529
|
+
|
|
530
|
+
let options = ClientOptions {
|
|
531
|
+
retry: Some(RetryPolicy::default()),
|
|
532
|
+
hook: Some(Arc::new(Logging)),
|
|
533
|
+
..Default::default()
|
|
534
|
+
};
|
|
535
|
+
let client = AppMicroserviceClient::connect("http://localhost:50059", options).await?;
|
|
536
|
+
```
|
|
537
|
+
|
|
538
|
+
In Go, use the retry policy of the gRPC service config and interceptors on the connection instead.
|
|
462
539
|
|
|
463
540
|
```go
|
|
464
541
|
package main
|
|
@@ -528,8 +605,9 @@ Differences from the TypeScript SDK:
|
|
|
528
605
|
- `format: 'any'` fields are JSON strings; encode and decode them yourself.
|
|
529
606
|
- Metadata parameters (`@GrpcMetadata`, `@GrpcMetadataId`) are set through the per-call metadata option. The generated
|
|
530
607
|
doc comment of each method lists the keys the server reads.
|
|
531
|
-
- A
|
|
532
|
-
|
|
608
|
+
- A nullable primitive response (`@ResponseModel(String, false, true)`) is `Option<String>` in Rust and `*string` in
|
|
609
|
+
Go (likewise `Option<f32>` / `*float32` and `Option<bool>` / `*bool`); `None` / `nil` means the server returned no
|
|
610
|
+
value.
|
|
533
611
|
- There is no mock client and no AI skill file.
|
|
534
612
|
- `Number` responses (`@ResponseModel(Number)`) are `f32` in Rust and `float32` in Go, because the proto carries them as
|
|
535
613
|
`float`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk-toolchain.const.js","sourceRoot":"","sources":["../../../lib/constants/sdk-toolchain.const.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,MAAM,WAAW,GAAuB;IAC3C,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,8FAA8F;CAC1G,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,KAAK,EAAE;QACH,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,+CAA+C,EAAE;QACxG,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,+CAA+C,EAAE;KACnF;IACzB,cAAc,EAAE,MAAM;IACtB,MAAM,EAAE;QACJ,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;QACb,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;KACjB;CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC5B,KAAK,EAAE;QACH;YACI,MAAM,EAAE,eAAe;YACvB,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,iEAAiE;SAC7E;QACD;YACI,MAAM,EAAE,oBAAoB;YAC5B,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,iEAAiE;SAC7E;KACoB;IACzB,SAAS,EAAE,MAAM;IACjB,OAAO,EAAE;QACL,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,SAAS;KACtB;CACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"sdk-toolchain.const.js","sourceRoot":"","sources":["../../../lib/constants/sdk-toolchain.const.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,MAAM,WAAW,GAAuB;IAC3C,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,8FAA8F;CAC1G,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,KAAK,EAAE;QACH,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,+CAA+C,EAAE;QACxG,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,+CAA+C,EAAE;KACnF;IACzB,cAAc,EAAE,MAAM;IACtB,MAAM,EAAE;QACJ,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;KACjB;CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC5B,KAAK,EAAE;QACH;YACI,MAAM,EAAE,eAAe;YACvB,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,iEAAiE;SAC7E;QACD;YACI,MAAM,EAAE,oBAAoB;YAC5B,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,iEAAiE;SAC7E;KACoB;IACzB,SAAS,EAAE,MAAM;IACjB,OAAO,EAAE;QACL,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,SAAS;KACtB;CACJ,CAAC"}
|
|
@@ -5,6 +5,6 @@ export declare class MicroserviceDocumentController {
|
|
|
5
5
|
private options;
|
|
6
6
|
private client;
|
|
7
7
|
constructor(options: DocumentModuleOptionType, client: ClientGrpc);
|
|
8
|
-
getDocumentJson(): import("../
|
|
8
|
+
getDocumentJson(): import("../index.js").DocumentType;
|
|
9
9
|
grpcTest(value: GrpcTestDto): Promise<unknown>;
|
|
10
10
|
}
|
package/dto/sort.dto.d.ts
CHANGED
package/dto/sort.dto.js
CHANGED
package/dto/sort.dto.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sort.dto.js","sourceRoot":"","sources":["../../../lib/dto/sort.dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,OAAO,OAAO;IAMhB,SAAS,CAAS;IAKlB,aAAa,
|
|
1
|
+
{"version":3,"file":"sort.dto.js","sourceRoot":"","sources":["../../../lib/dto/sort.dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,OAAO,OAAO;IAMhB,SAAS,CAAS;IAKlB,aAAa,CAAiB;CACjC;AANG;IALC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE;IACV,OAAO,CAAC,gBAAgB,EAAE;QACvB,OAAO,EAAE,8EAA8E;KAC1F,CAAC;;0CACgB;AAKlB;IAHC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE;IACV,MAAM,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;;8CACM"}
|
|
@@ -2,4 +2,4 @@ import { SdkBuildConfigType, SdkLanguage } from '../types/sdk-build-config.type.
|
|
|
2
2
|
export declare function resolveSdkLanguages(config: SdkBuildConfigType, languages?: SdkLanguage[]): SdkLanguage[];
|
|
3
3
|
export declare function generateSdk(config: SdkBuildConfigType, languages?: SdkLanguage[]): void;
|
|
4
4
|
export declare function generateProtoService(packageName: string, dirPath: string): void;
|
|
5
|
-
export declare function generateDocumentService(packageName: string): import("../
|
|
5
|
+
export declare function generateDocumentService(packageName: string): import("../index.js").DocumentType;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Logger } from '@nestjs/common';
|
|
2
1
|
import { GenerateDocumentService } from '../services/generate-document.service.js';
|
|
3
2
|
import { GenerateMicroserviceService } from '../services/generate-microservice.service.js';
|
|
4
3
|
import { GenerateProtoService } from '../services/generate-proto.service.js';
|
|
@@ -19,17 +18,6 @@ export function resolveSdkLanguages(config, languages) {
|
|
|
19
18
|
}
|
|
20
19
|
return languages;
|
|
21
20
|
}
|
|
22
|
-
function warnNullablePrimitives(descriptor) {
|
|
23
|
-
const logger = new Logger('GenerateSdk');
|
|
24
|
-
for (const service of descriptor.services) {
|
|
25
|
-
for (const method of service.methods) {
|
|
26
|
-
if (method.isNullablePrimitive) {
|
|
27
|
-
logger.warn(`${service.name}.${method.name} declares a nullable primitive response. The proto cannot carry ` +
|
|
28
|
-
`"no value" for it, so the Rust and Go SDKs return the primitive type.`);
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
21
|
function assertSdkTools(targets) {
|
|
34
22
|
const tools = new Set([
|
|
35
23
|
...(targets.includes('rust') ? RustSdkGeneratorService.requiredTools : []),
|
|
@@ -44,9 +32,6 @@ export function generateSdk(config, languages) {
|
|
|
44
32
|
assertSdkOutputs(config, targets);
|
|
45
33
|
assertSdkTools(targets);
|
|
46
34
|
const descriptor = targets.includes('rust') || targets.includes('go') ? new SdkDescriptorService().describe() : undefined;
|
|
47
|
-
if (descriptor) {
|
|
48
|
-
warnNullablePrimitives(descriptor);
|
|
49
|
-
}
|
|
50
35
|
if (targets.includes('ts')) {
|
|
51
36
|
new GenerateMicroserviceService(config).generate();
|
|
52
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.helper.js","sourceRoot":"","sources":["../../../lib/helpers/generate.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"generate.helper.js","sourceRoot":"","sources":["../../../lib/helpers/generate.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,8 +30,6 @@ export function getReturnType(response) {
|
|
|
30
30
|
if (response.isArray) {
|
|
31
31
|
return `${returnType}[]`;
|
|
32
32
|
}
|
|
33
|
-
|
|
34
|
-
return returnType;
|
|
35
|
-
}
|
|
33
|
+
return response.isAllowEmpty ? `${returnType} | null` : returnType;
|
|
36
34
|
}
|
|
37
35
|
//# sourceMappingURL=grpc-method.helper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc-method.helper.js","sourceRoot":"","sources":["../../../lib/helpers/grpc-method.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EACH,8BAA8B,EAC9B,+BAA+B,EAC/B,6BAA6B,EAChC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOnD,MAAM,UAAU,mBAAmB,CAAC,WAAqB,EAAE,WAAmB;IAC1E,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5F,IAAI,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,8BAA8B,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC3G,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,6BAA6B,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9G,IAAI,aAAa,CAAC;IAClB,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/B,aAAa,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC;QAC5C,MAAM,cAAc,GAAG,OAAO,CAC1B,OAAO,CAAC,WAAW,CAAC,+BAA+B,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,CAC3F,CAAC;QACF,IAAI,CAAC,YAAY,IAAI,cAAc,EAAE,CAAC;YAClC,YAAY,GAAG,oBAAoB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAC3E,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,GAAG,QAAQ,CAAC,MAAM;aACrB,CAAC,CAAC,CAAC;QACR,CAAC;IACL,CAAC;IACD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAA0B;IACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,IAAI,UAAU,GAAG,QAAQ,EAAE,aAAa,EAAE,IAAI,CAAC;IAC/C,IAAI,eAAe,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1C,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAC3D,CAAC;IACD,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,GAAG,UAAU,IAAI,CAAC;IAC7B,CAAC;
|
|
1
|
+
{"version":3,"file":"grpc-method.helper.js","sourceRoot":"","sources":["../../../lib/helpers/grpc-method.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EACH,8BAA8B,EAC9B,+BAA+B,EAC/B,6BAA6B,EAChC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOnD,MAAM,UAAU,mBAAmB,CAAC,WAAqB,EAAE,WAAmB;IAC1E,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5F,IAAI,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,8BAA8B,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC3G,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,6BAA6B,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9G,IAAI,aAAa,CAAC;IAClB,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/B,aAAa,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC;QAC5C,MAAM,cAAc,GAAG,OAAO,CAC1B,OAAO,CAAC,WAAW,CAAC,+BAA+B,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,CAC3F,CAAC;QACF,IAAI,CAAC,YAAY,IAAI,cAAc,EAAE,CAAC;YAClC,YAAY,GAAG,oBAAoB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAC3E,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,GAAG,QAAQ,CAAC,MAAM;aACrB,CAAC,CAAC,CAAC;QACR,CAAC;IACL,CAAC;IACD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAA0B;IACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,IAAI,UAAU,GAAG,QAAQ,EAAE,aAAa,EAAE,IAAI,CAAC;IAC/C,IAAI,eAAe,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1C,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAC3D,CAAC;IACD,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,GAAG,UAAU,IAAI,CAAC;IAC7B,CAAC;IAED,OAAO,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,UAAU,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;AACvE,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { ResponseMetadata } from '@hodfords/nestjs-response';
|
|
2
|
+
import { SdkResponseKind } from '../types/sdk-descriptor.type.js';
|
|
3
|
+
export type WireResponse = {
|
|
4
|
+
responseKind: SdkResponseKind;
|
|
5
|
+
wireResponseType: string;
|
|
6
|
+
nullableInner?: string;
|
|
7
|
+
};
|
|
8
|
+
export declare function resolveWireResponse(response: ResponseMetadata | undefined): WireResponse;
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { NullableGrpcClassResponseNamePrefix } from '@hodfords/nestjs-response';
|
|
2
|
+
import { isPrimitiveType } from './type.helper.js';
|
|
3
|
+
const emptyMessage = 'google.protobuf.Empty';
|
|
4
|
+
export function resolveWireResponse(response) {
|
|
5
|
+
if (!response) {
|
|
6
|
+
return { responseKind: 'empty', wireResponseType: emptyMessage };
|
|
7
|
+
}
|
|
8
|
+
const className = response.responseClass.name;
|
|
9
|
+
const isPrimitive = isPrimitiveType(response.responseClass);
|
|
10
|
+
if (response.isArray) {
|
|
11
|
+
return { responseKind: isPrimitive ? 'nativeList' : 'list', wireResponseType: `Proto${className}List` };
|
|
12
|
+
}
|
|
13
|
+
const message = isPrimitive ? `Native${className}Value` : className;
|
|
14
|
+
if (response.isAllowEmpty) {
|
|
15
|
+
return {
|
|
16
|
+
responseKind: isPrimitive ? 'nullableNative' : 'nullable',
|
|
17
|
+
wireResponseType: `${NullableGrpcClassResponseNamePrefix}${message}`,
|
|
18
|
+
nullableInner: message
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
return { responseKind: isPrimitive ? 'native' : 'single', wireResponseType: message };
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=wire-response.helper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wire-response.helper.js","sourceRoot":"","sources":["../../../lib/helpers/wire-response.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mCAAmC,EAAoB,MAAM,2BAA2B,CAAC;AAElG,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAUnD,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAO7C,MAAM,UAAU,mBAAmB,CAAC,QAAsC;IACtE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC;IACrE,CAAC;IAED,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC;IAC9C,MAAM,WAAW,GAAG,eAAe,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAE5D,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,SAAS,MAAM,EAAE,CAAC;IAC5G,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,SAAS,SAAS,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;QAExB,OAAO;YACH,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU;YACzD,gBAAgB,EAAE,GAAG,mCAAmC,GAAG,OAAO,EAAE;YACpE,aAAa,EAAE,OAAO;SACzB,CAAC;IACN,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC;AAC1F,CAAC"}
|
package/index.d.ts
CHANGED
|
@@ -7,6 +7,8 @@ export * from './decorators/grpc-metadata.decorator.js';
|
|
|
7
7
|
export * from './decorators/extend-type.decorator.js';
|
|
8
8
|
export * from './decorators/sdk-expose.decorator.js';
|
|
9
9
|
export * from './decorators/any-type.decorator.js';
|
|
10
|
+
export * from './dto/pagination.dto.js';
|
|
11
|
+
export * from './dto/sort.dto.js';
|
|
10
12
|
export * from './helpers/generate.helper.js';
|
|
11
13
|
export * from './helpers/mock.helper.js';
|
|
12
14
|
export * from './type-helpers/pick-type.helper.js';
|
|
@@ -14,6 +16,7 @@ export * from './type-helpers/omit-type.helper.js';
|
|
|
14
16
|
export * from './type-helpers/partial-type.helper.js';
|
|
15
17
|
export * from './type-helpers/intersection-type.helper.js';
|
|
16
18
|
export * from './types/property-option.type.js';
|
|
19
|
+
export * from './types/document.type.js';
|
|
17
20
|
export * from './types/sdk-build-config.type.js';
|
|
18
21
|
export * from './sdk-stub/helpers/grpc.helper.js';
|
|
19
22
|
export * from './documents/microservice-document.module.js';
|
package/index.js
CHANGED
|
@@ -7,6 +7,8 @@ export * from './decorators/grpc-metadata.decorator.js';
|
|
|
7
7
|
export * from './decorators/extend-type.decorator.js';
|
|
8
8
|
export * from './decorators/sdk-expose.decorator.js';
|
|
9
9
|
export * from './decorators/any-type.decorator.js';
|
|
10
|
+
export * from './dto/pagination.dto.js';
|
|
11
|
+
export * from './dto/sort.dto.js';
|
|
10
12
|
export * from './helpers/generate.helper.js';
|
|
11
13
|
export * from './helpers/mock.helper.js';
|
|
12
14
|
export * from './type-helpers/pick-type.helper.js';
|
|
@@ -14,6 +16,7 @@ export * from './type-helpers/omit-type.helper.js';
|
|
|
14
16
|
export * from './type-helpers/partial-type.helper.js';
|
|
15
17
|
export * from './type-helpers/intersection-type.helper.js';
|
|
16
18
|
export * from './types/property-option.type.js';
|
|
19
|
+
export * from './types/document.type.js';
|
|
17
20
|
export * from './types/sdk-build-config.type.js';
|
|
18
21
|
export * from './sdk-stub/helpers/grpc.helper.js';
|
|
19
22
|
export * from './documents/microservice-document.module.js';
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,wCAAwC,CAAC;AACvD,cAAc,oCAAoC,CAAC;AACnD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,uCAAuC,CAAC;AACtD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gDAAgD,CAAC;AAC/D,OAAO,gCAAgC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,wCAAwC,CAAC;AACvD,cAAc,oCAAoC,CAAC;AACnD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,oCAAoC,CAAC;AACnD,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,uCAAuC,CAAC;AACtD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gDAAgD,CAAC;AAC/D,OAAO,gCAAgC,CAAC"}
|
package/package.json
CHANGED
|
@@ -48,7 +48,7 @@ export class GrpcHelper {
|
|
|
48
48
|
return data[0];
|
|
49
49
|
}
|
|
50
50
|
stream() {
|
|
51
|
-
return this.serviceGrpc[this.methodName](this.payload, this.metadata).pipe(map((chunk) => applyTransforms(chunk, this.model, { groups: ['__getData'] })));
|
|
51
|
+
return this.serviceGrpc[this.methodName](this.payload, this.metadata).pipe(map((chunk) => applyTransforms(this.unwrapEnvelope(chunk), this.model, { groups: ['__getData'] })));
|
|
52
52
|
}
|
|
53
53
|
async getMany() {
|
|
54
54
|
try {
|
|
@@ -56,24 +56,22 @@ export class GrpcHelper {
|
|
|
56
56
|
if (data.grpcArray) {
|
|
57
57
|
data = data.items || [];
|
|
58
58
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
}
|
|
62
|
-
else if (data.grpcNullable) {
|
|
63
|
-
return [applyTransforms(data.value || null, this.model, { groups: ['__getData'] })];
|
|
64
|
-
}
|
|
65
|
-
if (Array.isArray(data)) {
|
|
66
|
-
return data.map((item) => applyTransforms(item, this.model, { groups: ['__getData'] }));
|
|
67
|
-
}
|
|
68
|
-
else {
|
|
69
|
-
return [applyTransforms(data, this.model, { groups: ['__getData'] })];
|
|
70
|
-
}
|
|
59
|
+
data = this.unwrapEnvelope(data);
|
|
60
|
+
const items = Array.isArray(data) ? data : [data];
|
|
61
|
+
return items.map((item) => applyTransforms(item, this.model, { groups: ['__getData'] }));
|
|
71
62
|
}
|
|
72
63
|
catch (exception) {
|
|
73
64
|
this.logger.error(exception);
|
|
74
65
|
throw exception;
|
|
75
66
|
}
|
|
76
67
|
}
|
|
68
|
+
unwrapEnvelope(data) {
|
|
69
|
+
if (data?.grpcNullable) {
|
|
70
|
+
const value = data.value?.grpcNative ? data.value.value : data.value;
|
|
71
|
+
return value ?? null;
|
|
72
|
+
}
|
|
73
|
+
return data?.grpcNative ? data.value : data;
|
|
74
|
+
}
|
|
77
75
|
async execute() {
|
|
78
76
|
const handler = () => this.toPromise(this.serviceGrpc[this.methodName](this.payload, this.metadata).pipe(timeout(this.options.timeout)));
|
|
79
77
|
return handler();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc.helper.js","sourceRoot":"","sources":["../../../../lib/sdk-stub/helpers/grpc.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,GAAG,EAAc,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,MAAM,OAAO,UAAU;IAiBP;IACA;IACA;IAlBJ,WAAW,CAAM;IACjB,WAAW,CAAS;IACpB,UAAU,CAAS;IACnB,OAAO,CAAM;IACb,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC1B,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;IAE1C,MAAM,CAAC,IAAI,CACP,MAAkB,EAClB,KAAwB,EACxB,OAAqC;QAErC,OAAO,IAAI,UAAU,CAAQ,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,YACY,MAAkB,EAClB,KAAwB,EACxB,OAAqC;QAFrC,WAAM,GAAN,MAAM,CAAY;QAClB,UAAK,GAAL,KAAK,CAAmB;QACxB,YAAO,GAAP,OAAO,CAA8B;QAE7C,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAClC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnD,CAAC;IACL,CAAC;IAED,OAAO,CAAC,IAAY;QAChB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAM,IAAI,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,IAAY;QACf,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,IAAS,EAAE,cAAoB;QAChC,IAAI,cAAc,EAAE,CAAC;YAEjB,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,MAAM,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACtG,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACxB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;IAOD,MAAM;QACF,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CACtE,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"grpc.helper.js","sourceRoot":"","sources":["../../../../lib/sdk-stub/helpers/grpc.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -152,6 +152,29 @@ describe('GrpcHelper', () => {
|
|
|
152
152
|
expect(result).toEqual([null]);
|
|
153
153
|
});
|
|
154
154
|
|
|
155
|
+
it('unwraps a nullable primitive, which wraps a Native*Value', async () => {
|
|
156
|
+
serviceGrpc.findNameOrNull = vi.fn(() =>
|
|
157
|
+
of({ grpcNullable: true, value: { value: 'john', grpcNative: true } })
|
|
158
|
+
);
|
|
159
|
+
serviceGrpc.isActiveOrNull = vi.fn(() =>
|
|
160
|
+
of({ grpcNullable: true, value: { value: false, grpcNative: true } })
|
|
161
|
+
);
|
|
162
|
+
|
|
163
|
+
const name = await createHelper().service('UserService').method('findNameOrNull').data({}).getMany();
|
|
164
|
+
const isActive = await createHelper().service('UserService').method('isActiveOrNull').data({}).getMany();
|
|
165
|
+
|
|
166
|
+
expect(name).toEqual(['john']);
|
|
167
|
+
expect(isActive).toEqual([false]);
|
|
168
|
+
});
|
|
169
|
+
|
|
170
|
+
it('returns [null] for a nullable primitive without a value', async () => {
|
|
171
|
+
serviceGrpc.findNameOrNull = vi.fn(() => of({ grpcNullable: true, value: null }));
|
|
172
|
+
|
|
173
|
+
const result = await createHelper().service('UserService').method('findNameOrNull').data({}).getMany();
|
|
174
|
+
|
|
175
|
+
expect(result).toEqual([null]);
|
|
176
|
+
});
|
|
177
|
+
|
|
155
178
|
it('getOne returns the first element of getMany', async () => {
|
|
156
179
|
serviceGrpc.findMany = vi.fn(() => of([{ name: 'john' }, { name: 'jane' }]));
|
|
157
180
|
|
|
@@ -172,6 +195,29 @@ describe('GrpcHelper', () => {
|
|
|
172
195
|
expect(result).toEqual([{ name: 'JOHN' }, { name: 'JANE' }]);
|
|
173
196
|
});
|
|
174
197
|
|
|
198
|
+
it('unwraps primitive and nullable chunks like the unary calls do', async () => {
|
|
199
|
+
serviceGrpc.streamNames = vi.fn(() =>
|
|
200
|
+
of({ value: 'john', grpcNative: true }, { value: '', grpcNative: true })
|
|
201
|
+
);
|
|
202
|
+
serviceGrpc.streamMaybe = vi.fn(() =>
|
|
203
|
+
of(
|
|
204
|
+
{ grpcNullable: true, value: { name: 'john' } },
|
|
205
|
+
{ grpcNullable: true, value: null },
|
|
206
|
+
{ grpcNullable: true, value: { value: false, grpcNative: true } }
|
|
207
|
+
)
|
|
208
|
+
);
|
|
209
|
+
|
|
210
|
+
const names = await firstValueFrom(
|
|
211
|
+
createHelper().service('UserService').method('streamNames').data({}).stream().pipe(toArray())
|
|
212
|
+
);
|
|
213
|
+
const maybe = await firstValueFrom(
|
|
214
|
+
createHelper().service('UserService').method('streamMaybe').data({}).stream().pipe(toArray())
|
|
215
|
+
);
|
|
216
|
+
|
|
217
|
+
expect(names).toEqual(['john', '']);
|
|
218
|
+
expect(maybe).toEqual([{ name: 'JOHN' }, null, false]);
|
|
219
|
+
});
|
|
220
|
+
|
|
175
221
|
it('passes the payload and metadata to the grpc stream method', () => {
|
|
176
222
|
serviceGrpc.streamIt = vi.fn(() => of({ name: 'john' }));
|
|
177
223
|
|
|
@@ -66,7 +66,9 @@ export class GrpcHelper<Model> {
|
|
|
66
66
|
*/
|
|
67
67
|
stream(): Observable<Model> {
|
|
68
68
|
return this.serviceGrpc[this.methodName](this.payload, this.metadata).pipe(
|
|
69
|
-
map((chunk: any) =>
|
|
69
|
+
map((chunk: any) =>
|
|
70
|
+
applyTransforms(this.unwrapEnvelope(chunk), this.model as any, { groups: ['__getData'] })
|
|
71
|
+
)
|
|
70
72
|
);
|
|
71
73
|
}
|
|
72
74
|
|
|
@@ -76,23 +78,28 @@ export class GrpcHelper<Model> {
|
|
|
76
78
|
if (data.grpcArray) {
|
|
77
79
|
data = data.items || [];
|
|
78
80
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
}
|
|
84
|
-
if (Array.isArray(data)) {
|
|
85
|
-
// applyTransforms does not walk top-level arrays — transform each item individually
|
|
86
|
-
return data.map((item) => applyTransforms(item, this.model as any, { groups: ['__getData'] }));
|
|
87
|
-
} else {
|
|
88
|
-
return [applyTransforms(data, this.model as any, { groups: ['__getData'] })];
|
|
89
|
-
}
|
|
81
|
+
data = this.unwrapEnvelope(data);
|
|
82
|
+
// applyTransforms does not walk top-level arrays — transform each item individually
|
|
83
|
+
const items = Array.isArray(data) ? data : [data];
|
|
84
|
+
return items.map((item) => applyTransforms(item, this.model as any, { groups: ['__getData'] }));
|
|
90
85
|
} catch (exception) {
|
|
91
86
|
this.logger.error(exception);
|
|
92
87
|
throw exception;
|
|
93
88
|
}
|
|
94
89
|
}
|
|
95
90
|
|
|
91
|
+
/**
|
|
92
|
+
* Removes the wire envelope of one message: `{ value, grpcNative }` around a primitive and
|
|
93
|
+
* `{ value, grpcNullable }` around a nullable result. A nullable primitive carries both, nested.
|
|
94
|
+
*/
|
|
95
|
+
private unwrapEnvelope(data: any): any {
|
|
96
|
+
if (data?.grpcNullable) {
|
|
97
|
+
const value = data.value?.grpcNative ? data.value.value : data.value;
|
|
98
|
+
return value ?? null;
|
|
99
|
+
}
|
|
100
|
+
return data?.grpcNative ? data.value : data;
|
|
101
|
+
}
|
|
102
|
+
|
|
96
103
|
private async execute<T>(): Promise<T> {
|
|
97
104
|
const handler = (): Promise<T> =>
|
|
98
105
|
this.toPromise<T>(
|
|
@@ -6,7 +6,7 @@ import { extractProperties } from '../helpers/property.helper.js';
|
|
|
6
6
|
import { microserviceStorage } from '../storages/microservice.storage.js';
|
|
7
7
|
import { HbsGeneratorService } from './hbs-generator.service.js';
|
|
8
8
|
import { isNil } from 'es-toolkit';
|
|
9
|
-
import {
|
|
9
|
+
import { resolveWireResponse } from '../helpers/wire-response.helper.js';
|
|
10
10
|
import { GRPC_METHOD_METADATA_KEY, GRPC_PARAM_INDEX_METADATA_KEY, GRPC_STREAM_METADATA_KEY } from '../constants/metadata-key.const.js';
|
|
11
11
|
export class GenerateProtoService extends HbsGeneratorService {
|
|
12
12
|
packageName;
|
|
@@ -119,21 +119,9 @@ export class GenerateProtoService extends HbsGeneratorService {
|
|
|
119
119
|
parameterName = params[parameterIndex].name;
|
|
120
120
|
}
|
|
121
121
|
const response = Reflect.getMetadata(RESPONSE_METADATA_KEY, constructor.prototype[propertyKey]);
|
|
122
|
-
|
|
123
|
-
if (
|
|
124
|
-
|
|
125
|
-
returnType = `Proto${response.responseClass.name}List`;
|
|
126
|
-
}
|
|
127
|
-
else if (isPrimitiveType(response.responseClass)) {
|
|
128
|
-
returnType = `Native${response.responseClass.name}Value`;
|
|
129
|
-
}
|
|
130
|
-
else if (response.isAllowEmpty) {
|
|
131
|
-
returnType = `${NullableGrpcClassResponseNamePrefix}${response.responseClass.name}`;
|
|
132
|
-
this.nullableResponseTypes.add(response.responseClass.name);
|
|
133
|
-
}
|
|
134
|
-
else {
|
|
135
|
-
returnType = response.responseClass.name;
|
|
136
|
-
}
|
|
122
|
+
const { wireResponseType: returnType, nullableInner } = resolveWireResponse(response);
|
|
123
|
+
if (nullableInner) {
|
|
124
|
+
this.nullableResponseTypes.add(nullableInner);
|
|
137
125
|
}
|
|
138
126
|
const isStream = Reflect.getMetadata(GRPC_STREAM_METADATA_KEY, constructor.prototype, propertyKey);
|
|
139
127
|
const returnClause = isStream ? `stream ${returnType}` : returnType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-proto.service.js","sourceRoot":"","sources":["../../../lib/services/generate-proto.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mCAAmC,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvG,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"generate-proto.service.js","sourceRoot":"","sources":["../../../lib/services/generate-proto.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -133,6 +133,8 @@ export class GoSdkGeneratorService extends HbsGeneratorService {
|
|
|
133
133
|
return goNativeTypes[method.responseType];
|
|
134
134
|
case 'nativeList':
|
|
135
135
|
return `[]${goNativeTypes[method.responseType]}`;
|
|
136
|
+
case 'nullableNative':
|
|
137
|
+
return `*${goNativeTypes[method.responseType]}`;
|
|
136
138
|
default:
|
|
137
139
|
return `*pb.${toGoCamelCase(method.responseType)}`;
|
|
138
140
|
}
|
|
@@ -148,6 +150,8 @@ export class GoSdkGeneratorService extends HbsGeneratorService {
|
|
|
148
150
|
case 'native':
|
|
149
151
|
case 'nullable':
|
|
150
152
|
return 'res.GetValue()';
|
|
153
|
+
case 'nullableNative':
|
|
154
|
+
return 'optional(res.GetValue() != nil, res.GetValue().GetValue())';
|
|
151
155
|
default:
|
|
152
156
|
return 'res';
|
|
153
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"go-sdk-generator.service.js","sourceRoot":"","sources":["../../../lib/services/go-sdk-generator.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"go-sdk-generator.service.js","sourceRoot":"","sources":["../../../lib/services/go-sdk-generator.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,6 +67,7 @@ export class RustSdkGeneratorService extends HbsGeneratorService {
|
|
|
67
67
|
services: descriptor.services.map((service) => this.buildServiceView(service))
|
|
68
68
|
})
|
|
69
69
|
],
|
|
70
|
+
['src/call.rs', this.compileTemplate('rust/call.hbs', {})],
|
|
70
71
|
['src/error.rs', this.compileTemplate('rust/error.hbs', {})],
|
|
71
72
|
[
|
|
72
73
|
'src/enums.rs',
|
|
@@ -121,6 +122,8 @@ export class RustSdkGeneratorService extends HbsGeneratorService {
|
|
|
121
122
|
}
|
|
122
123
|
return {
|
|
123
124
|
fnName: toRustIdentifier(snakeName),
|
|
125
|
+
rpcService: `${this.config.name}.${service.name}`,
|
|
126
|
+
rpcMethod: method.name,
|
|
124
127
|
docLines,
|
|
125
128
|
requestType: method.requestType ? `pb::${rustTypeName(method.requestType)}` : undefined,
|
|
126
129
|
requestArg: method.requestType ? 'request' : '()',
|
|
@@ -141,6 +144,8 @@ export class RustSdkGeneratorService extends HbsGeneratorService {
|
|
|
141
144
|
return `Vec<${rustNativeTypes[method.responseType]}>`;
|
|
142
145
|
case 'nullable':
|
|
143
146
|
return `Option<pb::${rustTypeName(method.responseType)}>`;
|
|
147
|
+
case 'nullableNative':
|
|
148
|
+
return `Option<${rustNativeTypes[method.responseType]}>`;
|
|
144
149
|
default:
|
|
145
150
|
return `pb::${rustTypeName(method.responseType)}`;
|
|
146
151
|
}
|
|
@@ -153,6 +158,8 @@ export class RustSdkGeneratorService extends HbsGeneratorService {
|
|
|
153
158
|
case 'native':
|
|
154
159
|
case 'nullable':
|
|
155
160
|
return 'response.value';
|
|
161
|
+
case 'nullableNative':
|
|
162
|
+
return 'response.value.map(|native| native.value)';
|
|
156
163
|
default:
|
|
157
164
|
return 'response';
|
|
158
165
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rust-sdk-generator.service.js","sourceRoot":"","sources":["../../../lib/services/rust-sdk-generator.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAsB,MAAM,qCAAqC,CAAC;AAC1G,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAClH,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAQxG,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,MAAM,eAAe,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AACzE,MAAM,YAAY,GAAG,eAAe,CAAC;AACrC,MAAM,mBAAmB,GAAG,OAAO,CAAC;AAIpC,MAAM,mBAAmB,GAAG;IACxB,SAAS;IACT,KAAK;IACL,aAAa;IACb,kBAAkB;IAClB,iBAAiB;IACjB,mBAAmB;IACnB,2BAA2B;IAC3B,2BAA2B;IAC3B,OAAO;CACV,CAAC;AAGF,SAAS,YAAY,CAAC,IAAY;IAC9B,OAAO,gBAAgB,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,OAAO,uBAAwB,SAAQ,mBAAmB;IAOhD;IACA;IAPZ,MAAM,CAAU,aAAa,GAAyB,CAAC,WAAW,EAAE,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAEzF,MAAM,GAAG,IAAI,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAClD,SAAS,CAAS;IAE1B,YACY,MAA0B,EAC1B,gBAA+B,IAAI,aAAa,EAAE;QAE1D,KAAK,EAAE,CAAC;QAHA,WAAM,GAAN,MAAM,CAAoB;QAC1B,kBAAa,GAAb,aAAa,CAAqC;QAG1D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1E,CAAC;IAED,QAAQ,CAAC,UAA0B;QAC/B,UAAU,KAAK,IAAI,oBAAoB,EAAE,CAAC,QAAQ,EAAE,CAAC;QACrD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,oFAAoF,CAAC,CAAC;QAC1G,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;QACtE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;QAEnD,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,UAAyB;QACzC,OAAO,IAAI,GAAG,CAAC;YACX;gBACI,YAAY;gBACZ,IAAI,CAAC,eAAe,CAAC,qBAAqB,EAAE;oBACxC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS;oBACrC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,mBAAmB;oBACxD,WAAW,EAAE,kBAAkB,CAAC,cAAc;oBAC9C,MAAM,EAAE,kBAAkB,CAAC,MAAM;iBACpC,CAAC;aACL;YACD;gBACI,eAAe;gBACf,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE;oBACpC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;iBACjF,CAAC;aACL;YACD,CAAC,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;YAC5D;gBACI,cAAc;gBACd,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE;oBACnC,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;iBAClE,CAAC;aACL;SACJ,CAAC,CAAC;IACP,CAAC;IAEO,eAAe,CAAC,KAA0B;QAC9C,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,EAAE,CAAC,UAAU,EAAE,EAAE;YAC7D,IAAI,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;YAClE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;YACtD,IAAI,CAAC,aAAa,CAAC,GAAG,CAClB,CAAC,gBAAgB,EAAE,eAAe,YAAY,EAAE,EAAE,eAAe,YAAY,EAAE,EAAE,oBAAoB,CAAC,EACtG,UAAU,CACb,CAAC;YACF,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACrG,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,KAAK,EAAE,CAAC;gBAClC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;YAC5D,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAOO,oBAAoB,CAAC,OAAe;QACxC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACvD,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACnF,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;QACtE,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;QAEvE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CACX,iDAAiD,YAAY,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,GAAG,CACzG,CAAC;QACN,CAAC;QAED,MAAM,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC;QAC/B,MAAM,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;QAElF,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;IACzF,CAAC;IAEO,gBAAgB,CAAC,OAA6B;QAClD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAEzE,OAAO;YAEH,UAAU,EAAE,GAAG,QAAQ,QAAQ;YAC/B,UAAU,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS;YACjD,QAAQ,EAAE,iBAAiB,OAAO,CAAC,IAAI,YAAY,WAAW,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;YAC5E,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;SAClF,CAAC;IACN,CAAC;IAEO,eAAe,CAAC,OAA6B,EAAE,MAA2B;QAC9E,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,mBAAmB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CACX,kBAAkB,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,uCAAuC,SAAS,oBAAoB,CACpH,CAAC;QACN,CAAC;QACD,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,aAAa,MAAM,CAAC,IAAI,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrF,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;YAC7B,QAAQ,CAAC,IAAI,CAAC,gCAAgC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrF,CAAC;QAED,OAAO;YAEH,MAAM,EAAE,gBAAgB,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"rust-sdk-generator.service.js","sourceRoot":"","sources":["../../../lib/services/rust-sdk-generator.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RESPONSE_METADATA_KEY } from '@hodfords/nestjs-response';
|
|
2
2
|
import { Logger } from '@nestjs/common';
|
|
3
3
|
import { isFunction, isUndefined } from '@nestjs/common/utils/shared.utils.js';
|
|
4
4
|
import { isEmpty } from 'es-toolkit/compat';
|
|
@@ -7,8 +7,8 @@ import { isEnumProperty } from '../helpers/api-property.helper.js';
|
|
|
7
7
|
import { extractProperties } from '../helpers/property.helper.js';
|
|
8
8
|
import { enumMemberName } from '../helpers/sdk-naming.helper.js';
|
|
9
9
|
import { isPrimitiveType } from '../helpers/type.helper.js';
|
|
10
|
+
import { resolveWireResponse } from '../helpers/wire-response.helper.js';
|
|
10
11
|
import { microserviceStorage } from '../storages/microservice.storage.js';
|
|
11
|
-
const emptyMessage = 'google.protobuf.Empty';
|
|
12
12
|
const nativeTypes = {
|
|
13
13
|
String: 'string',
|
|
14
14
|
Boolean: 'bool',
|
|
@@ -50,42 +50,13 @@ export class SdkDescriptorService {
|
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
describeResponse(response) {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
}
|
|
61
|
-
const className = response.responseClass.name;
|
|
62
|
-
const isPrimitive = isPrimitiveType(response.responseClass);
|
|
63
|
-
const responseType = isPrimitive ? nativeTypes[className] : className;
|
|
64
|
-
if (response.isArray) {
|
|
65
|
-
return {
|
|
66
|
-
responseKind: isPrimitive ? 'nativeList' : 'list',
|
|
67
|
-
responseType,
|
|
68
|
-
wireResponseType: `Proto${className}List`,
|
|
69
|
-
isNullablePrimitive: false
|
|
70
|
-
};
|
|
71
|
-
}
|
|
72
|
-
if (isPrimitive) {
|
|
73
|
-
return {
|
|
74
|
-
responseKind: 'native',
|
|
75
|
-
responseType,
|
|
76
|
-
wireResponseType: `Native${className}Value`,
|
|
77
|
-
isNullablePrimitive: Boolean(response.isAllowEmpty)
|
|
78
|
-
};
|
|
79
|
-
}
|
|
80
|
-
if (response.isAllowEmpty) {
|
|
81
|
-
return {
|
|
82
|
-
responseKind: 'nullable',
|
|
83
|
-
responseType,
|
|
84
|
-
wireResponseType: `${NullableGrpcClassResponseNamePrefix}${className}`,
|
|
85
|
-
isNullablePrimitive: false
|
|
86
|
-
};
|
|
87
|
-
}
|
|
88
|
-
return { responseKind: 'single', responseType, wireResponseType: className, isNullablePrimitive: false };
|
|
53
|
+
const { responseKind, wireResponseType } = resolveWireResponse(response);
|
|
54
|
+
const className = response?.responseClass.name;
|
|
55
|
+
return {
|
|
56
|
+
responseKind,
|
|
57
|
+
responseType: isPrimitiveType(response?.responseClass) ? nativeTypes[className] : className,
|
|
58
|
+
wireResponseType
|
|
59
|
+
};
|
|
89
60
|
}
|
|
90
61
|
describeEnums() {
|
|
91
62
|
const enums = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk-descriptor.service.js","sourceRoot":"","sources":["../../../lib/services/sdk-descriptor.service.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"sdk-descriptor.service.js","sourceRoot":"","sources":["../../../lib/services/sdk-descriptor.service.ts"],"names":[],"mappings":"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"}
|
package/templates/go/client.hbs
CHANGED
|
@@ -106,6 +106,14 @@ func wrapStreamError(err error) error {
|
|
|
106
106
|
}
|
|
107
107
|
return wrapError(err)
|
|
108
108
|
}
|
|
109
|
+
|
|
110
|
+
// optional returns nil when a nullable primitive response carries no value.
|
|
111
|
+
func optional[T any](present bool, value T) *T {
|
|
112
|
+
if !present {
|
|
113
|
+
return nil
|
|
114
|
+
}
|
|
115
|
+
return &value
|
|
116
|
+
}
|
|
109
117
|
{{#each services}}
|
|
110
118
|
|
|
111
119
|
{{#each docLines}}
|
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
// Generated by @hodfords/nestjs-grpc-helper. Do not edit.
|
|
2
|
+
|
|
3
|
+
use std::collections::hash_map::RandomState;
|
|
4
|
+
use std::fmt;
|
|
5
|
+
use std::future::Future;
|
|
6
|
+
use std::hash::BuildHasher;
|
|
7
|
+
use std::time::{Duration, Instant};
|
|
8
|
+
|
|
9
|
+
use tonic::metadata::MetadataMap;
|
|
10
|
+
|
|
11
|
+
use crate::client::{CallOptions, ClientOptions};
|
|
12
|
+
use crate::error::SdkError;
|
|
13
|
+
|
|
14
|
+
/// One rpc, named as on the wire: `/{service}/{method}`.
|
|
15
|
+
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
|
|
16
|
+
pub struct Rpc {
|
|
17
|
+
/// Proto package and service, for example `sample.UserMicroservice`.
|
|
18
|
+
pub service: &'static str,
|
|
19
|
+
/// Method name as the proto declares it, for example `findUser`.
|
|
20
|
+
pub method: &'static str,
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
impl fmt::Display for Rpc {
|
|
24
|
+
fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
25
|
+
write!(formatter, "{}/{}", self.service, self.method)
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/// Runs around every call of a client, for tracing, logging or metadata every call needs. Set it in
|
|
30
|
+
/// `ClientOptions.hook`.
|
|
31
|
+
///
|
|
32
|
+
/// `start` runs once per call, before the first attempt; metadata it adds is sent by every attempt.
|
|
33
|
+
/// The guard it returns receives the outcome once: after the last attempt of a unary call, or when a
|
|
34
|
+
/// stream opened or failed to open. A call whose future is dropped drops its guard without `finish`.
|
|
35
|
+
pub trait CallHook: Send + Sync + fmt::Debug {
|
|
36
|
+
fn start(&self, rpc: Rpc, metadata: &mut MetadataMap) -> Box<dyn CallGuard>;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/// Receives the outcome of the call a `CallHook` started.
|
|
40
|
+
pub trait CallGuard: Send {
|
|
41
|
+
fn finish(self: Box<Self>, outcome: Result<(), &SdkError>);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/// Retry of unary calls, as in the gRPC retry policy: at most `max_attempts` attempts in all, while the
|
|
45
|
+
/// status is one of `retryable_codes`, waiting a random time up to the current backoff between two
|
|
46
|
+
/// attempts. The call timeout bounds all attempts and waits together. Business errors
|
|
47
|
+
/// (`SdkError::Service`) and streams are never retried.
|
|
48
|
+
///
|
|
49
|
+
/// Only list codes for which sending the request again is safe for the rpcs of the client.
|
|
50
|
+
#[derive(Clone, Debug, PartialEq)]
|
|
51
|
+
pub struct RetryPolicy {
|
|
52
|
+
pub max_attempts: u32,
|
|
53
|
+
pub initial_backoff: Duration,
|
|
54
|
+
pub max_backoff: Duration,
|
|
55
|
+
pub backoff_multiplier: f64,
|
|
56
|
+
pub retryable_codes: Vec<tonic::Code>,
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
impl Default for RetryPolicy {
|
|
60
|
+
/// 3 attempts on UNAVAILABLE, with a backoff of 200 ms doubling up to 1 s.
|
|
61
|
+
fn default() -> Self {
|
|
62
|
+
Self {
|
|
63
|
+
max_attempts: 3,
|
|
64
|
+
initial_backoff: Duration::from_millis(200),
|
|
65
|
+
max_backoff: Duration::from_secs(1),
|
|
66
|
+
backoff_multiplier: 2.0,
|
|
67
|
+
retryable_codes: vec![tonic::Code::Unavailable],
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
impl RetryPolicy {
|
|
73
|
+
fn retries(&self, error: &SdkError) -> bool {
|
|
74
|
+
matches!(error, SdkError::Status(status) if self.retryable_codes.contains(&status.code()))
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
fn next_backoff(&self, backoff: Duration) -> Duration {
|
|
78
|
+
Duration::try_from_secs_f64(backoff.as_secs_f64() * self.backoff_multiplier)
|
|
79
|
+
.unwrap_or(self.max_backoff)
|
|
80
|
+
.min(self.max_backoff)
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
pub(crate) fn build_request<T>(message: T, timeout: Option<Duration>, metadata: MetadataMap) -> tonic::Request<T> {
|
|
85
|
+
let mut request = tonic::Request::new(message);
|
|
86
|
+
// Metadata first: set_timeout stores the deadline in the request metadata.
|
|
87
|
+
*request.metadata_mut() = metadata;
|
|
88
|
+
if let Some(timeout) = timeout {
|
|
89
|
+
request.set_timeout(timeout);
|
|
90
|
+
}
|
|
91
|
+
request
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
/// A unary call: the hook around it, the client default timeout as the deadline of all attempts, and
|
|
95
|
+
/// the retry policy of the client. `send` performs one attempt.
|
|
96
|
+
pub(crate) async fn unary<Req, Res, F, Fut>(
|
|
97
|
+
rpc: Rpc,
|
|
98
|
+
client: &ClientOptions,
|
|
99
|
+
options: CallOptions,
|
|
100
|
+
message: Req,
|
|
101
|
+
mut send: F,
|
|
102
|
+
) -> Result<Res, SdkError>
|
|
103
|
+
where
|
|
104
|
+
Req: Clone,
|
|
105
|
+
F: FnMut(tonic::Request<Req>) -> Fut,
|
|
106
|
+
Fut: Future<Output = Result<tonic::Response<Res>, tonic::Status>>,
|
|
107
|
+
{
|
|
108
|
+
let CallOptions { mut metadata, timeout } = options;
|
|
109
|
+
let guard = start(client, rpc, &mut metadata);
|
|
110
|
+
let deadline = timeout
|
|
111
|
+
.or(client.timeout)
|
|
112
|
+
.and_then(|timeout| Instant::now().checked_add(timeout));
|
|
113
|
+
let result = attempt(client.retry.as_ref(), deadline, metadata, message, &mut send).await;
|
|
114
|
+
finish(guard, &result);
|
|
115
|
+
result
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/// Opens a server stream: the hook around the opening and the call timeout only, never retried.
|
|
119
|
+
pub(crate) async fn open_stream<Req, Res, F, Fut>(
|
|
120
|
+
rpc: Rpc,
|
|
121
|
+
client: &ClientOptions,
|
|
122
|
+
options: CallOptions,
|
|
123
|
+
message: Req,
|
|
124
|
+
send: F,
|
|
125
|
+
) -> Result<tonic::Streaming<Res>, SdkError>
|
|
126
|
+
where
|
|
127
|
+
F: FnOnce(tonic::Request<Req>) -> Fut,
|
|
128
|
+
Fut: Future<Output = Result<tonic::Response<tonic::Streaming<Res>>, tonic::Status>>,
|
|
129
|
+
{
|
|
130
|
+
let CallOptions { mut metadata, timeout } = options;
|
|
131
|
+
let guard = start(client, rpc, &mut metadata);
|
|
132
|
+
let result = send(build_request(message, timeout, metadata))
|
|
133
|
+
.await
|
|
134
|
+
.map(tonic::Response::into_inner)
|
|
135
|
+
.map_err(SdkError::from_status);
|
|
136
|
+
finish(guard, &result);
|
|
137
|
+
result
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
async fn attempt<Req, Res, F, Fut>(
|
|
141
|
+
policy: Option<&RetryPolicy>,
|
|
142
|
+
deadline: Option<Instant>,
|
|
143
|
+
metadata: MetadataMap,
|
|
144
|
+
message: Req,
|
|
145
|
+
send: &mut F,
|
|
146
|
+
) -> Result<Res, SdkError>
|
|
147
|
+
where
|
|
148
|
+
Req: Clone,
|
|
149
|
+
F: FnMut(tonic::Request<Req>) -> Fut,
|
|
150
|
+
Fut: Future<Output = Result<tonic::Response<Res>, tonic::Status>>,
|
|
151
|
+
{
|
|
152
|
+
let max_attempts = policy.map_or(1, |policy| policy.max_attempts.max(1));
|
|
153
|
+
let mut backoff = policy.map_or(Duration::ZERO, |policy| policy.initial_backoff);
|
|
154
|
+
let mut attempt = 1;
|
|
155
|
+
loop {
|
|
156
|
+
let timeout = remaining(deadline)?;
|
|
157
|
+
let Some(policy) = policy.filter(|_| attempt < max_attempts) else {
|
|
158
|
+
// The last attempt sends the message itself instead of a copy.
|
|
159
|
+
return send(build_request(message, timeout, metadata))
|
|
160
|
+
.await
|
|
161
|
+
.map(tonic::Response::into_inner)
|
|
162
|
+
.map_err(SdkError::from_status);
|
|
163
|
+
};
|
|
164
|
+
let error = match send(build_request(message.clone(), timeout, metadata.clone())).await {
|
|
165
|
+
Ok(response) => return Ok(response.into_inner()),
|
|
166
|
+
Err(status) => SdkError::from_status(status),
|
|
167
|
+
};
|
|
168
|
+
let wait = jitter(backoff);
|
|
169
|
+
let out_of_time = deadline.is_some_and(|deadline| Instant::now() + wait >= deadline);
|
|
170
|
+
if out_of_time || !policy.retries(&error) {
|
|
171
|
+
return Err(error);
|
|
172
|
+
}
|
|
173
|
+
tokio::time::sleep(wait).await;
|
|
174
|
+
backoff = policy.next_backoff(backoff);
|
|
175
|
+
attempt += 1;
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
fn remaining(deadline: Option<Instant>) -> Result<Option<Duration>, SdkError> {
|
|
180
|
+
let Some(deadline) = deadline else {
|
|
181
|
+
return Ok(None);
|
|
182
|
+
};
|
|
183
|
+
match deadline.checked_duration_since(Instant::now()) {
|
|
184
|
+
Some(left) if !left.is_zero() => Ok(Some(left)),
|
|
185
|
+
_ => Err(SdkError::Status(tonic::Status::deadline_exceeded("Timeout expired"))),
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
/// A random duration up to `backoff`, without a random number crate: every `RandomState` has new keys.
|
|
190
|
+
fn jitter(backoff: Duration) -> Duration {
|
|
191
|
+
let bits = RandomState::new().hash_one(0u8) >> 11;
|
|
192
|
+
backoff.mul_f64(bits as f64 / (1u64 << 53) as f64)
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
fn start(client: &ClientOptions, rpc: Rpc, metadata: &mut MetadataMap) -> Option<Box<dyn CallGuard>> {
|
|
196
|
+
client.hook.as_ref().map(|hook| hook.start(rpc, metadata))
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
fn finish<T>(guard: Option<Box<dyn CallGuard>>, result: &Result<T, SdkError>) {
|
|
200
|
+
if let Some(guard) = guard {
|
|
201
|
+
guard.finish(result.as_ref().map(|_| ()));
|
|
202
|
+
}
|
|
203
|
+
}
|
|
@@ -8,6 +8,7 @@ rust-version = "{{rustVersion}}"
|
|
|
8
8
|
[dependencies]
|
|
9
9
|
prost = "{{crates.prost}}"
|
|
10
10
|
tonic = "{{crates.tonic}}"
|
|
11
|
+
tokio = { version = "{{crates.tokio}}", features = ["time"] }
|
|
11
12
|
tokio-stream = "{{crates.tokioStream}}"
|
|
12
13
|
serde_json = "{{crates.serdeJson}}"
|
|
13
14
|
thiserror = "{{crates.thiserror}}"
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Generated by @hodfords/nestjs-grpc-helper. Do not edit.
|
|
2
2
|
|
|
3
3
|
use std::pin::Pin;
|
|
4
|
+
use std::sync::Arc;
|
|
4
5
|
use std::time::Duration;
|
|
5
6
|
|
|
6
7
|
#[allow(unused_imports)]
|
|
@@ -8,6 +9,7 @@ use tokio_stream::{Stream, StreamExt};
|
|
|
8
9
|
use tonic::metadata::MetadataMap;
|
|
9
10
|
use tonic::transport::{Channel, Endpoint};
|
|
10
11
|
|
|
12
|
+
use crate::call::{self, CallHook, RetryPolicy, Rpc};
|
|
11
13
|
use crate::error::SdkError;
|
|
12
14
|
use crate::pb;
|
|
13
15
|
|
|
@@ -21,11 +23,19 @@ pub type SdkStream<T> = Pin<Box<dyn Stream<Item = Result<T, SdkError>> + Send +
|
|
|
21
23
|
/// Options shared by every call of a client.
|
|
22
24
|
#[derive(Clone, Debug, Default)]
|
|
23
25
|
pub struct ClientOptions {
|
|
24
|
-
/// Default timeout of unary calls. Streams never use it.
|
|
26
|
+
/// Default timeout of unary calls, covering every attempt of a retried call. Streams never use it.
|
|
25
27
|
pub timeout: Option<Duration>,
|
|
28
|
+
/// Largest response message, in bytes, the client accepts. `None` keeps tonic's default (4 MiB).
|
|
29
|
+
pub max_decoding_message_size: Option<usize>,
|
|
30
|
+
/// Largest request message, in bytes, the client sends. `None` keeps tonic's default (no limit).
|
|
31
|
+
pub max_encoding_message_size: Option<usize>,
|
|
32
|
+
/// Retry of unary calls. `None` sends each call once.
|
|
33
|
+
pub retry: Option<RetryPolicy>,
|
|
34
|
+
/// Runs around every call, unary or stream.
|
|
35
|
+
pub hook: Option<Arc<dyn CallHook>>,
|
|
26
36
|
}
|
|
27
37
|
|
|
28
|
-
/// Options of a single call.
|
|
38
|
+
/// Options of a single call. A `MetadataMap` converts into options with only that metadata.
|
|
29
39
|
#[derive(Clone, Debug, Default)]
|
|
30
40
|
pub struct CallOptions {
|
|
31
41
|
pub metadata: MetadataMap,
|
|
@@ -35,14 +45,10 @@ pub struct CallOptions {
|
|
|
35
45
|
pub timeout: Option<Duration>,
|
|
36
46
|
}
|
|
37
47
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
*request.metadata_mut() = metadata;
|
|
42
|
-
if let Some(timeout) = timeout {
|
|
43
|
-
request.set_timeout(timeout);
|
|
48
|
+
impl From<MetadataMap> for CallOptions {
|
|
49
|
+
fn from(metadata: MetadataMap) -> Self {
|
|
50
|
+
Self { metadata, timeout: None }
|
|
44
51
|
}
|
|
45
|
-
request
|
|
46
52
|
}
|
|
47
53
|
{{#each services}}
|
|
48
54
|
|
|
@@ -64,7 +70,13 @@ impl {{clientName}} {
|
|
|
64
70
|
|
|
65
71
|
/// Wraps an existing channel.
|
|
66
72
|
pub fn new(channel: Channel, options: ClientOptions) -> Self {
|
|
67
|
-
let inner = pb::{{moduleName}}::{{clientName}}::new(channel);
|
|
73
|
+
let mut inner = pb::{{moduleName}}::{{clientName}}::new(channel);
|
|
74
|
+
if let Some(limit) = options.max_decoding_message_size {
|
|
75
|
+
inner = inner.max_decoding_message_size(limit);
|
|
76
|
+
}
|
|
77
|
+
if let Some(limit) = options.max_encoding_message_size {
|
|
78
|
+
inner = inner.max_encoding_message_size(limit);
|
|
79
|
+
}
|
|
68
80
|
Self { inner, options }
|
|
69
81
|
}
|
|
70
82
|
{{#each methods}}
|
|
@@ -73,15 +85,23 @@ impl {{clientName}} {
|
|
|
73
85
|
/// {{{this}}}
|
|
74
86
|
{{/each}}
|
|
75
87
|
{{#if isStream}}
|
|
76
|
-
pub async fn {{{fnName}}}(&self{{#if requestType}}, request: {{{requestType}}}{{/if}}, options: CallOptions) -> Result<SdkStream<{{{returnType}}}>, SdkError> {
|
|
77
|
-
|
|
78
|
-
let stream = self.
|
|
88
|
+
pub async fn {{{fnName}}}(&self{{#if requestType}}, request: {{{requestType}}}{{/if}}, options: impl Into<CallOptions>) -> Result<SdkStream<{{{returnType}}}>, SdkError> {
|
|
89
|
+
const RPC: Rpc = Rpc { service: "{{{rpcService}}}", method: "{{{rpcMethod}}}" };
|
|
90
|
+
let stream = call::open_stream(RPC, &self.options, options.into(), {{{requestArg}}}, |request| {
|
|
91
|
+
let mut inner = self.inner.clone();
|
|
92
|
+
async move { inner.{{{fnName}}}(request).await }
|
|
93
|
+
})
|
|
94
|
+
.await?;
|
|
79
95
|
Ok(Box::pin(stream.map(|chunk| chunk.map(|response| {{{unwrapExpr}}}).map_err(SdkError::from_status))))
|
|
80
96
|
}
|
|
81
97
|
{{else}}
|
|
82
|
-
pub async fn {{{fnName}}}(&self{{#if requestType}}, request: {{{requestType}}}{{/if}}, options: CallOptions) -> Result<{{{returnType}}}, SdkError> {
|
|
83
|
-
|
|
84
|
-
let response = self.
|
|
98
|
+
pub async fn {{{fnName}}}(&self{{#if requestType}}, request: {{{requestType}}}{{/if}}, options: impl Into<CallOptions>) -> Result<{{{returnType}}}, SdkError> {
|
|
99
|
+
const RPC: Rpc = Rpc { service: "{{{rpcService}}}", method: "{{{rpcMethod}}}" };
|
|
100
|
+
let response = call::unary(RPC, &self.options, options.into(), {{{requestArg}}}, |request| {
|
|
101
|
+
let mut inner = self.inner.clone();
|
|
102
|
+
async move { inner.{{{fnName}}}(request).await }
|
|
103
|
+
})
|
|
104
|
+
.await?;
|
|
85
105
|
Ok({{{unwrapExpr}}})
|
|
86
106
|
}
|
|
87
107
|
{{/if}}
|
package/templates/rust/lib.hbs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export type SdkNativeType = 'string' | 'bool' | 'float';
|
|
2
|
-
export type SdkResponseKind = 'empty' | 'single' | 'list' | 'native' | 'nativeList' | 'nullable';
|
|
2
|
+
export type SdkResponseKind = 'empty' | 'single' | 'list' | 'native' | 'nativeList' | 'nullable' | 'nullableNative';
|
|
3
3
|
export type SdkMethodDescriptor = {
|
|
4
4
|
name: string;
|
|
5
5
|
description?: string;
|
|
@@ -9,7 +9,6 @@ export type SdkMethodDescriptor = {
|
|
|
9
9
|
wireResponseType: string;
|
|
10
10
|
isStream: boolean;
|
|
11
11
|
metadataKeys: string[];
|
|
12
|
-
isNullablePrimitive: boolean;
|
|
13
12
|
};
|
|
14
13
|
export type SdkServiceDescriptor = {
|
|
15
14
|
name: string;
|