@abtnode/router-provider 1.16.13-beta-118c3420 → 1.16.13-beta-a83ad86d

package/lib/nginx/index.js

@@ -220,6 +220,12 @@ class NginxProvider extends BaseProvider {
           const certificate = findCertificate(certificates, domain);
 
           const parsedServerName = parseServerName(domain);
+          if (!parsedServerName) {
+            logger.warn('invalid site, empty server name:', { site: JSON.stringify(site), domain, parsedServerName });
+            // eslint-disable-next-line no-continue
+            continue;
+          }
+
           if (certificate) {
             // HTTPS configurations
             // update all certs to disk
@@ -379,6 +385,11 @@ class NginxProvider extends BaseProvider {
       return;
     }
 
+    if (type === ROUTING_RULE_TYPES.GENERAL_REWRITE) {
+      this._addRewriteTypeLocation(args);
+      return;
+    }
+
     if (type === ROUTING_RULE_TYPES.GENERAL_PROXY) {
       this._addGeneralProxyLocation(args);
       return;
@@ -459,6 +470,7 @@ class NginxProvider extends BaseProvider {
     type,
     commonHeaders,
     cacheGroup,
+    pageGroup,
   }) {
     server._add('location', concatPath(prefix, suffix));
 
@@ -482,6 +494,9 @@ class NginxProvider extends BaseProvider {
     }
 
     location._add('include', 'includes/proxy');
+    if (pageGroup) {
+      location._add('proxy_set_header', `X-Page-Group "${pageGroup}"`);
+    }
 
     // kill cache
     if (this.cacheEnabled === false) {
@@ -558,6 +573,13 @@ class NginxProvider extends BaseProvider {
     }
   }
 
+  _addRewriteTypeLocation({ server, url, prefix, suffix, corsAllowedOrigins, serverName }) {
+    server._add('location', concatPath(prefix, suffix));
+    const location = this._getLastLocation(server);
+    this._addCors({ location, corsAllowedOrigins, serverName });
+    location._add('rewrite', `^${prefix}(.*) ${url}$1 last`);
+  }
+
   _addNotFoundLocation({ server, prefix, suffix }) {
     server._add('location', concatPath(prefix, suffix));
     const location = this._getLastLocation(server);

package/lib/util.js

@@ -72,6 +72,11 @@ const formatRoutingTable = (routingTable, onRule) => {
     }
 
     (site.rules || []).forEach((x) => {
+      if (x.to.type === ROUTING_RULE_TYPES.COMPONENT) {
+        console.warn(`Rule type is dropped: ${x.to.type}`, x);
+        return;
+      }
+
       const prefix = trimEndSlash(x.from.pathPrefix || '/');
       const groupPrefix = trimEndSlash(x.from.groupPathPrefix || '/');
       const suffix = trimEndSlash(x.from.pathSuffix || '');
@@ -87,6 +92,8 @@ const formatRoutingTable = (routingTable, onRule) => {
       if (x.to.type === ROUTING_RULE_TYPES.REDIRECT) {
         rule.redirectCode = x.to.redirectCode || 302;
         rule.url = x.to.url;
+      } else if (x.to.type === ROUTING_RULE_TYPES.GENERAL_REWRITE) {
+        rule.url = x.to.url;
       } else {
         rule.port = +x.to.port;
         rule.did = x.to.did;
@@ -95,6 +102,7 @@ const formatRoutingTable = (routingTable, onRule) => {
         rule.target = trimEndSlash(normalizePathPrefix(x.to.target || '/'));
         rule.targetPrefix = x.to.targetPrefix || '';
         rule.services = x.services || [];
+        rule.pageGroup = x.to.pageGroup;
       }
 
       const tmpPath = concatPath(prefix, suffix);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.16.13-beta-118c3420",
+  "version": "1.16.13-beta-a83ad86d",
   "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.13-beta-118c3420",
-    "@abtnode/logger": "1.16.13-beta-118c3420",
-    "@abtnode/router-templates": "1.16.13-beta-118c3420",
-    "@abtnode/util": "1.16.13-beta-118c3420",
+    "@abtnode/constant": "1.16.13-beta-a83ad86d",
+    "@abtnode/logger": "1.16.13-beta-a83ad86d",
+    "@abtnode/router-templates": "1.16.13-beta-a83ad86d",
+    "@abtnode/util": "1.16.13-beta-a83ad86d",
     "@arcblock/http-proxy": "^1.19.1",
     "axios": "^0.27.2",
     "debug": "^4.3.4",
@@ -60,5 +60,5 @@
     "bluebird": "^3.7.2",
     "fs-extra": "^10.1.0"
   },
-  "gitHead": "93e00311f882c8c153a1c6c3d18aa29c154f08f6"
+  "gitHead": "dc2a4f7d5b55da109ebf873d8aa4d24f27a088c9"
 }