fix(clients): create new session for every H2 requests (#3810)

* fix(clients): create new session for every H2 requests * chore: fix java style check
aws · Jul 29, 2022 · b2c026f · b2c026f
1 parent 91454a9
commit b2c026f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/clients/client-kinesis/src/runtimeConfig.ts b/clients/client-kinesis/src/runtimeConfig.ts
@@ -53,7 +53,9 @@ export const getRuntimeConfig = (config: KinesisClientConfig) => {
     eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
     maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),
     region: config?.region ?? loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),
-    requestHandler: config?.requestHandler ?? new RequestHandler(defaultConfigProvider),
+    requestHandler:
+      config?.requestHandler ??
+      new RequestHandler(async () => ({ ...(await defaultConfigProvider()), disableConcurrentStreams: true })),
     retryMode:
       config?.retryMode ??
       loadNodeConfig({

diff --git a/clients/client-lex-runtime-v2/src/runtimeConfig.ts b/clients/client-lex-runtime-v2/src/runtimeConfig.ts
@@ -55,7 +55,9 @@ export const getRuntimeConfig = (config: LexRuntimeV2ClientConfig) => {
     eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
     maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),
     region: config?.region ?? loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),
-    requestHandler: config?.requestHandler ?? new RequestHandler(defaultConfigProvider),
+    requestHandler:
+      config?.requestHandler ??
+      new RequestHandler(async () => ({ ...(await defaultConfigProvider()), disableConcurrentStreams: true })),
     retryMode:
       config?.retryMode ??
       loadNodeConfig({

diff --git a/clients/client-transcribe-streaming/src/runtimeConfig.ts b/clients/client-transcribe-streaming/src/runtimeConfig.ts
@@ -19,7 +19,7 @@ import {
   NODE_RETRY_MODE_CONFIG_OPTIONS,
 } from "@aws-sdk/middleware-retry";
 import { loadConfig as loadNodeConfig } from "@aws-sdk/node-config-provider";
-import { NodeHttp2Handler, streamCollector } from "@aws-sdk/node-http-handler";
+import { NodeHttp2Handler as RequestHandler, streamCollector } from "@aws-sdk/node-http-handler";
 import { fromBase64, toBase64 } from "@aws-sdk/util-base64-node";
 import { calculateBodyLength } from "@aws-sdk/util-body-length-node";
 import { defaultUserAgent } from "@aws-sdk/util-user-agent-node";
@@ -55,7 +55,9 @@ export const getRuntimeConfig = (config: TranscribeStreamingClientConfig) => {
     eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
     maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),
     region: config?.region ?? loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),
-    requestHandler: config?.requestHandler ?? new NodeHttp2Handler({ disableConcurrentStreams: true }),
+    requestHandler:
+      config?.requestHandler ??
+      new RequestHandler(async () => ({ ...(await defaultConfigProvider()), disableConcurrentStreams: true })),
     retryMode:
       config?.retryMode ??
       loadNodeConfig({

diff --git a/...degen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddHttp2Dependency.java b/...degen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddHttp2Dependency.java
@@ -49,7 +49,11 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                     writer.addDependency(TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER);
                     writer.addImport("NodeHttp2Handler", "RequestHandler",
                             TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER.packageName);
-                    writer.write("new RequestHandler(defaultConfigProvider)");
+                    writer.openBlock("new RequestHandler(async () => ({", "}))", () -> {
+                        writer.write("...await defaultConfigProvider(),");
+                        // TODO: remove this when root cause of #3809 is found
+                        writer.write("disableConcurrentStreams: true");
+                    });
                 });
             default:
                 return Collections.emptyMap();

diff --git a/.../java/software/amazon/smithy/aws/typescript/codegen/AddTranscribeStreamingDependency.java b/.../java/software/amazon/smithy/aws/typescript/codegen/AddTranscribeStreamingDependency.java
@@ -24,7 +24,6 @@
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.typescript.codegen.LanguageTarget;
-import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
 import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
 import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
 import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin;
@@ -77,14 +76,6 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                 });
 
         switch (target) {
-            case NODE:
-                return MapUtils.of(
-                    "requestHandler", writer -> {
-                        writer.addDependency(TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER);
-                        writer.addImport("NodeHttp2Handler", "NodeHttp2Handler",
-                            TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER.packageName);
-                         writer.write("new NodeHttp2Handler({ disableConcurrentStreams: true })");
-                    });
             case REACT_NATIVE:
             case BROWSER:
                 return transcribeStreamingHandlerConfig;