@blackglory/estore-js 0.6.0 → 0.7.0

package/README.md

@@ -54,7 +54,7 @@ export class EStoreClient {
   ): Promise<number>
 
   /**
-   * @param nextEventIndex 如果指定, 则会在eventIndex不等于下一个index时抛出EventIndexConflict错误.
+   * @param nextEventIndex 如果指定, 则会在不匹配下一个index时抛出EventIndexConflict错误.
    * @throws {EventIndexConflict}
    */
   appendEvent(
@@ -65,6 +65,17 @@ export class EStoreClient {
   , signal?: ABortSignal
   ): Promise<void>
 
+  /**
+   * @param lastEventIndex 如果指定, 则会在不匹配最后一个index时抛出EventIndexConflict错误.
+   * @throws {EventIndexConflict}
+   */
+  popEvent(
+    namespace: string
+  , itemId: string
+  , lastEventIndex?: number
+  , signal?: AbortSignal
+  ): Promise<void>
+
   getEvent(
     namespace: string
   , itemId: string

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

@@ -22,6 +22,7 @@ export declare class EStoreClient {
     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>;
+    popEvent(namespace: string, itemId: string, lastEventIndex?: number, signal?: AbortSignal): Promise<void>;
     getEvent(namespace: string, itemId: string, index: number, signal?: AbortSignal): Promise<JSONValue | null>;
     private withTimeout;
 }

package/lib/estore-client.js

@@ -4,7 +4,7 @@ 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);
+        const { client, close } = await createRPCClient(options.server, options.retryIntervalForReconnection, options.timeout);
         return new EStoreClient(client, close, options.timeout);
     }
     constructor(client, closeClients, timeout) {
@@ -44,6 +44,14 @@ export class EStoreClient {
             await this.client.appendEvent(namespace, itemId, event, nextEventIndex, this.withTimeout(signal));
         }
     }
+    async popEvent(namespace, itemId, lastEventIndex, signal) {
+        if (isUndefined(lastEventIndex)) {
+            await this.client.popEvent(namespace, itemId, this.withTimeout(signal));
+        }
+        else {
+            await this.client.popEvent(namespace, itemId, lastEventIndex, this.withTimeout(signal));
+        }
+    }
     async getEvent(namespace, itemId, index, signal) {
         return await this.client.getEvent(namespace, itemId, index, this.withTimeout(signal));
     }

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.6.0",
+  "version": "0.7.0",
   "description": "",
   "keywords": [],
   "files": [
@@ -41,36 +41,36 @@
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/js": "^9.27.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.27.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.33.0",
-    "typescript-transform-paths": "^3.5.5",
-    "vite": "^6.3.5",
-    "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.1.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.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",
-    "justypes": "^4.4.1",
-    "ws": "^8.18.2"
+    "@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

@@ -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)
   }
@@ -92,7 +93,7 @@ export class EStoreClient {
   }
 
   /**
-   * @param nextEventIndex 如果指定, 则会在eventIndex不等于下一个index时抛出EventIndexConflict错误.
+   * @param nextEventIndex 如果指定, 则会在不匹配下一个index时抛出EventIndexConflict错误.
    * @throws {EventIndexConflict}
    */
   async appendEvent(
@@ -120,6 +121,32 @@ export class EStoreClient {
     }
   }
 
+  /**
+   * @param lastEventIndex 如果指定, 则会在不匹配最后一个index时抛出EventIndexConflict错误.
+   * @throws {EventIndexConflict}
+   */
+  async popEvent(
+    namespace: string
+  , itemId: string
+  , lastEventIndex?: number
+  , signal?: AbortSignal
+  ): Promise<void> {
+    if (isUndefined(lastEventIndex)) {
+      await this.client.popEvent(
+        namespace
+      , itemId
+      , this.withTimeout(signal)
+      )
+    } else {
+      await this.client.popEvent(
+        namespace
+      , itemId
+      , lastEventIndex
+      , this.withTimeout(signal)
+      )
+    }
+  }
+
   async getEvent(
     namespace: string
   , itemId: string

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 })