extra-native-websocket 0.3.2 → 0.4.1

package/README.md

@@ -46,15 +46,19 @@ class ExtraNativeWebSocket extends Emitter<{
   /**
    * @throws {WebSocketError}
    */
-  connect(): Promise<void>
+  connect(signal?: AbortSignal): Promise<void>
   close(code?: number, reason?: string): Promise<void>
-  send(data: unknown): void
+  send(data: string | ArrayBufferLike | Blob | ArrayBufferView): void
 }
 ```
 
 ### autoReconnect
 ```ts
-function autoReconnect(ws: ExtraNativeWebSocket, timeout?: number): () => void
+function autoReconnect(
+  ws: ExtraNativeWebSocket
+, reconnectTimeout?: number = 0
+, connectTimeout?: number
+): () => void
 ```
 
 ### autoReconnectWithExponentialBackOff
@@ -63,9 +67,10 @@ function autoReonnectWithExponentialBackOff(
   ws: ExtraWebSocket
 , options: {
     baseTimeout: number
-    maxTimeout?: number
+    maxTimeout?: number = Infinity
     factor?: number = 2
     jitter?: boolean = true
+    connectTimeout?: number
   }
 ): () => void
 ```

package/lib/{es2015/extra-native-websocket.d.ts → extra-native-websocket.d.ts}

@@ -9,6 +9,7 @@ export declare enum State {
     Connected = 2,
     Closing = 3
 }
+type Data = string | ArrayBufferLike | Blob | ArrayBufferView;
 export declare class ExtraNativeWebSocket extends Emitter<{
     open: [event: Event];
     message: [event: MessageEvent];
@@ -18,12 +19,13 @@ export declare class ExtraNativeWebSocket extends Emitter<{
     private createWebSocket;
     private instance?;
     private binaryType;
-    protected unsentMessages: Queue<string | ArrayBufferLike | ArrayBufferView | Blob>;
+    protected unsentMessages: Queue<Data>;
     constructor(createWebSocket: () => WebSocket);
     getState(): State;
     getBinaryType(): BinaryType;
     setBinaryType(val: BinaryType): void;
-    connect(): Promise<void>;
+    connect(signal?: AbortSignal): Promise<void>;
     close(code?: number, reason?: string): Promise<void>;
-    send(data: string | ArrayBufferLike | Blob | ArrayBufferView): void;
+    send(data: Data): void;
 }
+export {};

package/lib/{es2018/extra-native-websocket.js → extra-native-websocket.js}

@@ -1,21 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtraNativeWebSocket = exports.State = exports.BinaryType = void 0;
-const prelude_1 = require("@blackglory/prelude");
-const websocket_error_1 = require("./websocket-error");
-const structures_1 = require("@blackglory/structures");
-var BinaryType;
+import { assert } from '@blackglory/prelude';
+import { WebSocketError } from './websocket-error.js';
+import { Queue, Emitter } from '@blackglory/structures';
+import { SyncDestructor } from 'extra-defer';
+export var BinaryType;
 (function (BinaryType) {
     BinaryType[BinaryType["Blob"] = 0] = "Blob";
     BinaryType[BinaryType["ArrayBuffer"] = 1] = "ArrayBuffer";
-})(BinaryType = exports.BinaryType || (exports.BinaryType = {}));
-var State;
+})(BinaryType || (BinaryType = {}));
+export var State;
 (function (State) {
     State[State["Closed"] = 0] = "Closed";
     State[State["Connecting"] = 1] = "Connecting";
     State[State["Connected"] = 2] = "Connected";
     State[State["Closing"] = 3] = "Closing";
-})(State = exports.State || (exports.State = {}));
+})(State || (State = {}));
 var ReadyState;
 (function (ReadyState) {
     ReadyState[ReadyState["CONNECTING"] = 0] = "CONNECTING";
@@ -23,12 +21,12 @@ var ReadyState;
     ReadyState[ReadyState["CLOSING"] = 2] = "CLOSING";
     ReadyState[ReadyState["CLOSED"] = 3] = "CLOSED";
 })(ReadyState || (ReadyState = {}));
-class ExtraNativeWebSocket extends structures_1.Emitter {
+export class ExtraNativeWebSocket extends Emitter {
     constructor(createWebSocket) {
         super();
         this.createWebSocket = createWebSocket;
         this.binaryType = BinaryType.Blob;
-        this.unsentMessages = new structures_1.Queue();
+        this.unsentMessages = new Queue();
     }
     getState() {
         if (this.instance) {
@@ -61,27 +59,54 @@ class ExtraNativeWebSocket extends structures_1.Emitter {
             }
         }
     }
-    connect() {
+    connect(signal) {
         return new Promise((resolve, reject) => {
-            (0, prelude_1.assert)(this.getState() === State.Closed, 'WebSocket is not closed');
+            signal === null || signal === void 0 ? void 0 : signal.throwIfAborted();
+            assert(this.getState() === State.Closed, 'WebSocket is not closed');
             const self = this;
-            const ws = this.instance = this.createWebSocket();
+            const ws = this.createWebSocket();
+            this.instance = ws;
+            signal === null || signal === void 0 ? void 0 : signal.addEventListener('abort', abortListener, { once: true });
+            const destructor = new SyncDestructor();
             ws.addEventListener('error', errorListener, { once: true });
-            ws.addEventListener('open', event => this.emit('open', event));
-            ws.addEventListener('message', event => this.emit('message', event));
-            ws.addEventListener('error', event => this.emit('error', event));
-            ws.addEventListener('close', event => this.emit('close', event));
+            destructor.defer(() => ws.removeEventListener('error', errorListener));
+            {
+                const listener = (event) => this.emit('open', event);
+                ws.addEventListener('open', listener);
+                destructor.defer(() => ws.removeEventListener('open', listener));
+            }
+            {
+                const listener = (event) => this.emit('message', event);
+                ws.addEventListener('message', listener);
+                destructor.defer(() => ws.removeEventListener('message', listener));
+            }
+            {
+                const listener = (event) => this.emit('error', event);
+                ws.addEventListener('error', listener);
+                destructor.defer(() => ws.removeEventListener('error', listener));
+            }
+            {
+                const listener = (event) => this.emit('close', event);
+                ws.addEventListener('close', listener);
+                destructor.defer(() => ws.removeEventListener('close', listener));
+            }
             this.setBinaryType(this.binaryType);
             ws.addEventListener('open', openListener, { once: true });
+            function abortListener() {
+                assert(signal);
+                destructor.execute();
+                ws.close();
+                reject(signal.reason);
+            }
             function errorListener(event) {
                 ws.addEventListener('close', closeListener, { once: true });
-            }
-            function closeListener(event) {
-                reject(new websocket_error_1.WebSocketError(event.code, event.reason));
+                function closeListener(event) {
+                    destructor.execute();
+                    reject(new WebSocketError(event.code, event.reason));
+                }
             }
             function openListener(event) {
                 ws.removeEventListener('error', errorListener);
-                ws.removeEventListener('close', closeListener);
                 for (let size = self.unsentMessages.size; size--;) {
                     self.send(self.unsentMessages.dequeue());
                 }
@@ -91,7 +116,7 @@ class ExtraNativeWebSocket extends structures_1.Emitter {
     }
     close(code, reason) {
         return new Promise(resolve => {
-            (0, prelude_1.assert)(this.instance, 'WebSocket is not created');
+            assert(this.instance, 'WebSocket is not created');
             switch (this.getState()) {
                 case State.Closed:
                     resolve();
@@ -114,5 +139,4 @@ class ExtraNativeWebSocket extends structures_1.Emitter {
         }
     }
 }
-exports.ExtraNativeWebSocket = ExtraNativeWebSocket;
 //# sourceMappingURL=extra-native-websocket.js.map

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

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

package/lib/index.d.ts

@@ -0,0 +1,3 @@
+export * from './extra-native-websocket.js';
+export * from './websocket-error.js';
+export * from './utils/index.js';

package/lib/index.js

@@ -0,0 +1,4 @@
+export * from './extra-native-websocket.js';
+export * from './websocket-error.js';
+export * from './utils/index.js';
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAA;AAC3C,cAAc,sBAAsB,CAAA;AACpC,cAAc,kBAAkB,CAAA"}

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

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

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

@@ -0,0 +1,47 @@
+import { State } from "../extra-native-websocket.js";
+import { calculateExponentialBackoffTimeout } from 'extra-timers';
+import { pass } from '@blackglory/prelude';
+import { delay } from 'extra-promise';
+import { waitForFunction } from '@blackglory/wait-for';
+import { AbortController, timeoutSignal } from 'extra-abort';
+export function autoReconnectWithExponentialBackOff(ws, { baseTimeout, maxTimeout = Infinity, factor = 2, jitter = true, connectTimeout }) {
+    const controller = new AbortController();
+    const removeErrorListener = ws.on('error', pass);
+    let removeCloseListener = ws.once('close', closeListener);
+    return () => {
+        controller.abort();
+        removeCloseListener();
+        removeErrorListener();
+    };
+    async function closeListener() {
+        let retries = 0;
+        while (true) {
+            if (controller.signal.aborted)
+                return;
+            await delay(calculateExponentialBackoffTimeout({
+                retries,
+                baseTimeout,
+                maxTimeout,
+                factor,
+                jitter
+            }));
+            if (controller.signal.aborted)
+                return;
+            try {
+                await waitForFunction(() => ws.getState() === State.Closed);
+                await ws.connect(connectTimeout
+                    ? timeoutSignal(connectTimeout)
+                    : undefined);
+                if (controller.signal.aborted)
+                    return;
+                removeCloseListener = ws.once('close', closeListener);
+                break;
+            }
+            catch (_a) {
+                retries++;
+                pass();
+            }
+        }
+    }
+}
+//# sourceMappingURL=auto-reconnect-with-exponential-back-off.js.map

package/lib/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,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;AAE5D,MAAM,UAAU,mCAAmC,CACjD,EAAwB,EACxB,EACE,WAAW,EACX,UAAU,GAAG,QAAQ,EACrB,MAAM,GAAG,CAAC,EACV,MAAM,GAAG,IAAI,EACb,cAAc,EAOf;IAED,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IAGxC,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;QAClB,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;gBACX,UAAU;gBACV,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,cAAc;oBAChB,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC;oBAC/B,CAAC,CAAC,SAAS,CACV,CAAA;gBACD,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;oBAAE,OAAM;gBAErC,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"}

package/lib/utils/auto-reconnect.d.ts

@@ -0,0 +1,2 @@
+import { ExtraNativeWebSocket } from "../extra-native-websocket.js";
+export declare function autoReconnect(ws: ExtraNativeWebSocket, reconnectTimeout?: number, connectTimeout?: number): () => void;

package/lib/utils/auto-reconnect.js

@@ -0,0 +1,38 @@
+import { State } from "../extra-native-websocket.js";
+import { delay } from 'extra-promise';
+import { AbortController, timeoutSignal } from 'extra-abort';
+import { pass } from '@blackglory/prelude';
+import { waitForFunction } from '@blackglory/wait-for';
+export function autoReconnect(ws, reconnectTimeout = 0, connectTimeout) {
+    const controller = new AbortController();
+    const removeErrorListener = ws.on('error', pass);
+    let removeCloseListener = ws.once('close', closeListener);
+    return () => {
+        controller.abort();
+        removeCloseListener();
+        removeErrorListener();
+    };
+    async function closeListener() {
+        while (true) {
+            if (controller.signal.aborted)
+                return;
+            await delay(reconnectTimeout);
+            if (controller.signal.aborted)
+                return;
+            try {
+                await waitForFunction(() => ws.getState() === State.Closed);
+                await ws.connect(connectTimeout
+                    ? timeoutSignal(connectTimeout)
+                    : undefined);
+                if (controller.signal.aborted)
+                    return;
+                removeCloseListener = ws.once('close', closeListener);
+                break;
+            }
+            catch (_a) {
+                pass();
+            }
+        }
+    }
+}
+//# sourceMappingURL=auto-reconnect.js.map

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

@@ -0,0 +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;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,MAAM,UAAU,aAAa,CAC3B,EAAwB,EACxB,mBAA2B,CAAC,EAC5B,cAAuB;IAEvB,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IAGxC,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;QAClB,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,gBAAgB,CAAC,CAAA;YAC7B,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,cAAc;oBAChB,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC;oBAC/B,CAAC,CAAC,SAAS,CACV,CAAA;gBACD,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;oBAAE,OAAM;gBAErC,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/lib/utils/index.d.ts

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

package/lib/utils/index.js

@@ -0,0 +1,3 @@
+export * from './auto-reconnect.js';
+export * from './auto-reconnect-with-exponential-back-off.js';
+//# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,+CAA+C,CAAA"}

package/lib/websocket-error.js

@@ -0,0 +1,14 @@
+import { CustomError } from '@blackglory/errors';
+export class WebSocketError extends CustomError {
+    constructor(code, reason) {
+        if (reason) {
+            super(`${code}: ${reason}`);
+        }
+        else {
+            super(`${code}`);
+        }
+        this.code = code;
+        this.reason = reason;
+    }
+}
+//# sourceMappingURL=websocket-error.js.map

package/lib/websocket-error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-error.js","sourceRoot":"","sources":["../src/websocket-error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAEhD,MAAM,OAAO,cAAe,SAAQ,WAAW;IAI7C,YAAY,IAAY,EAAE,MAAc;QACtC,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,CAAC,GAAG,IAAI,KAAK,MAAM,EAAE,CAAC,CAAA;QAC7B,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC,CAAA;QAClB,CAAC;QAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;CACF"}

package/package.json

@@ -1,66 +1,67 @@
 {
   "name": "extra-native-websocket",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "description": "",
   "keywords": [],
   "files": [
     "lib",
     "src"
   ],
-  "main": "lib/es2018/index.js",
-  "types": "lib/es2018/index.d.ts",
+  "type": "module",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "repository": "git@github.com:BlackGlory/extra-native-websocket.git",
   "author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
   "license": "MIT",
   "sideEffects": false,
+  "engines": {
+    "node": ">=18.17.0"
+  },
   "scripts": {
     "prepare": "ts-patch install -s",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src __tests__",
-    "test": "jest --runInBand --no-cache --config jest.config.js",
-    "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
-    "test:coverage": "jest --coverage --config jest.config.js",
+    "test": "vitest --run",
     "prepublishOnly": "run-s prepare clean build",
-    "clean": "run-p clean:*",
-    "clean:build": "rimraf lib",
-    "build": "run-p build:*",
-    "build:es2015": "tsc --project tsconfig.build.json --module commonjs --target es2015 --outDir lib/es2015",
-    "build:es2018": "tsc --project tsconfig.build.json --module commonjs --target es2018 --outDir lib/es2018",
+    "clean": "rimraf lib",
+    "build": "tsc --project tsconfig.build.json --outDir lib",
     "release": "standard-version"
   },
   "husky": {
     "hooks": {
-      "pre-commit": "run-s prepare lint build",
+      "pre-commit": "run-s prepare lint test build",
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   },
   "devDependencies": {
-    "@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.1",
-    "@typescript-eslint/parser": "^5.27.1",
-    "eslint": "^8.17.0",
+    "@commitlint/cli": "^18.4.3",
+    "@commitlint/config-conventional": "^18.4.3",
+    "@types/ws": "^8.5.10",
+    "@typescript-eslint/eslint-plugin": "^6.13.2",
+    "@typescript-eslint/parser": "^6.13.2",
+    "cross-env": "^7.0.3",
+    "eslint": "^8.55.0",
     "husky": "4",
-    "jest": "^28.1.1",
-    "jest-environment-jsdom": "^28.1.1",
+    "jsdom": "^23.0.1",
     "npm-run-all": "^4.1.5",
-    "return-style": "^1.0.0",
-    "rimraf": "^3.0.2",
+    "return-style": "^3.0.1",
+    "rimraf": "^5.0.5",
     "standard-version": "^9.5.0",
-    "ts-jest": "^28.0.4",
-    "ts-patch": "^2.0.1",
-    "tslib": "^2.4.0",
-    "typescript": "^4.7.3",
-    "typescript-transform-paths": "^3.3.1",
-    "ws": "^8.7.0"
+    "ts-patch": "^3.1.1",
+    "tslib": "^2.6.2",
+    "typescript": "^5.3.3",
+    "typescript-transform-paths": "^3.4.6",
+    "vite": "^5.0.7",
+    "vite-tsconfig-paths": "^4.2.2",
+    "vitest": "^1.0.4",
+    "ws": "^8.14.2"
   },
   "dependencies": {
-    "@blackglory/errors": "^2.2.1",
-    "@blackglory/prelude": "^0.1.1",
-    "@blackglory/structures": "^0.6.0",
-    "@blackglory/wait-for": "^0.5.0",
-    "extra-abort": "^0.1.2",
-    "extra-promise": "^2.0.0"
+    "@blackglory/errors": "^3.0.3",
+    "@blackglory/prelude": "^0.3.4",
+    "@blackglory/structures": "^0.13.4",
+    "@blackglory/wait-for": "^0.7.4",
+    "extra-abort": "^0.3.7",
+    "extra-defer": "^0.3.0",
+    "extra-promise": "^6.0.8"
   }
 }

package/src/extra-native-websocket.ts

@@ -1,6 +1,7 @@
 import { assert } from '@blackglory/prelude'
-import { WebSocketError } from './websocket-error'
+import { WebSocketError } from './websocket-error.js'
 import { Queue, Emitter } from '@blackglory/structures'
+import { SyncDestructor } from 'extra-defer'
 
 export enum BinaryType {
   Blob
@@ -21,6 +22,8 @@ enum ReadyState {
 , CLOSED = 3
 }
 
+type Data = string | ArrayBufferLike | Blob | ArrayBufferView
+
 export class ExtraNativeWebSocket extends Emitter<{
   open: [event: Event]
   message: [event: MessageEvent]
@@ -29,7 +32,7 @@ export class ExtraNativeWebSocket extends Emitter<{
 }> {
   private instance?: WebSocket
   private binaryType: BinaryType = BinaryType.Blob
-  protected unsentMessages = new Queue<string | ArrayBufferLike | Blob | ArrayBufferView>()
+  protected unsentMessages = new Queue<Data>()
 
   constructor(private createWebSocket: () => WebSocket) {
     super()
@@ -72,35 +75,68 @@ export class ExtraNativeWebSocket extends Emitter<{
   /**
    * @throws {WebSocketError}
    */
-  connect(): Promise<void> {
+  connect(signal?: AbortSignal): Promise<void> {
     return new Promise((resolve, reject) => {
+      signal?.throwIfAborted()
       assert(this.getState() === State.Closed, 'WebSocket is not closed')
 
       const self = this
-      const ws = this.instance = this.createWebSocket()
+      const ws = this.createWebSocket()
+      this.instance = ws
+
+      signal?.addEventListener('abort', abortListener, { once: true })
 
+      const destructor = new SyncDestructor()
       ws.addEventListener('error', errorListener, { once: true })
+      destructor.defer(() => ws.removeEventListener('error', errorListener))
 
-      ws.addEventListener('open', event => this.emit('open', event))
-      ws.addEventListener('message', event => this.emit('message', event))
-      ws.addEventListener('error', event => this.emit('error', event))
-      ws.addEventListener('close', event => this.emit('close', event))
+      {
+        const listener = (event: Event) => this.emit('open', event)
+        ws.addEventListener('open', listener)
+        destructor.defer(() => ws.removeEventListener('open', listener))
+      }
+      {
+        const listener = (event: MessageEvent) => this.emit('message', event)
+        ws.addEventListener('message', listener)
+        destructor.defer(() => ws.removeEventListener('message', listener))
+      }
+      {
+        const listener = (event: Event) => this.emit('error', event)
+        ws.addEventListener('error', listener)
+        destructor.defer(() => ws.removeEventListener('error', listener))
+      }
+      {
+        const listener = (event: CloseEvent) => this.emit('close', event)
+        ws.addEventListener('close', listener)
+        destructor.defer(() => ws.removeEventListener('close', listener))
+      }
 
       this.setBinaryType(this.binaryType)
 
       ws.addEventListener('open', openListener, { once: true })
 
+      function abortListener(): void {
+        assert(signal)
+
+        destructor.execute()
+        ws.close()
+
+        reject(signal.reason)
+      }
+
       function errorListener(event: Event): void {
         ws.addEventListener('close', closeListener, { once: true })
-      }
 
-      function closeListener(event: CloseEvent): void {
-        reject(new WebSocketError(event.code, event.reason))
+        function closeListener(event: CloseEvent): void {
+          destructor.execute()
+
+          reject(new WebSocketError(event.code, event.reason))
+        }
       }
 
       function openListener(event: Event): void {
         ws.removeEventListener('error', errorListener)
-        ws.removeEventListener('close', closeListener)
+
         for (let size = self.unsentMessages.size; size--;) {
           self.send(self.unsentMessages.dequeue()!)
         }
@@ -127,7 +163,7 @@ export class ExtraNativeWebSocket extends Emitter<{
     })
   }
 
-  send(data: string | ArrayBufferLike | Blob | ArrayBufferView): void {
+  send(data: Data): void {
     if (this.getState() === State.Connected) {
       this.instance!.send(data)
     } else {

package/src/index.ts

@@ -1,3 +1,3 @@
-export * from './extra-native-websocket'
-export * from './websocket-error'
-export * from './utils'
+export * from './extra-native-websocket.js'
+export * from './websocket-error.js'
+export * from './utils/index.js'

package/src/utils/auto-reconnect-with-exponential-back-off.ts

@@ -1,8 +1,9 @@
-import { ExtraNativeWebSocket, State } from '@src/extra-native-websocket'
+import { ExtraNativeWebSocket, State } from '@src/extra-native-websocket.js'
 import { calculateExponentialBackoffTimeout } from 'extra-timers'
 import { pass } from '@blackglory/prelude'
 import { delay } from 'extra-promise'
 import { waitForFunction } from '@blackglory/wait-for'
+import { AbortController, timeoutSignal } from 'extra-abort'
 
 export function autoReconnectWithExponentialBackOff(
   ws: ExtraNativeWebSocket
@@ -11,11 +12,13 @@ export function autoReconnectWithExponentialBackOff(
   , maxTimeout = Infinity
   , factor = 2
   , jitter = true
+  , connectTimeout
   }: {
     baseTimeout: number
     maxTimeout?: number
     factor?: number
     jitter?: boolean
+    connectTimeout?: number
   }
 ): () => void {
   const controller = new AbortController()
@@ -46,7 +49,11 @@ export function autoReconnectWithExponentialBackOff(
 
       try {
         await waitForFunction(() => ws.getState() === State.Closed)
-        await ws.connect()
+        await ws.connect(
+          connectTimeout
+        ? timeoutSignal(connectTimeout)
+        : undefined
+        )
         if (controller.signal.aborted) return
 
         removeCloseListener = ws.once('close', closeListener)