Skip to content

Commit 92c1752

Browse files
committed
Use web universal fetch handler and stream collector
Correspond to aws/aws-sdk-js-v3#1123
1 parent 726952d commit 92c1752

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/RuntimeConfigGenerator.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ final class RuntimeConfigGenerator {
130130
writer.write("bodyLengthChecker: calculateBodyLength,");
131131
},
132132
"streamCollector", writer -> {
133-
writer.addDependency(TypeScriptDependency.AWS_SDK_STREAM_COLLECTOR_BROWSER);
133+
writer.addDependency(TypeScriptDependency.AWS_SDK_STREAM_COLLECTOR_WEB);
134134
writer.addImport("streamCollector", "streamCollector",
135-
TypeScriptDependency.AWS_SDK_STREAM_COLLECTOR_BROWSER.packageName);
135+
TypeScriptDependency.AWS_SDK_STREAM_COLLECTOR_WEB.packageName);
136136
writer.write("streamCollector,");
137137
},
138138
"base64Decoder", writer -> {
@@ -169,12 +169,6 @@ final class RuntimeConfigGenerator {
169169
}
170170
);
171171
private final Map<String, Consumer<TypeScriptWriter>> reactNativeRuntimeConfigDefaults = MapUtils.of(
172-
"requestHandler", writer -> {
173-
writer.addDependency(TypeScriptDependency.AWS_SDK_FETCH_HTTP_HANDLER);
174-
writer.addImport("FetchHttpHandler", "FetchHttpHandler",
175-
TypeScriptDependency.AWS_SDK_FETCH_HTTP_HANDLER.packageName);
176-
writer.write("requestHandler: new FetchHttpHandler({ bufferBody: true }),");
177-
},
178172
"sha256", writer -> {
179173
writer.addDependency(TypeScriptDependency.AWS_CRYPTO_SHA256_JS);
180174
writer.addImport("Sha256", "Sha256",
@@ -187,12 +181,6 @@ final class RuntimeConfigGenerator {
187181
TypeScriptDependency.AWS_SDK_URL_PARSER_NODE.packageName);
188182
writer.write("urlParser: parseUrl,");
189183
},
190-
"streamCollector", writer -> {
191-
writer.addDependency(TypeScriptDependency.AWS_SDK_STREAM_COLLECTOR_RN);
192-
writer.addImport("streamCollector", "streamCollector",
193-
TypeScriptDependency.AWS_SDK_STREAM_COLLECTOR_RN.packageName);
194-
writer.write("streamCollector,");
195-
},
196184
"defaultUserAgent", writer -> {
197185
writer.addImport("name", "name", "./package.json");
198186
writer.addImport("version", "version", "./package.json");

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDependency.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ public enum TypeScriptDependency implements SymbolDependencyContainer {
4646
AWS_SDK_HASH_NODE("dependencies", "@aws-sdk/hash-node", "^1.0.0-beta.0", true),
4747

4848
AWS_SDK_STREAM_COLLECTOR_NODE("dependencies", "@aws-sdk/stream-collector-node", "^1.0.0-beta.0", true),
49-
AWS_SDK_STREAM_COLLECTOR_BROWSER("dependencies", "@aws-sdk/stream-collector-browser", "^1.0.0-beta.0", true),
50-
AWS_SDK_STREAM_COLLECTOR_RN("dependencies", "@aws-sdk/stream-collector-native", "^1.0.0-beta.0", true),
49+
AWS_SDK_STREAM_COLLECTOR_WEB("dependencies", "@aws-sdk/stream-collector-web", "^1.0.0-beta.0", true),
5150

5251
AWS_SDK_URL_PARSER_BROWSER("dependencies", "@aws-sdk/url-parser-browser", "^1.0.0-beta.0", true),
5352
AWS_SDK_URL_PARSER_NODE("dependencies", "@aws-sdk/url-parser-node", "^1.0.0-beta.0", true),

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/HttpBindingProtocolGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ private void writeHeaders(
368368
writer.write("...isSerializableHeaderValue($L) && { $S: $L },",
369369
memberLocation, binding.getLocationName(), headerValue);
370370
}
371-
371+
372372
// Handle assembling prefix headers.
373373
for (HttpBinding binding : bindingIndex.getRequestBindings(operation, Location.PREFIX_HEADERS)) {
374374
String memberLocation = "input." + symbolProvider.toMemberName(binding.getMember());

0 commit comments

Comments
 (0)