@abtnode/router-provider 1.6.25 → 1.6.28

package/lib/default/daemon.js

@@ -4,7 +4,11 @@ const fs = require('fs-extra');
 const get = require('lodash/get');
 const joinUrl = require('url-join');
 const checkDomainMatch = require('@abtnode/util/lib/check-domain-match');
-const { DEFAULT_IP_DNS_DOMAIN_SUFFIX, ROUTING_RULE_TYPES } = require('@abtnode/constant');
+const {
+  DEFAULT_IP_DNS_DOMAIN_SUFFIX,
+  ROUTING_RULE_TYPES,
+  WELLKNOWN_SERVICE_PATH_PREFIX,
+} = require('@abtnode/constant');
 
 const logger = require('@abtnode/logger')('router:default:daemon', { filename: 'engine' });
 
@@ -61,10 +65,13 @@ const createRequestHandler = (id) => (req, res, target) => {
     }
   }
 
+  // FIXME logic related to server gateway should not in provider
+  const rewritePathPrefix = rule.prefix.replace(WELLKNOWN_SERVICE_PATH_PREFIX, '') || '/';
+
   if (rule.type === ROUTING_RULE_TYPES.GENERAL_PROXY) {
     // we do not need rewrite for internal servers
   } else {
-    req.url = joinUrl(rule.target, req.url.substr(rule.prefix.length));
+    req.url = req.url.substr(rewritePathPrefix.length);
   }
 
   if (req.url.startsWith('/') === false) {
@@ -79,16 +86,20 @@ const createRequestHandler = (id) => (req, res, target) => {
     req.headers['X-Blocklet-Real-Did'] = rule.realDid;
   }
 
-  req.headers['X-Path-Prefix'] = rule.prefix;
+  req.headers['X-Path-Prefix'] = rewritePathPrefix;
   req.headers['X-Group-Path-Prefix'] = rule.groupPrefix || '/';
 
-  if (rule.services.length) {
+  if (rule.type === ROUTING_RULE_TYPES.BLOCKLET) {
     req.headers['X-Blocklet-Url'] = `http://127.0.0.1:${rule.port}`;
   }
 
   if (rule.ruleId) {
     req.headers['X-Routing-Rule-Id'] = rule.ruleId;
   }
+
+  if (rule.target && rule.target !== '/') {
+    req.headers['X-Routing-Rule-Path-Prefix'] = rule.target;
+  }
 };
 
 // eslint-disable-next-line
@@ -116,7 +127,7 @@ const sharedResolver = (host, url, req) => {
   }
 
   const match = findCertificate(config.certs, domain);
-  const upstream = `http://127.0.0.1:${rule.services.length ? servicePort : rule.port}`;
+  const upstream = `http://127.0.0.1:${rule.type === ROUTING_RULE_TYPES.BLOCKLET ? servicePort : rule.port}`;
   logger.debug('resolved request', { host, url, domain, upstream, rule });
 
   return {

package/lib/nginx/index.js

@@ -16,7 +16,7 @@ const {
   CONFIG_FOLDER_NAME,
   DEFAULT_ADMIN_PATH,
   SLOT_FOR_IP_DNS_SITE,
-  WELLKNOWN_AUTH_PATH_PREFIX,
+  WELLKNOWN_SERVICE_PATH_PREFIX,
 } = require('@abtnode/constant');
 const md5 = require('@abtnode/util/lib/md5');
 
@@ -51,7 +51,7 @@ const {
 const REQUIRED_MODULES = [{ configName: 'with-stream', moduleBinaryName: 'ngx_stream_module.so' }];
 
 // TODO: move the did-auth-path-prefix to a constant
-const DID_AUTH_PATH_PREFIX = `${DEFAULT_ADMIN_PATH}/api/did`;
+const ADMIN_DID_AUTH_PATH_PREFIX = `${DEFAULT_ADMIN_PATH}/api/did`;
 
 // convert wildcard domain and ipDnsDomain template to regex
 const parseServerName = (domain) => {
@@ -154,7 +154,7 @@ class NginxProvider extends BaseProvider {
           // TODO: this is really hacky, and should be abstracted out
           if (rule.type === ROUTING_RULE_TYPES.DAEMON && rule.prefix === DEFAULT_ADMIN_PATH) {
             const clonedRule = cloneDeep(rule);
-            clonedRule.prefix = DID_AUTH_PATH_PREFIX;
+            clonedRule.prefix = ADMIN_DID_AUTH_PATH_PREFIX;
             rules.push(clonedRule);
           }
         });
@@ -318,7 +318,9 @@ class NginxProvider extends BaseProvider {
     return parseNginxConfigArgs(result.stderr);
   }
 
-  _addReverseProxy({ type, ...args }) {
+  _addReverseProxy(args) {
+    const { type } = args;
+
     if (type === ROUTING_RULE_TYPES.REDIRECT) {
       this._addRedirectTypeLocation(args);
       return;
@@ -370,13 +372,12 @@ class NginxProvider extends BaseProvider {
     corsAllowedOrigins,
     target,
     ruleId,
-    services = [],
+    type,
   }) {
     server._add('location', concatPath(prefix, suffix));
 
     const location = this._getLastLocation(server);
-    const isDidAuthPath = prefix === DID_AUTH_PATH_PREFIX;
-    const rewritePathPrefix = isDidAuthPath ? DEFAULT_ADMIN_PATH : prefix;
+    const isDidAuthPath = prefix === ADMIN_DID_AUTH_PATH_PREFIX;
 
     // Note: 下面这段代码比较 tricky，不要在这段代码之前添加任何 add_header, proxy_set_header, proxy_hide_header 的语句，否则 nginx 配置可能无法按预期工作
     if (!isEmpty(corsAllowedOrigins)) {
@@ -410,14 +411,19 @@ class NginxProvider extends BaseProvider {
     }
 
     location._add('include', 'includes/proxy');
-    location._add('proxy_set_header', `X-Path-Prefix "${rewritePathPrefix}"`);
-    if (groupPrefix) {
-      location._add('proxy_set_header', `X-Group-Path-Prefix "${groupPrefix}"`);
-    }
 
-    // Redirect traffic to service process
-    if (services.length > 0) {
+    // Redirect blocklet traffic
+    if (type === ROUTING_RULE_TYPES.BLOCKLET) {
+      // FIXME logic related to server gateway should not in provider
+      const rewritePathPrefix = prefix.replace(WELLKNOWN_SERVICE_PATH_PREFIX, '') || '/';
+
       // Add header
+
+      location._add('proxy_set_header', `X-Path-Prefix "${rewritePathPrefix}"`);
+      if (groupPrefix) {
+        location._add('proxy_set_header', `X-Group-Path-Prefix "${groupPrefix}"`);
+      }
+
       location._add('proxy_set_header', `X-Blocklet-Url "http://127.0.0.1:${port}"`);
       if (ruleId) {
         location._add('proxy_set_header', `X-Routing-Rule-Id "${ruleId}"`);
@@ -428,21 +434,19 @@ class NginxProvider extends BaseProvider {
       }
 
       // Rewrite path
-      const rewrite = target === WELLKNOWN_AUTH_PATH_PREFIX ? `${target}/`.replace(/\/\//g, '/') : '/';
-      location._add('rewrite', `^${rewritePathPrefix}/?(.*) ${rewrite}$1  break`);
-
+      location._add('rewrite', `^${rewritePathPrefix}/?(.*) /$1  break`);
       location._add('proxy_pass', `http://127.0.0.1:${process.env.ABT_NODE_SERVICE_PORT}`);
 
       return;
     }
 
-    // Redirect traffic to blocklet process
-
-    // Rewrite path
+    // Redirect daemon traffic
+    const rewritePathPrefix = isDidAuthPath ? DEFAULT_ADMIN_PATH : prefix;
+    location._add('proxy_set_header', `X-Path-Prefix "${rewritePathPrefix}"`);
     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}`);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.6.25",
+  "version": "1.6.28",
   "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.6.25",
-    "@abtnode/logger": "1.6.25",
-    "@abtnode/router-templates": "1.6.25",
-    "@abtnode/util": "1.6.25",
+    "@abtnode/constant": "1.6.28",
+    "@abtnode/logger": "1.6.28",
+    "@abtnode/router-templates": "1.6.28",
+    "@abtnode/util": "1.6.28",
     "axios": "^0.25.0",
     "debug": "^4.3.3",
     "find-process": "^1.4.3",
@@ -61,5 +61,5 @@
     "fs-extra": "^10.0.0",
     "needle": "^3.0.0"
   },
-  "gitHead": "bd2ad7d90fbd1b3786702dfca1ab28dcec9a7bc7"
+  "gitHead": "acef8ea339bd8fc9c785312eb5a1a113ecbf0d4d"
 }