@blackglory/estore-js 0.2.4 → 0.4.0

package/README.md

@@ -9,247 +9,52 @@ yarn add @blackglory/estore-js
 ## API
 ### EStoreClient
 ```ts
-interface IInfo {
+interface IStats {
   namespace: string
   items: number
 }
 
 interface IEStoreClientOptions {
   server: string
-  token?: string
-  basicAuth?: {
-    username: string
-    password: string
-  }
-  keepalive?: boolean
   timeout?: number
-}
-
-interface IEStoreClientRequestOptions {
-  signal?: AbortSignal
-  token?: string
-  keepalive?: boolean
-  timeout?: number | false
-}
-
-interface IEStoreClientRequestOptionsWithoutToken {
-  signal?: AbortSignal
-  keepalive?: boolean
-  timeout?: number | false
+  retryIntervalForReconnection?: number
 }
 
 class EStoreClient {
-  constructor(options: IEStoreClientOptions)
-
-  append<T>(
-    namespace: string
-  , itemId: string
-  , payload: T
-  , index?: number
-  , options: IEStoreClientRequestOptions = {}
-  ): Promise<void>
+  static create(options: IEStoreClientOptions): Promise<EStoreClient>
 
-  getEvent<T>(
-    namespace: string
-  , itemId: string
-  , index: number
-  , options: IEStoreClientRequestOptions = {}
-  ): Promise<T | undefined>
+  close(): Promise<void>
 
-  getEvents<T>(
+  stats(namespace: string, timeout?: number): Promise<IStats>
+  getAllNamespaces(timeout?: number): Promise<string[]>
+  getAllItemIds(namespace: string, timeout?: number): Promise<string[]>
+  getAllEvents(
     namespace: string
   , itemId: string
-  , options: IEStoreClientRequestOptions = {}
-  ): Promise<T[] | undefined>
-
-  getSize(
-    namespace: string
-  , itemId: string
-  , options: IEStoreClientRequestOptions = {}
-  ): Promise<number>
-
-  has(
-    namespace: string
-  , itemId: string
-  , options: IEStoreClientRequestOptions = {}
-  ): Promise<boolean>
-
-  del(
-    namespace: string
-  , itemId: string
-  , options: IEStoreClientRequestOptions = {}
-  ): Promise<void>
-
-  clear(
-    namespace: string
-  , options: IEStoreClientRequestOptions = {}
-  ): Promise<void> 
-
-  getAllItemIds(
-    namespace: string
-  , options: IEStoreClientRequestOptions = {}
+  , timeout?: number
   ): Promise<string[]>
 
-  getAllNamespaces(
-    options: IEStoreClientRequestOptionsWithoutToken = {}
-  ): Promise<string[]>
+  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>
 
-  stats(
+  /**
+   * @param nextEventIndex 如果指定, 则会在eventIndex不等于下一个index时抛出EventIndexConflict错误.
+   * @throws {IllegalIndex}
+   */
+  appendEvent(
     namespace: string
-  , options: IEStoreClientRequestOptionsWithoutToken = {}
-  ): Promise<IInfo>
-}
-```
-
-### EStoreManager
-```ts
-interface IEStoreManagerRequestOptions {
-  signal?: AbortSignal
-  keepalive?: boolean
-  timeout?: number | false
-}
-
-interface IEStoreManagerOptions {
-  server: string
-  adminPassword: string
-  keepalive?: boolean
-  timeout?: number
-}
-
-class EStoreManager {
-  constructor(options: IEStoreManagerOptions)
-
-  JsonSchema: JsonSchemaManager
-  Blacklist: BlacklistManager
-  Whitelist: WhitelistManager
-  TokenPolicy: TokenPolicyManager
-  Token: TokenManager
-}
-```
-
-#### JsonSchemaManager
-```ts
-class JsonSchemaManager {
-  getNamespaces(options: IEStoreManagerRequestOptions = {}): Promise<string[]>
-  get(namespace: string, options: IEStoreManagerRequestOptions = {}): Promise<unknown>
-  set(
-    namespace: string
-  , schema: Json
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
-  remove(
-    namespace: string
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
-}
-```
-
-#### BlacklistManager
-```ts
-class BlacklistManager {
-  getNamespaces(options: IEStoreManagerRequestOptions = {}): Promise<string[]>
-  add(namespace: string, options: IEStoreManagerRequestOptions = {}): Promise<void>
-  remove(namespace: string, options: IEStoreManagerRequestOptions = {}): Promise<void>
-}
-```
-
-#### WhitelistManager
-```ts
-class WhitelistManager {
-  getNamespaces(options: IEStoreManagerRequestOptions = {}): Promise<string[]>
-  add(namespace: string, options: IEStoreManagerRequestOptions = {}): Promise<void>
-  remove(namespace: string, options: IEStoreManagerRequestOptions = {}): Promise<void>
-}
-```
-
-#### TokenPolicyManager
-```ts
-interface ITokenPolicy {
-  writeTokenRequired: boolean | null
-  readTokenRequired: boolean | null
-  deleteTokenRequired: boolean | null
-}
-
-class TokenPolicyManager {
-  getNamespaces(options: IEStoreManagerRequestOptions = {}): Promise<string[]>
-  get(
-    namespace: string
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<ITokenPolicy>
-  setWriteTokenRequired(
-    namespace: string
-  , val: boolean
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
-  removeWriteTokenRequired(
-    namespace: string
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
-  setReadTokenRequired(
-    namespace: string
-  , val: boolean
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
-  removeReadTokenRequired(
-    namespace: string
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
-  setDeleteTokenRequired(
-    namespace: string
-  , val: boolean
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
-  removeDeleteTokenRequired(
-    namespace: string
-  , options: IEStoreManagerRequestOptions = {}
+  , itemId: string
+  , event: string
+  , nextEventIndex?: number
+  , timeout?: number
   ): Promise<void>
-}
-```
 
-#### TokenManager
-```ts
-interface ITokenInfo {
-  token: string
-  write: boolean
-  read: boolean
-  delete: boolean
-}
-
-class TokenManager {
-  getNamespaces(options: IEStoreManagerRequestOptions = {}): Promise<string[]>
-  getTokens(
-    namespace: string
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<ITokenInfo[]>
-  addWriteToken(
-    namespace: string
-  , token: string
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
-  removeWriteToken(
+  getEvent(
     namespace: string
-  , token: string
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
-  addReadToken(
-    namespace: string
-  , token: string
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
-  removeReadToken(
-    namespace: string
-  , token: string
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
-  addDeleteToken(
-    namespace: string
-  , token: string
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
-  removeDeleteToken(
-    namespace: string
-  , token: string
-  , options: IEStoreManagerRequestOptions = {}
-  ): Promise<void>
+  , itemId: string
+  , index: number
+  , timeout?: number
+  ): Promise<string | null>
 }
 ```

package/lib/contract.d.ts

@@ -0,0 +1,16 @@
+export declare const expectedVersion = "^0.3.0";
+export interface IStats {
+    namespace: string;
+    items: number;
+}
+export interface IAPI {
+    stats(namespace: string): IStats;
+    getAllNamespaces(): string[];
+    getAllItemIds(namespace: string): string[];
+    getAllEvents(namespace: string, itemId: string): string[];
+    clearItemsByNamespace(namespace: string): null;
+    removeItem(namespace: string, itemId: string): null;
+    getItemSize(namespace: string, itemId: string): number;
+    appendEvent(namespace: string, itemId: string, event: string, nextEventIndex?: number): null;
+    getEvent(namespace: string, itemId: string, eventIndex: number): string | null;
+}

package/lib/contract.js

@@ -0,0 +1,2 @@
+export const expectedVersion = '^0.3.0';
+//# sourceMappingURL=contract.js.map

package/lib/contract.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,QAAQ,CAAA"}

package/lib/estore-client.d.ts

@@ -0,0 +1,27 @@
+import { IStats } from './contract.js';
+export { IStats } from './contract.js';
+export interface IEStoreClientOptions {
+    server: string;
+    timeout?: number;
+    retryIntervalForReconnection?: number;
+}
+export declare class EStoreClient {
+    private client;
+    private batchClient;
+    private batchProxy;
+    private closeClients;
+    private timeout?;
+    static create(options: IEStoreClientOptions): Promise<EStoreClient>;
+    private constructor();
+    close(): Promise<void>;
+    stats(namespace: string, timeout?: number): Promise<IStats>;
+    getAllNamespaces(timeout?: number): Promise<string[]>;
+    getAllItemIds(namespace: string, timeout?: number): Promise<string[]>;
+    getAllEvents(namespace: string, itemId: string, timeout?: number): Promise<string[]>;
+    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: string, nextEventIndex?: number, timeout?: number): Promise<void>;
+    getEvent(namespace: string, itemId: string, index: number, timeout?: number): Promise<string | null>;
+    private withTimeout;
+}

package/lib/estore-client.js

@@ -0,0 +1,62 @@
+import { createRPCClient } from "./utils/rpc-client.js";
+import { timeoutSignal, withAbortSignal } from 'extra-abort';
+import { isUndefined } from '@blackglory/prelude';
+export class EStoreClient {
+    constructor(client, batchClient, batchProxy, closeClients, timeout) {
+        this.client = client;
+        this.batchClient = batchClient;
+        this.batchProxy = batchProxy;
+        this.closeClients = closeClients;
+        this.timeout = timeout;
+    }
+    static async create(options) {
+        const { client, batchClient, proxy, close } = await createRPCClient(options.server);
+        return new EStoreClient(client, batchClient, proxy, close, options.timeout);
+    }
+    async close() {
+        await this.closeClients();
+    }
+    async stats(namespace, timeout) {
+        return await this.withTimeout(() => this.client.stats(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 getAllEvents(namespace, itemId, timeout) {
+        return await this.withTimeout(() => this.client.getAllEvents(namespace, itemId), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    }
+    async clearItemsByNamespace(namespace, timeout) {
+        await this.withTimeout(() => this.client.clearItemsByNamespace(namespace), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    }
+    async removeItem(namespace, itemId, timeout) {
+        await this.withTimeout(() => this.client.removeItem(namespace, itemId), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    }
+    async getItemSize(namespace, itemId, timeout) {
+        return await this.withTimeout(() => this.client.getItemSize(namespace, itemId), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    }
+    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 getEvent(namespace, itemId, index, timeout) {
+        return await this.withTimeout(() => this.client.getEvent(namespace, itemId, index), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    }
+    async withTimeout(fn, timeout = this.timeout) {
+        if (timeout) {
+            return await withAbortSignal(timeoutSignal(timeout), fn);
+        }
+        else {
+            return await fn();
+        }
+    }
+}
+//# sourceMappingURL=estore-client.js.map

package/lib/estore-client.js.map

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

package/lib/index.d.ts

@@ -0,0 +1 @@
+export * from './estore-client.js';

package/lib/index.js

@@ -0,0 +1,2 @@
+export * from './estore-client.js';
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

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

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

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

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

@@ -0,0 +1,24 @@
+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) {
+    const ws = new ExtraNativeWebSocket(() => new WebSocket(url));
+    const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection);
+    await ws.connect();
+    const [client, closeClient] = createClient(ws, { expectedVersion });
+    const [batchClient, closeBatchClient] = createBatchClient(ws, { expectedVersion });
+    const proxy = createBatchProxy();
+    return {
+        client,
+        batchClient,
+        proxy,
+        close: async () => {
+            closeClient();
+            closeBatchClient();
+            cancelAutoReconnect();
+            await ws.close();
+        }
+    };
+}
+//# sourceMappingURL=rpc-client.browser.js.map

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

@@ -0,0 +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"}

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

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

package/lib/utils/rpc-client.js

@@ -0,0 +1,25 @@
+import { expectedVersion } from "../contract.js";
+import { createBatchProxy } from 'delight-rpc';
+import { createClient, createBatchClient } from '@delight-rpc/extra-websocket';
+import { WebSocket } from 'ws';
+import { ExtraWebSocket, autoReconnect } from 'extra-websocket';
+export async function createRPCClient(url, retryIntervalForReconnection) {
+    const ws = new ExtraWebSocket(() => new WebSocket(url));
+    const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection);
+    await ws.connect();
+    const [client, closeClient] = createClient(ws, { expectedVersion });
+    const [batchClient, closeBatchClient] = createBatchClient(ws, { expectedVersion });
+    const proxy = createBatchProxy();
+    return {
+        client,
+        batchClient,
+        proxy,
+        close: async () => {
+            closeClient();
+            closeBatchClient();
+            cancelAutoReconnect();
+            await ws.close();
+        }
+    };
+}
+//# sourceMappingURL=rpc-client.js.map

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

@@ -0,0 +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"}

package/package.json

@@ -1,64 +1,79 @@
 {
   "name": "@blackglory/estore-js",
-  "version": "0.2.4",
+  "version": "0.4.0",
   "description": "",
   "keywords": [],
   "files": [
     "lib"
   ],
-  "main": "lib/es2018/index.js",
-  "types": "lib/es2018/index.d.ts",
+  "type": "module",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "browser": {
+    "./lib/utils/rpc-client.js": "./lib/utils/rpc-client.browser.js"
+  },
   "repository": "git@github.com:BlackGlory/estore-js.git",
   "author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
   "license": "MIT",
   "sideEffects": false,
+  "engines": {
+    "node": ">=16"
+  },
   "scripts": {
     "prepare": "ts-patch install -s",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src __tests__",
-    "test": "jest --runInBand --no-cache --config jest.config.js",
-    "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
-    "test:coverage": "jest --coverage --config jest.config.js",
+    "test": "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",
     "prepublishOnly": "run-s prepare clean build",
     "clean": "rimraf lib",
-    "build": "run-p build:*",
-    "build:es2015": "tsc --project tsconfig.build.json --module commonjs --target es2015 --outDir lib/es2015",
-    "build:es2018": "tsc --project tsconfig.build.json --module commonjs --target es2018 --outDir lib/es2018",
+    "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",
     "release": "standard-version"
   },
   "husky": {
     "hooks": {
-      "pre-commit": "run-s prepare lint test",
+      "pre-commit": "run-s prepare lint build docker:test",
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   },
   "devDependencies": {
-    "@blackglory/jest-matchers": "^0.2.1",
-    "@commitlint/cli": "^17.1.2",
-    "@commitlint/config-conventional": "^17.1.0",
-    "@types/jest": "^27.4.0",
-    "@typescript-eslint/eslint-plugin": "^5.10.2",
-    "@typescript-eslint/parser": "^5.10.2",
-    "eslint": "^8.8.0",
+    "@blackglory/jest-resolver": "^0.3.0",
+    "@commitlint/cli": "^17.4.2",
+    "@commitlint/config-conventional": "^17.4.2",
+    "@types/jest": "^29.4.0",
+    "@types/ws": "^8.5.4",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
+    "cross-env": "^7.0.3",
+    "eslint": "^8.33.0",
+    "extra-utils": "^5.0.1",
     "husky": "4",
-    "jest": "^27.5.0",
-    "msw": "^0.36.8",
+    "jest": "^29.4.1",
+    "jest-resolve": "^29.4.1",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
     "standard-version": "^9.3.2",
-    "ts-jest": "^27.1.3",
-    "ts-patch": "^2.0.1",
-    "tslib": "^2.3.1",
-    "typescript": "^4.5.5",
-    "typescript-transform-paths": "^3.3.1"
+    "ts-jest": "^29.0.5",
+    "ts-patch": "^2.1.0",
+    "tslib": "^2.5.0",
+    "typescript": "4.8",
+    "typescript-transform-paths": "^3.4.6"
   },
   "dependencies": {
-    "@blackglory/errors": "^2.1.0",
-    "@blackglory/http-status": "^1.0.3",
-    "@blackglory/types": "^1.3.0",
-    "extra-abort": "^0.1.1",
-    "extra-fetch": "^1.9.1",
-    "extra-request": "^4.0.1",
-    "extra-response": "^0.3.9",
-    "justypes": "^3.0.0"
+    "@blackglory/errors": "^3.0.0",
+    "@blackglory/prelude": "^0.3.1",
+    "@delight-rpc/extra-native-websocket": "^0.4.0",
+    "@delight-rpc/extra-websocket": "^0.4.0",
+    "delight-rpc": "^5.0.3",
+    "extra-abort": "^0.3.1",
+    "extra-native-websocket": "^0.3.1",
+    "extra-websocket": "^0.3.1",
+    "justypes": "^4.1.0",
+    "ws": "^8.12.0"
   }
 }

package/lib/es2015/client.d.ts

@@ -1,41 +0,0 @@
-interface IInfo {
-    namespace: string;
-    items: number;
-}
-export interface IEStoreClientOptions {
-    server: string;
-    token?: string;
-    basicAuth?: {
-        username: string;
-        password: string;
-    };
-    keepalive?: boolean;
-    timeout?: number;
-}
-export interface IEStoreClientRequestOptions {
-    signal?: AbortSignal;
-    token?: string;
-    keepalive?: boolean;
-    timeout?: number | false;
-}
-export interface IEStoreClientRequestOptionsWithoutToken {
-    signal?: AbortSignal;
-    keepalive?: boolean;
-    timeout?: number | false;
-}
-export declare class EStoreClient {
-    private options;
-    constructor(options: IEStoreClientOptions);
-    private getCommonTransformers;
-    append<T>(namespace: string, itemId: string, payload: T, index?: number, options?: IEStoreClientRequestOptions): Promise<void>;
-    getEvent<T>(namespace: string, itemId: string, index: number, options?: IEStoreClientRequestOptions): Promise<T | undefined>;
-    getEvents<T>(namespace: string, itemId: string, options?: IEStoreClientRequestOptions): Promise<T[] | undefined>;
-    getSize(namespace: string, itemId: string, options?: IEStoreClientRequestOptions): Promise<number>;
-    has(namespace: string, itemId: string, options?: IEStoreClientRequestOptions): Promise<boolean>;
-    del(namespace: string, itemId: string, options?: IEStoreClientRequestOptions): Promise<void>;
-    clear(namespace: string, options?: IEStoreClientRequestOptions): Promise<void>;
-    getAllItemIds(namespace: string, options?: IEStoreClientRequestOptions): Promise<string[]>;
-    getAllNamespaces(options?: IEStoreClientRequestOptionsWithoutToken): Promise<string[]>;
-    stats(namespace: string, options?: IEStoreClientRequestOptionsWithoutToken): Promise<IInfo>;
-}
-export {};