@abtnode/core 1.8.63 → 1.8.64-beta-b3d407e0

package/lib/event.js

@@ -238,7 +238,11 @@ module.exports = ({
       logger.info('take snapshot after updated blocklet app', { event: eventName, did: blocklet.meta.did, hash });
     }
 
-    if (blocklet.status && !isBeforeInstalled(blocklet.status)) {
+    if (
+      ![BlockletEvents.removed, BlockletEvents.dataCleaned].includes(eventName) &&
+      blocklet.status &&
+      !isBeforeInstalled(blocklet.status)
+    ) {
       try {
         await blockletManager.runtimeMonitor.monit(blocklet.meta.did);
       } catch (error) {

package/lib/router/helper.js

@@ -14,6 +14,7 @@ const getTmpDir = require('@abtnode/util/lib/get-tmp-directory');
 const downloadFile = require('@abtnode/util/lib/download-file');
 const { updateBlockletDocument } = require('@abtnode/util/lib/did-document');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
+const { forEachBlocklet } = require('@blocklet/meta/lib/util');
 const {
   DOMAIN_FOR_DEFAULT_SITE,
   DOMAIN_FOR_IP_SITE_REGEXP,
@@ -768,47 +769,77 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       return false;
     }
 
-    const tasks = (blocklet.meta.interfaces || [])
-      .filter((x) => x.type === BLOCKLET_INTERFACE_TYPE_WELLKNOWN)
-      .map(async (x) => {
-        const pathPrefix = normalizePathPrefix(x.prefix);
-        if (!pathPrefix.startsWith(WELLKNOWN_PATH_PREFIX)) {
-          throw new Error(`Wellknown path prefix must start with: ${WELLKNOWN_PATH_PREFIX}`);
-        }
+    /**
+     * 1. component blocklet 不允许有相同多的 wellknown
+     * 1. wellknown 可以访问的路由:
+     *    /.well-known/xxx
+     *    /{wellknown owner blocklet}/.well-known/xxx
+     */
 
-        const port = findInterfacePortByName(blocklet, x.name);
-        const existedRule = hasRuleByPrefix(wellknownSite, pathPrefix);
+    const isWellknownInterface = (x) => x.type === BLOCKLET_INTERFACE_TYPE_WELLKNOWN;
 
-        const rule = {
-          from: { pathPrefix },
-          to: {
-            did: blocklet.meta.did,
-            port,
-            type: ROUTING_RULE_TYPES.GENERAL_PROXY,
-            interfaceName: x.name,
-          },
-          isProtected: true,
-        };
+    const handler = async (tmpBlocklet, tmpInterface, mountPoint) => {
+      let pathPrefix = normalizePathPrefix(tmpInterface.prefix);
+      if (!pathPrefix.startsWith(WELLKNOWN_PATH_PREFIX)) {
+        throw new Error(`Wellknown path prefix must start with: ${WELLKNOWN_PATH_PREFIX}`);
+      }
 
-        if (!existedRule) {
-          await routerManager.addRoutingRule({ id: wellknownSite.id, rule, skipCheckDynamicBlacklist: true }, context);
-          return true;
-        }
+      const tmpMountPoint = mountPoint || tmpBlocklet.mountPoint;
+      if (tmpMountPoint) {
+        pathPrefix = joinUrl(tmpMountPoint, pathPrefix);
+      }
 
-        // 兼容代码，旧的 rule 没有 to.did 字段
-        if (port !== existedRule.to.port || existedRule.to.did !== blocklet.meta.did) {
-          existedRule.to = rule.to;
+      const port = findInterfacePortByName(tmpBlocklet, tmpInterface.name);
+      const existedRule = hasRuleByPrefix(wellknownSite, pathPrefix);
 
-          await routerManager.updateRoutingRule(
-            { id: wellknownSite.id, rule: existedRule, skipProtectedRuleChecking: true },
-            context
-          );
+      const rule = {
+        from: { pathPrefix },
+        to: {
+          did: tmpBlocklet.meta.did,
+          port,
+          type: ROUTING_RULE_TYPES.GENERAL_PROXY,
+          interfaceName: tmpInterface.name,
+        },
+        isProtected: true,
+      };
 
-          return true;
-        }
+      if (!existedRule) {
+        await routerManager.addRoutingRule({ id: wellknownSite.id, rule, skipCheckDynamicBlacklist: true }, context);
+        return true;
+      }
 
-        return false;
-      });
+      // 兼容代码，旧的 rule 没有 to.did 字段
+      if (port !== existedRule.to.port || existedRule.to.did !== tmpBlocklet.meta.did) {
+        existedRule.to = rule.to;
+
+        await routerManager.updateRoutingRule(
+          { id: wellknownSite.id, rule: existedRule, skipProtectedRuleChecking: true },
+          context
+        );
+
+        return true;
+      }
+
+      return false;
+    };
+
+    const tasks = [];
+
+    forEachBlocklet(
+      blocklet,
+      (b) => {
+        (b.meta.interfaces || []).forEach((item) => {
+          if (isWellknownInterface(item)) {
+            tasks.push(handler(b, item));
+
+            if (!b.mountPoint || b.mountPoint !== '/') {
+              tasks.push(handler(b, item, '/')); // 在站点的根路由下挂载一个
+            }
+          }
+        });
+      },
+      { sync: true }
+    );
 
     const changes = await Promise.all(tasks);
     return changes.some(Boolean);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.63",
+  "version": "1.8.64-beta-b3d407e0",
   "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.63",
-    "@abtnode/certificate-manager": "1.8.63",
-    "@abtnode/constant": "1.8.63",
-    "@abtnode/cron": "1.8.63",
-    "@abtnode/db": "1.8.63",
-    "@abtnode/logger": "1.8.63",
-    "@abtnode/queue": "1.8.63",
-    "@abtnode/rbac": "1.8.63",
-    "@abtnode/router-provider": "1.8.63",
-    "@abtnode/static-server": "1.8.63",
-    "@abtnode/timemachine": "1.8.63",
-    "@abtnode/util": "1.8.63",
+    "@abtnode/auth": "1.8.64-beta-b3d407e0",
+    "@abtnode/certificate-manager": "1.8.64-beta-b3d407e0",
+    "@abtnode/constant": "1.8.64-beta-b3d407e0",
+    "@abtnode/cron": "1.8.64-beta-b3d407e0",
+    "@abtnode/db": "1.8.64-beta-b3d407e0",
+    "@abtnode/logger": "1.8.64-beta-b3d407e0",
+    "@abtnode/queue": "1.8.64-beta-b3d407e0",
+    "@abtnode/rbac": "1.8.64-beta-b3d407e0",
+    "@abtnode/router-provider": "1.8.64-beta-b3d407e0",
+    "@abtnode/static-server": "1.8.64-beta-b3d407e0",
+    "@abtnode/timemachine": "1.8.64-beta-b3d407e0",
+    "@abtnode/util": "1.8.64-beta-b3d407e0",
     "@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.63",
-    "@blocklet/meta": "1.8.63",
-    "@blocklet/sdk": "1.8.63",
+    "@blocklet/constant": "1.8.64-beta-b3d407e0",
+    "@blocklet/meta": "1.8.64-beta-b3d407e0",
+    "@blocklet/sdk": "1.8.64-beta-b3d407e0",
     "@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": "69c7bf7f79fbabc8718d8ec0c6fb36ce9477cfd8"
+  "gitHead": "e076a9cab4c15cfafb82d0aef9a66dd1b825ec75"
 }