@abtnode/router-provider 1.16.21-beta-bd0e2503 → 1.16.21-beta-445a8baa

package/lib/default/daemon.js

@@ -82,6 +82,9 @@ const createRequestHandler = (id) => (req, res, target) => {
   if (rule.componentId) {
     req.headers['x-blocklet-component-id'] = rule.componentId;
   }
+  if (rule.pageGroup) {
+    req.headers['x-page-group'] = rule.pageGroup;
+  }
 
   req.headers['x-path-prefix'] = rule.prefix.replace(WELLKNOWN_SERVICE_PATH_PREFIX, '') || '/';
   req.headers['x-group-path-prefix'] = rule.groupPrefix || '/';
@@ -120,12 +123,12 @@ const sharedResolver = (host, url, req) => {
   }
 
   const match = findCertificate(config.certs, domain);
-  const upstream = `http://127.0.0.1:${rule.type === ROUTING_RULE_TYPES.BLOCKLET ? servicePort : rule.port}`;
+  const upstream = `http://127.0.0.1:${rule.type === ROUTING_RULE_TYPES.BLOCKLET ? servicePort : rule.port || servicePort}`; // prettier-ignore
   logger.debug('resolved request', { host, url, domain, upstream, rule });
 
   return {
     id: rule.id,
-    url: upstream,
+    url: rule.targetPrefix && rule.targetPrefix !== '/' ? joinUrl(upstream, rule.targetPrefix) : upstream,
     path: '/',
     opts: {
       ssl: match ? { key: match.privateKey, cert: match.certificate } : null,
@@ -252,6 +255,10 @@ const updateConfig = (reload = false) => {
       if (!rule) {
         continue;
       }
+      if (!rule.port) {
+        logger.warn('No port found for rule', rule);
+        return;
+      }
 
       logger.info('register domain on reload', { domain });
       const match = findCertificate(config.certs, site.domain);
@@ -316,6 +323,10 @@ config.sites.forEach((site) => {
   if (!rule) {
     return;
   }
+  if (!rule.port) {
+    logger.warn('No port found for rule', rule);
+    return;
+  }
 
   const match = findCertificate(config.certs, domain);
   logger.info('register domain on start', { domain });

package/lib/default/proxy.js

@@ -471,12 +471,12 @@ module.exports = class ReverseProxy {
       if (route.opts && route.opts.onRequest) {
         const resultFromRequestHandler = route.opts.onRequest(req, res, target);
         if (resultFromRequestHandler !== undefined) {
-          logger.info('proxy %s received result from onRequest handler, returning.', src + url);
+          logger.info('proxy returned result from onRequest handler', { from: src + url });
           return resultFromRequestHandler;
         }
       }
 
-      logger.info('proxy: %s => %s', src + url, path.posix.join(target.host, req.url));
+      logger.info('proxy', { from: src + url, to: path.posix.join(target.host, req.url) });
 
       return target;
     });

package/lib/util.js

@@ -164,7 +164,8 @@ const findRule = (rules, url) =>
   rules.find((x) => {
     const { prefix, suffix = '' } = x;
     if (suffix) {
-      return url.startsWith(prefix) && url.endsWith(suffix);
+      const regex = new RegExp(`${suffix}$`);
+      return url.startsWith(prefix) && regex.test(url);
     }
 
     if (prefix === '/' && prefix === url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.16.21-beta-bd0e2503",
+  "version": "1.16.21-beta-445a8baa",
   "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.21-beta-bd0e2503",
-    "@abtnode/logger": "1.16.21-beta-bd0e2503",
-    "@abtnode/router-templates": "1.16.21-beta-bd0e2503",
-    "@abtnode/util": "1.16.21-beta-bd0e2503",
+    "@abtnode/constant": "1.16.21-beta-445a8baa",
+    "@abtnode/logger": "1.16.21-beta-445a8baa",
+    "@abtnode/router-templates": "1.16.21-beta-445a8baa",
+    "@abtnode/util": "1.16.21-beta-445a8baa",
     "@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": "f4550e061b661cb67d7f1413ada51f3f6491f0b8"
+  "gitHead": "7a7ff8be7f424775c3bde0eead773d8e6177fa1a"
 }