@abtnode/core 1.8.61 → 1.8.62

package/lib/api/team.js

@@ -595,7 +595,13 @@ class TeamAPI extends EventEmitter {
   async getPassportIssuances({ teamDid, ownerDid }) {
     const state = await this.getSessionState(teamDid);
 
-    const list = await state.find({ type: 'passport-issuance', ownerDid });
+    const query = { type: 'passport-issuance' };
+
+    if (ownerDid) {
+      query.ownerDid = ownerDid;
+    }
+
+    const list = await state.find(query);
 
     return list.map((d) => ({
       // eslint-disable-next-line no-underscore-dangle

package/lib/blocklet/manager/disk.js

@@ -118,6 +118,7 @@ const {
   consumeServerlessNFT,
   validateAppConfig,
   checkDuplicateAppSk,
+  checkDuplicateMountPoint,
 } = require('../../util/blocklet');
 const StoreUtil = require('../../util/store');
 const states = require('../../states');
@@ -1144,20 +1145,26 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     const rootDid = blocklet.meta.did;
+    const isRootComponent = !did;
 
-    const { children } = blocklet;
-    const component = children.find((x) => x.meta.did === did);
-
+    const component = isRootComponent ? blocklet : blocklet.children.find((x) => x.meta.did === did);
     if (!component) {
       throw new Error('component does not exist');
     }
 
-    if (!component.dynamic) {
+    if (!isRootComponent && !component.dynamic) {
       throw new Error('cannot update mountPoint of non-dynamic component');
     }
 
+    if (isRootComponent && component.group === BlockletGroup.gateway) {
+      throw new Error('cannot update mountPoint of gateway blocklet');
+    }
+
+    checkDuplicateMountPoint(blocklet, mountPoint);
+
     component.mountPoint = mountPoint;
-    await states.blocklet.updateBlocklet(rootDid, { children });
+
+    await states.blocklet.updateBlocklet(rootDid, { mountPoint: blocklet.mountPoint, children: blocklet.children });
 
     this.emit(BlockletEvents.upgraded, { blocklet, context: { ...context, createAuditLog: false } }); // trigger router refresh
 

package/lib/router/helper.js

@@ -258,13 +258,19 @@ const ensureWellknownRule = async (sites) => {
       if (blockletRules.length) {
         // get pathPrefix for blocklet-service
         const rootBlockletRule = blockletRules.find((x) => x.to.did === x.to.componentId);
-        const pathPrefix = joinUrl(rootBlockletRule?.from?.pathPrefix || '/', WELLKNOWN_SERVICE_PATH_PREFIX);
+
+        const servicePathPrefix = joinUrl(
+          // rootBlockletRule?.from?.pathPrefix is for backwards compatibility
+          // rootBlockletRule?.from?.groupPathPrefix 在旧的场景中可能不为 '/' (blocklet 只能挂载在 relative prefix 下)
+          rootBlockletRule?.from?.groupPathPrefix || rootBlockletRule?.from?.pathPrefix || '/',
+          WELLKNOWN_SERVICE_PATH_PREFIX
+        );
 
         // requests for /.well-known/service will stay in blocklet-service and never proxy back to blocklet
         // so any rule is ok to be cloned
-        if (!site.rules.some((x) => x.from.pathPrefix === pathPrefix)) {
+        if (!site.rules.some((x) => x.from.pathPrefix === servicePathPrefix)) {
           const rule = cloneDeep(rootBlockletRule || blockletRules[0]);
-          rule.from.pathPrefix = pathPrefix;
+          rule.from.pathPrefix = servicePathPrefix;
           rule.isProtected = true;
           site.rules.push(rule);
         }

package/lib/router/manager.js

@@ -11,6 +11,7 @@ const get = require('lodash/get');
 const { EventEmitter } = require('events');
 const uuid = require('uuid');
 const isUrl = require('is-url');
+const joinUrl = require('url-join');
 const cloneDeep = require('lodash/cloneDeep');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const logger = require('@abtnode/logger')('@abtnode/core:router:manager');
@@ -570,7 +571,8 @@ class RouterManager extends EventEmitter {
     rule.groupId = rule.id;
     rule.from.pathPrefix = normalizePathPrefix(rule.from.pathPrefix);
     if (rule.to.type === ROUTING_RULE_TYPES.BLOCKLET) {
-      rule.from.groupPathPrefix = rule.from.pathPrefix;
+      // pathPrefix of root blocklet maybe changed to another prefix than '/', so use old groupPathPrefix first
+      rule.from.groupPathPrefix = rule.from.groupPathPrefix || rule.from.pathPrefix;
       rule.to.componentId = rule.to.did;
     }
     if (rule.to.url) {
@@ -580,18 +582,32 @@ class RouterManager extends EventEmitter {
 
   /**
    * get all rules to be add or update to site from root rule
-   * @param {*} rule
+   * @param {*} rootRule
    */
-  async getRulesForMutation(rule) {
-    if (rule.to.type !== ROUTING_RULE_TYPES.BLOCKLET) {
-      return [rule];
+  async getRulesForMutation(rootRule) {
+    if (rootRule.to.type !== ROUTING_RULE_TYPES.BLOCKLET) {
+      return [rootRule];
     }
 
     const rules = [];
-    let occupied = false;
 
     // get child rules
-    const blocklet = await states.blocklet.getBlocklet(rule.to.did);
+    const blocklet = await states.blocklet.getBlocklet(rootRule.to.did);
+
+    // blocklet may be mounted in relative prefix (for old usage), so blockletPrefix may not be '/'
+    // blocklet prefix is the origin pathPrefix in rootRule
+    const blockletPrefix = normalizePathPrefix(rootRule.from.pathPrefix);
+
+    // root component's mountPoint may not be '/'
+    const rootComponentPrefix = joinUrl(blockletPrefix, blocklet.mountPoint || '/');
+    rootRule.from.pathPrefix = normalizePathPrefix(rootComponentPrefix);
+
+    const isOccupiable = blocklet.meta.group === BlockletGroup.gateway;
+
+    if (!isOccupiable) {
+      rules.push(rootRule);
+    }
+
     forEachChildSync(blocklet, (component, { id, ancestors }) => {
       if (component.meta.group === BlockletGroup.gateway) {
         return;
@@ -611,38 +627,40 @@ class RouterManager extends EventEmitter {
         return;
       }
 
-      const pathPrefix = path.join(rule.from.pathPrefix, ...ancestors.map((x) => x.mountPoint || ''), mountPoint);
-      const isRootPath = normalizePathPrefix(pathPrefix) === normalizePathPrefix(rule.from.pathPrefix);
-      if (isRootPath) {
-        occupied = true;
+      const pathPrefix = path.join(
+        blockletPrefix,
+        // level 1 component should be independent with root component
+        ...ancestors.slice(1).map((x) => x.mountPoint || ''),
+        mountPoint
+      );
+
+      const occupied = normalizePathPrefix(pathPrefix) === normalizePathPrefix(rootRule.from.pathPrefix);
+
+      if (occupied && !isOccupiable) {
+        return;
       }
 
       // if is root path, child rule become root rule
       const childRule = {
-        id: isRootPath ? rule.id : uuid.v4(),
-        groupId: rule.id,
+        id: occupied ? rootRule.id : uuid.v4(),
+        groupId: rootRule.id,
         from: {
           pathPrefix: normalizePathPrefix(pathPrefix),
-          groupPathPrefix: rule.from.pathPrefix,
+          groupPathPrefix: blockletPrefix,
         },
         to: {
           type: ROUTING_RULE_TYPES.BLOCKLET,
           port: findInterfacePortByName(component, childWebInterface.name),
-          did: rule.to.did, // root component did
-          interfaceName: rule.to.interfaceName, // root component interface
+          did: rootRule.to.did, // root component did
+          interfaceName: rootRule.to.interfaceName, // root component interface
           componentId: id,
         },
-        isProtected: isRootPath ? rule.isProtected : true,
+        isProtected: occupied ? rootRule.isProtected : true,
       };
 
       rules.push(childRule);
     });
 
-    // get root rule
-    if (!occupied && blocklet.meta.group !== BlockletGroup.gateway) {
-      rules.push(rule);
-    }
-
     return rules;
   }
 }

package/lib/util/blocklet.js

@@ -1625,6 +1625,19 @@ const checkDuplicateAppSk = async ({ did, states }) => {
   }
 };
 
+const checkDuplicateMountPoint = (blocklet, mountPoint) => {
+  const err = new Error(`cannot add duplicate mount point, ${mountPoint || '/'} already exist`);
+  if (normalizePathPrefix(blocklet.mountPoint) === normalizePathPrefix(mountPoint)) {
+    throw err;
+  }
+
+  for (const component of blocklet.children || []) {
+    if (normalizePathPrefix(component.mountPoint) === normalizePathPrefix(mountPoint)) {
+      throw err;
+    }
+  }
+};
+
 module.exports = {
   consumeServerlessNFT,
   forEachBlocklet,
@@ -1670,4 +1683,5 @@ module.exports = {
   createDataArchive,
   validateAppConfig,
   checkDuplicateAppSk,
+  checkDuplicateMountPoint,
 };

package/lib/validators/router.js

@@ -47,7 +47,7 @@ const ruleSchema = {
     port: Joi.number().label('port').port().when('type', { is: ROUTING_RULE_TYPES.BLOCKLET, then: Joi.required() }),
     url: Joi.string().label('url').when('type', { is: ROUTING_RULE_TYPES.REDIRECT, then: Joi.required() }),
     redirectCode: Joi.alternatives()
-      .try(301, 302)
+      .try(301, 302, 307, 308)
       .label('redirect code')
       .when('type', { is: ROUTING_RULE_TYPES.REDIRECT, then: Joi.required() }),
     interfaceName: Joi.string() // root interface

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.61",
+  "version": "1.8.62",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.61",
-    "@abtnode/certificate-manager": "1.8.61",
-    "@abtnode/constant": "1.8.61",
-    "@abtnode/cron": "1.8.61",
-    "@abtnode/db": "1.8.61",
-    "@abtnode/logger": "1.8.61",
-    "@abtnode/queue": "1.8.61",
-    "@abtnode/rbac": "1.8.61",
-    "@abtnode/router-provider": "1.8.61",
-    "@abtnode/static-server": "1.8.61",
-    "@abtnode/timemachine": "1.8.61",
-    "@abtnode/util": "1.8.61",
+    "@abtnode/auth": "1.8.62",
+    "@abtnode/certificate-manager": "1.8.62",
+    "@abtnode/constant": "1.8.62",
+    "@abtnode/cron": "1.8.62",
+    "@abtnode/db": "1.8.62",
+    "@abtnode/logger": "1.8.62",
+    "@abtnode/queue": "1.8.62",
+    "@abtnode/rbac": "1.8.62",
+    "@abtnode/router-provider": "1.8.62",
+    "@abtnode/static-server": "1.8.62",
+    "@abtnode/timemachine": "1.8.62",
+    "@abtnode/util": "1.8.62",
     "@arcblock/did": "1.18.36",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.36",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.36",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.36",
-    "@blocklet/constant": "1.8.61",
-    "@blocklet/meta": "1.8.61",
-    "@blocklet/sdk": "1.8.61",
+    "@blocklet/constant": "1.8.62",
+    "@blocklet/meta": "1.8.62",
+    "@blocklet/sdk": "1.8.62",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.36",
     "@ocap/util": "1.18.36",
@@ -85,5 +85,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "f68ac14c2074400d392e2171d328f12dbd2e64cb"
+  "gitHead": "ea6ab48149eb9e1157ef37ab1505fa36a9ce598f"
 }