@vbarbarosh/node-helpers 3.4.2 → 3.4.4

package/package.json

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

package/src/eta.js

@@ -3,10 +3,9 @@ const format_seconds = require('./format_seconds');
 function eta(time0, total, done, resumed = 0)
 {
     const seconds = (Date.now() - time0)/1000;
-    const xdone = done - resumed;
-    const xtotal = total - resumed;
-    const bps = xdone/seconds;
-    return format_seconds(xtotal/bps);
+    const remained = total - done;
+    const bps = (done - resumed)/seconds;
+    return format_seconds(remained/bps);
 }
 
 module.exports = eta;

package/src/fs_size_noent.js

@@ -0,0 +1,21 @@
+/**
+ * Returns size of a file, or 0 if file is not present. Was created for cases
+ * when you need to resume download.
+ *
+ * @returns {Promise<int>}
+ */
+async function fs_size_enoent(path)
+{
+    try {
+        const stat = await fs.promises.stat(path);
+        return stat.size;
+    }
+    catch (error) {
+        if (error.code === 'ENOENT') {
+            return 0;
+        }
+        throw error;
+    }
+}
+
+module.exports = fs_size_enoent;

package/src/parse_http_content_range.js

@@ -0,0 +1,15 @@
+function parse_http_content_range(value)
+{
+    // Content-Range: bytes 262144000-272629759/5037662208
+    const m = value.match(/^(\w+)\s+(\d+)-(\d+)[/](\d+)$/);
+    if (!m) {
+        throw new Error(`Invalid Content-Range: [${value}]`);
+    }
+    const type = m[1];
+    const first = +m[2];
+    const last = +m[3];
+    const total = +m[4];
+    return {type, first, last, total};
+}
+
+module.exports = parse_http_content_range;

package/src/parse_http_content_range.test.js

@@ -0,0 +1,14 @@
+const assert = require('assert');
+const parse_http_content_range = require('./parse_http_content_range');
+
+const items = [
+    ['bytes 262144000-272629759/5037662208', {type: 'bytes', first: 262144000, last: 272629759, total: 5037662208}],
+];
+
+describe('parse_http_content_range', function () {
+    items.forEach(function ([expr, expected]) {
+        it(expr, function () {
+            assert.deepStrictEqual(parse_http_content_range(expr), expected);
+        });
+    });
+});