@abtnode/auth 1.17.5-beta-20251208-123021-e8c53f96 → 1.17.5-beta-20251211-104355-426d7eb6

package/lib/server.js

@@ -8,7 +8,7 @@ const pRetry = require('p-retry');
 const { isNFTExpired, isNFTConsumed } = require('@abtnode/util/lib/nft');
 const axios = require('@abtnode/util/lib/axios');
 const { CustomError } = require('@blocklet/error');
-const { joinURL } = require('ufo');
+const { joinURL, withHttps } = require('ufo');
 const { types } = require('@ocap/mcrypto');
 const { toHex, fromBase64 } = require('@ocap/util');
 const { DidType, isEthereumType } = require('@arcblock/did');
@@ -138,16 +138,16 @@ const getBlockletKnownDids = async ({ teamDid, blocklet, node }) => {
   }
 };
 
-const getKnownIssuerDids = async ({ issuerDid, node }) => {
+const getKnownIssuerDids = async ({ issuerDid }) => {
   try {
     // FIXME: @liushuang 多次迁移后，did 可能是第一次的 did，存在查询不到 blocklet 信息的情况，通过 domain 间接查询
     const domain = getDidDomainForBlocklet({ did: issuerDid });
-    const blockletInfo = await node.getBlocklet({
-      did: issuerDid,
-      domain,
-      useCache: true,
+    const { data } = await axios.get(joinURL(withHttps(domain), '__blocklet__.js?type=json'), {
+      timeout: 10 * 1000,
     });
-    return getBlockletAppIdList(blockletInfo);
+    const { appId, appPid, alsoKnownAs = [] } = data;
+    const alsoKnownAsDids = [appId, appPid, ...alsoKnownAs];
+    return [...new Set(alsoKnownAsDids.filter(Boolean))];
   } catch (error) {
     return [issuerDid];
   }
@@ -225,7 +225,8 @@ const authenticateByVc = async ({
 
     // 需要考虑到 Blocklet 迁移的情况
     const knownTeamDids = await getBlockletKnownDids({ teamDid, blocklet, node });
-    const knownIssuerDids = await getKnownIssuerDids({ issuerDid: issuerId, node });
+    const knownIssuerDids =
+      trustedIssuers.length > 0 ? trustedIssuers : await getKnownIssuerDids({ issuerDid: issuerId });
 
     // 如果 issuerId 存在于 blocklet 的 alsoKnownAs 中认为是相同的 blocklet
     if (knownTeamDids.includes(issuerId)) {
@@ -486,10 +487,15 @@ const getKeyPairClaim =
       chainInfo.id = '1';
     }
 
+    let moniker = convertToMoniker(appName);
+    if (!/^[a-zA-Z0-9][-a-zA-Z0-9_]{2,128}$/.test(moniker)) {
+      moniker = appDid ? [appDid.slice(0, 6), appDid.slice(-5)].join('-') : `app-${Date.now().toString(36)}`;
+    }
+
     const result = {
       mfa: !process.env.DID_CONNECT_MFA_DISABLED,
       description: description[locale] || description.en,
-      moniker: convertToMoniker(appName),
+      moniker,
       declare: !!declare,
       migrateFrom: declare ? migrateFrom : '',
       chainInfo,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.5-beta-20251208-123021-e8c53f96",
+  "version": "1.17.5-beta-20251211-104355-426d7eb6",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -18,9 +18,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/logger": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/util": "1.17.5-beta-20251208-123021-e8c53f96",
+    "@abtnode/constant": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/logger": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/util": "1.17.5-beta-20251211-104355-426d7eb6",
     "@arcblock/did": "^1.27.12",
     "@arcblock/did-connect-js": "^1.27.12",
     "@arcblock/did-ext": "^1.27.12",
@@ -29,10 +29,10 @@
     "@arcblock/nft-display": "^3.2.11",
     "@arcblock/validator": "^1.27.12",
     "@arcblock/vc": "^1.27.12",
-    "@blocklet/constant": "1.17.5-beta-20251208-123021-e8c53f96",
+    "@blocklet/constant": "1.17.5-beta-20251211-104355-426d7eb6",
     "@blocklet/error": "^0.3.3",
-    "@blocklet/meta": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@blocklet/sdk": "1.17.5-beta-20251208-123021-e8c53f96",
+    "@blocklet/meta": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@blocklet/sdk": "1.17.5-beta-20251211-104355-426d7eb6",
     "@ocap/client": "^1.27.12",
     "@ocap/mcrypto": "^1.27.12",
     "@ocap/util": "^1.27.12",
@@ -55,5 +55,5 @@
   "devDependencies": {
     "axios-mock-adapter": "^2.1.0"
   },
-  "gitHead": "ed63bdced5fa8df09ba7fd282b38751007df2216"
+  "gitHead": "9ea2a8077a8edbf5021281e823719758eb9fe02c"
 }