@vbarbarosh/node-helpers 3.22.0 → 3.23.1

package/package.json

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

package/src/format_progress.js

@@ -6,6 +6,9 @@ const is_number_gt = require('./is_number_gt');
 function format_progress({percents, total, done, rate, eta, duration})
 {
     const bps = is_number_gt(rate, 0) ? `${format_bytes(rate)}/s` : '~';
+    if (done > total) {
+        return `${format_bytes(done)} at ${bps} duration=${format_seconds(duration)}`;
+    }
     if (is_number_gt(total, 0)) {
         const eta_str = is_number_gt(eta, 0) ? format_seconds(eta) : '~';
         return `${format_percents(percents)} | ${format_bytes(done)} of ${format_bytes(total)} at ${bps} ETA ${eta_str} duration=${format_seconds(duration)}`;

package/src/format_progress.test.js

@@ -6,6 +6,8 @@ const items = [
     ['~ duration=00:00:01', {percents: 0, total: 0, done: 0, rate: 0, eta: 0, duration: 1}],
     ['25.25% | 5.0MB of 15.0MB at ~ ETA ~ duration=00:00:01', {percents: 0.2525, total: 15*1024*1024, done: 5*1024*1024, rate: 0, eta: 0, duration: 1}],
     ['25.25% | 5.0MB of 15.0MB at 10.0MB/s ETA 00:00:05 duration=00:00:01', {percents: 0.2525, total: 15*1024*1024, done: 5*1024*1024, rate: 10*1024*1024, eta: 5, duration: 1}],
+    // edge case: done > total
+    ['15.0MB at 10.0MB/s duration=00:00:01', {percents: 5.2525, total: 5*1024*1024, done: 15*1024*1024, rate: 10*1024*1024, eta: 5, duration: 1}],
 ];
 
 describe('format_progress', function () {

package/src/http_get_stream.js

@@ -1,10 +1,12 @@
 const axios = require('axios');
+const make_int = require('./make_int');
 
 async function http_get_stream(url, options)
 {
     const res = await axios.get(url, {responseType: 'stream', ...options});
     const out = res.data;
     out.headers = res.headers;
+    out.total = make_int(res.headers['content-length'], null, 0);
     return out;
 }
 

package/src/http_get_stream_range.js

@@ -9,6 +9,7 @@ async function http_get_stream_range(url, first, last)
     const headers = {Range: `bytes=${a}-${b}`};
     const res = await axios.get(url, {responseType: 'stream', headers});
     const out = res.data;
+    out.headers = res.headers;
     if (res.headers['content-range']) {
         out.content_range = parse_http_content_range(res.headers['content-range']);
     }
@@ -22,6 +23,7 @@ async function http_get_stream_range(url, first, last)
     else if (b && out.content_range.last !== b) {
         out.destroy(new Error(`Last byte of a returned range (${format_thousands(out.content_range.last)}) is not as expected: [${format_thousands(b)}]`));
     }
+    out.total = out.content_range.total;
     return out;
 }
 

package/src/make_int.js

@@ -0,0 +1,15 @@
+function make_int(value, default_value = 0, min = Number.MIN_SAFE_INTEGER, max = Number.MAX_SAFE_INTEGER)
+{
+    switch (typeof value) {
+    case 'bigint':
+        return Math.max(min, Math.min(max, Number(value)));
+    case 'symbol':
+        return default_value;
+    }
+    if (value === null || value === undefined || !isFinite(value)) {
+        return default_value;
+    }
+    return Math.max(min, Math.min(max, Math.round(value === 0 ? value : (+value||default_value))));
+}
+
+module.exports = make_int;