@abtnode/router-provider 1.7.19 → 1.7.22

package/lib/default/daemon.js

@@ -78,8 +78,8 @@ const createRequestHandler = (id) => (req, res, target) => {
   if (rule.did) {
     req.headers['x-blocklet-did'] = rule.did;
   }
-  if (rule.realDid && rule.did !== rule.realDid) {
-    req.headers['x-blocklet-real-did'] = rule.realDid;
+  if (rule.componentId) {
+    req.headers['x-blocklet-component-id'] = rule.componentId;
   }
 
   req.headers['x-path-prefix'] = rule.prefix.replace(WELLKNOWN_SERVICE_PATH_PREFIX, '') || '/';

package/lib/nginx/index.js

@@ -34,6 +34,7 @@ const {
   rotateNginxLogFile,
   getMissingModules,
   getMainTemplate,
+  getUpstreamName,
 } = require('./util');
 const {
   decideHttpPort,
@@ -106,6 +107,7 @@ class NginxProvider extends BaseProvider {
     this.httpsPort = decideHttpsPort(httpsPort);
     this.cacheDisabled = !!cacheDisabled;
     this.isHttp2Supported = this._isHttp2Supported();
+    this.conf = null; // nginx `conf` object
 
     logger.info('nginx provider config', {
       configDir,
@@ -156,6 +158,8 @@ class NginxProvider extends BaseProvider {
           return;
         }
 
+        this.conf = conf;
+
         conf.on('flushed', () => resolve());
         conf.live(this.configPath);
 
@@ -177,6 +181,14 @@ class NginxProvider extends BaseProvider {
         }
 
         logger.info('routing sites:', sites);
+
+        const allRules = sites.reduce((acc, site) => {
+          acc.push(...(site.rules || []));
+          return acc;
+        }, []);
+
+        this.ensureUpstreamServers(allRules);
+
         // eslint-disable-next-line no-restricted-syntax
         for (const site of sites) {
           const { domain, port, rules, corsAllowedOrigins } = site;
@@ -363,6 +375,44 @@ class NginxProvider extends BaseProvider {
     this._addBlockletTypeLocation(args);
   }
 
+  addUpstreamServer(port) {
+    this.conf.nginx.http._add('upstream', getUpstreamName(port));
+    const upstream = this.conf.nginx.http.upstream.length
+      ? this.conf.nginx.http.upstream[this.conf.nginx.http.upstream.length - 1]
+      : this.conf.nginx.http.upstream;
+
+    upstream._add('server', `127.0.0.1:${port} max_fails=1 fail_timeout=2s`);
+    upstream._add('keepalive', '2');
+  }
+
+  ensureUpstreamServers(rules) {
+    const upstreamMap = new Map();
+
+    const servicePort = process.env.ABT_NODE_SERVICE_PORT;
+
+    if (!upstreamMap.has(servicePort)) {
+      this.addUpstreamServer(servicePort);
+      upstreamMap.set(servicePort, 1);
+    }
+
+    for (let i = 0; i < rules.length; i++) {
+      const rule = rules[i];
+
+      if (
+        [
+          ROUTING_RULE_TYPES.DAEMON,
+          ROUTING_RULE_TYPES.SERVICE,
+          ROUTING_RULE_TYPES.BLOCKLET,
+          ROUTING_RULE_TYPES.GENERAL_PROXY,
+        ].includes(rule.type) &&
+        !upstreamMap.has(String(rule.port))
+      ) {
+        this.addUpstreamServer(rule.port);
+        upstreamMap.set(String(rule.port), 1);
+      }
+    }
+  }
+
   /**
    * Returns:
    * server /flash/ {
@@ -376,8 +426,8 @@ class NginxProvider extends BaseProvider {
    * @param {number} port
    * @param {string} pathPrefix
    * @param {string} pathSuffix
-   * @param {string} did root blocklet did
-   * @param {string} realDid child blocklet did
+   * @param {string} did app did
+   * @param {string} componentId component id
    */
   _addBlockletTypeLocation({
     server,
@@ -387,7 +437,7 @@ class NginxProvider extends BaseProvider {
     groupPrefix,
     suffix,
     did,
-    realDid,
+    componentId,
     corsAllowedOrigins,
     target,
     ruleId,
@@ -421,12 +471,11 @@ class NginxProvider extends BaseProvider {
     if (did) {
       location._add('set', `$did "${did}"`);
       location._add('proxy_set_header', `X-Blocklet-Did "${did}"`);
-      if (realDid) {
-        location._add('proxy_set_header', `X-Blocklet-Real-Did "${realDid}"`);
-      }
+      location._add('proxy_set_header', `X-Blocklet-Component-Id "${componentId}"`);
     }
 
     // kill cache
+    // TODO: 这个放在管理端的 Gateway 配置中
     if (this.cacheDisabled) {
       location._add('expires', '-1');
     }
@@ -456,7 +505,7 @@ class NginxProvider extends BaseProvider {
 
       // Rewrite path
       location._add('rewrite', `^${rewritePathPrefix}/?(.*) /$1  break`);
-      location._add('proxy_pass', `http://127.0.0.1:${process.env.ABT_NODE_SERVICE_PORT}`);
+      location._add('proxy_pass', `http://${getUpstreamName(process.env.ABT_NODE_SERVICE_PORT)}/`);
 
       return;
     }
@@ -467,8 +516,8 @@ class NginxProvider extends BaseProvider {
     if (!suffix && prefix !== target) {
       location._add('rewrite', `^${rewritePathPrefix}/?(.*) ${`${target}/`.replace(/\/\//g, '/')}$1  break`);
     }
-    // location._add('rewrite', `^${rewritePathPrefix}/?(.*) /$1  break`);
-    location._add('proxy_pass', `http://127.0.0.1:${port}`);
+
+    location._add('proxy_pass', `http://${getUpstreamName(port)}`);
   }
 
   _addRedirectTypeLocation({ server, url, redirectCode, prefix, suffix }) {
@@ -505,7 +554,7 @@ class NginxProvider extends BaseProvider {
     const location = this._getLastLocation(server);
     this._addCommonHeader(location);
 
-    location._add('proxy_pass', `http://127.0.0.1:${port}`);
+    location._add('proxy_pass', `http://${getUpstreamName(port)}`);
   }
 
   _addDirectResponseLocation({ server, response, prefix, suffix }) {

package/lib/nginx/util.js

@@ -162,7 +162,7 @@ events {
 http {
     map $http_upgrade $connection_upgrade {
       default upgrade;
-      '' close;
+      '' "";
     }
     client_body_temp_path ${path.join(tmpDir, 'client_body')};
     proxy_temp_path ${path.join(tmpDir, 'proxy')};
@@ -271,6 +271,8 @@ const getMissingModules = (configParams) => {
   return missingModules;
 };
 
+const getUpstreamName = (port) => `server_${port}`;
+
 module.exports = {
   addTestServer,
   getMainTemplate,
@@ -282,4 +284,5 @@ module.exports = {
   rotateNginxLogFile,
   getUserGroup,
   getWorkerConnectionCount,
+  getUpstreamName,
 };

package/lib/util.js

@@ -85,7 +85,7 @@ const formatRoutingTable = (routingTable, onRule) => {
       } else {
         rule.port = +x.to.port;
         rule.did = x.to.did;
-        rule.realDid = x.to.realDid;
+        rule.componentId = x.to.componentId;
         rule.target = trimEndSlash(normalizePathPrefix(x.to.target || '/'));
         rule.services = x.services || [];
       }
@@ -109,17 +109,18 @@ const formatRoutingTable = (routingTable, onRule) => {
 
   return { sites: Object.values(sites), configs };
 };
-
+/**
+ *
+ *
+ * @param {string} domain
+ * @return {boolean}
+ */
 const isSpecificDomain = (domain) => {
   if (isValidDomain(domain) === false) {
     return false;
   }
 
-  if (domain.endsWith(DEFAULT_IP_DOMAIN_SUFFIX)) {
-    return false;
-  }
-
-  return true;
+  return !domain.endsWith(DEFAULT_IP_DOMAIN_SUFFIX);
 };
 
 const toSlotDomain = (domain) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.7.19",
+  "version": "1.7.22",
   "description": "Routing engine implementations for abt node",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,10 +32,10 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.7.19",
-    "@abtnode/logger": "1.7.19",
-    "@abtnode/router-templates": "1.7.19",
-    "@abtnode/util": "1.7.19",
+    "@abtnode/constant": "1.7.22",
+    "@abtnode/logger": "1.7.22",
+    "@abtnode/router-templates": "1.7.22",
+    "@abtnode/util": "1.7.22",
     "axios": "^0.27.2",
     "debug": "^4.3.3",
     "find-process": "^1.4.3",
@@ -62,5 +62,5 @@
     "fs-extra": "^10.0.1",
     "needle": "^3.0.0"
   },
-  "gitHead": "73c02fe34d02270e59c5edfeedd7e2a878b772c4"
+  "gitHead": "6190972e62b5e6b1039aa71a291b3e2c521df367"
 }