@aws-sdk/middleware-websocket 3.348.0 → 3.353.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist-cjs/websocket-fetch-handler.js +33 -28
  2. package/dist-es/websocket-fetch-handler.js +32 -28
  3. package/package.json +3 -3
package/dist-cjs/websocket-fetch-handler.js CHANGED
@@ -54,7 +54,8 @@ class WebSocketFetchHandler {
54
54
  };
55
55
  }
56
56
  removeNotUsableSockets(url) {
57
- this.sockets[url] = this.sockets[url].filter((socket) => ![WebSocket.CLOSING, WebSocket.CLOSED].includes(socket.readyState));
57
+ var _a;
58
+ this.sockets[url] = ((_a = this.sockets[url]) !== null && _a !== void 0 ? _a : []).filter((socket) => ![WebSocket.CLOSING, WebSocket.CLOSED].includes(socket.readyState));
58
59
  }
59
60
  waitForReady(socket, connectionTimeout) {
60
61
  return new Promise((resolve, reject) => {
@@ -74,36 +75,40 @@ class WebSocketFetchHandler {
74
75
  }
75
76
  connect(socket, data) {
76
77
  let streamError = undefined;
78
+ let socketErrorOccurred = false;
79
+ let reject = () => { };
80
+ let resolve = () => { };
81
+ socket.onmessage = (event) => {
82
+ resolve({
83
+ done: false,
84
+ value: new Uint8Array(event.data),
85
+ });
86
+ };
87
+ socket.onerror = (error) => {
88
+ socketErrorOccurred = true;
89
+ socket.close();
90
+ reject(error);
91
+ };
92
+ socket.onclose = () => {
93
+ this.removeNotUsableSockets(socket.url);
94
+ if (socketErrorOccurred)
95
+ return;
96
+ if (streamError) {
97
+ reject(streamError);
98
+ }
99
+ else {
100
+ resolve({
101
+ done: true,
102
+ value: undefined,
103
+ });
104
+ }
105
+ };
77
106
  const outputStream = {
78
107
  [Symbol.asyncIterator]: () => ({
79
108
  next: () => {
80
- return new Promise((resolve, reject) => {
81
- let socketErrorOccurred = false;
82
- socket.onerror = (error) => {
83
- socketErrorOccurred = true;
84
- socket.close();
85
- reject(error);
86
- };
87
- socket.onclose = () => {
88
- this.removeNotUsableSockets(socket.url);
89
- if (socketErrorOccurred)
90
- return;
91
- if (streamError) {
92
- reject(streamError);
93
- }
94
- else {
95
- resolve({
96
- done: true,
97
- value: undefined,
98
- });
99
- }
100
- };
101
- socket.onmessage = (event) => {
102
- resolve({
103
- done: false,
104
- value: new Uint8Array(event.data),
105
- });
106
- };
109
+ return new Promise((_resolve, _reject) => {
110
+ resolve = _resolve;
111
+ reject = _reject;
107
112
  });
108
113
  },
109
114
  }),
package/dist-es/websocket-fetch-handler.js CHANGED
@@ -51,7 +51,7 @@ export class WebSocketFetchHandler {
51
51
  };
52
52
  }
53
53
  removeNotUsableSockets(url) {
54
- this.sockets[url] = this.sockets[url].filter((socket) => ![WebSocket.CLOSING, WebSocket.CLOSED].includes(socket.readyState));
54
+ this.sockets[url] = (this.sockets[url] ?? []).filter((socket) => ![WebSocket.CLOSING, WebSocket.CLOSED].includes(socket.readyState));
55
55
  }
56
56
  waitForReady(socket, connectionTimeout) {
57
57
  return new Promise((resolve, reject) => {
@@ -71,36 +71,40 @@ export class WebSocketFetchHandler {
71
71
  }
72
72
  connect(socket, data) {
73
73
  let streamError = undefined;
74
+ let socketErrorOccurred = false;
75
+ let reject = () => { };
76
+ let resolve = () => { };
77
+ socket.onmessage = (event) => {
78
+ resolve({
79
+ done: false,
80
+ value: new Uint8Array(event.data),
81
+ });
82
+ };
83
+ socket.onerror = (error) => {
84
+ socketErrorOccurred = true;
85
+ socket.close();
86
+ reject(error);
87
+ };
88
+ socket.onclose = () => {
89
+ this.removeNotUsableSockets(socket.url);
90
+ if (socketErrorOccurred)
91
+ return;
92
+ if (streamError) {
93
+ reject(streamError);
94
+ }
95
+ else {
96
+ resolve({
97
+ done: true,
98
+ value: undefined,
99
+ });
100
+ }
101
+ };
74
102
  const outputStream = {
75
103
  [Symbol.asyncIterator]: () => ({
76
104
  next: () => {
77
- return new Promise((resolve, reject) => {
78
- let socketErrorOccurred = false;
79
- socket.onerror = (error) => {
80
- socketErrorOccurred = true;
81
- socket.close();
82
- reject(error);
83
- };
84
- socket.onclose = () => {
85
- this.removeNotUsableSockets(socket.url);
86
- if (socketErrorOccurred)
87
- return;
88
- if (streamError) {
89
- reject(streamError);
90
- }
91
- else {
92
- resolve({
93
- done: true,
94
- value: undefined,
95
- });
96
- }
97
- };
98
- socket.onmessage = (event) => {
99
- resolve({
100
- done: false,
101
- value: new Uint8Array(event.data),
102
- });
103
- };
105
+ return new Promise((_resolve, _reject) => {
106
+ resolve = _resolve;
107
+ reject = _reject;
104
108
  });
105
109
  },
106
110
  }),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-sdk/middleware-websocket",
3
- "version": "3.348.0",
3
+ "version": "3.353.0",
4
4
  "main": "./dist-cjs/index.js",
5
5
  "module": "./dist-es/index.js",
6
6
  "types": "./dist-types/index.d.ts",
@@ -22,8 +22,8 @@
22
22
  "license": "Apache-2.0",
23
23
  "dependencies": {
24
24
  "@aws-sdk/eventstream-serde-browser": "3.347.0",
25
- "@aws-sdk/fetch-http-handler": "3.347.0",
26
- "@aws-sdk/middleware-signing": "3.347.0",
25
+ "@aws-sdk/fetch-http-handler": "3.353.0",
26
+ "@aws-sdk/middleware-signing": "3.353.0",
27
27
  "@aws-sdk/protocol-http": "3.347.0",
28
28
  "@aws-sdk/signature-v4": "3.347.0",
29
29
  "@aws-sdk/types": "3.347.0",