@abtnode/core 1.8.48 → 1.8.50

package/lib/blocklet/manager/disk.js

@@ -14,6 +14,7 @@ const { Throttle } = require('stream-throttle');
 const LRU = require('lru-cache');
 const joi = require('joi');
 const { isNFTExpired } = require('@abtnode/util/lib/nft');
+const { disableDNS } = require('@abtnode/util/lib/did-document');
 const { sign } = require('@arcblock/jwt');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { verifyPresentation } = require('@arcblock/vc');
@@ -21,6 +22,7 @@ const { toBase58, isHex } = require('@ocap/util');
 const { fromSecretKey } = require('@ocap/wallet');
 const { toSvg: createDidLogo } =
   process.env.NODE_ENV !== 'test' ? require('@arcblock/did-motif') : require('@arcblock/did-motif/dist/did-motif.cjs');
+const getBlockletInfo = require('@blocklet/meta/lib/info');
 
 const logger = require('@abtnode/logger')('@abtnode/core:blocklet:manager');
 const downloadFile = require('@abtnode/util/lib/download-file');
@@ -1000,9 +1002,12 @@ class BlockletManager extends BaseBlockletManager {
         }
 
         if (
-          [BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO, BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE].includes(
-            x.key
-          )
+          [
+            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO,
+            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_RECT,
+            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE,
+            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_FAVICON,
+          ].includes(x.key)
         ) {
           x.value = await logoSchema.validateAsync(x.value);
         }
@@ -1395,7 +1400,16 @@ class BlockletManager extends BaseBlockletManager {
     };
   }
 
-  async updateChildren({ updateId, did: inputDid, children: inputChildren, oldBlocklet: inputOldBlocklet }, context) {
+  async updateChildren(
+    {
+      updateId,
+      did: inputDid,
+      children: inputChildren,
+      oldBlocklet: inputOldBlocklet,
+      selectedComponents: selectedComponentDids,
+    },
+    context
+  ) {
     let did;
     let children;
     let oldBlocklet;
@@ -1406,8 +1420,19 @@ class BlockletManager extends BaseBlockletManager {
     } else {
       const sessionData = await states.session.end(updateId);
       did = sessionData.did;
-      children = sessionData.children;
       oldBlocklet = await this._getBlockletForInstallation(did);
+
+      if (selectedComponentDids && selectedComponentDids.length) {
+        children = cloneDeep(oldBlocklet.children).map((oldComponent) => {
+          const newComponent = sessionData.children.find((x) => x.meta.did === oldComponent.meta.did);
+          if (newComponent && selectedComponentDids.includes(newComponent.meta.did)) {
+            return newComponent;
+          }
+          return oldComponent;
+        });
+      } else {
+        children = sessionData.children;
+      }
     }
 
     // get old blocklet
@@ -3580,6 +3605,16 @@ class BlockletManager extends BaseBlockletManager {
       }
     }
 
+    const nodeInfo = await states.node.read();
+    const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+    disableDNS({ wallet, didRegistryUrl: nodeInfo.didRegistry })
+      .then(() => {
+        logger.info(`disabled blocklet ${blocklet.appDid} dns`);
+      })
+      .catch((err) => {
+        logger.error(`disable blocklet ${blocklet.appDid} dns failed`, { error: err });
+      });
+
     const result = await states.blocklet.deleteBlocklet(did);
     logger.info('blocklet removed successfully', { did });
 

package/lib/router/helper.js

@@ -12,6 +12,9 @@ const { getProvider } = require('@abtnode/router-provider');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const getTmpDir = require('@abtnode/util/lib/get-tmp-directory');
 const downloadFile = require('@abtnode/util/lib/download-file');
+const { encode: encodeBase32 } = require('@abtnode/util/lib/base32');
+const { updateBlockletDocument } = require('@abtnode/util/lib/did-document');
+const getBlockletInfo = require('@blocklet/meta/lib/info');
 const {
   DOMAIN_FOR_DEFAULT_SITE,
   DOMAIN_FOR_IP_SITE_REGEXP,
@@ -564,35 +567,26 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       }
     }
 
-    const isExistsInAlias = (domainAlias) =>
-      (dashboardSite.domainAliases || []).find((item) => {
-        if (typeof item === 'object') {
-          return domainAlias === item.value;
-        }
-
-        return domainAlias === item;
-      });
-
     const ipWildcardDomain = get(info, 'routing.ipWildcardDomain', '');
-    const didDomain = `${info.did.toLowerCase()}.${info.didDomain}`;
-    let dashboardAliasDomains = [ipWildcardDomain, didDomain];
 
-    dashboardAliasDomains = dashboardAliasDomains
-      .filter((item) => item && !isExistsInAlias(item))
-      .map((item) => ({ value: item, isProtected: true }));
+    const domainAliases = (dashboardSite.domainAliases || []).filter(
+      (item) => !item.value.endsWith(ipWildcardDomain) && !item.value.endsWith(info.didDomain)
+    );
 
-    if (dashboardAliasDomains.length > 0) {
-      try {
-        const result = await siteState.update(
-          { _id: dashboardSite.id },
-          { $push: { domainAliases: { $each: dashboardAliasDomains } } }
-        );
+    const didDomain = `${encodeBase32(info.did)}.${info.didDomain}`;
+    const dashboardAliasDomains = [
+      { value: ipWildcardDomain, isProtected: true },
+      { value: didDomain, isProtected: true },
+    ];
+    domainAliases.push(...dashboardAliasDomains);
 
-        updatedResult.push(result);
-      } catch (error) {
-        logger.error('add dashboard domain rule failed', { error });
-        console.error('Add dashboard domain rule failed:', error);
-      }
+    try {
+      const result = await siteState.update({ _id: dashboardSite.id }, { $set: { domainAliases } });
+
+      updatedResult.push(result);
+    } catch (error) {
+      logger.error('add dashboard domain rule failed', { error });
+      console.error('Add dashboard domain rule failed:', error);
     }
 
     const defaultRule = sites.find((x) => x.domain === DOMAIN_FOR_DEFAULT_SITE);
@@ -666,11 +660,25 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       const domainAliases = [];
 
       const didDomain = getDidDomainForBlocklet({
-        name: blocklet.meta.name,
-        daemonDid: nodeInfo.did,
+        blockletAppDid: blocklet.appDid,
         didDomain: nodeInfo.didDomain,
       });
 
+      const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+      updateBlockletDocument({
+        wallet,
+        blockletAppDid: blocklet.appDid,
+        daemonDidDomain: `${encodeBase32(nodeInfo.did)}.${nodeInfo.didDomain}`,
+        didRegistryUrl: nodeInfo.didRegistry,
+        domain: nodeInfo.didDomain,
+      })
+        .then(() => {
+          logger.info(`updated blocklet ${blocklet.appDid} dns`);
+        })
+        .catch((err) => {
+          logger.error(`update blocklet ${blocklet.appDid} dns failed`, { error: err });
+        });
+
       const ipEchoDnsDomain = getIpDnsDomainForBlocklet(blocklet, webInterface, nodeInfo.did);
 
       // let didDomain in front of ipEchoDnsDomain

package/lib/util/blocklet.js

@@ -266,7 +266,23 @@ const getAppSystemEnvironments = (blocklet, nodeInfo) => {
   const appName = title || name || result.name;
   const appDescription = description || result.description;
 
-  const appUrl = `https://${getDidDomainForBlocklet({ name, daemonDid: nodeInfo.did, didDomain: nodeInfo.didDomain })}`;
+  /* 获取 did domain 方式:
+   * 1. 先从 site 里读
+   * 2. 如果没有，再拼接
+   */
+
+  let appUrl = '';
+
+  const domainAliases = get(blocklet, 'site.domainAliases') || [];
+  const didDomainAlias = domainAliases.find((item) => item.value.endsWith(nodeInfo.didDomain));
+  if (didDomainAlias) {
+    appUrl = domainAliases.value;
+  } else {
+    appUrl = `https://${getDidDomainForBlocklet({
+      blockletAppDid: appId,
+      didDomain: nodeInfo.didDomain,
+    })}`;
+  }
 
   return {
     BLOCKLET_DID: did,
@@ -396,6 +412,7 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
     BLOCKLET_MOUNT_POINTS: JSON.stringify(mountPoints),
     BLOCKLET_MODE: blocklet.mode || BLOCKLET_MODES.PRODUCTION,
     BLOCKLET_APP_EK: tmp?.secretKey,
+    BLOCKLET_APP_VERSION: root.meta.version,
     ...nodeEnvironments,
     ...safeNodeEnvironments,
   };

package/lib/util/get-domain-for-blocklet.js

@@ -1,6 +1,6 @@
 const slugify = require('slugify');
 const { DEFAULT_IP_DOMAIN_SUFFIX } = require('@abtnode/constant');
-const md5 = require('@abtnode/util/lib/md5');
+const { encode: encodeBase32 } = require('@abtnode/util/lib/base32');
 
 const SLOT_FOR_IP_DNS_SITE = '888-888-888-888';
 
@@ -17,10 +17,8 @@ const getIpDnsDomainForBlocklet = (blocklet, blockletInterface) => {
   }${iName}-${SLOT_FOR_IP_DNS_SITE}.${DEFAULT_IP_DOMAIN_SUFFIX}`;
 };
 
-const getDidDomainForBlocklet = ({ name, daemonDid, didDomain }) => {
-  const prefix = md5(name).substring(0, 8);
-
-  return `${prefix}-${daemonDid.toLowerCase()}.${didDomain}`;
+const getDidDomainForBlocklet = ({ blockletAppDid, didDomain }) => {
+  return `${encodeBase32(blockletAppDid)}.${didDomain}`;
 };
 
 module.exports = { getIpDnsDomainForBlocklet, getDidDomainForBlocklet, formatName };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.48",
+  "version": "1.8.50",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,32 +19,32 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.48",
-    "@abtnode/certificate-manager": "1.8.48",
-    "@abtnode/constant": "1.8.48",
-    "@abtnode/cron": "1.8.48",
-    "@abtnode/db": "1.8.48",
-    "@abtnode/logger": "1.8.48",
-    "@abtnode/queue": "1.8.48",
-    "@abtnode/rbac": "1.8.48",
-    "@abtnode/router-provider": "1.8.48",
-    "@abtnode/static-server": "1.8.48",
-    "@abtnode/timemachine": "1.8.48",
-    "@abtnode/util": "1.8.48",
-    "@arcblock/did": "1.18.31",
+    "@abtnode/auth": "1.8.50",
+    "@abtnode/certificate-manager": "1.8.50",
+    "@abtnode/constant": "1.8.50",
+    "@abtnode/cron": "1.8.50",
+    "@abtnode/db": "1.8.50",
+    "@abtnode/logger": "1.8.50",
+    "@abtnode/queue": "1.8.50",
+    "@abtnode/rbac": "1.8.50",
+    "@abtnode/router-provider": "1.8.50",
+    "@abtnode/static-server": "1.8.50",
+    "@abtnode/timemachine": "1.8.50",
+    "@abtnode/util": "1.8.50",
+    "@arcblock/did": "1.18.32",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.31",
-    "@arcblock/event-hub": "1.18.31",
-    "@arcblock/jwt": "^1.18.31",
+    "@arcblock/did-util": "1.18.32",
+    "@arcblock/event-hub": "1.18.32",
+    "@arcblock/jwt": "^1.18.32",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.31",
-    "@blocklet/constant": "1.8.48",
-    "@blocklet/meta": "1.8.48",
-    "@blocklet/sdk": "1.8.48",
+    "@arcblock/vc": "1.18.32",
+    "@blocklet/constant": "1.8.50",
+    "@blocklet/meta": "1.8.50",
+    "@blocklet/sdk": "1.8.50",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.31",
-    "@ocap/util": "1.18.31",
-    "@ocap/wallet": "1.18.31",
+    "@ocap/mcrypto": "1.18.32",
+    "@ocap/util": "1.18.32",
+    "@ocap/wallet": "1.18.32",
     "@slack/webhook": "^5.0.4",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
@@ -82,5 +82,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "39979d7a059d5f97442ac7d46604391e6656ac8d"
+  "gitHead": "7f3ccb957659a6791b93b6fc4fbcbbd2c42f1efd"
 }