@abtnode/core 1.16.4 → 1.16.5

package/lib/router/helper.js

@@ -6,6 +6,7 @@ const tar = require('tar');
 const isUrl = require('is-url');
 const get = require('lodash/get');
 const cloneDeep = require('lodash/cloneDeep');
+const groupBy = require('lodash/groupBy');
 const isEqual = require('lodash/isEqual');
 const joinUrl = require('url-join');
 const { replaceSlotToIp, findComponentById, findWebInterface } = require('@blocklet/meta/lib/util');
@@ -58,6 +59,7 @@ const {
   getWellknownSitePort,
   getServerDidDomain,
   isGatewayCacheEnabled,
+  isBlockletSite,
 } = require('../util');
 const { getIpDnsDomainForBlocklet, getDidDomainForBlocklet } = require('../util/get-domain-for-blocklet');
 const { getFromCache: getAccessibleExternalNodeIp } = require('../util/get-accessible-external-node-ip');
@@ -242,13 +244,11 @@ const ensureLatestInterfaceInfo = async (sites = []) => {
   });
 };
 
-const ensureWellknownRule = async (sites) => {
-  const tempSites = sites || [];
+const ensureWellknownRule = async (sites = []) => {
   const wellknownPort = await getWellknownSitePort();
 
-  for (const site of tempSites) {
-    // 不向 default site & ip site & wellknown site 添加 wellknown rule
-    if (![DOMAIN_FOR_INTERNAL_SITE, DOMAIN_FOR_IP_SITE, DOMAIN_FOR_DEFAULT_SITE].includes(site.domain)) {
+  for (const site of sites) {
+    if (isBlockletSite(site.domain)) {
       // add /.well-known for blocklet
       const isExists = site.rules.find((x) => x.from.pathPrefix === WELLKNOWN_PATH_PREFIX);
       if (!isExists) {
@@ -262,31 +262,50 @@ const ensureWellknownRule = async (sites) => {
           isProtected: true,
         });
       }
+    }
 
-      // add /.well-known/service for blocklet
-      const blockletRules = site.rules
-        .filter((x) => x.to.type === ROUTING_RULE_TYPES.BLOCKLET)
-        // 可能存在挂载的 blocklet 不是自己, 是其他 blocklet
-        // 这里默认 pathPrefix 最短的是自己 ( 通常自己在 /, 其他 blocklet 在 /xxxx )
-        // 挂载其他 blocklet 的使用方式不推荐, 将来可能会被废弃
-        .sort((a, b) => (a.from.pathPrefix.length > b.from.pathPrefix.length ? 1 : -1));
+    // add /.well-known/service for blocklet
+    const blockletRules = site.rules
+      .filter((x) => x.to.type === ROUTING_RULE_TYPES.BLOCKLET)
+      // 可能存在挂载的 blocklet 不是自己, 是其他 blocklet
+      // 这里默认 pathPrefix 最短的是自己 ( 通常自己在 /, 其他 blocklet 在 /xxxx )
+      // 挂载其他 blocklet 的使用方式不推荐, 将来可能会被废弃
+      .sort((a, b) => (a.from.pathPrefix.length > b.from.pathPrefix.length ? 1 : -1));
+
+    // Group component rules and ensure that there is always a group even if there are no components
+    const grouped = groupBy(blockletRules, (x) => x.from.groupPathPrefix);
+    if (isBlockletSite(site.domain)) {
+      if (Object.keys(grouped).length === 0) {
+        grouped['/'] = [
+          {
+            id: '',
+            groupId: '',
+            to: {
+              did: site.blockletDid,
+              componentId: site.blockletDid,
+            },
+          },
+        ];
+      }
+    }
 
-      const rootRule = blockletRules[0];
+    Object.keys(grouped).forEach((groupPathPrefix) => {
+      const rule = grouped[groupPathPrefix][0];
 
       // Serve blocklet service always
-      const servicePathPrefix = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX);
+      const servicePathPrefix = joinUrl(groupPathPrefix, WELLKNOWN_SERVICE_PATH_PREFIX);
       if (!site.rules.some((x) => x.from.pathPrefix === servicePathPrefix)) {
         site.rules.push({
-          id: rootRule?.id || '',
-          groupId: rootRule?.groupId || '',
+          id: rule.id,
+          groupId: rule.groupId,
           from: {
             pathPrefix: servicePathPrefix,
-            groupPathPrefix: '/',
+            groupPathPrefix,
           },
           to: {
             type: 'blocklet',
-            did: site.blockletDid,
-            componentId: site.blockletDid,
+            did: rule.to.did,
+            componentId: rule.to.componentId,
             target: servicePathPrefix,
           },
           isProtected: true,
@@ -298,16 +317,16 @@ const ensureWellknownRule = async (sites) => {
       const avatarPathPrefix = joinUrl(servicePathPrefix, USER_AVATAR_PATH_PREFIX);
       if (!site.rules.some((x) => x.from.pathPrefix === avatarPathPrefix)) {
         site.rules.push({
-          id: rootRule?.id || '',
-          groupId: rootRule?.groupId || '',
+          id: rule.id,
+          groupId: rule.groupId,
           from: {
             pathPrefix: avatarPathPrefix,
-            groupPathPrefix: '/',
+            groupPathPrefix,
           },
           to: {
             type: 'blocklet',
-            did: site.blockletDid,
-            componentId: site.blockletDid,
+            did: rule.to.did,
+            componentId: rule.to.componentId,
             cacheGroup: 'blockletProxy',
             target: avatarPathPrefix,
           },
@@ -315,10 +334,10 @@ const ensureWellknownRule = async (sites) => {
           dynamic: true,
         });
       }
-    }
+    });
   }
 
-  return tempSites;
+  return sites;
 };
 
 const ensureBlockletDid = async (sites) => {

package/lib/router/index.js

@@ -15,7 +15,7 @@ const { BLOCKLET_UI_INTERFACES, BLOCKLET_MODES } = require('@blocklet/constant')
 
 const logger = require('@abtnode/logger')('@abtnode/core:router');
 
-const { isGatewayCacheEnabled } = require('../util');
+const { isGatewayCacheEnabled, isBlockletSite } = require('../util');
 
 const expandSites = (sites = []) => {
   const result = [];
@@ -184,96 +184,112 @@ Router.formatSites = (sites = []) => {
       break;
     }
   }
+  if (!daemonRule) {
+    return result;
+  }
 
   result.forEach((site) => {
-    if (Array.isArray(site.rules) && site.rules.length > 0) {
-      const rules = cloneDeep(site.rules);
-
-      rules.forEach((rule) => {
-        if ([ROUTING_RULE_TYPES.BLOCKLET].includes(rule.to.type) === false) {
-          return;
-        }
-
-        if (BLOCKLET_UI_INTERFACES.includes(rule.to.interfaceName) === false) {
-          return;
-        }
-
-        if (rule.dynamic) {
-          return;
-        }
-
-        if (daemonRule) {
-          // Serve meta js: both prefix and suffix do not contain trailing slash
-          // NOTICE: 这里隐含了一个约定
-          //   如果安装的 blockletA 和 blockletB 都需要 __blocklet__.js
-          //   则不可以将 blockletA mount 在 /a, 将 blockletB mount 在 /a/b (实际上也不会有这种需求)
-          site.rules.push({
-            from: {
-              pathPrefix: rule.from.pathPrefix.replace(/\/$/, ''),
-              groupPathPrefix: (rule.from.groupPathPrefix || '').replace(/\/$/, ''),
-              pathSuffix: '/__meta__.js',
-            },
-            to: {
-              type: ROUTING_RULE_TYPES.DAEMON,
-              port: daemonRule.to.port,
-              did: rule.to.did,
-              componentId: rule.to.componentId,
-              cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
-            },
-          });
-          site.rules.push({
-            from: {
-              pathPrefix: rule.from.pathPrefix.replace(/\/$/, ''),
-              groupPathPrefix: (rule.from.groupPathPrefix || '').replace(/\/$/, ''),
-              pathSuffix: '/__blocklet__.js',
-            },
-            to: {
-              type: ROUTING_RULE_TYPES.DAEMON,
-              port: daemonRule.to.port,
-              did: rule.to.did,
-              componentId: rule.to.componentId,
-              cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
-            },
-          });
-        }
-      });
+    const rules = Array.isArray(site.rules) ? cloneDeep(site.rules) : [];
+    const grouped = {};
 
-      if (daemonRule) {
-        const rootFrom = {
-          pathPrefix: '/',
-          groupPathPrefix: '/',
-          pathSuffix: '/__blocklet__.js',
-        };
-        // ensure /__blocklet__.js should be proxy to daemon
-        if (!site.rules.find((x) => isEqual(x.from, rootFrom))) {
-          site.rules.push({
-            from: rootFrom,
-            to: {
-              type: ROUTING_RULE_TYPES.DAEMON,
-              port: daemonRule.to.port,
-              cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
-              did: site.blockletDid,
-            },
-          });
-        }
-
-        // ensure /.blocklet/proxy should be proxy to daemon
-        if (!site.rules.find((x) => x.from.pathPrefix === BLOCKLET_PROXY_PATH_PREFIX)) {
-          site.rules.push({
-            from: {
-              pathPrefix: BLOCKLET_PROXY_PATH_PREFIX,
-            },
-            to: {
-              port: daemonRule.to.port,
-              type: ROUTING_RULE_TYPES.DAEMON,
-              target: BLOCKLET_PROXY_PATH_PREFIX,
-              cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletProxy' : '',
-              did: site.blockletDid,
-            },
-          });
-        }
+    // 1. serve blocklet.js for each component: both prefix and suffix do not contain trailing slash
+    rules.forEach((rule) => {
+      if ([ROUTING_RULE_TYPES.BLOCKLET].includes(rule.to.type) === false) {
+        return;
+      }
+
+      if (BLOCKLET_UI_INTERFACES.includes(rule.to.interfaceName) === false) {
+        return;
+      }
+
+      if (rule.dynamic) {
+        return;
       }
+
+      grouped[rule.from.groupPathPrefix] = rule;
+
+      site.rules.push({
+        dynamic: true,
+        from: {
+          pathPrefix: rule.from.pathPrefix,
+          groupPathPrefix: rule.from.groupPathPrefix,
+          pathSuffix: '/__meta__.js',
+        },
+        to: {
+          type: ROUTING_RULE_TYPES.DAEMON,
+          port: daemonRule.to.port,
+          did: rule.to.did,
+          componentId: rule.to.componentId,
+          cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
+        },
+      });
+      site.rules.push({
+        dynamic: true,
+        from: {
+          pathPrefix: rule.from.pathPrefix,
+          groupPathPrefix: rule.from.groupPathPrefix,
+          pathSuffix: '/__blocklet__.js',
+        },
+        to: {
+          type: ROUTING_RULE_TYPES.DAEMON,
+          port: daemonRule.to.port,
+          did: rule.to.did,
+          componentId: rule.to.componentId,
+          cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
+        },
+      });
+    });
+
+    // 2. ensure blocklet.js and proxy always served even if there are no components
+    if (isBlockletSite(site.domain) && Object.keys(grouped).length === 0) {
+      grouped['/'] = {
+        id: '',
+        groupId: '',
+        to: {
+          did: site.blockletDid,
+          componentId: site.blockletDid,
+        },
+      };
     }
+    Object.keys(grouped).forEach((groupPathPrefix) => {
+      const rootFrom = {
+        pathPrefix: groupPathPrefix,
+        groupPathPrefix,
+        pathSuffix: '/__blocklet__.js',
+      };
+
+      const rule = grouped[groupPathPrefix];
+
+      // 2.1 ensure /__blocklet__.js should be proxy to daemon
+      if (!site.rules.find((x) => isEqual(x.from, rootFrom))) {
+        site.rules.push({
+          dynamic: true,
+          from: rootFrom,
+          to: {
+            type: ROUTING_RULE_TYPES.DAEMON,
+            port: daemonRule.to.port,
+            cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
+            did: rule.to.did,
+          },
+        });
+      }
+      // 2.2 ensure /.blocklet/proxy should be proxy to daemon
+      if (!site.rules.find((x) => x.from.pathPrefix === BLOCKLET_PROXY_PATH_PREFIX)) {
+        site.rules.push({
+          dynamic: true,
+          from: {
+            pathPrefix: BLOCKLET_PROXY_PATH_PREFIX,
+          },
+          to: {
+            port: daemonRule.to.port,
+            type: ROUTING_RULE_TYPES.DAEMON,
+            target: BLOCKLET_PROXY_PATH_PREFIX,
+            cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletProxy' : '',
+            did: rule.to.did,
+          },
+        });
+      }
+    });
   });
 
   return result;

package/lib/states/user.js

@@ -190,6 +190,7 @@ class User extends BaseState {
    */
   async getUsers({ query, sort, paging: inputPaging } = {}) {
     const { approved, role, search, connectedDid } = query || {};
+    const queryParamList = [];
 
     // make query param
     const queryParam = {};
@@ -222,7 +223,16 @@ class User extends BaseState {
 
     // 根据 connectedDid 查询 user 信息（wallet 账户绑定 oauth 账户后，会有该字段）
     if (connectedDid) {
-      queryParam['extraConfigs.connectedAccounts.did'] = connectedDid;
+      queryParamList.push({
+        ...queryParam,
+        'extraConfigs.connectedAccounts.did': connectedDid,
+      });
+      // HACK: 在某些情况下，查询的条件可能是 version2 版本的用户 did，并且查村的 did 是派生出来的，没有实际的用户记录，只能通过这个条件查询出来
+      // version 1 的用户不需要通过这个条件来查询
+      queryParamList.push({
+        ...queryParam,
+        'extraConfigs.derivedAccount.did': connectedDid,
+      });
     }
 
     const sortParam = pickBy(sort, (x) => !isNullOrUndefined(x));
@@ -232,7 +242,11 @@ class User extends BaseState {
     }
 
     // get data
-    const { list, paging } = await this.paginate(queryParam, sortParam, inputPaging);
+    const { list, paging } = await this.paginate(
+      queryParamList.length > 0 ? { $or: queryParamList } : queryParam,
+      sortParam,
+      inputPaging
+    );
 
     return {
       list,

package/lib/util/index.js

@@ -26,6 +26,7 @@ const {
   DEFAULT_HTTP_PORT,
   DEFAULT_HTTPS_PORT,
   SLOT_FOR_IP_DNS_SITE,
+  BLOCKLET_SITE_GROUP_SUFFIX,
   NODE_MODES,
 } = require('@abtnode/constant');
 
@@ -458,6 +459,10 @@ const isGatewayCacheEnabled = (info) => {
   return true;
 };
 
+const isBlockletSite = (domain) => domain.endsWith(BLOCKLET_SITE_GROUP_SUFFIX);
+const isServerSite = (domain) =>
+  [DOMAIN_FOR_DEFAULT_SITE, DOMAIN_FOR_IP_SITE, DOMAIN_FOR_IP_SITE_REGEXP].includes(domain);
+
 const lib = {
   validateOwner,
   getProviderFromNodeInfo,
@@ -491,6 +496,8 @@ const lib = {
   prettyURL,
   templateReplace,
   isGatewayCacheEnabled,
+  isBlockletSite,
+  isServerSite,
 };
 
 module.exports = lib;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.4",
+  "version": "1.16.5",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,34 +19,34 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.4",
-    "@abtnode/certificate-manager": "1.16.4",
-    "@abtnode/constant": "1.16.4",
-    "@abtnode/cron": "1.16.4",
-    "@abtnode/db": "1.16.4",
-    "@abtnode/logger": "1.16.4",
-    "@abtnode/queue": "1.16.4",
-    "@abtnode/rbac": "1.16.4",
-    "@abtnode/router-provider": "1.16.4",
-    "@abtnode/static-server": "1.16.4",
-    "@abtnode/timemachine": "1.16.4",
-    "@abtnode/util": "1.16.4",
-    "@arcblock/did": "1.18.67",
+    "@abtnode/auth": "1.16.5",
+    "@abtnode/certificate-manager": "1.16.5",
+    "@abtnode/constant": "1.16.5",
+    "@abtnode/cron": "1.16.5",
+    "@abtnode/db": "1.16.5",
+    "@abtnode/logger": "1.16.5",
+    "@abtnode/queue": "1.16.5",
+    "@abtnode/rbac": "1.16.5",
+    "@abtnode/router-provider": "1.16.5",
+    "@abtnode/static-server": "1.16.5",
+    "@abtnode/timemachine": "1.16.5",
+    "@abtnode/util": "1.16.5",
+    "@arcblock/did": "1.18.68",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.67",
-    "@arcblock/event-hub": "1.18.67",
-    "@arcblock/jwt": "^1.18.67",
+    "@arcblock/did-util": "1.18.68",
+    "@arcblock/event-hub": "1.18.68",
+    "@arcblock/jwt": "^1.18.68",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.67",
-    "@blocklet/constant": "1.16.4",
-    "@blocklet/meta": "1.16.4",
-    "@blocklet/sdk": "1.16.4",
-    "@did-space/client": "^0.2.67",
+    "@arcblock/vc": "1.18.68",
+    "@blocklet/constant": "1.16.5",
+    "@blocklet/meta": "1.16.5",
+    "@blocklet/sdk": "1.16.5",
+    "@did-space/client": "^0.2.72",
     "@fidm/x509": "^1.2.1",
-    "@ocap/client": "1.18.67",
-    "@ocap/mcrypto": "1.18.67",
-    "@ocap/util": "1.18.67",
-    "@ocap/wallet": "1.18.67",
+    "@ocap/client": "1.18.68",
+    "@ocap/mcrypto": "1.18.68",
+    "@ocap/util": "1.18.68",
+    "@ocap/wallet": "1.18.68",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -93,5 +93,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "8d1062af0f4e4f491b6a7205c9d6542328ca6b20"
+  "gitHead": "229effc24ce7e12a0dbe551b2cc57825c3803745"
 }