@abtnode/router-provider 1.8.68 → 1.8.69-beta-e0666d0d

package/lib/nginx/index.js

@@ -79,12 +79,14 @@ const parseServerName = (domain) => {
 
 class NginxProvider extends BaseProvider {
   /**
-   * @param {string} configDir
-   * @param {number} httpPort
-   * @param {number} httpPort
-   * @param {number} cacheDisabled
+   * @param {object} options
+   * @param {string} options.configDir
+   * @param {number} options.httpPort
+   * @param {number} options.httpsPort
+   * @param {boolean} [options.cacheEnabled]
+   * @param {boolean} [options.isTest]
    */
-  constructor({ configDir, httpPort, httpsPort, cacheDisabled, isTest }) {
+  constructor({ configDir, httpPort, httpsPort, cacheEnabled = true, isTest = false }) {
     super('nginx');
     if (!configDir) {
       throw new Error('invalid configDir');
@@ -111,7 +113,7 @@ class NginxProvider extends BaseProvider {
 
     this.httpPort = decideHttpPort(httpPort);
     this.httpsPort = decideHttpsPort(httpsPort);
-    this.cacheDisabled = !!cacheDisabled;
+    this.cacheEnabled = !!cacheEnabled;
     this.isHttp2Supported = this._isHttp2Supported();
     this.conf = null; // nginx `conf` object
 
@@ -119,7 +121,7 @@ class NginxProvider extends BaseProvider {
       configDir,
       httpPort: this.httpPort,
       httpsPort: this.httpsPort,
-      cacheDisabled: this.cacheDisabled,
+      cacheEnabled: this.cacheEnabled,
     });
 
     // ensure directories
@@ -159,11 +161,16 @@ 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
@@ -432,12 +439,6 @@ 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,
@@ -450,6 +451,7 @@ class NginxProvider extends BaseProvider {
     componentId,
     corsAllowedOrigins,
     target,
+    targetPrefix, // used to strip prefix from target
     ruleId,
     type,
     commonHeaders,
@@ -471,14 +473,15 @@ class NginxProvider extends BaseProvider {
     if (did) {
       location._add('set', `$did "${did}"`);
       location._add('proxy_set_header', `X-Blocklet-Did "${did}"`);
-      location._add('proxy_set_header', `X-Blocklet-Component-Id "${componentId}"`);
+      if (componentId) {
+        location._add('proxy_set_header', `X-Blocklet-Component-Id "${componentId}"`);
+      }
     }
 
     location._add('include', 'includes/proxy');
 
     // kill cache
-    // TODO: 这个放在管理端的 Gateway 配置中
-    if (this.cacheDisabled) {
+    if (this.cacheEnabled === false) {
       location._add('expires', '-1');
     } else if (ROUTER_CACHE_GROUPS[cacheGroup]) {
       location._add('proxy_cache', cacheGroup);
@@ -489,9 +492,12 @@ class NginxProvider extends BaseProvider {
     // 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, '').replace(USER_AVATAR_PATH_PREFIX, '');
+      let 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

@@ -55,7 +55,11 @@ const formatRoutingTable = (routingTable, onRule) => {
       domain = '_';
     }
 
-    configs.push({ domain, corsAllowedOrigins: site.corsAllowedOrigins });
+    let corsAllowedOrigins = Array.isArray(site.corsAllowedOrigins) ? site.corsAllowedOrigins : [];
+    if (corsAllowedOrigins.includes('*')) {
+      corsAllowedOrigins = ['*'];
+    }
+    configs.push({ domain, corsAllowedOrigins });
 
     if (!sites[domain]) {
       sites[domain] = {
@@ -89,6 +93,7 @@ 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.68",
+  "version": "1.8.69-beta-e0666d0d",
   "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.68",
-    "@abtnode/logger": "1.8.68",
-    "@abtnode/router-templates": "1.8.68",
-    "@abtnode/util": "1.8.68",
+    "@abtnode/constant": "1.8.69-beta-e0666d0d",
+    "@abtnode/logger": "1.8.69-beta-e0666d0d",
+    "@abtnode/router-templates": "1.8.69-beta-e0666d0d",
+    "@abtnode/util": "1.8.69-beta-e0666d0d",
     "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": "1392044ac5677bde567797adeb9a6d3f0b9264b8"
+  "gitHead": "acf0373591eaa3aff76483edc4e648afc543f1f7"
 }