@aws-sdk/middleware-websocket 3.972.2 → 3.972.4

package/dist-cjs/index.js

@@ -64,19 +64,21 @@ class EventStreamPayloadHandler {
         }
         const placeHolderStream = new TransformStream();
         request.body = placeHolderStream.readable;
+        const match = (headers?.authorization ?? "").match(/Signature=(\w+)$/);
+        const priorSignature = (match ?? [])[1] ?? (query && query["X-Amz-Signature"]) ?? "";
+        const signingStream = getEventSigningTransformStream(priorSignature, await this.messageSigner(), this.eventStreamCodec, this.systemClockOffsetProvider);
+        payload.pipeThrough(signingStream).pipeThrough(placeHolderStream);
         let result;
         try {
             result = await next(args);
         }
         catch (e) {
-            request.body.cancel();
+            const p = payload.cancel?.();
+            if (p instanceof Promise) {
+                p.catch(() => { });
+            }
             throw e;
         }
-        const match = (headers["authorization"] || "").match(/Signature=([\w]+)$/);
-        const priorSignature = (match || [])[1] || (query && query["X-Amz-Signature"]) || "";
-        const signingStream = getEventSigningTransformStream(priorSignature, await this.messageSigner(), this.eventStreamCodec, this.systemClockOffsetProvider);
-        const signedPayload = payload.pipeThrough(signingStream);
-        signedPayload.pipeThrough(placeHolderStream);
         return result;
     }
 }
@@ -310,8 +312,13 @@ class WebSocketFetchHandler {
         };
         const send = async () => {
             try {
-                for await (const inputChunk of data) {
-                    socket.send(inputChunk);
+                for await (const chunk of data) {
+                    if (socket.readyState >= WebSocket.CLOSING) {
+                        break;
+                    }
+                    else {
+                        socket.send(chunk);
+                    }
                 }
             }
             catch (err) {

package/dist-es/EventStreamPayloadHandler.js

@@ -17,19 +17,21 @@ export class EventStreamPayloadHandler {
         }
         const placeHolderStream = new TransformStream();
         request.body = placeHolderStream.readable;
+        const match = (headers?.authorization ?? "").match(/Signature=(\w+)$/);
+        const priorSignature = (match ?? [])[1] ?? (query && query["X-Amz-Signature"]) ?? "";
+        const signingStream = getEventSigningTransformStream(priorSignature, await this.messageSigner(), this.eventStreamCodec, this.systemClockOffsetProvider);
+        payload.pipeThrough(signingStream).pipeThrough(placeHolderStream);
         let result;
         try {
             result = await next(args);
         }
         catch (e) {
-            request.body.cancel();
+            const p = payload.cancel?.();
+            if (p instanceof Promise) {
+                p.catch(() => { });
+            }
             throw e;
         }
-        const match = (headers["authorization"] || "").match(/Signature=([\w]+)$/);
-        const priorSignature = (match || [])[1] || (query && query["X-Amz-Signature"]) || "";
-        const signingStream = getEventSigningTransformStream(priorSignature, await this.messageSigner(), this.eventStreamCodec, this.systemClockOffsetProvider);
-        const signedPayload = payload.pipeThrough(signingStream);
-        signedPayload.pipeThrough(placeHolderStream);
         return result;
     }
 }

package/dist-es/websocket-fetch-handler.js

@@ -132,8 +132,13 @@ export class WebSocketFetchHandler {
         };
         const send = async () => {
             try {
-                for await (const inputChunk of data) {
-                    socket.send(inputChunk);
+                for await (const chunk of data) {
+                    if (socket.readyState >= WebSocket.CLOSING) {
+                        break;
+                    }
+                    else {
+                        socket.send(chunk);
+                    }
                 }
             }
             catch (err) {

package/dist-types/EventStreamPayloadHandler.d.ts

@@ -1,4 +1,7 @@
 import { Decoder, Encoder, EventStreamPayloadHandler as IEventStreamPayloadHandler, FinalizeHandler, FinalizeHandlerArguments, FinalizeHandlerOutput, HandlerExecutionContext, MessageSigner, MetadataBearer, Provider } from "@smithy/types";
+/**
+ * @internal
+ */
 export interface EventStreamPayloadHandlerOptions {
     messageSigner: Provider<MessageSigner>;
     utf8Encoder: Encoder;
@@ -11,6 +14,8 @@ export interface EventStreamPayloadHandlerOptions {
  * 2. Close the stream if initial request fails.
  * 3. Start piping payload when connection is established.
  * 4. Sign the payload after payload stream starting to flow.
+ *
+ * @internal
  */
 export declare class EventStreamPayloadHandler implements IEventStreamPayloadHandler {
     private readonly messageSigner;

package/dist-types/eventstream-payload-handler-provider.d.ts

@@ -1,3 +1,5 @@
 import { EventStreamPayloadHandlerProvider } from "@smithy/types";
-/** NodeJS event stream utils provider */
+/**
+ * @internal
+ */
 export declare const eventStreamPayloadHandlerProvider: EventStreamPayloadHandlerProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-websocket",
-  "version": "3.972.2",
+  "version": "3.972.4",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
   "types": "./dist-types/index.d.ts",
@@ -25,7 +25,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@aws-sdk/types": "^3.973.1",
-    "@aws-sdk/util-format-url": "^3.972.2",
+    "@aws-sdk/util-format-url": "^3.972.3",
     "@smithy/eventstream-codec": "^4.2.8",
     "@smithy/eventstream-serde-browser": "^4.2.8",
     "@smithy/fetch-http-handler": "^5.3.9",
@@ -42,8 +42,7 @@
     "mock-socket": "9.1.5",
     "premove": "4.0.0",
     "typescript": "~5.8.3",
-    "vitest-websocket-mock": "0.2.3",
-    "web-streams-polyfill": "3.2.1"
+    "vitest-websocket-mock": "0.2.3"
   },
   "engines": {
     "node": ">= 14.0.0"