@abtnode/router-provider 1.7.0 → 1.7.3

package/lib/default/daemon.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-continue */
 const url = require('url');
 const path = require('path');
 const fs = require('fs-extra');
@@ -73,26 +74,27 @@ const createRequestHandler = (id) => (req, res, target) => {
   }
   logger.debug('transform url', { url: req.url, rule });
 
+  // NOTE: x-* header keys must be lower case to avoid collisions from chained proxy
   if (rule.did) {
-    req.headers['X-Blocklet-Did'] = rule.did;
+    req.headers['x-blocklet-did'] = rule.did;
   }
   if (rule.realDid && rule.did !== rule.realDid) {
-    req.headers['X-Blocklet-Real-Did'] = rule.realDid;
+    req.headers['x-blocklet-real-did'] = rule.realDid;
   }
 
-  req.headers['X-Path-Prefix'] = rule.prefix.replace(WELLKNOWN_SERVICE_PATH_PREFIX, '') || '/';
-  req.headers['X-Group-Path-Prefix'] = rule.groupPrefix || '/';
+  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}`;
+    req.headers['x-blocklet-url'] = `http://127.0.0.1:${rule.port}`;
   }
 
   if (rule.ruleId) {
-    req.headers['X-Routing-Rule-Id'] = rule.ruleId;
+    req.headers['x-routing-rule-id'] = rule.ruleId;
   }
 
   if (rule.target && rule.target !== '/') {
-    req.headers['X-Routing-Rule-Path-Prefix'] = rule.target;
+    req.headers['x-routing-rule-path-prefix'] = rule.target;
   }
 };
 
@@ -243,18 +245,23 @@ const updateConfig = (reload = false) => {
 
     const addedDomains = newDomains.filter((x) => !oldDomains.includes(x));
     for (const domain of addedDomains) {
-      if (isSpecificDomain(domain)) {
-        logger.info('register domain on reload', { domain });
-        const site = sites.find((x) => x.domain === domain);
-        const [rule] = site.rules.filter((x) => ['daemon', 'blocklet'].includes(x.type));
-        const match = findCertificate(config.certs, site.domain);
-        main.register({
-          src: site.domain,
-          target: `http://127.0.0.1:${rule.port}`,
-          ssl: match ? { key: match.privateKey, cert: match.certificate } : null,
-          onRequest: createRequestHandler(rule.id),
-        });
+      if (isSpecificDomain(domain) === false) {
+        continue;
       }
+      const site = sites.find((x) => x.domain === domain);
+      const [rule] = site.rules.filter((x) => ['daemon', 'blocklet'].includes(x.type));
+      if (!rule) {
+        continue;
+      }
+
+      logger.info('register domain on reload', { domain });
+      const match = findCertificate(config.certs, site.domain);
+      main.register({
+        src: site.domain,
+        target: `http://127.0.0.1:${rule.port}`,
+        ssl: match ? { key: match.privateKey, cert: match.certificate } : null,
+        onRequest: createRequestHandler(rule.id),
+      });
     }
 
     const removedDomains = oldDomains.filter((x) => !newDomains.includes(x));
@@ -304,8 +311,11 @@ config.sites.forEach((site) => {
   }
 
   const [rule] = site.rules.filter((x) => ['daemon', 'blocklet'].includes(x.type));
-  const match = findCertificate(config.certs, domain);
+  if (!rule) {
+    return;
+  }
 
+  const match = findCertificate(config.certs, domain);
   logger.info('register domain on start', { domain });
   main.register({
     src: domain,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.7.0",
+  "version": "1.7.3",
   "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.7.0",
-    "@abtnode/logger": "1.7.0",
-    "@abtnode/router-templates": "1.7.0",
-    "@abtnode/util": "1.7.0",
+    "@abtnode/constant": "1.7.3",
+    "@abtnode/logger": "1.7.3",
+    "@abtnode/router-templates": "1.7.3",
+    "@abtnode/util": "1.7.3",
     "axios": "^0.25.0",
     "debug": "^4.3.3",
     "find-process": "^1.4.3",
@@ -62,5 +62,5 @@
     "fs-extra": "^10.0.0",
     "needle": "^3.0.0"
   },
-  "gitHead": "fc949a5e8a1017fbe17533d3bd78b166c7dad132"
+  "gitHead": "2b965b42a59a2d98642018749a6afb6e4014a698"
 }