@blackglory/estore-js 0.6.1 → 0.7.1

package/README.md

@@ -13,48 +13,61 @@ interface INamespaceStats {
   items: number
 }
 
-export interface IEStoreClientOptions {
+interface IEStoreClientOptions {
   server: string
   timeout?: number
   retryIntervalForReconnection?: number
 }
 
-export class EStoreClient {
+interface IEStoreClientRequestOptions {
+  signal?: AbortSignal
+  timeout?: number | false
+}
+
+class EStoreClient {
   static create(options: IEStoreClientOptions): Promise<EStoreClient>
 
   close(): Promise<void>
 
   getNamespaceStats(
     namespace: string
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<INamespaceStats>
 
-  getAllNamespaces(signal?: AbortSignal): Promise<string[]>
+  getAllNamespaces(
+    signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
+  ): Promise<string[]>
 
-  getAllItemIds(namespace: string, signal?: AbortSignal): Promise<string[]>
+  getAllItemIds(
+    namespace: string
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
+  ): Promise<string[]>
 
   getAllEvents(
     namespace: string
   , itemId: string
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<JSONValue[]>
 
-  clearItemsByNamespace(namespace: string, signal?: AbortSignal): Promise<void>
+  clearItemsByNamespace(
+    namespace: string
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
+  ): Promise<void>
 
   removeItem(
     namespace: string
   , itemId: string
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<void>
 
   getItemSize(
     namespace: string
   , itemId: string
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<number>
 
   /**
-   * @param nextEventIndex 如果指定, 则会在eventIndex不等于下一个index时抛出EventIndexConflict错误.
+   * @param nextEventIndex 如果指定, 则会在不匹配下一个index时抛出EventIndexConflict错误.
    * @throws {EventIndexConflict}
    */
   appendEvent(
@@ -62,14 +75,25 @@ export class EStoreClient {
   , itemId: string
   , event: JSONValue
   , nextEventIndex?: number
-  , signal?: ABortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
+  ): Promise<void>
+
+  /**
+   * @param lastEventIndex 如果指定, 则会在不匹配最后一个index时抛出EventIndexConflict错误.
+   * @throws {EventIndexConflict}
+   */
+  popEvent(
+    namespace: string
+  , itemId: string
+  , lastEventIndex?: number
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<void>
 
   getEvent(
     namespace: string
   , itemId: string
   , index: number
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<JSONValue | null>
 }
 ```

package/lib/contract.d.ts

@@ -1,6 +1,6 @@
 import { CustomError } from '@blackglory/errors';
 import { JSONValue } from 'justypes';
-export declare const expectedVersion = "^0.4.0";
+export declare const expectedVersion = "^0.4.1";
 export interface INamespaceStats {
     items: number;
 }
@@ -22,6 +22,14 @@ export interface IAPI {
         event: JSONValue,
         nextEventIndex: number
     ]): null;
+    popEvent(...args: [
+        namespace: string,
+        itemId: string
+    ] | [
+        namespace: string,
+        itemId: string,
+        lastEventIndex: number
+    ]): null;
     getEvent(namespace: string, itemId: string, eventIndex: number): JSONValue | null;
 }
 export declare class EventIndexConflict extends CustomError {

package/lib/contract.js

@@ -1,5 +1,5 @@
 import { CustomError } from '@blackglory/errors';
-export const expectedVersion = '^0.4.0';
+export const expectedVersion = '^0.4.1';
 export class EventIndexConflict extends CustomError {
 }
 //# sourceMappingURL=contract.js.map

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;AAgDvC,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;AAgEvC,MAAM,OAAO,kBAAmB,SAAQ,WAAW;CAAG"}

package/lib/estore-client.d.ts

@@ -7,6 +7,10 @@ export interface IEStoreClientOptions {
     timeout?: number;
     retryIntervalForReconnection?: number;
 }
+export interface IEStoreClientRequestOptions {
+    signal?: AbortSignal;
+    timeout?: number | false;
+}
 export declare class EStoreClient {
     private client;
     private closeClients;
@@ -14,14 +18,15 @@ export declare class EStoreClient {
     static create(options: IEStoreClientOptions): Promise<EStoreClient>;
     private constructor();
     close(): Promise<void>;
-    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;
+    getNamespaceStats(namespace: string, signalOrOptions?: AbortSignal | IEStoreClientRequestOptions): Promise<INamespaceStats>;
+    getAllNamespaces(signalOrOptions?: AbortSignal | IEStoreClientRequestOptions): Promise<string[]>;
+    getAllItemIds(namespace: string, signalOrOptions?: AbortSignal | IEStoreClientRequestOptions): Promise<string[]>;
+    getAllEvents(namespace: string, itemId: string, signalOrOptions?: AbortSignal | IEStoreClientRequestOptions): Promise<JSONValue[]>;
+    clearItemsByNamespace(namespace: string, signalOrOptions?: AbortSignal | IEStoreClientRequestOptions): Promise<void>;
+    removeItem(namespace: string, itemId: string, signalOrOptions?: AbortSignal | IEStoreClientRequestOptions): Promise<void>;
+    getItemSize(namespace: string, itemId: string, signalOrOptions?: AbortSignal | IEStoreClientRequestOptions): Promise<number>;
+    appendEvent(namespace: string, itemId: string, event: JSONValue, nextEventIndex?: number, signalOrOptions?: AbortSignal | IEStoreClientRequestOptions): Promise<void>;
+    popEvent(namespace: string, itemId: string, lastEventIndex?: number, signalOrOptions?: AbortSignal | IEStoreClientRequestOptions): Promise<void>;
+    getEvent(namespace: string, itemId: string, index: number, signalOrOptions?: AbortSignal | IEStoreClientRequestOptions): Promise<JSONValue | null>;
+    private createSignal;
 }

package/lib/estore-client.js

@@ -1,6 +1,6 @@
 import { createRPCClient } from "./utils/rpc-client.js";
-import { raceAbortSignals, timeoutSignal } from 'extra-abort';
-import { isntUndefined, isUndefined } from '@blackglory/prelude';
+import { isAbortSignal, raceAbortSignals, timeoutSignal } from 'extra-abort';
+import { isUndefined } from '@blackglory/prelude';
 export { EventIndexConflict } from './contract.js';
 export class EStoreClient {
     static async create(options) {
@@ -15,42 +15,54 @@ export class EStoreClient {
     async close() {
         await this.closeClients();
     }
-    async getNamespaceStats(namespace, signal) {
-        return await this.client.getNamespaceStats(namespace, this.withTimeout(signal));
+    async getNamespaceStats(namespace, signalOrOptions) {
+        return await this.client.getNamespaceStats(namespace, this.createSignal(signalOrOptions));
     }
-    async getAllNamespaces(signal) {
-        return await this.client.getAllNamespaces(this.withTimeout(signal));
+    async getAllNamespaces(signalOrOptions) {
+        return await this.client.getAllNamespaces(this.createSignal(signalOrOptions));
     }
-    async getAllItemIds(namespace, signal) {
-        return await this.client.getAllItemIds(namespace, this.withTimeout(signal));
+    async getAllItemIds(namespace, signalOrOptions) {
+        return await this.client.getAllItemIds(namespace, this.createSignal(signalOrOptions));
     }
-    async getAllEvents(namespace, itemId, signal) {
-        return await this.client.getAllEvents(namespace, itemId, this.withTimeout(signal));
+    async getAllEvents(namespace, itemId, signalOrOptions) {
+        return await this.client.getAllEvents(namespace, itemId, this.createSignal(signalOrOptions));
     }
-    async clearItemsByNamespace(namespace, signal) {
-        await this.client.clearItemsByNamespace(namespace, this.withTimeout(signal));
+    async clearItemsByNamespace(namespace, signalOrOptions) {
+        await this.client.clearItemsByNamespace(namespace, this.createSignal(signalOrOptions));
     }
-    async removeItem(namespace, itemId, signal) {
-        await this.client.removeItem(namespace, itemId, this.withTimeout(signal));
+    async removeItem(namespace, itemId, signalOrOptions) {
+        await this.client.removeItem(namespace, itemId, this.createSignal(signalOrOptions));
     }
-    async getItemSize(namespace, itemId, signal) {
-        return await this.client.getItemSize(namespace, itemId, this.withTimeout(signal));
+    async getItemSize(namespace, itemId, signalOrOptions) {
+        return await this.client.getItemSize(namespace, itemId, this.createSignal(signalOrOptions));
     }
-    async appendEvent(namespace, itemId, event, nextEventIndex, signal) {
+    async appendEvent(namespace, itemId, event, nextEventIndex, signalOrOptions) {
         if (isUndefined(nextEventIndex)) {
-            await this.client.appendEvent(namespace, itemId, event, this.withTimeout(signal));
+            await this.client.appendEvent(namespace, itemId, event, this.createSignal(signalOrOptions));
         }
         else {
-            await this.client.appendEvent(namespace, itemId, event, nextEventIndex, this.withTimeout(signal));
+            await this.client.appendEvent(namespace, itemId, event, nextEventIndex, this.createSignal(signalOrOptions));
         }
     }
-    async getEvent(namespace, itemId, index, signal) {
-        return await this.client.getEvent(namespace, itemId, index, this.withTimeout(signal));
+    async popEvent(namespace, itemId, lastEventIndex, signalOrOptions) {
+        if (isUndefined(lastEventIndex)) {
+            await this.client.popEvent(namespace, itemId, this.createSignal(signalOrOptions));
+        }
+        else {
+            await this.client.popEvent(namespace, itemId, lastEventIndex, this.createSignal(signalOrOptions));
+        }
+    }
+    async getEvent(namespace, itemId, index, signalOrOptions) {
+        return await this.client.getEvent(namespace, itemId, index, this.createSignal(signalOrOptions));
     }
-    withTimeout(signal) {
+    createSignal(signalOrOptions = {}) {
+        var _a;
+        const options = isAbortSignal(signalOrOptions)
+            ? { signal: signalOrOptions }
+            : signalOrOptions;
         return raceAbortSignals([
-            isntUndefined(this.timeout) && timeoutSignal(this.timeout),
-            signal
+            options.signal,
+            options.timeout !== false && ((_a = (options.timeout && timeoutSignal(options.timeout))) !== null && _a !== void 0 ? _a : (this.timeout && timeoutSignal(this.timeout)))
         ]);
     }
 }

package/lib/estore-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"estore-client.js","sourceRoot":"","sources":["../src/estore-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,8BAA4B;AAGtD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAa,MAAM,qBAAqB,CAAA;AAE3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAQlD,MAAM,OAAO,YAAY;IACvB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAA6B;QAC/C,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,eAAe,CAC7C,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,4BAA4B,EACpC,OAAO,CAAC,OAAO,CAChB,CAAA;QACD,OAAO,IAAI,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;IACzD,CAAC;IAED,YACU,MAAyB,EACzB,YAAiC,EACjC,OAAgB;QAFhB,WAAM,GAAN,MAAM,CAAmB;QACzB,iBAAY,GAAZ,YAAY,CAAqB;QACjC,YAAO,GAAP,OAAO,CAAS;IACvB,CAAC;IAEJ,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,SAAiB,EACjB,MAAoB;QAEpB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CACxC,SAAS,EACT,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CACzB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAoB;QACzC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAA;IACrE,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,SAAiB,EACjB,MAAoB;QAEpB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7E,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,SAAiB,EACjB,MAAc,EACd,MAAoB;QAEpB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CACnC,SAAS,EACT,MAAM,EACN,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CACzB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,SAAiB,EACjB,MAAoB;QAEpB,MAAM,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAA;IAC9E,CAAC;IAED,KAAK,CAAC,UAAU,CACd,SAAiB,EACjB,MAAc,EACd,MAAoB;QAEpB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAA;IAC3E,CAAC;IAED,KAAK,CAAC,WAAW,CACf,SAAiB,EACjB,MAAc,EACd,MAAoB;QAEpB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAClC,SAAS,EACT,MAAM,EACN,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CACzB,CAAA;IACH,CAAC;IAMD,KAAK,CAAC,WAAW,CACf,SAAiB,EACjB,MAAc,EACd,KAAgB,EAChB,cAAuB,EACvB,MAAoB;QAEpB,IAAI,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAC3B,SAAS,EACT,MAAM,EACN,KAAK,EACL,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CACzB,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAC3B,SAAS,EACT,MAAM,EACN,KAAK,EACL,cAAc,EACd,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CACzB,CAAA;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,SAAiB,EACjB,MAAc,EACd,KAAa,EACb,MAAoB;QAEpB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAC/B,SAAS,EACT,MAAM,EACN,KAAK,EACL,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CACzB,CAAA;IACH,CAAC;IAEO,WAAW,CAAC,MAAoB;QACtC,OAAO,gBAAgB,CAAC;YACtB,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC;YAC1D,MAAM;SACP,CAAC,CAAA;IACJ,CAAC;CACF"}
+{"version":3,"file":"estore-client.js","sourceRoot":"","sources":["../src/estore-client.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blackglory/estore-js",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "",
   "keywords": [],
   "files": [
@@ -41,36 +41,36 @@
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/js": "^9.31.0",
+    "@commitlint/cli": "^20.4.4",
+    "@commitlint/config-conventional": "^20.4.4",
+    "@eslint/js": "^10.0.1",
     "@types/ws": "^8.18.1",
-    "cross-env": "^7.0.3",
-    "eslint": "^9.31.0",
-    "extra-utils": "^5.19.0",
+    "cross-env": "^10.1.0",
+    "eslint": "^10.0.3",
+    "extra-utils": "^6.1.0",
     "husky": "4",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^6.0.1",
+    "rimraf": "^6.1.3",
     "standard-version": "^9.3.2",
     "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"
+    "typescript": "5.9.3",
+    "typescript-eslint": "^8.57.0",
+    "typescript-transform-paths": "^3.5.6",
+    "vite": "^8.0.0",
+    "vite-tsconfig-paths": "^6.1.1",
+    "vitest": "^4.1.0"
   },
   "dependencies": {
-    "@blackglory/errors": "^3.0.3",
+    "@blackglory/errors": "^3.1.0",
     "@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"
+    "@delight-rpc/extra-native-websocket": "^0.6.6",
+    "@delight-rpc/extra-websocket": "^0.7.8",
+    "delight-rpc": "^7.0.0",
+    "extra-abort": "^0.4.1",
+    "extra-native-websocket": "^0.5.1",
+    "extra-websocket": "^0.5.1",
+    "justypes": "^4.5.0",
+    "ws": "^8.19.0"
   }
 }

package/src/contract.ts

@@ -1,7 +1,7 @@
 import { CustomError } from '@blackglory/errors'
 import { JSONValue } from 'justypes'
 
-export const expectedVersion = '^0.4.0'
+export const expectedVersion = '^0.4.1'
 
 export interface INamespaceStats {
   items: number
@@ -25,7 +25,7 @@ export interface IAPI {
   getItemSize(namespace: string, itemId: string): number
 
   /**
-   * @param nextEventIndex 如果指定, 则会在eventIndex不等于下一个index时抛出EventIndexConflict错误.
+   * @param nextEventIndex 如果指定, 则会在不匹配下一个index时抛出EventIndexConflict错误.
    * @throws {EventIndexConflict}
    */
   appendEvent(...args:
@@ -42,6 +42,22 @@ export interface IAPI {
     ]
   ): null
 
+  /**
+   * @param lastEventIndex 如果指定, 则会在不匹配最后一个index时抛出EventIndexConflict错误.
+   * @throws {EventIndexConflict}
+   */
+  popEvent(...args:
+  | [
+      namespace: string
+    , itemId: string
+    ]
+  | [
+      namespace: string
+    , itemId: string
+    , lastEventIndex: number
+    ]
+  ): null
+
   getEvent(
     namespace: string
   , itemId: string

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 { raceAbortSignals, timeoutSignal } from 'extra-abort'
-import { isntUndefined, isUndefined, JSONValue } from '@blackglory/prelude'
+import { isAbortSignal, raceAbortSignals, timeoutSignal } from 'extra-abort'
+import { isUndefined, JSONValue } from '@blackglory/prelude'
 export { INamespaceStats } from './contract.js'
 export { EventIndexConflict } from './contract.js'
 
@@ -12,6 +12,11 @@ export interface IEStoreClientOptions {
   retryIntervalForReconnection?: number
 }
 
+export interface IEStoreClientRequestOptions {
+  signal?: AbortSignal
+  timeout?: number | false
+}
+
 export class EStoreClient {
   static async create(options: IEStoreClientOptions): Promise<EStoreClient> {
     const { client, close } = await createRPCClient(
@@ -34,66 +39,80 @@ export class EStoreClient {
 
   async getNamespaceStats(
     namespace: string
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<INamespaceStats> {
     return await this.client.getNamespaceStats(
       namespace
-    , this.withTimeout(signal)
+    , this.createSignal(signalOrOptions)
     )
   }
 
-  async getAllNamespaces(signal?: AbortSignal): Promise<string[]> {
-    return await this.client.getAllNamespaces(this.withTimeout(signal))
+  async getAllNamespaces(
+    signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
+  ): Promise<string[]> {
+    return await this.client.getAllNamespaces(
+      this.createSignal(signalOrOptions)
+    )
   }
 
   async getAllItemIds(
     namespace: string
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<string[]> {
-    return await this.client.getAllItemIds(namespace, this.withTimeout(signal))
+    return await this.client.getAllItemIds(
+      namespace
+    , this.createSignal(signalOrOptions)
+    )
   }
 
   async getAllEvents(
     namespace: string
   , itemId: string
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<JSONValue[]> {
     return await this.client.getAllEvents(
       namespace
     , itemId
-    , this.withTimeout(signal)
+    , this.createSignal(signalOrOptions)
     )
   }
 
   async clearItemsByNamespace(
     namespace: string
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<void> {
-    await this.client.clearItemsByNamespace(namespace, this.withTimeout(signal))
+    await this.client.clearItemsByNamespace(
+      namespace
+    , this.createSignal(signalOrOptions)
+    )
   }
 
   async removeItem(
     namespace: string
   , itemId: string
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<void> {
-    await this.client.removeItem(namespace, itemId, this.withTimeout(signal))
+    await this.client.removeItem(
+      namespace
+    , itemId
+    , this.createSignal(signalOrOptions)
+    )
   }
 
   async getItemSize(
     namespace: string
   , itemId: string
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<number> {
     return await this.client.getItemSize(
       namespace
     , itemId
-    , this.withTimeout(signal)
+    , this.createSignal(signalOrOptions)
     )
   }
 
   /**
-   * @param nextEventIndex 如果指定, 则会在eventIndex不等于下一个index时抛出EventIndexConflict错误.
+   * @param nextEventIndex 如果指定, 则会在不匹配下一个index时抛出EventIndexConflict错误.
    * @throws {EventIndexConflict}
    */
   async appendEvent(
@@ -101,14 +120,14 @@ export class EStoreClient {
   , itemId: string
   , event: JSONValue
   , nextEventIndex?: number
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<void> {
     if (isUndefined(nextEventIndex)) {
       await this.client.appendEvent(
         namespace
       , itemId
       , event
-      , this.withTimeout(signal)
+      , this.createSignal(signalOrOptions)
       )
     } else {
       await this.client.appendEvent(
@@ -116,7 +135,33 @@ export class EStoreClient {
       , itemId
       , event
       , nextEventIndex
-      , this.withTimeout(signal)
+      , this.createSignal(signalOrOptions)
+      )
+    }
+  }
+
+  /**
+   * @param lastEventIndex 如果指定, 则会在不匹配最后一个index时抛出EventIndexConflict错误.
+   * @throws {EventIndexConflict}
+   */
+  async popEvent(
+    namespace: string
+  , itemId: string
+  , lastEventIndex?: number
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
+  ): Promise<void> {
+    if (isUndefined(lastEventIndex)) {
+      await this.client.popEvent(
+        namespace
+      , itemId
+      , this.createSignal(signalOrOptions)
+      )
+    } else {
+      await this.client.popEvent(
+        namespace
+      , itemId
+      , lastEventIndex
+      , this.createSignal(signalOrOptions)
       )
     }
   }
@@ -125,20 +170,29 @@ export class EStoreClient {
     namespace: string
   , itemId: string
   , index: number
-  , signal?: AbortSignal
+  , signalOrOptions?: AbortSignal | IEStoreClientRequestOptions
   ): Promise<JSONValue | null> {
     return await this.client.getEvent(
       namespace
     , itemId
     , index
-    , this.withTimeout(signal)
+    , this.createSignal(signalOrOptions)
     )
   }
 
-  private withTimeout(signal?: AbortSignal): AbortSignal {
+  private createSignal(
+    signalOrOptions: AbortSignal | IEStoreClientRequestOptions = {}
+  ): AbortSignal {
+    const options: IEStoreClientRequestOptions = isAbortSignal(signalOrOptions)
+                                               ? { signal: signalOrOptions }
+                                               : signalOrOptions
+
     return raceAbortSignals([
-      isntUndefined(this.timeout) && timeoutSignal(this.timeout)
-    , signal
+      options.signal
+    , options.timeout !== false && (
+        (options.timeout && timeoutSignal(options.timeout)) ??
+        (this.timeout && timeoutSignal(this.timeout))
+      )
     ])
   }
 }