extra-native-websocket 0.1.0 → 0.2.2

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 (24) hide show
  1. package/README.md +13 -0
  2. package/lib/es2015/extra-native-websocket.d.ts +2 -0
  3. package/lib/es2015/extra-native-websocket.js +35 -17
  4. package/lib/es2015/extra-native-websocket.js.map +1 -1
  5. package/lib/es2015/utils/auto-reconnect-with-exponential-back-off.d.ts +7 -0
  6. package/lib/es2015/utils/auto-reconnect-with-exponential-back-off.js +63 -0
  7. package/lib/es2015/utils/auto-reconnect-with-exponential-back-off.js.map +1 -0
  8. package/lib/es2015/utils/auto-reconnect.js +19 -6
  9. package/lib/es2015/utils/auto-reconnect.js.map +1 -1
  10. package/lib/es2015/utils/index.d.ts +1 -0
  11. package/lib/es2015/utils/index.js +1 -0
  12. package/lib/es2015/utils/index.js.map +1 -1
  13. package/lib/es2018/extra-native-websocket.d.ts +2 -0
  14. package/lib/es2018/extra-native-websocket.js +35 -17
  15. package/lib/es2018/extra-native-websocket.js.map +1 -1
  16. package/lib/es2018/utils/auto-reconnect-with-exponential-back-off.d.ts +7 -0
  17. package/lib/es2018/utils/auto-reconnect-with-exponential-back-off.js +52 -0
  18. package/lib/es2018/utils/auto-reconnect-with-exponential-back-off.js.map +1 -0
  19. package/lib/es2018/utils/auto-reconnect.js +19 -6
  20. package/lib/es2018/utils/auto-reconnect.js.map +1 -1
  21. package/lib/es2018/utils/index.d.ts +1 -0
  22. package/lib/es2018/utils/index.js +1 -0
  23. package/lib/es2018/utils/index.js.map +1 -1
  24. package/package.json +5 -3
package/README.md CHANGED
@@ -59,3 +59,16 @@ class ExtraNativeWebSocket {
59
59
  ```ts
60
60
  function autoReconnect(ws: ExtraNativeWebSocket, timeout?: number): () => void
61
61
  ```
62
+
63
+ ### autoReconnectWithExponentialBackOff
64
+ ```ts
65
+ function autoReonnectWithExponentialBackOff(
66
+ ws: ExtraWebSocket
67
+ , options: {
68
+ baseTimeout: number
69
+ maxTimeout?: number
70
+ factor?: number = 2
71
+ jitter?: boolean = true
72
+ }
73
+ ): () => void
74
+ ```
package/lib/es2015/extra-native-websocket.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { Queue } from '@blackglory/structures';
1
2
  export declare enum BinaryType {
2
3
  Blob = 0,
3
4
  ArrayBuffer = 1
@@ -13,6 +14,7 @@ export declare class ExtraNativeWebSocket {
13
14
  private instance?;
14
15
  private eventListeners;
15
16
  private binaryType;
17
+ protected unsentMessages: Queue<string | ArrayBufferLike | ArrayBufferView | Blob>;
16
18
  constructor(createWebSocket: () => WebSocket);
17
19
  getState(): State;
18
20
  getBinaryType(): BinaryType;
package/lib/es2015/extra-native-websocket.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ExtraNativeWebSocket = exports.State = exports.BinaryType = void 0;
4
4
  const prelude_1 = require("@blackglory/prelude");
5
5
  const websocket_error_1 = require("./websocket-error");
6
+ const structures_1 = require("@blackglory/structures");
6
7
  var BinaryType;
7
8
  (function (BinaryType) {
8
9
  BinaryType[BinaryType["Blob"] = 0] = "Blob";
@@ -15,19 +16,27 @@ var State;
15
16
  State[State["Connected"] = 2] = "Connected";
16
17
  State[State["Closing"] = 3] = "Closing";
17
18
  })(State = exports.State || (exports.State = {}));
19
+ var ReadyState;
20
+ (function (ReadyState) {
21
+ ReadyState[ReadyState["CONNECTING"] = 0] = "CONNECTING";
22
+ ReadyState[ReadyState["OPEN"] = 1] = "OPEN";
23
+ ReadyState[ReadyState["CLOSING"] = 2] = "CLOSING";
24
+ ReadyState[ReadyState["CLOSED"] = 3] = "CLOSED";
25
+ })(ReadyState || (ReadyState = {}));
18
26
  class ExtraNativeWebSocket {
19
27
  constructor(createWebSocket) {
20
28
  this.createWebSocket = createWebSocket;
21
29
  this.eventListeners = new Map();
22
30
  this.binaryType = BinaryType.Blob;
31
+ this.unsentMessages = new structures_1.Queue();
23
32
  }
24
33
  getState() {
25
34
  if (this.instance) {
26
35
  switch (this.instance.readyState) {
27
- case 0: return State.Connecting;
28
- case 1: return State.Connected;
29
- case 2: return State.Closing;
30
- case 3: return State.Closed;
36
+ case ReadyState.CONNECTING: return State.Connecting;
37
+ case ReadyState.OPEN: return State.Connected;
38
+ case ReadyState.CLOSING: return State.Closing;
39
+ case ReadyState.CLOSED: return State.Closed;
31
40
  default: throw new Error('Unknown state');
32
41
  }
33
42
  }
@@ -75,35 +84,40 @@ class ExtraNativeWebSocket {
75
84
  }
76
85
  connect() {
77
86
  return new Promise((resolve, reject) => {
78
- (0, prelude_1.assert)(this.getState() === State.Closing ||
79
- this.getState() === State.Closed, 'WebSocket is not closed');
80
- const ws = this.createWebSocket();
81
- ws.addEventListener('error', errorListener);
82
- ws.addEventListener('open', () => {
83
- ws.removeEventListener('close', closeListener);
84
- ws.removeEventListener('error', errorListener);
85
- resolve();
86
- });
87
+ (0, prelude_1.assert)(this.getState() === State.Closed, 'WebSocket is not closed');
88
+ const self = this;
89
+ const ws = this.instance = this.createWebSocket();
90
+ ws.addEventListener('error', errorListener, { once: true });
87
91
  for (const [event, listeners] of this.eventListeners) {
88
92
  for (const listener of listeners) {
89
93
  ws.addEventListener(event, listener);
90
94
  }
91
95
  }
92
- this.instance = ws;
93
96
  this.setBinaryType(this.binaryType);
97
+ ws.addEventListener('open', openListener, { once: true });
94
98
  function errorListener(event) {
95
99
  ws.addEventListener('close', closeListener, { once: true });
96
100
  }
97
101
  function closeListener(event) {
98
102
  reject(new websocket_error_1.WebSocketError(event.code, event.reason));
99
103
  }
104
+ function openListener(event) {
105
+ ws.removeEventListener('error', errorListener);
106
+ ws.removeEventListener('close', closeListener);
107
+ for (let size = self.unsentMessages.size; size--;) {
108
+ self.send(self.unsentMessages.dequeue());
109
+ }
110
+ resolve();
111
+ }
100
112
  });
101
113
  }
102
114
  close(code, reason) {
103
115
  return new Promise(resolve => {
104
116
  (0, prelude_1.assert)(this.instance, 'WebSocket is not created');
105
117
  switch (this.getState()) {
106
- case State.Closed: return resolve();
118
+ case State.Closed:
119
+ resolve();
120
+ break;
107
121
  case State.Closing:
108
122
  this.instance.addEventListener('close', () => resolve(), { once: true });
109
123
  break;
@@ -114,8 +128,12 @@ class ExtraNativeWebSocket {
114
128
  });
115
129
  }
116
130
  send(data) {
117
- (0, prelude_1.assert)(this.instance, 'WebSocket is not created');
118
- this.instance.send(data);
131
+ if (this.getState() === State.Connected) {
132
+ this.instance.send(data);
133
+ }
134
+ else {
135
+ this.unsentMessages.enqueue(data);
136
+ }
119
137
  }
120
138
  }
121
139
  exports.ExtraNativeWebSocket = ExtraNativeWebSocket;
package/lib/es2015/extra-native-websocket.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"extra-native-websocket.js","sourceRoot":"","sources":["../../src/extra-native-websocket.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"extra-native-websocket.js","sourceRoot":"","sources":["../../src/extra-native-websocket.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAC5C,uDAAkD;AAClD,uDAA8C;AAE9C,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,2CAAI,CAAA;IACJ,yDAAW,CAAA;AACb,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB;AAED,IAAY,KAKX;AALD,WAAY,KAAK;IACf,qCAAM,CAAA;IACN,6CAAU,CAAA;IACV,2CAAS,CAAA;IACT,uCAAO,CAAA;AACT,CAAC,EALW,KAAK,GAAL,aAAK,KAAL,aAAK,QAKhB;AAED,IAAK,UAKJ;AALD,WAAK,UAAU;IACb,uDAAc,CAAA;IACd,2CAAQ,CAAA;IACR,iDAAW,CAAA;IACX,+CAAU,CAAA;AACZ,CAAC,EALI,UAAU,KAAV,UAAU,QAKd;AAED,MAAa,oBAAoB;IAM/B,YAAoB,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;QAJ5C,mBAAc,GAA+B,IAAI,GAAG,EAAE,CAAA;QACtD,eAAU,GAAe,UAAU,CAAC,IAAI,CAAA;QACtC,mBAAc,GAAG,IAAI,kBAAK,EAAqD,CAAA;IAElC,CAAC;IAExD,QAAQ;QACN,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,QAAQ,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;gBAChC,KAAK,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,KAAK,CAAC,UAAU,CAAA;gBACnD,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,CAAC,SAAS,CAAA;gBAC5C,KAAK,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,KAAK,CAAC,OAAO,CAAA;gBAC7C,KAAK,UAAU,CAAC,MAAM,CAAC,CAAC,OAAO,KAAK,CAAC,MAAM,CAAA;gBAC3C,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;aAC1C;SACF;aAAM;YACL,OAAO,KAAK,CAAC,MAAM,CAAA;SACpB;IACH,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;IAED,aAAa,CAAC,GAAe;QAC3B,IAAI,CAAC,UAAU,GAAG,GAAG,CAAA;QAErB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,QAAQ,GAAG,EAAE;gBACX,KAAK,UAAU,CAAC,IAAI;oBAClB,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAA;oBACjC,MAAK;gBACP,KAAK,UAAU,CAAC,WAAW;oBACzB,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,aAAa,CAAA;oBACxC,MAAK;gBACP,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;aAChD;SACF;IACH,CAAC;IAMD,gBAAgB,CAAC,KAAa,EAAE,QAAkB;;QAChD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACnC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;SAC1C;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAE,CAAA;QACjD,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAEvB,MAAA,IAAI,CAAC,QAAQ,0CAAE,gBAAgB,CAAC,KAAY,EAAE,QAAe,CAAC,CAAA;IAChE,CAAC;IAMD,mBAAmB,CAAC,KAAa,EAAE,QAAkB;;QACnD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACnC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;SAC1C;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAE,CAAA;QACjD,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC1B,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;YACxB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;SAClC;QAED,MAAA,IAAI,CAAC,QAAQ,0CAAE,mBAAmB,CAAC,KAAY,EAAE,QAAe,CAAC,CAAA;IACnE,CAAC;IAKD,OAAO;QACL,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAA,gBAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,KAAK,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAA;YAEnE,MAAM,IAAI,GAAG,IAAI,CAAA;YACjB,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;YAEjD,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;YAC3D,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE;gBACpD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;oBAChC,EAAE,CAAC,gBAAgB,CAAC,KAAY,EAAE,QAAe,CAAC,CAAA;iBACnD;aACF;YAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAEnC,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;YAEzD,SAAS,aAAa,CAAC,KAAY;gBACjC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;YAC7D,CAAC;YAED,SAAS,aAAa,CAAC,KAAiB;gBACtC,MAAM,CAAC,IAAI,gCAAc,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;YACtD,CAAC;YAED,SAAS,YAAY,CAAC,KAAY;gBAChC,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;gBAC9C,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;gBAC9C,KAAK,IAAI,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG;oBACjD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAG,CAAC,CAAA;iBAC1C;gBACD,OAAO,EAAE,CAAA;YACX,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,IAAa,EAAE,MAAe;QAClC,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;YACjC,IAAA,gBAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,0BAA0B,CAAC,CAAA;YAEjD,QAAQ,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACvB,KAAK,KAAK,CAAC,MAAM;oBACf,OAAO,EAAE,CAAA;oBACT,MAAK;gBACP,KAAK,KAAK,CAAC,OAAO;oBAChB,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;oBACxE,MAAK;gBACP;oBACE,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;oBACxE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;aACpC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC,IAAuD;QAC1D,IAAI,IAAI,CAAC,QAAQ,EAAE,KAAK,KAAK,CAAC,SAAS,EAAE;YACvC,IAAI,CAAC,QAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC1B;aAAM;YACL,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;SAClC;IACH,CAAC;CACF;AA5ID,oDA4IC"}
package/lib/es2015/utils/auto-reconnect-with-exponential-back-off.d.ts ADDED
@@ -0,0 +1,7 @@
1
+ import { ExtraNativeWebSocket } from "../extra-native-websocket";
2
+ export declare function autoReconnectWithExponentialBackOff(ws: ExtraNativeWebSocket, { baseTimeout, maxTimeout, factor, jitter }: {
3
+ baseTimeout: number;
4
+ maxTimeout?: number;
5
+ factor?: number;
6
+ jitter?: boolean;
7
+ }): () => void;
package/lib/es2015/utils/auto-reconnect-with-exponential-back-off.js ADDED
@@ -0,0 +1,63 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.autoReconnectWithExponentialBackOff = void 0;
13
+ const extra_native_websocket_1 = require("../extra-native-websocket");
14
+ const extra_timers_1 = require("extra-timers");
15
+ const prelude_1 = require("@blackglory/prelude");
16
+ const extra_promise_1 = require("extra-promise");
17
+ const wait_for_1 = require("@blackglory/wait-for");
18
+ function autoReconnectWithExponentialBackOff(ws, { baseTimeout, maxTimeout = Infinity, factor = 2, jitter = true }) {
19
+ const controller = new AbortController();
20
+ ws.addEventListener('error', ignore);
21
+ ws.addEventListener('close', listener);
22
+ return () => {
23
+ controller.abort();
24
+ ws.removeEventListener('close', listener);
25
+ ws.removeEventListener('error', ignore);
26
+ };
27
+ function ignore() {
28
+ (0, prelude_1.pass)();
29
+ }
30
+ function listener() {
31
+ return __awaiter(this, void 0, void 0, function* () {
32
+ ws.removeEventListener('close', listener);
33
+ let retries = 0;
34
+ while (true) {
35
+ if (controller.signal.aborted)
36
+ return;
37
+ yield (0, extra_promise_1.delay)((0, extra_timers_1.calculateExponentialBackoffTimeout)({
38
+ retries,
39
+ baseTimeout,
40
+ maxTimeout,
41
+ factor,
42
+ jitter
43
+ }));
44
+ if (controller.signal.aborted)
45
+ return;
46
+ try {
47
+ yield (0, wait_for_1.waitForFunction)(() => ws.getState() === extra_native_websocket_1.State.Closed);
48
+ yield ws.connect();
49
+ if (controller.signal.aborted)
50
+ return;
51
+ ws.addEventListener('close', listener);
52
+ break;
53
+ }
54
+ catch (_a) {
55
+ retries++;
56
+ (0, prelude_1.pass)();
57
+ }
58
+ }
59
+ });
60
+ }
61
+ }
62
+ exports.autoReconnectWithExponentialBackOff = autoReconnectWithExponentialBackOff;
63
+ //# sourceMappingURL=auto-reconnect-with-exponential-back-off.js.map
package/lib/es2015/utils/auto-reconnect-with-exponential-back-off.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"auto-reconnect-with-exponential-back-off.js","sourceRoot":"","sources":["../../../src/utils/auto-reconnect-with-exponential-back-off.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sEAAyE;AACzE,+CAAiE;AACjE,iDAA0C;AAC1C,iDAAqC;AACrC,mDAAsD;AAEtD,SAAgB,mCAAmC,CACjD,EAAwB,EACxB,EACE,WAAW,EACX,UAAU,GAAG,QAAQ,EACrB,MAAM,GAAG,CAAC,EACV,MAAM,GAAG,IAAI,EAMd;IAED,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IAGxC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACpC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACtC,OAAO,GAAG,EAAE;QACV,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QACzC,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACzC,CAAC,CAAA;IAED,SAAS,MAAM;QACb,IAAA,cAAI,GAAE,CAAA;IACR,CAAC;IAED,SAAe,QAAQ;;YACrB,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;YAEzC,IAAI,OAAO,GAAG,CAAC,CAAA;YACf,OAAO,IAAI,EAAE;gBACX,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;oBAAE,OAAM;gBAErC,MAAM,IAAA,qBAAK,EAAC,IAAA,iDAAkC,EAAC;oBAC7C,OAAO;oBACP,WAAW;oBACX,UAAU;oBACV,MAAM;oBACN,MAAM;iBACP,CAAC,CAAC,CAAA;gBACH,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;oBAAE,OAAM;gBAErC,IAAI;oBACF,MAAM,IAAA,0BAAe,EAAC,GAAG,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,8BAAK,CAAC,MAAM,CAAC,CAAA;oBAC3D,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;oBAClB,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;wBAAE,OAAM;oBAErC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;oBACtC,MAAK;iBACN;gBAAC,WAAM;oBACN,OAAO,EAAE,CAAA;oBACT,IAAA,cAAI,GAAE,CAAA;iBACP;aACF;QACH,CAAC;KAAA;AACH,CAAC;AA1DD,kFA0DC"}
package/lib/es2015/utils/auto-reconnect.js CHANGED
@@ -10,10 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.autoReconnect = void 0;
13
+ const extra_native_websocket_1 = require("../extra-native-websocket");
13
14
  const extra_promise_1 = require("extra-promise");
14
- const prelude_1 = require("@blackglory/prelude");
15
15
  const extra_abort_1 = require("extra-abort");
16
- function autoReconnect(ws, timeout) {
16
+ const prelude_1 = require("@blackglory/prelude");
17
+ const wait_for_1 = require("@blackglory/wait-for");
18
+ function autoReconnect(ws, timeout = 0) {
17
19
  const controller = new extra_abort_1.AbortController();
18
20
  ws.addEventListener('close', listener);
19
21
  return () => {
@@ -22,14 +24,25 @@ function autoReconnect(ws, timeout) {
22
24
  };
23
25
  function listener() {
24
26
  return __awaiter(this, void 0, void 0, function* () {
25
- if (controller.signal.aborted)
26
- return;
27
- if ((0, prelude_1.isntUndefined)(timeout)) {
27
+ ws.removeEventListener('close', listener);
28
+ while (true) {
29
+ if (controller.signal.aborted)
30
+ return;
28
31
  yield (0, extra_promise_1.delay)(timeout);
29
32
  if (controller.signal.aborted)
30
33
  return;
34
+ try {
35
+ yield (0, wait_for_1.waitForFunction)(() => ws.getState() === extra_native_websocket_1.State.Closed);
36
+ yield ws.connect();
37
+ if (controller.signal.aborted)
38
+ return;
39
+ ws.addEventListener('close', listener);
40
+ break;
41
+ }
42
+ catch (_a) {
43
+ (0, prelude_1.pass)();
44
+ }
31
45
  }
32
- yield ws.connect();
33
46
  });
34
47
  }
35
48
  }
package/lib/es2015/utils/auto-reconnect.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auto-reconnect.js","sourceRoot":"","sources":["../../../src/utils/auto-reconnect.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAAqC;AACrC,iDAAmD;AACnD,6CAA6C;AAE7C,SAAgB,aAAa,CAAC,EAAwB,EAAE,OAAgB;IACtE,MAAM,UAAU,GAAG,IAAI,6BAAe,EAAE,CAAA;IAExC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACtC,OAAO,GAAG,EAAE;QACV,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC3C,CAAC,CAAA;IAED,SAAe,QAAQ;;YACrB,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAM;YAErC,IAAI,IAAA,uBAAa,EAAC,OAAO,CAAC,EAAE;gBAC1B,MAAM,IAAA,qBAAK,EAAC,OAAO,CAAC,CAAA;gBACpB,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;oBAAE,OAAM;aACtC;YAED,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;QACpB,CAAC;KAAA;AACH,CAAC;AAnBD,sCAmBC"}
1
+ {"version":3,"file":"auto-reconnect.js","sourceRoot":"","sources":["../../../src/utils/auto-reconnect.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sEAAyE;AACzE,iDAAqC;AACrC,6CAA6C;AAC7C,iDAA0C;AAC1C,mDAAsD;AAEtD,SAAgB,aAAa,CAAC,EAAwB,EAAE,UAAkB,CAAC;IACzE,MAAM,UAAU,GAAG,IAAI,6BAAe,EAAE,CAAA;IAExC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACtC,OAAO,GAAG,EAAE;QACV,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC3C,CAAC,CAAA;IAED,SAAe,QAAQ;;YACrB,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;YAEzC,OAAO,IAAI,EAAE;gBACX,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;oBAAE,OAAM;gBAErC,MAAM,IAAA,qBAAK,EAAC,OAAO,CAAC,CAAA;gBACpB,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;oBAAE,OAAM;gBAErC,IAAI;oBACF,MAAM,IAAA,0BAAe,EAAC,GAAG,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,8BAAK,CAAC,MAAM,CAAC,CAAA;oBAC3D,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;oBAClB,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;wBAAE,OAAM;oBAErC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;oBACtC,MAAK;iBACN;gBAAC,WAAM;oBACN,IAAA,cAAI,GAAE,CAAA;iBACP;aACF;QACH,CAAC;KAAA;AACH,CAAC;AA9BD,sCA8BC"}
package/lib/es2015/utils/index.d.ts CHANGED
@@ -1 +1,2 @@
1
1
  export * from './auto-reconnect';
2
+ export * from './auto-reconnect-with-exponential-back-off';
package/lib/es2015/utils/index.js CHANGED
@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./auto-reconnect"), exports);
18
+ __exportStar(require("./auto-reconnect-with-exponential-back-off"), exports);
18
19
  //# sourceMappingURL=index.js.map
package/lib/es2015/utils/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC;AAChC,6EAA0D"}
package/lib/es2018/extra-native-websocket.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { Queue } from '@blackglory/structures';
1
2
  export declare enum BinaryType {
2
3
  Blob = 0,
3
4
  ArrayBuffer = 1
@@ -13,6 +14,7 @@ export declare class ExtraNativeWebSocket {
13
14
  private instance?;
14
15
  private eventListeners;
15
16
  private binaryType;
17
+ protected unsentMessages: Queue<string | ArrayBufferLike | ArrayBufferView | Blob>;
16
18
  constructor(createWebSocket: () => WebSocket);
17
19
  getState(): State;
18
20
  getBinaryType(): BinaryType;
package/lib/es2018/extra-native-websocket.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ExtraNativeWebSocket = exports.State = exports.BinaryType = void 0;
4
4
  const prelude_1 = require("@blackglory/prelude");
5
5
  const websocket_error_1 = require("./websocket-error");
6
+ const structures_1 = require("@blackglory/structures");
6
7
  var BinaryType;
7
8
  (function (BinaryType) {
8
9
  BinaryType[BinaryType["Blob"] = 0] = "Blob";
@@ -15,19 +16,27 @@ var State;
15
16
  State[State["Connected"] = 2] = "Connected";
16
17
  State[State["Closing"] = 3] = "Closing";
17
18
  })(State = exports.State || (exports.State = {}));
19
+ var ReadyState;
20
+ (function (ReadyState) {
21
+ ReadyState[ReadyState["CONNECTING"] = 0] = "CONNECTING";
22
+ ReadyState[ReadyState["OPEN"] = 1] = "OPEN";
23
+ ReadyState[ReadyState["CLOSING"] = 2] = "CLOSING";
24
+ ReadyState[ReadyState["CLOSED"] = 3] = "CLOSED";
25
+ })(ReadyState || (ReadyState = {}));
18
26
  class ExtraNativeWebSocket {
19
27
  constructor(createWebSocket) {
20
28
  this.createWebSocket = createWebSocket;
21
29
  this.eventListeners = new Map();
22
30
  this.binaryType = BinaryType.Blob;
31
+ this.unsentMessages = new structures_1.Queue();
23
32
  }
24
33
  getState() {
25
34
  if (this.instance) {
26
35
  switch (this.instance.readyState) {
27
- case 0: return State.Connecting;
28
- case 1: return State.Connected;
29
- case 2: return State.Closing;
30
- case 3: return State.Closed;
36
+ case ReadyState.CONNECTING: return State.Connecting;
37
+ case ReadyState.OPEN: return State.Connected;
38
+ case ReadyState.CLOSING: return State.Closing;
39
+ case ReadyState.CLOSED: return State.Closed;
31
40
  default: throw new Error('Unknown state');
32
41
  }
33
42
  }
@@ -75,35 +84,40 @@ class ExtraNativeWebSocket {
75
84
  }
76
85
  connect() {
77
86
  return new Promise((resolve, reject) => {
78
- (0, prelude_1.assert)(this.getState() === State.Closing ||
79
- this.getState() === State.Closed, 'WebSocket is not closed');
80
- const ws = this.createWebSocket();
81
- ws.addEventListener('error', errorListener);
82
- ws.addEventListener('open', () => {
83
- ws.removeEventListener('close', closeListener);
84
- ws.removeEventListener('error', errorListener);
85
- resolve();
86
- });
87
+ (0, prelude_1.assert)(this.getState() === State.Closed, 'WebSocket is not closed');
88
+ const self = this;
89
+ const ws = this.instance = this.createWebSocket();
90
+ ws.addEventListener('error', errorListener, { once: true });
87
91
  for (const [event, listeners] of this.eventListeners) {
88
92
  for (const listener of listeners) {
89
93
  ws.addEventListener(event, listener);
90
94
  }
91
95
  }
92
- this.instance = ws;
93
96
  this.setBinaryType(this.binaryType);
97
+ ws.addEventListener('open', openListener, { once: true });
94
98
  function errorListener(event) {
95
99
  ws.addEventListener('close', closeListener, { once: true });
96
100
  }
97
101
  function closeListener(event) {
98
102
  reject(new websocket_error_1.WebSocketError(event.code, event.reason));
99
103
  }
104
+ function openListener(event) {
105
+ ws.removeEventListener('error', errorListener);
106
+ ws.removeEventListener('close', closeListener);
107
+ for (let size = self.unsentMessages.size; size--;) {
108
+ self.send(self.unsentMessages.dequeue());
109
+ }
110
+ resolve();
111
+ }
100
112
  });
101
113
  }
102
114
  close(code, reason) {
103
115
  return new Promise(resolve => {
104
116
  (0, prelude_1.assert)(this.instance, 'WebSocket is not created');
105
117
  switch (this.getState()) {
106
- case State.Closed: return resolve();
118
+ case State.Closed:
119
+ resolve();
120
+ break;
107
121
  case State.Closing:
108
122
  this.instance.addEventListener('close', () => resolve(), { once: true });
109
123
  break;
@@ -114,8 +128,12 @@ class ExtraNativeWebSocket {
114
128
  });
115
129
  }
116
130
  send(data) {
117
- (0, prelude_1.assert)(this.instance, 'WebSocket is not created');
118
- this.instance.send(data);
131
+ if (this.getState() === State.Connected) {
132
+ this.instance.send(data);
133
+ }
134
+ else {
135
+ this.unsentMessages.enqueue(data);
136
+ }
119
137
  }
120
138
  }
121
139
  exports.ExtraNativeWebSocket = ExtraNativeWebSocket;
package/lib/es2018/extra-native-websocket.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"extra-native-websocket.js","sourceRoot":"","sources":["../../src/extra-native-websocket.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"extra-native-websocket.js","sourceRoot":"","sources":["../../src/extra-native-websocket.ts"],"names":[],"mappings":"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"}
package/lib/es2018/utils/auto-reconnect-with-exponential-back-off.d.ts ADDED
@@ -0,0 +1,7 @@
1
+ import { ExtraNativeWebSocket } from "../extra-native-websocket";
2
+ export declare function autoReconnectWithExponentialBackOff(ws: ExtraNativeWebSocket, { baseTimeout, maxTimeout, factor, jitter }: {
3
+ baseTimeout: number;
4
+ maxTimeout?: number;
5
+ factor?: number;
6
+ jitter?: boolean;
7
+ }): () => void;
package/lib/es2018/utils/auto-reconnect-with-exponential-back-off.js ADDED
@@ -0,0 +1,52 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.autoReconnectWithExponentialBackOff = void 0;
4
+ const extra_native_websocket_1 = require("../extra-native-websocket");
5
+ const extra_timers_1 = require("extra-timers");
6
+ const prelude_1 = require("@blackglory/prelude");
7
+ const extra_promise_1 = require("extra-promise");
8
+ const wait_for_1 = require("@blackglory/wait-for");
9
+ function autoReconnectWithExponentialBackOff(ws, { baseTimeout, maxTimeout = Infinity, factor = 2, jitter = true }) {
10
+ const controller = new AbortController();
11
+ ws.addEventListener('error', ignore);
12
+ ws.addEventListener('close', listener);
13
+ return () => {
14
+ controller.abort();
15
+ ws.removeEventListener('close', listener);
16
+ ws.removeEventListener('error', ignore);
17
+ };
18
+ function ignore() {
19
+ (0, prelude_1.pass)();
20
+ }
21
+ async function listener() {
22
+ ws.removeEventListener('close', listener);
23
+ let retries = 0;
24
+ while (true) {
25
+ if (controller.signal.aborted)
26
+ return;
27
+ await (0, extra_promise_1.delay)((0, extra_timers_1.calculateExponentialBackoffTimeout)({
28
+ retries,
29
+ baseTimeout,
30
+ maxTimeout,
31
+ factor,
32
+ jitter
33
+ }));
34
+ if (controller.signal.aborted)
35
+ return;
36
+ try {
37
+ await (0, wait_for_1.waitForFunction)(() => ws.getState() === extra_native_websocket_1.State.Closed);
38
+ await ws.connect();
39
+ if (controller.signal.aborted)
40
+ return;
41
+ ws.addEventListener('close', listener);
42
+ break;
43
+ }
44
+ catch (_a) {
45
+ retries++;
46
+ (0, prelude_1.pass)();
47
+ }
48
+ }
49
+ }
50
+ }
51
+ exports.autoReconnectWithExponentialBackOff = autoReconnectWithExponentialBackOff;
52
+ //# sourceMappingURL=auto-reconnect-with-exponential-back-off.js.map
package/lib/es2018/utils/auto-reconnect-with-exponential-back-off.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"auto-reconnect-with-exponential-back-off.js","sourceRoot":"","sources":["../../../src/utils/auto-reconnect-with-exponential-back-off.ts"],"names":[],"mappings":";;;AAAA,sEAAyE;AACzE,+CAAiE;AACjE,iDAA0C;AAC1C,iDAAqC;AACrC,mDAAsD;AAEtD,SAAgB,mCAAmC,CACjD,EAAwB,EACxB,EACE,WAAW,EACX,UAAU,GAAG,QAAQ,EACrB,MAAM,GAAG,CAAC,EACV,MAAM,GAAG,IAAI,EAMd;IAED,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IAGxC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACpC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACtC,OAAO,GAAG,EAAE;QACV,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QACzC,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACzC,CAAC,CAAA;IAED,SAAS,MAAM;QACb,IAAA,cAAI,GAAE,CAAA;IACR,CAAC;IAED,KAAK,UAAU,QAAQ;QACrB,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAEzC,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,OAAO,IAAI,EAAE;YACX,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAM;YAErC,MAAM,IAAA,qBAAK,EAAC,IAAA,iDAAkC,EAAC;gBAC7C,OAAO;gBACP,WAAW;gBACX,UAAU;gBACV,MAAM;gBACN,MAAM;aACP,CAAC,CAAC,CAAA;YACH,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAM;YAErC,IAAI;gBACF,MAAM,IAAA,0BAAe,EAAC,GAAG,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,8BAAK,CAAC,MAAM,CAAC,CAAA;gBAC3D,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;gBAClB,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;oBAAE,OAAM;gBAErC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;gBACtC,MAAK;aACN;YAAC,WAAM;gBACN,OAAO,EAAE,CAAA;gBACT,IAAA,cAAI,GAAE,CAAA;aACP;SACF;IACH,CAAC;AACH,CAAC;AA1DD,kFA0DC"}
package/lib/es2018/utils/auto-reconnect.js CHANGED
@@ -1,10 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.autoReconnect = void 0;
4
+ const extra_native_websocket_1 = require("../extra-native-websocket");
4
5
  const extra_promise_1 = require("extra-promise");
5
- const prelude_1 = require("@blackglory/prelude");
6
6
  const extra_abort_1 = require("extra-abort");
7
- function autoReconnect(ws, timeout) {
7
+ const prelude_1 = require("@blackglory/prelude");
8
+ const wait_for_1 = require("@blackglory/wait-for");
9
+ function autoReconnect(ws, timeout = 0) {
8
10
  const controller = new extra_abort_1.AbortController();
9
11
  ws.addEventListener('close', listener);
10
12
  return () => {
@@ -12,14 +14,25 @@ function autoReconnect(ws, timeout) {
12
14
  ws.removeEventListener('close', listener);
13
15
  };
14
16
  async function listener() {
15
- if (controller.signal.aborted)
16
- return;
17
- if ((0, prelude_1.isntUndefined)(timeout)) {
17
+ ws.removeEventListener('close', listener);
18
+ while (true) {
19
+ if (controller.signal.aborted)
20
+ return;
18
21
  await (0, extra_promise_1.delay)(timeout);
19
22
  if (controller.signal.aborted)
20
23
  return;
24
+ try {
25
+ await (0, wait_for_1.waitForFunction)(() => ws.getState() === extra_native_websocket_1.State.Closed);
26
+ await ws.connect();
27
+ if (controller.signal.aborted)
28
+ return;
29
+ ws.addEventListener('close', listener);
30
+ break;
31
+ }
32
+ catch (_a) {
33
+ (0, prelude_1.pass)();
34
+ }
21
35
  }
22
- await ws.connect();
23
36
  }
24
37
  }
25
38
  exports.autoReconnect = autoReconnect;
package/lib/es2018/utils/auto-reconnect.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auto-reconnect.js","sourceRoot":"","sources":["../../../src/utils/auto-reconnect.ts"],"names":[],"mappings":";;;AACA,iDAAqC;AACrC,iDAAmD;AACnD,6CAA6C;AAE7C,SAAgB,aAAa,CAAC,EAAwB,EAAE,OAAgB;IACtE,MAAM,UAAU,GAAG,IAAI,6BAAe,EAAE,CAAA;IAExC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACtC,OAAO,GAAG,EAAE;QACV,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC3C,CAAC,CAAA;IAED,KAAK,UAAU,QAAQ;QACrB,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;YAAE,OAAM;QAErC,IAAI,IAAA,uBAAa,EAAC,OAAO,CAAC,EAAE;YAC1B,MAAM,IAAA,qBAAK,EAAC,OAAO,CAAC,CAAA;YACpB,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAM;SACtC;QAED,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;IACpB,CAAC;AACH,CAAC;AAnBD,sCAmBC"}
1
+ {"version":3,"file":"auto-reconnect.js","sourceRoot":"","sources":["../../../src/utils/auto-reconnect.ts"],"names":[],"mappings":";;;AAAA,sEAAyE;AACzE,iDAAqC;AACrC,6CAA6C;AAC7C,iDAA0C;AAC1C,mDAAsD;AAEtD,SAAgB,aAAa,CAAC,EAAwB,EAAE,UAAkB,CAAC;IACzE,MAAM,UAAU,GAAG,IAAI,6BAAe,EAAE,CAAA;IAExC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACtC,OAAO,GAAG,EAAE;QACV,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC3C,CAAC,CAAA;IAED,KAAK,UAAU,QAAQ;QACrB,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAEzC,OAAO,IAAI,EAAE;YACX,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAM;YAErC,MAAM,IAAA,qBAAK,EAAC,OAAO,CAAC,CAAA;YACpB,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAM;YAErC,IAAI;gBACF,MAAM,IAAA,0BAAe,EAAC,GAAG,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,8BAAK,CAAC,MAAM,CAAC,CAAA;gBAC3D,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;gBAClB,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;oBAAE,OAAM;gBAErC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;gBACtC,MAAK;aACN;YAAC,WAAM;gBACN,IAAA,cAAI,GAAE,CAAA;aACP;SACF;IACH,CAAC;AACH,CAAC;AA9BD,sCA8BC"}
package/lib/es2018/utils/index.d.ts CHANGED
@@ -1 +1,2 @@
1
1
  export * from './auto-reconnect';
2
+ export * from './auto-reconnect-with-exponential-back-off';
package/lib/es2018/utils/index.js CHANGED
@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./auto-reconnect"), exports);
18
+ __exportStar(require("./auto-reconnect-with-exponential-back-off"), exports);
18
19
  //# sourceMappingURL=index.js.map
package/lib/es2018/utils/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC;AAChC,6EAA0D"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "extra-native-websocket",
3
- "version": "0.1.0",
3
+ "version": "0.2.2",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "files": [
@@ -38,8 +38,8 @@
38
38
  "@commitlint/config-conventional": "^17.0.0",
39
39
  "@types/jest": "^27.5.1",
40
40
  "@types/ws": "^8.5.3",
41
- "@typescript-eslint/eslint-plugin": "^5.26.0",
42
- "@typescript-eslint/parser": "^5.26.0",
41
+ "@typescript-eslint/eslint-plugin": "^5.27.0",
42
+ "@typescript-eslint/parser": "^5.27.0",
43
43
  "eslint": "^8.16.0",
44
44
  "husky": "4",
45
45
  "jest": "^28.1.0",
@@ -58,6 +58,8 @@
58
58
  "dependencies": {
59
59
  "@blackglory/errors": "^2.2.1",
60
60
  "@blackglory/prelude": "^0.1.1",
61
+ "@blackglory/structures": "^0.5.1",
62
+ "@blackglory/wait-for": "^0.4.4",
61
63
  "extra-abort": "^0.1.2",
62
64
  "extra-promise": "^2.0.0"
63
65
  }