@pathscale/wss-adapter 1.0.11 → 1.0.12

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.
@@ -146,20 +146,26 @@ var receiveHandler = function (event) {
146
146
  }
147
147
  };
148
148
  function onError(response) {
149
- var _a;
149
+ var _a, _b;
150
150
  var errorCode = response.params.error;
151
151
  var errorMsg = (_a = store.errors[errorCode]) !== null && _a !== void 0 ? _a : errorCode;
152
152
  if ([45349638, 45349637].includes(errorCode)) {
153
153
  store.sequence.decreaseSeq();
154
- console.log('seq has been decreased because of error');
155
154
  }
156
155
  // if there was only one executor saved in store.pendingPromises, then it was that request that failed
157
156
  if (Object.keys(store.pendingPromises).length === 1) {
158
157
  var onlyKey = Number.parseInt(Object.keys(store.pendingPromises)[0]);
159
158
  clearTimeout(store.pendingPromises[onlyKey].toHandler);
160
159
  store.pendingPromises[onlyKey].reject(new Error(errorMsg));
160
+ console.error(store.pendingPromises[onlyKey].methodName + ' failed');
161
161
  delete store.pendingPromises[onlyKey];
162
162
  }
163
+ else if (response.seq > 1 && store.pendingPromises[response.seq]) {
164
+ var executor = store.pendingPromises[response.seq];
165
+ clearTimeout(executor.toHandler);
166
+ executor.reject(new Error("".concat((_b = executor.methodName) !== null && _b !== void 0 ? _b : '', ": ").concat(errorCode || JSON.stringify(response.params))));
167
+ delete store.pendingPromises[response.seq];
168
+ }
163
169
  // if there were more than one, there is no way of knowing who failed
164
170
  else {
165
171
  throw new Error('Unkown request failed');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pathscale/wss-adapter",
3
- "version": "1.0.11",
3
+ "version": "1.0.12",
4
4
  "description": "Websocket adapter for the Pathscale WSS",
5
5
  "main": "dist/wssAdapter.js",
6
6
  "types": "dist/wssAdapter.d.ts",
package/wssAdapter.ts CHANGED
@@ -196,6 +196,7 @@ interface IResponse {
196
196
  params: {
197
197
  error: number
198
198
  }
199
+ seq: number
199
200
  }
200
201
 
201
202
  function onError(response: IResponse) {
@@ -204,7 +205,6 @@ function onError(response: IResponse) {
204
205
 
205
206
  if ([45349638, 45349637].includes(errorCode)) {
206
207
  store.sequence.decreaseSeq()
207
- console.log('seq has been decreased because of error')
208
208
  }
209
209
 
210
210
  // if there was only one executor saved in store.pendingPromises, then it was that request that failed
@@ -212,9 +212,21 @@ function onError(response: IResponse) {
212
212
  const onlyKey = Number.parseInt(Object.keys(store.pendingPromises)[0])
213
213
  clearTimeout(store.pendingPromises[onlyKey].toHandler)
214
214
  store.pendingPromises[onlyKey].reject(new Error(errorMsg))
215
+ console.error(store.pendingPromises[onlyKey].methodName + ' failed')
215
216
  delete store.pendingPromises[onlyKey]
217
+ } else if (response.seq > 1 && store.pendingPromises[response.seq]) {
218
+ const executor = store.pendingPromises[response.seq]
219
+
220
+ clearTimeout(executor.toHandler)
221
+ executor.reject(
222
+ new Error(
223
+ `${executor.methodName ?? ''}: ${
224
+ errorCode || JSON.stringify(response.params)
225
+ }`
226
+ )
227
+ )
228
+ delete store.pendingPromises[response.seq]
216
229
  }
217
-
218
230
  // if there were more than one, there is no way of knowing who failed
219
231
  else {
220
232
  throw new Error('Unkown request failed')