@abtnode/core 1.16.0-beta-ad6df3ae → 1.16.0-beta-7a7d5d97

package/lib/blocklet/manager/disk.js

@@ -11,12 +11,8 @@ const cloneDeep = require('lodash/cloneDeep');
 const { isNFTExpired, getNftExpirationDate } = require('@abtnode/util/lib/nft');
 const didDocument = require('@abtnode/util/lib/did-document');
 const { sign } = require('@arcblock/jwt');
-const { isEthereumDid } = require('@arcblock/did');
-const { toSvg: createDidLogo } =
-  process.env.NODE_ENV !== 'test' ? require('@arcblock/did-motif') : require('@arcblock/did-motif/dist/did-motif.cjs');
-const getBlockletInfo = require('@blocklet/meta/lib/info');
-const { createBlockiesSvg } = require('@blocklet/meta/lib/blockies');
 const sleep = require('@abtnode/util/lib/sleep');
+const getBlockletInfo = require('@blocklet/meta/lib/info');
 
 const logger = require('@abtnode/logger')('@abtnode/core:blocklet:manager');
 const {
@@ -100,6 +96,7 @@ const {
   isRotatingAppDid,
   checkVersionCompatibility,
   getBlockletKnownAs,
+  updateBlockletFallbackLogo,
 } = require('../../util/blocklet');
 const states = require('../../states');
 const BaseBlockletManager = require('./base');
@@ -150,10 +147,19 @@ const pm2StatusMap = {
  */
 const getBlockletEngineNameByPlatform = (blockletMeta) => getBlockletEngine(blockletMeta).interpreter;
 
-const getSkippedProcessIds = ({ newBlocklet, oldBlocklet, context = {} }) => {
+/**
+ * @param {{
+ *   newBlocklet,
+ *   oldBlocklet,
+ *   context: { forceStartProcessIds?: string[] },
+ * }}
+ * @returns {{ installedComponentNames: string[], skippedProcessIds: string[] }}
+ */
+const getComponentChangedInfoForUpgrade = ({ newBlocklet, oldBlocklet, context = {} }) => {
   const { forceStartProcessIds = [] } = context;
   const idMap = {};
-  const res = [];
+  const skippedProcessIds = [];
+  const installedComponentNames = [];
 
   forEachBlockletSync(oldBlocklet, (b, { ancestors }) => {
     if (b.meta.dist?.integrity) {
@@ -164,15 +170,18 @@ const getSkippedProcessIds = ({ newBlocklet, oldBlocklet, context = {} }) => {
   forEachBlockletSync(newBlocklet, (b, { ancestors }) => {
     const id = getComponentProcessId(b, ancestors);
     if (forceStartProcessIds.includes(id)) {
+      installedComponentNames.push(b.meta.title);
       return;
     }
 
     if (!b.meta.dist?.integrity || b.meta.dist.integrity === idMap[id]) {
-      res.push(id);
+      skippedProcessIds.push(id);
+    } else {
+      installedComponentNames.push(b.meta.title);
     }
   });
 
-  return res;
+  return { skippedProcessIds, installedComponentNames };
 };
 
 // 10s 上报统计一次
@@ -506,7 +515,7 @@ class BlockletManager extends BaseBlockletManager {
 
       const error = Array.isArray(err) ? err[0] : err;
       logger.error('Failed to start blocklet', { error, did, name: blocklet.meta.name });
-      const description = `Start blocklet ${blocklet.meta.name} failed with error: ${error.message}`;
+      const description = `Start blocklet ${blocklet.meta.title} failed with error: ${error.message}`;
       this._createNotification(did, {
         title: 'Start Blocklet Failed',
         description,
@@ -635,7 +644,7 @@ class BlockletManager extends BaseBlockletManager {
 
       this._createNotification(did, {
         title: 'Blocklet Restart Failed',
-        description: `Blocklet ${did} restart failed with error: ${err.message || 'queue exception'}`,
+        description: `Blocklet ${result.meta.title} restart failed with error: ${err.message || 'queue exception'}`,
         entityType: 'blocklet',
         entityId: did,
         severity: 'error',
@@ -686,7 +695,7 @@ class BlockletManager extends BaseBlockletManager {
       const doc = await this._deleteBlocklet({ did, keepData, keepLogsDir, keepConfigs }, context);
       this._createNotification(doc.meta.did, {
         title: 'Blocklet Deleted',
-        description: `Blocklet ${doc.meta.name}@${doc.meta.version} is deleted.`,
+        description: `Blocklet ${doc.meta.title} is deleted.`,
         entityType: 'blocklet',
         entityId: doc.meta.did,
         severity: 'success',
@@ -699,7 +708,7 @@ class BlockletManager extends BaseBlockletManager {
 
       this._createNotification(doc.meta.did, {
         title: 'Blocklet Deleted',
-        description: `Blocklet ${doc.meta.name}@${doc.meta.version} is deleted.`,
+        description: `Blocklet ${doc.meta.title} is deleted.`,
         entityType: 'blocklet',
         entityId: doc.meta.did,
         severity: 'success',
@@ -817,7 +826,7 @@ class BlockletManager extends BaseBlockletManager {
 
     this._createNotification(newBlocklet.meta.did, {
       title: 'Component Deleted',
-      description: `Component ${child.meta.name} of ${newBlocklet.meta.name} is successfully deleted.`,
+      description: `Component ${child.meta.title} of ${newBlocklet.meta.title} is successfully deleted.`,
       entityType: 'blocklet',
       entityId: newBlocklet.meta.did,
       severity: 'success',
@@ -1069,6 +1078,24 @@ class BlockletManager extends BaseBlockletManager {
       await this._updateDidDocument(blocklet);
     }
 
+    // update blocklet meta
+    if (blocklet.structVersion && !childDids.length) {
+      const changedTitle = newConfigs.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_NAME)?.value;
+      const changedDescription = newConfigs.find(
+        (x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_DESCRIPTION
+      )?.value;
+
+      if (changedTitle || changedDescription) {
+        await states.blocklet.updateBlocklet(rootDid, {
+          meta: {
+            ...blocklet.meta,
+            title: changedTitle || blocklet.meta.title,
+            description: changedDescription || blocklet.meta.description,
+          },
+        });
+      }
+    }
+
     await this._updateBlockletEnvironment(rootDid);
 
     // response
@@ -1418,7 +1445,7 @@ class BlockletManager extends BaseBlockletManager {
       skipCheckIntegrity,
     } = params;
     const { meta } = blocklet;
-    const { name, did, version } = meta;
+    const { title, name, did, version } = meta;
 
     // check status
     if (!skipCheckStatusBeforeDownload) {
@@ -1489,7 +1516,7 @@ class BlockletManager extends BaseBlockletManager {
       });
       this._createNotification(did, {
         title: 'Blocklet Download Failed',
-        description: `Blocklet ${name}@${version} download failed with error: ${err.message}`,
+        description: `Blocklet ${title} download failed with error: ${err.message}`,
         entityType: 'blocklet',
         entityId: did,
         severity: 'error',
@@ -1610,7 +1637,7 @@ class BlockletManager extends BaseBlockletManager {
     const blocklet = await this.getBlocklet(did);
 
     const { meta } = blocklet;
-    const { name } = meta;
+    const { name, title } = meta;
 
     try {
       // healthy check
@@ -1633,7 +1660,7 @@ class BlockletManager extends BaseBlockletManager {
 
       this._createNotification(did, {
         title: 'Blocklet Start Failed',
-        description: `Blocklet ${name} start failed: ${error.message}`,
+        description: `Blocklet ${title} start failed: ${error.message}`,
         entityType: 'blocklet',
         entityId: did,
         severity: 'error',
@@ -1886,11 +1913,7 @@ class BlockletManager extends BaseBlockletManager {
         await fs.copy(src, dist);
       }
 
-      if (isEthereumDid(blocklet.meta.did)) {
-        await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.svg'), createBlockiesSvg(blocklet.meta.did));
-      } else {
-        await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.svg'), createDidLogo(blocklet.meta.did));
-      }
+      await updateBlockletFallbackLogo(blocklet);
 
       // Init db
       await this.teamManager.initTeam(blocklet.meta.did);
@@ -1915,12 +1938,13 @@ class BlockletManager extends BaseBlockletManager {
       if (blocklet.controller && process.env.NODE_ENV !== 'test') {
         const nodeInfo = await states.node.read();
         await consumeServerlessNFT({ nftId: blocklet.controller.nftId, nodeInfo, blocklet });
+        this.emit(BlockletEvents.nftConsumed, { blocklet, context });
       }
 
       if (createNotification) {
         this._createNotification(did, {
           title: 'Blocklet Installed',
-          description: `Blocklet ${meta.name}@${meta.version} is installed successfully. (Source: ${
+          description: `Blocklet ${meta.title} is installed successfully. (Source: ${
             deployedFrom || fromBlockletSource(source)
           })`,
           action: `/blocklets/${did}/overview`,
@@ -1947,7 +1971,7 @@ class BlockletManager extends BaseBlockletManager {
         });
         this._createNotification(did, {
           title: 'Blocklet Install Failed',
-          description: `Blocklet ${meta.name}@${meta.version} install failed with error: ${err.message}`,
+          description: `Blocklet ${meta.title} install failed with error: ${err.message}`,
           entityType: 'blocklet',
           entityId: did,
           severity: 'error',
@@ -1962,10 +1986,15 @@ class BlockletManager extends BaseBlockletManager {
 
   async _upgradeBlocklet({ newBlocklet, oldBlocklet, context = {} }) {
     const { meta, source, deployedFrom, children } = newBlocklet;
-    const { did, version, name } = meta;
+    const { did, version, name, title } = meta;
 
     // ids
-    context.skippedProcessIds = getSkippedProcessIds({ newBlocklet, oldBlocklet, context });
+    const { skippedProcessIds, installedComponentNames } = getComponentChangedInfoForUpgrade({
+      newBlocklet,
+      oldBlocklet,
+      context,
+    });
+    context.skippedProcessIds = skippedProcessIds;
 
     try {
       // delete old process
@@ -2030,7 +2059,7 @@ class BlockletManager extends BaseBlockletManager {
 
       blocklet = await this.getBlocklet(did, context);
 
-      await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.svg'), createDidLogo(blocklet.meta.did));
+      await updateBlockletFallbackLogo(blocklet);
 
       await this._updateDependents(did);
 
@@ -2040,9 +2069,7 @@ class BlockletManager extends BaseBlockletManager {
         this.emit(BlockletEvents.upgraded, { blocklet, context });
         this._createNotification(did, {
           title: 'Blocklet Upgrade Success',
-          description: `Blocklet ${name}@${version} upgrade successfully. (Source: ${
-            deployedFrom || fromBlockletSource(source)
-          })`,
+          description: `Blocklet ${title} upgrade successfully. (Component: ${installedComponentNames.join(', ')})`,
           action: `/blocklets/${did}/overview`,
           entityType: 'blocklet',
           entityId: did,
@@ -2071,7 +2098,9 @@ class BlockletManager extends BaseBlockletManager {
 
       this._createNotification(did, {
         title: 'Blocklet Upgrade Failed',
-        description: `Blocklet ${name}@${version} upgrade failed with error: ${err.message}`,
+        description: `Blocklet ${title} upgrade failed with error: ${
+          err.message
+        }. (Component: ${installedComponentNames.join(', ')})`,
         entityType: 'blocklet',
         entityId: did,
         severity: 'error',
@@ -2543,16 +2572,32 @@ class BlockletManager extends BaseBlockletManager {
     const spacesRestore = new SpacesRestore({ ...input, event: this, userDid, referrer: context.referrer });
     const params = await spacesRestore.restore();
 
+    const removeRestoreDir = () => {
+      if (fs.existsSync(spacesRestore.restoreDir)) {
+        fs.remove(spacesRestore.restoreDir).catch((err) => {
+          logger.error('failed to remove restore dir', { error: err, dir: spacesRestore.restoreDir });
+        });
+      }
+    };
+
     this.emit(BlockletEvents.restoreProgress, { appDid: input.appDid, status: RESTORE_PROGRESS_STATUS.installing });
-    await installApplicationFromBackup({
-      url: `file://${spacesRestore.restoreDir}`,
-      moveDir: true,
-      ...merge(...params),
-      manager: this,
-      states,
-      controller: input.controller,
-      context: { ...context, startImmediately: true },
-    });
+
+    try {
+      await installApplicationFromBackup({
+        url: `file://${spacesRestore.restoreDir}`,
+        moveDir: true,
+        ...merge(...params),
+        manager: this,
+        states,
+        controller: input.controller,
+        context: { ...context, startImmediately: true },
+      });
+
+      removeRestoreDir();
+    } catch (error) {
+      removeRestoreDir();
+      throw error;
+    }
 
     this.emit(BlockletEvents.restoreProgress, { appDid: input.appDid, status: RESTORE_PROGRESS_STATUS.completed });
   }
@@ -2565,14 +2610,28 @@ class BlockletManager extends BaseBlockletManager {
     const diskRestore = new DiskRestore({ ...input, event: this });
     const params = await diskRestore.restore();
 
-    await installApplicationFromBackup({
-      url: `file://${diskRestore.restoreDir}`,
-      ...merge(...params),
-      manager: this,
-      states,
-      move: true,
-      sync: false, // use queue to download and install application
-    });
+    const removeRestoreDir = () => {
+      if (fs.existsSync(diskRestore.restoreDir)) {
+        fs.remove(diskRestore.restoreDir).catch((err) => {
+          logger.error('failed to remove restore dir', { error: err, dir: diskRestore.restoreDir });
+        });
+      }
+    };
+
+    try {
+      await installApplicationFromBackup({
+        url: `file://${diskRestore.restoreDir}`,
+        ...merge(...params),
+        manager: this,
+        states,
+        move: true,
+        sync: false, // use queue to download and install application
+      });
+      removeRestoreDir();
+    } catch (error) {
+      removeRestoreDir();
+      throw error;
+    }
   }
 }
 

package/lib/blocklet/manager/helper/install-application-from-dev.js

@@ -1,14 +1,7 @@
-const path = require('path');
-const fs = require('fs-extra');
-const { isEthereumDid } = require('@arcblock/did');
-const { createBlockiesSvg } = require('@blocklet/meta/lib/blockies');
-
-const { toSvg: createDidLogo } =
-  process.env.NODE_ENV !== 'test' ? require('@arcblock/did-motif') : require('@arcblock/did-motif/dist/did-motif.cjs');
 const { BlockletStatus, BLOCKLET_MODES, fromBlockletStatus, BlockletSource } = require('@blocklet/constant');
 
 const logger = require('@abtnode/logger')('@abtnode/core:install-app-dev');
-const { ensureMeta } = require('../../../util/blocklet');
+const { ensureMeta, updateBlockletFallbackLogo } = require('../../../util/blocklet');
 
 /**
  *
@@ -88,11 +81,7 @@ const installApplicationFromDev = async ({ folder, meta, states, manager } = {})
 
   blocklet = await manager.getBlocklet(did);
 
-  if (isEthereumDid(blocklet.meta.did)) {
-    await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.svg'), createBlockiesSvg(blocklet.meta.did));
-  } else {
-    await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.svg'), createDidLogo(blocklet.meta.did));
-  }
+  await updateBlockletFallbackLogo(blocklet);
 
   return blocklet;
 };

package/lib/blocklet/manager/helper/install-component-from-url.js

@@ -66,7 +66,11 @@ const installComponentFromUrl = async ({
   }
 
   if (!isComponentBlocklet(meta)) {
-    throw new Error('The blocklet cannot be a component');
+    throw new Error(
+      `The blocklet cannot be a component : ${
+        meta.title || meta.name
+      }. The reason may be that the developer set capabilities.component to false in blocklet.yml`
+    );
   }
 
   if (title) {

package/lib/blocklet/storage/utils/disk.js

@@ -9,7 +9,7 @@ const restoreDirName = 'tmp/restore-disk';
 const getBackupList = (dataDir) => {
   const baseBackupDir = path.join(dataDir, backupDirName);
   const backupList = [];
-  const appDidList = fs.readdirSync(baseBackupDir);
+  const appDidList = fs.existsSync(baseBackupDir) ? fs.readdirSync(baseBackupDir) : [];
 
   appDidList.forEach((appDid) => {
     const metaFile = path.join(baseBackupDir, appDid, 'meta.json');

package/lib/util/blocklet.js

@@ -5,6 +5,7 @@ const path = require('path');
 const joinURL = require('url-join');
 const shelljs = require('shelljs');
 const os = require('os');
+const pRetry = require('p-retry');
 const tar = require('tar');
 const get = require('lodash/get');
 const isEmpty = require('lodash/isEmpty');
@@ -21,7 +22,7 @@ const { stableStringify } = require('@arcblock/vc');
 const { fromSecretKey, WalletType } = require('@ocap/wallet');
 const { toHex, toBase58, isHex, toDid } = require('@ocap/util');
 const { types } = require('@ocap/mcrypto');
-const { isValid: isValidDid } = require('@arcblock/did');
+const { isValid: isValidDid, isEthereumDid } = require('@arcblock/did');
 const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
 const pm2 = require('@abtnode/util/lib/async-pm2');
 const sleep = require('@abtnode/util/lib/sleep');
@@ -39,6 +40,9 @@ const {
   APP_STRUCT_VERSION,
 } = require('@abtnode/constant');
 const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
+const { toSvg: createDidLogo } =
+  process.env.NODE_ENV !== 'test' ? require('@arcblock/did-motif') : require('@arcblock/did-motif/dist/did-motif.cjs');
+const { createBlockiesSvg } = require('@blocklet/meta/lib/blockies');
 
 const SCRIPT_ENGINES_WHITE_LIST = ['npm', 'npx', 'pnpm', 'yarn'];
 
@@ -814,7 +818,9 @@ const parseComponents = async (component, context = {}) => {
     validateBlockletMeta(rawMeta, { ensureDist: true });
 
     if (!isComponentBlocklet(rawMeta)) {
-      throw new Error(`The blocklet cannot be a component: ${rawMeta.title}`);
+      throw new Error(
+        `The blocklet cannot be a component: ${rawMeta.title}. The reason may be that the developer set capabilities.component to false in blocklet.yml`
+      );
     }
 
     const webInterface = findWebInterface(rawMeta);
@@ -1508,13 +1514,28 @@ const consumeServerlessNFT = async ({ nftId, nodeInfo, blocklet }) => {
     const body = { nftId, appURL };
 
     const { launcherUrl } = state.data.value;
-    const { data } = await axios.post(joinURL(launcherUrl, '/api/serverless/consume'), body, {
-      headers: {
-        'x-sig': toBase58(wallet.sign(stableStringify(body))),
+
+    const func = async () => {
+      const { data } = await axios.post(joinURL(launcherUrl, '/api/serverless/consume'), body, {
+        headers: {
+          'x-sig': toBase58(wallet.sign(stableStringify(body))),
+        },
+      });
+
+      return data;
+    };
+
+    const delay = 10 * 1000;
+    const result = await pRetry(func, {
+      retries: 3,
+      minTimeout: delay,
+      maxTimeout: delay,
+      onFailedAttempt: (error) => {
+        logger.error(`attempt consume nft ${nftId} failed`, { error });
       },
     });
 
-    logger.error('consume serverless nft success', { nftId, hash: data.hash });
+    logger.error('consume serverless nft success', { nftId, hash: result.hash });
   } catch (error) {
     logger.error('consume serverless nft failed', { nftId, error });
 
@@ -1861,7 +1882,16 @@ const getFixedBundleSource = (component) => {
   return null;
 };
 
+const updateBlockletFallbackLogo = async (blocklet) => {
+  if (isEthereumDid(blocklet.meta.did)) {
+    await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.svg'), createBlockiesSvg(blocklet.meta.did));
+  } else {
+    await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.svg'), createDidLogo(blocklet.meta.did));
+  }
+};
+
 module.exports = {
+  updateBlockletFallbackLogo,
   consumeServerlessNFT,
   forEachBlocklet,
   getBlockletMetaFromUrl: (url) => getBlockletMetaFromUrl(url, { logger }),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-ad6df3ae",
+  "version": "1.16.0-beta-7a7d5d97",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.0-beta-ad6df3ae",
-    "@abtnode/certificate-manager": "1.16.0-beta-ad6df3ae",
-    "@abtnode/constant": "1.16.0-beta-ad6df3ae",
-    "@abtnode/cron": "1.16.0-beta-ad6df3ae",
-    "@abtnode/db": "1.16.0-beta-ad6df3ae",
-    "@abtnode/logger": "1.16.0-beta-ad6df3ae",
-    "@abtnode/queue": "1.16.0-beta-ad6df3ae",
-    "@abtnode/rbac": "1.16.0-beta-ad6df3ae",
-    "@abtnode/router-provider": "1.16.0-beta-ad6df3ae",
-    "@abtnode/static-server": "1.16.0-beta-ad6df3ae",
-    "@abtnode/timemachine": "1.16.0-beta-ad6df3ae",
-    "@abtnode/util": "1.16.0-beta-ad6df3ae",
+    "@abtnode/auth": "1.16.0-beta-7a7d5d97",
+    "@abtnode/certificate-manager": "1.16.0-beta-7a7d5d97",
+    "@abtnode/constant": "1.16.0-beta-7a7d5d97",
+    "@abtnode/cron": "1.16.0-beta-7a7d5d97",
+    "@abtnode/db": "1.16.0-beta-7a7d5d97",
+    "@abtnode/logger": "1.16.0-beta-7a7d5d97",
+    "@abtnode/queue": "1.16.0-beta-7a7d5d97",
+    "@abtnode/rbac": "1.16.0-beta-7a7d5d97",
+    "@abtnode/router-provider": "1.16.0-beta-7a7d5d97",
+    "@abtnode/static-server": "1.16.0-beta-7a7d5d97",
+    "@abtnode/timemachine": "1.16.0-beta-7a7d5d97",
+    "@abtnode/util": "1.16.0-beta-7a7d5d97",
     "@arcblock/did": "1.18.64",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.64",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.64",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.64",
-    "@blocklet/constant": "1.16.0-beta-ad6df3ae",
-    "@blocklet/meta": "1.16.0-beta-ad6df3ae",
-    "@blocklet/sdk": "1.16.0-beta-ad6df3ae",
+    "@blocklet/constant": "1.16.0-beta-7a7d5d97",
+    "@blocklet/meta": "1.16.0-beta-7a7d5d97",
+    "@blocklet/sdk": "1.16.0-beta-7a7d5d97",
     "@did-space/client": "^0.2.45",
     "@fidm/x509": "^1.2.1",
     "@ocap/client": "1.18.64",
@@ -91,5 +91,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "8fa60176a00400cd412b308df3c7d6dcd9af2db1"
+  "gitHead": "c25ddcc371454b2e2f7038aa5e64c7b7c27763cb"
 }