@smithy/core 3.18.2 → 3.18.4
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-cjs/submodules/cbor/index.js +0 -1
- package/dist-cjs/submodules/event-streams/index.js +43 -2
- package/dist-cjs/submodules/schema/index.js +3 -0
- package/dist-es/submodules/cbor/SmithyRpcV2CborProtocol.js +0 -1
- package/dist-es/submodules/event-streams/EventStreamSerde.js +44 -3
- package/dist-es/submodules/schema/middleware/schemaDeserializationMiddleware.js +3 -0
- package/package.json +2 -2
|
@@ -998,7 +998,6 @@ class SmithyRpcV2CborProtocol extends protocols.RpcProtocol {
|
|
|
998
998
|
}
|
|
999
999
|
const errorMetadata = {
|
|
1000
1000
|
$metadata: metadata,
|
|
1001
|
-
$response: response,
|
|
1002
1001
|
$fault: response.statusCode <= 500 ? "client" : "server",
|
|
1003
1002
|
};
|
|
1004
1003
|
const registry = schema.TypeRegistry.for(namespace);
|
|
@@ -76,8 +76,9 @@ class EventStreamSerde {
|
|
|
76
76
|
const unionMember = Object.keys(event).find((key) => {
|
|
77
77
|
return key !== "__type";
|
|
78
78
|
}) ?? "";
|
|
79
|
+
const body = event[unionMember].body;
|
|
79
80
|
if (unionMember === "initial-response") {
|
|
80
|
-
const dataObject = await this.deserializer.read(responseSchema,
|
|
81
|
+
const dataObject = await this.deserializer.read(responseSchema, body);
|
|
81
82
|
delete dataObject[eventStreamMember];
|
|
82
83
|
return {
|
|
83
84
|
[initialResponseMarker]: true,
|
|
@@ -86,8 +87,48 @@ class EventStreamSerde {
|
|
|
86
87
|
}
|
|
87
88
|
else if (unionMember in memberSchemas) {
|
|
88
89
|
const eventStreamSchema = memberSchemas[unionMember];
|
|
90
|
+
if (eventStreamSchema.isStructSchema()) {
|
|
91
|
+
const out = {};
|
|
92
|
+
let hasBindings = false;
|
|
93
|
+
for (const [name, member] of eventStreamSchema.structIterator()) {
|
|
94
|
+
const { eventHeader, eventPayload } = member.getMergedTraits();
|
|
95
|
+
hasBindings = hasBindings || Boolean(eventHeader || eventPayload);
|
|
96
|
+
if (eventPayload) {
|
|
97
|
+
if (member.isBlobSchema()) {
|
|
98
|
+
out[name] = body;
|
|
99
|
+
}
|
|
100
|
+
else if (member.isStringSchema()) {
|
|
101
|
+
out[name] = (this.serdeContext?.utf8Encoder ?? utilUtf8.toUtf8)(body);
|
|
102
|
+
}
|
|
103
|
+
else if (member.isStructSchema()) {
|
|
104
|
+
out[name] = await this.deserializer.read(member, body);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
else if (eventHeader) {
|
|
108
|
+
const value = event[unionMember].headers[name]?.value;
|
|
109
|
+
if (value != null) {
|
|
110
|
+
if (member.isNumericSchema()) {
|
|
111
|
+
if (value && typeof value === "object" && "bytes" in value) {
|
|
112
|
+
out[name] = BigInt(value.toString());
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
out[name] = Number(value);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
out[name] = value;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
if (hasBindings) {
|
|
125
|
+
return {
|
|
126
|
+
[unionMember]: out,
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
}
|
|
89
130
|
return {
|
|
90
|
-
[unionMember]: await this.deserializer.read(eventStreamSchema,
|
|
131
|
+
[unionMember]: await this.deserializer.read(eventStreamSchema, body),
|
|
91
132
|
};
|
|
92
133
|
}
|
|
93
134
|
else {
|
|
@@ -35,6 +35,9 @@ const schemaDeserializationMiddleware = (config) => (next, context) => async (ar
|
|
|
35
35
|
catch (error) {
|
|
36
36
|
Object.defineProperty(error, "$response", {
|
|
37
37
|
value: response,
|
|
38
|
+
enumerable: false,
|
|
39
|
+
writable: false,
|
|
40
|
+
configurable: false,
|
|
38
41
|
});
|
|
39
42
|
if (!("$metadata" in error)) {
|
|
40
43
|
const hint = `Deserialization error: to see the raw response, inspect the hidden field {error}.$response on this object.`;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { fromUtf8 } from "@smithy/util-utf8";
|
|
1
|
+
import { fromUtf8, toUtf8 } from "@smithy/util-utf8";
|
|
2
2
|
export class EventStreamSerde {
|
|
3
3
|
marshaller;
|
|
4
4
|
serializer;
|
|
@@ -73,8 +73,9 @@ export class EventStreamSerde {
|
|
|
73
73
|
const unionMember = Object.keys(event).find((key) => {
|
|
74
74
|
return key !== "__type";
|
|
75
75
|
}) ?? "";
|
|
76
|
+
const body = event[unionMember].body;
|
|
76
77
|
if (unionMember === "initial-response") {
|
|
77
|
-
const dataObject = await this.deserializer.read(responseSchema,
|
|
78
|
+
const dataObject = await this.deserializer.read(responseSchema, body);
|
|
78
79
|
delete dataObject[eventStreamMember];
|
|
79
80
|
return {
|
|
80
81
|
[initialResponseMarker]: true,
|
|
@@ -83,8 +84,48 @@ export class EventStreamSerde {
|
|
|
83
84
|
}
|
|
84
85
|
else if (unionMember in memberSchemas) {
|
|
85
86
|
const eventStreamSchema = memberSchemas[unionMember];
|
|
87
|
+
if (eventStreamSchema.isStructSchema()) {
|
|
88
|
+
const out = {};
|
|
89
|
+
let hasBindings = false;
|
|
90
|
+
for (const [name, member] of eventStreamSchema.structIterator()) {
|
|
91
|
+
const { eventHeader, eventPayload } = member.getMergedTraits();
|
|
92
|
+
hasBindings = hasBindings || Boolean(eventHeader || eventPayload);
|
|
93
|
+
if (eventPayload) {
|
|
94
|
+
if (member.isBlobSchema()) {
|
|
95
|
+
out[name] = body;
|
|
96
|
+
}
|
|
97
|
+
else if (member.isStringSchema()) {
|
|
98
|
+
out[name] = (this.serdeContext?.utf8Encoder ?? toUtf8)(body);
|
|
99
|
+
}
|
|
100
|
+
else if (member.isStructSchema()) {
|
|
101
|
+
out[name] = await this.deserializer.read(member, body);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
else if (eventHeader) {
|
|
105
|
+
const value = event[unionMember].headers[name]?.value;
|
|
106
|
+
if (value != null) {
|
|
107
|
+
if (member.isNumericSchema()) {
|
|
108
|
+
if (value && typeof value === "object" && "bytes" in value) {
|
|
109
|
+
out[name] = BigInt(value.toString());
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
out[name] = Number(value);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
out[name] = value;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
if (hasBindings) {
|
|
122
|
+
return {
|
|
123
|
+
[unionMember]: out,
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
}
|
|
86
127
|
return {
|
|
87
|
-
[unionMember]: await this.deserializer.read(eventStreamSchema,
|
|
128
|
+
[unionMember]: await this.deserializer.read(eventStreamSchema, body),
|
|
88
129
|
};
|
|
89
130
|
}
|
|
90
131
|
else {
|
|
@@ -18,6 +18,9 @@ export const schemaDeserializationMiddleware = (config) => (next, context) => as
|
|
|
18
18
|
catch (error) {
|
|
19
19
|
Object.defineProperty(error, "$response", {
|
|
20
20
|
value: response,
|
|
21
|
+
enumerable: false,
|
|
22
|
+
writable: false,
|
|
23
|
+
configurable: false,
|
|
21
24
|
});
|
|
22
25
|
if (!("$metadata" in error)) {
|
|
23
26
|
const hint = `Deserialization error: to see the raw response, inspect the hidden field {error}.$response on this object.`;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smithy/core",
|
|
3
|
-
"version": "3.18.
|
|
3
|
+
"version": "3.18.4",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"build": "yarn lint && concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
|
|
6
6
|
"build:cjs": "node ../../scripts/inline core",
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"license": "Apache-2.0",
|
|
78
78
|
"sideEffects": false,
|
|
79
79
|
"dependencies": {
|
|
80
|
-
"@smithy/middleware-serde": "^4.2.
|
|
80
|
+
"@smithy/middleware-serde": "^4.2.6",
|
|
81
81
|
"@smithy/protocol-http": "^5.3.5",
|
|
82
82
|
"@smithy/types": "^4.9.0",
|
|
83
83
|
"@smithy/util-base64": "^4.3.0",
|