@blackglory/cache-js 0.10.4 → 0.11.1

package/README.md

@@ -34,30 +34,37 @@ class CacheClient {
 
   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[]>
 
-  getAllItemKeys(namespace: string, timeout?: number): Promise<string[]>
+  getAllItemKeys(namespace: string, signal?: AbortSignal): Promise<string[]>
 
-  hasItem(namespace: string, itemKey: string, timeout?: number): Promise<boolean>
+  hasItem(
+    namespace: string
+  , itemKey: string
+  , signal?: AbortSignal
+  ): Promise<boolean>
 
   getItem(
     namespace: string
   , itemKey: string
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<IItem | null>
 
   getItemValue(
     namespace: string
   , itemKey: string
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<JSONValue | null>
 
   getItemValues(
     namespace: string
   , itemKeys: string[]
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<Array<JSONValue | null>>
 
   setItem(
@@ -65,11 +72,15 @@ class CacheClient {
   , itemKey: string
   , itemValue: JSONValue
   , timeToLive: number | null
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<void>
 
-  removeItem(namespace: string, itemKey: string, timeout?: number): Promise<void>
+  removeItem(
+    namespace: string
+  , itemKey: string
+  , signal?: AbortSignal
+  ): Promise<void>
 
-  clearItemsByNamespace(namespace: string, timeout?: number): Promise<void>
+  clearItemsByNamespace(namespace: string, signal?: AbortSignal): Promise<void>
 }
 ```

package/lib/cache-client.d.ts

@@ -15,15 +15,15 @@ export declare class CacheClient {
     static create(options: ICacheClientOptions): Promise<CacheClient>;
     private constructor();
     close(): Promise<void>;
-    getNamespaceStats(namespace: string, timeout?: number): Promise<INamespaceStats>;
-    getAllNamespaces(timeout?: number): Promise<string[]>;
-    getAllItemKeys(namespace: string, timeout?: number): Promise<string[]>;
-    hasItem(namespace: string, itemKey: string, timeout?: number): Promise<boolean>;
-    getItem(namespace: string, itemKey: string, timeout?: number): Promise<IItem | null>;
-    getItemValue(namespace: string, itemKey: string, timeout?: number): Promise<JSONValue | null>;
-    getItemValues(namespace: string, itemKeys: string[], timeout?: number): Promise<Array<JSONValue | null>>;
-    setItem(namespace: string, itemKey: string, itemValue: JSONValue, timeToLive: number | null, timeout?: number): Promise<void>;
-    removeItem(namespace: string, itemKey: string, timeout?: number): Promise<void>;
-    clearItemsByNamespace(namespace: string, timeout?: number): Promise<void>;
+    getNamespaceStats(namespace: string, signal?: AbortSignal): Promise<INamespaceStats>;
+    getAllNamespaces(signal?: AbortSignal): Promise<string[]>;
+    getAllItemKeys(namespace: string, signal?: AbortSignal): Promise<string[]>;
+    hasItem(namespace: string, itemKey: string, signal?: AbortSignal): Promise<boolean>;
+    getItem(namespace: string, itemKey: string, signal?: AbortSignal): Promise<IItem | null>;
+    getItemValue(namespace: string, itemKey: string, signal?: AbortSignal): Promise<JSONValue | null>;
+    getItemValues(namespace: string, itemKeys: string[], signal?: AbortSignal): Promise<Array<JSONValue | null>>;
+    setItem(namespace: string, itemKey: string, itemValue: JSONValue, timeToLive: number | null, signal?: AbortSignal): Promise<void>;
+    removeItem(namespace: string, itemKey: string, signal?: AbortSignal): Promise<void>;
+    clearItemsByNamespace(namespace: string, signal?: AbortSignal): Promise<void>;
     private withTimeout;
 }

package/lib/cache-client.js

@@ -1,6 +1,11 @@
 import { createRPCClient } from "./utils/rpc-client.js";
-import { timeoutSignal, withAbortSignal } from 'extra-abort';
+import { raceAbortSignals, timeoutSignal, withAbortSignal } from 'extra-abort';
+import { isntUndefined } from '@blackglory/prelude';
 export class CacheClient {
+    static async create(options) {
+        const { client, batchClient, proxy, close } = await createRPCClient(options.server, options.retryIntervalForReconnection, options.timeout);
+        return new CacheClient(client, batchClient, proxy, close, options.timeout);
+    }
     constructor(client, batchClient, batchProxy, closeClients, timeout) {
         this.client = client;
         this.batchClient = batchClient;
@@ -8,53 +13,47 @@ export class CacheClient {
         this.closeClients = closeClients;
         this.timeout = timeout;
     }
-    static async create(options) {
-        const { client, batchClient, proxy, close } = await createRPCClient(options.server, options.retryIntervalForReconnection);
-        return new CacheClient(client, batchClient, proxy, 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 getNamespaceStats(namespace, signal) {
+        return await this.client.getNamespaceStats(namespace, this.withTimeout(signal));
     }
-    async getAllNamespaces(timeout) {
-        return await this.withTimeout(() => this.client.getAllNamespaces(), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async getAllNamespaces(signal) {
+        return await this.client.getAllNamespaces(this.withTimeout(signal));
     }
-    async getAllItemKeys(namespace, timeout) {
-        return await this.withTimeout(() => this.client.getAllItemKeys(namespace), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async getAllItemKeys(namespace, signal) {
+        return await this.client.getAllItemKeys(namespace, this.withTimeout(signal));
     }
-    async hasItem(namespace, itemKey, timeout) {
-        return await this.withTimeout(() => this.client.hasItem(namespace, itemKey), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async hasItem(namespace, itemKey, signal) {
+        return await this.client.hasItem(namespace, itemKey, this.withTimeout(signal));
     }
-    async getItem(namespace, itemKey, timeout) {
-        return await this.withTimeout(() => this.client.getItem(namespace, itemKey), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async getItem(namespace, itemKey, signal) {
+        return await this.client.getItem(namespace, itemKey, this.withTimeout(signal));
     }
-    async getItemValue(namespace, itemKey, timeout) {
-        return await this.withTimeout(() => this.client.getItemValue(namespace, itemKey), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async getItemValue(namespace, itemKey, signal) {
+        return await this.client.getItemValue(namespace, itemKey, this.withTimeout(signal));
     }
-    async getItemValues(namespace, itemKeys, timeout) {
-        return await this.withTimeout(async () => {
+    async getItemValues(namespace, itemKeys, signal) {
+        return await withAbortSignal(this.withTimeout(signal), async () => {
             const results = await this.batchClient.parallel(...itemKeys.map(key => this.batchProxy.getItemValue(namespace, key)));
             return results.map(result => result.unwrap());
-        }, timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+        });
     }
-    async setItem(namespace, itemKey, itemValue, timeToLive, timeout) {
-        await this.withTimeout(() => this.client.setItem(namespace, itemKey, itemValue, timeToLive), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async setItem(namespace, itemKey, itemValue, timeToLive, signal) {
+        await this.client.setItem(namespace, itemKey, itemValue, timeToLive, this.withTimeout(signal));
     }
-    async removeItem(namespace, itemKey, timeout) {
-        await this.withTimeout(() => this.client.removeItem(namespace, itemKey), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async removeItem(namespace, itemKey, signal) {
+        await this.client.removeItem(namespace, itemKey, this.withTimeout(signal));
     }
-    async clearItemsByNamespace(namespace, timeout) {
-        await this.withTimeout(() => this.client.clearItemsByNamespace(namespace), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    async clearItemsByNamespace(namespace, signal) {
+        await this.client.clearItemsByNamespace(namespace, this.withTimeout(signal));
     }
-    async withTimeout(fn, timeout = this.timeout) {
-        if (timeout) {
-            return await withAbortSignal(timeoutSignal(timeout), fn);
-        }
-        else {
-            return await fn();
-        }
+    withTimeout(signal) {
+        return raceAbortSignals([
+            isntUndefined(this.timeout) && timeoutSignal(this.timeout),
+            signal
+        ]);
     }
 }
 //# sourceMappingURL=cache-client.js.map

package/lib/cache-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache-client.js","sourceRoot":"","sources":["../src/cache-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cache-client.js","sourceRoot":"","sources":["../src/cache-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, BatchClient, BatchClientProxy } from 'delight-rpc';
-export declare function createRPCClient(url: string, retryIntervalForReconnection?: number): Promise<{
+export declare function createRPCClient(url: string, retryIntervalForReconnection?: number, timeout?: number): Promise<{
     client: ClientProxy<IAPI>;
     batchClient: BatchClient<IAPI>;
     proxy: BatchClientProxy<IAPI, unknown>;

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

@@ -2,10 +2,13 @@ import { expectedVersion } from "../contract.js";
 import { createBatchProxy } from 'delight-rpc';
 import { createClient, createBatchClient } 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, timeout) {
     const ws = new ExtraNativeWebSocket(() => new WebSocket(url));
-    const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection);
-    await ws.connect();
+    const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection, timeout);
+    await ws.connect(timeout
+        ? timeoutSignal(timeout)
+        : undefined);
     const [client, closeClient] = createClient(ws, { expectedVersion });
     const [batchClient, closeBatchClient] = createBatchClient(ws, { expectedVersion });
     const proxy = createBatchProxy();

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;AACxD,OAAO,EAA8C,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC1F,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAA;AACrF,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAE5E,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC;IAOrC,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;IACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,iBAAiB,CAAC,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IAClF,MAAM,KAAK,GAAG,gBAAgB,EAAQ,CAAA;IAEtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;YAClB,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;AACxD,OAAO,EAA8C,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC1F,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAA;AACrF,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,OAAgB;IAOhB,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,OAAO,CACR,CAAA;IACD,MAAM,EAAE,CAAC,OAAO,CACd,OAAO;QACT,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC;QACxB,CAAC,CAAC,SAAS,CACV,CAAA;IAED,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,YAAY,CAAO,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,iBAAiB,CAAC,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IAClF,MAAM,KAAK,GAAG,gBAAgB,EAAQ,CAAA;IAEtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;YAClB,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, BatchClient, BatchClientProxy } from 'delight-rpc';
-export declare function createRPCClient(url: string, retryIntervalForReconnection?: number): Promise<{
+export declare function createRPCClient(url: string, retryIntervalForReconnection?: number, timeout?: number): Promise<{
     client: ClientProxy<IAPI>;
     batchClient: BatchClient<IAPI>;
     proxy: BatchClientProxy<IAPI, unknown>;

package/lib/utils/rpc-client.js

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

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;AACxD,OAAO,EAA8C,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC1F,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAC9E,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;IAOrC,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;IACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,iBAAiB,CAAC,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IAClF,MAAM,KAAK,GAAG,gBAAgB,EAAQ,CAAA;IAEtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;YAClB,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;AACxD,OAAO,EAA8C,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC1F,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/D,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC,EACrC,OAAgB;IAOhB,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,OAAO,CACR,CAAA;IACD,MAAM,EAAE,CAAC,OAAO,CACd,OAAO;QACT,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC;QACxB,CAAC,CAAC,SAAS,CACV,CAAA;IAED,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,YAAY,CAAO,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,iBAAiB,CAAC,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IAClF,MAAM,KAAK,GAAG,gBAAgB,EAAQ,CAAA;IAEtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;YAClB,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/cache-js",
-  "version": "0.10.4",
+  "version": "0.11.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 cache-js --file docker-compose.test.yml build",
-    "docker:test:run": "docker-compose --project-name cache-js --file docker-compose.test.yml run --rm test",
-    "docker:test:clean": "docker-compose --project-name cache-js --file docker-compose.test.yml down",
+    "docker:test:build": "docker compose --project-name cache-js --file docker-compose.test.yml build",
+    "docker:test:run": "docker compose --project-name cache-js --file docker-compose.test.yml run --no-TTY --rm test",
+    "docker:test:clean": "docker compose --project-name cache-js --file docker-compose.test.yml down",
     "release": "standard-version"
   },
   "husky": {
@@ -43,35 +41,33 @@
     }
   },
   "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.27.0",
+    "@types/ws": "^8.18.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.36.0",
+    "eslint": "^9.27.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.5.0",
-    "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.33.0",
+    "typescript-transform-paths": "^3.5.5",
+    "vite": "^6.3.5",
+    "vite-tsconfig-paths": "^5.1.4",
+    "vitest": "^3.1.4"
   },
   "dependencies": {
-    "@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.0",
-    "ws": "^8.13.0"
+    "@blackglory/prelude": "^0.4.0",
+    "@delight-rpc/extra-native-websocket": "^0.6.0",
+    "@delight-rpc/extra-websocket": "^0.7.0",
+    "delight-rpc": "^6.1.2",
+    "extra-abort": "^0.4.0",
+    "extra-native-websocket": "^0.4.1",
+    "extra-websocket": "^0.4.2",
+    "ws": "^8.18.2"
   }
 }

package/src/cache-client.ts

@@ -1,8 +1,8 @@
 import { createRPCClient } from '@utils/rpc-client.js'
 import { ClientProxy, BatchClient, BatchClientProxy } from 'delight-rpc'
 import { IAPI, INamespaceStats, IItem } from './contract.js'
-import { timeoutSignal, withAbortSignal } from 'extra-abort'
-import { JSONValue } from '@blackglory/prelude'
+import { raceAbortSignals, timeoutSignal, withAbortSignal } from 'extra-abort'
+import { isntUndefined, JSONValue } from '@blackglory/prelude'
 export { INamespaceStats, IItem, IItemMetadata } from './contract.js'
 
 export interface ICacheClientOptions {
@@ -16,6 +16,7 @@ export class CacheClient {
     const { client, batchClient, proxy, close } = await createRPCClient(
       options.server
     , options.retryIntervalForReconnection
+    , options.timeout
     )
     return new CacheClient(client, batchClient, proxy, close, options.timeout)
   }
@@ -34,74 +35,68 @@ export class CacheClient {
 
   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 getAllItemKeys(namespace: string, timeout?: number): Promise<string[]> {
-    return await this.withTimeout(
-      () => this.client.getAllItemKeys(namespace)
-    , timeout ?? this.timeout
-    )
+  async getAllItemKeys(
+    namespace: string
+  , signal?: AbortSignal
+  ): Promise<string[]> {
+    return await this.client.getAllItemKeys(namespace, this.withTimeout(signal))
   }
 
   async hasItem(
     namespace: string
   , itemKey: string
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<boolean> {
-    return await this.withTimeout(
-      () => this.client.hasItem(namespace, itemKey)
-    , timeout ?? this.timeout
-    )
+    return await this.client.hasItem(namespace, itemKey, this.withTimeout(signal))
   }
 
   async getItem(
     namespace: string
   , itemKey: string
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<IItem | null> {
-    return await this.withTimeout(
-      () => this.client.getItem(namespace, itemKey)
-    , timeout ?? this.timeout
-    )
+    return await this.client.getItem(namespace, itemKey, this.withTimeout(signal))
   }
 
   async getItemValue(
     namespace: string
   , itemKey: string
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<JSONValue | null> {
-    return await this.withTimeout(
-      () => this.client.getItemValue(namespace, itemKey)
-    , timeout ?? this.timeout
+    return await this.client.getItemValue(
+      namespace
+    , itemKey
+    , this.withTimeout(signal)
     )
   }
 
   async getItemValues(
     namespace: string
   , itemKeys: string[]
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<Array<JSONValue | null>> {
-    return await this.withTimeout(
-      async () => {
+    return await withAbortSignal(
+      this.withTimeout(signal)
+    , async () => {
         const results = await this.batchClient.parallel(
           ...itemKeys.map(key => this.batchProxy.getItemValue(namespace, key))
         )
         return results.map(result => result.unwrap())
       }
-    , timeout ?? this.timeout
     )
   }
 
@@ -110,45 +105,36 @@ export class CacheClient {
   , itemKey: string
   , itemValue: JSONValue
   , timeToLive: number | null
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<void> {
-    await this.withTimeout(
-      () => this.client.setItem(
-        namespace
-      , itemKey
-      , itemValue
-      , timeToLive
-      )
-    , timeout ?? this.timeout
+    await this.client.setItem(
+      namespace
+    , itemKey
+    , itemValue
+    , timeToLive
+    , this.withTimeout(signal)
     )
   }
 
   async removeItem(
     namespace: string
   , itemKey: string
-  , timeout?: number
+  , signal?: AbortSignal
   ): Promise<void> {
-    await this.withTimeout(
-      () => this.client.removeItem(namespace, itemKey)
-    , timeout ?? this.timeout
-    )
+    await this.client.removeItem(namespace, itemKey, 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))
   }
 
-  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,10 +2,12 @@ import { IAPI, expectedVersion } from '@src/contract.js'
 import { ClientProxy, BatchClient, BatchClientProxy, createBatchProxy } from 'delight-rpc'
 import { createClient, createBatchClient } 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
+, timeout?: number
 ): Promise<{
   client: ClientProxy<IAPI>
   batchClient: BatchClient<IAPI>
@@ -13,8 +15,16 @@ export async function createRPCClient(
   close: () => Promise<void>
 }> {
   const ws = new ExtraNativeWebSocket(() => new WebSocket(url))
-  const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection)
-  await ws.connect()
+  const cancelAutoReconnect = autoReconnect(
+    ws
+  , retryIntervalForReconnection
+  , timeout
+  )
+  await ws.connect(
+    timeout
+  ? timeoutSignal(timeout)
+  : undefined
+  )
 
   const [client, closeClient] = createClient<IAPI>(ws, { expectedVersion })
   const [batchClient, closeBatchClient] = createBatchClient(ws, { expectedVersion })

package/src/utils/rpc-client.ts

@@ -2,11 +2,13 @@ import { IAPI, expectedVersion } from '@src/contract.js'
 import { ClientProxy, BatchClient, BatchClientProxy, createBatchProxy } from 'delight-rpc'
 import { createClient, createBatchClient } from '@delight-rpc/extra-websocket'
 import { WebSocket } from 'ws'
+import { timeoutSignal } from 'extra-abort'
 import { ExtraWebSocket, autoReconnect } from 'extra-websocket'
 
 export async function createRPCClient(
   url: string
 , retryIntervalForReconnection?: number
+, timeout?: number
 ): Promise<{
   client: ClientProxy<IAPI>
   batchClient: BatchClient<IAPI>
@@ -14,8 +16,16 @@ export async function createRPCClient(
   close: () => Promise<void>
 }> {
   const ws = new ExtraWebSocket(() => new WebSocket(url))
-  const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection)
-  await ws.connect()
+  const cancelAutoReconnect = autoReconnect(
+    ws
+  , retryIntervalForReconnection
+  , timeout
+  )
+  await ws.connect(
+    timeout
+  ? timeoutSignal(timeout)
+  : undefined
+  )
 
   const [client, closeClient] = createClient<IAPI>(ws, { expectedVersion })
   const [batchClient, closeBatchClient] = createBatchClient(ws, { expectedVersion })