@abtnode/core 1.7.22 → 1.7.25

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/states/audit-log.js

@@ -9,7 +9,6 @@ const logger = require('@abtnode/logger')('@abtnode/core:states:audit-log');
 const BaseState = require('./base');
 
 const { parse } = require('../util/ua');
-const { lookup } = require('../util/ip');
 
 const getServerInfo = (info) => `[${info.name}](${joinUrl(info.routing.adminPath, '/settings/about')})`;
 const getBlockletInfo = (blocklet, info) => `[${getDisplayName(blocklet)} v${blocklet.meta.version}](${joinUrl(info.routing.adminPath, '/blocklets/', blocklet.meta.did, '/overview')})`; // prettier-ignore
@@ -374,7 +373,7 @@ class AuditLogState extends BaseState {
 
       try {
         const { ip, ua, user } = context;
-        const [info, geoInfo, uaInfo] = await Promise.all([node.states.node.read(), lookup(ip), parse(ua)]);
+        const [info, uaInfo] = await Promise.all([node.states.node.read(), parse(ua)]);
 
         const data = await this.asyncDB.insert({
           scope: getScope(args) || info.did, // server or blocklet did
@@ -384,7 +383,6 @@ class AuditLogState extends BaseState {
           actor: pick(user.actual || user, ['did', 'fullName', 'role']),
           extra: args,
           env: pick(uaInfo, ['browser', 'os', 'device']),
-          geo: pick(geoInfo || { country: '', city: '' }, ['country', 'city']),
           ip,
           ua,
         });

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.22",
+  "version": "1.7.25",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,24 +19,24 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.7.22",
-    "@abtnode/constant": "1.7.22",
-    "@abtnode/cron": "1.7.22",
-    "@abtnode/db": "1.7.22",
-    "@abtnode/logger": "1.7.22",
-    "@abtnode/queue": "1.7.22",
-    "@abtnode/rbac": "1.7.22",
-    "@abtnode/router-provider": "1.7.22",
-    "@abtnode/static-server": "1.7.22",
-    "@abtnode/timemachine": "1.7.22",
-    "@abtnode/util": "1.7.22",
+    "@abtnode/certificate-manager": "1.7.25",
+    "@abtnode/constant": "1.7.25",
+    "@abtnode/cron": "1.7.25",
+    "@abtnode/db": "1.7.25",
+    "@abtnode/logger": "1.7.25",
+    "@abtnode/queue": "1.7.25",
+    "@abtnode/rbac": "1.7.25",
+    "@abtnode/router-provider": "1.7.25",
+    "@abtnode/static-server": "1.7.25",
+    "@abtnode/timemachine": "1.7.25",
+    "@abtnode/util": "1.7.25",
     "@arcblock/did": "^1.16.15",
-    "@arcblock/did-motif": "^1.1.9",
+    "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "^1.16.15",
     "@arcblock/event-hub": "1.16.15",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "^1.16.15",
-    "@blocklet/meta": "1.7.22",
+    "@blocklet/meta": "1.7.25",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
@@ -80,5 +80,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "6190972e62b5e6b1039aa71a291b3e2c521df367"
+  "gitHead": "a500728739278c8a9464cf631a811ddfc4838fad"
 }