@abtnode/router-provider 1.16.29-beta-cbfd116d → 1.16.29-beta-8671c2cf

package/lib/default/daemon.js

@@ -56,7 +56,7 @@ const createRequestHandler = (id) => (req, res, target) => {
     const parsed = url.parse(req.url);
     if (parsed.pathname === rule.prefix) {
       logger.info('redirect url', { url: req.url, rule });
-      parsed.pathname = joinURL(rule.prefix, '/');
+      parsed.pathname = rule.prefix.endsWith('/') ? rule.prefix : `${rule.prefix}/`;
       res.writeHead(307, { Location: url.format(parsed) });
       res.end();
       return { abort: true };

package/lib/util.js

@@ -162,17 +162,18 @@ const toSlotDomain = (domain) => {
 
 const findRule = (rules, url) =>
   rules.find((x) => {
+    const [pathname] = url.split('?');
     const { prefix, suffix = '' } = x;
     if (suffix) {
       const regex = new RegExp(`${suffix}$`);
-      return url.startsWith(prefix) && regex.test(url);
+      return pathname.startsWith(prefix) && regex.test(pathname);
     }
 
-    if (prefix === '/' && prefix === url) {
+    if (prefix === '/' && prefix === pathname) {
       return true;
     }
 
-    return url.startsWith(prefix);
+    return pathname.startsWith(prefix);
   });
 const matchRule = (rules, url) => {
   const rulesWithSuffix = rules.filter((x) => x.suffix);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.16.29-beta-cbfd116d",
+  "version": "1.16.29-beta-8671c2cf",
   "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.29-beta-cbfd116d",
-    "@abtnode/logger": "1.16.29-beta-cbfd116d",
-    "@abtnode/router-templates": "1.16.29-beta-cbfd116d",
-    "@abtnode/util": "1.16.29-beta-cbfd116d",
+    "@abtnode/constant": "1.16.29-beta-8671c2cf",
+    "@abtnode/logger": "1.16.29-beta-8671c2cf",
+    "@abtnode/router-templates": "1.16.29-beta-8671c2cf",
+    "@abtnode/util": "1.16.29-beta-8671c2cf",
     "@arcblock/http-proxy": "^1.19.1",
     "@arcblock/is-valid-domain": "^1.0.5",
     "axios": "^1.7.2",
@@ -59,5 +59,5 @@
     "bluebird": "^3.7.2",
     "fs-extra": "^11.2.0"
   },
-  "gitHead": "e9bdb7af77f2d126e40195c67972b07fe683adf9"
+  "gitHead": "67207cc32f2cdf4ab8af39d4083ad61fba9711e2"
 }