@aws-sdk/middleware-flexible-checksums 3.398.0 → 3.400.0

package/dist-cjs/flexibleChecksumsMiddleware.js

@@ -8,7 +8,6 @@ const hasHeader_1 = require("./hasHeader");
 const isStreaming_1 = require("./isStreaming");
 const selectChecksumAlgorithmFunction_1 = require("./selectChecksumAlgorithmFunction");
 const stringHasher_1 = require("./stringHasher");
-const validateChecksumFromResponse_1 = require("./validateChecksumFromResponse");
 const flexibleChecksumsMiddleware = (config, middlewareConfig) => (next) => async (args) => {
     if (!protocol_http_1.HttpRequest.isInstance(args.request)) {
         return next(args);
@@ -63,13 +62,6 @@ const flexibleChecksumsMiddleware = (config, middlewareConfig) => (next) => asyn
             body: updatedBody,
         },
     });
-    const { requestValidationModeMember, responseAlgorithms } = middlewareConfig;
-    if (requestValidationModeMember && input[requestValidationModeMember] === "ENABLED") {
-        await (0, validateChecksumFromResponse_1.validateChecksumFromResponse)(result.response, {
-            config,
-            responseAlgorithms,
-        });
-    }
     return result;
 };
 exports.flexibleChecksumsMiddleware = flexibleChecksumsMiddleware;

package/dist-cjs/flexibleChecksumsResponseMiddleware.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.flexibleChecksumsResponseMiddleware = exports.flexibleChecksumsResponseMiddlewareOptions = void 0;
+const protocol_http_1 = require("@smithy/protocol-http");
+const isStreaming_1 = require("./isStreaming");
+const create_read_stream_on_buffer_1 = require("./streams/create-read-stream-on-buffer");
+const validateChecksumFromResponse_1 = require("./validateChecksumFromResponse");
+exports.flexibleChecksumsResponseMiddlewareOptions = {
+    name: "flexibleChecksumsResponseMiddleware",
+    toMiddleware: "deserializerMiddleware",
+    relation: "after",
+    tags: ["BODY_CHECKSUM"],
+    override: true,
+};
+const flexibleChecksumsResponseMiddleware = (config, middlewareConfig) => (next) => async (args) => {
+    if (!protocol_http_1.HttpRequest.isInstance(args.request)) {
+        return next(args);
+    }
+    const input = args.input;
+    const result = await next(args);
+    const response = result.response;
+    let collectedStream = undefined;
+    const { requestValidationModeMember, responseAlgorithms } = middlewareConfig;
+    if (requestValidationModeMember && input[requestValidationModeMember] === "ENABLED") {
+        const isStreamingBody = (0, isStreaming_1.isStreaming)(response.body);
+        if (isStreamingBody) {
+            collectedStream = await config.streamCollector(response.body);
+            response.body = (0, create_read_stream_on_buffer_1.createReadStreamOnBuffer)(collectedStream);
+        }
+        await (0, validateChecksumFromResponse_1.validateChecksumFromResponse)(result.response, {
+            config,
+            responseAlgorithms,
+        });
+        if (isStreamingBody && collectedStream) {
+            response.body = (0, create_read_stream_on_buffer_1.createReadStreamOnBuffer)(collectedStream);
+        }
+    }
+    return result;
+};
+exports.flexibleChecksumsResponseMiddleware = flexibleChecksumsResponseMiddleware;

package/dist-cjs/getFlexibleChecksumsPlugin.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFlexibleChecksumsPlugin = exports.flexibleChecksumsMiddlewareOptions = void 0;
 const flexibleChecksumsMiddleware_1 = require("./flexibleChecksumsMiddleware");
+const flexibleChecksumsResponseMiddleware_1 = require("./flexibleChecksumsResponseMiddleware");
 exports.flexibleChecksumsMiddlewareOptions = {
     name: "flexibleChecksumsMiddleware",
     step: "build",
@@ -11,6 +12,7 @@ exports.flexibleChecksumsMiddlewareOptions = {
 const getFlexibleChecksumsPlugin = (config, middlewareConfig) => ({
     applyToStack: (clientStack) => {
         clientStack.add((0, flexibleChecksumsMiddleware_1.flexibleChecksumsMiddleware)(config, middlewareConfig), exports.flexibleChecksumsMiddlewareOptions);
+        clientStack.addRelativeTo((0, flexibleChecksumsResponseMiddleware_1.flexibleChecksumsResponseMiddleware)(config, middlewareConfig), flexibleChecksumsResponseMiddleware_1.flexibleChecksumsResponseMiddlewareOptions);
     },
 });
 exports.getFlexibleChecksumsPlugin = getFlexibleChecksumsPlugin;

package/dist-cjs/streams/create-read-stream-on-buffer.browser.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createReadStreamOnBuffer = void 0;
+function createReadStreamOnBuffer(buffer) {
+    return new Blob([buffer]).stream();
+}
+exports.createReadStreamOnBuffer = createReadStreamOnBuffer;

package/dist-cjs/streams/create-read-stream-on-buffer.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createReadStreamOnBuffer = void 0;
+const stream_1 = require("stream");
+function createReadStreamOnBuffer(buffer) {
+    const stream = new stream_1.Transform();
+    stream.push(buffer);
+    stream.push(null);
+    return stream;
+}
+exports.createReadStreamOnBuffer = createReadStreamOnBuffer;

package/dist-es/flexibleChecksumsMiddleware.js

@@ -5,7 +5,6 @@ import { hasHeader } from "./hasHeader";
 import { isStreaming } from "./isStreaming";
 import { selectChecksumAlgorithmFunction } from "./selectChecksumAlgorithmFunction";
 import { stringHasher } from "./stringHasher";
-import { validateChecksumFromResponse } from "./validateChecksumFromResponse";
 export const flexibleChecksumsMiddleware = (config, middlewareConfig) => (next) => async (args) => {
     if (!HttpRequest.isInstance(args.request)) {
         return next(args);
@@ -60,12 +59,5 @@ export const flexibleChecksumsMiddleware = (config, middlewareConfig) => (next)
             body: updatedBody,
         },
     });
-    const { requestValidationModeMember, responseAlgorithms } = middlewareConfig;
-    if (requestValidationModeMember && input[requestValidationModeMember] === "ENABLED") {
-        await validateChecksumFromResponse(result.response, {
-            config,
-            responseAlgorithms,
-        });
-    }
     return result;
 };

package/dist-es/flexibleChecksumsResponseMiddleware.js

@@ -0,0 +1,36 @@
+import { HttpRequest } from "@smithy/protocol-http";
+import { isStreaming } from "./isStreaming";
+import { createReadStreamOnBuffer } from "./streams/create-read-stream-on-buffer";
+import { validateChecksumFromResponse } from "./validateChecksumFromResponse";
+export const flexibleChecksumsResponseMiddlewareOptions = {
+    name: "flexibleChecksumsResponseMiddleware",
+    toMiddleware: "deserializerMiddleware",
+    relation: "after",
+    tags: ["BODY_CHECKSUM"],
+    override: true,
+};
+export const flexibleChecksumsResponseMiddleware = (config, middlewareConfig) => (next) => async (args) => {
+    if (!HttpRequest.isInstance(args.request)) {
+        return next(args);
+    }
+    const input = args.input;
+    const result = await next(args);
+    const response = result.response;
+    let collectedStream = undefined;
+    const { requestValidationModeMember, responseAlgorithms } = middlewareConfig;
+    if (requestValidationModeMember && input[requestValidationModeMember] === "ENABLED") {
+        const isStreamingBody = isStreaming(response.body);
+        if (isStreamingBody) {
+            collectedStream = await config.streamCollector(response.body);
+            response.body = createReadStreamOnBuffer(collectedStream);
+        }
+        await validateChecksumFromResponse(result.response, {
+            config,
+            responseAlgorithms,
+        });
+        if (isStreamingBody && collectedStream) {
+            response.body = createReadStreamOnBuffer(collectedStream);
+        }
+    }
+    return result;
+};

package/dist-es/getFlexibleChecksumsPlugin.js

@@ -1,4 +1,5 @@
 import { flexibleChecksumsMiddleware } from "./flexibleChecksumsMiddleware";
+import { flexibleChecksumsResponseMiddleware, flexibleChecksumsResponseMiddlewareOptions, } from "./flexibleChecksumsResponseMiddleware";
 export const flexibleChecksumsMiddlewareOptions = {
     name: "flexibleChecksumsMiddleware",
     step: "build",
@@ -8,5 +9,6 @@ export const flexibleChecksumsMiddlewareOptions = {
 export const getFlexibleChecksumsPlugin = (config, middlewareConfig) => ({
     applyToStack: (clientStack) => {
         clientStack.add(flexibleChecksumsMiddleware(config, middlewareConfig), flexibleChecksumsMiddlewareOptions);
+        clientStack.addRelativeTo(flexibleChecksumsResponseMiddleware(config, middlewareConfig), flexibleChecksumsResponseMiddlewareOptions);
     },
 });

package/dist-es/streams/create-read-stream-on-buffer.browser.js

@@ -0,0 +1,3 @@
+export function createReadStreamOnBuffer(buffer) {
+    return new Blob([buffer]).stream();
+}

package/dist-es/streams/create-read-stream-on-buffer.js

@@ -0,0 +1,7 @@
+import { Transform } from "stream";
+export function createReadStreamOnBuffer(buffer) {
+    const stream = new Transform();
+    stream.push(buffer);
+    stream.push(null);
+    return stream;
+}

package/dist-types/configuration.d.ts

@@ -1,4 +1,4 @@
-import { BodyLengthCalculator, ChecksumConstructor, Encoder, GetAwsChunkedEncodingStream, HashConstructor, StreamHasher } from "@smithy/types";
+import { BodyLengthCalculator, ChecksumConstructor, Encoder, GetAwsChunkedEncodingStream, HashConstructor, StreamCollector, StreamHasher } from "@smithy/types";
 export interface PreviouslyResolved {
     /**
      * The function that will be used to convert binary data to a base64-encoded string.
@@ -33,4 +33,8 @@ export interface PreviouslyResolved {
      * @internal
      */
     streamHasher: StreamHasher<any>;
+    /**
+     * Collects streams into buffers.
+     */
+    streamCollector: StreamCollector;
 }

package/dist-types/flexibleChecksumsMiddleware.d.ts

@@ -1,4 +1,7 @@
 import { BuildMiddleware } from "@smithy/types";
 import { PreviouslyResolved } from "./configuration";
 import { FlexibleChecksumsMiddlewareConfig } from "./getFlexibleChecksumsPlugin";
+/**
+ * @internal
+ */
 export declare const flexibleChecksumsMiddleware: (config: PreviouslyResolved, middlewareConfig: FlexibleChecksumsMiddlewareConfig) => BuildMiddleware<any, any>;

package/dist-types/flexibleChecksumsResponseMiddleware.d.ts

@@ -0,0 +1,13 @@
+import { DeserializeMiddleware, RelativeMiddlewareOptions } from "@smithy/types";
+import { PreviouslyResolved } from "./configuration";
+import { FlexibleChecksumsMiddlewareConfig } from "./getFlexibleChecksumsPlugin";
+/**
+ * @internal
+ */
+export declare const flexibleChecksumsResponseMiddlewareOptions: RelativeMiddlewareOptions;
+/**
+ * @internal
+ *
+ * The validation counterpart to the flexibleChecksumsMiddleware.
+ */
+export declare const flexibleChecksumsResponseMiddleware: (config: PreviouslyResolved, middlewareConfig: FlexibleChecksumsMiddlewareConfig) => DeserializeMiddleware<any, any>;

package/dist-types/streams/create-read-stream-on-buffer.browser.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Convert a buffer to a readable stream.
+ */
+export declare function createReadStreamOnBuffer(buffer: Uint8Array): ReadableStream;

package/dist-types/streams/create-read-stream-on-buffer.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="node" />
+import { Readable } from "stream";
+/**
+ * Convert a buffer to a readable stream.
+ */
+export declare function createReadStreamOnBuffer(buffer: Uint8Array): Readable;

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

@@ -4,6 +4,7 @@ import {
   Encoder,
   GetAwsChunkedEncodingStream,
   HashConstructor,
+  StreamCollector,
   StreamHasher,
 } from "@smithy/types";
 export interface PreviouslyResolved {
@@ -14,4 +15,5 @@ export interface PreviouslyResolved {
   sha1: ChecksumConstructor | HashConstructor;
   sha256: ChecksumConstructor | HashConstructor;
   streamHasher: StreamHasher<any>;
+  streamCollector: StreamCollector;
 }

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

@@ -0,0 +1,11 @@
+import {
+  DeserializeMiddleware,
+  RelativeMiddlewareOptions,
+} from "@smithy/types";
+import { PreviouslyResolved } from "./configuration";
+import { FlexibleChecksumsMiddlewareConfig } from "./getFlexibleChecksumsPlugin";
+export declare const flexibleChecksumsResponseMiddlewareOptions: RelativeMiddlewareOptions;
+export declare const flexibleChecksumsResponseMiddleware: (
+  config: PreviouslyResolved,
+  middlewareConfig: FlexibleChecksumsMiddlewareConfig
+) => DeserializeMiddleware<any, any>;

package/dist-types/ts3.4/streams/create-read-stream-on-buffer.browser.d.ts

@@ -0,0 +1,3 @@
+export declare function createReadStreamOnBuffer(
+  buffer: Uint8Array
+): ReadableStream;

package/dist-types/ts3.4/streams/create-read-stream-on-buffer.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-flexible-checksums",
-  "version": "3.398.0",
+  "version": "3.400.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "tsc -p tsconfig.cjs.json",
@@ -14,6 +14,9 @@
   },
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
+  "browser": {
+    "./dist-es/streams/create-read-stream-on-buffer": "./dist-es/streams/create-read-stream-on-buffer.browser"
+  },
   "types": "./dist-types/index.d.ts",
   "author": {
     "name": "AWS SDK for JavaScript Team",
@@ -31,6 +34,7 @@
     "tslib": "^2.5.0"
   },
   "devDependencies": {
+    "@smithy/node-http-handler": "^2.0.5",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
     "rimraf": "3.0.2",