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

package/lib/base.js

@@ -37,11 +37,13 @@ class BaseProvider {
     throw new Error('rotateLogs method is not implemented');
   }
 
-  searchCache() {
+  // eslint-disable-next-line no-unused-vars
+  searchCache(pattern, group) {
     throw new Error('searchCache method is not implemented');
   }
 
-  clearCache() {
+  // eslint-disable-next-line no-unused-vars
+  clearCache(group) {
     throw new Error('clearCache method is not implemented');
   }
 

package/lib/default/daemon.js

@@ -85,10 +85,6 @@ const createRequestHandler = (id) => (req, res, target) => {
   req.headers['x-path-prefix'] = rule.prefix.replace(WELLKNOWN_SERVICE_PATH_PREFIX, '') || '/';
   req.headers['x-group-path-prefix'] = rule.groupPrefix || '/';
 
-  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;
   }

package/lib/nginx/index.js

@@ -186,9 +186,10 @@ class NginxProvider extends BaseProvider {
         conf.on('flushed', () => resolve());
         conf.live(this.configPath);
 
-        const { sites, configs: siteCorsConfigs } = formatRoutingTable(routingTable);
+        const { sites, cacheGroups, configs: siteCorsConfigs } = formatRoutingTable(routingTable);
 
         this._addCorsMap(conf, siteCorsConfigs);
+        this._addCacheGroups(conf, cacheGroups);
         conf.nginx.http._add('server_tokens', 'off');
         this._addCommonResHeaders(conf.nginx.http, commonHeaders);
         this._addExposeServices(conf, services);
@@ -512,9 +513,9 @@ class NginxProvider extends BaseProvider {
     // kill cache
     if (this.cacheEnabled === false) {
       location._add('expires', '-1');
-    } else if (ROUTER_CACHE_GROUPS[cacheGroup]) {
+    } else if (cacheGroup) {
       location._add('proxy_cache', cacheGroup);
-      location._add('proxy_cache_valid', `200 ${ROUTER_CACHE_GROUPS[cacheGroup].period}`);
+      location._add('proxy_cache_valid', `200 ${ROUTER_CACHE_GROUPS.blockletProxy.period}`);
       location._add('include', 'includes/cache');
     }
 
@@ -533,7 +534,6 @@ class NginxProvider extends BaseProvider {
         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}"`);
       }
@@ -884,6 +884,17 @@ class NginxProvider extends BaseProvider {
     }
   }
 
+  _addCacheGroups(conf, cacheGroups) {
+    const cacheDir = this.getRelativeConfigDir(formatBackSlash(this.cacheDir));
+    cacheGroups.forEach((group) => {
+      const config = ROUTER_CACHE_GROUPS.blockletProxy;
+      conf.nginx.http._add(
+        'proxy_cache_path',
+        `${cacheDir}/${group} levels=1:2 keys_zone=${group}:${config.minSize} inactive=${config.period} max_size=${config.maxSize}`
+      );
+    });
+  }
+
   _addCorsMap(conf, siteCorsConfigs) {
     siteCorsConfigs.forEach((corsConfig) => {
       if (Array.isArray(corsConfig.corsAllowedOrigins) && corsConfig.corsAllowedOrigins.length > 0) {
@@ -942,8 +953,19 @@ class NginxProvider extends BaseProvider {
     return this.logDir;
   }
 
-  searchCache(pattern) {
-    const result = shelljs.exec(`grep -rl '^KEY:.*${pattern}' ${this.cacheDir}`, { silent: true });
+  /**
+   * Search cached files by group and pattern
+   * @param {string} pattern
+   * @param {string} group
+   * @returns {string[]} list of files cached match the pattern
+   */
+  searchCache(pattern, group = '') {
+    if (!pattern) {
+      return [];
+    }
+
+    const cacheDir = group ? path.join(this.cacheDir, group) : this.cacheDir;
+    const result = shelljs.exec(`grep -rl '^KEY:.*${pattern}' ${cacheDir}`, { silent: true });
     logger.info('search nginx cache', { pattern, result });
     if (result.stderr) {
       console.error('Failed to search nginx cache', result.stderr);
@@ -953,15 +975,18 @@ class NginxProvider extends BaseProvider {
     return result.stdout.split(os.EOL).filter(Boolean);
   }
 
-  clearCache() {
+  /**
+   * Clear cache by group, if group is empty, clear all cache
+   * @param {string} group
+   * @returns {string[]} cleared cache files
+   */
+  clearCache(group = '') {
     try {
-      return Object.keys(ROUTER_CACHE_GROUPS).map((key) => {
-        const cacheDir = path.join(this.cacheDir, key);
-        fs.rmSync(cacheDir, { recursive: true, force: true });
-        fs.ensureDirSync(cacheDir);
-        logger.info('nginx cache cleared', { key });
-        return cacheDir;
-      });
+      const cacheDir = group ? path.join(this.cacheDir, group) : this.cacheDir;
+      fs.rmSync(cacheDir, { recursive: true, force: true });
+      fs.ensureDirSync(cacheDir);
+      logger.info('nginx cache cleared', { group });
+      return [cacheDir];
     } catch (err) {
       console.error('Failed to clear nginx cache', err);
       return [];

package/lib/util.js

@@ -3,6 +3,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const getPort = require('get-port');
 const portUsed = require('port-used');
+const uniq = require('lodash/uniq');
 const sortBy = require('lodash/sortBy');
 const isValidDomain = require('is-valid-domain');
 const checkDomainMatch = require('@abtnode/util/lib/check-domain-match');
@@ -51,6 +52,7 @@ const concatPath = (prefix = '', suffix = '', root = false) => {
 
 const formatRoutingTable = (routingTable) => {
   const sites = {};
+  const cacheGroups = [];
   const configs = [];
 
   routingTable.forEach((site) => {
@@ -66,6 +68,7 @@ const formatRoutingTable = (routingTable) => {
     configs.push({ domain, corsAllowedOrigins });
 
     if (!sites[domain]) {
+      cacheGroups.push(site.blockletDid);
       sites[domain] = {
         domain,
         blockletDid: site.blockletDid,
@@ -102,7 +105,7 @@ const formatRoutingTable = (routingTable) => {
       } else {
         rule.port = +x.to.port;
         rule.did = x.to.did;
-        rule.cacheGroup = x.to.cacheGroup;
+        rule.cacheGroup = x.to.cacheGroup ? site.blockletDid || x.to.did : '';
         rule.componentId = x.to.componentId;
         rule.target = trimEndSlash(normalizePathPrefix(x.to.target || '/'));
         rule.targetPrefix = x.to.targetPrefix || '';
@@ -128,8 +131,9 @@ const formatRoutingTable = (routingTable) => {
     sites[domain].rules = rulesWithoutSuffix.concat(rulesWithSuffix);
   });
 
-  return { sites: Object.values(sites), configs };
+  return { sites: Object.values(sites), cacheGroups: uniq(cacheGroups).filter(Boolean), configs };
 };
+
 /**
  *
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.16.15-beta-e143b1cf",
+  "version": "1.16.15-beta-12f50442",
   "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-e143b1cf",
-    "@abtnode/logger": "1.16.15-beta-e143b1cf",
-    "@abtnode/router-templates": "1.16.15-beta-e143b1cf",
-    "@abtnode/util": "1.16.15-beta-e143b1cf",
+    "@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",
     "@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": "86dcc908f3cb7259d1ca92b9ae75160a6e43509a"
+  "gitHead": "48bda4b29eb31a70e0eb9cab0bce6e544960c7fd"
 }