@abtnode/router-provider 1.16.25-next-bc2f4c63 → 1.16.26-beta-e0056285

package/lib/default/proxy.js

@@ -6,7 +6,18 @@ const https = require('https');
 const httpProxy = require('@arcblock/http-proxy');
 const validUrl = require('valid-url');
 const path = require('path');
-const _ = require('lodash');
+const clone = require('lodash/clone');
+const remove = require('lodash/remove');
+const uniq = require('lodash/uniq');
+const find = require('lodash/find');
+const flatten = require('lodash/flatten');
+const map = require('lodash/map');
+const sortBy = require('lodash/sortBy');
+const defaults = require('lodash/defaults');
+const isArray = require('lodash/isArray');
+const isString = require('lodash/isString');
+const isObject = require('lodash/isObject');
+const isFunction = require('lodash/isFunction');
 const hash = require('object-hash');
 const LRUCache = require('lru-cache');
 const tls = require('tls');
@@ -16,8 +27,8 @@ const logger = require('@abtnode/logger')('router:default:proxy', { filename: 'e
 
 const ensureHttp = (str) => (!str.startsWith('http://') && !str.startsWith('https://') ? `http://${str}` : str);
 const prepareUrl = (url) => {
-  url = _.clone(url);
-  if (_.isString(url)) {
+  url = clone(url);
+  if (isString(url)) {
     url = ensureHttp(url);
     if (!validUrl.isHttpUri(url) && !validUrl.isHttpsUri(url)) {
       throw new Error(`uri is not a valid http uri ${url}`);
@@ -182,7 +193,7 @@ module.exports = class ReverseProxy {
     }
 
     if (sslOpts.opts) {
-      ssl = _.defaults(ssl, sslOpts.opts);
+      ssl = defaults(ssl, sslOpts.opts);
     }
 
     this.httpsServer = https.createServer(ssl, (req, res) => {
@@ -217,7 +228,7 @@ module.exports = class ReverseProxy {
   addResolver(_resolver) {
     const resolver = Array.isArray(_resolver) ? _resolver : [_resolver];
     resolver.forEach((resolveObj) => {
-      if (!_.isFunction(resolveObj)) {
+      if (!isFunction(resolveObj)) {
         throw new Error('Resolver must be an invokable function.');
       }
 
@@ -228,7 +239,7 @@ module.exports = class ReverseProxy {
       this.resolvers.push(resolveObj);
     });
 
-    this.resolvers = _.sortBy(_.uniq(this.resolvers), ['priority']).reverse();
+    this.resolvers = sortBy(uniq(this.resolvers), ['priority']).reverse();
   }
 
   removeResolver(resolver) {
@@ -292,14 +303,14 @@ module.exports = class ReverseProxy {
 
     const host = this.routing[src.hostname];
     const pathname = src.pathname || '/';
-    let route = _.find(host, { path: pathname });
+    let route = find(host, { path: pathname });
 
     if (!route) {
       route = { path: pathname, rr: 0, urls: [], opts: Object.assign({}, opts) };
       host.push(route);
 
       // Sort routes
-      this.routing[src.hostname] = _.sortBy(host, (x) => -x.path.length);
+      this.routing[src.hostname] = sortBy(host, (x) => -x.path.length);
     }
 
     route.urls.push(target);
@@ -329,7 +340,7 @@ module.exports = class ReverseProxy {
 
       if (target) {
         target = prepareUrl(target);
-        _.remove(route.urls, (x) => x.href === target.href);
+        remove(route.urls, (x) => x.href === target.href);
       } else {
         route.urls = [];
       }
@@ -403,24 +414,24 @@ module.exports = class ReverseProxy {
   }
 
   static buildRoute(route) {
-    if (!_.isString(route) && !_.isObject(route)) {
+    if (!isString(route) && !isObject(route)) {
       return null;
     }
 
     // default route type matched.
-    if (_.isObject(route) && route.urls && route.path) {
+    if (isObject(route) && route.urls && route.path) {
       return route;
     }
 
     // to bust cache for route, you can attach an id to the route object in business layer
-    const cacheKey = _.isString(route) ? route : hash(route);
+    const cacheKey = isString(route) ? route : hash(route);
     const entry = routeCache.get(cacheKey);
     if (entry) {
       return entry;
     }
 
     const routeObject = { rr: 0, isResolved: true };
-    if (_.isString(route)) {
+    if (isString(route)) {
       routeObject.urls = [ReverseProxy.buildTarget(route)];
       routeObject.path = '/';
     } else {
@@ -428,7 +439,7 @@ module.exports = class ReverseProxy {
         return null;
       }
 
-      routeObject.urls = (_.isArray(route.url) ? route.url : [route.url]).map((url) =>
+      routeObject.urls = (isArray(route.url) ? route.url : [route.url]).map((url) =>
         ReverseProxy.buildTarget(url, route.opts || {})
       );
 
@@ -531,9 +542,9 @@ module.exports = class ReverseProxy {
   _getCertData(source, unbundle) {
     let data;
     if (source) {
-      if (_.isArray(source)) {
+      if (isArray(source)) {
         const sources = source;
-        return _.flatten(_.map(sources, (_source) => this._getCertData(_source, unbundle)));
+        return flatten(map(sources, (_source) => this._getCertData(_source, unbundle)));
       }
       if (Buffer.isBuffer(source)) {
         data = source.toString('utf8');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.16.25-next-bc2f4c63",
+  "version": "1.16.26-beta-e0056285",
   "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.25-next-bc2f4c63",
-    "@abtnode/logger": "1.16.25-next-bc2f4c63",
-    "@abtnode/router-templates": "1.16.25-next-bc2f4c63",
-    "@abtnode/util": "1.16.25-next-bc2f4c63",
+    "@abtnode/constant": "1.16.26-beta-e0056285",
+    "@abtnode/logger": "1.16.26-beta-e0056285",
+    "@abtnode/router-templates": "1.16.26-beta-e0056285",
+    "@abtnode/util": "1.16.26-beta-e0056285",
     "@arcblock/http-proxy": "^1.19.1",
     "axios": "^0.27.2",
     "debug": "^4.3.4",
@@ -59,5 +59,5 @@
     "bluebird": "^3.7.2",
     "fs-extra": "^11.2.0"
   },
-  "gitHead": "499ecf2bde0cdb25dbfdd1cf7807212f5fe37ad9"
+  "gitHead": "a79b8637ad50d136e7c5d91bfb41dc7a7c337485"
 }