@smithy/core 3.39.0 → 3.41.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.
Files changed (40) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/dist-cjs/submodules/protocols/index.js +600 -328
  3. package/dist-cjs/submodules/retry/index.browser.js +8 -8
  4. package/dist-cjs/submodules/retry/index.js +8 -8
  5. package/dist-cjs/submodules/serde/index.browser.js +9 -4
  6. package/dist-cjs/submodules/serde/index.js +9 -4
  7. package/dist-cjs/submodules/serde/index.native.js +9 -4
  8. package/dist-es/submodules/protocols/HttpBindingNormalizedSchema.js +215 -0
  9. package/dist-es/submodules/protocols/HttpBindingProtocol.js +223 -195
  10. package/dist-es/submodules/protocols/HttpProtocol.js +22 -23
  11. package/dist-es/submodules/protocols/extended-encode-uri-component.js +3 -0
  12. package/dist-es/submodules/protocols/serde/FromStringShapeDeserializer.js +54 -47
  13. package/dist-es/submodules/protocols/serde/HttpInterceptingShapeDeserializer.js +23 -18
  14. package/dist-es/submodules/protocols/serde/HttpInterceptingShapeSerializer.js +12 -5
  15. package/dist-es/submodules/protocols/serde/ToStringShapeSerializer.js +33 -27
  16. package/dist-es/submodules/protocols/serde/determineTimestampFormat.js +5 -5
  17. package/dist-es/submodules/retry/util-retry/StandardRetryStrategy.js +2 -2
  18. package/dist-es/submodules/retry/util-retry/retries-2026-config.js +6 -6
  19. package/dist-es/submodules/serde/quote-header.js +1 -1
  20. package/dist-es/submodules/serde/schema-serde-lib/schema-date-utils.js +4 -0
  21. package/dist-es/submodules/serde/split-header.js +4 -3
  22. package/dist-types/submodules/protocols/HttpBindingNormalizedSchema.d.ts +75 -0
  23. package/dist-types/submodules/protocols/HttpBindingProtocol.d.ts +11 -8
  24. package/dist-types/submodules/protocols/HttpProtocol.d.ts +2 -2
  25. package/dist-types/submodules/protocols/serde/FromStringShapeDeserializer.d.ts +2 -1
  26. package/dist-types/submodules/protocols/serde/HttpInterceptingShapeDeserializer.d.ts +4 -0
  27. package/dist-types/submodules/protocols/serde/HttpInterceptingShapeSerializer.d.ts +3 -0
  28. package/dist-types/submodules/protocols/serde/ToStringShapeSerializer.d.ts +2 -0
  29. package/dist-types/submodules/retry/util-retry/retries-2026-config.d.ts +16 -6
  30. package/dist-types/submodules/schema/schemas/NormalizedSchema.d.ts +1 -1
  31. package/dist-types/ts3.4/submodules/protocols/HttpBindingNormalizedSchema.d.ts +81 -0
  32. package/dist-types/ts3.4/submodules/protocols/HttpBindingProtocol.d.ts +11 -8
  33. package/dist-types/ts3.4/submodules/protocols/HttpProtocol.d.ts +1 -1
  34. package/dist-types/ts3.4/submodules/protocols/serde/FromStringShapeDeserializer.d.ts +2 -1
  35. package/dist-types/ts3.4/submodules/protocols/serde/HttpInterceptingShapeDeserializer.d.ts +4 -0
  36. package/dist-types/ts3.4/submodules/protocols/serde/HttpInterceptingShapeSerializer.d.ts +3 -0
  37. package/dist-types/ts3.4/submodules/protocols/serde/ToStringShapeSerializer.d.ts +2 -0
  38. package/dist-types/ts3.4/submodules/retry/util-retry/retries-2026-config.d.ts +16 -6
  39. package/dist-types/ts3.4/submodules/schema/schemas/NormalizedSchema.d.ts +1 -1
  40. package/package.json +1 -1
@@ -1,184 +1,220 @@
1
- import { hasOwn } from "@smithy/core/transport";
2
- import { NormalizedSchema, translateTraits } from "@smithy/core/schema";
1
+ import { hasOwn, HttpRequest } from "@smithy/core/transport";
3
2
  import { sdkStreamMixin, splitEvery, splitHeader } from "@smithy/core/serde";
4
- import { HttpRequest } from "@smithy/core/transport";
3
+ import { getHttpOperationBindings, HttpBindingNormalizedSchema, } from "./HttpBindingNormalizedSchema";
5
4
  import { HttpProtocol } from "./HttpProtocol";
6
5
  import { collectBody } from "./collect-stream-body";
7
6
  import { extendedEncodeURIComponent } from "./extended-encode-uri-component";
8
7
  export class HttpBindingProtocol extends HttpProtocol {
9
8
  async serializeRequest(operationSchema, _input, context) {
10
9
  const input = _input && typeof _input === "object" ? _input : {};
11
- const serializer = this.serializer;
12
10
  const query = {};
13
11
  const headers = {};
14
12
  const endpoint = await context.endpoint();
15
- const ns = NormalizedSchema.of(operationSchema?.input);
16
- const payloadMemberNames = [];
17
- const payloadMemberSchemas = [];
18
- let hasNonHttpBindingMember = false;
19
- let payload;
20
- const request = new HttpRequest({
21
- protocol: "",
22
- hostname: "",
23
- port: undefined,
24
- path: "",
25
- fragment: undefined,
26
- query: query,
27
- headers: headers,
28
- body: undefined,
29
- });
13
+ const ns = HttpBindingNormalizedSchema.of(operationSchema?.input);
14
+ const bindings = ns.getHttpBindings().request;
15
+ const operation = getHttpOperationBindings(operationSchema);
16
+ const request = new HttpRequest({ query, headers });
30
17
  if (endpoint) {
31
18
  this.updateServiceEndpoint(request, endpoint);
32
- this.setHostPrefix(request, operationSchema, input);
33
- const opTraits = translateTraits(operationSchema.traits);
34
- if (opTraits.http) {
35
- request.method = opTraits.http[0];
36
- const [path, search] = opTraits.http[1].split("?");
37
- if (request.path == "/") {
38
- request.path = path;
39
- }
40
- else {
41
- request.path += path;
42
- }
43
- const traitSearchParams = new URLSearchParams(search ?? "");
44
- for (const [key, value] of traitSearchParams) {
19
+ this.setHostPrefix(request, operationSchema, input, operation);
20
+ const [method, path, staticQuery] = operation;
21
+ if (method) {
22
+ request.method = method;
23
+ request.path = request.path === "/" ? path : request.path + path;
24
+ for (const [key, value] of staticQuery) {
45
25
  query[key] = value;
46
26
  }
47
27
  }
48
28
  }
49
- for (const [memberName, memberNs] of ns.structIterator()) {
50
- const memberTraits = memberNs.getMergedTraits() ?? {};
29
+ request.query = query;
30
+ const eventStream = this.serializeHttpBindings(input, request, bindings, operation);
31
+ if (eventStream) {
32
+ request.body = await this.serializeEventStream({ eventStream, requestSchema: ns });
33
+ }
34
+ return request;
35
+ }
36
+ serializeHttpBindings(input, request, bindings, operation) {
37
+ const serializer = this.serializer;
38
+ const directSerializer = typeof serializer.writeCodec === "function"
39
+ ? serializer
40
+ : undefined;
41
+ const query = request.query;
42
+ const headers = request.headers;
43
+ const bodySchema = bindings.syntheticBodySchema;
44
+ let hasBodyValue = false;
45
+ let payload;
46
+ let eventStream;
47
+ let labels;
48
+ const names = Object.getOwnPropertyNames(input);
49
+ const prototype = Object.getPrototypeOf(input);
50
+ const sparse = (prototype === Object.prototype || prototype === null) &&
51
+ !bindings.hasIdempotency &&
52
+ !bindings.hasPrefixHeaders &&
53
+ names.length * 2 < bindings.memberBindings.length;
54
+ const length = sparse ? names.length : bindings.memberBindings.length;
55
+ for (let i = 0; i < length; ++i) {
56
+ const binding = sparse
57
+ ? hasOwn(bindings.byName, names[i])
58
+ ? bindings.byName[names[i]]
59
+ : undefined
60
+ : bindings.memberBindings[i];
61
+ if (!binding) {
62
+ continue;
63
+ }
64
+ const value = binding[1];
65
+ const memberName = binding[0];
66
+ const memberNs = value[0];
67
+ const flags = value[1];
68
+ const collectionValue = value[2];
69
+ const location = binding[2];
70
+ const wireName = binding[3];
51
71
  const inputMemberValue = input[memberName];
52
- if (inputMemberValue == null && !memberNs.isIdempotencyToken()) {
53
- if (memberTraits.httpLabel) {
54
- if (request.path.includes(`{${memberName}+}`) || request.path.includes(`{${memberName}}`)) {
55
- throw new Error(`No value provided for input HTTP label: ${memberName}.`);
56
- }
57
- }
72
+ if (inputMemberValue == null && !((flags >> 10) & 1)) {
58
73
  continue;
59
74
  }
60
- if (memberTraits.httpPayload) {
61
- const isStreaming = memberNs.isStreaming();
62
- if (isStreaming) {
63
- const isEventStream = memberNs.isStructSchema();
64
- if (isEventStream) {
65
- if (input[memberName]) {
66
- payload = await this.serializeEventStream({
67
- eventStream: input[memberName],
68
- requestSchema: ns,
69
- });
70
- }
75
+ if (location === 0b100_100) {
76
+ const stream = (flags >> 11) & 0b11;
77
+ if (stream) {
78
+ if (stream === 2) {
79
+ eventStream = inputMemberValue || undefined;
71
80
  }
72
81
  else {
73
82
  payload = inputMemberValue;
74
83
  }
75
84
  }
76
85
  else {
77
- serializer.write(memberNs, inputMemberValue);
86
+ if (directSerializer) {
87
+ directSerializer.writeCodec(memberNs, inputMemberValue);
88
+ }
89
+ else {
90
+ serializer.write(memberNs, inputMemberValue);
91
+ }
78
92
  payload = serializer.flush();
79
93
  }
80
94
  }
81
- else if (memberTraits.httpLabel) {
82
- serializer.write(memberNs, inputMemberValue);
83
- const replacement = serializer.flush();
84
- if (request.path.includes(`{${memberName}+}`)) {
85
- request.path = request.path.replace(`{${memberName}+}`, replacement.split("/").map(extendedEncodeURIComponent).join("/"));
95
+ else if (location === 0b100_001 || location === 0b100_110) {
96
+ const serialized = this.serializeHttpValue(value, inputMemberValue, location, directSerializer);
97
+ if (location === 0b100_001) {
98
+ (labels ??= Object.create(null))[memberName] = serialized;
86
99
  }
87
- else if (request.path.includes(`{${memberName}}`)) {
88
- request.path = request.path.replace(`{${memberName}}`, extendedEncodeURIComponent(replacement));
100
+ else {
101
+ headers[wireName] = serialized;
89
102
  }
90
103
  }
91
- else if (memberTraits.httpHeader) {
92
- serializer.write(memberNs, inputMemberValue);
93
- headers[memberTraits.httpHeader.toLowerCase()] = String(serializer.flush());
94
- }
95
- else if (typeof memberTraits.httpPrefixHeaders === "string") {
104
+ else if (location === 0b100_111) {
96
105
  for (const key in inputMemberValue) {
97
106
  if (!hasOwn(inputMemberValue, key)) {
98
107
  continue;
99
108
  }
100
- const val = inputMemberValue[key];
101
- const amalgam = memberTraits.httpPrefixHeaders + key;
102
- serializer.write([memberNs.getValueSchema(), { httpHeader: amalgam }], val);
103
- headers[amalgam.toLowerCase()] = serializer.flush();
109
+ const amalgam = wireName + key;
110
+ headers[amalgam.toLowerCase()] = this.serializeHttpValue(collectionValue, inputMemberValue[key], 0b100_110, directSerializer, directSerializer ? collectionValue[0] : [collectionValue[0], { httpHeader: amalgam }]);
104
111
  }
105
112
  }
106
- else if (memberTraits.httpQuery || memberTraits.httpQueryParams) {
107
- this.serializeQuery(memberNs, inputMemberValue, query);
113
+ else if ((location & 0b111_110) === 0b100_010) {
114
+ this.serializeQuery(value, inputMemberValue, wireName, query, directSerializer);
108
115
  }
109
116
  else {
110
- hasNonHttpBindingMember = true;
111
- payloadMemberNames.push(memberName);
112
- payloadMemberSchemas.push(memberNs);
117
+ hasBodyValue = true;
113
118
  }
114
119
  }
115
- if (hasNonHttpBindingMember && input) {
116
- const [namespace, name] = (ns.getName(true) ?? "#Unknown").split("#");
117
- const requiredMembers = ns.getSchema()[6];
118
- const payloadSchema = [
119
- 3,
120
- namespace,
121
- name,
122
- ns.getMergedTraits(),
123
- payloadMemberNames,
124
- payloadMemberSchemas,
125
- undefined,
126
- ];
127
- if (requiredMembers) {
128
- payloadSchema[6] = requiredMembers;
120
+ const operationPath = operation[1];
121
+ const pathSegments = operation[3];
122
+ if (operationPath && pathSegments && request.path.endsWith(operationPath)) {
123
+ request.path = request.path.slice(0, -operationPath.length) + this.serializePath(pathSegments, labels, bindings);
124
+ }
125
+ if (hasBodyValue && bodySchema) {
126
+ if (directSerializer) {
127
+ directSerializer.writeCodec(bodySchema, input);
129
128
  }
130
129
  else {
131
- payloadSchema.pop();
130
+ serializer.write(bodySchema, input);
132
131
  }
133
- serializer.write(payloadSchema, input);
134
132
  payload = serializer.flush();
135
133
  }
136
- request.headers = headers;
137
- request.query = query;
138
134
  request.body = payload;
139
- return request;
135
+ return eventStream;
140
136
  }
141
- serializeQuery(ns, data, query) {
142
- const serializer = this.serializer;
143
- const traits = ns.getMergedTraits();
144
- if (traits.httpQueryParams) {
137
+ serializeQuery(value, data, wireName, query, directSerializer) {
138
+ const [ns, flags, collectionValue] = value;
139
+ const traits = directSerializer ? undefined : ns.getMergedTraits();
140
+ if (wireName === undefined) {
145
141
  for (const key in data) {
146
- if (!hasOwn(data, key)) {
142
+ if (!hasOwn(data, key) || key in query) {
147
143
  continue;
148
144
  }
149
- if (!(key in query)) {
150
- const val = data[key];
151
- const valueSchema = ns.getValueSchema();
152
- Object.assign(valueSchema.getMergedTraits(), {
145
+ if (!directSerializer) {
146
+ Object.assign(collectionValue[0].getMergedTraits(), {
153
147
  ...traits,
154
148
  httpQuery: key,
155
149
  httpQueryParams: undefined,
156
150
  });
157
- this.serializeQuery(valueSchema, val, query);
158
151
  }
152
+ this.serializeQuery(collectionValue, data[key], key, query, directSerializer);
159
153
  }
160
154
  return;
161
155
  }
162
- if (ns.isListSchema()) {
163
- const sparse = !!ns.getMergedTraits().sparse;
156
+ if ((flags & 0b1100_0000) === 0b0100_0000) {
164
157
  const buffer = [];
165
158
  for (const item of data) {
166
- serializer.write([ns.getValueSchema(), traits], item);
167
- const serializable = serializer.flush();
168
- if (sparse || serializable !== undefined) {
169
- buffer.push(serializable);
159
+ const serialized = this.serializeHttpValue(collectionValue, item, 0b100_010, directSerializer, directSerializer ? collectionValue[0] : [collectionValue[0], traits]);
160
+ if ((flags >> 13) & 1 || serialized !== undefined) {
161
+ buffer.push(serialized);
170
162
  }
171
163
  }
172
- query[traits.httpQuery] = buffer;
164
+ query[wireName] = buffer;
173
165
  }
174
166
  else {
175
- serializer.write([ns, traits], data);
176
- query[traits.httpQuery] = serializer.flush();
167
+ query[wireName] = this.serializeHttpValue(value, data, 0b100_010, directSerializer, directSerializer ? ns : [ns, traits]);
177
168
  }
178
169
  }
170
+ serializeHttpValue(value, data, location, directSerializer, schema = value[0]) {
171
+ const flags = value[1];
172
+ const type = flags & 0xff;
173
+ if (directSerializer &&
174
+ !(flags & 0x700) &&
175
+ (type <= 2 ||
176
+ type === 17 ||
177
+ type === 19)) {
178
+ return String(data);
179
+ }
180
+ if (directSerializer) {
181
+ directSerializer.writeHttpBinding(value, data, location);
182
+ }
183
+ else {
184
+ this.serializer.write(schema, data);
185
+ }
186
+ return this.serializer.flush();
187
+ }
188
+ serializePath(segments, labels, bindings) {
189
+ let path = "";
190
+ for (const [value, kind] of segments) {
191
+ if (kind === 0) {
192
+ path += value;
193
+ continue;
194
+ }
195
+ const replacement = labels?.[value];
196
+ if (replacement === undefined) {
197
+ if (hasOwn(bindings.byName, value) && bindings.byName[value][2] === 0b100_001) {
198
+ throw new Error(`No value provided for input HTTP label: ${value}.`);
199
+ }
200
+ path += `{${value}${kind === 2 ? "+" : ""}}`;
201
+ }
202
+ else {
203
+ path +=
204
+ kind === 2
205
+ ? replacement.split("/").map(extendedEncodeURIComponent).join("/")
206
+ : extendedEncodeURIComponent(replacement);
207
+ }
208
+ }
209
+ return path;
210
+ }
179
211
  async deserializeResponse(operationSchema, context, response) {
180
212
  const deserializer = this.deserializer;
181
- const ns = NormalizedSchema.of(operationSchema.output);
213
+ const directDeserializer = typeof deserializer.readCodec === "function"
214
+ ? deserializer
215
+ : undefined;
216
+ const ns = HttpBindingNormalizedSchema.of(operationSchema.output);
217
+ const responseBindings = ns.getHttpBindings().response;
182
218
  const dataObject = {};
183
219
  if (response.statusCode >= 300) {
184
220
  const bytes = await collectBody(response.body, context);
@@ -188,19 +224,13 @@ export class HttpBindingProtocol extends HttpProtocol {
188
224
  await this.handleError(operationSchema, context, response, dataObject, this.deserializeMetadata(response));
189
225
  throw new Error("@smithy/core/protocols - HTTP Protocol error handler failed to throw.");
190
226
  }
191
- for (const header in response.headers) {
192
- if (!hasOwn(response.headers, header)) {
193
- continue;
194
- }
195
- const value = response.headers[header];
196
- delete response.headers[header];
197
- response.headers[header.toLowerCase()] = value;
198
- }
199
227
  const nonHttpBindingMembers = await this.deserializeHttpMessage(ns, context, response, dataObject);
200
228
  if (nonHttpBindingMembers.length) {
201
229
  const bytes = await collectBody(response.body, context);
202
230
  if (bytes.byteLength > 0) {
203
- const dataFromBody = await deserializer.read(ns, bytes);
231
+ const dataFromBody = await (directDeserializer
232
+ ? directDeserializer.readCodec(responseBindings.syntheticBodySchema, bytes)
233
+ : deserializer.read(responseBindings.syntheticBodySchema, bytes));
204
234
  for (const member of nonHttpBindingMembers) {
205
235
  if (dataFromBody[member] != null) {
206
236
  dataObject[member] = dataFromBody[member];
@@ -208,96 +238,94 @@ export class HttpBindingProtocol extends HttpProtocol {
208
238
  }
209
239
  }
210
240
  }
211
- else if (nonHttpBindingMembers.discardResponseBody) {
241
+ else if (!responseBindings.bindings.payload) {
212
242
  await collectBody(response.body, context);
213
243
  }
214
244
  dataObject.$metadata = this.deserializeMetadata(response);
215
245
  return dataObject;
216
246
  }
217
247
  async deserializeHttpMessage(schema, context, response, arg4, arg5) {
218
- let dataObject;
219
- if (arg4 instanceof Set) {
220
- dataObject = arg5;
221
- }
222
- else {
223
- dataObject = arg4;
224
- }
225
- let discardResponseBody = true;
248
+ const dataObject = arg4 instanceof Set ? arg5 : arg4;
226
249
  const deserializer = this.deserializer;
227
- const ns = NormalizedSchema.of(schema);
228
- const nonHttpBindingMembers = [];
229
- for (const [memberName, memberSchema] of ns.structIterator()) {
230
- const memberTraits = memberSchema.getMemberTraits();
231
- if (memberTraits.httpPayload) {
232
- discardResponseBody = false;
233
- const isStreaming = memberSchema.isStreaming();
234
- if (isStreaming) {
235
- const isEventStream = memberSchema.isStructSchema();
236
- if (isEventStream) {
237
- dataObject[memberName] = await this.deserializeEventStream({
238
- response,
239
- responseSchema: ns,
240
- });
241
- }
242
- else {
243
- dataObject[memberName] = sdkStreamMixin(response.body);
244
- }
250
+ const directDeserializer = typeof deserializer.readCodec === "function"
251
+ ? deserializer
252
+ : undefined;
253
+ const ns = HttpBindingNormalizedSchema.of(schema);
254
+ const { bodyMemberNames, bindings: { payload, statusCode, headers: responseHeaders, prefixHeaders }, } = ns.getHttpBindings().response;
255
+ const headers = response.headers;
256
+ if (payload) {
257
+ const [memberName, value] = payload;
258
+ const [memberSchema, flags] = value;
259
+ const stream = (flags >> 11) & 0b11;
260
+ if (stream) {
261
+ if (stream === 2) {
262
+ dataObject[memberName] = await this.deserializeEventStream({
263
+ response,
264
+ responseSchema: ns,
265
+ });
245
266
  }
246
- else if (response.body) {
247
- const bytes = await collectBody(response.body, context);
248
- if (bytes.byteLength > 0) {
249
- dataObject[memberName] = await deserializer.read(memberSchema, bytes);
250
- }
267
+ else {
268
+ dataObject[memberName] = sdkStreamMixin(response.body);
251
269
  }
252
270
  }
253
- else if (memberTraits.httpHeader) {
254
- const key = String(memberTraits.httpHeader).toLowerCase();
255
- const value = response.headers[key];
256
- if (null != value) {
257
- if (memberSchema.isListSchema()) {
258
- const headerListValueSchema = memberSchema.getValueSchema();
259
- headerListValueSchema.getMergedTraits().httpHeader = key;
260
- let sections;
261
- if (headerListValueSchema.isTimestampSchema() &&
262
- headerListValueSchema.getSchema() === 4) {
263
- sections = splitEvery(value, ",", 2);
264
- }
265
- else {
266
- sections = splitHeader(value);
267
- }
268
- const list = [];
269
- for (const section of sections) {
270
- list.push(await deserializer.read(headerListValueSchema, section.trim()));
271
- }
272
- dataObject[memberName] = list;
273
- }
274
- else {
275
- dataObject[memberName] = await deserializer.read(memberSchema, value);
276
- }
271
+ else if (response.body) {
272
+ const bytes = await collectBody(response.body, context);
273
+ if (bytes.byteLength > 0) {
274
+ dataObject[memberName] = await (directDeserializer
275
+ ? directDeserializer.readPayload(value, bytes)
276
+ : deserializer.read(memberSchema, bytes));
277
277
  }
278
278
  }
279
- else if (memberTraits.httpPrefixHeaders !== undefined) {
280
- dataObject[memberName] = {};
281
- for (const header in response.headers) {
282
- if (!hasOwn(response.headers, header)) {
283
- continue;
284
- }
285
- if (header.startsWith(memberTraits.httpPrefixHeaders)) {
286
- const value = response.headers[header];
287
- const valueSchema = memberSchema.getValueSchema();
288
- valueSchema.getMergedTraits().httpHeader = header;
289
- dataObject[memberName][header.slice(memberTraits.httpPrefixHeaders.length)] = await deserializer.read(valueSchema, value);
290
- }
291
- }
279
+ }
280
+ for (const header in headers) {
281
+ if (!hasOwn(headers, header)) {
282
+ continue;
283
+ }
284
+ const lower = header.toLowerCase();
285
+ const headerValue = headers[header];
286
+ if (lower !== header) {
287
+ delete headers[header];
288
+ headers[lower] = headerValue;
292
289
  }
293
- else if (memberTraits.httpResponseCode) {
294
- dataObject[memberName] = response.statusCode;
290
+ const binding = hasOwn(responseHeaders, lower) ? responseHeaders[lower] : undefined;
291
+ if (!binding) {
292
+ continue;
293
+ }
294
+ const [memberName, [memberSchema, flags, collectionValue], , wireName] = binding;
295
+ if (collectionValue) {
296
+ const sections = (flags >> 16) & 1 ? splitEvery(headerValue, ",", 2) : splitHeader(headerValue);
297
+ const list = [];
298
+ for (const section of sections) {
299
+ list.push(directDeserializer
300
+ ? directDeserializer.readHttpBinding(collectionValue, section.trim(), 0b100_110)
301
+ : await deserializer.read([collectionValue[0], { httpHeader: wireName }], section.trim()));
302
+ }
303
+ dataObject[memberName] = list;
295
304
  }
296
305
  else {
297
- nonHttpBindingMembers.push(memberName);
306
+ dataObject[memberName] = directDeserializer
307
+ ? directDeserializer.readHttpBinding(binding[1], headerValue, 0b100_110)
308
+ : await deserializer.read(memberSchema, headerValue);
309
+ }
310
+ }
311
+ for (const [memberName, [, , collectionValue], , wireName] of prefixHeaders) {
312
+ dataObject[memberName] = {};
313
+ for (const header in headers) {
314
+ if (!hasOwn(headers, header)) {
315
+ continue;
316
+ }
317
+ if (!header.startsWith(wireName)) {
318
+ continue;
319
+ }
320
+ const headerValue = headers[header];
321
+ dataObject[memberName][header.slice(wireName.length)] = directDeserializer
322
+ ? directDeserializer.readHttpBinding(collectionValue, headerValue, 0b100_110)
323
+ : await deserializer.read([collectionValue[0], { httpHeader: header }], headerValue);
298
324
  }
299
325
  }
300
- nonHttpBindingMembers.discardResponseBody = discardResponseBody;
301
- return nonHttpBindingMembers;
326
+ if (statusCode) {
327
+ dataObject[statusCode[0]] = response.statusCode;
328
+ }
329
+ return bodyMemberNames;
302
330
  }
303
331
  }
@@ -1,7 +1,7 @@
1
- import { hasOwn } from "@smithy/core/transport";
2
- import { NormalizedSchema, TypeRegistry, translateTraits } from "@smithy/core/schema";
3
- import { HttpRequest, HttpResponse, isValidHostname } from "@smithy/core/transport";
1
+ import { hasOwn, HttpRequest, HttpResponse, isValidHostname } from "@smithy/core/transport";
2
+ import { TypeRegistry } from "@smithy/core/schema";
4
3
  import { SerdeContext } from "./SerdeContext";
4
+ import { getHttpOperationBindings, HttpBindingNormalizedSchema } from "./HttpBindingNormalizedSchema";
5
5
  export class HttpProtocol extends SerdeContext {
6
6
  options;
7
7
  compositeErrorRegistry;
@@ -71,30 +71,29 @@ export class HttpProtocol extends SerdeContext {
71
71
  return request;
72
72
  }
73
73
  }
74
- setHostPrefix(request, operationSchema, input) {
74
+ setHostPrefix(request, operationSchema, input, operation = getHttpOperationBindings(operationSchema)) {
75
75
  if (this.serdeContext?.disableHostPrefix) {
76
76
  return;
77
77
  }
78
- const inputNs = NormalizedSchema.of(operationSchema.input);
79
- const opTraits = translateTraits(operationSchema.traits ?? {});
80
- if (opTraits.endpoint) {
81
- let hostPrefix = opTraits.endpoint?.[0];
82
- if (typeof hostPrefix === "string") {
83
- for (const [name, member] of inputNs.structIterator()) {
84
- if (!member.getMergedTraits().hostLabel) {
85
- continue;
86
- }
87
- const replacement = input[name];
88
- if (typeof replacement !== "string") {
89
- throw new Error(`@smithy/core/schema - ${name} in input must be a string as hostLabel.`);
90
- }
91
- hostPrefix = hostPrefix.replace(`{${name}}`, replacement);
92
- }
93
- request.hostname = hostPrefix + request.hostname;
94
- if (!isValidHostname(request.hostname)) {
95
- throw new Error(`[${request.hostname}] is not a valid hostname.`);
96
- }
78
+ const hostPrefix = operation[4];
79
+ if (typeof hostPrefix !== "string") {
80
+ return;
81
+ }
82
+ let resolvedHostPrefix = hostPrefix;
83
+ for (const [name, [, flags]] of HttpBindingNormalizedSchema.of(operationSchema.input).getHttpBindings().request
84
+ .memberBindings) {
85
+ if (!((flags >> 17) & 1)) {
86
+ continue;
97
87
  }
88
+ const replacement = input[name];
89
+ if (typeof replacement !== "string") {
90
+ throw new Error(`@smithy/core/schema - ${name} in input must be a string as hostLabel.`);
91
+ }
92
+ resolvedHostPrefix = resolvedHostPrefix.replace(`{${name}}`, replacement);
93
+ }
94
+ request.hostname = resolvedHostPrefix + request.hostname;
95
+ if (!isValidHostname(request.hostname)) {
96
+ throw new Error(`[${request.hostname}] is not a valid hostname.`);
98
97
  }
99
98
  }
100
99
  deserializeMetadata(output) {
@@ -1,4 +1,7 @@
1
1
  export function extendedEncodeURIComponent(str) {
2
+ if (/^[\w.~-]+$/.test(str)) {
3
+ return str;
4
+ }
2
5
  return encodeURIComponent(str).replace(/[!'()*]/g, function (c) {
3
6
  return "%" + c.charCodeAt(0).toString(16).toUpperCase();
4
7
  });