@abtnode/core 1.16.0-beta-58020de5 → 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');
@@ -1916,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);
@@ -1945,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`,
@@ -2065,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);
 
@@ -2578,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 });
   }
@@ -2600,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/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'];
 
@@ -1510,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 });
 
@@ -1863,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-58020de5",
+  "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-58020de5",
-    "@abtnode/certificate-manager": "1.16.0-beta-58020de5",
-    "@abtnode/constant": "1.16.0-beta-58020de5",
-    "@abtnode/cron": "1.16.0-beta-58020de5",
-    "@abtnode/db": "1.16.0-beta-58020de5",
-    "@abtnode/logger": "1.16.0-beta-58020de5",
-    "@abtnode/queue": "1.16.0-beta-58020de5",
-    "@abtnode/rbac": "1.16.0-beta-58020de5",
-    "@abtnode/router-provider": "1.16.0-beta-58020de5",
-    "@abtnode/static-server": "1.16.0-beta-58020de5",
-    "@abtnode/timemachine": "1.16.0-beta-58020de5",
-    "@abtnode/util": "1.16.0-beta-58020de5",
+    "@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-58020de5",
-    "@blocklet/meta": "1.16.0-beta-58020de5",
-    "@blocklet/sdk": "1.16.0-beta-58020de5",
+    "@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": "9d3f47f9827acf13e9efea38cd605d3b36f9f523"
+  "gitHead": "c25ddcc371454b2e2f7038aa5e64c7b7c27763cb"
 }