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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -79,12 +79,14 @@ const parseServerName = (domain) => {
79
79
 
80
80
  class NginxProvider extends BaseProvider {
81
81
  /**
82
- * @param {string} configDir
83
- * @param {number} httpPort
84
- * @param {number} httpPort
85
- * @param {number} cacheDisabled
82
+ * @param {object} options
83
+ * @param {string} options.configDir
84
+ * @param {number} options.httpPort
85
+ * @param {number} options.httpsPort
86
+ * @param {boolean} [options.cacheEnabled]
87
+ * @param {boolean} [options.isTest]
86
88
  */
87
- constructor({ configDir, httpPort, httpsPort, cacheDisabled, isTest }) {
89
+ constructor({ configDir, httpPort, httpsPort, cacheEnabled = true, isTest = false }) {
88
90
  super('nginx');
89
91
  if (!configDir) {
90
92
  throw new Error('invalid configDir');
@@ -111,7 +113,7 @@ class NginxProvider extends BaseProvider {
111
113
 
112
114
  this.httpPort = decideHttpPort(httpPort);
113
115
  this.httpsPort = decideHttpsPort(httpsPort);
114
- this.cacheDisabled = !!cacheDisabled;
116
+ this.cacheEnabled = !!cacheEnabled;
115
117
  this.isHttp2Supported = this._isHttp2Supported();
116
118
  this.conf = null; // nginx `conf` object
117
119
 
@@ -119,7 +121,7 @@ class NginxProvider extends BaseProvider {
119
121
  configDir,
120
122
  httpPort: this.httpPort,
121
123
  httpsPort: this.httpsPort,
122
- cacheDisabled: this.cacheDisabled,
124
+ cacheEnabled: this.cacheEnabled,
123
125
  });
124
126
 
125
127
  // ensure directories
@@ -159,11 +161,16 @@ class NginxProvider extends BaseProvider {
159
161
  services = [],
160
162
  nodeInfo = {},
161
163
  requestLimit,
164
+ cacheEnabled,
162
165
  } = {}) {
163
166
  if (!Array.isArray(routingTable)) {
164
167
  throw new Error('routingTable must be an array');
165
168
  }
166
169
 
170
+ if (typeof cacheEnabled !== 'undefined') {
171
+ this.cacheEnabled = !!cacheEnabled;
172
+ }
173
+
167
174
  this._addWwwFiles(nodeInfo);
168
175
 
169
176
  // eslint-disable-next-line consistent-return
@@ -432,12 +439,6 @@ class NginxProvider extends BaseProvider {
432
439
  * rewrite ^/flash/(.*) /$1 break;
433
440
  * proxy_pass http://127.0.0.1:8090;
434
441
  * }
435
- * @param {object} server
436
- * @param {number} port
437
- * @param {string} pathPrefix
438
- * @param {string} pathSuffix
439
- * @param {string} did app did
440
- * @param {string} componentId component id
441
442
  */
442
443
  _addBlockletTypeLocation({
443
444
  server,
@@ -450,6 +451,7 @@ class NginxProvider extends BaseProvider {
450
451
  componentId,
451
452
  corsAllowedOrigins,
452
453
  target,
454
+ targetPrefix, // used to strip prefix from target
453
455
  ruleId,
454
456
  type,
455
457
  commonHeaders,
@@ -479,8 +481,7 @@ class NginxProvider extends BaseProvider {
479
481
  location._add('include', 'includes/proxy');
480
482
 
481
483
  // kill cache
482
- // TODO: 这个放在管理端的 Gateway 配置中
483
- if (this.cacheDisabled) {
484
+ if (this.cacheEnabled === false) {
484
485
  location._add('expires', '-1');
485
486
  } else if (ROUTER_CACHE_GROUPS[cacheGroup]) {
486
487
  location._add('proxy_cache', cacheGroup);
@@ -491,9 +492,12 @@ class NginxProvider extends BaseProvider {
491
492
  // Redirect blocklet traffic
492
493
  if (type === ROUTING_RULE_TYPES.BLOCKLET) {
493
494
  // FIXME: logic related to server gateway should not in provider
494
- const rewritePathPrefix = prefix.replace(WELLKNOWN_SERVICE_PATH_PREFIX, '').replace(USER_AVATAR_PATH_PREFIX, '');
495
+ let rewritePathPrefix = prefix.replace(WELLKNOWN_SERVICE_PATH_PREFIX, '').replace(USER_AVATAR_PATH_PREFIX, '');
495
496
 
496
497
  // Add header
498
+ if (targetPrefix) {
499
+ rewritePathPrefix = rewritePathPrefix.replace(targetPrefix, '');
500
+ }
497
501
 
498
502
  location._add('proxy_set_header', `X-Path-Prefix "${rewritePathPrefix}"`);
499
503
  if (groupPrefix) {
@@ -961,15 +965,12 @@ NginxProvider.check = async ({ configDir = '' } = {}) => {
961
965
  }
962
966
  }
963
967
 
964
- const tmpDir = path.join(
965
- os.tmpdir(),
966
- `test_nginx_provider-${Date.now()}-${Math.ceil(Math.random() * 10000)}`,
967
- CONFIG_FOLDER_NAME
968
- );
968
+ const testDir = path.join(os.tmpdir(), `test_nginx_provider-${Date.now()}-${Math.ceil(Math.random() * 10000)}`);
969
969
  try {
970
- fs.mkdirSync(tmpDir, { recursive: true });
970
+ const tempConfDir = path.join(testDir, CONFIG_FOLDER_NAME);
971
+ fs.mkdirSync(tempConfDir, { recursive: true });
971
972
 
972
- const provider = new NginxProvider({ configDir: tmpDir, isTest: true });
973
+ const provider = new NginxProvider({ configDir: tempConfDir, isTest: true });
973
974
  provider.initialize();
974
975
 
975
976
  logger.info('check:addTestServer', { configPath: provider.configPath });
@@ -999,7 +1000,9 @@ NginxProvider.check = async ({ configDir = '' } = {}) => {
999
1000
  logger.error('check nginx failed', { error });
1000
1001
  return result;
1001
1002
  } finally {
1002
- fs.rmSync(tmpDir, { recursive: true, force: true });
1003
+ if (fs.existsSync(testDir)) {
1004
+ fs.rmSync(testDir, { recursive: true, force: true });
1005
+ }
1003
1006
  }
1004
1007
  };
1005
1008
 
package/lib/util.js CHANGED
@@ -89,6 +89,7 @@ const formatRoutingTable = (routingTable, onRule) => {
89
89
  rule.cacheGroup = x.to.cacheGroup;
90
90
  rule.componentId = x.to.componentId;
91
91
  rule.target = trimEndSlash(normalizePathPrefix(x.to.target || '/'));
92
+ rule.targetPrefix = x.to.targetPrefix || '';
92
93
  rule.services = x.services || [];
93
94
  }
94
95
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abtnode/router-provider",
3
- "version": "1.8.67-beta-f8b4c9ec",
3
+ "version": "1.8.67-beta-794a8082",
4
4
  "description": "Routing engine implementations for abt node",
5
5
  "author": "polunzh <polunzh@gmail.com>",
6
6
  "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,10 +32,10 @@
32
32
  "url": "https://github.com/ArcBlock/blocklet-server/issues"
33
33
  },
34
34
  "dependencies": {
35
- "@abtnode/constant": "1.8.67-beta-f8b4c9ec",
36
- "@abtnode/logger": "1.8.67-beta-f8b4c9ec",
37
- "@abtnode/router-templates": "1.8.67-beta-f8b4c9ec",
38
- "@abtnode/util": "1.8.67-beta-f8b4c9ec",
35
+ "@abtnode/constant": "1.8.67-beta-794a8082",
36
+ "@abtnode/logger": "1.8.67-beta-794a8082",
37
+ "@abtnode/router-templates": "1.8.67-beta-794a8082",
38
+ "@abtnode/util": "1.8.67-beta-794a8082",
39
39
  "axios": "^0.27.2",
40
40
  "debug": "^4.3.4",
41
41
  "find-process": "^1.4.7",
@@ -62,5 +62,5 @@
62
62
  "fs-extra": "^10.1.0",
63
63
  "needle": "^3.1.0"
64
64
  },
65
- "gitHead": "ebf19fcbc6d99fff0d214dc0680c4df81aa94d6d"
65
+ "gitHead": "f4ad32bea4d80b12971fb6bef941bdbe2af6a834"
66
66
  }