@abtnode/router-provider 1.16.15-beta-12f50442 → 1.16.15-beta-d649cecc

package/lib/nginx/index.js

@@ -468,7 +468,6 @@ class NginxProvider extends BaseProvider {
    */
   _addBlockletTypeLocation({
     server,
-    serverName,
     port,
     root,
     prefix,
@@ -490,7 +489,7 @@ class NginxProvider extends BaseProvider {
     const location = this._getLastLocation(server);
 
     // Note: 下面这段代码比较 tricky，不要在这段代码之前添加任何 add_header, proxy_set_header, proxy_hide_header 的语句，否则 nginx 配置可能无法按预期工作
-    this._addCors({ location, corsAllowedOrigins, serverName });
+    this._addCors({ location, corsAllowedOrigins });
 
     this._addCommonResHeaders(location, commonHeaders);
     if (!cacheGroup && !suffix) {
@@ -558,12 +557,12 @@ class NginxProvider extends BaseProvider {
     location._add('proxy_pass', `http://${getUpstreamName(port)}`);
   }
 
-  _addRedirectTypeLocation({ server, url, redirectCode, prefix, suffix, corsAllowedOrigins, serverName }) {
+  _addRedirectTypeLocation({ server, url, redirectCode, prefix, suffix, corsAllowedOrigins }) {
     const cleanUrl = trimEndSlash(url);
     server._add('location', `${concatPath(prefix, suffix)}`);
     const location = this._getLastLocation(server);
 
-    this._addCors({ location, corsAllowedOrigins, serverName });
+    this._addCors({ location, corsAllowedOrigins });
 
     location._add('set $abt_query_string', '""');
     location._addVerbatimBlock('if ($query_string)', 'set $abt_query_string "?$query_string";');
@@ -581,10 +580,10 @@ class NginxProvider extends BaseProvider {
     }
   }
 
-  _addRewriteTypeLocation({ server, url, prefix, suffix, corsAllowedOrigins, serverName }) {
+  _addRewriteTypeLocation({ server, url, prefix, suffix, corsAllowedOrigins }) {
     server._add('location', concatPath(prefix, suffix));
     const location = this._getLastLocation(server);
-    this._addCors({ location, corsAllowedOrigins, serverName });
+    this._addCors({ location, corsAllowedOrigins });
     location._add('rewrite', `^${prefix}(.*) ${url}$1 last`);
   }
 
@@ -916,14 +915,14 @@ class NginxProvider extends BaseProvider {
     });
   }
 
-  _addCors({ location, corsAllowedOrigins, serverName }) {
+  _addCors({ location, corsAllowedOrigins }) {
     if (!isEmpty(corsAllowedOrigins)) {
       if (corsAllowedOrigins.includes(DOMAIN_FOR_DEFAULT_SITE)) {
         location._add('include', 'includes/cors-loose');
         location._add('include', 'includes/security');
       } else {
         // TODO: @zhanghan 此处是否需要变更默认的值，如果在逻辑代码中有指定的 Access-Control-Allow-Origin，则应该优先遵守逻辑代码中的配置
-        location._add('add_header', `Access-Control-Allow-Origin $allow_origin_${md5(serverName)} always`);
+        // location._add('add_header', `Access-Control-Allow-Origin $allow_origin_${md5(serverName)} always`); // TODO: zhenqiang 下面去掉了 OPTIONS 请求逻辑，这里也不应该处理 Access-Control-Allow-Origin
         location._add('include', 'includes/cors-strict');
         location._add('include', 'includes/security');
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.16.15-beta-12f50442",
+  "version": "1.16.15-beta-d649cecc",
   "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.16.15-beta-12f50442",
-    "@abtnode/logger": "1.16.15-beta-12f50442",
-    "@abtnode/router-templates": "1.16.15-beta-12f50442",
-    "@abtnode/util": "1.16.15-beta-12f50442",
+    "@abtnode/constant": "1.16.15-beta-d649cecc",
+    "@abtnode/logger": "1.16.15-beta-d649cecc",
+    "@abtnode/router-templates": "1.16.15-beta-d649cecc",
+    "@abtnode/util": "1.16.15-beta-d649cecc",
     "@arcblock/http-proxy": "^1.19.1",
     "axios": "^0.27.2",
     "debug": "^4.3.4",
@@ -59,5 +59,5 @@
     "bluebird": "^3.7.2",
     "fs-extra": "^10.1.0"
   },
-  "gitHead": "48bda4b29eb31a70e0eb9cab0bce6e544960c7fd"
+  "gitHead": "56941d1056a9e5f189992ace6e93971aa4226d07"
 }