@aws-sdk/middleware-sdk-s3 3.614.0 → 3.617.0

package/dist-cjs/index.js

@@ -441,25 +441,46 @@ var resolveS3Config = /* @__PURE__ */ __name((input, {
 
 // src/throw-200-exceptions.ts
 
-var throw200ExceptionsMiddleware = /* @__PURE__ */ __name((config) => (next) => async (args) => {
+var import_util_stream = require("@smithy/util-stream");
+var THROW_IF_EMPTY_BODY = {
+  CopyObjectCommand: true,
+  UploadPartCopyCommand: true,
+  CompleteMultipartUploadCommand: true
+};
+var MAX_BYTES_TO_INSPECT = 3e3;
+var throw200ExceptionsMiddleware = /* @__PURE__ */ __name((config) => (next, context) => async (args) => {
   const result = await next(args);
   const { response } = result;
-  if (!import_protocol_http.HttpResponse.isInstance(response))
+  if (!import_protocol_http.HttpResponse.isInstance(response)) {
     return result;
-  const { statusCode, body } = response;
-  if (statusCode < 200 || statusCode >= 300)
+  }
+  const { statusCode, body: sourceBody } = response;
+  if (statusCode < 200 || statusCode >= 300) {
     return result;
-  const bodyBytes = await collectBody(body, config);
-  const bodyString = await collectBodyString(bodyBytes, config);
-  if (bodyBytes.length === 0) {
+  }
+  let bodyCopy = sourceBody;
+  let body = sourceBody;
+  if (sourceBody && typeof sourceBody === "object" && !(sourceBody instanceof Uint8Array)) {
+    [bodyCopy, body] = await (0, import_util_stream.splitStream)(sourceBody);
+  }
+  response.body = body;
+  const bodyBytes = await collectBody(bodyCopy, {
+    streamCollector: async (stream) => {
+      return (0, import_util_stream.headStream)(stream, MAX_BYTES_TO_INSPECT);
+    }
+  });
+  if (typeof (bodyCopy == null ? void 0 : bodyCopy.destroy) === "function") {
+    bodyCopy.destroy();
+  }
+  const bodyStringTail = config.utf8Encoder(bodyBytes.subarray(bodyBytes.length - 16));
+  if (bodyBytes.length === 0 && THROW_IF_EMPTY_BODY[context.commandName]) {
     const err = new Error("S3 aborted request");
     err.name = "InternalError";
     throw err;
   }
-  if (bodyString && bodyString.match("<Error>")) {
+  if (bodyStringTail && bodyStringTail.endsWith("</Error>")) {
     response.statusCode = 400;
   }
-  response.body = bodyBytes;
   return result;
 }, "throw200ExceptionsMiddleware");
 var collectBody = /* @__PURE__ */ __name((streamBody = new Uint8Array(), context) => {
@@ -468,7 +489,6 @@ var collectBody = /* @__PURE__ */ __name((streamBody = new Uint8Array(), context
   }
   return context.streamCollector(streamBody) || Promise.resolve(new Uint8Array());
 }, "collectBody");
-var collectBodyString = /* @__PURE__ */ __name((streamBody, context) => collectBody(streamBody, context).then((body) => context.utf8Encoder(body)), "collectBodyString");
 var throw200ExceptionsMiddlewareOptions = {
   relation: "after",
   toMiddleware: "deserializerMiddleware",

package/dist-es/throw-200-exceptions.js

@@ -1,23 +1,44 @@
 import { HttpResponse } from "@smithy/protocol-http";
-export const throw200ExceptionsMiddleware = (config) => (next) => async (args) => {
+import { headStream, splitStream } from "@smithy/util-stream";
+const THROW_IF_EMPTY_BODY = {
+    CopyObjectCommand: true,
+    UploadPartCopyCommand: true,
+    CompleteMultipartUploadCommand: true,
+};
+const MAX_BYTES_TO_INSPECT = 3000;
+export const throw200ExceptionsMiddleware = (config) => (next, context) => async (args) => {
     const result = await next(args);
     const { response } = result;
-    if (!HttpResponse.isInstance(response))
+    if (!HttpResponse.isInstance(response)) {
         return result;
-    const { statusCode, body } = response;
-    if (statusCode < 200 || statusCode >= 300)
+    }
+    const { statusCode, body: sourceBody } = response;
+    if (statusCode < 200 || statusCode >= 300) {
         return result;
-    const bodyBytes = await collectBody(body, config);
-    const bodyString = await collectBodyString(bodyBytes, config);
-    if (bodyBytes.length === 0) {
+    }
+    let bodyCopy = sourceBody;
+    let body = sourceBody;
+    if (sourceBody && typeof sourceBody === "object" && !(sourceBody instanceof Uint8Array)) {
+        [bodyCopy, body] = await splitStream(sourceBody);
+    }
+    response.body = body;
+    const bodyBytes = await collectBody(bodyCopy, {
+        streamCollector: async (stream) => {
+            return headStream(stream, MAX_BYTES_TO_INSPECT);
+        },
+    });
+    if (typeof bodyCopy?.destroy === "function") {
+        bodyCopy.destroy();
+    }
+    const bodyStringTail = config.utf8Encoder(bodyBytes.subarray(bodyBytes.length - 16));
+    if (bodyBytes.length === 0 && THROW_IF_EMPTY_BODY[context.commandName]) {
         const err = new Error("S3 aborted request");
         err.name = "InternalError";
         throw err;
     }
-    if (bodyString && bodyString.match("<Error>")) {
+    if (bodyStringTail && bodyStringTail.endsWith("</Error>")) {
         response.statusCode = 400;
     }
-    response.body = bodyBytes;
     return result;
 };
 const collectBody = (streamBody = new Uint8Array(), context) => {
@@ -26,7 +47,6 @@ const collectBody = (streamBody = new Uint8Array(), context) => {
     }
     return context.streamCollector(streamBody) || Promise.resolve(new Uint8Array());
 };
-const collectBodyString = (streamBody, context) => collectBody(streamBody, context).then((body) => context.utf8Encoder(body));
 export const throw200ExceptionsMiddlewareOptions = {
     relation: "after",
     toMiddleware: "deserializerMiddleware",

package/dist-types/throw-200-exceptions.d.ts

@@ -1,6 +1,5 @@
-import { DeserializeMiddleware, Encoder, Pluggable, RelativeMiddlewareOptions, StreamCollector } from "@smithy/types";
+import { DeserializeMiddleware, Encoder, Pluggable, RelativeMiddlewareOptions } from "@smithy/types";
 type PreviouslyResolved = {
-    streamCollector: StreamCollector;
     utf8Encoder: Encoder;
 };
 /**

package/dist-types/ts3.4/throw-200-exceptions.d.ts

@@ -3,10 +3,8 @@ import {
   Encoder,
   Pluggable,
   RelativeMiddlewareOptions,
-  StreamCollector,
 } from "@smithy/types";
 type PreviouslyResolved = {
-  streamCollector: StreamCollector;
   utf8Encoder: Encoder;
 };
 export declare const throw200ExceptionsMiddleware: (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-sdk-s3",
-  "version": "3.614.0",
+  "version": "3.617.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline middleware-sdk-s3",
@@ -26,11 +26,13 @@
     "@aws-sdk/types": "3.609.0",
     "@aws-sdk/util-arn-parser": "3.568.0",
     "@smithy/node-config-provider": "^3.1.4",
-    "@smithy/protocol-http": "^4.0.3",
-    "@smithy/signature-v4": "^3.1.2",
-    "@smithy/smithy-client": "^3.1.7",
+    "@smithy/protocol-http": "^4.0.4",
+    "@smithy/signature-v4": "^4.0.0",
+    "@smithy/smithy-client": "^3.1.8",
     "@smithy/types": "^3.3.0",
     "@smithy/util-config-provider": "^3.0.0",
+    "@smithy/util-stream": "^3.1.0",
+    "@smithy/util-utf8": "^3.0.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {