@aws-sdk/core 3.974.8 → 3.974.9

package/dist-cjs/index.js

@@ -1,18 +1,15 @@
 'use strict';
 
-var utilRetry = require('@smithy/util-retry');
-var protocolHttp = require('@smithy/protocol-http');
+var retry = require('@smithy/core/retry');
+var protocols = require('@smithy/core/protocols');
 var core = require('@smithy/core');
-var propertyProvider = require('@smithy/property-provider');
+var config = require('@smithy/core/config');
 var client = require('@aws-sdk/core/client');
 var signatureV4 = require('@smithy/signature-v4');
 var cbor = require('@smithy/core/cbor');
 var schema = require('@smithy/core/schema');
-var smithyClient = require('@smithy/smithy-client');
-var protocols = require('@smithy/core/protocols');
+var client$1 = require('@smithy/core/client');
 var serde = require('@smithy/core/serde');
-var utilBase64 = require('@smithy/util-base64');
-var utilUtf8 = require('@smithy/util-utf8');
 var xmlBuilder = require('@aws-sdk/xml-builder');
 
 const state = {
@@ -64,7 +61,7 @@ function setCredentialFeature(credentials, feature, value) {
     return credentials;
 }
 
-utilRetry.Retry.v2026 ||= typeof process === "object" && process.env?.AWS_NEW_RETRIES_2026 === "true";
+retry.Retry.v2026 ||= typeof process === "object" && process.env?.AWS_NEW_RETRIES_2026 === "true";
 function setFeature(context, feature, value) {
     if (!context.__aws_sdk_context) {
         context.__aws_sdk_context = {
@@ -85,7 +82,7 @@ function setTokenFeature(token, feature, value) {
     return token;
 }
 
-const getDateHeader = (response) => protocolHttp.HttpResponse.isInstance(response) ? response.headers?.date ?? response.headers?.Date : undefined;
+const getDateHeader = (response) => protocols.HttpResponse.isInstance(response) ? response.headers?.date ?? response.headers?.Date : undefined;
 
 const getSkewCorrectedDate = (systemClockOffset) => new Date(Date.now() + systemClockOffset);
 
@@ -124,7 +121,7 @@ const validateSigningProperties = async (signingProperties) => {
 };
 class AwsSdkSigV4Signer {
     async sign(httpRequest, identity, signingProperties) {
-        if (!protocolHttp.HttpRequest.isInstance(httpRequest)) {
+        if (!protocols.HttpRequest.isInstance(httpRequest)) {
             throw new Error("The request is not an instance of `HttpRequest` and cannot be signed");
         }
         const validatedProps = await validateSigningProperties(signingProperties);
@@ -172,7 +169,7 @@ const AWSSDKSigV4Signer = AwsSdkSigV4Signer;
 
 class AwsSdkSigV4ASigner extends AwsSdkSigV4Signer {
     async sign(httpRequest, identity, signingProperties) {
-        if (!protocolHttp.HttpRequest.isInstance(httpRequest)) {
+        if (!protocols.HttpRequest.isInstance(httpRequest)) {
             throw new Error("The request is not an instance of `HttpRequest` and cannot be signed");
         }
         const { config, signer, signingRegion, signingRegionSet, signingName } = await validateSigningProperties(signingProperties);
@@ -222,7 +219,7 @@ const NODE_SIGV4A_CONFIG_OPTIONS = {
         if (env.AWS_SIGV4A_SIGNING_REGION_SET) {
             return env.AWS_SIGV4A_SIGNING_REGION_SET.split(",").map((_) => _.trim());
         }
-        throw new propertyProvider.ProviderError("AWS_SIGV4A_SIGNING_REGION_SET not set in env.", {
+        throw new config.ProviderError("AWS_SIGV4A_SIGNING_REGION_SET not set in env.", {
             tryNextLink: true,
         });
     },
@@ -230,7 +227,7 @@ const NODE_SIGV4A_CONFIG_OPTIONS = {
         if (profile.sigv4a_signing_region_set) {
             return (profile.sigv4a_signing_region_set ?? "").split(",").map((_) => _.trim());
         }
-        throw new propertyProvider.ProviderError("sigv4a_signing_region_set not set in profile.", {
+        throw new config.ProviderError("sigv4a_signing_region_set not set in profile.", {
             tryNextLink: true,
         });
     },
@@ -457,7 +454,7 @@ class ProtocolLib {
     decorateServiceException(exception, additions = {}) {
         if (this.queryCompat) {
             const msg = exception.Message ?? additions.Message;
-            const error = smithyClient.decorateServiceException(exception, additions);
+            const error = client$1.decorateServiceException(exception, additions);
             if (msg) {
                 error.message = msg;
             }
@@ -472,7 +469,7 @@ class ProtocolLib {
             }
             return error;
         }
-        return smithyClient.decorateServiceException(exception, additions);
+        return client$1.decorateServiceException(exception, additions);
     }
     setQueryCompatError(output, response) {
         const queryErrorHeader = response.headers?.["x-amzn-query-error"];
@@ -545,7 +542,7 @@ class AwsSmithyRpcV2CborProtocol extends cbor.SmithyRpcV2CborProtocol {
         const ns = schema.NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "UnknownError";
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         const output = {};
         for (const [name, member] of ns.structIterator()) {
             if (dataObject[name] != null) {
@@ -664,7 +661,7 @@ function jsonReviver(key, value, context) {
     return value;
 }
 
-const collectBodyString = (streamBody, context) => smithyClient.collectBody(streamBody, context).then((body) => (context?.utf8Encoder ?? utilUtf8.toUtf8)(body));
+const collectBodyString = (streamBody, context) => protocols.collectBody(streamBody, context).then((body) => (context?.utf8Encoder ?? serde.toUtf8)(body));
 
 const parseJsonBody = (streamBody, context) => collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {
@@ -688,7 +685,7 @@ const parseJsonErrorBody = async (errorBody, context) => {
     return value;
 };
 const findKey = (object, key) => Object.keys(object).find((k) => k.toLowerCase() === key.toLowerCase());
-const sanitizeErrorCode = (rawValue) => {
+const sanitizeErrorCode = (rawValue, removeNamespace = true) => {
     let cleanValue = rawValue;
     if (typeof cleanValue === "number") {
         cleanValue = cleanValue.toString();
@@ -699,23 +696,38 @@ const sanitizeErrorCode = (rawValue) => {
     if (cleanValue.indexOf(":") >= 0) {
         cleanValue = cleanValue.split(":")[0];
     }
-    if (cleanValue.indexOf("#") >= 0) {
+    if (removeNamespace && cleanValue.indexOf("#") >= 0) {
         cleanValue = cleanValue.split("#")[1];
     }
     return cleanValue;
 };
 const loadRestJsonErrorCode = (output, data) => {
-    const headerKey = findKey(output.headers, "x-amzn-errortype");
-    if (headerKey !== undefined) {
-        return sanitizeErrorCode(output.headers[headerKey]);
-    }
-    if (data && typeof data === "object") {
-        const codeKey = findKey(data, "code");
-        if (codeKey && data[codeKey] !== undefined) {
-            return sanitizeErrorCode(data[codeKey]);
-        }
-        if (data["__type"] !== undefined) {
-            return sanitizeErrorCode(data["__type"]);
+    return loadErrorCode(output, data, true, ["header", "code", "type"]);
+};
+const loadJsonRpcErrorCode = (output, data, removeNamespace, queryCompat = false) => {
+    return loadErrorCode(output, data, removeNamespace, queryCompat ? ["code", "header", "type"] : ["type", "code", "header"]);
+};
+const loadErrorCode = ({ headers }, data, removeNamespace, order) => {
+    while (order.length > 0) {
+        const location = order.shift();
+        switch (location) {
+            case "header":
+                const headerKey = findKey(headers ?? {}, "x-amzn-errortype");
+                if (headerKey !== undefined) {
+                    return sanitizeErrorCode(headers[headerKey], removeNamespace);
+                }
+                break;
+            case "code":
+                const codeKey = findKey(data ?? {}, "code");
+                if (codeKey && data[codeKey] !== undefined) {
+                    return sanitizeErrorCode(data[codeKey], removeNamespace);
+                }
+                break;
+            case "type":
+                if (data?.__type !== undefined) {
+                    return sanitizeErrorCode(data.__type, removeNamespace);
+                }
+                break;
         }
     }
 };
@@ -794,7 +806,7 @@ class JsonShapeDeserializer extends SerdeContextConfig {
             }
         }
         if (ns.isBlobSchema() && typeof value === "string") {
-            return utilBase64.fromBase64(value);
+            return serde.fromBase64(value);
         }
         const mediaType = ns.getMergedTraits().mediaType;
         if (ns.isStringSchema() && typeof value === "string" && mediaType) {
@@ -1012,7 +1024,7 @@ class JsonShapeSerializer extends SerdeContextConfig {
                 if (ns === this.rootSchema) {
                     return value;
                 }
-                return (this.serdeContext?.base64Encoder ?? utilBase64.toBase64)(value);
+                return (this.serdeContext?.base64Encoder ?? serde.toBase64)(value);
             }
             if (value instanceof Date && (ns.isTimestampSchema() || ns.isDocumentSchema())) {
                 const format = protocols.determineTimestampFormat(ns, this.settings);
@@ -1058,7 +1070,7 @@ class JsonShapeSerializer extends SerdeContextConfig {
             if (ns === this.rootSchema) {
                 return value;
             }
-            return (this.serdeContext?.base64Encoder ?? utilBase64.toBase64)(value);
+            return (this.serdeContext?.base64Encoder ?? serde.toBase64)(value);
         }
         if (typeof value === "bigint") {
             this.useReplacer = true;
@@ -1150,16 +1162,17 @@ class AwsJsonRpcProtocol extends protocols.RpcProtocol {
         return this.codec;
     }
     async handleError(operationSchema, context, response, dataObject, metadata) {
-        if (this.awsQueryCompatible) {
+        const { awsQueryCompatible } = this;
+        if (awsQueryCompatible) {
             this.mixin.setQueryCompatError(dataObject, response);
         }
-        const errorIdentifier = loadRestJsonErrorCode(response, dataObject) ?? "Unknown";
+        const errorIdentifier = loadJsonRpcErrorCode(response, dataObject, this.getJsonRpcVersion() === "1.1", awsQueryCompatible) ?? "Unknown";
         this.mixin.compose(this.compositeErrorRegistry, errorIdentifier, this.options.defaultNamespace);
-        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata, this.awsQueryCompatible ? this.mixin.findQueryCompatibleError : undefined);
+        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata, awsQueryCompatible ? this.mixin.findQueryCompatibleError : undefined);
         const ns = schema.NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "UnknownError";
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         const output = {};
         const errorDeserializer = this.codec.createDeserializer();
         for (const [name, member] of ns.structIterator()) {
@@ -1167,7 +1180,7 @@ class AwsJsonRpcProtocol extends protocols.RpcProtocol {
                 output[name] = errorDeserializer.readObject(member, dataObject[name]);
             }
         }
-        if (this.awsQueryCompatible) {
+        if (awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);
         }
         throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
@@ -1282,7 +1295,7 @@ class AwsRestJsonProtocol extends protocols.HttpBindingProtocol {
         const ns = schema.NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "UnknownError";
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         await this.deserializeHttpMessage(errorSchema, context, response, dataObject);
         const output = {};
         const errorDeserializer = this.codec.createDeserializer();
@@ -1307,7 +1320,7 @@ const awsExpectUnion = (value) => {
     if (typeof value === "object" && "__type" in value) {
         delete value.__type;
     }
-    return smithyClient.expectUnion(value);
+    return serde.expectUnion(value);
 };
 
 class XmlShapeDeserializer extends SerdeContextConfig {
@@ -1342,7 +1355,7 @@ class XmlShapeDeserializer extends SerdeContextConfig {
             }
             return output;
         }
-        const xmlString = (this.serdeContext?.utf8Encoder ?? utilUtf8.toUtf8)(bytes);
+        const xmlString = (this.serdeContext?.utf8Encoder ?? serde.toUtf8)(bytes);
         const parsedObject = this.parseXml(xmlString);
         return this.readSchema(schema$1, key ? parsedObject[key] : parsedObject);
     }
@@ -1451,7 +1464,7 @@ class XmlShapeDeserializer extends SerdeContextConfig {
                 parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
                 delete parsedObjToReturn[textNodeName];
             }
-            return smithyClient.getValueFromTextNode(parsedObjToReturn);
+            return client$1.getValueFromTextNode(parsedObjToReturn);
         }
         return {};
     }
@@ -1475,7 +1488,7 @@ class QueryShapeSerializer extends SerdeContextConfig {
         if (ns.isBlobSchema()) {
             if (typeof value === "string" || value instanceof Uint8Array) {
                 this.writeKey(prefix);
-                this.writeValue((this.serdeContext?.base64Encoder ?? utilBase64.toBase64)(value));
+                this.writeValue((this.serdeContext?.base64Encoder ?? serde.toBase64)(value));
             }
         }
         else if (ns.isBooleanSchema() || ns.isNumericSchema() || ns.isStringSchema()) {
@@ -1509,7 +1522,7 @@ class QueryShapeSerializer extends SerdeContextConfig {
                         this.writeValue(value.toISOString().replace(".000Z", "Z"));
                         break;
                     case 6:
-                        this.writeValue(smithyClient.dateToUtcString(value));
+                        this.writeValue(serde.dateToUtcString(value));
                         break;
                     case 7:
                         this.writeValue(String(value.getTime() / 1000));
@@ -1733,7 +1746,7 @@ class AwsQueryProtocol extends protocols.RpcProtocol {
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, errorData, metadata, this.mixin.findQueryCompatibleError);
         const ns = schema.NormalizedSchema.of(errorSchema);
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         const output = {
             Type: errorData.Error.Type,
             Code: errorData.Error.Code,
@@ -1812,7 +1825,7 @@ const parseXmlBody = (streamBody, context) => collectBodyString(streamBody, cont
             parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
             delete parsedObjToReturn[textNodeName];
         }
-        return smithyClient.getValueFromTextNode(parsedObjToReturn);
+        return client$1.getValueFromTextNode(parsedObjToReturn);
     }
     return {};
 });
@@ -1853,7 +1866,7 @@ class XmlShapeSerializer extends SerdeContextConfig {
             this.byteBuffer =
                 "byteLength" in value
                     ? value
-                    : (this.serdeContext?.base64Decoder ?? utilBase64.fromBase64)(value);
+                    : (this.serdeContext?.base64Decoder ?? serde.fromBase64)(value);
         }
         else {
             this.buffer = this.writeStruct(ns, value, undefined);
@@ -2057,7 +2070,7 @@ class XmlShapeSerializer extends SerdeContextConfig {
         let nodeContents = null;
         if (value && typeof value === "object") {
             if (ns.isBlobSchema()) {
-                nodeContents = (this.serdeContext?.base64Encoder ?? utilBase64.toBase64)(value);
+                nodeContents = (this.serdeContext?.base64Encoder ?? serde.toBase64)(value);
             }
             else if (ns.isTimestampSchema() && value instanceof Date) {
                 const format = protocols.determineTimestampFormat(ns, this.settings);
@@ -2066,14 +2079,14 @@ class XmlShapeSerializer extends SerdeContextConfig {
                         nodeContents = value.toISOString().replace(".000Z", "Z");
                         break;
                     case 6:
-                        nodeContents = smithyClient.dateToUtcString(value);
+                        nodeContents = serde.dateToUtcString(value);
                         break;
                     case 7:
                         nodeContents = String(value.getTime() / 1000);
                         break;
                     default:
                         console.warn("Missing timestamp format, using http date", value);
-                        nodeContents = smithyClient.dateToUtcString(value);
+                        nodeContents = serde.dateToUtcString(value);
                         break;
                 }
             }
@@ -2212,7 +2225,7 @@ class AwsRestXmlProtocol extends protocols.HttpBindingProtocol {
             dataObject.Message ??
             "UnknownError";
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         await this.deserializeHttpMessage(errorSchema, context, response, dataObject);
         const output = {};
         const errorDeserializer = this.codec.createDeserializer();
@@ -2266,6 +2279,7 @@ exports.awsExpectUnion = awsExpectUnion;
 exports.emitWarningIfUnsupportedVersion = emitWarningIfUnsupportedVersion;
 exports.getBearerTokenEnvKey = getBearerTokenEnvKey;
 exports.getLongPollPlugin = getLongPollPlugin;
+exports.loadJsonRpcErrorCode = loadJsonRpcErrorCode;
 exports.loadRestJsonErrorCode = loadRestJsonErrorCode;
 exports.loadRestXmlErrorCode = loadRestXmlErrorCode;
 exports.parseJsonBody = parseJsonBody;

package/dist-cjs/submodules/account-id-endpoint/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var utilMiddleware = require('@smithy/util-middleware');
+var client = require('@smithy/core/client');
 
 const DEFAULT_ACCOUNT_ID_ENDPOINT_MODE = "preferred";
 const ACCOUNT_ID_ENDPOINT_MODE_VALUES = ["disabled", "preferred", "required"];
@@ -10,7 +10,7 @@ function validateAccountIdEndpointMode(value) {
 
 const resolveAccountIdEndpointModeConfig = (input) => {
     const { accountIdEndpointMode } = input;
-    const accountIdEndpointModeProvider = utilMiddleware.normalizeProvider(accountIdEndpointMode ?? DEFAULT_ACCOUNT_ID_ENDPOINT_MODE);
+    const accountIdEndpointModeProvider = client.normalizeProvider(accountIdEndpointMode ?? DEFAULT_ACCOUNT_ID_ENDPOINT_MODE);
     return Object.assign(input, {
         accountIdEndpointMode: async () => {
             const accIdMode = await accountIdEndpointModeProvider();

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var utilRetry = require('@smithy/util-retry');
+var retry = require('@smithy/core/retry');
 
 const state = {
     warningEmitted: false,
@@ -51,7 +51,7 @@ function setCredentialFeature(credentials, feature, value) {
     return credentials;
 }
 
-utilRetry.Retry.v2026 ||= typeof process === "object" && process.env?.AWS_NEW_RETRIES_2026 === "true";
+retry.Retry.v2026 ||= typeof process === "object" && process.env?.AWS_NEW_RETRIES_2026 === "true";
 function setFeature(context, feature, value) {
     if (!context.__aws_sdk_context) {
         context.__aws_sdk_context = {

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

@@ -1,12 +1,12 @@
 'use strict';
 
-var protocolHttp = require('@smithy/protocol-http');
+var protocols = require('@smithy/core/protocols');
 var core = require('@smithy/core');
-var propertyProvider = require('@smithy/property-provider');
+var config = require('@smithy/core/config');
 var client = require('@aws-sdk/core/client');
 var signatureV4 = require('@smithy/signature-v4');
 
-const getDateHeader = (response) => protocolHttp.HttpResponse.isInstance(response) ? response.headers?.date ?? response.headers?.Date : undefined;
+const getDateHeader = (response) => protocols.HttpResponse.isInstance(response) ? response.headers?.date ?? response.headers?.Date : undefined;
 
 const getSkewCorrectedDate = (systemClockOffset) => new Date(Date.now() + systemClockOffset);
 
@@ -45,7 +45,7 @@ const validateSigningProperties = async (signingProperties) => {
 };
 class AwsSdkSigV4Signer {
     async sign(httpRequest, identity, signingProperties) {
-        if (!protocolHttp.HttpRequest.isInstance(httpRequest)) {
+        if (!protocols.HttpRequest.isInstance(httpRequest)) {
             throw new Error("The request is not an instance of `HttpRequest` and cannot be signed");
         }
         const validatedProps = await validateSigningProperties(signingProperties);
@@ -93,7 +93,7 @@ const AWSSDKSigV4Signer = AwsSdkSigV4Signer;
 
 class AwsSdkSigV4ASigner extends AwsSdkSigV4Signer {
     async sign(httpRequest, identity, signingProperties) {
-        if (!protocolHttp.HttpRequest.isInstance(httpRequest)) {
+        if (!protocols.HttpRequest.isInstance(httpRequest)) {
             throw new Error("The request is not an instance of `HttpRequest` and cannot be signed");
         }
         const { config, signer, signingRegion, signingRegionSet, signingName } = await validateSigningProperties(signingProperties);
@@ -143,7 +143,7 @@ const NODE_SIGV4A_CONFIG_OPTIONS = {
         if (env.AWS_SIGV4A_SIGNING_REGION_SET) {
             return env.AWS_SIGV4A_SIGNING_REGION_SET.split(",").map((_) => _.trim());
         }
-        throw new propertyProvider.ProviderError("AWS_SIGV4A_SIGNING_REGION_SET not set in env.", {
+        throw new config.ProviderError("AWS_SIGV4A_SIGNING_REGION_SET not set in env.", {
             tryNextLink: true,
         });
     },
@@ -151,7 +151,7 @@ const NODE_SIGV4A_CONFIG_OPTIONS = {
         if (profile.sigv4a_signing_region_set) {
             return (profile.sigv4a_signing_region_set ?? "").split(",").map((_) => _.trim());
         }
-        throw new propertyProvider.ProviderError("sigv4a_signing_region_set not set in profile.", {
+        throw new config.ProviderError("sigv4a_signing_region_set not set in profile.", {
             tryNextLink: true,
         });
     },