@vbarbarosh/node-helpers 3.7.0 → 3.8.0

package/package.json

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

package/src/fastdl.js

@@ -2,6 +2,7 @@ const format_bytes = require('./format_bytes');
 const format_seconds = require('./format_seconds');
 const format_thousands = require('./format_thousands');
 const fs = require('fs');
+const fs_path_basename = require('./fs_path_basename');
 const make_progress = require('./progress');
 const parallel = require('./parallel');
 const stream = require('stream');
@@ -14,16 +15,17 @@ const stream = require('stream');
  *     read_stream_with_range: (first, last) => http_get_stream_range(url, first, last),
  * });
  */
-async function fastdl({file, read_stream_with_range, concurrency = 60, log = v => console.log(v)})
+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;
 
-    log(`Truncating destination file [${file}]...`);
+    _(`Truncating destination file [${fs_path_basename(file)}]...`);
     await fs.promises.writeFile(file, '');
 
-    log('Requesting first chunk to determine total size...');
+    _('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,10 +41,15 @@ async function fastdl({file, read_stream_with_range, concurrency = 60, log = v =
         const p = progress;
         const bb = format_bytes;
         const ss = format_seconds;
-        log(`${bb(p.done)} of ${bb(p.total)} ${(p.percentage*100).toFixed(2)}% at ${bb(p.rate)}/s ETA ${ss(p.eta)} duration=${ss(p.duration)} connections=${connections}`);
+        if (p.rate) {
+            _(`${bb(p.done)} of ${bb(p.total)} [${(p.percentage*100).toFixed(2)}%] at ${bb(p.rate)}/s ETA ${ss(p.eta)} duration=${ss(p.duration)} connections=${connections}`);
+        }
+        else {
+            _(`${bb(p.done)} of ${bb(p.total)} [${(p.percentage*100).toFixed(2)}%] at ~ ETA ${ss(p.eta)} duration=${ss(p.duration)} connections=${connections}`);
+        }
     }
 
-    log(`${format_bytes(total)} [${format_thousands(total)} bytes] to download`);
+    _(`${format_bytes(total)} [${format_thousands(total)} bytes] to download`);
 
     try {
         await parallel({concurrency, spawn});

package/src/progress.js

@@ -21,10 +21,10 @@ function progress(total)
         progress: null,
         percentage: null,
         add: function (delta = 0) {
-            const now_minus_5_seconds = Date.now() - 5000;
+            const now_minus_2sec = Date.now() - 2000;
             history.push({time: Date.now(), delta});
-            // Keep last 5 seconds
-            history.splice(0, history.findLastIndex(v => v.time < now_minus_5_seconds));
+            // Keep last 2 seconds
+            history.splice(0, history.findLastIndex(v => v.time < now_minus_2sec));
             out.done += delta;
             out.refresh();
         },
@@ -32,8 +32,8 @@ function progress(total)
             out.add(done - out.done);
         },
         refresh: function () {
-            const now_minus_5_seconds = Date.now() - 5000;
-            const tmp = history.filter(v => v.time >= now_minus_5_seconds);
+            const now_minus_2sec = Date.now() - 2000;
+            const tmp = history.filter(v => v.time >= now_minus_2sec);
             if (tmp.length > 1) {
                 const items = tmp.reduce((a,v) => a + v.delta, 0);
                 const time_sec = (tmp.pop().time - tmp[0].time)/1000;