@abtnode/util 1.8.0 → 1.8.3

package/lib/axios.js

@@ -2,6 +2,4 @@
 // https://github.com/axios/axios/issues/3384
 const { default: axios } = require('axios');
 
-axios.defaults.proxy = false;
-
 module.exports = axios;

package/lib/download-file.js

@@ -6,6 +6,39 @@ const axios = require('./axios');
 
 const CANCEL = '__cancel__';
 
+/**
+ *
+ *
+ * @param {Stream} stream
+ * @returns {Promise<string>}
+ */
+async function getErrorMessageFromStream(stream) {
+  const str = await streamToString(stream);
+
+  try {
+    const json = JSON.parse(str);
+    return json.error;
+  } catch (error) {
+    return str;
+  }
+}
+
+/**
+ *
+ *
+ * @param {*} stream
+ * @return {Promise<string>}
+ */
+async function streamToString(stream) {
+  const chunks = [];
+
+  for await (const chunk of stream) {
+    chunks.push(Buffer.from(chunk));
+  }
+
+  return Buffer.concat(chunks).toString('utf-8');
+}
+
 /**
  *
  *
@@ -80,6 +113,11 @@ const downloadFile = async (url, dest, { timeout = 600 * 1000, cancelCtrl } = {}
     }
 
     source.cancel();
+
+    if (err?.response?.data) {
+      throw new Error(await getErrorMessageFromStream(err.response.data));
+    }
+
     throw err;
   }
 };

package/lib/sleep.js

@@ -1 +1,2 @@
+// eslint-disable-next-line no-promise-executor-return
 module.exports = (timeout = 0) => new Promise((resolve) => setTimeout(resolve, timeout));

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.0",
+  "version": "1.8.3",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,10 +18,12 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.0",
-    "@ocap/mcrypto": "1.17.0",
-    "@ocap/util": "1.17.0",
-    "@ocap/wallet": "1.17.0",
+    "@abtnode/constant": "1.8.3",
+    "@abtnode/logger": "1.8.3",
+    "@arcblock/jwt": "^1.17.5",
+    "@ocap/mcrypto": "1.17.5",
+    "@ocap/util": "1.17.5",
+    "@ocap/wallet": "1.17.5",
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.20.0",
     "axon": "^2.0.3",
@@ -56,5 +58,5 @@
     "fs-extra": "^10.0.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "6446a85fb33721abc24bb1045d59158e6b96c241"
+  "gitHead": "c734aca7bf1fc03378c3b082d0622b6a540a8bd3"
 }