@vbarbarosh/node-helpers 3.24.0 → 3.25.0

package/package.json

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

package/src/errors/AbortError.js

@@ -1,5 +1,7 @@
+const UserFriendlyError = require('./UserFriendlyError');
+
 // https://github.com/nodejs/node/issues/36084#issuecomment-729894622
-class AbortError extends Error
+class AbortError extends UserFriendlyError
 {
     constructor(message = 'The operation was aborted') {
         super(message);

package/src/errors/UserFriendlyError.js

@@ -0,0 +1,8 @@
+class UserFriendlyError extends Error
+{
+    constructor(message) {
+        super(message);
+    }
+}
+
+module.exports = UserFriendlyError;

package/src/fastdl.js

@@ -1,8 +1,10 @@
+const UserFriendlyError = require('./errors/UserFriendlyError');
 const format_bytes = require('./format_bytes');
 const format_progress = require('./format_progress');
 const format_thousands = require('./format_thousands');
 const fs = require('fs');
 const fs_path_basename = require('./fs_path_basename');
+const ignore = require('./ignore');
 const make_progress = require('./make_progress');
 const parallel = require('./parallel');
 const stream = require('stream');
@@ -37,6 +39,7 @@ async function fastdl({file, read_stream_with_range, concurrency = 60, user_frie
 
     const timer = setInterval(tick, 1000);
     function tick() {
+        progress.refresh();
         user_friendly_status(`${format_progress(progress)} connections=${connections}`);
     }
 
@@ -51,7 +54,7 @@ async function fastdl({file, read_stream_with_range, concurrency = 60, user_frie
     }
 
     if (total !== total_written) {
-        throw new Error(`Total bytes written differs from size of a file: total[${total}] - total_written[${total_written}] = ${total - total_written}`);
+        throw new UserFriendlyError(`Total bytes written differs from expected size of a file: total[${total}] - total_written[${total_written}] = ${total - total_written}`);
     }
 
     function spawn() {
@@ -68,6 +71,11 @@ async function fastdl({file, read_stream_with_range, concurrency = 60, user_frie
                 return;
             }
             const rs = (first === 0) ? rs0 : await read_stream_with_range(first, last);
+            if (rs.content_range.total !== total) {
+                rs.once('error', ignore);
+                rs.destroy();
+                throw new UserFriendlyError('Size of a file changed during download');
+            }
             const acc = new stream.PassThrough({
                 transform(buf, encoding, next) {
                     first += buf.length;

package/src/sftp_get_stream_range.js

@@ -2,8 +2,6 @@ const ignore = require('./ignore');
 const ssh2 = require('ssh2');
 const waitcb = require('./waitcb');
 
-const ___stat = Symbol('sftp_get_stream_range.stat');
-
 async function sftp_get_stream_range(url, first, last, {log = ignore} = {})
 {
     const u = new URL(url);
@@ -25,7 +23,7 @@ async function sftp_get_stream_range(url, first, last, {log = ignore} = {})
     const sftp = await waitcb(cb => conn.sftp(cb));
 
     log('Requesting file info...');
-    const stat = url[___stat] || (url[___stat] = await waitcb(cb => sftp.stat(pathname, cb)));
+    const stat = await waitcb(cb => sftp.stat(pathname, cb));
 
     if (first < 0 || last >= stat.size) {
         throw new Error(`Invalid range: [first=${first}][last=${last}]`);