@ocap/indexdb-elasticsearch 1.20.16 → 1.21.1

package/lib/db.js

@@ -361,7 +361,10 @@ class ESIndexDB extends BaseIndexDB {
       }
     });
 
-    return { accounts: items.map((x) => Account.formatAfterRead(x)), paging: nextPaging };
+    return {
+      accounts: await Promise.all(items.map((x) => Account.formatAfterRead(x))),
+      paging: nextPaging,
+    };
   }
 
   async listTokens({ issuerAddress, paging, timeFilter = {} } = {}) {

package/lib/table/account.js

@@ -19,6 +19,7 @@ class Account extends ESIndex {
 
   static formatBeforeUpdate(data, tokenLength) {
     data.balance = super.padBalance(data.balance, tokenLength);
+
     if (Array.isArray(data.tokens)) {
       data.tokens = data.tokens.map((x) => {
         x.balance = super.padBalance(x.balance, tokenLength);
@@ -30,13 +31,9 @@ class Account extends ESIndex {
   }
 
   static formatAfterRead(data) {
-    if (!data) {
-      return data;
-    }
+    if (!data) return data;
 
-    if (data) {
-      data.balance = super.trimBalance(data.balance);
-    }
+    data.balance = super.trimBalance(data.balance);
 
     if (Array.isArray(data.tokens)) {
       data.tokens = data.tokens.map((x) => {
@@ -50,7 +47,6 @@ class Account extends ESIndex {
 
   batchInsert(rows) {
     const formatted = rows.map((x) => Account.formatBeforeUpdate(x, this.tokenLength));
-
     return super.batchInsert(formatted);
   }
 

package/lib/table/base.js

@@ -10,12 +10,13 @@ const formatEsResponseError = (err) => (get(err, 'meta.body') ? err.meta.body :
 
 class ESIndex extends BaseIndex {
   constructor({ name, docId, client, http, indexParams }) {
-    super(name);
+    super(name, docId);
 
     this.docId = docId;
     this.client = client;
     this.http = http;
     this.indexParams = indexParams;
+
     this.ensureIndex(indexParams).then(() => {
       debug(`index ready ${name}`);
       this.markReady();
@@ -91,30 +92,35 @@ class ESIndex extends BaseIndex {
   }
 
   batchInsert(rows) {
-    const body = rows.flatMap((row) => [{ index: { _index: this.name, _id: row[this.docId] } }, row]);
+    const body = rows.flatMap((row) => [{ index: { _index: this.name, _id: this.generatePrimaryKey(row) } }, row]);
     return this.client.bulk({ refresh: 'wait_for', body });
   }
 
   batchUpdate(rows) {
-    const body = rows.flatMap((row) => [{ update: { _index: this.name, _id: row[this.docId] } }, { doc: row }]);
+    const body = rows.flatMap((row) => [
+      { update: { _index: this.name, _id: this.generatePrimaryKey(row) } },
+      { doc: row },
+    ]);
     return this.client.bulk({ refresh: 'wait_for', body });
   }
 
   async _insert(row) {
     const copy = { ...row };
     try {
-      const doc = await this._get(row[this.docId]);
+      const id = this.generatePrimaryKey(copy);
+      const doc = await this._get(id);
       if (doc) {
         return null;
       }
 
       const { body } = await this.client.create({
         index: this.name,
-        id: copy[this.docId],
+        id,
         body: copy,
         refresh: process.env.NODE_ENV === 'test' ? 'wait_for' : undefined,
       });
       debug(`insert ${this.name} ${body.result}`, copy);
+
       return row;
     } catch (err) {
       console.warn(`failed to insert ${this.name}`, formatEsResponseError(err));
@@ -123,8 +129,10 @@ class ESIndex extends BaseIndex {
   }
 
   async _get(docId) {
+    const id = this.generatePrimaryKey(docId);
+
     try {
-      const { body } = await this.client.get({ index: this.name, id: docId });
+      const { body } = await this.client.get({ index: this.name, id });
       return body ? body._source : null;
     } catch {
       return null;
@@ -137,18 +145,21 @@ class ESIndex extends BaseIndex {
       return null;
     }
 
-    delete updates[this.docId];
+    [].concat(this.docId).forEach((id) => {
+      delete updates[id];
+    });
 
     try {
+      const id = this.generatePrimaryKey(docId);
       const { body } = await this.client.update({
         index: this.name,
-        id: docId,
+        id,
         retry_on_conflict: 5,
         // partial doc merge is supported in opensearch, so we just pass the updates here
         // @link https://www.elastic.co/guide/en/elasticsearch/reference/7.16/docs-update.html#update-api-desc
         body: { doc: { ...updates } },
       });
-      debug(`update ${this.name}`, { docId, result: body.result });
+      debug(`update ${this.name}`, { docId: id, result: body.result });
     } catch (err) {
       console.warn(`failed to update ${this.name}`, formatEsResponseError(err));
       throw err;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocap/indexdb-elasticsearch",
   "description": "OCAP indexdb adapter that uses elasticsearch 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",
@@ -16,7 +16,7 @@
   "devDependencies": {
     "dotenv-flow": "^3.2.0",
     "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/elasticsearch",
   "keywords": [
@@ -40,9 +40,9 @@
     "bn.js": "^5.2.1",
     "debug": "^4.3.6",
     "lodash": "^4.17.21",
-    "@arcblock/did": "1.20.16",
-    "@ocap/indexdb": "1.20.16",
-    "@ocap/util": "1.20.16"
+    "@arcblock/did": "1.21.1",
+    "@ocap/indexdb": "1.21.1",
+    "@ocap/util": "1.21.1"
   },
   "scripts": {
     "lint": "eslint tests lib",