@aws-sdk/middleware-sdk-s3 3.972.32 → 3.972.34

package/dist-cjs/index.js

@@ -2,7 +2,7 @@
 
 var protocolHttp = require('@smithy/protocol-http');
 var smithyClient = require('@smithy/smithy-client');
-var utilStream = require('@smithy/util-stream');
+var toStream = require('./toStream');
 var utilArnParser = require('@aws-sdk/util-arn-parser');
 var protocols = require('@aws-sdk/core/protocols');
 var schema = require('@smithy/core/schema');
@@ -419,45 +419,29 @@ const THROW_IF_EMPTY_BODY = {
     UploadPartCopyCommand: true,
     CompleteMultipartUploadCommand: true,
 };
-const MAX_BYTES_TO_INSPECT = 3000;
 const throw200ExceptionsMiddleware = (config) => (next, context) => async (args) => {
     const result = await next(args);
     const { response } = result;
     if (!protocolHttp.HttpResponse.isInstance(response)) {
         return result;
     }
-    const { statusCode, body: sourceBody } = response;
+    const { statusCode, body } = response;
     if (statusCode < 200 || statusCode >= 300) {
         return result;
     }
-    const isSplittableStream = typeof sourceBody?.stream === "function" ||
-        typeof sourceBody?.pipe === "function" ||
-        typeof sourceBody?.tee === "function";
-    if (!isSplittableStream) {
-        return result;
-    }
-    let bodyCopy = sourceBody;
-    let body = sourceBody;
-    if (sourceBody && typeof sourceBody === "object" && !(sourceBody instanceof Uint8Array)) {
-        [bodyCopy, body] = await utilStream.splitStream(sourceBody);
-    }
-    response.body = body;
-    const bodyBytes = await collectBody(bodyCopy, {
-        streamCollector: async (stream) => {
-            return utilStream.headStream(stream, MAX_BYTES_TO_INSPECT);
-        },
-    });
-    if (typeof bodyCopy?.destroy === "function") {
-        bodyCopy.destroy();
-    }
-    const bodyStringTail = config.utf8Encoder(bodyBytes.subarray(bodyBytes.length - 16));
+    const bodyBytes = await collectBody(body, config);
+    response.body = toStream.toStream(bodyBytes);
     if (bodyBytes.length === 0 && THROW_IF_EMPTY_BODY[context.commandName]) {
         const err = new Error("S3 aborted request");
+        err.$metadata = {
+            httpStatusCode: 503,
+        };
         err.name = "InternalError";
         throw err;
     }
+    const bodyStringTail = config.utf8Encoder(bodyBytes.subarray(bodyBytes.length - 16));
     if (bodyStringTail && bodyStringTail.endsWith("</Error>")) {
-        response.statusCode = 400;
+        response.statusCode = 503;
     }
     return result;
 };

package/dist-cjs/toStream.browser.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toStream = toStream;
+function toStream(bytes) {
+    return new ReadableStream({
+        start(controller) {
+            controller.enqueue(bytes);
+            controller.close();
+        },
+    });
+}

package/dist-cjs/toStream.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toStream = toStream;
+const node_stream_1 = require("node:stream");
+function toStream(bytes) {
+    return node_stream_1.Readable.from(Buffer.from(bytes));
+}

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

@@ -1,49 +1,33 @@
 import { HttpResponse } from "@smithy/protocol-http";
-import { headStream, splitStream } from "@smithy/util-stream";
+import { toStream } from "./toStream";
 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)) {
         return result;
     }
-    const { statusCode, body: sourceBody } = response;
+    const { statusCode, body } = response;
     if (statusCode < 200 || statusCode >= 300) {
         return result;
     }
-    const isSplittableStream = typeof sourceBody?.stream === "function" ||
-        typeof sourceBody?.pipe === "function" ||
-        typeof sourceBody?.tee === "function";
-    if (!isSplittableStream) {
-        return result;
-    }
-    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));
+    const bodyBytes = await collectBody(body, config);
+    response.body = toStream(bodyBytes);
     if (bodyBytes.length === 0 && THROW_IF_EMPTY_BODY[context.commandName]) {
         const err = new Error("S3 aborted request");
+        err.$metadata = {
+            httpStatusCode: 503,
+        };
         err.name = "InternalError";
         throw err;
     }
+    const bodyStringTail = config.utf8Encoder(bodyBytes.subarray(bodyBytes.length - 16));
     if (bodyStringTail && bodyStringTail.endsWith("</Error>")) {
-        response.statusCode = 400;
+        response.statusCode = 503;
     }
     return result;
 };

package/dist-es/toStream.browser.js

@@ -0,0 +1,8 @@
+export function toStream(bytes) {
+    return new ReadableStream({
+        start(controller) {
+            controller.enqueue(bytes);
+            controller.close();
+        },
+    });
+}

package/dist-es/toStream.js

@@ -0,0 +1,4 @@
+import { Readable } from "node:stream";
+export function toStream(bytes) {
+    return Readable.from(Buffer.from(bytes));
+}

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

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

package/dist-types/toStream.browser.d.ts

@@ -0,0 +1,4 @@
+/**
+ * @internal
+ */
+export declare function toStream(bytes: Uint8Array): ReadableStream;

package/dist-types/toStream.d.ts

@@ -0,0 +1,5 @@
+import { Readable } from "node:stream";
+/**
+ * @internal
+ */
+export declare function toStream(bytes: Uint8Array): Readable;

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

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

package/dist-types/ts3.4/toStream.browser.d.ts

@@ -0,0 +1 @@
+export declare function toStream(bytes: Uint8Array): ReadableStream;

package/dist-types/ts3.4/toStream.d.ts

@@ -0,0 +1,2 @@
+import { Readable } from "node:stream";
+export declare function toStream(bytes: Uint8Array): Readable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-sdk-s3",
-  "version": "3.972.32",
+  "version": "3.972.34",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline middleware-sdk-s3",
@@ -9,13 +9,13 @@
     "build:types": "tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
-    "test": "yarn g:vitest run",
     "test:types": "tsc -p tsconfig.test.json",
-    "test:integration": "yarn g:vitest run -c vitest.config.integ.mts && yarn test:types",
-    "test:e2e": "yarn g:vitest run -c vitest.config.e2e.mts --mode development",
     "extract:docs": "api-extractor run --local",
+    "test": "yarn g:vitest run",
     "test:watch": "yarn g:vitest watch",
+    "test:integration": "yarn g:vitest run -c vitest.config.integ.mts && yarn test:types",
     "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts",
+    "test:e2e": "yarn g:vitest run -c vitest.config.e2e.mts --mode development",
     "test:e2e:watch": "yarn g:vitest watch -c vitest.config.e2e.mts"
   },
   "main": "./dist-cjs/index.js",
@@ -28,18 +28,18 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/core": "^3.974.3",
+    "@aws-sdk/core": "^3.974.5",
     "@aws-sdk/types": "^3.973.8",
     "@aws-sdk/util-arn-parser": "^3.972.3",
-    "@smithy/core": "^3.23.16",
+    "@smithy/core": "^3.23.17",
     "@smithy/node-config-provider": "^4.3.14",
     "@smithy/protocol-http": "^5.3.14",
     "@smithy/signature-v4": "^5.3.14",
-    "@smithy/smithy-client": "^4.12.12",
+    "@smithy/smithy-client": "^4.12.13",
     "@smithy/types": "^4.14.1",
     "@smithy/util-config-provider": "^4.2.2",
     "@smithy/util-middleware": "^4.2.14",
-    "@smithy/util-stream": "^4.5.24",
+    "@smithy/util-stream": "^4.5.25",
     "@smithy/util-utf8": "^4.2.2",
     "tslib": "^2.6.2"
   },
@@ -63,6 +63,13 @@
   "files": [
     "dist-*/**"
   ],
+  "browser": {
+    "./dist-es/toStream": "./dist-es/toStream.browser"
+  },
+  "react-native": {
+    "./dist-es/toStream": "./dist-es/toStream.browser",
+    "./dist-cjs/toStream": "./dist-cjs/toStream.browser"
+  },
   "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages-internal/middleware-sdk-s3",
   "repository": {
     "type": "git",