@abtnode/core 1.6.10 → 1.6.14

package/lib/router/helper.js

@@ -5,6 +5,7 @@ const path = require('path');
 const tar = require('tar');
 const get = require('lodash/get');
 const cloneDeep = require('lodash/cloneDeep');
+const isEqual = require('lodash/isEqual');
 const joinUrl = require('url-join');
 const { getProvider } = require('@abtnode/router-provider');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
@@ -28,6 +29,7 @@ const {
   SLOT_FOR_IP_DNS_SITE,
   BLOCKLET_SITE_GROUP_SUFFIX,
   WELLKNOWN_ACME_CHALLENGE_PREFIX,
+  WELLKNOWN_DID_RESOLVER_PREFIX,
 } = require('@abtnode/constant');
 const {
   BLOCKLET_DYNAMIC_PATH_PREFIX,
@@ -499,6 +501,30 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     return { status: 'downloaded' };
   };
 
+  const upsertSiteRule = async ({ site, rule }, context) => {
+    const findExistingRule = (prefix) => site.rules.find((r) => r.from.pathPrefix === normalizePathPrefix(prefix));
+
+    const newSiteRule = {
+      id: site.id,
+      rule,
+    };
+
+    const existingRule = findExistingRule(get(rule, 'from.pathPrefix'));
+    if (!existingRule) {
+      await routerManager.addRoutingRule(newSiteRule, context);
+      return true;
+    }
+
+    if (!isEqual(existingRule.to, rule.to)) {
+      newSiteRule.rule.id = existingRule.id;
+      newSiteRule.skipProtectedRuleChecking = true;
+      await routerManager.updateRoutingRule(newSiteRule, context);
+      return true;
+    }
+
+    return false;
+  };
+
   const addWellknownSite = async (sites, context) => {
     const site = (sites || []).find((x) => x.name === NAME_FOR_WELLKNOWN_SITE);
 
@@ -511,42 +537,35 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       };
 
       const didResolverWellknownRule = {
-        from: { pathPrefix: joinUrl(WELLKNOWN_PATH_PREFIX, '/did.json') },
+        isProtected: true,
+        from: { pathPrefix: WELLKNOWN_DID_RESOLVER_PREFIX },
         to: proxyTarget,
       };
 
       const acmeChallengeWellknownRule = {
+        isProtected: true,
         from: { pathPrefix: WELLKNOWN_ACME_CHALLENGE_PREFIX },
         to: proxyTarget,
       };
 
       if (site) {
-        let changed = false;
-        const exists = (prefix) => !!site.rules.find((r) => r.from.pathPrefix === normalizePathPrefix(prefix));
-
-        if (!exists(didResolverWellknownRule.from.pathPrefix)) {
-          await routerManager.addRoutingRule(
-            {
-              id: site.id,
-              rule: didResolverWellknownRule,
-            },
-            context
-          );
-          changed = true;
-        }
+        const didResolverRuleUpdateRes = await upsertSiteRule(
+          {
+            site,
+            rule: didResolverWellknownRule,
+          },
+          context
+        );
 
-        if (!exists(acmeChallengeWellknownRule.from.pathPrefix)) {
-          await routerManager.addRoutingRule(
-            {
-              id: site.id,
-              rule: acmeChallengeWellknownRule,
-            },
-            context
-          );
-          changed = true;
-        }
+        const acmeRuleUpdateRes = await upsertSiteRule(
+          {
+            site,
+            rule: acmeChallengeWellknownRule,
+          },
+          context
+        );
 
-        return changed;
+        return didResolverRuleUpdateRes || acmeRuleUpdateRes;
       }
 
       await routerManager.addRoutingSite(
@@ -1354,6 +1373,8 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     getCertificates,
     checkDomain,
     ensureDashboardCertificate,
+    addWellknownSite,
+    upsertSiteRule,
 
     getRoutingCrons: () => [
       {

package/lib/router/manager.js

@@ -302,7 +302,7 @@ class RouterManager extends EventEmitter {
 
     // update rules
     const newRules = [
-      ...dbSite.rules.filter((x) => x.groupId !== rule.id || x.id !== rule.id), // 有些路由没有 rule.groupId
+      ...dbSite.rules.filter((x) => (x.groupId && x.groupId !== rule.id) || x.id !== rule.id), // 有些路由没有 rule.groupId
       ...(await this.getRules(rule)),
     ];
 

package/lib/states/node.js

@@ -255,6 +255,7 @@ class NodeState extends BaseState {
       ABT_NODE_PK: info.pk,
       ABT_NODE_PORT: info.port,
       ABT_NODE_SERVICE_PORT: process.env.ABT_NODE_SERVICE_PORT,
+      ABT_NODE_MODE: info.mode,
     }));
   }
 

package/lib/util/blocklet.js

@@ -74,7 +74,6 @@ const PRIVATE_NODE_ENVS = [
   // 'NEDB_MULTI_PORT', // FIXME: 排查 abtnode 对外提供的 SDK(比如 @abtnode/queue), SDK 中不要自动使用 NEDB_MULTI_PORT 环境变量
   'ABT_NODE_UPDATER_PORT',
   'ABT_NODE_SESSION_TTL',
-  'ABT_NODE_MODE',
   'ABT_NODE_ROUTER_PROVIDER',
   'ABT_NODE_DATA_DIR',
   'ABT_NODE_TOKEN_SECRET',

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.10",
+  "version": "1.6.14",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,22 +19,22 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.6.10",
-    "@abtnode/constant": "1.6.10",
-    "@abtnode/cron": "1.6.10",
-    "@abtnode/db": "1.6.10",
-    "@abtnode/logger": "1.6.10",
-    "@abtnode/queue": "1.6.10",
-    "@abtnode/rbac": "1.6.10",
-    "@abtnode/router-provider": "1.6.10",
-    "@abtnode/static-server": "1.6.10",
-    "@abtnode/timemachine": "1.6.10",
-    "@abtnode/util": "1.6.10",
+    "@abtnode/certificate-manager": "1.6.14",
+    "@abtnode/constant": "1.6.14",
+    "@abtnode/cron": "1.6.14",
+    "@abtnode/db": "1.6.14",
+    "@abtnode/logger": "1.6.14",
+    "@abtnode/queue": "1.6.14",
+    "@abtnode/rbac": "1.6.14",
+    "@abtnode/router-provider": "1.6.14",
+    "@abtnode/static-server": "1.6.14",
+    "@abtnode/timemachine": "1.6.14",
+    "@abtnode/util": "1.6.14",
     "@arcblock/did": "^1.13.79",
     "@arcblock/event-hub": "1.13.79",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "^1.13.79",
-    "@blocklet/meta": "1.6.10",
+    "@blocklet/meta": "1.6.14",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
@@ -75,5 +75,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "90aa29d892f9f54c87faa3041daec042997fffcc"
+  "gitHead": "0ae215d5cf1160631bdd9b64639c8fcf80eb2d5f"
 }