@smithy/signature-v4a 3.2.8 → 3.3.0

package/dist-cjs/index.js

@@ -1,9 +1,7 @@
-'use strict';
+const { REGION_SET_PARAM, KEY_TYPE_IDENTIFIER, ALGORITHM_IDENTIFIER_V4A, SignatureV4Base, prepareRequest, AMZ_DATE_HEADER, TOKEN_HEADER, getPayloadHash, hasHeader, SHA256_HEADER, getCanonicalHeaders, AUTH_HEADER, signatureV4aContainer } = require("@smithy/signature-v4");
+const { toUint8Array, toHex } = require("@smithy/core/serde");
 
-var signatureV4 = require('@smithy/signature-v4');
-var serde = require('@smithy/core/serde');
-
-const REGION_HEADER = signatureV4.REGION_SET_PARAM.toLowerCase();
+const REGION_HEADER = REGION_SET_PARAM.toLowerCase();
 const ONE_AS_4_BYTES = [0x00, 0x00, 0x00, 0x01];
 const TWOFIFTYSIX_AS_4_BYTES = [0x00, 0x00, 0x01, 0x00];
 const N_MINUS_TWO = [
@@ -11,7 +9,7 @@ const N_MINUS_TWO = [
     0xad, 0xa7, 0x17, 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x4f,
 ];
 
-const createSigV4aScope = (shortDate, service) => `${shortDate}/${service}/${signatureV4.KEY_TYPE_IDENTIFIER}`;
+const createSigV4aScope = (shortDate, service) => `${shortDate}/${service}/${KEY_TYPE_IDENTIFIER}`;
 const getSigV4aSigningKey = async (sha256, accessKey, secretKey) => {
     let outputBufferWriter = "";
     const maxTrials = 254;
@@ -31,7 +29,7 @@ const getSigV4aSigningKey = async (sha256, accessKey, secretKey) => {
         outputBufferWriter = buildFixedInputBuffer(outputBufferWriter, accessKey, trial);
         const secretKey = inputKeyBuf.subarray(0, inputKeyLength);
         const hash = new sha256(secretKey);
-        const hashVal = serde.toUint8Array(outputBufferWriter);
+        const hashVal = toUint8Array(outputBufferWriter);
         hash.update(hashVal);
         const hashedOutput = await hash.digest();
         if (isBiggerThanNMinus2(hashedOutput)) {
@@ -45,7 +43,7 @@ const getSigV4aSigningKey = async (sha256, accessKey, secretKey) => {
 const buildFixedInputBuffer = (bufferInput, accessKey, counter) => {
     let outputBuffer = bufferInput;
     outputBuffer += ONE_AS_4_BYTES.map((value) => String.fromCharCode(value)).join("");
-    outputBuffer += signatureV4.ALGORITHM_IDENTIFIER_V4A;
+    outputBuffer += ALGORITHM_IDENTIFIER_V4A;
     outputBuffer += String.fromCharCode(0x00);
     outputBuffer += accessKey;
     outputBuffer += String.fromCharCode(counter);
@@ -9908,7 +9906,7 @@ var require_elliptic = __commonJS({
 var import_elliptic = __toESM(require_elliptic());
 var export_Ec = import_elliptic.ec;
 
-class SignatureV4a extends signatureV4.SignatureV4Base {
+class SignatureV4a extends SignatureV4Base {
     constructor({ applyChecksum, credentials, region, service, sha256, uriEscapePath = true, }) {
         super({
             applyChecksum,
@@ -9926,25 +9924,25 @@ class SignatureV4a extends signatureV4.SignatureV4Base {
         const credentials = await this.credentialProvider();
         this.validateResolvedCredentials(credentials);
         const region = signingRegion ?? (await this.regionProvider());
-        const request = signatureV4.prepareRequest(requestToSign);
+        const request = prepareRequest(requestToSign);
         const { longDate, shortDate } = this.formatDate(signingDate);
         const scope = createSigV4aScope(shortDate, signingService ?? this.service);
         const pKey = await getSigV4aSigningKey(this.sha256, credentials.accessKeyId, credentials.secretAccessKey);
-        request.headers[signatureV4.AMZ_DATE_HEADER] = longDate;
+        request.headers[AMZ_DATE_HEADER] = longDate;
         if (credentials.sessionToken) {
-            request.headers[signatureV4.TOKEN_HEADER] = credentials.sessionToken;
+            request.headers[TOKEN_HEADER] = credentials.sessionToken;
         }
         request.headers[REGION_HEADER] = region;
-        const payloadHash = await signatureV4.getPayloadHash(request, this.sha256);
-        if (!signatureV4.hasHeader(signatureV4.SHA256_HEADER, request.headers) && this.applyChecksum) {
-            request.headers[signatureV4.SHA256_HEADER] = payloadHash;
+        const payloadHash = await getPayloadHash(request, this.sha256);
+        if (!hasHeader(SHA256_HEADER, request.headers) && this.applyChecksum) {
+            request.headers[SHA256_HEADER] = payloadHash;
         }
-        const canonicalHeaders = signatureV4.getCanonicalHeaders(request, unsignableHeaders, signableHeaders);
+        const canonicalHeaders = getCanonicalHeaders(request, unsignableHeaders, signableHeaders);
         const canonicalRequest = this.createCanonicalRequest(request, canonicalHeaders, payloadHash);
-        const stringToSign = await this.createStringToSign(longDate, scope, canonicalRequest, signatureV4.ALGORITHM_IDENTIFIER_V4A);
+        const stringToSign = await this.createStringToSign(longDate, scope, canonicalRequest, ALGORITHM_IDENTIFIER_V4A);
         const signature = await this.getSignature(pKey, stringToSign);
-        request.headers[signatureV4.AUTH_HEADER] =
-            `${signatureV4.ALGORITHM_IDENTIFIER_V4A} ` +
+        request.headers[AUTH_HEADER] =
+            `${ALGORITHM_IDENTIFIER_V4A} ` +
                 `Credential=${credentials.accessKeyId}/${scope}, ` +
                 `SignedHeaders=${this.getCanonicalHeaderList(canonicalHeaders)}, ` +
                 `Signature=${signature}`;
@@ -9954,13 +9952,13 @@ class SignatureV4a extends signatureV4.SignatureV4Base {
         const ecdsa = new export_Ec("p256");
         const key = ecdsa.keyFromPrivate(privateKey);
         const hash = new this.sha256();
-        hash.update(serde.toUint8Array(stringToSign));
+        hash.update(toUint8Array(stringToSign));
         const hashResult = await hash.digest();
         const signature = key.sign(hashResult);
-        return serde.toHex(new Uint8Array(signature.toDER()));
+        return toHex(new Uint8Array(signature.toDER()));
     }
 }
 
-signatureV4.signatureV4aContainer.SignatureV4a = SignatureV4a;
+signatureV4aContainer.SignatureV4a = SignatureV4a;
 
 exports.SignatureV4a = SignatureV4a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithy/signature-v4a",
-  "version": "3.2.8",
+  "version": "3.3.0",
   "description": "Asymmetric addon for the @smithy/signature-v4 package",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -8,10 +8,10 @@
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es:cjs'",
     "build:elliptic": "node ./scripts/esbuild.mjs",
-    "build:es:cjs": "yarn g:tsc -p tsconfig.es.json && node ../../scripts/inline",
-    "build:types": "yarn g:tsc -p tsconfig.types.json",
+    "build:es:cjs": "premove dist-es && yarn g:tsc -p tsconfig.es.json && node ../../scripts/inline",
+    "build:types": "premove dist-types && yarn g:tsc -p tsconfig.types.json",
     "build:types:downlevel": "premove dist-types/ts3.4 && downlevel-dts dist-types dist-types/ts3.4",
-    "clean": "premove dist-cjs dist-es dist-types *.tsbuildinfo",
+    "clean": "premove dist-cjs dist-es dist-types",
     "extract:docs": "api-extractor run --local",
     "format": "prettier --config ../../prettier.config.js --ignore-path ../.prettierignore --write \"**/*.{ts,md,json}\"",
     "lint": "eslint -c ../../.eslintrc.js \"src/**/*.ts\"",
@@ -26,9 +26,9 @@
   "license": "Apache-2.0",
   "sideEffects": true,
   "dependencies": {
-    "@smithy/core": "^3.24.7",
-    "@smithy/signature-v4": "^5.4.7",
-    "@smithy/types": "^4.14.4",
+    "@smithy/core": "^3.25.0",
+    "@smithy/signature-v4": "^5.5.0",
+    "@smithy/types": "^4.15.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {