@aws-sdk/core 3.894.0 → 3.899.0

package/dist-cjs/submodules/protocols/index.js

@@ -54,22 +54,10 @@ var import_schema2 = require("@smithy/core/schema");
 
 // src/submodules/protocols/ProtocolLib.ts
 var import_schema = require("@smithy/core/schema");
-var import_util_body_length_browser = require("@smithy/util-body-length-browser");
 var ProtocolLib = class {
   static {
     __name(this, "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.
-   */
-  calculateContentLength(body, serdeContext) {
-    const bodyLengthCalculator = serdeContext?.bodyLengthChecker ?? import_util_body_length_browser.calculateBodyLength;
-    return String(bodyLengthCalculator(body));
-  }
   /**
    * This is only for REST protocols.
    *
@@ -127,12 +115,11 @@ var ProtocolLib = class {
       const errorSchema = getErrorSchema?.(registry, errorName) ?? registry.getSchema(errorIdentifier);
       return { errorSchema, errorMetadata };
     } catch (e) {
-      if (dataObject.Message) {
-        dataObject.message = dataObject.Message;
-      }
-      const baseExceptionSchema = import_schema.TypeRegistry.for("smithy.ts.sdk.synthetic." + namespace).getBaseException();
+      dataObject.message = dataObject.message ?? dataObject.Message ?? "UnknownError";
+      const synthetic = import_schema.TypeRegistry.for("smithy.ts.sdk.synthetic." + namespace);
+      const baseExceptionSchema = synthetic.getBaseException();
       if (baseExceptionSchema) {
-        const ErrorCtor = baseExceptionSchema.ctor;
+        const ErrorCtor = synthetic.getErrorCtor(baseExceptionSchema) ?? Error;
         throw Object.assign(new ErrorCtor({ name: errorName }), errorMetadata, dataObject);
       }
       throw Object.assign(new Error(errorName), errorMetadata, dataObject);
@@ -220,7 +207,8 @@ var AwsSmithyRpcV2CborProtocol = class extends import_cbor.SmithyRpcV2CborProtoc
     );
     const ns = import_schema2.NormalizedSchema.of(errorSchema);
     const message = dataObject.message ?? dataObject.Message ?? "Unknown";
-    const exception = new errorSchema.ctor(message);
+    const ErrorCtor = import_schema2.TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+    const exception = new ErrorCtor(message);
     const output = {};
     for (const [name, member] of ns.structIterator()) {
       output[name] = this.deserializer.readValue(member, dataObject[name]);
@@ -683,7 +671,7 @@ var JsonShapeSerializer = class extends SerdeContextConfig {
         return (0, import_serde4.generateIdempotencyToken)();
       }
       const mediaType = ns.getMergedTraits().mediaType;
-      if (typeof value === "string" && mediaType) {
+      if (value != null && mediaType) {
         const isJson = mediaType === "application/json" || mediaType.endsWith("+json");
         if (isJson) {
           return import_serde4.LazyJsonString.from(value);
@@ -776,10 +764,6 @@ var AwsJsonRpcProtocol = class extends import_protocols3.RpcProtocol {
     if ((0, import_schema5.deref)(operationSchema.input) === "unit" || !request.body) {
       request.body = "{}";
     }
-    try {
-      request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-    } catch (e) {
-    }
     return request;
   }
   getPayloadCodec() {
@@ -799,7 +783,8 @@ var AwsJsonRpcProtocol = class extends import_protocols3.RpcProtocol {
     );
     const ns = import_schema5.NormalizedSchema.of(errorSchema);
     const message = dataObject.message ?? dataObject.Message ?? "Unknown";
-    const exception = new errorSchema.ctor(message);
+    const ErrorCtor = import_schema5.TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+    const exception = new ErrorCtor(message);
     const output = {};
     for (const [name, member] of ns.structIterator()) {
       const target = member.getMergedTraits().jsonName ?? name;
@@ -929,12 +914,6 @@ var AwsRestJsonProtocol = class extends import_protocols4.HttpBindingProtocol {
     if (request.headers["content-type"] && !request.body) {
       request.body = "{}";
     }
-    if (request.body) {
-      try {
-        request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-      } catch (e) {
-      }
-    }
     return request;
   }
   async handleError(operationSchema, context, response, dataObject, metadata) {
@@ -948,7 +927,8 @@ var AwsRestJsonProtocol = class extends import_protocols4.HttpBindingProtocol {
     );
     const ns = import_schema6.NormalizedSchema.of(errorSchema);
     const message = dataObject.message ?? dataObject.Message ?? "Unknown";
-    const exception = new errorSchema.ctor(message);
+    const ErrorCtor = import_schema6.TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+    const exception = new ErrorCtor(message);
     await this.deserializeHttpMessage(errorSchema, context, response, dataObject);
     const output = {};
     for (const [name, member] of ns.structIterator()) {
@@ -1037,6 +1017,9 @@ var XmlShapeDeserializer = class extends SerdeContextConfig {
   }
   readSchema(_schema, value) {
     const ns = import_schema7.NormalizedSchema.of(_schema);
+    if (ns.isUnitSchema()) {
+      return;
+    }
     const traits = ns.getMergedTraits();
     if (ns.isListSchema() && !Array.isArray(value)) {
       return this.readSchema(ns, [value]);
@@ -1329,10 +1312,6 @@ var AwsQueryProtocol = class extends import_protocols7.RpcProtocol {
     if (request.body.endsWith("&")) {
       request.body = request.body.slice(-1);
     }
-    try {
-      request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-    } catch (e) {
-    }
     return request;
   }
   async deserializeResponse(operationSchema, context, response) {
@@ -1372,6 +1351,13 @@ var AwsQueryProtocol = class extends import_protocols7.RpcProtocol {
   async handleError(operationSchema, context, response, dataObject, metadata) {
     const errorIdentifier = this.loadQueryErrorCode(response, dataObject) ?? "Unknown";
     const errorData = this.loadQueryError(dataObject);
+    const message = this.loadQueryErrorMessage(dataObject);
+    errorData.message = message;
+    errorData.Error = {
+      Type: errorData.Type,
+      Code: errorData.Code,
+      Message: message
+    };
     const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(
       errorIdentifier,
       this.options.defaultNamespace,
@@ -1383,9 +1369,11 @@ var AwsQueryProtocol = class extends import_protocols7.RpcProtocol {
       )
     );
     const ns = import_schema9.NormalizedSchema.of(errorSchema);
-    const message = this.loadQueryErrorMessage(dataObject);
-    const exception = new errorSchema.ctor(message);
-    const output = {};
+    const ErrorCtor = import_schema9.TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+    const exception = new ErrorCtor(message);
+    const output = {
+      Error: errorData.Error
+    };
     for (const [name, member] of ns.structIterator()) {
       const target = member.getMergedTraits().xmlName ?? name;
       const value = errorData[target] ?? dataObject[target];
@@ -1847,12 +1835,6 @@ var AwsRestXmlProtocol = class extends import_protocols9.HttpBindingProtocol {
         request.body = '<?xml version="1.0" encoding="UTF-8"?>' + request.body;
       }
     }
-    if (request.body) {
-      try {
-        request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-      } catch (e) {
-      }
-    }
     return request;
   }
   async deserializeResponse(operationSchema, context, response) {
@@ -1869,7 +1851,8 @@ var AwsRestXmlProtocol = class extends import_protocols9.HttpBindingProtocol {
     );
     const ns = import_schema11.NormalizedSchema.of(errorSchema);
     const message = dataObject.Error?.message ?? dataObject.Error?.Message ?? dataObject.message ?? dataObject.Message ?? "Unknown";
-    const exception = new errorSchema.ctor(message);
+    const ErrorCtor = import_schema11.TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+    const exception = new ErrorCtor(message);
     await this.deserializeHttpMessage(errorSchema, context, response, dataObject);
     const output = {};
     for (const [name, member] of ns.structIterator()) {

package/dist-es/submodules/protocols/ProtocolLib.js

@@ -1,10 +1,5 @@
 import { TypeRegistry } from "@smithy/core/schema";
-import { calculateBodyLength } from "@smithy/util-body-length-browser";
 export class ProtocolLib {
-    calculateContentLength(body, serdeContext) {
-        const bodyLengthCalculator = serdeContext?.bodyLengthChecker ?? calculateBodyLength;
-        return String(bodyLengthCalculator(body));
-    }
     resolveRestContentType(defaultContentType, inputSchema) {
         const members = inputSchema.getMemberSchemas();
         const httpPayloadMember = Object.values(members).find((m) => {
@@ -53,12 +48,11 @@ export class ProtocolLib {
             return { errorSchema, errorMetadata };
         }
         catch (e) {
-            if (dataObject.Message) {
-                dataObject.message = dataObject.Message;
-            }
-            const baseExceptionSchema = TypeRegistry.for("smithy.ts.sdk.synthetic." + namespace).getBaseException();
+            dataObject.message = dataObject.message ?? dataObject.Message ?? "UnknownError";
+            const synthetic = TypeRegistry.for("smithy.ts.sdk.synthetic." + namespace);
+            const baseExceptionSchema = synthetic.getBaseException();
             if (baseExceptionSchema) {
-                const ErrorCtor = baseExceptionSchema.ctor;
+                const ErrorCtor = synthetic.getErrorCtor(baseExceptionSchema) ?? Error;
                 throw Object.assign(new ErrorCtor({ name: errorName }), errorMetadata, dataObject);
             }
             throw Object.assign(new Error(errorName), errorMetadata, dataObject);

package/dist-es/submodules/protocols/cbor/AwsSmithyRpcV2CborProtocol.js

@@ -1,5 +1,5 @@
 import { loadSmithyRpcV2CborErrorCode, SmithyRpcV2CborProtocol } from "@smithy/core/cbor";
-import { NormalizedSchema } from "@smithy/core/schema";
+import { NormalizedSchema, TypeRegistry } from "@smithy/core/schema";
 import { ProtocolLib } from "../ProtocolLib";
 export class AwsSmithyRpcV2CborProtocol extends SmithyRpcV2CborProtocol {
     awsQueryCompatible;
@@ -23,7 +23,8 @@ export class AwsSmithyRpcV2CborProtocol extends SmithyRpcV2CborProtocol {
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorName, this.options.defaultNamespace, response, dataObject, metadata);
         const ns = NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "Unknown";
-        const exception = new errorSchema.ctor(message);
+        const ErrorCtor = TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+        const exception = new ErrorCtor(message);
         const output = {};
         for (const [name, member] of ns.structIterator()) {
             output[name] = this.deserializer.readValue(member, dataObject[name]);

package/dist-es/submodules/protocols/json/AwsJsonRpcProtocol.js

@@ -1,5 +1,5 @@
 import { RpcProtocol } from "@smithy/core/protocols";
-import { deref, NormalizedSchema, SCHEMA } from "@smithy/core/schema";
+import { deref, NormalizedSchema, SCHEMA, TypeRegistry } from "@smithy/core/schema";
 import { ProtocolLib } from "../ProtocolLib";
 import { JsonCodec } from "./JsonCodec";
 import { loadRestJsonErrorCode } from "./parseJsonBody";
@@ -41,10 +41,6 @@ export 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) { }
         return request;
     }
     getPayloadCodec() {
@@ -58,7 +54,8 @@ export class AwsJsonRpcProtocol extends RpcProtocol {
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata);
         const ns = NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "Unknown";
-        const exception = new errorSchema.ctor(message);
+        const ErrorCtor = TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+        const exception = new ErrorCtor(message);
         const output = {};
         for (const [name, member] of ns.structIterator()) {
             const target = member.getMergedTraits().jsonName ?? name;

package/dist-es/submodules/protocols/json/AwsRestJsonProtocol.js

@@ -1,5 +1,5 @@
 import { HttpBindingProtocol, HttpInterceptingShapeDeserializer, HttpInterceptingShapeSerializer, } from "@smithy/core/protocols";
-import { NormalizedSchema, SCHEMA } from "@smithy/core/schema";
+import { NormalizedSchema, SCHEMA, TypeRegistry } from "@smithy/core/schema";
 import { ProtocolLib } from "../ProtocolLib";
 import { JsonCodec } from "./JsonCodec";
 import { loadRestJsonErrorCode } from "./parseJsonBody";
@@ -46,12 +46,6 @@ export class AwsRestJsonProtocol extends HttpBindingProtocol {
         if (request.headers["content-type"] && !request.body) {
             request.body = "{}";
         }
-        if (request.body) {
-            try {
-                request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-            }
-            catch (e) { }
-        }
         return request;
     }
     async handleError(operationSchema, context, response, dataObject, metadata) {
@@ -59,7 +53,8 @@ export class AwsRestJsonProtocol extends HttpBindingProtocol {
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata);
         const ns = NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "Unknown";
-        const exception = new errorSchema.ctor(message);
+        const ErrorCtor = TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+        const exception = new ErrorCtor(message);
         await this.deserializeHttpMessage(errorSchema, context, response, dataObject);
         const output = {};
         for (const [name, member] of ns.structIterator()) {

package/dist-es/submodules/protocols/json/JsonShapeSerializer.js

@@ -104,7 +104,7 @@ export class JsonShapeSerializer extends SerdeContextConfig {
                 return generateIdempotencyToken();
             }
             const mediaType = ns.getMergedTraits().mediaType;
-            if (typeof value === "string" && mediaType) {
+            if (value != null && mediaType) {
                 const isJson = mediaType === "application/json" || mediaType.endsWith("+json");
                 if (isJson) {
                     return LazyJsonString.from(value);

package/dist-es/submodules/protocols/query/AwsQueryProtocol.js

@@ -1,5 +1,5 @@
 import { collectBody, RpcProtocol } from "@smithy/core/protocols";
-import { deref, NormalizedSchema, SCHEMA } from "@smithy/core/schema";
+import { deref, NormalizedSchema, SCHEMA, TypeRegistry } from "@smithy/core/schema";
 import { ProtocolLib } from "../ProtocolLib";
 import { XmlShapeDeserializer } from "../xml/XmlShapeDeserializer";
 import { QueryShapeSerializer } from "./QueryShapeSerializer";
@@ -52,10 +52,6 @@ export class AwsQueryProtocol extends RpcProtocol {
         if (request.body.endsWith("&")) {
             request.body = request.body.slice(-1);
         }
-        try {
-            request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-        }
-        catch (e) { }
         return request;
     }
     async deserializeResponse(operationSchema, context, response) {
@@ -92,11 +88,20 @@ export class AwsQueryProtocol extends RpcProtocol {
     async handleError(operationSchema, context, response, dataObject, metadata) {
         const errorIdentifier = this.loadQueryErrorCode(response, dataObject) ?? "Unknown";
         const errorData = this.loadQueryError(dataObject);
+        const message = this.loadQueryErrorMessage(dataObject);
+        errorData.message = message;
+        errorData.Error = {
+            Type: errorData.Type,
+            Code: errorData.Code,
+            Message: message,
+        };
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, errorData, metadata, (registry, errorName) => registry.find((schema) => NormalizedSchema.of(schema).getMergedTraits().awsQueryError?.[0] === errorName));
         const ns = NormalizedSchema.of(errorSchema);
-        const message = this.loadQueryErrorMessage(dataObject);
-        const exception = new errorSchema.ctor(message);
-        const output = {};
+        const ErrorCtor = TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+        const exception = new ErrorCtor(message);
+        const output = {
+            Error: errorData.Error,
+        };
         for (const [name, member] of ns.structIterator()) {
             const target = member.getMergedTraits().xmlName ?? name;
             const value = errorData[target] ?? dataObject[target];

package/dist-es/submodules/protocols/xml/AwsRestXmlProtocol.js

@@ -1,5 +1,5 @@
 import { HttpBindingProtocol, HttpInterceptingShapeDeserializer, HttpInterceptingShapeSerializer, } from "@smithy/core/protocols";
-import { NormalizedSchema, SCHEMA } from "@smithy/core/schema";
+import { NormalizedSchema, SCHEMA, TypeRegistry } from "@smithy/core/schema";
 import { ProtocolLib } from "../ProtocolLib";
 import { loadRestXmlErrorCode } from "./parseXmlBody";
 import { XmlCodec } from "./XmlCodec";
@@ -43,12 +43,6 @@ export class AwsRestXmlProtocol extends HttpBindingProtocol {
                 request.body = '<?xml version="1.0" encoding="UTF-8"?>' + request.body;
             }
         }
-        if (request.body) {
-            try {
-                request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-            }
-            catch (e) { }
-        }
         return request;
     }
     async deserializeResponse(operationSchema, context, response) {
@@ -59,7 +53,8 @@ export class AwsRestXmlProtocol extends HttpBindingProtocol {
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata);
         const ns = NormalizedSchema.of(errorSchema);
         const message = dataObject.Error?.message ?? dataObject.Error?.Message ?? dataObject.message ?? dataObject.Message ?? "Unknown";
-        const exception = new errorSchema.ctor(message);
+        const ErrorCtor = TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+        const exception = new ErrorCtor(message);
         await this.deserializeHttpMessage(errorSchema, context, response, dataObject);
         const output = {};
         for (const [name, member] of ns.structIterator()) {

package/dist-es/submodules/protocols/xml/XmlShapeDeserializer.js

@@ -42,6 +42,9 @@ export class XmlShapeDeserializer extends SerdeContextConfig {
     }
     readSchema(_schema, value) {
         const ns = NormalizedSchema.of(_schema);
+        if (ns.isUnitSchema()) {
+            return;
+        }
         const traits = ns.getMergedTraits();
         if (ns.isListSchema() && !Array.isArray(value)) {
             return this.readSchema(ns, [value]);

package/dist-types/submodules/protocols/ProtocolLib.d.ts

@@ -1,5 +1,5 @@
 import { ErrorSchema, NormalizedSchema, TypeRegistry } from "@smithy/core/schema";
-import type { HttpResponse as IHttpResponse, MetadataBearer, ResponseMetadata, SerdeFunctions } from "@smithy/types";
+import type { HttpResponse as IHttpResponse, MetadataBearer, ResponseMetadata } from "@smithy/types";
 /**
  * @internal
  */
@@ -13,14 +13,6 @@ type ErrorMetadataBearer = MetadataBearer & {
  * @internal
  */
 export declare 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.
-     */
-    calculateContentLength(body: any, serdeContext?: SerdeFunctions): string;
     /**
      * This is only for REST protocols.
      *

package/dist-types/ts3.4/submodules/protocols/ProtocolLib.d.ts

@@ -7,14 +7,12 @@ import {
   HttpResponse as IHttpResponse,
   MetadataBearer,
   ResponseMetadata,
-  SerdeFunctions,
 } from "@smithy/types";
 type ErrorMetadataBearer = MetadataBearer & {
   $response: IHttpResponse;
   $fault: "client" | "server";
 };
 export declare class ProtocolLib {
-  calculateContentLength(body: any, serdeContext?: SerdeFunctions): string;
   resolveRestContentType(
     defaultContentType: string,
     inputSchema: NormalizedSchema

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/core",
-  "version": "3.894.0",
+  "version": "3.899.0",
   "description": "Core functions & classes shared by multiple AWS SDK clients.",
   "scripts": {
     "build": "yarn lint && concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
@@ -83,15 +83,14 @@
   "dependencies": {
     "@aws-sdk/types": "3.893.0",
     "@aws-sdk/xml-builder": "3.894.0",
-    "@smithy/core": "^3.11.1",
+    "@smithy/core": "^3.13.0",
     "@smithy/node-config-provider": "^4.2.2",
     "@smithy/property-provider": "^4.1.1",
     "@smithy/protocol-http": "^5.2.1",
     "@smithy/signature-v4": "^5.2.1",
-    "@smithy/smithy-client": "^4.6.3",
+    "@smithy/smithy-client": "^4.6.5",
     "@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"