@abtnode/core 1.7.23 → 1.7.26

package/lib/blocklet/manager/disk.js

@@ -686,7 +686,8 @@ class BlockletManager extends BaseBlockletManager {
       try {
         const blocklet = await this.ensureBlocklet(did);
         return blocklet;
-      } catch {
+      } catch (e) {
+        logger.error('get blocklet detail error', { error: e.message });
         return null;
       }
     }
@@ -1318,6 +1319,15 @@ class BlockletManager extends BaseBlockletManager {
         blocklet = { ...cachedBlocklet, ...blocklet };
       }
 
+      // 处理 domainAliases#value SLOT_FOR_IP_DNS_SITE
+      if (blocklet?.site?.domainAliases?.length) {
+        const nodeIp = await getAccessibleExternalNodeIp(nodeInfo);
+        blocklet.site.domainAliases = blocklet.site.domainAliases.map((x) => ({
+          ...x,
+          value: util.replaceDomainSlot({ domain: x.value, context, nodeIp }),
+        }));
+      }
+
       blocklet.interfaces = await this.getBlockletInterfaces({ blocklet, nodeInfo, context });
 
       if (!fromCache) {

package/lib/util/index.js

@@ -68,6 +68,21 @@ const getInterfaceUrl = ({ baseUrl, url }) => {
 
 const trimSlash = (str = '') => str.replace(/^\/+/, '').replace(/\/+$/, '');
 
+const replaceDomainSlot = ({ domain, context = {}, nodeIp }) => {
+  let processed = domain;
+  if (processed.includes(SLOT_FOR_IP_DNS_SITE)) {
+    const ipRegex = /\d+[-.]\d+[-.]\d+[-.]\d+/;
+    const match = ipRegex.exec(context.hostname);
+    if (match) {
+      const ip = match[0];
+      processed = replaceSlotToIp(processed, ip);
+    } else if (nodeIp) {
+      processed = replaceSlotToIp(processed, nodeIp);
+    }
+  }
+  return processed;
+};
+
 const getBlockletHost = ({ domain, context, nodeIp }) => {
   const { protocol, port } = context || {};
 
@@ -80,16 +95,7 @@ const getBlockletHost = ({ domain, context, nodeIp }) => {
     tmpDomain = context.hostname || '';
   }
 
-  if (tmpDomain.includes(SLOT_FOR_IP_DNS_SITE)) {
-    const ipRegex = /\d+[-.]\d+[-.]\d+[-.]\d+/;
-    const match = ipRegex.exec(context.hostname);
-    if (match) {
-      const ip = match[0];
-      tmpDomain = replaceSlotToIp(tmpDomain, ip);
-    } else if (nodeIp) {
-      tmpDomain = replaceSlotToIp(tmpDomain, nodeIp);
-    }
-  }
+  tmpDomain = replaceDomainSlot({ domain: tmpDomain, context, nodeIp });
 
   if (!port) {
     return tmpDomain;
@@ -541,6 +547,7 @@ const lib = {
   isBeforeInstalled,
   getInterfaceUrl,
   getBlockletBaseUrls,
+  replaceDomainSlot,
   getBlockletHost,
   getBlockletInterfaces,
   isRoutingEnabled,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.23",
+  "version": "1.7.26",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,30 +19,30 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.7.23",
-    "@abtnode/constant": "1.7.23",
-    "@abtnode/cron": "1.7.23",
-    "@abtnode/db": "1.7.23",
-    "@abtnode/logger": "1.7.23",
-    "@abtnode/queue": "1.7.23",
-    "@abtnode/rbac": "1.7.23",
-    "@abtnode/router-provider": "1.7.23",
-    "@abtnode/static-server": "1.7.23",
-    "@abtnode/timemachine": "1.7.23",
-    "@abtnode/util": "1.7.23",
-    "@arcblock/did": "^1.16.15",
-    "@arcblock/did-motif": "^1.1.9",
-    "@arcblock/did-util": "^1.16.15",
-    "@arcblock/event-hub": "1.16.15",
+    "@abtnode/certificate-manager": "1.7.26",
+    "@abtnode/constant": "1.7.26",
+    "@abtnode/cron": "1.7.26",
+    "@abtnode/db": "1.7.26",
+    "@abtnode/logger": "1.7.26",
+    "@abtnode/queue": "1.7.26",
+    "@abtnode/rbac": "1.7.26",
+    "@abtnode/router-provider": "1.7.26",
+    "@abtnode/static-server": "1.7.26",
+    "@abtnode/timemachine": "1.7.26",
+    "@abtnode/util": "1.7.26",
+    "@arcblock/did": "1.17.0",
+    "@arcblock/did-motif": "^1.1.10",
+    "@arcblock/did-util": "1.17.0",
+    "@arcblock/event-hub": "1.17.0",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.16.15",
-    "@blocklet/meta": "1.7.23",
+    "@arcblock/vc": "1.17.0",
+    "@blocklet/meta": "1.7.26",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.16.15",
-    "@ocap/util": "^1.16.15",
-    "@ocap/wallet": "^1.16.15",
+    "@ocap/mcrypto": "1.17.0",
+    "@ocap/util": "1.17.0",
+    "@ocap/wallet": "1.17.0",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
@@ -80,5 +80,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "aa13838b7597bce11851d0b902575f861aa1ab34"
+  "gitHead": "b7ef9b4ddb18f7a0c3898177fe06d9cefe966566"
 }