@abtnode/util 1.8.27 → 1.8.29

package/lib/axios.js

@@ -1,5 +1,35 @@
-// set proxy to false to fix bug with HTTPS_PROXY environment
-// https://github.com/axios/axios/issues/3384
-const { default: axios } = require('axios');
+const axios = require('axios').default;
+const { HttpProxyAgent, HttpsProxyAgent } = require('hpagent');
+
+function proxyInterceptor(config) {
+  /* istanbul ignore if */
+  if (config.socketPath != null) return config;
+
+  const { proxy } = config;
+
+  /* istanbul ignore if */
+  if (proxy === false) return config;
+
+  const httpProxyUrl = process.env.HTTP_PROXY || process.env.http_proxy;
+  const httpsProxyUrl = process.env.HTTPS_PROXY || process.env.https_proxy;
+
+  const proxyOptions = Object.assign(
+    { keepAlive: true, keepAliveMsecs: 1000, maxSockets: 256, maxFreeSockets: 256 },
+    config.proxyOptions || {}
+  );
+
+  if (httpProxyUrl) {
+    config.proxy = false;
+    config.httpAgent = new HttpProxyAgent({ proxy: httpProxyUrl, ...proxyOptions });
+  }
+  if (httpsProxyUrl) {
+    config.proxy = false;
+    config.httpsAgent = new HttpsProxyAgent({ proxy: httpsProxyUrl, ...proxyOptions });
+  }
+
+  return config;
+}
+
+axios.interceptors.request.use(proxyInterceptor);
 
 module.exports = axios;

package/lib/get-folder-size.js

@@ -1,6 +1,7 @@
+const getSize = require('get-folder-size');
 const exec = require('child_process').execFile;
 
-module.exports = (dir) => {
+const getOnUnixLike = (dir) => {
   const regex = /^(\d*)/;
 
   return new Promise((resolve, reject) => {
@@ -16,3 +17,17 @@ module.exports = (dir) => {
     });
   });
 };
+
+const getOnWindows = (dir) => {
+  return new Promise((resolve, reject) => {
+    getSize(dir, (err, size) => {
+      if (err) {
+        return reject(err);
+      }
+
+      return resolve(size);
+    });
+  });
+};
+
+module.exports = process.platform === 'win32' ? getOnWindows : getOnUnixLike;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.27",
+  "version": "1.8.29",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,13 +18,13 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.27",
-    "@abtnode/logger": "1.8.27",
-    "@arcblock/jwt": "^1.17.20",
-    "@blocklet/constant": "1.8.27",
-    "@ocap/mcrypto": "1.17.20",
-    "@ocap/util": "1.17.20",
-    "@ocap/wallet": "1.17.20",
+    "@abtnode/constant": "1.8.29",
+    "@abtnode/logger": "1.8.29",
+    "@arcblock/jwt": "^1.17.23",
+    "@blocklet/constant": "1.8.29",
+    "@ocap/mcrypto": "1.17.23",
+    "@ocap/util": "1.17.23",
+    "@ocap/wallet": "1.17.23",
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.21.2",
     "axon": "^2.0.3",
@@ -34,7 +34,9 @@
     "flush-write-stream": "^2.0.0",
     "folder-walker": "^3.2.0",
     "form-data": "^4.0.0",
+    "get-folder-size": "^2.0.1",
     "hasha": "^5.2.2",
+    "hpagent": "^1.1.0",
     "internal-ip": "^6.2.0",
     "is-docker": "^2.2.1",
     "json-stable-stringify": "^1.0.1",
@@ -44,7 +46,7 @@
     "public-ip": "^4.0.4",
     "pump": "^3.0.0",
     "read-last-lines": "^1.8.0",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "semver-sort": "^1.0.0",
     "shelljs": "^0.8.5",
     "stream-to-promise": "^3.0.0",
@@ -56,10 +58,10 @@
     "which": "^2.0.2"
   },
   "devDependencies": {
-    "detect-port": "^1.3.0",
-    "express": "^4.18.1",
+    "detect-port": "^1.5.1",
+    "express": "^4.18.2",
     "fs-extra": "^10.1.0",
     "jest": "^27.5.1"
   },
-  "gitHead": "84b2cb3ee703479f17e88c91650ecf3015cbf6af"
+  "gitHead": "ee52d838f0cf97e551d53a6509cb0da7e5f31978"
 }