@blackglory/estore-js 0.5.3 → 0.6.1

package/README.md

@@ -24,23 +24,34 @@ export class EStoreClient {
 
   close(): Promise<void>
 
-  getNamespaceStats(namespace: string, timeout?: number): Promise<INamespaceStats>
+  getNamespaceStats(
+    namespace: string
+  , signal?: AbortSignal
+  ): Promise<INamespaceStats>
 
-  getAllNamespaces(timeout?: number): Promise<string[]>
+  getAllNamespaces(signal?: AbortSignal): Promise<string[]>
 
-  getAllItemIds(namespace: string, timeout?: number): Promise<string[]>
+  getAllItemIds(namespace: string, signal?: AbortSignal): Promise<string[]>
 
   getAllEvents(
     namespace: string
   , itemId: string
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<JSONValue[]>
 
-  clearItemsByNamespace(namespace: string, timeout?: number): Promise<void>
+  clearItemsByNamespace(namespace: string, signal?: AbortSignal): Promise<void>
 
-  removeItem(namespace: string, itemId: string, timeout?: number): Promise<void>
+  removeItem(
+    namespace: string
+  , itemId: string
+  , signal?: AbortSignal
+  ): Promise<void>
 
-  getItemSize(namespace: string, itemId: string, timeout?: number): Promise<number>
+  getItemSize(
+    namespace: string
+  , itemId: string
+  , signal?: AbortSignal
+  ): Promise<number>
 
   /**
    * @param nextEventIndex 如果指定, 则会在eventIndex不等于下一个index时抛出EventIndexConflict错误.
@@ -51,14 +62,14 @@ export class EStoreClient {
   , itemId: string
   , event: JSONValue
   , nextEventIndex?: number
-  , timeout?: number
+  , signal?: ABortSignal
   ): Promise<void>
 
   getEvent(
     namespace: string
   , itemId: string
   , index: number
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<JSONValue | null>
 }
 ```

package/lib/contract.d.ts

@@ -12,7 +12,16 @@ export interface IAPI {
     clearItemsByNamespace(namespace: string): null;
     removeItem(namespace: string, itemId: string): null;
     getItemSize(namespace: string, itemId: string): number;
-    appendEvent(namespace: string, itemId: string, event: JSONValue, nextEventIndex?: number): null;
+    appendEvent(...args: [
+        namespace: string,
+        itemId: string,
+        event: JSONValue
+    ] | [
+        namespace: string,
+        itemId: string,
+        event: JSONValue,
+        nextEventIndex: number
+    ]): null;
     getEvent(namespace: string, itemId: string, eventIndex: number): JSONValue | null;
 }
 export declare class EventIndexConflict extends CustomError {

package/lib/contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAGhD,MAAM,CAAC,MAAM,eAAe,GAAG,QAAQ,CAAA;AAyCvC,MAAM,OAAO,kBAAmB,SAAQ,WAAW;CAAG"}
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAGhD,MAAM,CAAC,MAAM,eAAe,GAAG,QAAQ,CAAA;AAgDvC,MAAM,OAAO,kBAAmB,SAAQ,WAAW;CAAG"}

package/lib/estore-client.d.ts

@@ -14,14 +14,14 @@ export declare class EStoreClient {
     static create(options: IEStoreClientOptions): Promise<EStoreClient>;
     private constructor();
     close(): Promise<void>;
-    getNamespaceStats(namespace: string, timeout?: number): Promise<INamespaceStats>;
-    getAllNamespaces(timeout?: number): Promise<string[]>;
-    getAllItemIds(namespace: string, timeout?: number): Promise<string[]>;
-    getAllEvents(namespace: string, itemId: string, timeout?: number): Promise<JSONValue[]>;
-    clearItemsByNamespace(namespace: string, timeout?: number): Promise<void>;
-    removeItem(namespace: string, itemId: string, timeout?: number): Promise<void>;
-    getItemSize(namespace: string, itemId: string, timeout?: number): Promise<number>;
-    appendEvent(namespace: string, itemId: string, event: JSONValue, nextEventIndex?: number, timeout?: number): Promise<void>;
-    getEvent(namespace: string, itemId: string, index: number, timeout?: number): Promise<JSONValue | null>;
+    getNamespaceStats(namespace: string, signal?: AbortSignal): Promise<INamespaceStats>;
+    getAllNamespaces(signal?: AbortSignal): Promise<string[]>;
+    getAllItemIds(namespace: string, signal?: AbortSignal): Promise<string[]>;
+    getAllEvents(namespace: string, itemId: string, signal?: AbortSignal): Promise<JSONValue[]>;
+    clearItemsByNamespace(namespace: string, signal?: AbortSignal): Promise<void>;
+    removeItem(namespace: string, itemId: string, signal?: AbortSignal): Promise<void>;
+    getItemSize(namespace: string, itemId: string, signal?: AbortSignal): Promise<number>;
+    appendEvent(namespace: string, itemId: string, event: JSONValue, nextEventIndex?: number, signal?: AbortSignal): Promise<void>;
+    getEvent(namespace: string, itemId: string, index: number, signal?: AbortSignal): Promise<JSONValue | null>;
     private withTimeout;
 }

package/lib/estore-client.js

@@ -1,61 +1,57 @@
 import { createRPCClient } from "./utils/rpc-client.js";
-import { timeoutSignal, withAbortSignal } from 'extra-abort';
-import { isUndefined } from '@blackglory/prelude';
+import { raceAbortSignals, timeoutSignal } from 'extra-abort';
+import { isntUndefined, isUndefined } from '@blackglory/prelude';
 export { EventIndexConflict } from './contract.js';
 export class EStoreClient {
+    static async create(options) {
+        const { client, close } = await createRPCClient(options.server, options.retryIntervalForReconnection, options.timeout);
+        return new EStoreClient(client, close, options.timeout);
+    }
     constructor(client, closeClients, timeout) {
         this.client = client;
         this.closeClients = closeClients;
         this.timeout = timeout;
     }
-    static async create(options) {
-        const { client, close } = await createRPCClient(options.server, options.retryIntervalForReconnection);
-        return new EStoreClient(client, close, options.timeout);
-    }
     async close() {
         await this.closeClients();
     }
-    async getNamespaceStats(namespace, timeout) {
-        return await this.withTimeout(() => this.client.getNamespaceStats(namespace), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
-    }
-    async getAllNamespaces(timeout) {
-        return await this.withTimeout(() => this.client.getAllNamespaces(), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
-    }
-    async getAllItemIds(namespace, timeout) {
-        return await this.withTimeout(() => this.client.getAllItemIds(namespace), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async getNamespaceStats(namespace, signal) {
+        return await this.client.getNamespaceStats(namespace, this.withTimeout(signal));
     }
-    async getAllEvents(namespace, itemId, timeout) {
-        return await this.withTimeout(() => this.client.getAllEvents(namespace, itemId), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async getAllNamespaces(signal) {
+        return await this.client.getAllNamespaces(this.withTimeout(signal));
     }
-    async clearItemsByNamespace(namespace, timeout) {
-        await this.withTimeout(() => this.client.clearItemsByNamespace(namespace), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async getAllItemIds(namespace, signal) {
+        return await this.client.getAllItemIds(namespace, this.withTimeout(signal));
     }
-    async removeItem(namespace, itemId, timeout) {
-        await this.withTimeout(() => this.client.removeItem(namespace, itemId), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async getAllEvents(namespace, itemId, signal) {
+        return await this.client.getAllEvents(namespace, itemId, this.withTimeout(signal));
     }
-    async getItemSize(namespace, itemId, timeout) {
-        return await this.withTimeout(() => this.client.getItemSize(namespace, itemId), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async clearItemsByNamespace(namespace, signal) {
+        await this.client.clearItemsByNamespace(namespace, this.withTimeout(signal));
     }
-    async appendEvent(namespace, itemId, event, nextEventIndex, timeout) {
-        await this.withTimeout(() => {
-            if (isUndefined(nextEventIndex)) {
-                return this.client.appendEvent(namespace, itemId, event);
-            }
-            else {
-                return this.client.appendEvent(namespace, itemId, event, nextEventIndex);
-            }
-        }, timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async removeItem(namespace, itemId, signal) {
+        await this.client.removeItem(namespace, itemId, this.withTimeout(signal));
     }
-    async getEvent(namespace, itemId, index, timeout) {
-        return await this.withTimeout(() => this.client.getEvent(namespace, itemId, index), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async getItemSize(namespace, itemId, signal) {
+        return await this.client.getItemSize(namespace, itemId, this.withTimeout(signal));
     }
-    async withTimeout(fn, timeout = this.timeout) {
-        if (timeout) {
-            return await withAbortSignal(timeoutSignal(timeout), fn);
+    async appendEvent(namespace, itemId, event, nextEventIndex, signal) {
+        if (isUndefined(nextEventIndex)) {
+            await this.client.appendEvent(namespace, itemId, event, this.withTimeout(signal));
         }
         else {
-            return await fn();
+            await this.client.appendEvent(namespace, itemId, event, nextEventIndex, this.withTimeout(signal));
         }
     }
+    async getEvent(namespace, itemId, index, signal) {
+        return await this.client.getEvent(namespace, itemId, index, this.withTimeout(signal));
+    }
+    withTimeout(signal) {
+        return raceAbortSignals([
+            isntUndefined(this.timeout) && timeoutSignal(this.timeout),
+            signal
+        ]);
+    }
 }
 //# sourceMappingURL=estore-client.js.map

package/lib/estore-client.js.map

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

package/lib/utils/rpc-client.browser.d.ts

@@ -1,6 +1,6 @@
 import { IAPI } from "../contract.js";
 import { ClientProxy } from 'delight-rpc';
-export declare function createRPCClient(url: string, retryIntervalForReconnection?: number): Promise<{
+export declare function createRPCClient(url: string, retryIntervalForReconnection?: number, timeoutForConnection?: number): Promise<{
     client: ClientProxy<IAPI>;
     close: () => Promise<void>;
 }>;

package/lib/utils/rpc-client.browser.js

@@ -1,10 +1,13 @@
 import { expectedVersion } from "../contract.js";
 import { createClient } from '@delight-rpc/extra-native-websocket';
 import { ExtraNativeWebSocket, autoReconnect } from 'extra-native-websocket';
-export async function createRPCClient(url, retryIntervalForReconnection) {
+import { timeoutSignal } from 'extra-abort';
+export async function createRPCClient(url, retryIntervalForReconnection, timeoutForConnection) {
     const ws = new ExtraNativeWebSocket(() => new WebSocket(url));
-    const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection);
-    await ws.connect();
+    const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection, timeoutForConnection);
+    await ws.connect(timeoutForConnection
+        ? timeoutSignal(timeoutForConnection)
+        : undefined);
     const [client, closeClient] = createClient(ws, { expectedVersion });
     return {
         client,

package/lib/utils/rpc-client.browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.browser.js","sourceRoot":"","sources":["../../src/utils/rpc-client.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,eAAe,EAAE,uBAAwB;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAClE,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAE5E,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC;IAKrC,MAAM,EAAE,GAAG,IAAI,oBAAoB,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAC7D,MAAM,mBAAmB,GAAG,aAAa,CAAC,EAAE,EAAE,4BAA4B,CAAC,CAAA;IAC3E,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;IAElB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,YAAY,CAAO,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IAEzE,OAAO;QACL,MAAM;QACN,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"rpc-client.browser.js","sourceRoot":"","sources":["../../src/utils/rpc-client.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,eAAe,EAAE,uBAAwB;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAClE,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC,EACrC,oBAA6B;IAK7B,MAAM,EAAE,GAAG,IAAI,oBAAoB,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAC7D,MAAM,mBAAmB,GAAG,aAAa,CACvC,EAAE,EACF,4BAA4B,EAC5B,oBAAoB,CACrB,CAAA;IACD,MAAM,EAAE,CAAC,OAAO,CACd,oBAAoB;QACtB,CAAC,CAAC,aAAa,CAAC,oBAAoB,CAAC;QACrC,CAAC,CAAC,SAAS,CACV,CAAA;IAED,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,YAAY,CAAO,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IAEzE,OAAO;QACL,MAAM;QACN,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC"}

package/lib/utils/rpc-client.d.ts

@@ -1,6 +1,6 @@
 import { IAPI } from "../contract.js";
 import { ClientProxy } from 'delight-rpc';
-export declare function createRPCClient(url: string, retryIntervalForReconnection?: number): Promise<{
+export declare function createRPCClient(url: string, retryIntervalForReconnection?: number, timeoutForConnection?: number): Promise<{
     client: ClientProxy<IAPI>;
     close: () => Promise<void>;
 }>;

package/lib/utils/rpc-client.js

@@ -2,10 +2,13 @@ import { expectedVersion } from "../contract.js";
 import { createClient } from '@delight-rpc/extra-websocket';
 import { WebSocket } from 'ws';
 import { ExtraWebSocket, autoReconnect } from 'extra-websocket';
-export async function createRPCClient(url, retryIntervalForReconnection) {
+import { timeoutSignal } from 'extra-abort';
+export async function createRPCClient(url, retryIntervalForReconnection, timeoutForConnection) {
     const ws = new ExtraWebSocket(() => new WebSocket(url));
-    const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection);
-    await ws.connect();
+    const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection, timeoutForConnection);
+    await ws.connect(timeoutForConnection
+        ? timeoutSignal(timeoutForConnection)
+        : undefined);
     const [client, closeClient] = createClient(ws, { expectedVersion });
     return {
         client,

package/lib/utils/rpc-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../src/utils/rpc-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,eAAe,EAAE,uBAAwB;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/D,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC;IAKrC,MAAM,EAAE,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IACvD,MAAM,mBAAmB,GAAG,aAAa,CAAC,EAAE,EAAE,4BAA4B,CAAC,CAAA;IAC3E,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;IAElB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,YAAY,CAAO,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IAEzE,OAAO;QACL,MAAM;QACN,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../src/utils/rpc-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,eAAe,EAAE,uBAAwB;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC,EACrC,oBAA6B;IAK7B,MAAM,EAAE,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IACvD,MAAM,mBAAmB,GAAG,aAAa,CACvC,EAAE,EACF,4BAA4B,EAC5B,oBAAoB,CACrB,CAAA;IACD,MAAM,EAAE,CAAC,OAAO,CACd,oBAAoB;QACtB,CAAC,CAAC,aAAa,CAAC,oBAAoB,CAAC;QACrC,CAAC,CAAC,SAAS,CACV,CAAA;IAED,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,YAAY,CAAO,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IAEzE,OAAO;QACL,MAAM;QACN,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blackglory/estore-js",
-  "version": "0.5.3",
+  "version": "0.6.1",
   "description": "",
   "keywords": [],
   "files": [
@@ -18,22 +18,20 @@
   "license": "MIT",
   "sideEffects": false,
   "engines": {
-    "node": ">=16"
+    "node": ">=22"
   },
   "scripts": {
     "prepare": "ts-patch install -s",
-    "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src __tests__",
-    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --no-cache --config jest.config.cjs",
-    "test:debug": "cross-env NODE_OPTIONS=--experimental-vm-modules node --inspect-brk node_modules/.bin/jest --runInBand jest.config.cjs",
-    "test:coverage": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --coverage --config jest.config.cjs",
+    "lint": "eslint --quiet src __tests__",
+    "test": "vitest --run",
     "prepublishOnly": "run-s prepare clean build",
     "clean": "rimraf lib",
     "build": "tsc --project tsconfig.build.json",
     "docker:test": "run-s docker:test:clean docker:test:build docker:test:run docker:test:clean",
     "docker:coverage": "run-s docker:test:clean docker:test:build docker:test:coverage docker:test:clean",
-    "docker:test:build": "docker-compose --project-name estore-js --file docker-compose.test.yml build",
-    "docker:test:run": "docker-compose --project-name estore-js --file docker-compose.test.yml run --rm test",
-    "docker:test:clean": "docker-compose --project-name estore-js --file docker-compose.test.yml down",
+    "docker:test:build": "docker compose --project-name estore-js --file docker-compose.test.yml build",
+    "docker:test:run": "docker compose --project-name estore-js --file docker-compose.test.yml run --no-TTY --rm test",
+    "docker:test:clean": "docker compose --project-name estore-js --file docker-compose.test.yml down",
     "release": "standard-version"
   },
   "husky": {
@@ -43,38 +41,36 @@
     }
   },
   "devDependencies": {
-    "@blackglory/jest-resolver": "^0.3.0",
-    "@commitlint/cli": "^17.5.1",
-    "@commitlint/config-conventional": "^17.4.4",
-    "@types/jest": "^29.5.0",
-    "@types/ws": "^8.5.4",
-    "@typescript-eslint/eslint-plugin": "^5.57.0",
-    "@typescript-eslint/parser": "^5.57.0",
+    "@commitlint/cli": "^19.8.1",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@eslint/js": "^9.31.0",
+    "@types/ws": "^8.18.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.36.0",
-    "extra-utils": "^5.1.1",
+    "eslint": "^9.31.0",
+    "extra-utils": "^5.19.0",
     "husky": "4",
-    "jest": "^29.5.0",
-    "jest-resolve": "^29.5.0",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^3.0.2",
+    "rimraf": "^6.0.1",
     "standard-version": "^9.3.2",
-    "ts-jest": "^29.0.5",
-    "ts-patch": "^2.1.0",
-    "tslib": "^2.5.0",
-    "typescript": "4.8",
-    "typescript-transform-paths": "^3.4.6"
+    "ts-patch": "^3.3.0",
+    "tslib": "^2.8.1",
+    "typescript": "5.8.3",
+    "typescript-eslint": "^8.38.0",
+    "typescript-transform-paths": "^3.5.5",
+    "vite": "^7.0.5",
+    "vite-tsconfig-paths": "^5.1.4",
+    "vitest": "^3.2.4"
   },
   "dependencies": {
-    "@blackglory/errors": "^3.0.0",
-    "@blackglory/prelude": "^0.3.1",
-    "@delight-rpc/extra-native-websocket": "^0.5.1",
-    "@delight-rpc/extra-websocket": "^0.6.1",
-    "delight-rpc": "^6.0.1",
-    "extra-abort": "^0.3.4",
-    "extra-native-websocket": "^0.3.1",
-    "extra-websocket": "^0.3.1",
-    "justypes": "^4.2.0",
-    "ws": "^8.13.0"
+    "@blackglory/errors": "^3.0.3",
+    "@blackglory/prelude": "^0.4.0",
+    "@delight-rpc/extra-native-websocket": "^0.6.1",
+    "@delight-rpc/extra-websocket": "^0.7.1",
+    "delight-rpc": "^6.1.2",
+    "extra-abort": "^0.4.0",
+    "extra-native-websocket": "^0.5.0",
+    "extra-websocket": "^0.5.0",
+    "justypes": "^4.4.1",
+    "ws": "^8.18.3"
   }
 }

package/src/contract.ts

@@ -28,11 +28,18 @@ export interface IAPI {
    * @param nextEventIndex 如果指定, 则会在eventIndex不等于下一个index时抛出EventIndexConflict错误.
    * @throws {EventIndexConflict}
    */
-  appendEvent(
-    namespace: string
-  , itemId: string
-  , event: JSONValue
-  , nextEventIndex?: number
+  appendEvent(...args:
+  | [
+      namespace: string
+    , itemId: string
+    , event: JSONValue
+    ]
+  | [
+      namespace: string
+    , itemId: string
+    , event: JSONValue
+    , nextEventIndex: number
+    ]
   ): null
 
   getEvent(

package/src/estore-client.ts

@@ -1,8 +1,8 @@
 import { createRPCClient } from '@utils/rpc-client.js'
 import { ClientProxy } from 'delight-rpc'
 import { IAPI, INamespaceStats } from './contract.js'
-import { timeoutSignal, withAbortSignal } from 'extra-abort'
-import { isUndefined, JSONValue } from '@blackglory/prelude'
+import { raceAbortSignals, timeoutSignal } from 'extra-abort'
+import { isntUndefined, isUndefined, JSONValue } from '@blackglory/prelude'
 export { INamespaceStats } from './contract.js'
 export { EventIndexConflict } from './contract.js'
 
@@ -17,6 +17,7 @@ export class EStoreClient {
     const { client, close } = await createRPCClient(
       options.server
     , options.retryIntervalForReconnection
+    , options.timeout
     )
     return new EStoreClient(client, close, options.timeout)
   }
@@ -33,65 +34,61 @@ export class EStoreClient {
 
   async getNamespaceStats(
     namespace: string
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<INamespaceStats> {
-    return await this.withTimeout(
-      () => this.client.getNamespaceStats(namespace)
-    , timeout ?? this.timeout
+    return await this.client.getNamespaceStats(
+      namespace
+    , this.withTimeout(signal)
     )
   }
 
-  async getAllNamespaces(timeout?: number): Promise<string[]> {
-    return await this.withTimeout(
-      () => this.client.getAllNamespaces()
-    , timeout ?? this.timeout
-    )
+  async getAllNamespaces(signal?: AbortSignal): Promise<string[]> {
+    return await this.client.getAllNamespaces(this.withTimeout(signal))
   }
 
-  async getAllItemIds(namespace: string, timeout?: number): Promise<string[]> {
-    return await this.withTimeout(
-      () => this.client.getAllItemIds(namespace)
-    , timeout ?? this.timeout
-    )
+  async getAllItemIds(
+    namespace: string
+  , signal?: AbortSignal
+  ): Promise<string[]> {
+    return await this.client.getAllItemIds(namespace, this.withTimeout(signal))
   }
 
   async getAllEvents(
     namespace: string
   , itemId: string
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<JSONValue[]> {
-    return await this.withTimeout(
-      () => this.client.getAllEvents(namespace, itemId)
-    , timeout ?? this.timeout
+    return await this.client.getAllEvents(
+      namespace
+    , itemId
+    , this.withTimeout(signal)
     )
   }
 
-  async clearItemsByNamespace(namespace: string, timeout?: number): Promise<void> {
-    await this.withTimeout(
-      () => this.client.clearItemsByNamespace(namespace)
-    , timeout ?? this.timeout
-    )
+  async clearItemsByNamespace(
+    namespace: string
+  , signal?: AbortSignal
+  ): Promise<void> {
+    await this.client.clearItemsByNamespace(namespace, this.withTimeout(signal))
   }
 
   async removeItem(
     namespace: string
   , itemId: string
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<void> {
-    await this.withTimeout(
-      () => this.client.removeItem(namespace, itemId)
-    , timeout ?? this.timeout
-    )
+    await this.client.removeItem(namespace, itemId, this.withTimeout(signal))
   }
 
   async getItemSize(
     namespace: string
   , itemId: string
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<number> {
-    return await this.withTimeout(
-      () => this.client.getItemSize(namespace, itemId)
-    , timeout ?? this.timeout
+    return await this.client.getItemSize(
+      namespace
+    , itemId
+    , this.withTimeout(signal)
     )
   }
 
@@ -104,40 +101,44 @@ export class EStoreClient {
   , itemId: string
   , event: JSONValue
   , nextEventIndex?: number
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<void> {
-    await this.withTimeout(
-      () => {
-        if (isUndefined(nextEventIndex)) {
-          return this.client.appendEvent(namespace, itemId, event)
-        } else {
-          return this.client.appendEvent(namespace, itemId, event, nextEventIndex)
-        }
-      }
-    , timeout ?? this.timeout
-    )
+    if (isUndefined(nextEventIndex)) {
+      await this.client.appendEvent(
+        namespace
+      , itemId
+      , event
+      , this.withTimeout(signal)
+      )
+    } else {
+      await this.client.appendEvent(
+        namespace
+      , itemId
+      , event
+      , nextEventIndex
+      , this.withTimeout(signal)
+      )
+    }
   }
 
   async getEvent(
     namespace: string
   , itemId: string
   , index: number
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<JSONValue | null> {
-    return await this.withTimeout(
-      () => this.client.getEvent(namespace, itemId, index)
-    , timeout ?? this.timeout
+    return await this.client.getEvent(
+      namespace
+    , itemId
+    , index
+    , this.withTimeout(signal)
     )
   }
 
-  private async withTimeout<T>(
-    fn: () => PromiseLike<T>
-  , timeout: number | undefined = this.timeout
-  ): Promise<T> {
-    if (timeout) {
-      return await withAbortSignal(timeoutSignal(timeout), fn)
-    } else {
-      return await fn()
-    }
+  private withTimeout(signal?: AbortSignal): AbortSignal {
+    return raceAbortSignals([
+      isntUndefined(this.timeout) && timeoutSignal(this.timeout)
+    , signal
+    ])
   }
 }

package/src/utils/rpc-client.browser.ts

@@ -2,17 +2,27 @@ import { IAPI, expectedVersion } from '@src/contract.js'
 import { ClientProxy } from 'delight-rpc'
 import { createClient } from '@delight-rpc/extra-native-websocket'
 import { ExtraNativeWebSocket, autoReconnect } from 'extra-native-websocket'
+import { timeoutSignal } from 'extra-abort'
 
 export async function createRPCClient(
   url: string
 , retryIntervalForReconnection?: number
+, timeoutForConnection?: number
 ): Promise<{
   client: ClientProxy<IAPI>
   close: () => Promise<void>
 }> {
   const ws = new ExtraNativeWebSocket(() => new WebSocket(url))
-  const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection)
-  await ws.connect()
+  const cancelAutoReconnect = autoReconnect(
+    ws
+  , retryIntervalForReconnection
+  , timeoutForConnection
+  )
+  await ws.connect(
+    timeoutForConnection
+  ? timeoutSignal(timeoutForConnection)
+  : undefined
+  )
 
   const [client, closeClient] = createClient<IAPI>(ws, { expectedVersion })
 

package/src/utils/rpc-client.ts

@@ -3,17 +3,27 @@ import { ClientProxy } from 'delight-rpc'
 import { createClient } from '@delight-rpc/extra-websocket'
 import { WebSocket } from 'ws'
 import { ExtraWebSocket, autoReconnect } from 'extra-websocket'
+import { timeoutSignal } from 'extra-abort'
 
 export async function createRPCClient(
   url: string
 , retryIntervalForReconnection?: number
+, timeoutForConnection?: number
 ): Promise<{
   client: ClientProxy<IAPI>
   close: () => Promise<void>
 }> {
   const ws = new ExtraWebSocket(() => new WebSocket(url))
-  const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection)
-  await ws.connect()
+  const cancelAutoReconnect = autoReconnect(
+    ws
+  , retryIntervalForReconnection
+  , timeoutForConnection
+  )
+  await ws.connect(
+    timeoutForConnection
+  ? timeoutSignal(timeoutForConnection)
+  : undefined
+  )
 
   const [client, closeClient] = createClient<IAPI>(ws, { expectedVersion })