@cdk8s/awscdk-resolver 0.0.657 → 0.0.659
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/.jsii +2 -2
- package/lib/resolve.js +1 -1
- package/node_modules/@smithy/core/dist-cjs/submodules/cbor/index.js +1 -2
- package/node_modules/@smithy/core/dist-cjs/submodules/event-streams/index.browser.js +23 -23
- package/node_modules/@smithy/core/dist-cjs/submodules/event-streams/index.js +23 -23
- package/node_modules/@smithy/core/dist-cjs/submodules/protocols/index.js +9 -8
- package/node_modules/@smithy/core/dist-es/submodules/cbor/SmithyRpcV2CborProtocol.js +1 -2
- package/node_modules/@smithy/core/dist-es/submodules/event-streams/EventStreamSerde.js +4 -4
- package/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/HeaderMarshaller.js +19 -19
- package/node_modules/@smithy/core/dist-es/submodules/protocols/RpcProtocol.js +3 -4
- package/node_modules/@smithy/core/dist-es/submodules/protocols/middleware-content-length/contentLengthMiddleware.js +6 -4
- package/node_modules/@smithy/core/dist-types/submodules/client/smithy-client/extensions/defaultExtensionConfiguration.d.ts +1 -7
- package/node_modules/@smithy/core/dist-types/submodules/config/config-resolver/regionConfig/checkRegion.d.ts +2 -1
- package/node_modules/@smithy/core/dist-types/submodules/endpoints/util-endpoints/utils/evaluateCondition.d.ts +1 -1
- package/node_modules/@smithy/core/dist-types/submodules/endpoints/util-endpoints/utils/evaluateConditions.d.ts +1 -1
- package/node_modules/@smithy/core/dist-types/submodules/endpoints/util-endpoints/utils/evaluateExpression.d.ts +2 -2
- package/node_modules/@smithy/core/dist-types/submodules/endpoints/util-endpoints/utils/evaluateRules.d.ts +2 -2
- package/node_modules/@smithy/core/dist-types/submodules/endpoints/util-endpoints/utils/getEndpointProperties.d.ts +2 -2
- package/node_modules/@smithy/core/dist-types/submodules/endpoints/util-endpoints/utils/getReferenceValue.d.ts +2 -2
- package/node_modules/@smithy/core/dist-types/submodules/event-streams/EventStreamSerde.d.ts +14 -2
- package/node_modules/@smithy/core/dist-types/submodules/retry/util-retry/retries-2026-config.d.ts +2 -2
- package/node_modules/@smithy/core/dist-types/submodules/schema/TypeRegistry.d.ts +1 -1
- package/node_modules/@smithy/core/dist-types/submodules/serde/parse-utils.d.ts +5 -5
- package/node_modules/@smithy/core/dist-types/ts3.4/submodules/client/smithy-client/extensions/defaultExtensionConfiguration.d.ts +1 -7
- package/node_modules/@smithy/core/dist-types/ts3.4/submodules/config/config-resolver/regionConfig/checkRegion.d.ts +2 -1
- package/node_modules/@smithy/core/dist-types/ts3.4/submodules/endpoints/util-endpoints/utils/evaluateCondition.d.ts +1 -1
- package/node_modules/@smithy/core/dist-types/ts3.4/submodules/endpoints/util-endpoints/utils/evaluateConditions.d.ts +1 -1
- package/node_modules/@smithy/core/dist-types/ts3.4/submodules/endpoints/util-endpoints/utils/evaluateExpression.d.ts +2 -2
- package/node_modules/@smithy/core/dist-types/ts3.4/submodules/endpoints/util-endpoints/utils/evaluateRules.d.ts +2 -2
- package/node_modules/@smithy/core/dist-types/ts3.4/submodules/endpoints/util-endpoints/utils/getEndpointProperties.d.ts +2 -2
- package/node_modules/@smithy/core/dist-types/ts3.4/submodules/endpoints/util-endpoints/utils/getReferenceValue.d.ts +2 -2
- package/node_modules/@smithy/core/dist-types/ts3.4/submodules/event-streams/EventStreamSerde.d.ts +14 -2
- package/node_modules/@smithy/core/dist-types/ts3.4/submodules/retry/util-retry/retries-2026-config.d.ts +2 -2
- package/node_modules/@smithy/core/dist-types/ts3.4/submodules/schema/TypeRegistry.d.ts +1 -1
- package/node_modules/@smithy/core/dist-types/ts3.4/submodules/serde/parse-utils.d.ts +5 -5
- package/node_modules/@smithy/core/package.json +3 -7
- package/node_modules/@smithy/credential-provider-imds/package.json +4 -12
- package/node_modules/@smithy/fetch-http-handler/package.json +5 -13
- package/node_modules/@smithy/node-http-handler/dist-types/node-http2-handler.d.ts +1 -1
- package/node_modules/@smithy/node-http-handler/dist-types/ts3.4/node-http2-handler.d.ts +1 -1
- package/node_modules/@smithy/node-http-handler/package.json +5 -9
- package/node_modules/@smithy/signature-v4/dist-cjs/index.js +9 -9
- package/node_modules/@smithy/signature-v4/dist-es/HeaderFormatter.js +9 -9
- package/node_modules/@smithy/signature-v4/package.json +4 -12
- package/node_modules/@smithy/types/package.json +2 -10
- package/package.json +2 -2
package/.jsii
CHANGED
|
@@ -4083,6 +4083,6 @@
|
|
|
4083
4083
|
"symbolId": "src/resolve:AwsCdkResolver"
|
|
4084
4084
|
}
|
|
4085
4085
|
},
|
|
4086
|
-
"version": "0.0.
|
|
4087
|
-
"fingerprint": "
|
|
4086
|
+
"version": "0.0.659",
|
|
4087
|
+
"fingerprint": "6i5qaqvpQj4YBDZxV5IyvOZ1m4IdBepNvgU37KN1tp0="
|
|
4088
4088
|
}
|
package/lib/resolve.js
CHANGED
|
@@ -39,7 +39,7 @@ const child_process_1 = require("child_process");
|
|
|
39
39
|
const path = __importStar(require("path"));
|
|
40
40
|
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
41
41
|
class AwsCdkResolver {
|
|
42
|
-
static [JSII_RTTI_SYMBOL_1] = { fqn: "@cdk8s/awscdk-resolver.AwsCdkResolver", version: "0.0.
|
|
42
|
+
static [JSII_RTTI_SYMBOL_1] = { fqn: "@cdk8s/awscdk-resolver.AwsCdkResolver", version: "0.0.659" };
|
|
43
43
|
resolve(context) {
|
|
44
44
|
if (!aws_cdk_lib_1.Token.isUnresolved(context.value)) {
|
|
45
45
|
return;
|
|
@@ -2187,10 +2187,9 @@ class SmithyRpcV2CborProtocol extends RpcProtocol {
|
|
|
2187
2187
|
this.serializer.write(15, {});
|
|
2188
2188
|
request.body = this.serializer.flush();
|
|
2189
2189
|
}
|
|
2190
|
-
|
|
2190
|
+
if (request.body instanceof Uint8Array) {
|
|
2191
2191
|
request.headers["content-length"] = String(request.body.byteLength);
|
|
2192
2192
|
}
|
|
2193
|
-
catch (ignored) { }
|
|
2194
2193
|
}
|
|
2195
2194
|
const { service, operation } = getSmithyContext(context);
|
|
2196
2195
|
const path = `/service/${service}/operation/${operation}`;
|
|
@@ -70,27 +70,27 @@ class HeaderMarshaller {
|
|
|
70
70
|
formatHeaderValue(header) {
|
|
71
71
|
switch (header.type) {
|
|
72
72
|
case "boolean":
|
|
73
|
-
return Uint8Array.from([header.value ?
|
|
73
|
+
return Uint8Array.from([header.value ? 0 : 1]);
|
|
74
74
|
case "byte":
|
|
75
|
-
return Uint8Array.from([
|
|
75
|
+
return Uint8Array.from([2, header.value]);
|
|
76
76
|
case "short":
|
|
77
77
|
const shortView = new DataView(new ArrayBuffer(3));
|
|
78
|
-
shortView.setUint8(0,
|
|
78
|
+
shortView.setUint8(0, 3);
|
|
79
79
|
shortView.setInt16(1, header.value, false);
|
|
80
80
|
return new Uint8Array(shortView.buffer);
|
|
81
81
|
case "integer":
|
|
82
82
|
const intView = new DataView(new ArrayBuffer(5));
|
|
83
|
-
intView.setUint8(0,
|
|
83
|
+
intView.setUint8(0, 4);
|
|
84
84
|
intView.setInt32(1, header.value, false);
|
|
85
85
|
return new Uint8Array(intView.buffer);
|
|
86
86
|
case "long":
|
|
87
87
|
const longBytes = new Uint8Array(9);
|
|
88
|
-
longBytes[0] =
|
|
88
|
+
longBytes[0] = 5;
|
|
89
89
|
longBytes.set(header.value.bytes, 1);
|
|
90
90
|
return longBytes;
|
|
91
91
|
case "binary":
|
|
92
92
|
const binView = new DataView(new ArrayBuffer(3 + header.value.byteLength));
|
|
93
|
-
binView.setUint8(0,
|
|
93
|
+
binView.setUint8(0, 6);
|
|
94
94
|
binView.setUint16(1, header.value.byteLength, false);
|
|
95
95
|
const binBytes = new Uint8Array(binView.buffer);
|
|
96
96
|
binBytes.set(header.value, 3);
|
|
@@ -98,14 +98,14 @@ class HeaderMarshaller {
|
|
|
98
98
|
case "string":
|
|
99
99
|
const utf8Bytes = this.fromUtf8(header.value);
|
|
100
100
|
const strView = new DataView(new ArrayBuffer(3 + utf8Bytes.byteLength));
|
|
101
|
-
strView.setUint8(0,
|
|
101
|
+
strView.setUint8(0, 7);
|
|
102
102
|
strView.setUint16(1, utf8Bytes.byteLength, false);
|
|
103
103
|
const strBytes = new Uint8Array(strView.buffer);
|
|
104
104
|
strBytes.set(utf8Bytes, 3);
|
|
105
105
|
return strBytes;
|
|
106
106
|
case "timestamp":
|
|
107
107
|
const tsBytes = new Uint8Array(9);
|
|
108
|
-
tsBytes[0] =
|
|
108
|
+
tsBytes[0] = 8;
|
|
109
109
|
tsBytes.set(Int64.fromNumber(header.value.valueOf()).bytes, 1);
|
|
110
110
|
return tsBytes;
|
|
111
111
|
case "uuid":
|
|
@@ -113,7 +113,7 @@ class HeaderMarshaller {
|
|
|
113
113
|
throw new Error(`Invalid UUID received: ${header.value}`);
|
|
114
114
|
}
|
|
115
115
|
const uuidBytes = new Uint8Array(17);
|
|
116
|
-
uuidBytes[0] =
|
|
116
|
+
uuidBytes[0] = 9;
|
|
117
117
|
uuidBytes.set(fromHex(header.value.replace(/-/g, "")), 1);
|
|
118
118
|
return uuidBytes;
|
|
119
119
|
}
|
|
@@ -126,46 +126,46 @@ class HeaderMarshaller {
|
|
|
126
126
|
const name = this.toUtf8(new Uint8Array(headers.buffer, headers.byteOffset + position, nameLength));
|
|
127
127
|
position += nameLength;
|
|
128
128
|
switch (headers.getUint8(position++)) {
|
|
129
|
-
case
|
|
129
|
+
case 0:
|
|
130
130
|
out[name] = {
|
|
131
131
|
type: BOOLEAN_TAG,
|
|
132
132
|
value: true,
|
|
133
133
|
};
|
|
134
134
|
break;
|
|
135
|
-
case
|
|
135
|
+
case 1:
|
|
136
136
|
out[name] = {
|
|
137
137
|
type: BOOLEAN_TAG,
|
|
138
138
|
value: false,
|
|
139
139
|
};
|
|
140
140
|
break;
|
|
141
|
-
case
|
|
141
|
+
case 2:
|
|
142
142
|
out[name] = {
|
|
143
143
|
type: BYTE_TAG,
|
|
144
144
|
value: headers.getInt8(position++),
|
|
145
145
|
};
|
|
146
146
|
break;
|
|
147
|
-
case
|
|
147
|
+
case 3:
|
|
148
148
|
out[name] = {
|
|
149
149
|
type: SHORT_TAG,
|
|
150
150
|
value: headers.getInt16(position, false),
|
|
151
151
|
};
|
|
152
152
|
position += 2;
|
|
153
153
|
break;
|
|
154
|
-
case
|
|
154
|
+
case 4:
|
|
155
155
|
out[name] = {
|
|
156
156
|
type: INT_TAG,
|
|
157
157
|
value: headers.getInt32(position, false),
|
|
158
158
|
};
|
|
159
159
|
position += 4;
|
|
160
160
|
break;
|
|
161
|
-
case
|
|
161
|
+
case 5:
|
|
162
162
|
out[name] = {
|
|
163
163
|
type: LONG_TAG,
|
|
164
164
|
value: new Int64(new Uint8Array(headers.buffer, headers.byteOffset + position, 8)),
|
|
165
165
|
};
|
|
166
166
|
position += 8;
|
|
167
167
|
break;
|
|
168
|
-
case
|
|
168
|
+
case 6:
|
|
169
169
|
const binaryLength = headers.getUint16(position, false);
|
|
170
170
|
position += 2;
|
|
171
171
|
out[name] = {
|
|
@@ -174,7 +174,7 @@ class HeaderMarshaller {
|
|
|
174
174
|
};
|
|
175
175
|
position += binaryLength;
|
|
176
176
|
break;
|
|
177
|
-
case
|
|
177
|
+
case 7:
|
|
178
178
|
const stringLength = headers.getUint16(position, false);
|
|
179
179
|
position += 2;
|
|
180
180
|
out[name] = {
|
|
@@ -183,14 +183,14 @@ class HeaderMarshaller {
|
|
|
183
183
|
};
|
|
184
184
|
position += stringLength;
|
|
185
185
|
break;
|
|
186
|
-
case
|
|
186
|
+
case 8:
|
|
187
187
|
out[name] = {
|
|
188
188
|
type: TIMESTAMP_TAG,
|
|
189
189
|
value: new Date(new Int64(new Uint8Array(headers.buffer, headers.byteOffset + position, 8)).valueOf()),
|
|
190
190
|
};
|
|
191
191
|
position += 8;
|
|
192
192
|
break;
|
|
193
|
-
case
|
|
193
|
+
case 9:
|
|
194
194
|
const uuidBytes = new Uint8Array(headers.buffer, headers.byteOffset + position, 16);
|
|
195
195
|
position += 16;
|
|
196
196
|
out[name] = {
|
|
@@ -601,7 +601,7 @@ class EventStreamSerde {
|
|
|
601
601
|
this.defaultContentType = defaultContentType;
|
|
602
602
|
this.compositeErrorRegistry = compositeErrorRegistry;
|
|
603
603
|
}
|
|
604
|
-
async serializeEventStream({ eventStream, requestSchema, initialRequest, }) {
|
|
604
|
+
async serializeEventStream({ eventStream, requestSchema, initialRequest, initialMessageType, }) {
|
|
605
605
|
const marshaller = this.marshaller;
|
|
606
606
|
const eventStreamMember = requestSchema.getEventStreamMember();
|
|
607
607
|
const unionSchema = requestSchema.getMemberSchema(eventStreamMember);
|
|
@@ -612,7 +612,7 @@ class EventStreamSerde {
|
|
|
612
612
|
async *[Symbol.asyncIterator]() {
|
|
613
613
|
if (initialRequest) {
|
|
614
614
|
const headers = {
|
|
615
|
-
":event-type": { type: "string", value: "initial-request" },
|
|
615
|
+
":event-type": { type: "string", value: initialMessageType ?? "initial-request" },
|
|
616
616
|
":message-type": { type: "string", value: "event" },
|
|
617
617
|
":content-type": { type: "string", value: defaultContentType },
|
|
618
618
|
};
|
|
@@ -656,7 +656,7 @@ class EventStreamSerde {
|
|
|
656
656
|
};
|
|
657
657
|
});
|
|
658
658
|
}
|
|
659
|
-
async deserializeEventStream({ response, responseSchema, initialResponseContainer, }) {
|
|
659
|
+
async deserializeEventStream({ response, responseSchema, initialResponseContainer, initialMessageType, }) {
|
|
660
660
|
const marshaller = this.marshaller;
|
|
661
661
|
const eventStreamMember = responseSchema.getEventStreamMember();
|
|
662
662
|
const unionSchema = responseSchema.getMemberSchema(eventStreamMember);
|
|
@@ -671,7 +671,7 @@ class EventStreamSerde {
|
|
|
671
671
|
}
|
|
672
672
|
}
|
|
673
673
|
const body = event[unionMember].body;
|
|
674
|
-
if (unionMember === "initial-response") {
|
|
674
|
+
if (unionMember === (initialMessageType ?? "initial-response")) {
|
|
675
675
|
const dataObject = await this.deserializer.read(responseSchema, body);
|
|
676
676
|
delete dataObject[eventStreamMember];
|
|
677
677
|
return {
|
|
@@ -71,27 +71,27 @@ class HeaderMarshaller {
|
|
|
71
71
|
formatHeaderValue(header) {
|
|
72
72
|
switch (header.type) {
|
|
73
73
|
case "boolean":
|
|
74
|
-
return Uint8Array.from([header.value ?
|
|
74
|
+
return Uint8Array.from([header.value ? 0 : 1]);
|
|
75
75
|
case "byte":
|
|
76
|
-
return Uint8Array.from([
|
|
76
|
+
return Uint8Array.from([2, header.value]);
|
|
77
77
|
case "short":
|
|
78
78
|
const shortView = new DataView(new ArrayBuffer(3));
|
|
79
|
-
shortView.setUint8(0,
|
|
79
|
+
shortView.setUint8(0, 3);
|
|
80
80
|
shortView.setInt16(1, header.value, false);
|
|
81
81
|
return new Uint8Array(shortView.buffer);
|
|
82
82
|
case "integer":
|
|
83
83
|
const intView = new DataView(new ArrayBuffer(5));
|
|
84
|
-
intView.setUint8(0,
|
|
84
|
+
intView.setUint8(0, 4);
|
|
85
85
|
intView.setInt32(1, header.value, false);
|
|
86
86
|
return new Uint8Array(intView.buffer);
|
|
87
87
|
case "long":
|
|
88
88
|
const longBytes = new Uint8Array(9);
|
|
89
|
-
longBytes[0] =
|
|
89
|
+
longBytes[0] = 5;
|
|
90
90
|
longBytes.set(header.value.bytes, 1);
|
|
91
91
|
return longBytes;
|
|
92
92
|
case "binary":
|
|
93
93
|
const binView = new DataView(new ArrayBuffer(3 + header.value.byteLength));
|
|
94
|
-
binView.setUint8(0,
|
|
94
|
+
binView.setUint8(0, 6);
|
|
95
95
|
binView.setUint16(1, header.value.byteLength, false);
|
|
96
96
|
const binBytes = new Uint8Array(binView.buffer);
|
|
97
97
|
binBytes.set(header.value, 3);
|
|
@@ -99,14 +99,14 @@ class HeaderMarshaller {
|
|
|
99
99
|
case "string":
|
|
100
100
|
const utf8Bytes = this.fromUtf8(header.value);
|
|
101
101
|
const strView = new DataView(new ArrayBuffer(3 + utf8Bytes.byteLength));
|
|
102
|
-
strView.setUint8(0,
|
|
102
|
+
strView.setUint8(0, 7);
|
|
103
103
|
strView.setUint16(1, utf8Bytes.byteLength, false);
|
|
104
104
|
const strBytes = new Uint8Array(strView.buffer);
|
|
105
105
|
strBytes.set(utf8Bytes, 3);
|
|
106
106
|
return strBytes;
|
|
107
107
|
case "timestamp":
|
|
108
108
|
const tsBytes = new Uint8Array(9);
|
|
109
|
-
tsBytes[0] =
|
|
109
|
+
tsBytes[0] = 8;
|
|
110
110
|
tsBytes.set(Int64.fromNumber(header.value.valueOf()).bytes, 1);
|
|
111
111
|
return tsBytes;
|
|
112
112
|
case "uuid":
|
|
@@ -114,7 +114,7 @@ class HeaderMarshaller {
|
|
|
114
114
|
throw new Error(`Invalid UUID received: ${header.value}`);
|
|
115
115
|
}
|
|
116
116
|
const uuidBytes = new Uint8Array(17);
|
|
117
|
-
uuidBytes[0] =
|
|
117
|
+
uuidBytes[0] = 9;
|
|
118
118
|
uuidBytes.set(fromHex(header.value.replace(/-/g, "")), 1);
|
|
119
119
|
return uuidBytes;
|
|
120
120
|
}
|
|
@@ -127,46 +127,46 @@ class HeaderMarshaller {
|
|
|
127
127
|
const name = this.toUtf8(new Uint8Array(headers.buffer, headers.byteOffset + position, nameLength));
|
|
128
128
|
position += nameLength;
|
|
129
129
|
switch (headers.getUint8(position++)) {
|
|
130
|
-
case
|
|
130
|
+
case 0:
|
|
131
131
|
out[name] = {
|
|
132
132
|
type: BOOLEAN_TAG,
|
|
133
133
|
value: true,
|
|
134
134
|
};
|
|
135
135
|
break;
|
|
136
|
-
case
|
|
136
|
+
case 1:
|
|
137
137
|
out[name] = {
|
|
138
138
|
type: BOOLEAN_TAG,
|
|
139
139
|
value: false,
|
|
140
140
|
};
|
|
141
141
|
break;
|
|
142
|
-
case
|
|
142
|
+
case 2:
|
|
143
143
|
out[name] = {
|
|
144
144
|
type: BYTE_TAG,
|
|
145
145
|
value: headers.getInt8(position++),
|
|
146
146
|
};
|
|
147
147
|
break;
|
|
148
|
-
case
|
|
148
|
+
case 3:
|
|
149
149
|
out[name] = {
|
|
150
150
|
type: SHORT_TAG,
|
|
151
151
|
value: headers.getInt16(position, false),
|
|
152
152
|
};
|
|
153
153
|
position += 2;
|
|
154
154
|
break;
|
|
155
|
-
case
|
|
155
|
+
case 4:
|
|
156
156
|
out[name] = {
|
|
157
157
|
type: INT_TAG,
|
|
158
158
|
value: headers.getInt32(position, false),
|
|
159
159
|
};
|
|
160
160
|
position += 4;
|
|
161
161
|
break;
|
|
162
|
-
case
|
|
162
|
+
case 5:
|
|
163
163
|
out[name] = {
|
|
164
164
|
type: LONG_TAG,
|
|
165
165
|
value: new Int64(new Uint8Array(headers.buffer, headers.byteOffset + position, 8)),
|
|
166
166
|
};
|
|
167
167
|
position += 8;
|
|
168
168
|
break;
|
|
169
|
-
case
|
|
169
|
+
case 6:
|
|
170
170
|
const binaryLength = headers.getUint16(position, false);
|
|
171
171
|
position += 2;
|
|
172
172
|
out[name] = {
|
|
@@ -175,7 +175,7 @@ class HeaderMarshaller {
|
|
|
175
175
|
};
|
|
176
176
|
position += binaryLength;
|
|
177
177
|
break;
|
|
178
|
-
case
|
|
178
|
+
case 7:
|
|
179
179
|
const stringLength = headers.getUint16(position, false);
|
|
180
180
|
position += 2;
|
|
181
181
|
out[name] = {
|
|
@@ -184,14 +184,14 @@ class HeaderMarshaller {
|
|
|
184
184
|
};
|
|
185
185
|
position += stringLength;
|
|
186
186
|
break;
|
|
187
|
-
case
|
|
187
|
+
case 8:
|
|
188
188
|
out[name] = {
|
|
189
189
|
type: TIMESTAMP_TAG,
|
|
190
190
|
value: new Date(new Int64(new Uint8Array(headers.buffer, headers.byteOffset + position, 8)).valueOf()),
|
|
191
191
|
};
|
|
192
192
|
position += 8;
|
|
193
193
|
break;
|
|
194
|
-
case
|
|
194
|
+
case 9:
|
|
195
195
|
const uuidBytes = new Uint8Array(headers.buffer, headers.byteOffset + position, 16);
|
|
196
196
|
position += 16;
|
|
197
197
|
out[name] = {
|
|
@@ -626,7 +626,7 @@ class EventStreamSerde {
|
|
|
626
626
|
this.defaultContentType = defaultContentType;
|
|
627
627
|
this.compositeErrorRegistry = compositeErrorRegistry;
|
|
628
628
|
}
|
|
629
|
-
async serializeEventStream({ eventStream, requestSchema, initialRequest, }) {
|
|
629
|
+
async serializeEventStream({ eventStream, requestSchema, initialRequest, initialMessageType, }) {
|
|
630
630
|
const marshaller = this.marshaller;
|
|
631
631
|
const eventStreamMember = requestSchema.getEventStreamMember();
|
|
632
632
|
const unionSchema = requestSchema.getMemberSchema(eventStreamMember);
|
|
@@ -637,7 +637,7 @@ class EventStreamSerde {
|
|
|
637
637
|
async *[Symbol.asyncIterator]() {
|
|
638
638
|
if (initialRequest) {
|
|
639
639
|
const headers = {
|
|
640
|
-
":event-type": { type: "string", value: "initial-request" },
|
|
640
|
+
":event-type": { type: "string", value: initialMessageType ?? "initial-request" },
|
|
641
641
|
":message-type": { type: "string", value: "event" },
|
|
642
642
|
":content-type": { type: "string", value: defaultContentType },
|
|
643
643
|
};
|
|
@@ -681,7 +681,7 @@ class EventStreamSerde {
|
|
|
681
681
|
};
|
|
682
682
|
});
|
|
683
683
|
}
|
|
684
|
-
async deserializeEventStream({ response, responseSchema, initialResponseContainer, }) {
|
|
684
|
+
async deserializeEventStream({ response, responseSchema, initialResponseContainer, initialMessageType, }) {
|
|
685
685
|
const marshaller = this.marshaller;
|
|
686
686
|
const eventStreamMember = responseSchema.getEventStreamMember();
|
|
687
687
|
const unionSchema = responseSchema.getMemberSchema(eventStreamMember);
|
|
@@ -696,7 +696,7 @@ class EventStreamSerde {
|
|
|
696
696
|
}
|
|
697
697
|
}
|
|
698
698
|
const body = event[unionMember].body;
|
|
699
|
-
if (unionMember === "initial-response") {
|
|
699
|
+
if (unionMember === (initialMessageType ?? "initial-response")) {
|
|
700
700
|
const dataObject = await this.deserializer.read(responseSchema, body);
|
|
701
701
|
delete dataObject[eventStreamMember];
|
|
702
702
|
return {
|
|
@@ -494,10 +494,9 @@ class RpcProtocol extends HttpProtocol {
|
|
|
494
494
|
if (eventStreamMember) {
|
|
495
495
|
if (input[eventStreamMember]) {
|
|
496
496
|
const initialRequest = {};
|
|
497
|
-
for (const [memberName
|
|
498
|
-
if (memberName !== eventStreamMember && input[memberName]) {
|
|
499
|
-
|
|
500
|
-
initialRequest[memberName] = serializer.flush();
|
|
497
|
+
for (const [memberName] of ns.structIterator()) {
|
|
498
|
+
if (memberName !== eventStreamMember && input[memberName] != null) {
|
|
499
|
+
initialRequest[memberName] = input[memberName];
|
|
501
500
|
}
|
|
502
501
|
}
|
|
503
502
|
payload = await this.serializeEventStream({
|
|
@@ -964,10 +963,12 @@ function contentLengthMiddleware(bodyLengthChecker) {
|
|
|
964
963
|
.indexOf(CONTENT_LENGTH_HEADER) === -1) {
|
|
965
964
|
try {
|
|
966
965
|
const length = bodyLengthChecker(body);
|
|
967
|
-
|
|
968
|
-
|
|
969
|
-
|
|
970
|
-
|
|
966
|
+
if (length != null) {
|
|
967
|
+
request.headers = {
|
|
968
|
+
...request.headers,
|
|
969
|
+
[CONTENT_LENGTH_HEADER]: String(length),
|
|
970
|
+
};
|
|
971
|
+
}
|
|
971
972
|
}
|
|
972
973
|
catch (ignored) {
|
|
973
974
|
}
|
|
@@ -32,10 +32,9 @@ export class SmithyRpcV2CborProtocol extends RpcProtocol {
|
|
|
32
32
|
this.serializer.write(15, {});
|
|
33
33
|
request.body = this.serializer.flush();
|
|
34
34
|
}
|
|
35
|
-
|
|
35
|
+
if (request.body instanceof Uint8Array) {
|
|
36
36
|
request.headers["content-length"] = String(request.body.byteLength);
|
|
37
37
|
}
|
|
38
|
-
catch (ignored) { }
|
|
39
38
|
}
|
|
40
39
|
const { service, operation } = getSmithyContext(context);
|
|
41
40
|
const path = `/service/${service}/operation/${operation}`;
|
|
@@ -15,7 +15,7 @@ export class EventStreamSerde {
|
|
|
15
15
|
this.defaultContentType = defaultContentType;
|
|
16
16
|
this.compositeErrorRegistry = compositeErrorRegistry;
|
|
17
17
|
}
|
|
18
|
-
async serializeEventStream({ eventStream, requestSchema, initialRequest, }) {
|
|
18
|
+
async serializeEventStream({ eventStream, requestSchema, initialRequest, initialMessageType, }) {
|
|
19
19
|
const marshaller = this.marshaller;
|
|
20
20
|
const eventStreamMember = requestSchema.getEventStreamMember();
|
|
21
21
|
const unionSchema = requestSchema.getMemberSchema(eventStreamMember);
|
|
@@ -26,7 +26,7 @@ export class EventStreamSerde {
|
|
|
26
26
|
async *[Symbol.asyncIterator]() {
|
|
27
27
|
if (initialRequest) {
|
|
28
28
|
const headers = {
|
|
29
|
-
":event-type": { type: "string", value: "initial-request" },
|
|
29
|
+
":event-type": { type: "string", value: initialMessageType ?? "initial-request" },
|
|
30
30
|
":message-type": { type: "string", value: "event" },
|
|
31
31
|
":content-type": { type: "string", value: defaultContentType },
|
|
32
32
|
};
|
|
@@ -70,7 +70,7 @@ export class EventStreamSerde {
|
|
|
70
70
|
};
|
|
71
71
|
});
|
|
72
72
|
}
|
|
73
|
-
async deserializeEventStream({ response, responseSchema, initialResponseContainer, }) {
|
|
73
|
+
async deserializeEventStream({ response, responseSchema, initialResponseContainer, initialMessageType, }) {
|
|
74
74
|
const marshaller = this.marshaller;
|
|
75
75
|
const eventStreamMember = responseSchema.getEventStreamMember();
|
|
76
76
|
const unionSchema = responseSchema.getMemberSchema(eventStreamMember);
|
|
@@ -85,7 +85,7 @@ export class EventStreamSerde {
|
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
const body = event[unionMember].body;
|
|
88
|
-
if (unionMember === "initial-response") {
|
|
88
|
+
if (unionMember === (initialMessageType ?? "initial-response")) {
|
|
89
89
|
const dataObject = await this.deserializer.read(responseSchema, body);
|
|
90
90
|
delete dataObject[eventStreamMember];
|
|
91
91
|
return {
|
|
@@ -24,27 +24,27 @@ export class HeaderMarshaller {
|
|
|
24
24
|
formatHeaderValue(header) {
|
|
25
25
|
switch (header.type) {
|
|
26
26
|
case "boolean":
|
|
27
|
-
return Uint8Array.from([header.value ?
|
|
27
|
+
return Uint8Array.from([header.value ? 0 : 1]);
|
|
28
28
|
case "byte":
|
|
29
|
-
return Uint8Array.from([
|
|
29
|
+
return Uint8Array.from([2, header.value]);
|
|
30
30
|
case "short":
|
|
31
31
|
const shortView = new DataView(new ArrayBuffer(3));
|
|
32
|
-
shortView.setUint8(0,
|
|
32
|
+
shortView.setUint8(0, 3);
|
|
33
33
|
shortView.setInt16(1, header.value, false);
|
|
34
34
|
return new Uint8Array(shortView.buffer);
|
|
35
35
|
case "integer":
|
|
36
36
|
const intView = new DataView(new ArrayBuffer(5));
|
|
37
|
-
intView.setUint8(0,
|
|
37
|
+
intView.setUint8(0, 4);
|
|
38
38
|
intView.setInt32(1, header.value, false);
|
|
39
39
|
return new Uint8Array(intView.buffer);
|
|
40
40
|
case "long":
|
|
41
41
|
const longBytes = new Uint8Array(9);
|
|
42
|
-
longBytes[0] =
|
|
42
|
+
longBytes[0] = 5;
|
|
43
43
|
longBytes.set(header.value.bytes, 1);
|
|
44
44
|
return longBytes;
|
|
45
45
|
case "binary":
|
|
46
46
|
const binView = new DataView(new ArrayBuffer(3 + header.value.byteLength));
|
|
47
|
-
binView.setUint8(0,
|
|
47
|
+
binView.setUint8(0, 6);
|
|
48
48
|
binView.setUint16(1, header.value.byteLength, false);
|
|
49
49
|
const binBytes = new Uint8Array(binView.buffer);
|
|
50
50
|
binBytes.set(header.value, 3);
|
|
@@ -52,14 +52,14 @@ export class HeaderMarshaller {
|
|
|
52
52
|
case "string":
|
|
53
53
|
const utf8Bytes = this.fromUtf8(header.value);
|
|
54
54
|
const strView = new DataView(new ArrayBuffer(3 + utf8Bytes.byteLength));
|
|
55
|
-
strView.setUint8(0,
|
|
55
|
+
strView.setUint8(0, 7);
|
|
56
56
|
strView.setUint16(1, utf8Bytes.byteLength, false);
|
|
57
57
|
const strBytes = new Uint8Array(strView.buffer);
|
|
58
58
|
strBytes.set(utf8Bytes, 3);
|
|
59
59
|
return strBytes;
|
|
60
60
|
case "timestamp":
|
|
61
61
|
const tsBytes = new Uint8Array(9);
|
|
62
|
-
tsBytes[0] =
|
|
62
|
+
tsBytes[0] = 8;
|
|
63
63
|
tsBytes.set(Int64.fromNumber(header.value.valueOf()).bytes, 1);
|
|
64
64
|
return tsBytes;
|
|
65
65
|
case "uuid":
|
|
@@ -67,7 +67,7 @@ export class HeaderMarshaller {
|
|
|
67
67
|
throw new Error(`Invalid UUID received: ${header.value}`);
|
|
68
68
|
}
|
|
69
69
|
const uuidBytes = new Uint8Array(17);
|
|
70
|
-
uuidBytes[0] =
|
|
70
|
+
uuidBytes[0] = 9;
|
|
71
71
|
uuidBytes.set(fromHex(header.value.replace(/-/g, "")), 1);
|
|
72
72
|
return uuidBytes;
|
|
73
73
|
}
|
|
@@ -80,46 +80,46 @@ export class HeaderMarshaller {
|
|
|
80
80
|
const name = this.toUtf8(new Uint8Array(headers.buffer, headers.byteOffset + position, nameLength));
|
|
81
81
|
position += nameLength;
|
|
82
82
|
switch (headers.getUint8(position++)) {
|
|
83
|
-
case
|
|
83
|
+
case 0:
|
|
84
84
|
out[name] = {
|
|
85
85
|
type: BOOLEAN_TAG,
|
|
86
86
|
value: true,
|
|
87
87
|
};
|
|
88
88
|
break;
|
|
89
|
-
case
|
|
89
|
+
case 1:
|
|
90
90
|
out[name] = {
|
|
91
91
|
type: BOOLEAN_TAG,
|
|
92
92
|
value: false,
|
|
93
93
|
};
|
|
94
94
|
break;
|
|
95
|
-
case
|
|
95
|
+
case 2:
|
|
96
96
|
out[name] = {
|
|
97
97
|
type: BYTE_TAG,
|
|
98
98
|
value: headers.getInt8(position++),
|
|
99
99
|
};
|
|
100
100
|
break;
|
|
101
|
-
case
|
|
101
|
+
case 3:
|
|
102
102
|
out[name] = {
|
|
103
103
|
type: SHORT_TAG,
|
|
104
104
|
value: headers.getInt16(position, false),
|
|
105
105
|
};
|
|
106
106
|
position += 2;
|
|
107
107
|
break;
|
|
108
|
-
case
|
|
108
|
+
case 4:
|
|
109
109
|
out[name] = {
|
|
110
110
|
type: INT_TAG,
|
|
111
111
|
value: headers.getInt32(position, false),
|
|
112
112
|
};
|
|
113
113
|
position += 4;
|
|
114
114
|
break;
|
|
115
|
-
case
|
|
115
|
+
case 5:
|
|
116
116
|
out[name] = {
|
|
117
117
|
type: LONG_TAG,
|
|
118
118
|
value: new Int64(new Uint8Array(headers.buffer, headers.byteOffset + position, 8)),
|
|
119
119
|
};
|
|
120
120
|
position += 8;
|
|
121
121
|
break;
|
|
122
|
-
case
|
|
122
|
+
case 6:
|
|
123
123
|
const binaryLength = headers.getUint16(position, false);
|
|
124
124
|
position += 2;
|
|
125
125
|
out[name] = {
|
|
@@ -128,7 +128,7 @@ export class HeaderMarshaller {
|
|
|
128
128
|
};
|
|
129
129
|
position += binaryLength;
|
|
130
130
|
break;
|
|
131
|
-
case
|
|
131
|
+
case 7:
|
|
132
132
|
const stringLength = headers.getUint16(position, false);
|
|
133
133
|
position += 2;
|
|
134
134
|
out[name] = {
|
|
@@ -137,14 +137,14 @@ export class HeaderMarshaller {
|
|
|
137
137
|
};
|
|
138
138
|
position += stringLength;
|
|
139
139
|
break;
|
|
140
|
-
case
|
|
140
|
+
case 8:
|
|
141
141
|
out[name] = {
|
|
142
142
|
type: TIMESTAMP_TAG,
|
|
143
143
|
value: new Date(new Int64(new Uint8Array(headers.buffer, headers.byteOffset + position, 8)).valueOf()),
|
|
144
144
|
};
|
|
145
145
|
position += 8;
|
|
146
146
|
break;
|
|
147
|
-
case
|
|
147
|
+
case 9:
|
|
148
148
|
const uuidBytes = new Uint8Array(headers.buffer, headers.byteOffset + position, 16);
|
|
149
149
|
position += 16;
|
|
150
150
|
out[name] = {
|
|
@@ -31,10 +31,9 @@ export class RpcProtocol extends HttpProtocol {
|
|
|
31
31
|
if (eventStreamMember) {
|
|
32
32
|
if (input[eventStreamMember]) {
|
|
33
33
|
const initialRequest = {};
|
|
34
|
-
for (const [memberName
|
|
35
|
-
if (memberName !== eventStreamMember && input[memberName]) {
|
|
36
|
-
|
|
37
|
-
initialRequest[memberName] = serializer.flush();
|
|
34
|
+
for (const [memberName] of ns.structIterator()) {
|
|
35
|
+
if (memberName !== eventStreamMember && input[memberName] != null) {
|
|
36
|
+
initialRequest[memberName] = input[memberName];
|
|
38
37
|
}
|
|
39
38
|
}
|
|
40
39
|
payload = await this.serializeEventStream({
|
|
@@ -11,10 +11,12 @@ export function contentLengthMiddleware(bodyLengthChecker) {
|
|
|
11
11
|
.indexOf(CONTENT_LENGTH_HEADER) === -1) {
|
|
12
12
|
try {
|
|
13
13
|
const length = bodyLengthChecker(body);
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
if (length != null) {
|
|
15
|
+
request.headers = {
|
|
16
|
+
...request.headers,
|
|
17
|
+
[CONTENT_LENGTH_HEADER]: String(length),
|
|
18
|
+
};
|
|
19
|
+
}
|
|
18
20
|
}
|
|
19
21
|
catch (ignored) {
|
|
20
22
|
}
|
|
@@ -23,13 +23,7 @@ export declare const getDefaultExtensionConfiguration: (runtimeConfig: DefaultEx
|
|
|
23
23
|
* @internal
|
|
24
24
|
* @deprecated use getDefaultExtensionConfiguration
|
|
25
25
|
*/
|
|
26
|
-
export declare const getDefaultClientConfiguration:
|
|
27
|
-
addChecksumAlgorithm(algo: import("@smithy/types").ChecksumAlgorithm): void;
|
|
28
|
-
checksumAlgorithms(): import("@smithy/types").ChecksumAlgorithm[];
|
|
29
|
-
} & {
|
|
30
|
-
setRetryStrategy(retryStrategy: import("@smithy/types").Provider<import("@smithy/types").RetryStrategyV2 | import("@smithy/types").RetryStrategy>): void;
|
|
31
|
-
retryStrategy(): import("@smithy/types").Provider<import("@smithy/types").RetryStrategyV2 | import("@smithy/types").RetryStrategy>;
|
|
32
|
-
};
|
|
26
|
+
export declare const getDefaultClientConfiguration: typeof getDefaultExtensionConfiguration;
|
|
33
27
|
/**
|
|
34
28
|
* Helper function to resolve runtime config from default extension configuration
|
|
35
29
|
*
|