@ocap/resolver 1.19.5 → 1.19.7

package/lib/index.js

@@ -1286,10 +1286,11 @@ module.exports = class OCAPResolver {
    * @param {string} param.dataKey Key to access data in response
    * @returns {Promise<Array>} Array of fetched items
    */
-  listChunks(fn, { total, concurrency = 3, chunkSize = 2000, pageSize = 100, timeKey, dataKey }) {
+  listChunks(fn, { total, concurrency = 3, chunkSize = 2100, pageSize = 100, timeKey, dataKey }) {
     let done = false;
     let time;
     const totalPage = Math.ceil(total / pageSize);
+    let curPage = 0;
 
     const next = async () => {
       if (done) {
@@ -1299,7 +1300,7 @@ module.exports = class OCAPResolver {
       let results = [];
 
       // next pages
-      for (let curPage = 0; curPage < totalPage; curPage += concurrency) {
+      for (; curPage < totalPage; curPage += concurrency) {
         const batchResults = await Promise.all(
           new Array(Math.min(concurrency, totalPage - curPage)).fill(true).map(async (_, i) => {
             const { [dataKey]: list } = await fn({
@@ -1315,7 +1316,7 @@ module.exports = class OCAPResolver {
         // finish
         if (!flatResults.length) {
           done = true;
-          return [];
+          return results;
         }
 
         results = results.concat(flatResults);
@@ -1337,7 +1338,7 @@ module.exports = class OCAPResolver {
     };
   }
 
-  async listTransactionsChunks(args = {}, { chunkSize = 2000, pageSize = 100 } = {}) {
+  async listTransactionsChunks(args = {}, { chunkSize = 2100, pageSize = 100 } = {}) {
     return this.listChunks(
       ({ size, time, cursor }) =>
         this.listTransactions({
@@ -1360,7 +1361,7 @@ module.exports = class OCAPResolver {
     );
   }
 
-  async listStakeChunks(args = {}, { chunkSize = 2000, pageSize = 100 } = {}) {
+  async listStakeChunks(args = {}, { chunkSize = 2100, pageSize = 100 } = {}) {
     return this.listChunks(
       ({ size, time, cursor }) =>
         this.listStakes({

package/lib/token-distribution.js

@@ -16,6 +16,7 @@ class TokenDistributionManager {
   constructor(resolver) {
     this.resolver = resolver;
     this.indexdb = resolver.indexdb;
+    this.isProcessing = false;
   }
 
   formatDistribution(distribution) {
@@ -69,6 +70,11 @@ class TokenDistributionManager {
   async updateByToken(tokenAddress, force) {
     const { logger, config } = this.resolver;
 
+    if (this.isProcessing) {
+      logger?.logger('Token distribution is already in progress', { tokenAddress, force });
+      return;
+    }
+
     const distribution = force
       ? this.formatDistribution({ tokenAddress })
       : this.formatDistribution((await this.getDistribution(tokenAddress)) || { tokenAddress });
@@ -78,44 +84,52 @@ class TokenDistributionManager {
       distribution: createIndexedTokenDistribution(distribution),
     });
 
-    if (force && isDefaultToken) {
-      this.handleModerator(distribution);
-    }
+    this.isProcessing = true;
 
-    const { next } = await this.resolver.listTransactionsChunks({
-      timeFilter: { startDateTime: distribution.txTime },
-      // Default token is used for gas payment and may appear in any transaction, so we cannot filter by tokenFilter
-      tokenFilter: isDefaultToken ? {} : { tokenFilter: { tokens: [tokenAddress] } },
-    });
-    let nextData = await next();
+    try {
+      if (force && isDefaultToken) {
+        this.handleModerator(distribution);
+      }
 
-    // Process transactions in chunks and update indexdb
-    while (nextData.length) {
-      logger?.info('Updating token distribution in chunks', {
-        chunkSize: nextData.length,
-        startTime: nextData[0].time,
-        startHash: nextData[0].hash,
-        endTime: nextData[nextData.length - 1].time,
+      const { next } = await this.resolver.listTransactionsChunks({
+        timeFilter: { startDateTime: distribution.txTime },
+        // Default token is used for gas payment and may appear in any transaction, so we cannot filter by tokenFilter
+        tokenFilter: isDefaultToken ? {} : { tokenFilter: { tokens: [tokenAddress] } },
       });
+      let nextData = await next();
+
+      // Process transactions in chunks and update indexdb
+      while (nextData.length) {
+        logger?.info('Updating token distribution in chunks', {
+          chunkSize: nextData.length,
+          startTime: nextData[0].time,
+          startHash: nextData[0].hash,
+          endTime: nextData[nextData.length - 1].time,
+        });
+
+        const handlePromises = nextData.map((tx) => this.handleTx(tx, distribution));
+        await Promise.all(handlePromises);
+
+        // update indexdb
+        await this.saveDistribution(distribution, false);
+        nextData = await next();
+      }
 
-      const handlePromises = nextData.map((tx) => this.handleTx(tx, distribution));
-      await Promise.all(handlePromises);
-
-      // update indexdb
+      // We cannot distinguish between revokedStake and stake from tx receipts here,
+      // so we need to read all stake transactions and recalculate token distribution based on their revokeTokens and tokens
+      await this.splitStake(distribution);
       await this.saveDistribution(distribution, false);
-      nextData = await next();
-    }
-
-    // We cannot distinguish between revokedStake and stake from tx receipts here,
-    // so we need to read all stake transactions and recalculate token distribution based on their revokeTokens and tokens
-    await this.splitStake(distribution, force);
-    await this.saveDistribution(distribution, false);
-
-    const result = createIndexedTokenDistribution(distribution);
 
-    logger.info(`Token distribution update completed (${tokenAddress})`, { distribution: result });
+      const result = createIndexedTokenDistribution(distribution);
 
-    return result;
+      logger.info(`Token distribution update completed (${tokenAddress})`, { distribution: result });
+      return result;
+    } catch (e) {
+      logger?.error('Token distribution update failed', { error: e });
+      return null;
+    } finally {
+      this.isProcessing = false;
+    }
   }
 
   /**
@@ -175,6 +189,13 @@ class TokenDistributionManager {
    * @returns {Promise<Object>} The updated token distributions
    */
   async updateByTx(tx, context) {
+    const { logger } = this.resolver;
+
+    if (this.isProcessing) {
+      logger?.logger('Token distribution is already in progress', { tx });
+      return;
+    }
+
     const formattedTx = await this.resolver.formatTx(tx);
     const tokens = formattedTx.tokenSymbols.map(({ address }) => address);
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.19.5",
+  "version": "1.19.7",
   "description": "GraphQL resolver built upon ocap statedb and GQL layer",
   "main": "lib/index.js",
   "files": [
@@ -22,18 +22,18 @@
     "jest": "^29.7.0"
   },
   "dependencies": {
-    "@arcblock/did": "1.19.5",
-    "@arcblock/did-util": "1.19.5",
-    "@arcblock/validator": "1.19.5",
-    "@ocap/config": "1.19.5",
-    "@ocap/indexdb": "1.19.5",
-    "@ocap/mcrypto": "1.19.5",
-    "@ocap/message": "1.19.5",
-    "@ocap/state": "1.19.5",
-    "@ocap/tx-protocols": "1.19.5",
-    "@ocap/util": "1.19.5",
+    "@arcblock/did": "1.19.7",
+    "@arcblock/did-util": "1.19.7",
+    "@arcblock/validator": "1.19.7",
+    "@ocap/config": "1.19.7",
+    "@ocap/indexdb": "1.19.7",
+    "@ocap/mcrypto": "1.19.7",
+    "@ocap/message": "1.19.7",
+    "@ocap/state": "1.19.7",
+    "@ocap/tx-protocols": "1.19.7",
+    "@ocap/util": "1.19.7",
     "debug": "^4.3.6",
     "lodash": "^4.17.21"
   },
-  "gitHead": "9f93acb129f6fee316149f3921a98b88dcccfac3"
+  "gitHead": "b3a8e11bd01dd1dc6e2d222bc7dd2476f278a9f7"
 }