@aws-sdk/middleware-sdk-s3 3.714.0 → 3.723.0

package/dist-cjs/index.js

@@ -59,12 +59,11 @@ var import_smithy_client = require("@smithy/smithy-client");
 var CONTENT_LENGTH_HEADER = "content-length";
 function checkContentLengthHeader() {
   return (next, context) => async (args) => {
-    var _a;
     const { request } = args;
     if (import_protocol_http.HttpRequest.isInstance(request)) {
       if (!(CONTENT_LENGTH_HEADER in request.headers)) {
         const message = `Are you using a Stream of unknown length as the Body of a PutObject request? Consider using Upload instead from @aws-sdk/lib-storage.`;
-        if (typeof ((_a = context == null ? void 0 : context.logger) == null ? void 0 : _a.warn) === "function" && !(context.logger instanceof import_smithy_client.NoOpLogger)) {
+        if (typeof context?.logger?.warn === "function" && !(context.logger instanceof import_smithy_client.NoOpLogger)) {
           context.logger.warn(message);
         } else {
           console.warn(message);
@@ -133,16 +132,15 @@ var regionRedirectEndpointMiddlewareOptions = {
 // src/region-redirect-middleware.ts
 function regionRedirectMiddleware(clientConfig) {
   return (next, context) => async (args) => {
-    var _a, _b, _c;
     try {
       return await next(args);
     } catch (err) {
       if (clientConfig.followRegionRedirects) {
-        if (((_a = err == null ? void 0 : err.$metadata) == null ? void 0 : _a.httpStatusCode) === 301 || // err.name === "PermanentRedirect" && --> removing the error name check, as that allows for HEAD operations (which have the 301 status code, but not the same error name) to be covered for region redirection as well
-        ((_b = err == null ? void 0 : err.$metadata) == null ? void 0 : _b.httpStatusCode) === 400 && (err == null ? void 0 : err.name) === "IllegalLocationConstraintException") {
+        if (err?.$metadata?.httpStatusCode === 301 || // err.name === "PermanentRedirect" && --> removing the error name check, as that allows for HEAD operations (which have the 301 status code, but not the same error name) to be covered for region redirection as well
+        err?.$metadata?.httpStatusCode === 400 && err?.name === "IllegalLocationConstraintException") {
           try {
             const actualRegion = err.$response.headers["x-amz-bucket-region"];
-            (_c = context.logger) == null ? void 0 : _c.debug(`Redirecting from ${await clientConfig.region()} to ${actualRegion}`);
+            context.logger?.debug(`Redirecting from ${await clientConfig.region()} to ${actualRegion}`);
             context.__s3RegionRedirect = actualRegion;
           } catch (e) {
             throw new Error("Region redirect failed: " + e);
@@ -173,7 +171,6 @@ var getRegionRedirectMiddlewarePlugin = /* @__PURE__ */ __name((clientConfig) =>
 
 var s3ExpiresMiddleware = /* @__PURE__ */ __name((config) => {
   return (next, context) => async (args) => {
-    var _a;
     const result = await next(args);
     const { response } = result;
     if (import_protocol_http.HttpResponse.isInstance(response)) {
@@ -182,7 +179,7 @@ var s3ExpiresMiddleware = /* @__PURE__ */ __name((config) => {
         try {
           (0, import_smithy_client.parseRfc7231DateTime)(response.headers.expires);
         } catch (e) {
-          (_a = context.logger) == null ? void 0 : _a.warn(
+          context.logger?.warn(
             `AWS SDK Warning for ${context.clientName}::${context.commandName} response parsing (${response.headers.expires}): ${e}`
           );
           delete response.headers.expires;
@@ -206,11 +203,15 @@ var getS3ExpiresMiddlewarePlugin = /* @__PURE__ */ __name((clientConfig) => ({
 }), "getS3ExpiresMiddlewarePlugin");
 
 // src/s3-express/classes/S3ExpressIdentityCache.ts
-var _S3ExpressIdentityCache = class _S3ExpressIdentityCache {
+var S3ExpressIdentityCache = class _S3ExpressIdentityCache {
   constructor(data = {}) {
     this.data = data;
-    this.lastPurgeTime = Date.now();
   }
+  static {
+    __name(this, "S3ExpressIdentityCache");
+  }
+  lastPurgeTime = Date.now();
+  static EXPIRED_CREDENTIAL_PURGE_INTERVAL_MS = 3e4;
   get(key) {
     const entry = this.data[key];
     if (!entry) {
@@ -243,12 +244,9 @@ var _S3ExpressIdentityCache = class _S3ExpressIdentityCache {
     }
   }
 };
-__name(_S3ExpressIdentityCache, "S3ExpressIdentityCache");
-_S3ExpressIdentityCache.EXPIRED_CREDENTIAL_PURGE_INTERVAL_MS = 3e4;
-var S3ExpressIdentityCache = _S3ExpressIdentityCache;
 
 // src/s3-express/classes/S3ExpressIdentityCacheEntry.ts
-var _S3ExpressIdentityCacheEntry = class _S3ExpressIdentityCacheEntry {
+var S3ExpressIdentityCacheEntry = class {
   /**
    * @param identity - stored identity.
    * @param accessed - timestamp of last access in epoch ms.
@@ -259,32 +257,36 @@ var _S3ExpressIdentityCacheEntry = class _S3ExpressIdentityCacheEntry {
     this.isRefreshing = isRefreshing;
     this.accessed = accessed;
   }
+  static {
+    __name(this, "S3ExpressIdentityCacheEntry");
+  }
   get identity() {
     this.accessed = Date.now();
     return this._identity;
   }
 };
-__name(_S3ExpressIdentityCacheEntry, "S3ExpressIdentityCacheEntry");
-var S3ExpressIdentityCacheEntry = _S3ExpressIdentityCacheEntry;
 
 // src/s3-express/classes/S3ExpressIdentityProviderImpl.ts
-var _S3ExpressIdentityProviderImpl = class _S3ExpressIdentityProviderImpl {
+var S3ExpressIdentityProviderImpl = class _S3ExpressIdentityProviderImpl {
   constructor(createSessionFn, cache = new S3ExpressIdentityCache()) {
     this.createSessionFn = createSessionFn;
     this.cache = cache;
   }
+  static {
+    __name(this, "S3ExpressIdentityProviderImpl");
+  }
+  static REFRESH_WINDOW_MS = 6e4;
   async getS3ExpressIdentity(awsIdentity, identityProperties) {
     const key = identityProperties.Bucket;
     const { cache } = this;
     const entry = cache.get(key);
     if (entry) {
       return entry.identity.then((identity) => {
-        var _a, _b;
-        const isExpired = (((_a = identity.expiration) == null ? void 0 : _a.getTime()) ?? 0) < Date.now();
+        const isExpired = (identity.expiration?.getTime() ?? 0) < Date.now();
         if (isExpired) {
           return cache.set(key, new S3ExpressIdentityCacheEntry(this.getIdentity(key))).identity;
         }
-        const isExpiringSoon = (((_b = identity.expiration) == null ? void 0 : _b.getTime()) ?? 0) < Date.now() + _S3ExpressIdentityProviderImpl.REFRESH_WINDOW_MS;
+        const isExpiringSoon = (identity.expiration?.getTime() ?? 0) < Date.now() + _S3ExpressIdentityProviderImpl.REFRESH_WINDOW_MS;
         if (isExpiringSoon && !entry.isRefreshing) {
           entry.isRefreshing = true;
           this.getIdentity(key).then((id) => {
@@ -297,12 +299,11 @@ var _S3ExpressIdentityProviderImpl = class _S3ExpressIdentityProviderImpl {
     return cache.set(key, new S3ExpressIdentityCacheEntry(this.getIdentity(key))).identity;
   }
   async getIdentity(key) {
-    var _a, _b;
     await this.cache.purgeExpired().catch((error) => {
       console.warn("Error while clearing expired entries in S3ExpressIdentityCache: \n" + error);
     });
     const session = await this.createSessionFn(key);
-    if (!((_a = session.Credentials) == null ? void 0 : _a.AccessKeyId) || !((_b = session.Credentials) == null ? void 0 : _b.SecretAccessKey)) {
+    if (!session.Credentials?.AccessKeyId || !session.Credentials?.SecretAccessKey) {
       throw new Error("s3#createSession response credential missing AccessKeyId or SecretAccessKey.");
     }
     const identity = {
@@ -314,9 +315,6 @@ var _S3ExpressIdentityProviderImpl = class _S3ExpressIdentityProviderImpl {
     return identity;
   }
 };
-__name(_S3ExpressIdentityProviderImpl, "S3ExpressIdentityProviderImpl");
-_S3ExpressIdentityProviderImpl.REFRESH_WINDOW_MS = 6e4;
-var S3ExpressIdentityProviderImpl = _S3ExpressIdentityProviderImpl;
 
 // src/s3-express/classes/SignatureV4S3Express.ts
 var import_signature_v4 = require("@smithy/signature-v4");
@@ -337,7 +335,10 @@ var NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_OPTIONS = {
 };
 
 // src/s3-express/classes/SignatureV4S3Express.ts
-var _SignatureV4S3Express = class _SignatureV4S3Express extends import_signature_v4.SignatureV4 {
+var SignatureV4S3Express = class extends import_signature_v4.SignatureV4 {
+  static {
+    __name(this, "SignatureV4S3Express");
+  }
   /**
    * Signs with alternate provided credentials instead of those provided in the
    * constructor.
@@ -366,8 +367,6 @@ var _SignatureV4S3Express = class _SignatureV4S3Express extends import_signature
     return this.presign(requestToSign, options);
   }
 };
-__name(_SignatureV4S3Express, "SignatureV4S3Express");
-var SignatureV4S3Express = _SignatureV4S3Express;
 function getCredentialsWithoutSessionToken(credentials) {
   const credentialsWithoutSessionToken = {
     accessKeyId: credentials.accessKeyId,
@@ -396,11 +395,10 @@ var import_core = require("@aws-sdk/core");
 
 var s3ExpressMiddleware = /* @__PURE__ */ __name((options) => {
   return (next, context) => async (args) => {
-    var _a, _b, _c, _d, _e;
     if (context.endpointV2) {
       const endpoint = context.endpointV2;
-      const isS3ExpressAuth = ((_c = (_b = (_a = endpoint.properties) == null ? void 0 : _a.authSchemes) == null ? void 0 : _b[0]) == null ? void 0 : _c.name) === S3_EXPRESS_AUTH_SCHEME;
-      const isS3ExpressBucket = ((_d = endpoint.properties) == null ? void 0 : _d.backend) === S3_EXPRESS_BACKEND || ((_e = endpoint.properties) == null ? void 0 : _e.bucketType) === S3_EXPRESS_BUCKET_TYPE;
+      const isS3ExpressAuth = endpoint.properties?.authSchemes?.[0]?.name === S3_EXPRESS_AUTH_SCHEME;
+      const isS3ExpressBucket = endpoint.properties?.backend === S3_EXPRESS_BACKEND || endpoint.properties?.bucketType === S3_EXPRESS_BUCKET_TYPE;
       if (isS3ExpressBucket) {
         (0, import_core.setFeature)(context, "S3_EXPRESS_BUCKET", "J");
         context.isS3ExpressBucket = true;
@@ -540,7 +538,7 @@ var throw200ExceptionsMiddleware = /* @__PURE__ */ __name((config) => (next, con
   if (statusCode < 200 || statusCode >= 300) {
     return result;
   }
-  const isSplittableStream = typeof (sourceBody == null ? void 0 : sourceBody.stream) === "function" || typeof (sourceBody == null ? void 0 : sourceBody.pipe) === "function" || typeof (sourceBody == null ? void 0 : sourceBody.tee) === "function";
+  const isSplittableStream = typeof sourceBody?.stream === "function" || typeof sourceBody?.pipe === "function" || typeof sourceBody?.tee === "function";
   if (!isSplittableStream) {
     return result;
   }
@@ -555,7 +553,7 @@ var throw200ExceptionsMiddleware = /* @__PURE__ */ __name((config) => (next, con
       return (0, import_util_stream.headStream)(stream, MAX_BYTES_TO_INSPECT);
     }
   });
-  if (typeof (bodyCopy == null ? void 0 : bodyCopy.destroy) === "function") {
+  if (typeof bodyCopy?.destroy === "function") {
     bodyCopy.destroy();
   }
   const bodyStringTail = config.utf8Encoder(bodyBytes.subarray(bodyBytes.length - 16));
@@ -594,7 +592,6 @@ var import_util_arn_parser = require("@aws-sdk/util-arn-parser");
 // src/bucket-endpoint-middleware.ts
 function bucketEndpointMiddleware(options) {
   return (next, context) => async (args) => {
-    var _a, _b, _c, _d;
     if (options.bucketEndpoint) {
       const endpoint = context.endpointV2;
       if (endpoint) {
@@ -608,10 +605,10 @@ function bucketEndpointMiddleware(options) {
             };
           } catch (e) {
             const warning = `@aws-sdk/middleware-sdk-s3: bucketEndpoint=true was set but Bucket=${bucket} could not be parsed as URL.`;
-            if (((_b = (_a = context.logger) == null ? void 0 : _a.constructor) == null ? void 0 : _b.name) === "NoOpLogger") {
+            if (context.logger?.constructor?.name === "NoOpLogger") {
               console.warn(warning);
             } else {
-              (_d = (_c = context.logger) == null ? void 0 : _c.warn) == null ? void 0 : _d.call(_c, warning);
+              context.logger?.warn?.(warning);
             }
             throw e;
           }

package/dist-es/s3-express/classes/S3ExpressIdentityCache.js

@@ -1,7 +1,9 @@
 export class S3ExpressIdentityCache {
+    data;
+    lastPurgeTime = Date.now();
+    static EXPIRED_CREDENTIAL_PURGE_INTERVAL_MS = 30000;
     constructor(data = {}) {
         this.data = data;
-        this.lastPurgeTime = Date.now();
     }
     get(key) {
         const entry = this.data[key];
@@ -35,4 +37,3 @@ export class S3ExpressIdentityCache {
         }
     }
 }
-S3ExpressIdentityCache.EXPIRED_CREDENTIAL_PURGE_INTERVAL_MS = 30000;

package/dist-es/s3-express/classes/S3ExpressIdentityCacheEntry.js

@@ -1,4 +1,7 @@
 export class S3ExpressIdentityCacheEntry {
+    _identity;
+    isRefreshing;
+    accessed;
     constructor(_identity, isRefreshing = false, accessed = Date.now()) {
         this._identity = _identity;
         this.isRefreshing = isRefreshing;

package/dist-es/s3-express/classes/S3ExpressIdentityProviderImpl.js

@@ -1,6 +1,9 @@
 import { S3ExpressIdentityCache } from "./S3ExpressIdentityCache";
 import { S3ExpressIdentityCacheEntry } from "./S3ExpressIdentityCacheEntry";
 export class S3ExpressIdentityProviderImpl {
+    createSessionFn;
+    cache;
+    static REFRESH_WINDOW_MS = 60000;
     constructor(createSessionFn, cache = new S3ExpressIdentityCache()) {
         this.createSessionFn = createSessionFn;
         this.cache = cache;
@@ -44,4 +47,3 @@ export class S3ExpressIdentityProviderImpl {
         return identity;
     }
 }
-S3ExpressIdentityProviderImpl.REFRESH_WINDOW_MS = 60000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-sdk-s3",
-  "version": "3.714.0",
+  "version": "3.723.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline middleware-sdk-s3",
@@ -27,19 +27,19 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/core": "3.714.0",
-    "@aws-sdk/types": "3.714.0",
-    "@aws-sdk/util-arn-parser": "3.693.0",
-    "@smithy/core": "^2.5.5",
-    "@smithy/node-config-provider": "^3.1.12",
-    "@smithy/protocol-http": "^4.1.8",
-    "@smithy/signature-v4": "^4.2.4",
-    "@smithy/smithy-client": "^3.5.0",
-    "@smithy/types": "^3.7.2",
-    "@smithy/util-config-provider": "^3.0.0",
-    "@smithy/util-middleware": "^3.0.11",
-    "@smithy/util-stream": "^3.3.2",
-    "@smithy/util-utf8": "^3.0.0",
+    "@aws-sdk/core": "3.723.0",
+    "@aws-sdk/types": "3.723.0",
+    "@aws-sdk/util-arn-parser": "3.723.0",
+    "@smithy/core": "^3.0.0",
+    "@smithy/node-config-provider": "^4.0.0",
+    "@smithy/protocol-http": "^5.0.0",
+    "@smithy/signature-v4": "^5.0.0",
+    "@smithy/smithy-client": "^4.0.0",
+    "@smithy/types": "^4.0.0",
+    "@smithy/util-config-provider": "^4.0.0",
+    "@smithy/util-middleware": "^4.0.0",
+    "@smithy/util-stream": "^4.0.0",
+    "@smithy/util-utf8": "^4.0.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
@@ -47,10 +47,10 @@
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
     "rimraf": "3.0.2",
-    "typescript": "~4.9.5"
+    "typescript": "~5.2.2"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "typesVersions": {
     "<4.0": {