@vbarbarosh/node-helpers 3.36.0 → 3.37.1

package/package.json

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

package/src/format_bytes.js

@@ -1,17 +1,17 @@
 function format_bytes(bytes)
 {
     const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
-    if (Number.isNaN(bytes*1)) {
+    if (typeof bytes !== 'number' || Number.isNaN(bytes)) {
         return 'n/a';
     }
-    if (bytes == 0) {
+    if (!bytes) {
         return '0KB';
     }
     if (bytes < 1024) {
         return '1KB';
     }
     const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)), 10);
-    return `${(bytes / (1024 ** i)).toFixed(bytes > 1024*1024 ? 1 : 0)}${sizes[i]}`;
+    return `${(bytes / (1024 ** i)).toFixed(bytes > 1024*1024 ? 2 : 0)}${sizes[i]}`.replace(/\.00/, '.0');
 }
 
 module.exports = format_bytes;

package/src/format_bytes.test.js

@@ -0,0 +1,22 @@
+const assert = require('assert');
+const format_bytes = require('./format_bytes');
+
+const items = [
+    ['', 'n/a'],
+    [null, 'n/a'],
+    [undefined, 'n/a'],
+    [0, '0KB'],
+    [1, '1KB'],
+    [1023, '1KB'],
+    [2048, '2KB'],
+    [35.45*1024*1024, '35.45MB'],
+    [3.92*1024*1024*1024, '3.92GB'],
+];
+
+describe('format_bytes', function () {
+    items.forEach(function ([input, expected]) {
+        it(`${input} → ${expected}`, function () {
+            assert.strictEqual(expected, format_bytes(input));
+        });
+    });
+});

package/src/parse_bytes.js

@@ -0,0 +1,14 @@
+function parse_bytes(bytes)
+{
+    const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
+    if (typeof bytes !== 'string') {
+        return Number.NaN;
+    }
+    const m = bytes.toUpperCase().match(/(\d+([.]?\d+)?)(([KMGTP]I?)?B)/);
+    if (!m) {
+        return Number.NaN;
+    }
+    return Math.floor(m[1]*Math.pow(1024, sizes.indexOf(m[3].replace('I', ''))));
+}
+
+module.exports = parse_bytes;

package/src/parse_bytes.test.js

@@ -0,0 +1,21 @@
+const assert = require('assert');
+const parse_bytes = require('./parse_bytes');
+
+const items = [
+    ['', Number.NaN],
+    [null, Number.NaN],
+    [undefined, Number.NaN],
+    ['0KB', 0],
+    ['1KB', 1024],
+    ['2KB', 2048],
+    ['35.45MB', Math.floor(35.45*1024*1024)],
+    ['3.92GB', Math.floor(3.92*1024*1024*1024)],
+];
+
+describe('parse_bytes', function () {
+    items.forEach(function ([input, expected]) {
+        it(`${input} → ${expected}`, function () {
+            assert.strictEqual(expected, parse_bytes(input));
+        });
+    });
+});

package/src/shell_ytdlp_progress.js

@@ -1,11 +1,13 @@
 const child_process = require('child_process');
+const format_seconds = require('./format_seconds');
 const stream = require('stream');
 const stream_each = require('./stream_each');
 const stream_ytdlp_progress = require('./stream_ytdlp_progress');
 
-async function shell_ytdlp_progress(args, {progress_fn, ...options})
+async function shell_ytdlp_progress(args, {user_friendly_status, ...options})
 {
     const proc = child_process.spawn('yt-dlp', ['--progress', ...args], {...options, stdio: 'pipe'});
+    const time0 = Date.now();
 
     const promises = [];
     promises.push(new Promise(function (resolve, reject) {
@@ -16,6 +18,16 @@ async function shell_ytdlp_progress(args, {progress_fn, ...options})
     promises.push(stream.promises.pipeline(proc.stderr, stream_each(v => console.log(`[stderr] ${v}`))));
 
     await Promise.all(promises);
+
+    function progress_fn(v) {
+        const duration = format_seconds((Date.now() - time0)/1000);
+        if (v.merging) {
+            user_friendly_status(`Merging... duration=${duration}`);
+        }
+        else {
+            user_friendly_status(`${v.perc} | [${v.current_part}/${v.total_parts}] ${v.done} of ${v.total} at ${v.speed} ETA ${v.eta} duration=${duration}`);
+        }
+    }
 }
 
 module.exports = shell_ytdlp_progress;

package/src/stream_ytdlp_progress.js

@@ -1,16 +1,81 @@
+const format_bytes = require('./format_bytes');
+const format_percents = require('./format_percents');
+const parse_bytes = require('./parse_bytes');
 const stream = require('stream');
 const stream_filter = require('./stream_filter');
 const stream_lines = require('./stream_lines');
 const stream_map = require('./stream_map');
 
+// [download]   0.0% of   15.71MiB at  Unknown B/s ETA Unknown
+// [download]   0.0% of   15.71MiB at  Unknown B/s ETA Unknown
+// [download]   0.0% of   15.71MiB at  Unknown B/s ETA Unknown
+// [download]   0.1% of   15.71MiB at  Unknown B/s ETA Unknown
+// [download]   0.2% of   15.71MiB at   21.76MiB/s ETA 00:00
+// [download]   0.4% of   15.71MiB at   16.48MiB/s ETA 00:00
+// [download]   0.8% of   15.71MiB at   25.54MiB/s ETA 00:00
+// [download]   1.6% of   15.71MiB at   30.65MiB/s ETA 00:00
+// [download]   3.2% of   15.71MiB at   42.99MiB/s ETA 00:00
+// [download]   6.4% of   15.71MiB at   66.25MiB/s ETA 00:00
+// [download]  12.7% of   15.71MiB at   81.24MiB/s ETA 00:00
+// [download]  25.5% of   15.71MiB at   55.11MiB/s ETA 00:00
+// [download]  50.9% of   15.71MiB at   33.83MiB/s ETA 00:00
+// [download]  61.7% of   15.71MiB at   33.98MiB/s ETA 00:00
+// [download]  61.7% of   15.71MiB at  Unknown B/s ETA Unknown
+// [download]  61.7% of   15.71MiB at  Unknown B/s ETA Unknown
+// [download]  61.7% of   15.71MiB at  Unknown B/s ETA Unknown
+// [download]  61.8% of   15.71MiB at  Unknown B/s ETA Unknown
+// [download]  61.9% of   15.71MiB at   12.32MiB/s ETA 00:00
+// [download]  62.1% of   15.71MiB at   14.26MiB/s ETA 00:00
+// [download]  62.5% of   15.71MiB at   25.10MiB/s ETA 00:00
+// [download]  63.3% of   15.71MiB at   34.18MiB/s ETA 00:00
+// [download]  64.9% of   15.71MiB at    8.95MiB/s ETA 00:00
+// [download]  68.1% of   15.71MiB at   16.75MiB/s ETA 00:00
+// [download]  74.4% of   15.71MiB at   29.10MiB/s ETA 00:00
+// [download]  87.2% of   15.71MiB at   40.45MiB/s ETA 00:00
+// [download] 100.0% of   15.71MiB at   47.64MiB/s ETA 00:00
+// [download] 100% of   15.71MiB in 00:00:00 at 29.07MiB/s
+// [Merger] Merging formats into "xxxxxxxxxxxxxxx.webm"
+// Deleting original file xxxxxxxxxxxxxxx.f251.webm (pass -k to keep)
+// Deleting original file xxxxxxxxxxxxxxx.f248.webm (pass -k to keep)
+
 function stream_ytdlp_progress()
 {
-    const re = /^\[download] (.*) of (.*) at (.*) ETA (.*)$/;
+    let last = {};
+    let current_part = 1;
+    const downloading_formats = [];
     return stream.compose(
         stream_lines(),
-        stream_map(function (v) {
-            const m = re.exec(v);
-            return !m ? false : {done: m[1].trim(), of: m[2].trim(), speed: m[3].trim(), eta: m[4].trim()};
+        stream_map(function (line) {
+            let m;
+            if (m = line.match(/^\[info] \S+: Downloading \d+ format\(s\): (.+)$/)) {
+                downloading_formats.push(...m[1].split('+'));
+                return false;
+            }
+            if (m = line.match(/^\[download] Destination: .*f(\d+)\.[^.]+/)) {
+                current_part = downloading_formats.indexOf(m[1]) + 1;
+                return false;
+            }
+            if (m = line.match(/^\[Merger]/i)) {
+                last.merging = true;
+                return last;
+            }
+            if (m = line.match(/^\[download] (.*) of (.*) at (.*) ETA (.*)$/)) {
+                const percentage = parseFloat(m[1].trim())/100;
+                const total = parse_bytes(m[2].trim());
+                const speed = m[3].trim().replace('i', '');
+                const eta = m[4].trim();
+                return last = {
+                    current_part,
+                    total_parts: downloading_formats.length,
+                    perc: format_percents(percentage),
+                    done: format_bytes(percentage*total),
+                    total: format_bytes(total),
+                    speed: speed.toLowerCase().includes('unknown') ? '~' : speed,
+                    eta: eta.toLowerCase().includes('unknown') ? '~' : eta,
+                    merging: false,
+                };
+            }
+            return false;
         }),
         stream_filter(v => v),
     );