@abtnode/core 1.16.11-beta-8e4c6e5c → 1.16.11-beta-069c3537

package/lib/util/blocklet.js

@@ -101,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 || [];
@@ -1520,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);
@@ -1527,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: {
@@ -1994,4 +2015,5 @@ module.exports = {
   ensureAppLogo,
   getBlockletDidDomainList,
   shouldCleanExpiredBlocklet,
+  getBlockletURLForLauncher,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.11-beta-8e4c6e5c",
+  "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.11-beta-8e4c6e5c",
-    "@abtnode/certificate-manager": "1.16.11-beta-8e4c6e5c",
-    "@abtnode/constant": "1.16.11-beta-8e4c6e5c",
-    "@abtnode/cron": "1.16.11-beta-8e4c6e5c",
-    "@abtnode/logger": "1.16.11-beta-8e4c6e5c",
-    "@abtnode/models": "1.16.11-beta-8e4c6e5c",
-    "@abtnode/queue": "1.16.11-beta-8e4c6e5c",
-    "@abtnode/rbac": "1.16.11-beta-8e4c6e5c",
-    "@abtnode/router-provider": "1.16.11-beta-8e4c6e5c",
-    "@abtnode/static-server": "1.16.11-beta-8e4c6e5c",
-    "@abtnode/timemachine": "1.16.11-beta-8e4c6e5c",
-    "@abtnode/util": "1.16.11-beta-8e4c6e5c",
+    "@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.11-beta-8e4c6e5c",
-    "@blocklet/meta": "1.16.11-beta-8e4c6e5c",
-    "@blocklet/sdk": "1.16.11-beta-8e4c6e5c",
+    "@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": "bd1beb1fb79e075d31359f438a263ee9077d3cd9"
+  "gitHead": "a89c7f13901d2c2d50b09d68d6088ca705648ff6"
 }