@ckb-ccc/core 1.1.1 → 1.2.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ckb-ccc/core
 
+## 1.2.1
+
+### Patch Changes
+
+- [#118](https://github.com/ckb-devrel/ccc/pull/118) [`94e2618`](https://github.com/ckb-devrel/ccc/commit/94e26182515e09d6086ec5b653d091f117a499e6) Thanks [@Hanssen0](https://github.com/Hanssen0)! - fix: client concurrent should be FIFO
+
+## 1.2.0
+
+### Minor Changes
+
+- [#116](https://github.com/ckb-devrel/ccc/pull/116) [`128e87b`](https://github.com/ckb-devrel/ccc/commit/128e87b5ca3e97bfe7842e76f786aa6aec010797) Thanks [@Hanssen0](https://github.com/Hanssen0)! - feat: Client LRU cache
+
 ## 1.1.1
 
 ### Patch Changes

package/dist/client/cache/memory.advanced.d.ts

@@ -1,10 +1,22 @@
-import { CellLike, ScriptLike } from "../../ckb/index.js";
+import { Cell, CellLike, ScriptLike } from "../../ckb/index.js";
 import { HexLike } from "../../hex/index.js";
 import { NumLike } from "../../num/index.js";
 import { ClientCollectableSearchKeyLike } from "../clientTypes.advanced.js";
+export type CellRecord = [
+    false,
+    Pick<Cell, "outPoint"> & Partial<Pick<Cell, "cellOutput" | "outputData">>
+] | [true, Cell] | [undefined, Cell];
 export declare function filterData(dataLike: HexLike, filterLike: HexLike | undefined, filterMode: "exact" | "prefix" | "partial"): boolean;
 export declare function filterScript(valueLike: ScriptLike | undefined, filterLike: ScriptLike | undefined, filterMode: "prefix" | "exact" | "partial"): boolean;
 export declare function filterNumByRange(lengthLike: NumLike, range: [NumLike, NumLike] | undefined): boolean;
 export declare function filterScriptByLenRange(valueLike?: ScriptLike, scriptLenRange?: [NumLike, NumLike]): boolean;
 export declare function filterCell(searchKeyLike: ClientCollectableSearchKeyLike, cellLike: CellLike): boolean;
+export declare class MapLru<K, V> extends Map<K, V> {
+    private readonly capacity;
+    private readonly lru;
+    constructor(capacity: number);
+    access(key: K): void;
+    get(key: K): V | undefined;
+    set(key: K, value: V): this;
+}
 //# sourceMappingURL=memory.advanced.d.ts.map

package/dist/client/cache/memory.advanced.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory.advanced.d.ts","sourceRoot":"","sources":["../../../src/client/cache/memory.advanced.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,QAAQ,EAAU,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACL,8BAA8B,EAE/B,MAAM,4BAA4B,CAAC;AAGpC,wBAAgB,UAAU,CACxB,QAAQ,EAAE,OAAO,EACjB,UAAU,EAAE,OAAO,GAAG,SAAS,EAC/B,UAAU,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,GACzC,OAAO,CAgBT;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,UAAU,GAAG,SAAS,EACjC,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,UAAU,EAAE,QAAQ,GAAG,OAAO,GAAG,SAAS,GACzC,OAAO,CAkBT;AAED,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,OAAO,EACnB,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,SAAS,GACpC,OAAO,CAQT;AAED,wBAAgB,sBAAsB,CACpC,SAAS,CAAC,EAAE,UAAU,EACtB,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,GAClC,OAAO,CAYT;AAED,wBAAgB,UAAU,CACxB,aAAa,EAAE,8BAA8B,EAC7C,QAAQ,EAAE,QAAQ,GACjB,OAAO,CA4CT"}
+{"version":3,"file":"memory.advanced.d.ts","sourceRoot":"","sources":["../../../src/client/cache/memory.advanced.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAU,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACL,8BAA8B,EAE/B,MAAM,4BAA4B,CAAC;AAIpC,MAAM,MAAM,UAAU,GAClB;IACE,KAAK;IACL,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC;CAC1E,GACD,CAAC,IAAI,EAAE,IAAI,CAAC,GACZ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAEtB,wBAAgB,UAAU,CACxB,QAAQ,EAAE,OAAO,EACjB,UAAU,EAAE,OAAO,GAAG,SAAS,EAC/B,UAAU,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,GACzC,OAAO,CAgBT;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,UAAU,GAAG,SAAS,EACjC,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,UAAU,EAAE,QAAQ,GAAG,OAAO,GAAG,SAAS,GACzC,OAAO,CAkBT;AAED,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,OAAO,EACnB,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,SAAS,GACpC,OAAO,CAQT;AAED,wBAAgB,sBAAsB,CACpC,SAAS,CAAC,EAAE,UAAU,EACtB,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,GAClC,OAAO,CAYT;AAED,wBAAgB,UAAU,CACxB,aAAa,EAAE,8BAA8B,EAC7C,QAAQ,EAAE,QAAQ,GACjB,OAAO,CA4CT;AAED,qBAAa,MAAM,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IAG7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAFrC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAW;gBAEF,QAAQ,EAAE,MAAM;IAI7C,MAAM,CAAC,GAAG,EAAE,CAAC;IAYb,GAAG,CAAC,GAAG,EAAE,CAAC;IAKV,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;CAIrB"}

package/dist/client/cache/memory.advanced.js

@@ -78,3 +78,29 @@ export function filterCell(searchKeyLike, cellLike) {
     }
     return true;
 }
+export class MapLru extends Map {
+    constructor(capacity) {
+        super();
+        this.capacity = capacity;
+        this.lru = [];
+    }
+    access(key) {
+        const index = this.lru.indexOf(key);
+        if (index !== -1) {
+            this.lru.splice(index, 1);
+        }
+        this.lru.push(key);
+        if (this.lru.length > this.capacity) {
+            this.delete(this.lru[0]);
+            this.lru.shift();
+        }
+    }
+    get(key) {
+        this.access(key);
+        return super.get(key);
+    }
+    set(key, value) {
+        this.access(key);
+        return super.set(key, value);
+    }
+}

package/dist/client/cache/memory.d.ts

@@ -3,6 +3,8 @@ import { HexLike } from "../../hex/index.js";
 import { ClientCollectableSearchKeyLike } from "../clientTypes.advanced.js";
 import { ClientCache } from "./cache.js";
 export declare class ClientCacheMemory extends ClientCache {
+    private readonly maxCells;
+    private readonly maxTxs;
     /**
      * OutPoint => [isLive, Cell | OutPoint]
      */
@@ -11,6 +13,7 @@ export declare class ClientCacheMemory extends ClientCache {
      * TX Hash => Transaction
      */
     private readonly knownTransactions;
+    constructor(maxCells?: number, maxTxs?: number);
     markUsable(...cellLikes: (CellLike | CellLike[])[]): Promise<void>;
     markUnusable(...outPointLikes: (OutPointLike | OutPointLike[])[]): Promise<void>;
     clear(): Promise<void>;

package/dist/client/cache/memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/client/cache/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,QAAQ,EAER,YAAY,EACZ,WAAW,EACX,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,qBAAa,iBAAkB,SAAQ,WAAW;IAChD;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,KAAK,CASR;IAEd;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuC;IAEnE,UAAU,CAAC,GAAG,SAAS,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASlE,YAAY,CAChB,GAAG,aAAa,EAAE,CAAC,YAAY,GAAG,YAAY,EAAE,CAAC,EAAE,GAClD,OAAO,CAAC,IAAI,CAAC;IAcV,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrB,SAAS,CACd,OAAO,EAAE,8BAA8B,GACtC,cAAc,CAAC,IAAI,CAAC;IAYjB,OAAO,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAS9D,UAAU,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAMxD,kBAAkB,CACtB,GAAG,YAAY,EAAE,CAAC,eAAe,GAAG,eAAe,EAAE,CAAC,EAAE,GACvD,OAAO,CAAC,IAAI,CAAC;IAMV,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAKrE,WAAW,CAAC,GAAG,KAAK,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAWtE"}
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/client/cache/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,QAAQ,EAER,YAAY,EACZ,WAAW,EACX,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAW,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,qBAAa,iBAAkB,SAAQ,WAAW;IAY9C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAZzB;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IAEnD;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA8B;gBAG7C,QAAQ,SAAM,EACd,MAAM,SAAM;IAQzB,UAAU,CAAC,GAAG,SAAS,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASlE,YAAY,CAChB,GAAG,aAAa,EAAE,CAAC,YAAY,GAAG,YAAY,EAAE,CAAC,EAAE,GAClD,OAAO,CAAC,IAAI,CAAC;IAcV,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,SAAS,CACd,OAAO,EAAE,8BAA8B,GACtC,cAAc,CAAC,IAAI,CAAC;IAajB,OAAO,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAS9D,UAAU,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAMxD,kBAAkB,CACtB,GAAG,YAAY,EAAE,CAAC,eAAe,GAAG,eAAe,EAAE,CAAC,EAAE,GACvD,OAAO,CAAC,IAAI,CAAC;IAMV,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAKrE,WAAW,CAAC,GAAG,KAAK,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAWtE"}

package/dist/client/cache/memory.js

@@ -1,18 +1,14 @@
 import { Cell, OutPoint, Transaction, } from "../../ckb/index.js";
 import { hexFrom } from "../../hex/index.js";
 import { ClientCache } from "./cache.js";
-import { filterCell } from "./memory.advanced.js";
+import { filterCell, MapLru } from "./memory.advanced.js";
 export class ClientCacheMemory extends ClientCache {
-    constructor() {
-        super(...arguments);
-        /**
-         * OutPoint => [isLive, Cell | OutPoint]
-         */
-        this.cells = new Map();
-        /**
-         * TX Hash => Transaction
-         */
-        this.knownTransactions = new Map();
+    constructor(maxCells = 512, maxTxs = 256) {
+        super();
+        this.maxCells = maxCells;
+        this.maxTxs = maxTxs;
+        this.cells = new MapLru(this.maxCells);
+        this.knownTransactions = new MapLru(this.maxTxs);
     }
     async markUsable(...cellLikes) {
         cellLikes.flat().forEach((cellLike) => {
@@ -34,18 +30,18 @@ export class ClientCacheMemory extends ClientCache {
         });
     }
     async clear() {
-        for (const val of this.cells.values()) {
-            val[0] = undefined;
-        }
+        this.cells.clear();
+        this.knownTransactions.clear();
     }
     async *findCells(keyLike) {
-        for (const [isLive, cell] of this.cells.values()) {
+        for (const [key, [isLive, cell]] of this.cells.entries()) {
             if (!isLive) {
                 continue;
             }
             if (!filterCell(keyLike, cell)) {
                 continue;
             }
+            this.cells.access(key);
             yield cell.clone();
         }
     }

package/dist/client/jsonRpc/index.js

@@ -266,7 +266,7 @@ export class ClientJsonRpc extends Client {
         this.concurrent += 1;
         const res = (await this.transport.request(payload));
         this.concurrent -= 1;
-        this.pending.pop()?.();
+        this.pending.shift()?.();
         if (res.id !== payload.id) {
             throw new Error(`Id mismatched, got ${res.id}, expected ${payload.id}`);
         }

package/dist.commonjs/client/cache/memory.advanced.d.ts

@@ -1,10 +1,22 @@
-import { CellLike, ScriptLike } from "../../ckb/index.js";
+import { Cell, CellLike, ScriptLike } from "../../ckb/index.js";
 import { HexLike } from "../../hex/index.js";
 import { NumLike } from "../../num/index.js";
 import { ClientCollectableSearchKeyLike } from "../clientTypes.advanced.js";
+export type CellRecord = [
+    false,
+    Pick<Cell, "outPoint"> & Partial<Pick<Cell, "cellOutput" | "outputData">>
+] | [true, Cell] | [undefined, Cell];
 export declare function filterData(dataLike: HexLike, filterLike: HexLike | undefined, filterMode: "exact" | "prefix" | "partial"): boolean;
 export declare function filterScript(valueLike: ScriptLike | undefined, filterLike: ScriptLike | undefined, filterMode: "prefix" | "exact" | "partial"): boolean;
 export declare function filterNumByRange(lengthLike: NumLike, range: [NumLike, NumLike] | undefined): boolean;
 export declare function filterScriptByLenRange(valueLike?: ScriptLike, scriptLenRange?: [NumLike, NumLike]): boolean;
 export declare function filterCell(searchKeyLike: ClientCollectableSearchKeyLike, cellLike: CellLike): boolean;
+export declare class MapLru<K, V> extends Map<K, V> {
+    private readonly capacity;
+    private readonly lru;
+    constructor(capacity: number);
+    access(key: K): void;
+    get(key: K): V | undefined;
+    set(key: K, value: V): this;
+}
 //# sourceMappingURL=memory.advanced.d.ts.map

package/dist.commonjs/client/cache/memory.advanced.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory.advanced.d.ts","sourceRoot":"","sources":["../../../src/client/cache/memory.advanced.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,QAAQ,EAAU,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACL,8BAA8B,EAE/B,MAAM,4BAA4B,CAAC;AAGpC,wBAAgB,UAAU,CACxB,QAAQ,EAAE,OAAO,EACjB,UAAU,EAAE,OAAO,GAAG,SAAS,EAC/B,UAAU,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,GACzC,OAAO,CAgBT;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,UAAU,GAAG,SAAS,EACjC,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,UAAU,EAAE,QAAQ,GAAG,OAAO,GAAG,SAAS,GACzC,OAAO,CAkBT;AAED,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,OAAO,EACnB,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,SAAS,GACpC,OAAO,CAQT;AAED,wBAAgB,sBAAsB,CACpC,SAAS,CAAC,EAAE,UAAU,EACtB,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,GAClC,OAAO,CAYT;AAED,wBAAgB,UAAU,CACxB,aAAa,EAAE,8BAA8B,EAC7C,QAAQ,EAAE,QAAQ,GACjB,OAAO,CA4CT"}
+{"version":3,"file":"memory.advanced.d.ts","sourceRoot":"","sources":["../../../src/client/cache/memory.advanced.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAU,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACL,8BAA8B,EAE/B,MAAM,4BAA4B,CAAC;AAIpC,MAAM,MAAM,UAAU,GAClB;IACE,KAAK;IACL,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC;CAC1E,GACD,CAAC,IAAI,EAAE,IAAI,CAAC,GACZ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAEtB,wBAAgB,UAAU,CACxB,QAAQ,EAAE,OAAO,EACjB,UAAU,EAAE,OAAO,GAAG,SAAS,EAC/B,UAAU,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,GACzC,OAAO,CAgBT;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,UAAU,GAAG,SAAS,EACjC,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,UAAU,EAAE,QAAQ,GAAG,OAAO,GAAG,SAAS,GACzC,OAAO,CAkBT;AAED,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,OAAO,EACnB,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,SAAS,GACpC,OAAO,CAQT;AAED,wBAAgB,sBAAsB,CACpC,SAAS,CAAC,EAAE,UAAU,EACtB,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,GAClC,OAAO,CAYT;AAED,wBAAgB,UAAU,CACxB,aAAa,EAAE,8BAA8B,EAC7C,QAAQ,EAAE,QAAQ,GACjB,OAAO,CA4CT;AAED,qBAAa,MAAM,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IAG7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAFrC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAW;gBAEF,QAAQ,EAAE,MAAM;IAI7C,MAAM,CAAC,GAAG,EAAE,CAAC;IAYb,GAAG,CAAC,GAAG,EAAE,CAAC;IAKV,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;CAIrB"}

package/dist.commonjs/client/cache/memory.advanced.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MapLru = void 0;
 exports.filterData = filterData;
 exports.filterScript = filterScript;
 exports.filterNumByRange = filterNumByRange;
@@ -85,3 +86,30 @@ function filterCell(searchKeyLike, cellLike) {
     }
     return true;
 }
+class MapLru extends Map {
+    constructor(capacity) {
+        super();
+        this.capacity = capacity;
+        this.lru = [];
+    }
+    access(key) {
+        const index = this.lru.indexOf(key);
+        if (index !== -1) {
+            this.lru.splice(index, 1);
+        }
+        this.lru.push(key);
+        if (this.lru.length > this.capacity) {
+            this.delete(this.lru[0]);
+            this.lru.shift();
+        }
+    }
+    get(key) {
+        this.access(key);
+        return super.get(key);
+    }
+    set(key, value) {
+        this.access(key);
+        return super.set(key, value);
+    }
+}
+exports.MapLru = MapLru;

package/dist.commonjs/client/cache/memory.d.ts

@@ -3,6 +3,8 @@ import { HexLike } from "../../hex/index.js";
 import { ClientCollectableSearchKeyLike } from "../clientTypes.advanced.js";
 import { ClientCache } from "./cache.js";
 export declare class ClientCacheMemory extends ClientCache {
+    private readonly maxCells;
+    private readonly maxTxs;
     /**
      * OutPoint => [isLive, Cell | OutPoint]
      */
@@ -11,6 +13,7 @@ export declare class ClientCacheMemory extends ClientCache {
      * TX Hash => Transaction
      */
     private readonly knownTransactions;
+    constructor(maxCells?: number, maxTxs?: number);
     markUsable(...cellLikes: (CellLike | CellLike[])[]): Promise<void>;
     markUnusable(...outPointLikes: (OutPointLike | OutPointLike[])[]): Promise<void>;
     clear(): Promise<void>;

package/dist.commonjs/client/cache/memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/client/cache/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,QAAQ,EAER,YAAY,EACZ,WAAW,EACX,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,qBAAa,iBAAkB,SAAQ,WAAW;IAChD;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,KAAK,CASR;IAEd;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuC;IAEnE,UAAU,CAAC,GAAG,SAAS,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASlE,YAAY,CAChB,GAAG,aAAa,EAAE,CAAC,YAAY,GAAG,YAAY,EAAE,CAAC,EAAE,GAClD,OAAO,CAAC,IAAI,CAAC;IAcV,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrB,SAAS,CACd,OAAO,EAAE,8BAA8B,GACtC,cAAc,CAAC,IAAI,CAAC;IAYjB,OAAO,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAS9D,UAAU,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAMxD,kBAAkB,CACtB,GAAG,YAAY,EAAE,CAAC,eAAe,GAAG,eAAe,EAAE,CAAC,EAAE,GACvD,OAAO,CAAC,IAAI,CAAC;IAMV,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAKrE,WAAW,CAAC,GAAG,KAAK,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAWtE"}
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/client/cache/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,QAAQ,EAER,YAAY,EACZ,WAAW,EACX,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAW,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,qBAAa,iBAAkB,SAAQ,WAAW;IAY9C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAZzB;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IAEnD;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA8B;gBAG7C,QAAQ,SAAM,EACd,MAAM,SAAM;IAQzB,UAAU,CAAC,GAAG,SAAS,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASlE,YAAY,CAChB,GAAG,aAAa,EAAE,CAAC,YAAY,GAAG,YAAY,EAAE,CAAC,EAAE,GAClD,OAAO,CAAC,IAAI,CAAC;IAcV,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,SAAS,CACd,OAAO,EAAE,8BAA8B,GACtC,cAAc,CAAC,IAAI,CAAC;IAajB,OAAO,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAS9D,UAAU,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAMxD,kBAAkB,CACtB,GAAG,YAAY,EAAE,CAAC,eAAe,GAAG,eAAe,EAAE,CAAC,EAAE,GACvD,OAAO,CAAC,IAAI,CAAC;IAMV,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAKrE,WAAW,CAAC,GAAG,KAAK,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAWtE"}

package/dist.commonjs/client/cache/memory.js

@@ -6,16 +6,12 @@ const index_js_2 = require("../../hex/index.js");
 const cache_js_1 = require("./cache.js");
 const memory_advanced_js_1 = require("./memory.advanced.js");
 class ClientCacheMemory extends cache_js_1.ClientCache {
-    constructor() {
-        super(...arguments);
-        /**
-         * OutPoint => [isLive, Cell | OutPoint]
-         */
-        this.cells = new Map();
-        /**
-         * TX Hash => Transaction
-         */
-        this.knownTransactions = new Map();
+    constructor(maxCells = 512, maxTxs = 256) {
+        super();
+        this.maxCells = maxCells;
+        this.maxTxs = maxTxs;
+        this.cells = new memory_advanced_js_1.MapLru(this.maxCells);
+        this.knownTransactions = new memory_advanced_js_1.MapLru(this.maxTxs);
     }
     async markUsable(...cellLikes) {
         cellLikes.flat().forEach((cellLike) => {
@@ -37,18 +33,18 @@ class ClientCacheMemory extends cache_js_1.ClientCache {
         });
     }
     async clear() {
-        for (const val of this.cells.values()) {
-            val[0] = undefined;
-        }
+        this.cells.clear();
+        this.knownTransactions.clear();
     }
     async *findCells(keyLike) {
-        for (const [isLive, cell] of this.cells.values()) {
+        for (const [key, [isLive, cell]] of this.cells.entries()) {
             if (!isLive) {
                 continue;
             }
             if (!(0, memory_advanced_js_1.filterCell)(keyLike, cell)) {
                 continue;
             }
+            this.cells.access(key);
             yield cell.clone();
         }
     }

package/dist.commonjs/client/jsonRpc/index.js

@@ -269,7 +269,7 @@ class ClientJsonRpc extends client_js_1.Client {
         this.concurrent += 1;
         const res = (await this.transport.request(payload));
         this.concurrent -= 1;
-        this.pending.pop()?.();
+        this.pending.shift()?.();
         if (res.id !== payload.id) {
             throw new Error(`Id mismatched, got ${res.id}, expected ${payload.id}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "Core of CCC - CKBer's Codebase",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",

package/src/client/cache/memory.advanced.ts

@@ -8,6 +8,15 @@ import {
 } from "../clientTypes.advanced.js";
 import { ClientIndexerSearchKey } from "../clientTypes.js";
 
+// [isLive, Cell | OutPoint]
+export type CellRecord =
+  | [
+      false,
+      Pick<Cell, "outPoint"> & Partial<Pick<Cell, "cellOutput" | "outputData">>,
+    ]
+  | [true, Cell]
+  | [undefined, Cell];
+
 export function filterData(
   dataLike: HexLike,
   filterLike: HexLike | undefined,
@@ -132,3 +141,33 @@ export function filterCell(
 
   return true;
 }
+
+export class MapLru<K, V> extends Map<K, V> {
+  private readonly lru: K[] = [];
+
+  constructor(private readonly capacity: number) {
+    super();
+  }
+
+  access(key: K) {
+    const index = this.lru.indexOf(key);
+    if (index !== -1) {
+      this.lru.splice(index, 1);
+    }
+    this.lru.push(key);
+    if (this.lru.length > this.capacity) {
+      this.delete(this.lru[0]);
+      this.lru.shift();
+    }
+  }
+
+  get(key: K) {
+    this.access(key);
+    return super.get(key);
+  }
+
+  set(key: K, value: V) {
+    this.access(key);
+    return super.set(key, value);
+  }
+}

package/src/client/cache/memory.ts

@@ -6,30 +6,31 @@ import {
   Transaction,
   TransactionLike,
 } from "../../ckb/index.js";
-import { HexLike, hexFrom } from "../../hex/index.js";
+import { hexFrom, HexLike } from "../../hex/index.js";
 import { ClientCollectableSearchKeyLike } from "../clientTypes.advanced.js";
 import { ClientCache } from "./cache.js";
-import { filterCell } from "./memory.advanced.js";
+import { CellRecord, filterCell, MapLru } from "./memory.advanced.js";
 
 export class ClientCacheMemory extends ClientCache {
   /**
    * OutPoint => [isLive, Cell | OutPoint]
    */
-  private readonly cells: Map<
-    string,
-    | [
-        false,
-        Pick<Cell, "outPoint"> &
-          Partial<Pick<Cell, "cellOutput" | "outputData">>,
-      ]
-    | [true, Cell]
-    | [undefined, Cell]
-  > = new Map();
+  private readonly cells: MapLru<string, CellRecord>;
 
   /**
    * TX Hash => Transaction
    */
-  private readonly knownTransactions: Map<string, Transaction> = new Map();
+  private readonly knownTransactions: MapLru<string, Transaction>;
+
+  constructor(
+    private readonly maxCells = 512,
+    private readonly maxTxs = 256,
+  ) {
+    super();
+
+    this.cells = new MapLru<string, CellRecord>(this.maxCells);
+    this.knownTransactions = new MapLru<string, Transaction>(this.maxTxs);
+  }
 
   async markUsable(...cellLikes: (CellLike | CellLike[])[]): Promise<void> {
     cellLikes.flat().forEach((cellLike) => {
@@ -57,15 +58,14 @@ export class ClientCacheMemory extends ClientCache {
   }
 
   async clear(): Promise<void> {
-    for (const val of this.cells.values()) {
-      val[0] = undefined;
-    }
+    this.cells.clear();
+    this.knownTransactions.clear();
   }
 
   async *findCells(
     keyLike: ClientCollectableSearchKeyLike,
   ): AsyncGenerator<Cell> {
-    for (const [isLive, cell] of this.cells.values()) {
+    for (const [key, [isLive, cell]] of this.cells.entries()) {
       if (!isLive) {
         continue;
       }
@@ -73,6 +73,7 @@ export class ClientCacheMemory extends ClientCache {
         continue;
       }
 
+      this.cells.access(key);
       yield cell.clone();
     }
   }

package/src/client/jsonRpc/index.ts

@@ -459,7 +459,7 @@ export abstract class ClientJsonRpc extends Client {
       result: unknown;
     };
     this.concurrent -= 1;
-    this.pending.pop()?.();
+    this.pending.shift()?.();
 
     if (res.id !== payload.id) {
       throw new Error(`Id mismatched, got ${res.id}, expected ${payload.id}`);