extra-native-websocket 0.5.0 → 0.5.1
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.
- package/lib/utils/auto-reconnect-with-exponential-back-off.js +6 -6
- package/lib/utils/auto-reconnect-with-exponential-back-off.js.map +1 -1
- package/lib/utils/auto-reconnect.js +6 -6
- package/lib/utils/auto-reconnect.js.map +1 -1
- package/package.json +1 -1
- package/src/utils/auto-reconnect-with-exponential-back-off.ts +7 -5
- package/src/utils/auto-reconnect.ts +7 -5
|
@@ -3,7 +3,7 @@ import { calculateExponentialBackoffTimeout } from 'extra-timers';
|
|
|
3
3
|
import { pass } from '@blackglory/prelude';
|
|
4
4
|
import { delay } from 'extra-promise';
|
|
5
5
|
import { waitForFunction } from '@blackglory/wait-for';
|
|
6
|
-
import { AbortController, timeoutSignal } from 'extra-abort';
|
|
6
|
+
import { AbortController, timeoutSignal, raceAbortSignals } from 'extra-abort';
|
|
7
7
|
export function autoReconnectWithExponentialBackOff(ws, { baseInterval, maxInterval = Infinity, factor = 2, jitter = true }, connectTimeout) {
|
|
8
8
|
const controller = new AbortController();
|
|
9
9
|
// Make sure the error listener is added, prevent crashes due to uncaught errors.
|
|
@@ -30,11 +30,11 @@ export function autoReconnectWithExponentialBackOff(ws, { baseInterval, maxInter
|
|
|
30
30
|
return;
|
|
31
31
|
try {
|
|
32
32
|
await waitForFunction(() => ws.getState() === State.Closed);
|
|
33
|
-
await ws.connect(
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
33
|
+
await ws.connect(raceAbortSignals([
|
|
34
|
+
connectTimeout && timeoutSignal(connectTimeout),
|
|
35
|
+
controller.signal
|
|
36
|
+
]));
|
|
37
|
+
removeCloseListener();
|
|
38
38
|
removeCloseListener = ws.once('close', closeListener);
|
|
39
39
|
break;
|
|
40
40
|
}
|
|
@@ -1 +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,OAAO,EAAwB,KAAK,EAAE,qCAAsC;AAC5E,OAAO,EAAE,kCAAkC,EAAE,MAAM,cAAc,CAAA;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;
|
|
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,OAAO,EAAwB,KAAK,EAAE,qCAAsC;AAC5E,OAAO,EAAE,kCAAkC,EAAE,MAAM,cAAc,CAAA;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAE9E,MAAM,UAAU,mCAAmC,CACjD,EAAwB,EACxB,EACE,YAAY,EACZ,WAAW,GAAG,QAAQ,EACtB,MAAM,GAAG,CAAC,EACV,MAAM,GAAG,IAAI,EAMd,EACD,cAAuB;IAEvB,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IAExC,iFAAiF;IACjF,MAAM,mBAAmB,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IAChD,IAAI,mBAAmB,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAEzD,OAAO,GAAG,EAAE;QACV,UAAU,CAAC,KAAK,EAAE,CAAA;QAElB,mBAAmB,EAAE,CAAA;QACrB,mBAAmB,EAAE,CAAA;IACvB,CAAC,CAAA;IAED,KAAK,UAAU,aAAa;QAC1B,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,OAAO,IAAI,EAAE,CAAC;YACZ,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAM;YAErC,MAAM,KAAK,CAAC,kCAAkC,CAAC;gBAC7C,OAAO;gBACP,WAAW,EAAE,YAAY;gBACzB,UAAU,EAAE,WAAW;gBACvB,MAAM;gBACN,MAAM;aACP,CAAC,CAAC,CAAA;YACH,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAM;YAErC,IAAI,CAAC;gBACH,MAAM,eAAe,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,KAAK,CAAC,MAAM,CAAC,CAAA;gBAC3D,MAAM,EAAE,CAAC,OAAO,CACd,gBAAgB,CAAC;oBACf,cAAc,IAAI,aAAa,CAAC,cAAc,CAAC;oBAC/C,UAAU,CAAC,MAAM;iBAClB,CAAC,CACH,CAAA;gBAED,mBAAmB,EAAE,CAAA;gBACrB,mBAAmB,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;gBACrD,MAAK;YACP,CAAC;YAAC,WAAM,CAAC;gBACP,OAAO,EAAE,CAAA;gBACT,IAAI,EAAE,CAAA;YACR,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { State } from "../extra-native-websocket.js";
|
|
2
2
|
import { delay } from 'extra-promise';
|
|
3
|
-
import { AbortController, timeoutSignal } from 'extra-abort';
|
|
3
|
+
import { AbortController, timeoutSignal, raceAbortSignals } from 'extra-abort';
|
|
4
4
|
import { pass } from '@blackglory/prelude';
|
|
5
5
|
import { waitForFunction } from '@blackglory/wait-for';
|
|
6
6
|
export function autoReconnect(ws, reconnectInterval = 0, connectTimeout) {
|
|
@@ -22,11 +22,11 @@ export function autoReconnect(ws, reconnectInterval = 0, connectTimeout) {
|
|
|
22
22
|
return;
|
|
23
23
|
try {
|
|
24
24
|
await waitForFunction(() => ws.getState() === State.Closed);
|
|
25
|
-
await ws.connect(
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
25
|
+
await ws.connect(raceAbortSignals([
|
|
26
|
+
connectTimeout && timeoutSignal(connectTimeout),
|
|
27
|
+
controller.signal
|
|
28
|
+
]));
|
|
29
|
+
removeCloseListener();
|
|
30
30
|
removeCloseListener = ws.once('close', closeListener);
|
|
31
31
|
break;
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-reconnect.js","sourceRoot":"","sources":["../../src/utils/auto-reconnect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,EAAE,qCAAsC;AAC5E,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"auto-reconnect.js","sourceRoot":"","sources":["../../src/utils/auto-reconnect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,EAAE,qCAAsC;AAC5E,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9E,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,MAAM,UAAU,aAAa,CAC3B,EAAwB,EACxB,oBAA4B,CAAC,EAC7B,cAAuB;IAEvB,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IAExC,iFAAiF;IACjF,MAAM,mBAAmB,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IAChD,IAAI,mBAAmB,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAEzD,OAAO,GAAG,EAAE;QACV,UAAU,CAAC,KAAK,EAAE,CAAA;QAElB,mBAAmB,EAAE,CAAA;QACrB,mBAAmB,EAAE,CAAA;IACvB,CAAC,CAAA;IAED,KAAK,UAAU,aAAa;QAC1B,OAAO,IAAI,EAAE,CAAC;YACZ,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAM;YAErC,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;YAC9B,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAM;YAErC,IAAI,CAAC;gBACH,MAAM,eAAe,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,KAAK,CAAC,MAAM,CAAC,CAAA;gBAC3D,MAAM,EAAE,CAAC,OAAO,CACd,gBAAgB,CAAC;oBACf,cAAc,IAAI,aAAa,CAAC,cAAc,CAAC;oBAC/C,UAAU,CAAC,MAAM;iBAClB,CAAC,CACH,CAAA;gBAED,mBAAmB,EAAE,CAAA;gBACrB,mBAAmB,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;gBACrD,MAAK;YACP,CAAC;YAAC,WAAM,CAAC;gBACP,IAAI,EAAE,CAAA;YACR,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@ import { calculateExponentialBackoffTimeout } from 'extra-timers'
|
|
|
3
3
|
import { pass } from '@blackglory/prelude'
|
|
4
4
|
import { delay } from 'extra-promise'
|
|
5
5
|
import { waitForFunction } from '@blackglory/wait-for'
|
|
6
|
-
import { AbortController, timeoutSignal } from 'extra-abort'
|
|
6
|
+
import { AbortController, timeoutSignal, raceAbortSignals } from 'extra-abort'
|
|
7
7
|
|
|
8
8
|
export function autoReconnectWithExponentialBackOff(
|
|
9
9
|
ws: ExtraNativeWebSocket
|
|
@@ -28,6 +28,7 @@ export function autoReconnectWithExponentialBackOff(
|
|
|
28
28
|
|
|
29
29
|
return () => {
|
|
30
30
|
controller.abort()
|
|
31
|
+
|
|
31
32
|
removeCloseListener()
|
|
32
33
|
removeErrorListener()
|
|
33
34
|
}
|
|
@@ -49,12 +50,13 @@ export function autoReconnectWithExponentialBackOff(
|
|
|
49
50
|
try {
|
|
50
51
|
await waitForFunction(() => ws.getState() === State.Closed)
|
|
51
52
|
await ws.connect(
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
raceAbortSignals([
|
|
54
|
+
connectTimeout && timeoutSignal(connectTimeout)
|
|
55
|
+
, controller.signal
|
|
56
|
+
])
|
|
55
57
|
)
|
|
56
|
-
if (controller.signal.aborted) return
|
|
57
58
|
|
|
59
|
+
removeCloseListener()
|
|
58
60
|
removeCloseListener = ws.once('close', closeListener)
|
|
59
61
|
break
|
|
60
62
|
} catch {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ExtraNativeWebSocket, State } from '@src/extra-native-websocket.js'
|
|
2
2
|
import { delay } from 'extra-promise'
|
|
3
|
-
import { AbortController, timeoutSignal } from 'extra-abort'
|
|
3
|
+
import { AbortController, timeoutSignal, raceAbortSignals } from 'extra-abort'
|
|
4
4
|
import { pass } from '@blackglory/prelude'
|
|
5
5
|
import { waitForFunction } from '@blackglory/wait-for'
|
|
6
6
|
|
|
@@ -17,6 +17,7 @@ export function autoReconnect(
|
|
|
17
17
|
|
|
18
18
|
return () => {
|
|
19
19
|
controller.abort()
|
|
20
|
+
|
|
20
21
|
removeCloseListener()
|
|
21
22
|
removeErrorListener()
|
|
22
23
|
}
|
|
@@ -31,12 +32,13 @@ export function autoReconnect(
|
|
|
31
32
|
try {
|
|
32
33
|
await waitForFunction(() => ws.getState() === State.Closed)
|
|
33
34
|
await ws.connect(
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
raceAbortSignals([
|
|
36
|
+
connectTimeout && timeoutSignal(connectTimeout)
|
|
37
|
+
, controller.signal
|
|
38
|
+
])
|
|
37
39
|
)
|
|
38
|
-
if (controller.signal.aborted) return
|
|
39
40
|
|
|
41
|
+
removeCloseListener()
|
|
40
42
|
removeCloseListener = ws.once('close', closeListener)
|
|
41
43
|
break
|
|
42
44
|
} catch {
|