@abtnode/router-provider 1.16.28-next-5a717317 → 1.16.29-beta-0070353c

package/lib/default/daemon.js

@@ -3,7 +3,7 @@ const url = require('url');
 const path = require('path');
 const fs = require('fs-extra');
 const get = require('lodash/get');
-const joinUrl = require('url-join');
+const { joinURL } = require('ufo');
 const checkDomainMatch = require('@abtnode/util/lib/check-domain-match');
 const { DEFAULT_IP_DOMAIN_SUFFIX, ROUTING_RULE_TYPES, WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
 
@@ -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 = joinURL(rule.prefix, '/');
       res.writeHead(307, { Location: url.format(parsed) });
       res.end();
       return { abort: true };
@@ -68,7 +68,7 @@ const createRequestHandler = (id) => (req, res, target) => {
   } else if (rule.prefix.includes(WELLKNOWN_SERVICE_PATH_PREFIX)) {
     // do not rewrite for service requests
   } else {
-    req.url = joinUrl(rule.target, req.url.substr(rule.prefix.length));
+    req.url = joinURL(rule.target, req.url.substr(rule.prefix.length));
   }
   if (req.url.startsWith('/') === false) {
     req.url = `/${req.url}`;
@@ -128,7 +128,7 @@ const sharedResolver = (host, url, req) => {
 
   return {
     id: rule.id,
-    url: rule.targetPrefix && rule.targetPrefix !== '/' ? joinUrl(upstream, rule.targetPrefix) : upstream,
+    url: rule.targetPrefix && rule.targetPrefix !== '/' ? joinURL(upstream, rule.targetPrefix) : upstream,
     path: '/',
     opts: {
       ssl: match ? { key: match.privateKey, cert: match.certificate } : null,

package/lib/util.js

@@ -5,7 +5,7 @@ const getPort = require('get-port');
 const portUsed = require('port-used');
 const uniq = require('lodash/uniq');
 const sortBy = require('lodash/sortBy');
-const isValidDomain = require('is-valid-domain');
+const isValidDomain = require('@arcblock/is-valid-domain');
 const checkDomainMatch = require('@abtnode/util/lib/check-domain-match');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const { template404, template502, template5xx, templateWelcome } = require('@abtnode/router-templates');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.16.28-next-5a717317",
+  "version": "1.16.29-beta-0070353c",
   "description": "Routing engine implementations for abt node",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,18 +32,18 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.16.28-next-5a717317",
-    "@abtnode/logger": "1.16.28-next-5a717317",
-    "@abtnode/router-templates": "1.16.28-next-5a717317",
-    "@abtnode/util": "1.16.28-next-5a717317",
+    "@abtnode/constant": "1.16.29-beta-0070353c",
+    "@abtnode/logger": "1.16.29-beta-0070353c",
+    "@abtnode/router-templates": "1.16.29-beta-0070353c",
+    "@abtnode/util": "1.16.29-beta-0070353c",
     "@arcblock/http-proxy": "^1.19.1",
-    "axios": "^0.27.2",
+    "@arcblock/is-valid-domain": "^1.0.5",
+    "axios": "^1.7.2",
     "debug": "^4.3.4",
     "find-process": "^1.4.7",
     "fkill": "^7.2.1",
     "fs-extra": "^11.2.0",
     "get-port": "^5.1.1",
-    "is-valid-domain": "^0.1.6",
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.0",
     "nginx-conf": "^1.7.0",
@@ -52,12 +52,12 @@
     "promise-retry": "^2.0.1",
     "shelljs": "^0.8.5",
     "tar": "^6.1.11",
-    "url-join": "^4.0.1",
+    "ufo": "^1.5.3",
     "valid-url": "^1.0.9"
   },
   "devDependencies": {
     "bluebird": "^3.7.2",
     "fs-extra": "^11.2.0"
   },
-  "gitHead": "3624967f9549de3a25a87ed6b20f82519ddb4757"
+  "gitHead": "7e3562be3a8af477749420cc022938a1059484d4"
 }