@abtnode/core 1.15.17 → 1.16.0-beta-8ee536d7

package/lib/router/index.js

@@ -1,17 +1,21 @@
 const get = require('lodash/get');
+const pick = require('lodash/pick');
 const cloneDeep = require('lodash/cloneDeep');
 const {
   DOMAIN_FOR_DEFAULT_SITE,
   DOMAIN_FOR_IP_SITE_REGEXP,
   ROUTING_RULE_TYPES,
-  DEFAULT_DASHBOARD_DOMAIN,
+  DEFAULT_IP_DOMAIN,
   BLOCKLET_PROXY_PATH_PREFIX,
   BLOCKLET_SITE_GROUP_SUFFIX,
+  GATEWAY_REQ_LIMIT,
 } = require('@abtnode/constant');
-const { BLOCKLET_UI_INTERFACES } = require('@blocklet/meta/lib/constants');
-const { pick } = require('lodash');
+const { BLOCKLET_UI_INTERFACES, BLOCKLET_MODES } = require('@blocklet/constant');
+
 const logger = require('@abtnode/logger')('@abtnode/core:router');
 
+const { isGatewayCacheEnabled } = require('../util');
+
 const expandSites = (sites = []) => {
   const result = [];
 
@@ -60,12 +64,12 @@ const getRoutingTable = ({ sites, nodeInfo }) => {
   let routingTable = Router.formatSites(sites);
   routingTable = expandSites(routingTable);
 
-  // put dashboardDomain to last, to let blockletDomain match first
+  // put ipWildcardDomain to last, to let blockletDomain match first
   // e.g.
-  //  dashboardDomain: 192-168-3-2.ip.abtnet.io
+  //  ipWildcardDomain: 192-168-3-2.ip.abtnet.io
   //  blockletDomain: static-demo-xxx-192-168-3-2.ip.abtnet.io
-  const dashboardDomain = get(nodeInfo, 'routing.dashboardDomain', '');
-  const index = routingTable.findIndex((x) => x.domain === dashboardDomain);
+  const ipWildcardDomain = get(nodeInfo, 'routing.ipWildcardDomain', '');
+  const index = routingTable.findIndex((x) => x.domain === ipWildcardDomain);
   if (index > -1) {
     routingTable.push(...routingTable.splice(index, 1));
   }
@@ -94,35 +98,34 @@ class Router {
   }
 
   async updateRoutingTable() {
+    logger.info('update routing table');
+
     const { sites, certificates, headers = {}, services = [], nodeInfo = {} } = (await this.getRoutingParams()) || {};
     if (!Array.isArray(sites)) {
       logger.error('sites is not an array', { sites });
       return;
     }
 
-    logger.info('updateRoutingTable sites:', { sites });
-
     this.routingTable = getRoutingTable({ sites, nodeInfo });
 
-    logger.info('updateRoutingTable routingTable:', { routingTable: this.routingTable });
-    logger.info('updateRoutingTable certificates:', { certificates: certificates.map((item) => item.domain) });
+    const requestLimit = nodeInfo.routing.requestLimit || { enable: false, rate: GATEWAY_REQ_LIMIT.min };
+    if (requestLimit.enabled) {
+      requestLimit.maxInstantRate = requestLimit.rate >= 20 ? 20 : requestLimit.rate + 20;
+    }
 
     await this.provider.update({
       routingTable: this.routingTable,
       certificates,
-      globalHeaders: headers,
+      commonHeaders: headers,
       services,
       nodeInfo: pick(nodeInfo, ['name', 'version', 'port', 'mode', 'enableWelcomePage', 'routing']),
+      requestLimit,
+      cacheEnabled: isGatewayCacheEnabled(nodeInfo),
     });
   }
 
   async update() {
-    if (!this.provider) {
-      throw new Error('use setProvider() to set provider first');
-    }
-
     logger.info('router: update');
-
     await this.updateRoutingTable();
     await this.provider.reload();
   }
@@ -139,6 +142,12 @@ class Router {
     return this.provider.restart();
   }
 
+  async reload() {
+    logger.info('router: reload');
+    await this.updateRoutingTable();
+    return this.provider.reload();
+  }
+
   stop() {
     logger.info('router: stop');
     return this.provider.stop();
@@ -153,6 +162,14 @@ class Router {
     logger.info('router: rotate logs');
     await this.provider.rotateLogs();
   }
+
+  getLogFilesForToday() {
+    return this.provider.getLogFilesForToday();
+  }
+
+  getLogDir() {
+    return this.provider.getLogDir();
+  }
 }
 
 Router.formatSites = (sites = []) => {
@@ -170,6 +187,10 @@ Router.formatSites = (sites = []) => {
   result.forEach((site) => {
     if (Array.isArray(site.rules) && site.rules.length > 0) {
       const rules = cloneDeep(site.rules);
+
+      let hasRootPathBlockletRule = false;
+      let tmpBlockletRule;
+
       rules.forEach((rule) => {
         if ([ROUTING_RULE_TYPES.BLOCKLET].includes(rule.to.type) === false) {
           return;
@@ -179,10 +200,19 @@ Router.formatSites = (sites = []) => {
           return;
         }
 
+        if (rule.dynamic) {
+          return;
+        }
+
         if (daemonRule) {
+          if (rule.from.pathPrefix === '/') {
+            hasRootPathBlockletRule = true;
+          }
+          tmpBlockletRule = rule;
+
           // Serve meta js: both prefix and suffix do not contain trailing slash
           // NOTICE: 这里隐含了一个约定
-          //   如果安装的 blockletA 和 blockletB 都需要 __meta__.js
+          //   如果安装的 blockletA 和 blockletB 都需要 __blocklet__.js
           //   则不可以将 blockletA mount 在 /a, 将 blockletB mount 在 /a/b (实际上也不会有这种需求)
           site.rules.push({
             from: {
@@ -194,7 +224,22 @@ Router.formatSites = (sites = []) => {
               type: ROUTING_RULE_TYPES.DAEMON,
               port: daemonRule.to.port,
               did: rule.to.did,
-              realDid: rule.to.realDid,
+              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' : '',
             },
           });
 
@@ -207,10 +252,29 @@ Router.formatSites = (sites = []) => {
               did: rule.to.did,
               type: ROUTING_RULE_TYPES.DAEMON,
               target: BLOCKLET_PROXY_PATH_PREFIX,
+              cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletProxy' : '',
             },
           });
         }
       });
+
+      // ensure /__blocklet__.js should be proxy to daemon
+      if (daemonRule && !hasRootPathBlockletRule && tmpBlockletRule) {
+        site.rules.push({
+          from: {
+            pathPrefix: '/',
+            groupPathPrefix: '/',
+            pathSuffix: '/__blocklet__.js',
+          },
+          to: {
+            type: ROUTING_RULE_TYPES.DAEMON,
+            port: daemonRule.to.port,
+            did: tmpBlockletRule.to.did,
+            componentId: tmpBlockletRule.to.did,
+            cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
+          },
+        });
+      }
     }
   });
 
@@ -219,11 +283,11 @@ Router.formatSites = (sites = []) => {
 
 Router.flattenSitesToRules = (sites = [], info = {}) => {
   const result = [];
-  const dashboardDomain = get(info, 'routing.dashboardDomain', DEFAULT_DASHBOARD_DOMAIN);
+  const ipWildcardDomain = get(info, 'routing.ipWildcardDomain', DEFAULT_IP_DOMAIN);
   sites.forEach((site) => {
     const aliases = (site.domainAliases || [])
       .map((x) => (typeof x === 'string' ? x : x.value))
-      .filter((x) => x !== dashboardDomain)
+      .filter((x) => x !== ipWildcardDomain)
       .filter(Boolean);
 
     if (Array.isArray(site.rules) && site.rules.length > 0) {