@abtnode/core 1.16.15-beta-a635f48d → 1.16.15-beta-89b542d3

package/lib/blocklet/manager/disk.js

@@ -2690,25 +2690,29 @@ class DiskBlockletManager extends BaseBlockletManager {
       await this._runPostInstallHook(blocklet, context);
 
       logger.info('start migration');
-      try {
+      {
         const oldVersions = {};
         forEachBlockletSync(oldBlocklet, (b, { id }) => {
           oldVersions[id] = b.meta.version;
         });
         const nodeEnvironments = await states.node.getEnvironments();
-        const runMigration = (b, { id, ancestors }) => {
-          return runMigrationScripts({
-            blocklet: b,
-            appDir: b.env.appDir,
-            env: getRuntimeEnvironments(b, nodeEnvironments, ancestors),
-            oldVersion: oldVersions[id],
-            newVersion: b.meta.version,
-          });
+        const runMigration = async (b, { id, ancestors }) => {
+          try {
+            await runMigrationScripts({
+              blocklet: b,
+              appDir: b.env.appDir,
+              env: getRuntimeEnvironments(b, nodeEnvironments, ancestors),
+              oldVersion: oldVersions[id],
+              newVersion: b.meta.version,
+              ...getHooksOutputFiles(b),
+            });
+          } catch (error) {
+            logger.error('Failed to run migration scripts', { appDid: did, title: b.meta.title, error });
+            error.message = `Failed to run migration scripts for ${b.meta.title}: ${error.message}`;
+            throw error;
+          }
         };
         await forEachBlocklet(blocklet, runMigration, { parallel: true });
-      } catch (error) {
-        logger.error('Failed to migrate blocklet', { did, error });
-        throw error;
       }
       logger.info('end migration');
 
@@ -2798,7 +2802,7 @@ class DiskBlockletManager extends BaseBlockletManager {
           : BlockletEvents.componentUpgradeFailed;
 
       this.emit(notificationEvent, {
-        blocklet: { ...oldBlocklet, componentDids, error: { message: err.message } },
+        blocklet: { ...newBlocklet, componentDids, error: { message: err.message } },
         context,
       });
 

package/lib/blocklet/migration.js

@@ -20,6 +20,8 @@ async function runScripts({
   printInfo,
   printSuccess,
   printError,
+  output,
+  error,
 }) {
   // 获取所有待执行的脚本
   let scripts = [];
@@ -57,6 +59,8 @@ async function runScripts({
         cwd: appDir,
         env: getSafeEnv(env),
         silent: false,
+        output,
+        error,
       });
       printInfo(`Migration script executed: ${scriptPath}`);
     } catch (migrationErr) {
@@ -101,6 +105,8 @@ module.exports = async ({
   printInfo = logger.info,
   printSuccess = logger.info,
   printError = logger.error,
+  output,
+  error,
 }) => {
   if (!oldVersion) {
     return;
@@ -128,6 +134,8 @@ module.exports = async ({
     printError,
     printInfo,
     printSuccess,
+    output,
+    error,
   });
 
   fs.removeSync(backupDir);

package/lib/index.js

@@ -1,4 +1,4 @@
-const fs = require('fs');
+const fs = require('fs-extra');
 const path = require('path');
 const get = require('lodash/get');
 const uniq = require('lodash/uniq');
@@ -37,6 +37,7 @@ const pm2Events = require('./blocklet/manager/pm2-events');
 const { createStateReadyQueue, createStateReadyHandler } = require('./util/ready');
 const { createDataArchive } = require('./util/blocklet');
 const { toStatus, fromStatus, ensureDataDirs, getQueueConcurrencyByMem, getStateCrons } = require('./util');
+const { clearCache } = require('./util/cache');
 const getMetaFromUrl = require('./util/get-meta-from-url');
 
 /**
@@ -320,6 +321,7 @@ function ABTNode(options) {
 
     // Gateway
     updateGateway: nodeAPI.updateGateway.bind(nodeAPI),
+    clearCache: (params) => clearCache(params, instance, blockletManager),
 
     // Team && Access control
 

package/lib/locales/en.js

@@ -13,7 +13,7 @@ module.exports = flat({
       },
       isFull: 'The current Space storage space is full, please expand the space and back up again',
       lackOfSpace:
-        'The current available space in the storage is insufficient. Please expand the space and perform the backup again',
+        'The current available space in the storage is insufficient, Please expand the space and perform the backup again',
     },
   },
 });

package/lib/locales/zh.js

@@ -11,7 +11,7 @@ module.exports = flat({
         forbidden: '你还没有权限执行备份操作，请尝试在 DID Spaces 上恢复应用授权或者重新连接 DID Spaces 后重试',
       },
       isFull: '当前的空间存储空间已满,请扩展空间并再次备份',
-      lackOfSpace: '当前存储空间的可用空间不足。请扩展空间后再次进行备份',
+      lackOfSpace: '当前存储空间的可用空间不足, 请扩展空间后再次进行备份',
     },
   },
 });

package/lib/router/index.js

@@ -173,6 +173,14 @@ class Router {
   getLogDir() {
     return this.provider.getLogDir();
   }
+
+  searchCache(pattern) {
+    return this.provider.searchCache(pattern);
+  }
+
+  clearCache() {
+    return this.provider.clearCache();
+  }
 }
 
 Router.formatSites = (sites = []) => {

package/lib/states/audit-log.js

@@ -124,7 +124,11 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'upgradeBlocklet':
       const actionName = result.action || 'upgraded';
       if (result.resultStatus === 'failed') {
-        return `${actionName} component failed: **${getComponentNamesWithVersion(result, result.componentDids)}**`;
+        const errMsg = result.error?.message ? `: ${result.error.message}` : '';
+        return `${actionName} component failed: **${getComponentNamesWithVersion(
+          result,
+          result.componentDids
+        )}**${errMsg}`;
       }
       return `${actionName} component: **${getComponentNamesWithVersion(result, result.componentDids)}**`;
     case 'deleteComponent':
@@ -283,6 +287,8 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `updated routing rule **${args.rule?.from?.pathPrefix}** from ${site}`; // prettier-ignore
     case 'deleteRoutingRule':
       return `deleted routing rule from ${site}`; // prettier-ignore
+    case 'clearCache':
+      return args.pattern ? `cleared cache with pattern ${args.pattern}` : 'cleared all cache';
     case 'updateGateway': {
       const changes = [
         args.requestLimit.enabled ? `rate limit: enabled, rate: ${args.requestLimit.rate}` : 'rate limit: disabled',
@@ -389,6 +395,7 @@ const getLogCategory = (action) => {
     case 'issueLetsEncryptCert':
       return 'certificates';
 
+    case 'clearCache':
     case 'updateGateway':
       return 'gateway';
 

package/lib/states/backup.js

@@ -1,4 +1,5 @@
 const { Joi } = require('@arcblock/validator');
+const { BACKUPS } = require('@abtnode/constant');
 const BaseState = require('./base');
 const {
   validateBackupSuccess,
@@ -29,7 +30,7 @@ const validateBackup = Joi.object({
   updatedAt: Joi.string().optional().default('').allow(''),
 
   // 0 表示成功了，建议使用常量表示，默认是 1 表示错误的, null 表示备份中
-  status: Joi.number().optional().allow(null),
+  status: Joi.number().optional().allow(BACKUPS.STATUS.PROGRESS),
   // 发生错误的时候可以用来存储错误下信息
   message: Joi.string().optional().default('').allow(''),
 
@@ -101,7 +102,7 @@ class BackupState extends BaseState {
       {
         $set: {
           ...value,
-          status: 0,
+          status: BACKUPS.STATUS.SUCCEEDED,
           updatedAt: new Date().toISOString(),
         },
       }
@@ -127,7 +128,7 @@ class BackupState extends BaseState {
       {
         $set: {
           ...value,
-          status: 1,
+          status: BACKUPS.STATUS.FAILED,
           updatedAt: new Date().toISOString(),
         },
       }

package/lib/util/cache.js

@@ -0,0 +1,71 @@
+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) => {
+  if (fs.existsSync(dir)) {
+    fs.rmSync(dir, { recursive: true, force: true });
+    fs.ensureDirSync(dir);
+  }
+};
+
+/**
+ * The `clearCache` function is used to clear cache files based on different
+ * parameters and directories.
+ * @param params - { teamDid: string, pattern: string }
+ * @param node - the server instance.
+ * @param blockletManager - the blocklet manager instance.
+ * @returns String[] list of files removed from the cache.
+ */
+const clearCache = async (params, node, blockletManager) => {
+  const baseDir = path.dirname(node.dataDirs.core);
+
+  // reset cache by pattern
+  const info = await node.getNodeInfo({ useCache: true });
+  const provider = node.getRouterProvider(info.routing.provider);
+  if (params.pattern) {
+    const files = await provider.searchCache(params.pattern);
+    files.forEach((x) => fs.rmSync(x, { force: true }));
+    return files.map((x) => x.replace(baseDir, ''));
+  }
+
+  const removed = [];
+
+  // reset server cache
+  if (params.teamDid === info.did) {
+    // reset all router cache
+    const result = await provider.clearCache();
+    removed.push(...result);
+
+    // reset global cache for external images used for open graph
+    const cacheDir = getAppOgCacheDir(node.dataDirs.tmp);
+    clearCacheDir(cacheDir);
+    removed.push(cacheDir);
+
+    return removed.map((x) => x.replace(baseDir, ''));
+  }
+
+  // reset blocklet cache
+  const blocklet = await blockletManager.getBlocklet(params.teamDid);
+  [getAppImageCacheDir(blocklet.env.cacheDir), getAppOgCacheDir(blocklet.env.cacheDir)].forEach((x) => {
+    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 }
+  );
+
+  // FIXME: @wangshijun can we bust cache for image-filter in nginx?
+  return removed.map((x) => x.replace(baseDir, ''));
+};
+
+module.exports = {
+  clearCache,
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.15-beta-a635f48d",
+  "version": "1.16.15-beta-89b542d3",
   "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-a635f48d",
-    "@abtnode/auth": "1.16.15-beta-a635f48d",
-    "@abtnode/certificate-manager": "1.16.15-beta-a635f48d",
-    "@abtnode/constant": "1.16.15-beta-a635f48d",
-    "@abtnode/cron": "1.16.15-beta-a635f48d",
-    "@abtnode/logger": "1.16.15-beta-a635f48d",
-    "@abtnode/models": "1.16.15-beta-a635f48d",
-    "@abtnode/queue": "1.16.15-beta-a635f48d",
-    "@abtnode/rbac": "1.16.15-beta-a635f48d",
-    "@abtnode/router-provider": "1.16.15-beta-a635f48d",
-    "@abtnode/static-server": "1.16.15-beta-a635f48d",
-    "@abtnode/timemachine": "1.16.15-beta-a635f48d",
-    "@abtnode/util": "1.16.15-beta-a635f48d",
+    "@abtnode/analytics": "1.16.15-beta-89b542d3",
+    "@abtnode/auth": "1.16.15-beta-89b542d3",
+    "@abtnode/certificate-manager": "1.16.15-beta-89b542d3",
+    "@abtnode/constant": "1.16.15-beta-89b542d3",
+    "@abtnode/cron": "1.16.15-beta-89b542d3",
+    "@abtnode/logger": "1.16.15-beta-89b542d3",
+    "@abtnode/models": "1.16.15-beta-89b542d3",
+    "@abtnode/queue": "1.16.15-beta-89b542d3",
+    "@abtnode/rbac": "1.16.15-beta-89b542d3",
+    "@abtnode/router-provider": "1.16.15-beta-89b542d3",
+    "@abtnode/static-server": "1.16.15-beta-89b542d3",
+    "@abtnode/timemachine": "1.16.15-beta-89b542d3",
+    "@abtnode/util": "1.16.15-beta-89b542d3",
     "@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-a635f48d",
-    "@blocklet/env": "1.16.15-beta-a635f48d",
-    "@blocklet/meta": "1.16.15-beta-a635f48d",
-    "@blocklet/resolver": "1.16.15-beta-a635f48d",
-    "@blocklet/sdk": "1.16.15-beta-a635f48d",
+    "@blocklet/constant": "1.16.15-beta-89b542d3",
+    "@blocklet/env": "1.16.15-beta-89b542d3",
+    "@blocklet/meta": "1.16.15-beta-89b542d3",
+    "@blocklet/resolver": "1.16.15-beta-89b542d3",
+    "@blocklet/sdk": "1.16.15-beta-89b542d3",
     "@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": "a42c00d339896a089694a6275cee988422ecef69"
+  "gitHead": "a5302e43c87e7f33a35b1293d7b55579cc36fcc8"
 }