Skip to content

Commit 2dccabd

Browse files
authored
refactor http request handlers (#179)
* Use web universal fetch handler and stream collector Correspond to aws/aws-sdk-js-v3#1123 * move runtime-specific stream collectors to individual request handler package
1 parent 96a235f commit 2dccabd

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ final class RuntimeConfigGenerator {
6666
writer.write("bodyLengthChecker: calculateBodyLength,");
6767
},
6868
"streamCollector", writer -> {
69-
writer.addDependency(TypeScriptDependency.AWS_SDK_STREAM_COLLECTOR_NODE);
69+
writer.addDependency(TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER);
7070
writer.addImport("streamCollector", "streamCollector",
71-
TypeScriptDependency.AWS_SDK_STREAM_COLLECTOR_NODE.packageName);
71+
TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER.packageName);
7272
writer.write("streamCollector,");
7373
},
7474
"base64Decoder", writer -> {
@@ -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_FETCH_HTTP_HANDLER);
134134
writer.addImport("streamCollector", "streamCollector",
135-
TypeScriptDependency.AWS_SDK_STREAM_COLLECTOR_BROWSER.packageName);
135+
TypeScriptDependency.AWS_SDK_FETCH_HTTP_HANDLER.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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ public enum TypeScriptDependency implements SymbolDependencyContainer {
4545
AWS_CRYPTO_SHA256_JS("dependencies", "@aws-crypto/sha256-js", "^1.0.0-alpha.0", true),
4646
AWS_SDK_HASH_NODE("dependencies", "@aws-sdk/hash-node", "^1.0.0-beta.0", true),
4747

48-
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),
51-
5248
AWS_SDK_URL_PARSER_BROWSER("dependencies", "@aws-sdk/url-parser-browser", "^1.0.0-beta.0", true),
5349
AWS_SDK_URL_PARSER_NODE("dependencies", "@aws-sdk/url-parser-node", "^1.0.0-beta.0", true),
5450

0 commit comments

Comments
 (0)