@abtnode/router-provider 1.8.67-beta-794a8082 → 1.8.67

package/lib/nginx/index.js

@@ -79,14 +79,12 @@ const parseServerName = (domain) => {
 
 class NginxProvider extends BaseProvider {
   /**
-   * @param {object} options
-   * @param {string} options.configDir
-   * @param {number} options.httpPort
-   * @param {number} options.httpsPort
-   * @param {boolean} [options.cacheEnabled]
-   * @param {boolean} [options.isTest]
+   * @param {string} configDir
+   * @param {number} httpPort
+   * @param {number} httpPort
+   * @param {number} cacheDisabled
    */
-  constructor({ configDir, httpPort, httpsPort, cacheEnabled = true, isTest = false }) {
+  constructor({ configDir, httpPort, httpsPort, cacheDisabled, isTest }) {
     super('nginx');
     if (!configDir) {
       throw new Error('invalid configDir');
@@ -113,7 +111,7 @@ class NginxProvider extends BaseProvider {
 
     this.httpPort = decideHttpPort(httpPort);
     this.httpsPort = decideHttpsPort(httpsPort);
-    this.cacheEnabled = !!cacheEnabled;
+    this.cacheDisabled = !!cacheDisabled;
     this.isHttp2Supported = this._isHttp2Supported();
     this.conf = null; // nginx `conf` object
 
@@ -121,7 +119,7 @@ class NginxProvider extends BaseProvider {
       configDir,
       httpPort: this.httpPort,
       httpsPort: this.httpsPort,
-      cacheEnabled: this.cacheEnabled,
+      cacheDisabled: this.cacheDisabled,
     });
 
     // ensure directories
@@ -161,16 +159,11 @@ class NginxProvider extends BaseProvider {
     services = [],
     nodeInfo = {},
     requestLimit,
-    cacheEnabled,
   } = {}) {
     if (!Array.isArray(routingTable)) {
       throw new Error('routingTable must be an array');
     }
 
-    if (typeof cacheEnabled !== 'undefined') {
-      this.cacheEnabled = !!cacheEnabled;
-    }
-
     this._addWwwFiles(nodeInfo);
 
     // eslint-disable-next-line consistent-return
@@ -439,6 +432,12 @@ class NginxProvider extends BaseProvider {
    *     rewrite ^/flash/(.*) /$1  break;
    *     proxy_pass http://127.0.0.1:8090;
    * }
+   * @param {object} server
+   * @param {number} port
+   * @param {string} pathPrefix
+   * @param {string} pathSuffix
+   * @param {string} did app did
+   * @param {string} componentId component id
    */
   _addBlockletTypeLocation({
     server,
@@ -451,7 +450,6 @@ class NginxProvider extends BaseProvider {
     componentId,
     corsAllowedOrigins,
     target,
-    targetPrefix, // used to strip prefix from target
     ruleId,
     type,
     commonHeaders,
@@ -473,15 +471,14 @@ class NginxProvider extends BaseProvider {
     if (did) {
       location._add('set', `$did "${did}"`);
       location._add('proxy_set_header', `X-Blocklet-Did "${did}"`);
-      if (componentId) {
-        location._add('proxy_set_header', `X-Blocklet-Component-Id "${componentId}"`);
-      }
+      location._add('proxy_set_header', `X-Blocklet-Component-Id "${componentId}"`);
     }
 
     location._add('include', 'includes/proxy');
 
     // kill cache
-    if (this.cacheEnabled === false) {
+    // TODO: 这个放在管理端的 Gateway 配置中
+    if (this.cacheDisabled) {
       location._add('expires', '-1');
     } else if (ROUTER_CACHE_GROUPS[cacheGroup]) {
       location._add('proxy_cache', cacheGroup);
@@ -492,12 +489,9 @@ class NginxProvider extends BaseProvider {
     // Redirect blocklet traffic
     if (type === ROUTING_RULE_TYPES.BLOCKLET) {
       // FIXME: logic related to server gateway should not in provider
-      let rewritePathPrefix = prefix.replace(WELLKNOWN_SERVICE_PATH_PREFIX, '').replace(USER_AVATAR_PATH_PREFIX, '');
+      const rewritePathPrefix = prefix.replace(WELLKNOWN_SERVICE_PATH_PREFIX, '').replace(USER_AVATAR_PATH_PREFIX, '');
 
       // Add header
-      if (targetPrefix) {
-        rewritePathPrefix = rewritePathPrefix.replace(targetPrefix, '');
-      }
 
       location._add('proxy_set_header', `X-Path-Prefix "${rewritePathPrefix}"`);
       if (groupPrefix) {

package/lib/util.js

@@ -89,7 +89,6 @@ const formatRoutingTable = (routingTable, onRule) => {
         rule.cacheGroup = x.to.cacheGroup;
         rule.componentId = x.to.componentId;
         rule.target = trimEndSlash(normalizePathPrefix(x.to.target || '/'));
-        rule.targetPrefix = x.to.targetPrefix || '';
         rule.services = x.services || [];
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.8.67-beta-794a8082",
+  "version": "1.8.67",
   "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.8.67-beta-794a8082",
-    "@abtnode/logger": "1.8.67-beta-794a8082",
-    "@abtnode/router-templates": "1.8.67-beta-794a8082",
-    "@abtnode/util": "1.8.67-beta-794a8082",
+    "@abtnode/constant": "1.8.67",
+    "@abtnode/logger": "1.8.67",
+    "@abtnode/router-templates": "1.8.67",
+    "@abtnode/util": "1.8.67",
     "axios": "^0.27.2",
     "debug": "^4.3.4",
     "find-process": "^1.4.7",
@@ -62,5 +62,5 @@
     "fs-extra": "^10.1.0",
     "needle": "^3.1.0"
   },
-  "gitHead": "f4ad32bea4d80b12971fb6bef941bdbe2af6a834"
+  "gitHead": "543dbadffd29dc4f096261e136a2a306885d6508"
 }