@abtnode/core 1.16.15-beta-e143b1cf → 1.16.15-beta-12f50442

package/lib/blocklet/manager/disk.js

@@ -2963,6 +2963,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     const dataDir = path.join(this.dataDirs.data, name);
     const logsDir = path.join(this.dataDirs.logs, name);
+    const cacheDir = path.join(this.dataDirs.cache, name);
 
     logger.info(`clean blocklet ${blocklet.meta.did} data`, { keepData, keepLogsDir, keepConfigs });
 
@@ -2973,6 +2974,9 @@ class DiskBlockletManager extends BaseBlockletManager {
       fs.removeSync(logsDir);
       logger.info(`removed blocklet ${blocklet.meta.did} logs dir: ${logsDir}`);
 
+      fs.removeSync(cacheDir);
+      logger.info(`removed blocklet ${blocklet.meta.did} cache dir: ${cacheDir}`);
+
       await states.blockletExtras.remove({ did: blocklet.meta.did });
       logger.info(`removed blocklet ${blocklet.meta.did} extra data`);
     } else {

package/lib/router/helper.js

@@ -1154,6 +1154,14 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     return true;
   };
 
+  const clearBlockletRoutingCache = async (blocklet) => {
+    const info = await nodeState.read();
+    const provider = providers[info.routing.provider];
+    if (provider) {
+      await provider.clearCache(blocklet.appPid);
+    }
+  };
+
   /**
    * Remove routing for blocklet
    *
@@ -1166,6 +1174,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       siteChanged = await _removeBlockletSites(blocklet, context);
     }
 
+    await clearBlockletRoutingCache(blocklet);
     return ruleChanged || siteChanged;
   };
 

package/lib/router/index.js

@@ -174,12 +174,12 @@ class Router {
     return this.provider.getLogDir();
   }
 
-  searchCache(pattern) {
-    return this.provider.searchCache(pattern);
+  searchCache(pattern, group) {
+    return this.provider.searchCache(pattern, group);
   }
 
-  clearCache() {
-    return this.provider.clearCache();
+  clearCache(group) {
+    return this.provider.clearCache(group);
   }
 }
 

package/lib/util/cache.js

@@ -1,6 +1,5 @@
 const fs = require('fs-extra');
 const path = require('path');
-const { forEachComponentV2 } = require('@blocklet/meta/lib/util');
 const { getAppImageCacheDir, getAppOgCacheDir } = require('@abtnode/util/lib/blocklet');
 
 const clearCacheDir = (dir) => {
@@ -25,7 +24,7 @@ const clearCache = async (params, node, blockletManager) => {
   const info = await node.getNodeInfo({ useCache: true });
   const provider = node.getRouterProvider(info.routing.provider);
   if (params.pattern) {
-    const files = await provider.searchCache(params.pattern);
+    const files = await provider.searchCache(params.pattern, params.teamDid);
     files.forEach((x) => fs.rmSync(x, { force: true }));
     return files.map((x) => x.replace(baseDir, ''));
   }
@@ -52,17 +51,10 @@ const clearCache = async (params, node, blockletManager) => {
     clearCacheDir(x);
     removed.push(x);
   });
-  await forEachComponentV2(
-    blocklet,
-    async (component) => {
-      const files = await provider.searchCache(component.meta.did);
-      files.forEach((x) => fs.rmSync(x, { force: true }));
-      removed.push(...files);
-    },
-    { parallel: true, sync: true }
-  );
+  // reset blocklet router cache
+  const result = await provider.clearCache(params.teamDid);
+  removed.push(...result);
 
-  // FIXME: @wangshijun can we bust cache for image-filter in nginx?
   return removed.map((x) => x.replace(baseDir, ''));
 };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.15-beta-e143b1cf",
+  "version": "1.16.15-beta-12f50442",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.15-beta-e143b1cf",
-    "@abtnode/auth": "1.16.15-beta-e143b1cf",
-    "@abtnode/certificate-manager": "1.16.15-beta-e143b1cf",
-    "@abtnode/constant": "1.16.15-beta-e143b1cf",
-    "@abtnode/cron": "1.16.15-beta-e143b1cf",
-    "@abtnode/logger": "1.16.15-beta-e143b1cf",
-    "@abtnode/models": "1.16.15-beta-e143b1cf",
-    "@abtnode/queue": "1.16.15-beta-e143b1cf",
-    "@abtnode/rbac": "1.16.15-beta-e143b1cf",
-    "@abtnode/router-provider": "1.16.15-beta-e143b1cf",
-    "@abtnode/static-server": "1.16.15-beta-e143b1cf",
-    "@abtnode/timemachine": "1.16.15-beta-e143b1cf",
-    "@abtnode/util": "1.16.15-beta-e143b1cf",
+    "@abtnode/analytics": "1.16.15-beta-12f50442",
+    "@abtnode/auth": "1.16.15-beta-12f50442",
+    "@abtnode/certificate-manager": "1.16.15-beta-12f50442",
+    "@abtnode/constant": "1.16.15-beta-12f50442",
+    "@abtnode/cron": "1.16.15-beta-12f50442",
+    "@abtnode/logger": "1.16.15-beta-12f50442",
+    "@abtnode/models": "1.16.15-beta-12f50442",
+    "@abtnode/queue": "1.16.15-beta-12f50442",
+    "@abtnode/rbac": "1.16.15-beta-12f50442",
+    "@abtnode/router-provider": "1.16.15-beta-12f50442",
+    "@abtnode/static-server": "1.16.15-beta-12f50442",
+    "@abtnode/timemachine": "1.16.15-beta-12f50442",
+    "@abtnode/util": "1.16.15-beta-12f50442",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/did-ext": "^1.18.89",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.89",
     "@arcblock/vc": "1.18.89",
-    "@blocklet/constant": "1.16.15-beta-e143b1cf",
-    "@blocklet/env": "1.16.15-beta-e143b1cf",
-    "@blocklet/meta": "1.16.15-beta-e143b1cf",
-    "@blocklet/resolver": "1.16.15-beta-e143b1cf",
-    "@blocklet/sdk": "1.16.15-beta-e143b1cf",
+    "@blocklet/constant": "1.16.15-beta-12f50442",
+    "@blocklet/env": "1.16.15-beta-12f50442",
+    "@blocklet/meta": "1.16.15-beta-12f50442",
+    "@blocklet/resolver": "1.16.15-beta-12f50442",
+    "@blocklet/sdk": "1.16.15-beta-12f50442",
     "@did-space/client": "^0.2.165",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.89",
@@ -100,5 +100,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "86dcc908f3cb7259d1ca92b9ae75160a6e43509a"
+  "gitHead": "48bda4b29eb31a70e0eb9cab0bce6e544960c7fd"
 }