@abtnode/core 1.16.14-beta-08abf537 → 1.16.14-beta-9743e8e2

package/lib/blocklet/manager/disk.js

@@ -12,7 +12,6 @@ const pick = require('lodash/pick');
 const isEmpty = require('lodash/isEmpty');
 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 sleep = require('@abtnode/util/lib/sleep');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
@@ -118,7 +117,6 @@ const {
   validateStore,
   isRotatingAppSk,
   checkVersionCompatibility,
-  getBlockletKnownAs,
   updateBlockletFallbackLogo,
   ensureAppLogo,
   getBlockletDidDomainList,
@@ -128,6 +126,7 @@ const {
   exceedRedemptionPeriod,
   ensureAppPortsNotOccupied,
   getComponentNamesWithVersion,
+  updateDidDocument: updateBlockletDocument,
 } = require('../../util/blocklet');
 const { getDidDomainForBlocklet } = require('../../util/get-domain-for-blocklet');
 const states = require('../../states');
@@ -1624,8 +1623,10 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
   }
 
-  getCrons() {
-    return [
+  async getCrons() {
+    const info = await states.node.read();
+
+    const crons = [
       {
         name: 'sync-blocklet-status',
         time: '*/60 * * * * *', // 60s
@@ -1646,30 +1647,41 @@ class DiskBlockletManager extends BaseBlockletManager {
           await refreshAccessibleExternalNodeIp(nodeInfo);
         },
       },
-      {
-        name: 'check-renewed-blocklet',
-        time: '0 */10 * * * *', // 10min
-        options: { runOnInit: false },
-        fn: () => this.checkRenewedBlocklet(),
-      },
-      {
-        name: 'stop-expired-external-blocklet',
-        time: '0 */30 * * * *', // 30min
-        options: { runOnInit: false },
-        fn: () => this.stopExpiredBlocklets(),
-      },
-      {
-        name: 'clean-expired-blocklet-data',
-        time: '0 */20 0 * * *', // 每天凌晨 0 点的每 20 分钟
-        options: { runOnInit: false },
-        fn: () => this.cleanExpiredBlocklets(),
-      },
       {
         name: 'record-blocklet-runtime-history',
         time: `*/${MONITOR_RECORD_INTERVAL_SEC} * * * * *`, // 10s
         fn: () => this.runtimeMonitor.monitAll(),
       },
     ];
+
+    if (info.mode === NODE_MODES.SERVERLESS) {
+      const serverlessJobs = [
+        {
+          name: 'check-renewed-blocklet',
+          time: '0 */10 * * * *', // 10min
+          options: { runOnInit: false },
+          fn: () => this.checkRenewedBlocklet(),
+        },
+        {
+          name: 'stop-expired-external-blocklet',
+          time: '0 */30 * * * *', // 30min
+          options: { runOnInit: false },
+          fn: () => this.stopExpiredBlocklets(),
+        },
+        {
+          name: 'clean-expired-blocklet-data',
+          time: '0 */20 0 * * *', // 每天凌晨 0 点的每 20 分钟
+          options: { runOnInit: false },
+          fn: () => this.cleanExpiredBlocklets(),
+        },
+      ];
+
+      logger.info('enable serverless jobs', serverlessJobs.map((x) => x.name).join(','));
+
+      crons.push(...serverlessJobs);
+    }
+
+    return crons;
   }
 
   /**
@@ -3035,7 +3047,7 @@ class DiskBlockletManager extends BaseBlockletManager {
           const urls = blocklet.site?.domainAliases || [];
           const customUrl = urls.find((x) => !x.isProtected)?.value;
           blockletUrl = `http://${
-            customUrl || getDidDomainForBlocklet({ appPid: blocklet.appPid })
+            customUrl || getDidDomainForBlocklet({ did: blocklet.appPid })
           }${WELLKNOWN_BLOCKLET_ADMIN_PATH}`;
         }
       } catch (error) {
@@ -3237,15 +3249,9 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     this.emit(BlockletEvents.appDidChanged, blocklet);
 
-    const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
-    const alsoKnownAs = getBlockletKnownAs(blocklet);
-    await didDocument.updateBlockletDocument({
-      wallet,
-      appPid: blocklet.appPid,
-      alsoKnownAs,
-      daemonDidDomain: util.getServerDidDomain(nodeInfo),
-      didRegistryUrl: nodeInfo.didRegistry,
-      domain: nodeInfo.didDomain,
+    await updateBlockletDocument({
+      blocklet,
+      nodeInfo,
     });
     logger.info('updated blocklet dns document', { appPid: blocklet.appPid, appDid: blocklet.appDid });
   }

package/lib/index.js

@@ -518,14 +518,14 @@ function ABTNode(options) {
 
   const webhook = WebHook({ events, dataDirs, instance });
 
-  const initCron = () => {
+  const initCron = async () => {
     Cron.init({
       context: { states, events, webhook },
       jobs: [
         IP.cron,
         VersionChecker.getCron(),
         ...getRoutingCrons(),
-        ...blockletManager.getCrons(),
+        ...(await blockletManager.getCrons()),
         DiskMonitor.getCron(),
         LogRotator.getCron(),
         ...getStateCrons(states),
@@ -566,12 +566,12 @@ function ABTNode(options) {
         .catch((error) => logger.error('Certificate manager service start failed', { error }));
 
       // start jobs
-      setTimeout(() => {
+      setTimeout(async () => {
         if (process.env.NODE_ENV === 'development') {
-          initCron();
+          await initCron();
         } else {
           pm2Events.resume();
-          initCron();
+          await initCron();
           createCLILog('startServer');
           logger.info('Cron jobs start successfully on daemon start');
         }

package/lib/router/helper.js

@@ -16,8 +16,6 @@ const { getProvider } = require('@abtnode/router-provider');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const getTmpDir = require('@abtnode/util/lib/get-tmp-directory');
 const downloadFile = require('@abtnode/util/lib/download-file');
-const { updateBlockletDocument } = require('@abtnode/util/lib/did-document');
-const getBlockletInfo = require('@blocklet/meta/lib/info');
 const { forEachBlockletSync } = require('@blocklet/meta/lib/util');
 const { processLogByDate } = require('@abtnode/analytics');
 const {
@@ -73,7 +71,7 @@ const { getFromCache: getAccessibleExternalNodeIp } = require('../util/get-acces
 const Router = require('./index');
 const states = require('../states');
 const { getBlockletDomainGroupName, getDidFromDomainGroupName } = require('../util/router');
-const { getBlockletKnownAs, getBlockletDidDomainList } = require('../util/blocklet');
+const { getBlockletDidDomainList, updateDidDocument: updateBlockletDocument } = require('../util/blocklet');
 const { toCamelCase } = require('../util/index');
 const { get: getIp } = require('../util/ip');
 
@@ -983,14 +981,9 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     };
 
     const existSite = await states.site.findOne({ domain: domainGroup });
-    const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
     updateBlockletDocument({
-      wallet,
-      appPid: blocklet.appPid,
-      alsoKnownAs: getBlockletKnownAs(blocklet),
-      daemonDidDomain: getServerDidDomain(nodeInfo),
-      didRegistryUrl: nodeInfo.didRegistry,
-      domain: nodeInfo.didDomain,
+      blocklet,
+      nodeInfo,
     })
       .then(() => {
         logger.info(`updated blocklet ${blocklet.appDid} dns`);

package/lib/states/node.js

@@ -83,6 +83,7 @@ class NodeState extends BaseState {
       launcher,
       didRegistry,
       didDomain,
+      slpDomain,
       enablePassportIssuance = true,
       trustedPassports = [],
       webWalletUrl,
@@ -119,6 +120,7 @@ class NodeState extends BaseState {
       launcher: launcher || null,
       didRegistry,
       didDomain,
+      slpDomain,
       enablePassportIssuance,
       trustedPassports,
       customBlockletNumber: 0,

package/lib/util/blocklet.js

@@ -19,8 +19,8 @@ const isUrl = require('is-url');
 const semver = require('semver');
 const { chainInfo: chainInfoSchema } = require('@arcblock/did-auth/lib/schema');
 
-const { fromSecretKey } = require('@ocap/wallet');
-const { toHex, isHex, toDid, toAddress } = require('@ocap/util');
+const { fromSecretKey, fromPublicKey } = require('@ocap/wallet');
+const { toHex, isHex, toDid, toAddress, toBuffer } = require('@ocap/util');
 const { isValid: isValidDid, isEthereumDid } = require('@arcblock/did');
 const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
 const pm2 = require('@abtnode/util/lib/async-pm2');
@@ -32,6 +32,7 @@ const CustomError = require('@abtnode/util/lib/custom-error');
 const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const hashFiles = require('@abtnode/util/lib/hash-files');
+const didDocument = require('@abtnode/util/lib/did-document');
 const {
   BLOCKLET_MAX_MEM_LIMIT_IN_MB,
   BLOCKLET_STORE,
@@ -39,6 +40,7 @@ const {
   BLOCKLET_STORE_DEV,
   APP_STRUCT_VERSION,
   EXPIRED_BLOCKLET_DATA_RETENTION_DAYS,
+  NODE_MODES,
 } = require('@abtnode/constant');
 const {
   parseComponents,
@@ -94,15 +96,13 @@ const {
 const { titleSchema, descriptionSchema, logoSchema } = require('@blocklet/meta/lib/schema');
 const { getBlockletMetaFromUrl } = require('@blocklet/meta/lib/util-meta');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
+const md5 = require('@abtnode/util/lib/md5');
 
 const { validate: validateEngine, get: getEngine } = require('../blocklet/manager/engine');
 
 const isRequirementsSatisfied = require('./requirement');
 const { getDidDomainForBlocklet } = require('./get-domain-for-blocklet');
-const { expandBundle, findInterfacePortByName, prettyURL, templateReplace } = require('./index');
-const externalIpUtil = require('./get-accessible-external-node-ip');
-const { getIpDnsDomainForBlocklet } = require('./get-domain-for-blocklet');
-const { replaceDomainSlot } = require('./index');
+const { expandBundle, findInterfacePortByName, prettyURL, templateReplace, getServerDidDomain } = require('./index');
 
 /**
  * get blocklet engine info, default is node
@@ -296,7 +296,7 @@ const getAppSystemEnvironments = (blocklet, nodeInfo) => {
    * 2. 如果没有，再拼接
    */
 
-  const pidDomain = getDidDomainForBlocklet({ appPid, didDomain: nodeInfo.didDomain });
+  const pidDomain = getDidDomainForBlocklet({ did: appPid, didDomain: nodeInfo.didDomain });
   const domainAliases = get(blocklet, 'site.domainAliases') || [];
 
   let didDomain = domainAliases.find((item) => toLower(item.value) === toLower(pidDomain));
@@ -1346,19 +1346,12 @@ 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 getBlockletURLForLauncher = ({ blocklet, nodeInfo }) => {
+  const didDomain = getDidDomainForBlocklet({
+    did: getSlpDid(nodeInfo.did, blocklet.appPid),
+    didDomain: nodeInfo.slpDomain,
+  });
 
-  const didDomain = getDidDomainForBlocklet({ appPid: blocklet.appPid, didDomain: nodeInfo.didDomain });
   return `https://${didDomain}`;
 };
 const createDataArchive = (dataDir, fileName) => {
@@ -1692,11 +1685,19 @@ const getBlockletDidDomainList = (blocklet, nodeInfo) => {
   const dids = [blocklet.appPid, blocklet.appDid, ...alsoKnownAs].filter(Boolean).map((did) => toAddress(did));
 
   uniq(dids).forEach((did) => {
-    const domain = getDidDomainForBlocklet({ appPid: did, didDomain: nodeInfo.didDomain });
+    const domain = getDidDomainForBlocklet({ did, didDomain: nodeInfo.didDomain });
 
     domainAliases.push({ value: domain, isProtected: true });
   });
 
+  const enableSlpDomain = shouldEnableSlpDomain({ mode: nodeInfo.mode, launcher: nodeInfo.launcher, blocklet });
+  if (enableSlpDomain) {
+    const slpDid = getSlpDid(nodeInfo.did, blocklet.appPid);
+    const domain = getDidDomainForBlocklet({ did: slpDid, didDomain: nodeInfo.slpDomain });
+
+    domainAliases.push({ value: domain, isProtected: true });
+  }
+
   return domainAliases;
 };
 
@@ -1821,6 +1822,54 @@ const getComponentNamesWithVersion = (app = {}, componentDids = []) => {
   return str;
 };
 
+const shouldEnableSlpDomain = ({ mode, launcher, blocklet }) => {
+  if (process.env.NODE_ENV === 'development' && process.env.ABT_NODE_ENABLE_SLP_DOMAIN === 'true') {
+    return true;
+  }
+
+  return mode === NODE_MODES.SERVERLESS && !!launcher && !!blocklet.controller;
+};
+
+const getSlpDid = (serverDid, appPid) => {
+  if (!serverDid || !appPid) {
+    throw new Error('serverDid and appPid is required');
+  }
+
+  const buffer = Buffer.concat([toBuffer(serverDid), toBuffer(appPid)]);
+  const md5Str = md5(buffer);
+
+  const wallet = fromPublicKey(md5Str);
+  return wallet.address;
+};
+
+// eslint-disable-next-line require-await
+const updateDidDocument = async ({ blocklet, nodeInfo }) => {
+  const alsoKnownAs = getBlockletKnownAs(blocklet);
+  const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+  const { mode, launcher, did: serverDid } = nodeInfo;
+
+  let slpDid = null;
+  const enableSlpDomain = shouldEnableSlpDomain({ mode, launcher, blocklet });
+  if (enableSlpDomain) {
+    slpDid = getSlpDid(serverDid, blocklet.appPid);
+
+    if (alsoKnownAs.indexOf(slpDid) === -1) {
+      alsoKnownAs.push(toDid(slpDid));
+    }
+  }
+
+  return didDocument.updateBlockletDocument({
+    blocklet,
+    wallet,
+    alsoKnownAs,
+    slpDid,
+    daemonDidDomain: getServerDidDomain(nodeInfo),
+    didRegistryUrl: nodeInfo.didRegistry,
+    domain: nodeInfo.didDomain,
+    slpDomain: nodeInfo.slpDomain,
+  });
+};
+
 module.exports = {
   updateBlockletFallbackLogo,
   forEachBlocklet,
@@ -1884,4 +1933,7 @@ module.exports = {
   exceedRedemptionPeriod,
   ensureAppPortsNotOccupied,
   getComponentNamesWithVersion,
+  updateDidDocument,
+  getSlpDid,
+  shouldEnableSlpDomain,
 };

package/lib/util/get-domain-for-blocklet.js

@@ -6,8 +6,8 @@ const getIpDnsDomainForBlocklet = (blocklet) => {
   return `${encodeBase32(blocklet.meta.did)}-${SLOT_FOR_IP_DNS_SITE}.${DEFAULT_IP_DOMAIN_SUFFIX}`;
 };
 
-const getDidDomainForBlocklet = ({ appPid, didDomain = DEFAULT_DID_DOMAIN }) => {
-  return `${encodeBase32(appPid)}.${didDomain}`;
+const getDidDomainForBlocklet = ({ did, didDomain = DEFAULT_DID_DOMAIN }) => {
+  return `${encodeBase32(did)}.${didDomain}`;
 };
 
 module.exports = { getIpDnsDomainForBlocklet, getDidDomainForBlocklet, formatName };

package/lib/util/launcher.js

@@ -60,7 +60,9 @@ const consumeServerlessNFT = async ({ nftId, blocklet }) => {
 const consumeLauncherSession = async ({ params, blocklet }) => {
   try {
     const info = await states.node.read();
-    const { appUrl, name } = getBlockletInfo(blocklet, info.sk);
+    const { name } = getBlockletInfo(blocklet, info.sk);
+    const appUrl = getBlockletURLForLauncher({ blocklet, nodeInfo: info });
+
     const result = await doRequest(info.sk, {
       launcherUrl: params.launcherUrl,
       pathname: `/api/launches/${params.launcherSessionId}/installed`,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.14-beta-08abf537",
+  "version": "1.16.14-beta-9743e8e2",
   "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.14-beta-08abf537",
-    "@abtnode/auth": "1.16.14-beta-08abf537",
-    "@abtnode/certificate-manager": "1.16.14-beta-08abf537",
-    "@abtnode/constant": "1.16.14-beta-08abf537",
-    "@abtnode/cron": "1.16.14-beta-08abf537",
-    "@abtnode/logger": "1.16.14-beta-08abf537",
-    "@abtnode/models": "1.16.14-beta-08abf537",
-    "@abtnode/queue": "1.16.14-beta-08abf537",
-    "@abtnode/rbac": "1.16.14-beta-08abf537",
-    "@abtnode/router-provider": "1.16.14-beta-08abf537",
-    "@abtnode/static-server": "1.16.14-beta-08abf537",
-    "@abtnode/timemachine": "1.16.14-beta-08abf537",
-    "@abtnode/util": "1.16.14-beta-08abf537",
+    "@abtnode/analytics": "1.16.14-beta-9743e8e2",
+    "@abtnode/auth": "1.16.14-beta-9743e8e2",
+    "@abtnode/certificate-manager": "1.16.14-beta-9743e8e2",
+    "@abtnode/constant": "1.16.14-beta-9743e8e2",
+    "@abtnode/cron": "1.16.14-beta-9743e8e2",
+    "@abtnode/logger": "1.16.14-beta-9743e8e2",
+    "@abtnode/models": "1.16.14-beta-9743e8e2",
+    "@abtnode/queue": "1.16.14-beta-9743e8e2",
+    "@abtnode/rbac": "1.16.14-beta-9743e8e2",
+    "@abtnode/router-provider": "1.16.14-beta-9743e8e2",
+    "@abtnode/static-server": "1.16.14-beta-9743e8e2",
+    "@abtnode/timemachine": "1.16.14-beta-9743e8e2",
+    "@abtnode/util": "1.16.14-beta-9743e8e2",
     "@arcblock/did": "1.18.88",
     "@arcblock/did-auth": "1.18.88",
     "@arcblock/did-ext": "^1.18.88",
@@ -42,10 +42,10 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.88",
     "@arcblock/vc": "1.18.88",
-    "@blocklet/constant": "1.16.14-beta-08abf537",
-    "@blocklet/meta": "1.16.14-beta-08abf537",
-    "@blocklet/resolver": "1.16.14-beta-08abf537",
-    "@blocklet/sdk": "1.16.14-beta-08abf537",
+    "@blocklet/constant": "1.16.14-beta-9743e8e2",
+    "@blocklet/meta": "1.16.14-beta-9743e8e2",
+    "@blocklet/resolver": "1.16.14-beta-9743e8e2",
+    "@blocklet/sdk": "1.16.14-beta-9743e8e2",
     "@did-space/client": "^0.2.141",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.88",
@@ -98,5 +98,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "656c4bf8e2ca94cdc604a5d45ba7e8c3443f1dac"
+  "gitHead": "8c98d12062bfe1ea2d4faff920e4dd99436bea1f"
 }