@abtnode/core 1.16.52-beta-20250924-093428-bd3f0d8c → 1.16.52-beta-20250924-135333-541024a8

package/lib/blocklet/manager/disk.js

@@ -2607,13 +2607,13 @@ class DiskBlockletManager extends BaseBlockletManager {
         },
         {
           name: 'stop-expired-external-blocklet',
-          time: '0 */30 * * * *', // 30min
+          time: '0 */10 * * * *', // 每10分钟
           options: { runOnInit: false },
           fn: () => this.stopExpiredBlocklets(),
         },
         {
           name: 'clean-expired-blocklet-data',
-          time: '0 10 0 * * *', // 每天凌晨 0:10
+          time: '0 10 * * * *', // 每小时
           options: { runOnInit: false },
           fn: () => this.cleanExpiredBlocklets(),
         },
@@ -3379,8 +3379,8 @@ class DiskBlockletManager extends BaseBlockletManager {
       }
 
       return installedBlocklet;
-    } catch (err) {
-      logger.error('blocklet onInstall error', { err });
+    } catch (error) {
+      logger.error('blocklet onInstall error', { error });
       return null;
     }
   }
@@ -5147,7 +5147,7 @@ class DiskBlockletManager extends BaseBlockletManager {
           }
 
           // 订阅终止后需要再保留一段时间数据
-          if (!launcher.isDataRetentionExceeded(launcherSession.terminatedAt)) {
+          if (!launcher.isDataRetentionExceeded(launcherSession)) {
             logger.info('skip cleaning the non-exceed redemption blocklet', {
               blockletDid: did,
               controller: data.controller,

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

@@ -131,6 +131,19 @@ const installApplicationFromGeneral = async ({
   try {
     await states.blockletExtras.addMeta({ did, meta: { did, name }, controller });
     await manager._setConfigsFromMeta(did);
+    if (context.bindDomainCap && context.domainNftDid) {
+      await states.blockletExtras.setSettings(did, {
+        bindDomainCap: context.bindDomainCap,
+        domainNftDid: context.domainNftDid,
+      });
+
+      logger.info('set domain cap and nft did in blocklet extras', {
+        did,
+        bindDomainCap: context.bindDomainCap,
+        domainNftDid: context.domainNftDid,
+      });
+    }
+
     await states.blockletExtras.setConfigs(did, [
       {
         key: BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK,

package/lib/router/helper.js

@@ -1220,6 +1220,55 @@ module.exports = function getRouterHelpers({
       );
       logger.info('add routing site', { site: domainGroup });
 
+      const bindDomainCap = await states.blockletExtras.getSettings(blocklet.meta.did, 'bindDomainCap');
+      const nftDid = await states.blockletExtras.getSettings(blocklet.meta.did, 'domainNftDid');
+      const domainAlias = bindDomainCap?.cap?.domain;
+
+      if (bindDomainCap && nftDid && domainAlias) {
+        logger.info('bind cap and nft did domain alias', {
+          did: blocklet.meta.did,
+          domainAlias,
+          nftDid,
+          chainHost: context.domainChainHost,
+        });
+
+        const site = await states.site.findOneByBlocklet(blocklet.meta.did);
+
+        await routerManager
+          .addDomainAlias(
+            {
+              id: site?.id,
+              type: 'nft-domain',
+              domainAlias,
+              nftDid,
+            },
+            context
+          )
+          .then(() => {
+            logger.info('bind domain alias', {
+              did: blocklet.meta.did,
+              domainAlias,
+              nftDid,
+              chainHost: context.domainChainHost,
+            });
+          })
+          .catch((error) => {
+            logger.error('bind domain alias failed', {
+              error,
+              did: blocklet.meta.did,
+              domainAlias,
+              nftDid,
+            });
+          });
+
+        logger.info('bind cap and nft did domain alias done', {
+          did: blocklet.meta.did,
+          domainAlias,
+          nftDid,
+          chainHost: context.domainChainHost,
+        });
+      }
+
       return true;
     }
 

package/lib/router/manager.js

@@ -337,7 +337,13 @@ class RouterManager extends EventEmitter {
       const blocklet = await states.blocklet.getBlocklet(did);
       const nodeInfo = await states.node.read();
 
-      await updateNFTDomainRecord({ name: domain, value: didDomain.value, blocklet, nodeInfo });
+      await updateNFTDomainRecord({
+        name: domain,
+        value: didDomain.value,
+        blocklet,
+        nodeInfo,
+        bindCap: context.bindDomainCap,
+      });
       logger.info('update nft domain record', { domain, didDomain, nftDid, id });
     }
 

package/lib/util/launcher.js

@@ -432,6 +432,7 @@ const getLauncherSession = async ({ launcherUrl, launcherSessionId, external = t
       'reservedUntil',
       'userDid',
       'walletDid',
+      'metadata',
     ]);
   }
 
@@ -514,8 +515,27 @@ const isBlockletTerminated = async (blockletDid, controller) => {
   return status === LAUNCH_SESSION_STATUS.terminated;
 };
 
-const isDataRetentionExceeded = (terminatedAt) =>
-  !!terminatedAt && dayjs().diff(dayjs(terminatedAt), 'days') > SERVERLESS_BLOCKLET_DATA_RETENTION_DAYS;
+const isDataRetentionExceeded = (launcherSession) => {
+  if (!launcherSession) {
+    return false;
+  }
+
+  if (!launcherSession.terminatedAt) {
+    return false;
+  }
+
+  const { terminatedAt } = launcherSession;
+  const exceeded =
+    !!terminatedAt && dayjs().diff(dayjs(terminatedAt), 'days') > SERVERLESS_BLOCKLET_DATA_RETENTION_DAYS;
+
+  if (!exceeded) {
+    logger.info('blocklet data retention not exceeded, check terminateImmediately', { launcherSession });
+
+    return launcherSession.metadata.terminateImmediately === true;
+  }
+
+  return exceeded;
+};
 
 const launchBlockletByLauncher = async (node, extraParams, context) => {
   logger.debug('launchBlockletByLauncher', { extraParams, context });
@@ -532,10 +552,18 @@ const launchBlockletByLauncher = async (node, extraParams, context) => {
   // generate owner key pair
   const info = await states.node.read();
   const user = await getLauncherUser(info.sk, extraParams);
+
   const userWallet = fromAppDid(`email|${user.email}`, appWallet.secretKey);
 
   let data = {};
 
+  if (extraParams.bindDomainCap && extraParams.domainNftDid) {
+    context.bindDomainCap = JSON.parse(extraParams.bindDomainCap);
+    context.domainNftDid = extraParams.domainNftDid;
+
+    logger.info('bind domain cap', { bindDomainCap: extraParams.bindCap, domainNftDid: extraParams.domainNftDid });
+  }
+
   const handler = createLaunchBlockletHandler(node, 'launcher');
   await handler(
     {

package/lib/util/router.js

@@ -29,7 +29,7 @@ const getNFTDomainHeaders = ({ wallet, payload }) => ({
   'x-blocklet-sig': toBase58(wallet.sign(stableStringify(payload))),
 });
 
-const updateNFTDomainRecord = async ({ name, value, blocklet, nodeInfo }) => {
+const updateNFTDomainRecord = async ({ name, value, blocklet, nodeInfo, bindCap }) => {
   const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
 
   const payload = {
@@ -42,6 +42,15 @@ const updateNFTDomainRecord = async ({ name, value, blocklet, nodeInfo }) => {
     },
   };
 
+  let proof;
+  if (bindCap) {
+    proof = wallet.sign(stableStringify(`${bindCap.cap.sessionId}|${bindCap.cap.domain}`));
+
+    payload.bindCap = bindCap;
+    payload.proof = proof;
+    payload.delegateePk = wallet.publicKey;
+  }
+
   const nftDomainServiceUrl = await getDidDomainServiceURL(nodeInfo.nftDomainUrl);
 
   try {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.52-beta-20250924-093428-bd3f0d8c",
+  "version": "1.16.52-beta-20250924-135333-541024a8",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -20,21 +20,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/auth": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/certificate-manager": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/constant": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/cron": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/db-cache": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/docker-utils": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/logger": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/models": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/queue": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/rbac": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/router-provider": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/static-server": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/timemachine": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@abtnode/util": "1.16.52-beta-20250924-093428-bd3f0d8c",
+    "@abtnode/analytics": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/auth": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/certificate-manager": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/constant": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/cron": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/db-cache": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/docker-utils": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/logger": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/models": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/queue": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/rbac": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/router-provider": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/static-server": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/timemachine": "1.16.52-beta-20250924-135333-541024a8",
+    "@abtnode/util": "1.16.52-beta-20250924-135333-541024a8",
     "@aigne/aigne-hub": "^0.8.10",
     "@arcblock/did": "1.24.0",
     "@arcblock/did-connect-js": "1.24.0",
@@ -46,15 +46,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.24.0",
     "@arcblock/vc": "1.24.0",
-    "@blocklet/constant": "1.16.52-beta-20250924-093428-bd3f0d8c",
+    "@blocklet/constant": "1.16.52-beta-20250924-135333-541024a8",
     "@blocklet/did-space-js": "^1.1.24",
-    "@blocklet/env": "1.16.52-beta-20250924-093428-bd3f0d8c",
+    "@blocklet/env": "1.16.52-beta-20250924-135333-541024a8",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@blocklet/resolver": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@blocklet/sdk": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@blocklet/server-js": "1.16.52-beta-20250924-093428-bd3f0d8c",
-    "@blocklet/store": "1.16.52-beta-20250924-093428-bd3f0d8c",
+    "@blocklet/meta": "1.16.52-beta-20250924-135333-541024a8",
+    "@blocklet/resolver": "1.16.52-beta-20250924-135333-541024a8",
+    "@blocklet/sdk": "1.16.52-beta-20250924-135333-541024a8",
+    "@blocklet/server-js": "1.16.52-beta-20250924-135333-541024a8",
+    "@blocklet/store": "1.16.52-beta-20250924-135333-541024a8",
     "@blocklet/theme": "^3.1.41",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.24.0",
@@ -119,5 +119,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "208aa87c8e036c9ff5d40e7f6d7a5e24bcc57833"
+  "gitHead": "49da2436236dcd95eac44d785d6d2847efd3c643"
 }