@vbarbarosh/node-helpers 3.19.1 → 3.21.0

package/package.json

@@ -2,7 +2,7 @@
     "author": "Vladimir Barbarosh <vladimir.barbarosh@gmail.com>",
     "license": "MIT",
     "name": "@vbarbarosh/node-helpers",
-    "version": "3.19.1",
+    "version": "3.21.0",
     "description": "A set of helpers for JavaScript/Node.js",
     "files": [
         "src"

package/src/fastdl.js

@@ -1,6 +1,5 @@
 const format_bytes = require('./format_bytes');
-const format_percents = require('./format_percents');
-const format_seconds = require('./format_seconds');
+const format_progress = require('./format_progress');
 const format_thousands = require('./format_thousands');
 const fs = require('fs');
 const fs_path_basename = require('./fs_path_basename');
@@ -18,15 +17,14 @@ const stream = require('stream');
  */
 async function fastdl({file, read_stream_with_range, concurrency = 60, user_friendly_status = v => console.log(v)})
 {
-    const _ = user_friendly_status;
     const M = 1024*1024;
     const chunk_min_bytes = M;
     const chunk_max_bytes = 50*M;
 
-    _(`Truncating destination file [${fs_path_basename(file)}]...`);
+    user_friendly_status(`Truncating destination file [${fs_path_basename(file)}]...`);
     await fs.promises.writeFile(file, '');
 
-    _('Requesting first chunk to determine total size...');
+    user_friendly_status('Requesting first chunk to determine total size...');
     const rs0 = await read_stream_with_range(0, chunk_min_bytes);
 
     const total = rs0.content_range.total;
@@ -39,18 +37,10 @@ async function fastdl({file, read_stream_with_range, concurrency = 60, user_frie
 
     const timer = setInterval(tick, 1000);
     function tick() {
-        const p = progress;
-        const bb = format_bytes;
-        const ss = format_seconds;
-        if (p.rate) {
-            _(`${bb(p.done)} of ${bb(p.total)} [${format_percents(p.percents)}] at ${bb(p.rate)}/s ETA ${ss(p.eta)} duration=${ss(p.duration)} connections=${connections}`);
-        }
-        else {
-            _(`${bb(p.done)} of ${bb(p.total)} [${format_percents(p.percents)}] at ~ ETA ${ss(p.eta)} duration=${ss(p.duration)} connections=${connections}`);
-        }
+        user_friendly_status(`${format_progress(progress)} connections=${connections}`);
     }
 
-    _(`${format_bytes(total)} [${format_thousands(total)} bytes] to download`);
+    user_friendly_status(`${format_bytes(total)} [${format_thousands(total)} bytes] to download`);
 
     try {
         await parallel({concurrency, spawn});

package/src/format_progress.js

@@ -0,0 +1,13 @@
+const format_bytes = require('./format_bytes');
+const format_percents = require('./format_percents');
+const format_seconds = require('./format_seconds');
+
+function format_progress({percents, total, done, rate, eta, duration})
+{
+    if (total) {
+        return `${format_percents(percents)} | ${format_bytes(done)} of ${format_bytes(total)} at ${format_bytes(rate)}/s ETA ${format_seconds(eta)} duration=${format_seconds(duration)}`;
+    }
+    return `${format_bytes(done)} of ~ at ${format_bytes(rate)}/s duration=${format_seconds(duration)}`;
+}
+
+module.exports = format_progress;

package/src/http_get_stream.js

@@ -1,8 +1,11 @@
 const axios = require('axios');
 
-function http_get_stream(url, options)
+async function http_get_stream(url, options)
 {
-    return axios.get(url, {responseType: 'stream', ...options}).then(v => v.data);
+    const res = await axios.get(url, {responseType: 'stream', ...options});
+    const out = res.data;
+    out.headers = res.headers;
+    return out;
 }
 
 module.exports = http_get_stream;

package/src/stream_progress.js

@@ -1,6 +1,4 @@
-const format_bytes = require('./format_bytes');
-const format_percents = require('./format_percents');
-const format_seconds = require('./format_seconds');
+const format_progress = require('./format_progress');
 const make_progress = require('./make_progress');
 const stream = require('stream');
 
@@ -26,7 +24,7 @@ function stream_progress({total, user_friendly_status = s => console.log(s)})
     });
     function tick() {
         progress.update(done);
-        user_friendly_status(`${format_percents(progress.percents)} | ${format_bytes(done)} of ${format_bytes(total)} at ${format_bytes(progress.rate)}/s ETA ${format_seconds(progress.eta)} duration=${format_seconds(progress.duration)}`);
+        user_friendly_status(format_progress(progress));
     }
 }