@abtnode/util 1.16.23-beta-aeb9f5bd → 1.16.23-beta-ce222a8b

package/lib/did-document.js

@@ -18,7 +18,7 @@ const getDID = (address) => {
   return `did:abt:${address}`;
 };
 
-const update = ({ id, services, didRegistryUrl, wallet, alsoKnownAs = [] }) => {
+const update = ({ id, services, didRegistryUrl, wallet, alsoKnownAs = [], blockletServerVersion }) => {
   debug('update did document', { didRegistryUrl });
 
   const did = getDID(wallet.address);
@@ -52,7 +52,10 @@ const update = ({ id, services, didRegistryUrl, wallet, alsoKnownAs = [] }) => {
 
   document.proof = proof;
 
-  return axios.post(joinUrl(didRegistryUrl, '/.well-known/did-resolver/registries'), document, { timeout: 10 * 1000 });
+  return axios.post(joinUrl(didRegistryUrl, '/.well-known/did-resolver/registries'), document, {
+    timeout: 10 * 1000,
+    headers: { 'X-Blocklet-Server-Version': blockletServerVersion },
+  });
 };
 
 const updateWithRetry = (...args) => pRetry(() => update(...args), { retries: 3 });
@@ -76,7 +79,7 @@ const getServerServices = ({ ips, wallet, domain }) => {
   return services;
 };
 
-const getBlockletServices = ({ appPid, slpDid, daemonDidDomain, domain, slpDomain }) => {
+const getBlockletServices = ({ appPid, slpDid, daemonDidDomain, domain, slpDomain, serverDid }) => {
   const records = [
     {
       type: 'CNAME',
@@ -92,6 +95,7 @@ const getBlockletServices = ({ appPid, slpDid, daemonDidDomain, domain, slpDomai
       rr: encodeBase32(slpDid),
       value: daemonDidDomain,
       domain: slpDomain,
+      derivedFrom: serverDid, // 用于验证 slpDid 的所有权是否合法
     });
   }
 
@@ -105,7 +109,7 @@ const getBlockletServices = ({ appPid, slpDid, daemonDidDomain, domain, slpDomai
 };
 
 // eslint-disable-next-line require-await
-const updateServerDocument = async ({ ips, wallet, didRegistryUrl, domain }) => {
+const updateServerDocument = async ({ ips, wallet, didRegistryUrl, domain, blockletServerVersion }) => {
   const filteredIps = (ips || []).filter(Boolean);
   if (filteredIps.length === 0) {
     throw new Error('No DID Document to update');
@@ -113,7 +117,7 @@ const updateServerDocument = async ({ ips, wallet, didRegistryUrl, domain }) =>
 
   const services = getServerServices({ ips: filteredIps, domain, wallet });
 
-  return updateWithRetry({ id: getDID(wallet.address), services, didRegistryUrl, wallet });
+  return updateWithRetry({ id: getDID(wallet.address), services, didRegistryUrl, wallet, blockletServerVersion });
 };
 
 const updateBlockletDocument = ({
@@ -125,11 +129,13 @@ const updateBlockletDocument = ({
   slpDomain,
   daemonDidDomain,
   alsoKnownAs = [],
+  serverDid,
+  blockletServerVersion,
 }) => {
   const { appPid } = blocklet;
 
-  const services = getBlockletServices({ appPid, slpDid, daemonDidDomain, domain, slpDomain });
-  return updateWithRetry({ id: appPid, services, didRegistryUrl, alsoKnownAs, wallet });
+  const services = getBlockletServices({ appPid, slpDid, daemonDidDomain, domain, slpDomain, serverDid });
+  return updateWithRetry({ id: appPid, services, didRegistryUrl, alsoKnownAs, wallet, blockletServerVersion });
 };
 
 module.exports = {

package/lib/list-npm-package-version.js

@@ -6,10 +6,7 @@ const axios = require('./axios');
 module.exports = async (name, { includePrereleases = false, limit = 60 } = {}) => {
   const {
     data: { time, versions },
-  } = await Promise.race([
-    axios.get(`https://registry.npmjs.org/${name}?t=${Date.now()}`),
-    axios.get(`https://registry.npm.taobao.org/${name}?t=${Date.now()}`),
-  ]);
+  } = await axios.get(`https://registry.npmjs.org/${name}?t=${Date.now()}`);
   const valid = semverSort.desc(semverClean(Object.keys(time), { includePrereleases, clean: true }));
 
   const result = valid

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.23-beta-aeb9f5bd",
+  "version": "1.16.23-beta-ce222a8b",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,10 +18,10 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.23-beta-aeb9f5bd",
-    "@abtnode/logger": "1.16.23-beta-aeb9f5bd",
-    "@blocklet/constant": "1.16.23-beta-aeb9f5bd",
-    "@blocklet/meta": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/constant": "1.16.23-beta-ce222a8b",
+    "@abtnode/logger": "1.16.23-beta-ce222a8b",
+    "@blocklet/constant": "1.16.23-beta-ce222a8b",
+    "@blocklet/meta": "1.16.23-beta-ce222a8b",
     "@ocap/client": "1.18.108",
     "@ocap/mcrypto": "1.18.108",
     "@ocap/util": "1.18.108",
@@ -36,7 +36,7 @@
     "cross-spawn": "^7.0.3",
     "dayjs": "^1.11.8",
     "debug": "^4.3.4",
-    "fast-glob": "^3.2.12",
+    "fast-glob": "^3.3.2",
     "find-up": "^5.0.0",
     "fkill": "^7.2.1",
     "flush-write-stream": "^2.0.0",
@@ -73,8 +73,8 @@
     "cookie-signature": "^1.0.6",
     "detect-port": "^1.5.1",
     "express": "^4.18.2",
-    "fs-extra": "^10.1.0",
+    "fs-extra": "^11.2.0",
     "jest": "^29.7.0"
   },
-  "gitHead": "418cacd970d373aecc8706f8992e57369d394577"
+  "gitHead": "12e2bb15e23b349041139ae79691312067975812"
 }