@abtnode/core 1.16.15-beta-324519fc → 1.16.15-beta-58d50c9a

package/lib/blocklet/manager/disk.js

@@ -1565,7 +1565,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         try {
           const status = await getProcessState(component.env.processId);
           const oldStatus = component.status;
-          if (component.status !== status) {
+          if (!isInProgress(status) && component.status !== status) {
             component.status = status;
             addToUpdates(component.meta.did, status);
             logger.info('will sync status from pm2', { did, status, oldStatus, componentDid: component.meta.did });
@@ -1675,12 +1675,6 @@ class DiskBlockletManager extends BaseBlockletManager {
     const info = await states.node.read();
 
     const crons = [
-      {
-        name: 'sync-blocklet-status',
-        time: '*/60 * * * * *', // 60s
-        fn: this._syncBlockletStatus.bind(this),
-        options: { runOnInit: false },
-      },
       {
         name: 'sync-blocklet-list',
         time: '*/60 * * * * *', // 60s
@@ -2422,18 +2416,6 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
   }
 
-  async _syncBlockletStatus() {
-    const run = async (blocklet) => {
-      try {
-        await this.status(blocklet.meta.did);
-      } catch (err) {
-        logger.error('sync blocklet status failed', { error: err });
-      }
-    };
-    const blocklets = await states.blocklet.getBlocklets();
-    blocklets.forEach(run);
-  }
-
   async _getChildrenForInstallation(component) {
     if (!component) {
       return [];
@@ -2708,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');
 
@@ -2816,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/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/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':
@@ -231,6 +235,8 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `${args.owner} ${args.reason}`;
     case 'issuePassportToUser':
       return `issued **${args.role}** passport to ${user}`;
+    case 'downloadLog':
+      return `download log for ${args.days} day${args.days > 1 ? 's' : ''}`;
 
     // accessKeys
     case 'createAccessKey':

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/blocklet.js

@@ -1898,7 +1898,6 @@ module.exports = {
   getProcessInfo,
   expandTarball,
   verifyIntegrity,
-  statusMap,
   getAppDirs,
   pruneBlockletBundle,
   getDiskInfo,

package/package.json

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