@abtnode/router-provider 1.8.62 → 1.8.63-beta-c51e554d

package/lib/nginx/index.js

@@ -206,7 +206,7 @@ class NginxProvider extends BaseProvider {
 
         // eslint-disable-next-line no-restricted-syntax
         for (const site of sites) {
-          const { domain, port, rules, corsAllowedOrigins } = site;
+          const { domain, port, rules, corsAllowedOrigins, blockletDid } = site;
           const certificate = findCertificate(certificates, domain);
 
           const parsedServerName = parseServerName(domain);
@@ -229,6 +229,7 @@ class NginxProvider extends BaseProvider {
               corsAllowedOrigins,
               daemonPort: nodeInfo.port,
               commonHeaders,
+              blockletDid,
             });
           } else {
             this._addHttpServer({
@@ -239,6 +240,7 @@ class NginxProvider extends BaseProvider {
               port,
               daemonPort: nodeInfo.port,
               commonHeaders,
+              blockletDid,
             });
           }
         }
@@ -546,10 +548,14 @@ class NginxProvider extends BaseProvider {
     location._add('try_files', '$uri /404.html break');
   }
 
-  _addGeneralProxyLocation({ server, port, prefix, suffix }) {
+  _addGeneralProxyLocation({ server, port, prefix, suffix, blockletDid }) {
     server._add('location', concatPath(prefix, suffix));
     const location = this._getLastLocation(server);
     this._addCommonHeader(location);
+    location._add('include', 'includes/proxy');
+    if (blockletDid) {
+      location._add('proxy_set_header', `X-Blocklet-Did ${blockletDid}`);
+    }
 
     location._add('proxy_pass', `http://${getUpstreamName(port)}`);
   }
@@ -719,14 +725,32 @@ class NginxProvider extends BaseProvider {
       : conf.nginx.stream.server;
   }
 
-  _addHttpServer({ locations = [], serverName, conf, corsAllowedOrigins, port, daemonPort, commonHeaders }) {
+  _addHttpServer({
+    locations = [],
+    serverName,
+    conf,
+    corsAllowedOrigins,
+    port,
+    daemonPort,
+    commonHeaders,
+    blockletDid,
+  }) {
     const httpServerUnit = this._addHttpServerUnit({ conf, serverName, port });
     this._addDefaultLocations(httpServerUnit, daemonPort);
     // eslint-disable-next-line max-len
-    locations.forEach((x) => this._addReverseProxy({ server: httpServerUnit, ...x, serverName, corsAllowedOrigins, commonHeaders })); // prettier-ignore
+    locations.forEach((x) => this._addReverseProxy({ server: httpServerUnit, ...x, serverName, corsAllowedOrigins, commonHeaders, blockletDid })); // prettier-ignore
   }
 
-  _addHttpsServer({ conf, locations, certificateFileName, serverName, corsAllowedOrigins, daemonPort, commonHeaders }) {
+  _addHttpsServer({
+    conf,
+    locations,
+    certificateFileName,
+    serverName,
+    corsAllowedOrigins,
+    daemonPort,
+    commonHeaders,
+    blockletDid,
+  }) {
     const httpsServerUnit = this._addHttpsServerUnit({ conf, serverName, certificateFileName });
 
     const httpServerUnit = this._addHttpServerUnit({ conf, serverName });
@@ -734,7 +758,7 @@ class NginxProvider extends BaseProvider {
 
     this._addDefaultLocations(httpsServerUnit, daemonPort);
     // eslint-disable-next-line max-len
-    locations.forEach((x) => this._addReverseProxy({ server: httpsServerUnit, ...x, serverName, corsAllowedOrigins, commonHeaders })); // prettier-ignore
+    locations.forEach((x) => this._addReverseProxy({ server: httpsServerUnit, ...x, serverName, corsAllowedOrigins, commonHeaders, blockletDid })); // prettier-ignore
   }
 
   _addHttpServerUnit({ conf, serverName, port }) {

package/lib/util.js

@@ -60,6 +60,7 @@ const formatRoutingTable = (routingTable, onRule) => {
     if (!sites[domain]) {
       sites[domain] = {
         domain,
+        blockletDid: site.blockletDid,
         rules: [],
         port: site.port,
         corsAllowedOrigins: site.corsAllowedOrigins,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.8.62",
+  "version": "1.8.63-beta-c51e554d",
   "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.8.62",
-    "@abtnode/logger": "1.8.62",
-    "@abtnode/router-templates": "1.8.62",
-    "@abtnode/util": "1.8.62",
+    "@abtnode/constant": "1.8.63-beta-c51e554d",
+    "@abtnode/logger": "1.8.63-beta-c51e554d",
+    "@abtnode/router-templates": "1.8.63-beta-c51e554d",
+    "@abtnode/util": "1.8.63-beta-c51e554d",
     "axios": "^0.27.2",
     "debug": "^4.3.4",
     "find-process": "^1.4.7",
@@ -62,5 +62,5 @@
     "fs-extra": "^10.1.0",
     "needle": "^3.1.0"
   },
-  "gitHead": "ea6ab48149eb9e1157ef37ab1505fa36a9ce598f"
+  "gitHead": "9913ed7968dfab63d6549201a5a98f9819fcfac6"
 }