@abtnode/util 1.17.6-beta-20251217-011553-818fcc8e → 1.17.6-beta-20251218-120326-5b44dadf

package/lib/did-document.js

@@ -3,6 +3,7 @@ const { toBase64, toBase58, toDid } = require('@ocap/util');
 const { joinURL } = require('ufo');
 const pRetry = require('p-retry');
 const debug = require('debug')('@abtnode/util:did-document');
+const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
 
 const sleep = require('./sleep');
 const axios = require('./axios');
@@ -20,8 +21,17 @@ const getDID = (address) => {
   return `did:abt:${address}`;
 };
 
-const update = async ({ id, services, didRegistryUrl, wallet, alsoKnownAs = [], blockletServerVersion }) => {
-  debug('update did document', { didRegistryUrl });
+const update = async ({
+  id,
+  services,
+  didRegistryUrl,
+  wallet,
+  alsoKnownAs = [],
+  blockletServerVersion,
+  name,
+  capabilities,
+}) => {
+  debug('starting update did document', { didRegistryUrl });
 
   const did = getDID(wallet.address);
   const time = new Date().toISOString();
@@ -45,6 +55,14 @@ const update = async ({ id, services, didRegistryUrl, wallet, alsoKnownAs = [],
     updated: time,
   };
 
+  if (name) {
+    document.name = name;
+  }
+
+  if (capabilities) {
+    document.capabilities = capabilities;
+  }
+
   const proof = {
     type: 'Ed25519Signature',
     created: time,
@@ -63,6 +81,8 @@ const update = async ({ id, services, didRegistryUrl, wallet, alsoKnownAs = [],
 };
 
 const DEFAULT_RETRY_COUNT = 6;
+const DEFAULT_DEBOUNCE_TIME = 3000;
+
 const getRetryCount = () => {
   try {
     let retryCount = parseInt(process.env.ABT_NODE_UPDATE_DID_DOCUMENT_RETRY_COUNT, 10);
@@ -75,14 +95,60 @@ const getRetryCount = () => {
   }
 };
 
-const updateWithRetry = (...args) =>
-  pRetry(() => update(...args), {
-    retries: getRetryCount(),
-    onFailedAttempt: async (error) => {
-      debug('update did document failed', error);
-      await sleep(10 * 1000);
-    },
+const getDebounceTime = () => {
+  try {
+    let debounceTime = parseInt(process.env.ABT_NODE_DID_DOCUMENT_DEBOUNCE_TIME, 10);
+    debounceTime = Number.isNaN(debounceTime) ? DEFAULT_DEBOUNCE_TIME : debounceTime;
+    return debounceTime;
+  } catch (error) {
+    return DEFAULT_DEBOUNCE_TIME;
+  }
+};
+
+const pendingUpdates = new Map();
+const updateTimers = new Map();
+
+const updateWithRetry = (...args) => {
+  const params = args[0];
+  const did = toDid(params.id);
+
+  return new Promise((resolve, reject) => {
+    if (updateTimers.has(did)) {
+      clearTimeout(updateTimers.get(did));
+      debug('cancelled pending update for did', { did });
+    }
+
+    pendingUpdates.set(did, { args, resolve, reject });
+
+    const timer = setTimeout(async () => {
+      const pending = pendingUpdates.get(did);
+      pendingUpdates.delete(did);
+      updateTimers.delete(did);
+
+      if (!pending) {
+        return;
+      }
+
+      debug('executing debounced update for did', { did });
+
+      try {
+        const result = await pRetry(() => update(...pending.args), {
+          retries: getRetryCount(),
+          onFailedAttempt: async (error) => {
+            debug('update did document failed', error);
+            await sleep(10 * 1000);
+          },
+        });
+        pending.resolve(result);
+      } catch (error) {
+        pending.reject(error);
+      }
+    }, getDebounceTime());
+
+    updateTimers.set(did, timer);
+    debug('scheduled update for did', { did, debounceTime: getDebounceTime() });
   });
+};
 
 const getServerServices = ({ ips, wallet, domain }) => {
   const records = ips.map((ip) => ({
@@ -148,6 +214,83 @@ const updateServerDocument = async ({ ips, wallet, didRegistryUrl, domain, block
   return updateWithRetry({ id: getDID(wallet.address), services, didRegistryUrl, wallet, blockletServerVersion });
 };
 
+// Fetch existing DID document from registry
+const getDidDocument = async ({ did, didRegistryUrl }) => {
+  const fullDid = getDID(did);
+  const resolveUrl = joinURL(didRegistryUrl, '/.well-known/did-resolver/resolve', fullDid);
+
+  debug('fetching did document', { did: fullDid, resolveUrl });
+
+  const response = await axios.get(resolveUrl, {
+    timeout: 10 * 1000,
+  });
+
+  return response.data?.didDocument || null;
+};
+
+// Internal function to update blocklet state only
+const updateBlockletStateOnlyInternal = async ({ did, state, didRegistryUrl, wallet, blockletServerVersion }) => {
+  if (['0', 'false', 0, false].includes(process.env.ABT_NODE_DID_DOCUMENT_UPDATE)) {
+    throw new Error('Did Document update is disabled');
+  }
+
+  debug('updating blocklet state only', { did, state });
+
+  // Fetch current DID document from registry
+  const currentDoc = await getDidDocument({ did, didRegistryUrl });
+
+  if (!currentDoc) {
+    throw new Error(`Failed to fetch DID document for ${did} from registry`);
+  }
+
+  // Only update state if the path exists
+  if (currentDoc.capabilities?.blocklet?.metadata) {
+    currentDoc.capabilities.blocklet.metadata.state = state;
+  } else {
+    throw new Error(`DID document for ${did} does not have capabilities.blocklet.metadata structure`);
+  }
+
+  // Update timestamp
+  const time = new Date().toISOString();
+  currentDoc.updated = time;
+
+  // Remove old proof before re-signing
+  delete currentDoc.proof;
+
+  // Generate new proof with updated document
+  const controllerDid = getDID(wallet.address);
+  const proof = {
+    type: 'Ed25519Signature',
+    created: time,
+    verificationMethod: `${controllerDid}#key-1`,
+    jws: toBase64(await wallet.sign(stringify(currentDoc))),
+  };
+
+  currentDoc.proof = proof;
+
+  debug('update blocklet state only - sending to registry', { did, state, didRegistryUrl });
+
+  // Send directly to registry without reconstructing
+  return axios.post(joinURL(didRegistryUrl, '/.well-known/did-resolver/registries'), currentDoc, {
+    timeout: 10 * 1000,
+    headers: { 'X-Blocklet-Server-Version': blockletServerVersion },
+  });
+};
+
+// Update only blocklet state (e.g., to 'deleted') by fetching current document from registry with retry
+// This function preserves the complete DID document structure and only modifies the state field
+const updateBlockletStateOnly = (params) => {
+  debug('updateBlockletStateOnly with retry', { did: params.did });
+
+  return pRetry(() => updateBlockletStateOnlyInternal(params), {
+    retries: getRetryCount(),
+    onFailedAttempt: async (error) => {
+      debug('update blocklet state only failed', error);
+      await sleep(10 * 1000);
+    },
+  });
+};
+
 const updateBlockletDocument = ({
   blocklet,
   slpDid,
@@ -159,6 +302,11 @@ const updateBlockletDocument = ({
   alsoKnownAs = [],
   serverDid,
   blockletServerVersion,
+  name,
+  state,
+  owner,
+  launcher,
+  domains,
 }) => {
   const { appPid } = blocklet;
   if (['0', 'false', 0, false].includes(process.env.ABT_NODE_DID_DOCUMENT_UPDATE)) {
@@ -166,16 +314,58 @@ const updateBlockletDocument = ({
   }
 
   const services = getBlockletServices({ appPid, slpDid, daemonDidDomain, domain, slpDomain, serverDid });
-  return updateWithRetry({ id: appPid, services, didRegistryUrl, alsoKnownAs, wallet, blockletServerVersion });
+
+  const tagMap = new Set(blocklet.meta?.keywords || []);
+  tagMap.add('type:blocklet');
+
+  const metadata = {
+    name: blocklet.environments.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_NAME)?.value,
+    description: blocklet.environments.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_DESCRIPTION)?.value,
+    icon: blocklet.environments.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO)?.value,
+    tags: [],
+    state,
+    owner,
+  };
+
+  if (launcher) {
+    tagMap.add('launcher:app');
+    metadata.launcher = launcher;
+  }
+
+  metadata.tags = Array.from(tagMap);
+
+  const capabilities = {
+    blocklet: {
+      metadata,
+      domains,
+    },
+  };
+
+  debug('update blocklet document', { appPid, capabilities });
+
+  return updateWithRetry({
+    id: appPid,
+    services,
+    didRegistryUrl,
+    alsoKnownAs,
+    wallet,
+    blockletServerVersion,
+    name,
+    capabilities,
+  });
 };
 
 module.exports = {
   DEFAULT_RETRY_COUNT,
+  DEFAULT_DEBOUNCE_TIME,
   updateServerDocument,
   updateBlockletDocument,
+  updateBlockletStateOnly,
+  getDidDocument,
   getDID,
   getServerServices,
   getBlockletServices,
   updateWithRetry,
   getRetryCount,
+  getDebounceTime,
 };

package/lib/security.js

@@ -266,7 +266,7 @@ function patchValueIntoDirectives(directives, key, value) {
   return [...new Set(currentValue)];
 }
 
-async function patchResponseHeader(rawConfig, { node, blocklet, trustedDomains = [] }) {
+async function patchResponseHeader(rawConfig, { node, blocklet, trustedDomains = [], info }) {
   if (!rawConfig?.contentSecurityPolicy?.directives) {
     return rawConfig;
   }
@@ -295,7 +295,7 @@ async function patchResponseHeader(rawConfig, { node, blocklet, trustedDomains =
     );
   }
 
-  const nodeInfo = await node.getNodeInfo({ useCache: true });
+  const nodeInfo = info || (await node.getNodeInfo({ useCache: true }));
   // 添加 domain 的别名，需要放行 .well-known/ping 接口
   let domainAliases = await node.getBlockletDomainAliases({ blocklet, nodeInfo });
   domainAliases = (domainAliases || []).map((x) => x.value);
@@ -347,13 +347,13 @@ async function patchResponseHeader(rawConfig, { node, blocklet, trustedDomains =
   return config;
 }
 
-async function patchCors(rawConfig, { node, blocklet }) {
+async function patchCors(rawConfig, { node, blocklet, info }) {
   const config = cloneDeep(rawConfig);
   if (config?.origin?.smart) {
     // 获取当前应用自身的所有域名别名
     const result = [];
     result.push(...(config.origin?.value || []));
-    const nodeInfo = await node.getNodeInfo({ useCache: true });
+    const nodeInfo = info || (await node.getNodeInfo({ useCache: true }));
     let domainAliases = await node.getBlockletDomainAliases({ blocklet, nodeInfo });
     domainAliases = (domainAliases || []).map((x) => x.value);
     result.push(...domainAliases.map((x) => withHttps(x)));

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.6-beta-20251217-011553-818fcc8e",
+  "version": "1.17.6-beta-20251218-120326-5b44dadf",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,15 +18,15 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/db-cache": "1.17.6-beta-20251217-011553-818fcc8e",
+    "@abtnode/constant": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/db-cache": "1.17.6-beta-20251218-120326-5b44dadf",
     "@arcblock/did": "^1.27.15",
     "@arcblock/event-hub": "^1.27.15",
     "@arcblock/pm2": "^6.0.12",
-    "@blocklet/constant": "1.17.6-beta-20251217-011553-818fcc8e",
+    "@blocklet/constant": "1.17.6-beta-20251218-120326-5b44dadf",
     "@blocklet/error": "^0.3.5",
-    "@blocklet/meta": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@blocklet/xss": "^0.3.13",
+    "@blocklet/meta": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@blocklet/xss": "^0.3.14",
     "@ocap/client": "^1.27.15",
     "@ocap/mcrypto": "^1.27.15",
     "@ocap/util": "^1.27.15",
@@ -90,5 +90,5 @@
     "express": "^4.18.2",
     "fs-extra": "^11.2.0"
   },
-  "gitHead": "e4291b92297d4b9abfdc5c1e5bbe262882fe34f2"
+  "gitHead": "a07b4f70aa6dddea49ed794423b47d36dc206e53"
 }