@abtnode/core 1.8.67-beta-f8b4c9ec → 1.8.67-beta-794a8082

package/lib/router/helper.js

@@ -26,7 +26,6 @@ const {
   NAME_FOR_WELLKNOWN_SITE,
   DEFAULT_HTTP_PORT,
   DEFAULT_HTTPS_PORT,
-  NODE_MODES,
   ROUTING_RULE_TYPES,
   CERTIFICATE_EXPIRES_OFFSET,
   DEFAULT_SERVICE_PATH,
@@ -56,6 +55,7 @@ const {
   findInterfacePortByName,
   getWellknownSitePort,
   getServerDidDomain,
+  isGatewayCacheEnabled,
 } = require('../util');
 const { getIpDnsDomainForBlocklet, getDidDomainForBlocklet } = require('../util/get-domain-for-blocklet');
 const { getFromCache: getAccessibleExternalNodeIp } = require('../util/get-accessible-external-node-ip');
@@ -382,7 +382,7 @@ const ensureBlockletCache = async (sites = [], blocklets) => {
             const clone = cloneDeep(rule);
             clone.from.pathPrefix = joinUrl(rule.from.pathPrefix, cachePrefix);
             clone.to.cacheGroup = 'blockletProxy';
-            clone.to.target = cachePrefix;
+            clone.to.targetPrefix = cachePrefix;
             clone.dynamic = true; // mark as dynamic to avoid redundant generated rules
             cacheRules.push(clone);
           });
@@ -1115,7 +1115,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
           configDir: path.join(dataDirs.router, providerName),
           httpPort: nodeInfo.routing.httpPort || DEFAULT_HTTP_PORT,
           httpsPort: nodeInfo.routing.httpsPort || DEFAULT_HTTPS_PORT,
-          cacheDisabled: nodeInfo.mode === NODE_MODES.DEBUG,
+          cacheEnabled: isGatewayCacheEnabled(nodeInfo),
         }),
         getRoutingParams: async () => {
           try {
@@ -1220,7 +1220,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
             configDir: path.join(dataDirs.router, info.routing.provider),
             httpPort: info.routing.httpPort || DEFAULT_HTTP_PORT,
             httpsPort: info.routing.httpsPort || DEFAULT_HTTPS_PORT,
-            cacheDisabled: info.mode === NODE_MODES.DEBUG,
+            cacheEnabled: isGatewayCacheEnabled(info),
           });
           await providerInstance.stop();
           logger.info('original router stopped:', { provider: info.routing.provider });
@@ -1408,6 +1408,8 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     deleteRoutingRule,
     addDomainAlias,
     deleteDomainAlias,
+
+    isGatewayCacheEnabled,
   };
 };
 

package/lib/router/index.js

@@ -11,8 +11,11 @@ const {
   GATEWAY_REQ_LIMIT,
 } = require('@abtnode/constant');
 const { BLOCKLET_UI_INTERFACES, BLOCKLET_MODES } = require('@blocklet/constant');
+
 const logger = require('@abtnode/logger')('@abtnode/core:router');
 
+const { isGatewayCacheEnabled } = require('../util');
+
 const expandSites = (sites = []) => {
   const result = [];
 
@@ -117,6 +120,7 @@ class Router {
       services,
       nodeInfo: pick(nodeInfo, ['name', 'version', 'port', 'mode', 'enableWelcomePage', 'routing']),
       requestLimit,
+      cacheEnabled: isGatewayCacheEnabled(nodeInfo),
     });
   }
 

package/lib/router/manager.js

@@ -559,8 +559,8 @@ class RouterManager extends EventEmitter {
       await tempRouter.validateConfig();
       await fse.remove(tmpDir);
     } catch (error) {
+      // 如果出错，保留 Nginx 配置文件，方便定位问题
       logger.error('validate router config failed', { error, action, data });
-      await fse.remove(tmpDir);
       throw error;
     }
   }

package/lib/states/audit-log.js

@@ -239,9 +239,11 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'deleteRoutingRule':
       return `deleted routing rule from ${site}`; // prettier-ignore
     case 'updateGateway': {
-      let message = args.requestLimit.enabled ? `status: enabled, rate: ${args.requestLimit.rate}` : 'status: disabled';
-      message = `update gateway. ${message}`;
-
+      const changes = [
+        args.requestLimit.enabled ? `rate limit: enabled, rate: ${args.requestLimit.rate}` : 'rate limit: disabled',
+        args.cacheEnabled ? `global cache: enabled, rate: ${args.cacheEnabled}` : 'global cache: disabled',
+      ];
+      const message = `update gateway: ${changes.join('; ')}`;
       return message;
     }
     case 'createTransferInvitation':

package/lib/states/node.js

@@ -310,7 +310,10 @@ class NodeState extends BaseState {
   }
 
   async updateGateway(gateway) {
-    const [, nodeInfo] = await this.update({}, { $set: { 'routing.requestLimit': gateway.requestLimit } });
+    const [, nodeInfo] = await this.update(
+      {},
+      { $set: { 'routing.requestLimit': gateway.requestLimit, 'routing.cacheEnabled': gateway.cacheEnabled } }
+    );
 
     this.emit(EVENTS.RELOAD_GATEWAY, nodeInfo);
 

package/lib/util/blocklet.js

@@ -94,6 +94,7 @@ const {
   validateBlockletMeta,
   prettyURL,
   getNFTState,
+  templateReplace,
 } = require('./index');
 
 const getComponentConfig = (meta) => meta.components || meta.children;
@@ -240,12 +241,12 @@ const getComponentDirs = (
 const fillBlockletConfigs = (blocklet, configs) => {
   blocklet.configs = configs || [];
   blocklet.configObj = blocklet.configs.reduce((acc, x) => {
-    acc[x.key] = x.value;
+    acc[x.key] = templateReplace(x.value, blocklet);
     return acc;
   }, {});
   blocklet.environments = blocklet.environments || [];
   blocklet.environmentObj = blocklet.environments.reduce((acc, x) => {
-    acc[x.key] = x.value;
+    acc[x.key] = templateReplace(x.value, blocklet);
     return acc;
   }, {});
 };

package/lib/util/index.js

@@ -27,6 +27,7 @@ const {
   DEFAULT_HTTP_PORT,
   DEFAULT_HTTPS_PORT,
   SLOT_FOR_IP_DNS_SITE,
+  NODE_MODES,
 } = require('@abtnode/constant');
 
 const DEFAULT_WELLKNOWN_PORT = 8088;
@@ -452,6 +453,27 @@ const prettyURL = (url, isHttps = true) => {
   return isHttps ? `https://${url}` : `http://${url}`;
 };
 
+const templateReplace = (str, vars = {}) => {
+  if (typeof str === 'string') {
+    return str.replace(/{([.\w]+)}/g, (m, key) => get(vars, key));
+  }
+
+  return str;
+};
+
+const isGatewayCacheEnabled = (info) => {
+  if (info.mode === NODE_MODES.DEBUG) {
+    return false;
+  }
+
+  const cacheEnabled = get(info, 'routing.cacheEnabled');
+  if (typeof cacheEnabled === 'boolean') {
+    return cacheEnabled;
+  }
+
+  return true;
+};
+
 const lib = {
   validateOwner,
   getProviderFromNodeInfo,
@@ -489,6 +511,8 @@ const lib = {
   getNFTState,
   getServerDidDomain,
   prettyURL,
+  templateReplace,
+  isGatewayCacheEnabled,
 };
 
 module.exports = lib;

package/lib/validators/node.js

@@ -52,6 +52,7 @@ const updateGatewaySchema = Joi.object({
       .when('requestLimit.enabled', { is: true, then: Joi.required() }),
     ipHeader: Joi.string().allow('').trim(),
   }),
+  cacheEnabled: Joi.bool().optional().default(true),
 });
 
 module.exports = {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.67-beta-f8b4c9ec",
+  "version": "1.8.67-beta-794a8082",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.67-beta-f8b4c9ec",
-    "@abtnode/certificate-manager": "1.8.67-beta-f8b4c9ec",
-    "@abtnode/constant": "1.8.67-beta-f8b4c9ec",
-    "@abtnode/cron": "1.8.67-beta-f8b4c9ec",
-    "@abtnode/db": "1.8.67-beta-f8b4c9ec",
-    "@abtnode/logger": "1.8.67-beta-f8b4c9ec",
-    "@abtnode/queue": "1.8.67-beta-f8b4c9ec",
-    "@abtnode/rbac": "1.8.67-beta-f8b4c9ec",
-    "@abtnode/router-provider": "1.8.67-beta-f8b4c9ec",
-    "@abtnode/static-server": "1.8.67-beta-f8b4c9ec",
-    "@abtnode/timemachine": "1.8.67-beta-f8b4c9ec",
-    "@abtnode/util": "1.8.67-beta-f8b4c9ec",
+    "@abtnode/auth": "1.8.67-beta-794a8082",
+    "@abtnode/certificate-manager": "1.8.67-beta-794a8082",
+    "@abtnode/constant": "1.8.67-beta-794a8082",
+    "@abtnode/cron": "1.8.67-beta-794a8082",
+    "@abtnode/db": "1.8.67-beta-794a8082",
+    "@abtnode/logger": "1.8.67-beta-794a8082",
+    "@abtnode/queue": "1.8.67-beta-794a8082",
+    "@abtnode/rbac": "1.8.67-beta-794a8082",
+    "@abtnode/router-provider": "1.8.67-beta-794a8082",
+    "@abtnode/static-server": "1.8.67-beta-794a8082",
+    "@abtnode/timemachine": "1.8.67-beta-794a8082",
+    "@abtnode/util": "1.8.67-beta-794a8082",
     "@arcblock/did": "1.18.54",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.54",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.54",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.54",
-    "@blocklet/constant": "1.8.67-beta-f8b4c9ec",
-    "@blocklet/meta": "1.8.67-beta-f8b4c9ec",
-    "@blocklet/sdk": "1.8.67-beta-f8b4c9ec",
+    "@blocklet/constant": "1.8.67-beta-794a8082",
+    "@blocklet/meta": "1.8.67-beta-794a8082",
+    "@blocklet/sdk": "1.8.67-beta-794a8082",
     "@did-space/client": "^0.1.76",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.54",
@@ -89,5 +89,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "ebf19fcbc6d99fff0d214dc0680c4df81aa94d6d"
+  "gitHead": "f4ad32bea4d80b12971fb6bef941bdbe2af6a834"
 }