fix(core/protocols): defer content length calculation to middleware

Author: kuhe

packages/core/package.json

@@ -91,7 +91,6 @@
     "@smithy/smithy-client": "^4.6.4",
     "@smithy/types": "^4.5.0",
     "@smithy/util-base64": "^4.1.0",
-    "@smithy/util-body-length-browser": "^4.1.0",
     "@smithy/util-middleware": "^4.1.1",
     "@smithy/util-utf8": "^4.1.0",
     "tslib": "^2.6.2"

packages/core/src/submodules/protocols/ProtocolLib.ts

@@ -1,12 +1,5 @@
 import { ErrorSchema, NormalizedSchema, TypeRegistry } from "@smithy/core/schema";
-import type {
-  BodyLengthCalculator,
-  HttpResponse as IHttpResponse,
-  MetadataBearer,
-  ResponseMetadata,
-  SerdeFunctions,
-} from "@smithy/types";
-import { calculateBodyLength } from "@smithy/util-body-length-browser";
+import type { HttpResponse as IHttpResponse, MetadataBearer, ResponseMetadata } from "@smithy/types";
 
 /**
  * @internal
@@ -22,23 +15,6 @@ type ErrorMetadataBearer = MetadataBearer & {
  * @internal
  */
 export class ProtocolLib {
-  /**
-   * @param body - to be inspected.
-   * @param serdeContext - this is a subset type but in practice is the client.config having a property called bodyLengthChecker.
-   *
-   * @returns content-length value for the body if possible.
-   * @throws Error and should be caught and handled if not possible to determine length.
-   */
-  public calculateContentLength(body: any, serdeContext?: SerdeFunctions) {
-    const bodyLengthCalculator: BodyLengthCalculator =
-      (
-        serdeContext as SerdeFunctions & {
-          bodyLengthChecker?: BodyLengthCalculator;
-        }
-      )?.bodyLengthChecker ?? calculateBodyLength;
-    return String(bodyLengthCalculator(body));
-  }
-
   /**
    * This is only for REST protocols.
    *

packages/core/src/submodules/protocols/json/AwsJson1_0Protocol.spec.ts

@@ -115,7 +115,6 @@ describe(AwsJson1_0Protocol.name, () => {
       );
 
       expect(request.headers).toEqual({
-        "content-length": "60",
         "content-type": "application/x-amz-json-1.0",
         "x-amz-target": "JsonRpc10.MyOperation",
       });

packages/core/src/submodules/protocols/json/AwsJsonRpcProtocol.ts

@@ -71,9 +71,9 @@ export abstract class AwsJsonRpcProtocol extends RpcProtocol {
     if (deref(operationSchema.input) === "unit" || !request.body) {
       request.body = "{}";
     }
-    try {
-      request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-    } catch (e) {}
+
+    // content-length header is set by the contentLengthMiddleware.
+
     return request;
   }
 

packages/core/src/submodules/protocols/json/AwsRestJsonProtocol.spec.ts

@@ -161,7 +161,6 @@ describe(AwsRestJsonProtocol.name, () => {
       );
 
       expect(request.headers).toEqual({
-        "content-length": "25",
         "content-type": "application/json",
         header: "hello",
         a: "1",
@@ -265,7 +264,6 @@ describe(AwsRestJsonProtocol.name, () => {
 
       expect(request.headers).toEqual({
         "content-type": "application/json",
-        "content-length": "24",
         "header-default-date": "Thu, 01 Jan 1970 00:00:00 GMT",
         "header-member-trait-date": "1970-01-01T00:00:00Z",
         "header-epoch-seconds": "0",

packages/core/src/submodules/protocols/json/AwsRestJsonProtocol.ts

@@ -78,11 +78,7 @@ export class AwsRestJsonProtocol extends HttpBindingProtocol {
       request.body = "{}";
     }
 
-    if (request.body) {
-      try {
-        request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-      } catch (e) {}
-    }
+    // content-length header is set by the contentLengthMiddleware.
 
     return request;
   }

packages/core/src/submodules/protocols/query/AwsQueryProtocol.ts

@@ -82,9 +82,8 @@ export class AwsQueryProtocol extends RpcProtocol {
       request.body = request.body.slice(-1);
     }
 
-    try {
-      request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-    } catch (e) {}
+    // content-length header is set by the contentLengthMiddleware.
+
     return request;
   }
 

packages/core/src/submodules/protocols/xml/AwsRestXmlProtocol.spec.ts

@@ -37,7 +37,6 @@ describe(AwsRestXmlProtocol.name, () => {
             method: "POST",
             headers: {
               "content-type": "application/xml",
-              "content-length": "167",
             },
             query: {
               delete: "",

packages/core/src/submodules/protocols/xml/AwsRestXmlProtocol.ts

@@ -74,11 +74,7 @@ export class AwsRestXmlProtocol extends HttpBindingProtocol {
       }
     }
 
-    if (request.body) {
-      try {
-        request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-      } catch (e) {}
-    }
+    // content-length header is set by the contentLengthMiddleware.
 
     return request;
   }