extra-native-websocket 0.2.0 → 0.3.0

package/README.md

@@ -17,6 +17,8 @@ class WebSocketError extends CustomError {
 
 ### ExtraNativeWebSocket
 ```ts
+import { Emitter } from '@blackglory/structures'
+
 enum BinaryType {
   Blob
 , ArrayBuffer
@@ -29,7 +31,12 @@ enum State {
 , Closing
 }
 
-class ExtraNativeWebSocket {
+class ExtraNativeWebSocket extends Emitter<{
+  message: [event: MessageEvent]
+  close: [event: CloseEvent]
+  error: [event: Event]
+  open: [event: Event]
+}> {
   constructor(createWebSocket: () => WebSocket)
 
   getState(): State
@@ -42,16 +49,6 @@ class ExtraNativeWebSocket {
   connect(): Promise<void>
   close(code?: number, reason?: string): Promise<void>
   send(data: unknown): void
-
-  addEventListener(event: 'message', listener: (event: MessageEvent) => void): void
-  addEventListener(event: 'close', listener: (event: CloseEvent) => void): void
-  addEventListener(event: 'error', listener: (event: Event) => void): void
-  addEventListener(event: 'open', listener: (event: Event) => void): void
-
-  removeEventListener(event: 'message', listener: (event: MessageEvent) => void): void
-  removeEventListener(event: 'close', listener: (event: CloseEvent) => void): void
-  removeEventListener(event: 'error', listener: (event: Event) => void): void
-  removeEventListener(event: 'open', listener: (event: Event) => void): void
 }
 ```
 
@@ -59,3 +56,16 @@ class ExtraNativeWebSocket {
 ```ts
 function autoReconnect(ws: ExtraNativeWebSocket, timeout?: number): () => void
 ```
+
+### autoReconnectWithExponentialBackOff
+```ts
+function autoReonnectWithExponentialBackOff(
+  ws: ExtraWebSocket
+, options: {
+    baseTimeout: number
+    maxTimeout?: number
+    factor?: number = 2
+    jitter?: boolean = true
+  }
+): () => void
+```

package/lib/es2015/extra-native-websocket.d.ts

@@ -1,4 +1,4 @@
-import { Queue } from '@blackglory/structures';
+import { Queue, Emitter } from '@blackglory/structures';
 export declare enum BinaryType {
     Blob = 0,
     ArrayBuffer = 1
@@ -9,24 +9,20 @@ export declare enum State {
     Connected = 2,
     Closing = 3
 }
-export declare class ExtraNativeWebSocket {
+export declare class ExtraNativeWebSocket extends Emitter<{
+    message: [event: MessageEvent];
+    close: [event: CloseEvent];
+    error: [event: Event];
+    open: [event: Event];
+}> {
     private createWebSocket;
     private instance?;
-    private eventListeners;
     private binaryType;
     protected unsentMessages: Queue<string | ArrayBufferLike | ArrayBufferView | Blob>;
     constructor(createWebSocket: () => WebSocket);
     getState(): State;
     getBinaryType(): BinaryType;
     setBinaryType(val: BinaryType): void;
-    addEventListener(event: 'message', listener: (event: MessageEvent) => void): void;
-    addEventListener(event: 'close', listener: (event: CloseEvent) => void): void;
-    addEventListener(event: 'error', listener: (event: Event) => void): void;
-    addEventListener(event: 'open', listener: (event: Event) => void): void;
-    removeEventListener(event: 'message', listener: (event: MessageEvent) => void): void;
-    removeEventListener(event: 'close', listener: (event: CloseEvent) => void): void;
-    removeEventListener(event: 'error', listener: (event: Event) => void): void;
-    removeEventListener(event: 'open', listener: (event: Event) => void): void;
     connect(): Promise<void>;
     close(code?: number, reason?: string): Promise<void>;
     send(data: string | ArrayBufferLike | Blob | ArrayBufferView): void;

package/lib/es2015/extra-native-websocket.js

@@ -23,10 +23,10 @@ var ReadyState;
     ReadyState[ReadyState["CLOSING"] = 2] = "CLOSING";
     ReadyState[ReadyState["CLOSED"] = 3] = "CLOSED";
 })(ReadyState || (ReadyState = {}));
-class ExtraNativeWebSocket {
+class ExtraNativeWebSocket extends structures_1.Emitter {
     constructor(createWebSocket) {
+        super();
         this.createWebSocket = createWebSocket;
-        this.eventListeners = new Map();
         this.binaryType = BinaryType.Blob;
         this.unsentMessages = new structures_1.Queue();
     }
@@ -61,38 +61,16 @@ class ExtraNativeWebSocket {
             }
         }
     }
-    addEventListener(event, listener) {
-        var _a;
-        if (!this.eventListeners.has(event)) {
-            this.eventListeners.set(event, new Set());
-        }
-        const listeners = this.eventListeners.get(event);
-        listeners.add(listener);
-        (_a = this.instance) === null || _a === void 0 ? void 0 : _a.addEventListener(event, listener);
-    }
-    removeEventListener(event, listener) {
-        var _a;
-        if (!this.eventListeners.has(event)) {
-            this.eventListeners.set(event, new Set());
-        }
-        const listeners = this.eventListeners.get(event);
-        listeners.delete(listener);
-        if (listeners.size === 0) {
-            this.eventListeners.delete(event);
-        }
-        (_a = this.instance) === null || _a === void 0 ? void 0 : _a.removeEventListener(event, listener);
-    }
     connect() {
         return new Promise((resolve, reject) => {
             (0, prelude_1.assert)(this.getState() === State.Closed, 'WebSocket is not closed');
             const self = this;
             const ws = this.instance = this.createWebSocket();
             ws.addEventListener('error', errorListener, { once: true });
-            for (const [event, listeners] of this.eventListeners) {
-                for (const listener of listeners) {
-                    ws.addEventListener(event, listener);
-                }
-            }
+            ws.addEventListener('open', event => this.emit('open', event));
+            ws.addEventListener('close', event => this.emit('close', event));
+            ws.addEventListener('message', event => this.emit('message', event));
+            ws.addEventListener('error', event => this.emit('error', event));
             this.setBinaryType(this.binaryType);
             ws.addEventListener('open', openListener, { once: true });
             function errorListener(event) {

package/lib/es2015/extra-native-websocket.js.map

@@ -1 +1 @@
-{"version":3,"file":"extra-native-websocket.js","sourceRoot":"","sources":["../../src/extra-native-websocket.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extra-native-websocket.js","sourceRoot":"","sources":["../../src/extra-native-websocket.ts"],"names":[],"mappings":"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"}

package/lib/es2015/utils/auto-reconnect-with-exponential-back-off.d.ts

@@ -0,0 +1,7 @@
+import { ExtraNativeWebSocket } from "../extra-native-websocket";
+export declare function autoReconnectWithExponentialBackOff(ws: ExtraNativeWebSocket, { baseTimeout, maxTimeout, factor, jitter }: {
+    baseTimeout: number;
+    maxTimeout?: number;
+    factor?: number;
+    jitter?: boolean;
+}): () => void;

package/lib/es2015/utils/auto-reconnect-with-exponential-back-off.js

@@ -0,0 +1,60 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoReconnectWithExponentialBackOff = void 0;
+const extra_native_websocket_1 = require("../extra-native-websocket");
+const extra_timers_1 = require("extra-timers");
+const prelude_1 = require("@blackglory/prelude");
+const extra_promise_1 = require("extra-promise");
+const wait_for_1 = require("@blackglory/wait-for");
+function autoReconnectWithExponentialBackOff(ws, { baseTimeout, maxTimeout = Infinity, factor = 2, jitter = true }) {
+    const controller = new AbortController();
+    const removeErrorListener = ws.on('error', prelude_1.pass);
+    let removeCloseListener = ws.on('close', closeListener);
+    return () => {
+        controller.abort();
+        removeCloseListener();
+        removeErrorListener();
+    };
+    function closeListener() {
+        return __awaiter(this, void 0, void 0, function* () {
+            removeCloseListener();
+            let retries = 0;
+            while (true) {
+                if (controller.signal.aborted)
+                    return;
+                yield (0, extra_promise_1.delay)((0, extra_timers_1.calculateExponentialBackoffTimeout)({
+                    retries,
+                    baseTimeout,
+                    maxTimeout,
+                    factor,
+                    jitter
+                }));
+                if (controller.signal.aborted)
+                    return;
+                try {
+                    yield (0, wait_for_1.waitForFunction)(() => ws.getState() === extra_native_websocket_1.State.Closed);
+                    yield ws.connect();
+                    if (controller.signal.aborted)
+                        return;
+                    removeCloseListener = ws.on('close', closeListener);
+                    break;
+                }
+                catch (_a) {
+                    retries++;
+                    (0, prelude_1.pass)();
+                }
+            }
+        });
+    }
+}
+exports.autoReconnectWithExponentialBackOff = autoReconnectWithExponentialBackOff;
+//# sourceMappingURL=auto-reconnect-with-exponential-back-off.js.map

package/lib/es2015/utils/auto-reconnect-with-exponential-back-off.js.map

@@ -0,0 +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,MAAM,mBAAmB,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,cAAI,CAAC,CAAA;IAChD,IAAI,mBAAmB,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAEvD,OAAO,GAAG,EAAE;QACV,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,mBAAmB,EAAE,CAAA;QACrB,mBAAmB,EAAE,CAAA;IACvB,CAAC,CAAA;IAED,SAAe,aAAa;;YAC1B,mBAAmB,EAAE,CAAA;YAErB,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,mBAAmB,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;oBACnD,MAAK;iBACN;gBAAC,WAAM;oBACN,OAAO,EAAE,CAAA;oBACT,IAAA,cAAI,GAAE,CAAA;iBACP;aACF;QACH,CAAC;KAAA;AACH,CAAC;AAvDD,kFAuDC"}

package/lib/es2015/utils/auto-reconnect.js

@@ -10,26 +10,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autoReconnect = void 0;
+const extra_native_websocket_1 = require("../extra-native-websocket");
 const extra_promise_1 = require("extra-promise");
-const prelude_1 = require("@blackglory/prelude");
 const extra_abort_1 = require("extra-abort");
-function autoReconnect(ws, timeout) {
+const prelude_1 = require("@blackglory/prelude");
+const wait_for_1 = require("@blackglory/wait-for");
+function autoReconnect(ws, timeout = 0) {
     const controller = new extra_abort_1.AbortController();
-    ws.addEventListener('close', listener);
+    let removeCloseListener = ws.on('close', closeListener);
     return () => {
         controller.abort();
-        ws.removeEventListener('close', listener);
+        removeCloseListener();
     };
-    function listener() {
+    function closeListener() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (controller.signal.aborted)
-                return;
-            if ((0, prelude_1.isntUndefined)(timeout)) {
+            removeCloseListener();
+            while (true) {
+                if (controller.signal.aborted)
+                    return;
                 yield (0, extra_promise_1.delay)(timeout);
                 if (controller.signal.aborted)
                     return;
+                try {
+                    yield (0, wait_for_1.waitForFunction)(() => ws.getState() === extra_native_websocket_1.State.Closed);
+                    yield ws.connect();
+                    if (controller.signal.aborted)
+                        return;
+                    removeCloseListener = ws.on('close', closeListener);
+                    break;
+                }
+                catch (_a) {
+                    (0, prelude_1.pass)();
+                }
             }
-            yield ws.connect();
         });
     }
 }

package/lib/es2015/utils/auto-reconnect.js.map

@@ -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"}
+{"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,IAAI,mBAAmB,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAEvD,OAAO,GAAG,EAAE;QACV,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,mBAAmB,EAAE,CAAA;IACvB,CAAC,CAAA;IAED,SAAe,aAAa;;YAC1B,mBAAmB,EAAE,CAAA;YAErB,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,mBAAmB,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;oBACnD,MAAK;iBACN;gBAAC,WAAM;oBACN,IAAA,cAAI,GAAE,CAAA;iBACP;aACF;QACH,CAAC;KAAA;AACH,CAAC;AA/BD,sCA+BC"}

package/lib/es2015/utils/index.d.ts

@@ -1 +1,2 @@
 export * from './auto-reconnect';
+export * from './auto-reconnect-with-exponential-back-off';

package/lib/es2015/utils/index.js

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./auto-reconnect"), exports);
+__exportStar(require("./auto-reconnect-with-exponential-back-off"), exports);
 //# sourceMappingURL=index.js.map

package/lib/es2015/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC"}
+{"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

@@ -1,4 +1,4 @@
-import { Queue } from '@blackglory/structures';
+import { Queue, Emitter } from '@blackglory/structures';
 export declare enum BinaryType {
     Blob = 0,
     ArrayBuffer = 1
@@ -9,24 +9,20 @@ export declare enum State {
     Connected = 2,
     Closing = 3
 }
-export declare class ExtraNativeWebSocket {
+export declare class ExtraNativeWebSocket extends Emitter<{
+    message: [event: MessageEvent];
+    close: [event: CloseEvent];
+    error: [event: Event];
+    open: [event: Event];
+}> {
     private createWebSocket;
     private instance?;
-    private eventListeners;
     private binaryType;
     protected unsentMessages: Queue<string | ArrayBufferLike | ArrayBufferView | Blob>;
     constructor(createWebSocket: () => WebSocket);
     getState(): State;
     getBinaryType(): BinaryType;
     setBinaryType(val: BinaryType): void;
-    addEventListener(event: 'message', listener: (event: MessageEvent) => void): void;
-    addEventListener(event: 'close', listener: (event: CloseEvent) => void): void;
-    addEventListener(event: 'error', listener: (event: Event) => void): void;
-    addEventListener(event: 'open', listener: (event: Event) => void): void;
-    removeEventListener(event: 'message', listener: (event: MessageEvent) => void): void;
-    removeEventListener(event: 'close', listener: (event: CloseEvent) => void): void;
-    removeEventListener(event: 'error', listener: (event: Event) => void): void;
-    removeEventListener(event: 'open', listener: (event: Event) => void): void;
     connect(): Promise<void>;
     close(code?: number, reason?: string): Promise<void>;
     send(data: string | ArrayBufferLike | Blob | ArrayBufferView): void;

package/lib/es2018/extra-native-websocket.js

@@ -23,10 +23,10 @@ var ReadyState;
     ReadyState[ReadyState["CLOSING"] = 2] = "CLOSING";
     ReadyState[ReadyState["CLOSED"] = 3] = "CLOSED";
 })(ReadyState || (ReadyState = {}));
-class ExtraNativeWebSocket {
+class ExtraNativeWebSocket extends structures_1.Emitter {
     constructor(createWebSocket) {
+        super();
         this.createWebSocket = createWebSocket;
-        this.eventListeners = new Map();
         this.binaryType = BinaryType.Blob;
         this.unsentMessages = new structures_1.Queue();
     }
@@ -61,38 +61,16 @@ class ExtraNativeWebSocket {
             }
         }
     }
-    addEventListener(event, listener) {
-        var _a;
-        if (!this.eventListeners.has(event)) {
-            this.eventListeners.set(event, new Set());
-        }
-        const listeners = this.eventListeners.get(event);
-        listeners.add(listener);
-        (_a = this.instance) === null || _a === void 0 ? void 0 : _a.addEventListener(event, listener);
-    }
-    removeEventListener(event, listener) {
-        var _a;
-        if (!this.eventListeners.has(event)) {
-            this.eventListeners.set(event, new Set());
-        }
-        const listeners = this.eventListeners.get(event);
-        listeners.delete(listener);
-        if (listeners.size === 0) {
-            this.eventListeners.delete(event);
-        }
-        (_a = this.instance) === null || _a === void 0 ? void 0 : _a.removeEventListener(event, listener);
-    }
     connect() {
         return new Promise((resolve, reject) => {
             (0, prelude_1.assert)(this.getState() === State.Closed, 'WebSocket is not closed');
             const self = this;
             const ws = this.instance = this.createWebSocket();
             ws.addEventListener('error', errorListener, { once: true });
-            for (const [event, listeners] of this.eventListeners) {
-                for (const listener of listeners) {
-                    ws.addEventListener(event, listener);
-                }
-            }
+            ws.addEventListener('open', event => this.emit('open', event));
+            ws.addEventListener('close', event => this.emit('close', event));
+            ws.addEventListener('message', event => this.emit('message', event));
+            ws.addEventListener('error', event => this.emit('error', event));
             this.setBinaryType(this.binaryType);
             ws.addEventListener('open', openListener, { once: true });
             function errorListener(event) {

package/lib/es2018/extra-native-websocket.js.map

@@ -1 +1 @@
-{"version":3,"file":"extra-native-websocket.js","sourceRoot":"","sources":["../../src/extra-native-websocket.ts"],"names":[],"mappings":"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"}
+{"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

@@ -0,0 +1,7 @@
+import { ExtraNativeWebSocket } from "../extra-native-websocket";
+export declare function autoReconnectWithExponentialBackOff(ws: ExtraNativeWebSocket, { baseTimeout, maxTimeout, factor, jitter }: {
+    baseTimeout: number;
+    maxTimeout?: number;
+    factor?: number;
+    jitter?: boolean;
+}): () => void;

package/lib/es2018/utils/auto-reconnect-with-exponential-back-off.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoReconnectWithExponentialBackOff = void 0;
+const extra_native_websocket_1 = require("../extra-native-websocket");
+const extra_timers_1 = require("extra-timers");
+const prelude_1 = require("@blackglory/prelude");
+const extra_promise_1 = require("extra-promise");
+const wait_for_1 = require("@blackglory/wait-for");
+function autoReconnectWithExponentialBackOff(ws, { baseTimeout, maxTimeout = Infinity, factor = 2, jitter = true }) {
+    const controller = new AbortController();
+    const removeErrorListener = ws.on('error', prelude_1.pass);
+    let removeCloseListener = ws.on('close', closeListener);
+    return () => {
+        controller.abort();
+        removeCloseListener();
+        removeErrorListener();
+    };
+    async function closeListener() {
+        removeCloseListener();
+        let retries = 0;
+        while (true) {
+            if (controller.signal.aborted)
+                return;
+            await (0, extra_promise_1.delay)((0, extra_timers_1.calculateExponentialBackoffTimeout)({
+                retries,
+                baseTimeout,
+                maxTimeout,
+                factor,
+                jitter
+            }));
+            if (controller.signal.aborted)
+                return;
+            try {
+                await (0, wait_for_1.waitForFunction)(() => ws.getState() === extra_native_websocket_1.State.Closed);
+                await ws.connect();
+                if (controller.signal.aborted)
+                    return;
+                removeCloseListener = ws.on('close', closeListener);
+                break;
+            }
+            catch (_a) {
+                retries++;
+                (0, prelude_1.pass)();
+            }
+        }
+    }
+}
+exports.autoReconnectWithExponentialBackOff = autoReconnectWithExponentialBackOff;
+//# sourceMappingURL=auto-reconnect-with-exponential-back-off.js.map

package/lib/es2018/utils/auto-reconnect-with-exponential-back-off.js.map

@@ -0,0 +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,MAAM,mBAAmB,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,cAAI,CAAC,CAAA;IAChD,IAAI,mBAAmB,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAEvD,OAAO,GAAG,EAAE;QACV,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,mBAAmB,EAAE,CAAA;QACrB,mBAAmB,EAAE,CAAA;IACvB,CAAC,CAAA;IAED,KAAK,UAAU,aAAa;QAC1B,mBAAmB,EAAE,CAAA;QAErB,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,mBAAmB,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;gBACnD,MAAK;aACN;YAAC,WAAM;gBACN,OAAO,EAAE,CAAA;gBACT,IAAA,cAAI,GAAE,CAAA;aACP;SACF;IACH,CAAC;AACH,CAAC;AAvDD,kFAuDC"}

package/lib/es2018/utils/auto-reconnect.js

@@ -1,25 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autoReconnect = void 0;
+const extra_native_websocket_1 = require("../extra-native-websocket");
 const extra_promise_1 = require("extra-promise");
-const prelude_1 = require("@blackglory/prelude");
 const extra_abort_1 = require("extra-abort");
-function autoReconnect(ws, timeout) {
+const prelude_1 = require("@blackglory/prelude");
+const wait_for_1 = require("@blackglory/wait-for");
+function autoReconnect(ws, timeout = 0) {
     const controller = new extra_abort_1.AbortController();
-    ws.addEventListener('close', listener);
+    let removeCloseListener = ws.on('close', closeListener);
     return () => {
         controller.abort();
-        ws.removeEventListener('close', listener);
+        removeCloseListener();
     };
-    async function listener() {
-        if (controller.signal.aborted)
-            return;
-        if ((0, prelude_1.isntUndefined)(timeout)) {
+    async function closeListener() {
+        removeCloseListener();
+        while (true) {
+            if (controller.signal.aborted)
+                return;
             await (0, extra_promise_1.delay)(timeout);
             if (controller.signal.aborted)
                 return;
+            try {
+                await (0, wait_for_1.waitForFunction)(() => ws.getState() === extra_native_websocket_1.State.Closed);
+                await ws.connect();
+                if (controller.signal.aborted)
+                    return;
+                removeCloseListener = ws.on('close', closeListener);
+                break;
+            }
+            catch (_a) {
+                (0, prelude_1.pass)();
+            }
         }
-        await ws.connect();
     }
 }
 exports.autoReconnect = autoReconnect;

package/lib/es2018/utils/auto-reconnect.js.map

@@ -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"}
+{"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,IAAI,mBAAmB,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAEvD,OAAO,GAAG,EAAE;QACV,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,mBAAmB,EAAE,CAAA;IACvB,CAAC,CAAA;IAED,KAAK,UAAU,aAAa;QAC1B,mBAAmB,EAAE,CAAA;QAErB,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,mBAAmB,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;gBACnD,MAAK;aACN;YAAC,WAAM;gBACN,IAAA,cAAI,GAAE,CAAA;aACP;SACF;IACH,CAAC;AACH,CAAC;AA/BD,sCA+BC"}

package/lib/es2018/utils/index.d.ts

@@ -1 +1,2 @@
 export * from './auto-reconnect';
+export * from './auto-reconnect-with-exponential-back-off';

package/lib/es2018/utils/index.js

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./auto-reconnect"), exports);
+__exportStar(require("./auto-reconnect-with-exponential-back-off"), exports);
 //# sourceMappingURL=index.js.map

package/lib/es2018/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC;AAChC,6EAA0D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-native-websocket",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "",
   "keywords": [],
   "files": [
@@ -34,31 +34,32 @@
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.0.1",
-    "@commitlint/config-conventional": "^17.0.0",
+    "@commitlint/cli": "^17.0.2",
+    "@commitlint/config-conventional": "^17.0.2",
     "@types/jest": "^27.5.1",
     "@types/ws": "^8.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.27.0",
-    "@typescript-eslint/parser": "^5.27.0",
-    "eslint": "^8.16.0",
+    "@typescript-eslint/eslint-plugin": "^5.27.1",
+    "@typescript-eslint/parser": "^5.27.1",
+    "eslint": "^8.17.0",
     "husky": "4",
-    "jest": "^28.1.0",
-    "jest-environment-jsdom": "^28.1.0",
+    "jest": "^28.1.1",
+    "jest-environment-jsdom": "^28.1.1",
     "npm-run-all": "^4.1.5",
     "return-style": "^1.0.0",
     "rimraf": "^3.0.2",
     "standard-version": "^9.5.0",
-    "ts-jest": "^28.0.3",
+    "ts-jest": "^28.0.4",
     "ts-patch": "^2.0.1",
     "tslib": "^2.4.0",
-    "typescript": "^4.7.2",
+    "typescript": "^4.7.3",
     "typescript-transform-paths": "^3.3.1",
     "ws": "^8.7.0"
   },
   "dependencies": {
     "@blackglory/errors": "^2.2.1",
     "@blackglory/prelude": "^0.1.1",
-    "@blackglory/structures": "^0.5.1",
+    "@blackglory/structures": "^0.6.0",
+    "@blackglory/wait-for": "^0.5.0",
     "extra-abort": "^0.1.2",
     "extra-promise": "^2.0.0"
   }