@abtnode/util 1.16.16-beta-d8a9fb09 → 1.16.16-beta-e038cde7

package/lib/download-file.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const { CancelToken } = require('axios');
+const throttle = require('lodash/throttle');
 const streamToPromise = require('stream-to-promise');
 const tryWithTimeout = require('./try-with-timeout');
 const axios = require('./axios');
@@ -45,13 +46,20 @@ async function streamToString(stream) {
  * @param {*} url
  * @param {*} dest directory
  * @param {{
- *  timeout: number; // unit: ms
- *  cancelCtrl: any;
+ *  timeout?: number; // unit: ms
+ *  cancelCtrl?: any;
+ *  onProgress?: any
+ *  minProgressInterval?: number
  * }} [{ timeout = 600 * 1000, cancelCtrl, data }={}]
  * @param {{}} context
  * @return {*}
  */
-const downloadFile = async (url, dest, { timeout = 600 * 1000, cancelCtrl, onProgress } = {}, context = {}) => {
+const downloadFile = async (
+  url,
+  dest,
+  { timeout = 600 * 1000, minProgressInterval = 400, cancelCtrl, onProgress } = {},
+  context = {}
+) => {
   const CONNECTION_TIMEOUT = 20 * 1000;
   const source = CancelToken.source();
 
@@ -85,12 +93,13 @@ const downloadFile = async (url, dest, { timeout = 600 * 1000, cancelCtrl, onPro
       });
 
       if (typeof onProgress === 'function') {
+        const throttled = throttle(onProgress, minProgressInterval, { leading: false, trailing: true });
         const total = (response.headers || {})['content-length'] || 0;
         let current = 0;
         response.data.on('data', (chunk) => {
           current += chunk.length;
           try {
-            onProgress({ total, current });
+            throttled({ total, current });
           } catch {
             // do nothing
           }

package/lib/express-bearer-token.js

@@ -1,7 +1,7 @@
 /**
  * Fork from https://github.com/tkellen/js-express-bearer-token
  */
-
+const toLower = require('lodash/toLower');
 const parseCookie = require('cookie').parse;
 const decodeCookie = require('cookie-parser').signedCookie;
 
@@ -51,17 +51,6 @@ module.exports = (opts) => {
 
     // headers
     if (req.headers) {
-      if (req.headers[headerName]) {
-        const parts = req.headers[headerName].split(' ');
-        if (parts.length === 2 && parts[0] === headerKey) {
-          if (token) {
-            error = true;
-          }
-          // eslint-disable-next-line prefer-destructuring
-          token = parts[1];
-        }
-      }
-
       // cookie
       if (cookie && req.headers.cookie) {
         const plainCookie = getCookie(req.headers.cookie || '', cookie.key); // seeks the key
@@ -76,6 +65,21 @@ module.exports = (opts) => {
           }
         }
       }
+
+      // header 中携带的 token 应该是等级最高的
+      if (req.headers[headerName]) {
+        const parts = req.headers[headerName].split(' ');
+        if (parts.length === 2 && toLower(parts[0]) === toLower(headerKey)) {
+          if (token) {
+            // HACK: 在统一登录的切换账户场景中，会同时携带 cookie 和 header bearerToken，但这两个值是不一样的，需要以 bearerToken 为准
+            if (token === parts[1]) {
+              error = true;
+            }
+          }
+          // eslint-disable-next-line prefer-destructuring
+          token = parts[1];
+        }
+      }
     }
 
     // RFC6750 states the access_token MUST NOT be provided

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.16-beta-d8a9fb09",
+  "version": "1.16.16-beta-e038cde7",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,9 +18,9 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.16-beta-d8a9fb09",
-    "@abtnode/logger": "1.16.16-beta-d8a9fb09",
-    "@blocklet/constant": "1.16.16-beta-d8a9fb09",
+    "@abtnode/constant": "1.16.16-beta-e038cde7",
+    "@abtnode/logger": "1.16.16-beta-e038cde7",
+    "@blocklet/constant": "1.16.16-beta-e038cde7",
     "@ocap/client": "1.18.89",
     "@ocap/mcrypto": "1.18.89",
     "@ocap/util": "1.18.89",
@@ -71,5 +71,5 @@
     "fs-extra": "^10.1.0",
     "jest": "^27.5.1"
   },
-  "gitHead": "a03d8972fd0fafe810369efa89b03ccd0647dce5"
+  "gitHead": "688b1c7ae0f6652094100c101f5d218266dd86ac"
 }