@ocap/indexdb-fs 1.20.16 → 1.21.1

package/lib/db.js

@@ -25,6 +25,7 @@ class FsIndexDB extends BaseIndexDB {
     this.rollupBlock = new Table('rollupBlock', dataDir, 'hash');
     this.rollupValidator = new Table('rollupValidator', dataDir, 'address');
     this.tokenDistribution = new Table('tokenDistribution', dataDir, 'tokenAddress');
+    this.balance = new Table('balance', dataDir, ['address', 'tokenAddress']);
 
     this.attachReadyListeners();
   }

package/lib/table/base.js

@@ -8,7 +8,7 @@ const debug = require('debug')(require('../../package.json').name);
 
 class FsIndex extends BaseIndex {
   constructor(name, dataDir, uniqIndex) {
-    super(name);
+    super(name, uniqIndex);
 
     this.name = name;
     this.uniqIndex = uniqIndex;
@@ -24,7 +24,7 @@ class FsIndex extends BaseIndex {
         this.collection = db.getCollection(name);
 
         if (this.collection === null) {
-          this.collection = db.addCollection(name, { unique: [uniqIndex], clone: true });
+          this.collection = db.addCollection(name, { unique: [this.primaryKey], clone: true });
         }
 
         this.markReady();
@@ -38,26 +38,32 @@ class FsIndex extends BaseIndex {
   }
 
   _insert(row) {
-    const doc = this._get(row[this.uniqIndex]);
+    const id = this.generatePrimaryKey(row);
+    // Don't call this._get here cause _get may be overwritten
+    const doc = FsIndex.prototype._get.call(this, id);
     if (doc) {
       return doc;
     }
 
     debug(`insert ${this.name}`, row);
-    return this.collection.insert({ ...row });
+    return this.collection.insert({ [this.primaryKey]: id, ...row });
   }
 
   _get(key) {
-    return this.collection.by(this.uniqIndex, key);
+    const id = this.generatePrimaryKey(key);
+    return key ? this.collection.by(this.primaryKey, id) : null;
   }
 
   _update(key, updates) {
-    const doc = this._get(key);
+    const id = this.generatePrimaryKey(key);
+    // Don't call this._get here cause _get may be overwritten
+    const doc = FsIndex.prototype._get.call(this, id);
     if (!doc) {
       return null;
     }
 
-    debug(`update ${this.name}`, { key, updates });
+    debug(`update ${this.name}`, { id, key, updates });
+
     Object.assign(doc, updates);
     this.collection.update(doc);
     return doc;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocap/indexdb-fs",
   "description": "OCAP indexdb adapter that uses file system as backend",
-  "version": "1.20.16",
+  "version": "1.21.1",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
     "url": "https://github.com/ArcBlock/blockchain/issues",
@@ -15,7 +15,7 @@
   ],
   "devDependencies": {
     "jest": "^29.7.0",
-    "@ocap/indexdb-test": "1.20.16"
+    "@ocap/indexdb-test": "1.21.1"
   },
   "homepage": "https://github.com/ArcBlock/blockchain/tree/master/indexdb/fs",
   "keywords": [
@@ -37,9 +37,9 @@
     "debug": "^4.3.6",
     "lodash": "^4.17.21",
     "lokijs": "^1.5.12",
-    "@ocap/indexdb": "1.20.16",
-    "@ocap/util": "1.20.16",
-    "@ocap/indexdb-memory": "1.20.16"
+    "@ocap/indexdb": "1.21.1",
+    "@ocap/indexdb-memory": "1.21.1",
+    "@ocap/util": "1.21.1"
   },
   "scripts": {
     "lint": "eslint tests lib",