@abtnode/core 1.16.10 → 1.16.11-beta-069c3537

package/lib/blocklet/manager/disk.js

@@ -104,6 +104,7 @@ const {
   updateBlockletFallbackLogo,
   ensureAppLogo,
   getBlockletDidDomainList,
+  shouldCleanExpiredBlocklet,
 } = require('../../util/blocklet');
 const states = require('../../states');
 const BaseBlockletManager = require('./base');
@@ -2850,13 +2851,22 @@ class BlockletManager extends BaseBlockletManager {
         return;
       }
 
-      const tasks = blockletExtras.map(async ({ appDid, did, meta }) => {
+      const tasks = blockletExtras.map(async ({ appDid, did, meta, controller }) => {
         const blocklet = await this.getBlocklet(did);
         if (blocklet) {
           logger.error('skip cleaning the blocklet which is not deleted', { blockletDid: did });
           return;
         }
 
+        const assetState = await util.getNFTState(controller.chainHost, controller.nftId);
+        const expirationDate = getNftExpirationDate(assetState);
+
+        if (!shouldCleanExpiredBlocklet(expirationDate)) {
+          logger.error('skip cleaning the blocklet which is not expired', { blockletDid: did, expirationDate });
+          await blockletExtras.updateExpireInfo({ did, expiredAt: expirationDate });
+          return;
+        }
+
         let blockletMeta = meta;
         if (isEmpty(blockletMeta)) {
           // 旧版本的 blocklet 没有 meta 信息，这里补充一下

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

@@ -74,6 +74,7 @@ const installApplicationFromBackup = async ({
     'createdAt',
     'updatedAt',
     'controller',
+    'expiredAt',
   ]);
 
   if (blockletState.meta.did !== extra.did) {

package/lib/util/blocklet.js

@@ -2,6 +2,7 @@
 
 const fs = require('fs-extra');
 const path = require('path');
+const dayjs = require('dayjs');
 const joinURL = require('url-join');
 const shelljs = require('shelljs');
 const os = require('os');
@@ -43,6 +44,7 @@ const {
   BLOCKLET_INSTALL_TYPE,
   BLOCKLET_STORE_DEV,
   APP_STRUCT_VERSION,
+  EXPIRED_BLOCKLET_DATA_RETENTION_DAYS,
 } = require('@abtnode/constant');
 const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
 const { toSvg: createDidLogo } =
@@ -99,6 +101,9 @@ const { validate: validateEngine, get: getEngine } = require('../blocklet/manage
 const isRequirementsSatisfied = require('./requirement');
 const { getDidDomainForBlocklet } = require('./get-domain-for-blocklet');
 const { expandBundle, findInterfacePortByName, prettyURL, getNFTState, templateReplace } = require('./index');
+const externalIpUtil = require('./get-accessible-external-node-ip');
+const { getIpDnsDomainForBlocklet } = require('./get-domain-for-blocklet');
+const { replaceDomainSlot } = require('./index');
 
 const getComponentConfig = (meta) => {
   const components = meta.components || meta.children || [];
@@ -1518,6 +1523,22 @@ const getConfigFromPreferences = (blocklet) => {
   return result;
 };
 
+const getBlockletURLForLauncher = async ({ blocklet, nodeInfo }) => {
+  let nodeIp = await externalIpUtil.getFromCache();
+  if (process.env.ABT_NODE_HOST) {
+    // 开发调试用
+    nodeIp = process.env.ABT_NODE_HOST;
+  }
+
+  if (nodeIp) {
+    const ipEchoDomain = getIpDnsDomainForBlocklet(blocklet);
+    return `https://${replaceDomainSlot({ domain: ipEchoDomain, nodeIp })}`;
+  }
+
+  const didDomain = getDidDomainForBlocklet({ appPid: blocklet.appPid, didDomain: nodeInfo.didDomain });
+  return `https://${didDomain}`;
+};
+
 const consumeServerlessNFT = async ({ nftId, nodeInfo, blocklet }) => {
   try {
     const state = await getNFTState(blocklet.controller.chainHost, nftId);
@@ -1525,13 +1546,15 @@ const consumeServerlessNFT = async ({ nftId, nodeInfo, blocklet }) => {
       throw new Error(`get nft state failed, chainHost: ${blocklet.controller.chainHost}, nftId: ${nftId}`);
     }
 
-    const wallet = getNodeWallet(nodeInfo.sk);
-    const appURL = blocklet.environments.find((item) => item.key === 'BLOCKLET_APP_URL').value;
+    const appURL = await getBlockletURLForLauncher({ blocklet, nodeInfo });
+
+    logger.info('app url when consuming nft', { appURL, nftId });
 
     const body = { nftId, appURL };
 
     const { launcherUrl } = state.data.value;
 
+    const wallet = getNodeWallet(nodeInfo.sk);
     const func = async () => {
       const { data } = await axios.post(joinURL(launcherUrl, '/api/serverless/consume'), body, {
         headers: {
@@ -1929,6 +1952,10 @@ const getBlockletDidDomainList = (blocklet, nodeInfo) => {
   return domainAliases;
 };
 
+const shouldCleanExpiredBlocklet = (expirationDate) => {
+  return dayjs().diff(dayjs(expirationDate), 'day') > EXPIRED_BLOCKLET_DATA_RETENTION_DAYS;
+};
+
 module.exports = {
   updateBlockletFallbackLogo,
   consumeServerlessNFT,
@@ -1987,4 +2014,6 @@ module.exports = {
   getFixedBundleSource,
   ensureAppLogo,
   getBlockletDidDomainList,
+  shouldCleanExpiredBlocklet,
+  getBlockletURLForLauncher,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.10",
+  "version": "1.16.11-beta-069c3537",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.10",
-    "@abtnode/certificate-manager": "1.16.10",
-    "@abtnode/constant": "1.16.10",
-    "@abtnode/cron": "1.16.10",
-    "@abtnode/logger": "1.16.10",
-    "@abtnode/models": "1.16.10",
-    "@abtnode/queue": "1.16.10",
-    "@abtnode/rbac": "1.16.10",
-    "@abtnode/router-provider": "1.16.10",
-    "@abtnode/static-server": "1.16.10",
-    "@abtnode/timemachine": "1.16.10",
-    "@abtnode/util": "1.16.10",
+    "@abtnode/auth": "1.16.11-beta-069c3537",
+    "@abtnode/certificate-manager": "1.16.11-beta-069c3537",
+    "@abtnode/constant": "1.16.11-beta-069c3537",
+    "@abtnode/cron": "1.16.11-beta-069c3537",
+    "@abtnode/logger": "1.16.11-beta-069c3537",
+    "@abtnode/models": "1.16.11-beta-069c3537",
+    "@abtnode/queue": "1.16.11-beta-069c3537",
+    "@abtnode/rbac": "1.16.11-beta-069c3537",
+    "@abtnode/router-provider": "1.16.11-beta-069c3537",
+    "@abtnode/static-server": "1.16.11-beta-069c3537",
+    "@abtnode/timemachine": "1.16.11-beta-069c3537",
+    "@abtnode/util": "1.16.11-beta-069c3537",
     "@arcblock/did": "1.18.80",
     "@arcblock/did-auth": "1.18.80",
     "@arcblock/did-ext": "^1.18.80",
@@ -41,9 +41,9 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.80",
     "@arcblock/vc": "1.18.80",
-    "@blocklet/constant": "1.16.10",
-    "@blocklet/meta": "1.16.10",
-    "@blocklet/sdk": "1.16.10",
+    "@blocklet/constant": "1.16.11-beta-069c3537",
+    "@blocklet/meta": "1.16.11-beta-069c3537",
+    "@blocklet/sdk": "1.16.11-beta-069c3537",
     "@did-space/client": "^0.2.99",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.80",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "8f1d613ed04b1bd4a16a2b4109ac86a7848803a5"
+  "gitHead": "a89c7f13901d2c2d50b09d68d6088ca705648ff6"
 }