@vbarbarosh/node-helpers 3.29.1 → 3.30.1

package/package.json

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

package/src/sftp_get_file_info.js

@@ -3,7 +3,7 @@ const ignore = require('./ignore');
 const ssh2 = require('ssh2');
 const waitcb = require('./waitcb');
 
-async function sftp_get_file_info(url, {log = ignore})
+async function sftp_get_file_info(url, {user_friendly_status = ignore})
 {
     const u = new URL(url);
     const host = u.host;
@@ -12,7 +12,7 @@ async function sftp_get_file_info(url, {log = ignore})
     const password = decodeURIComponent(u.password);
     const pathname = u.pathname;
 
-    log('Establishing connection...');
+    user_friendly_status('Establishing connection...');
     const conn = new ssh2.Client();
     try {
         await new Promise(function (resolve, reject) {
@@ -21,10 +21,10 @@ async function sftp_get_file_info(url, {log = ignore})
             conn.connect({host, port, username, password});
         });
 
-        log('Asking for an sftp service...');
+        user_friendly_status('Asking for an sftp service...');
         const sftp = await waitcb(cb => conn.sftp(cb));
 
-        log('Requesting file info...');
+        user_friendly_status('Requesting file info...');
         const [stat, lstat, readdir] = await Promise.all([
             waitcb(cb => sftp.stat(pathname, cb)),
             waitcb(cb => sftp.lstat(pathname, cb)),

package/src/sftp_get_stream_range.js

@@ -2,7 +2,7 @@ const ignore = require('./ignore');
 const ssh2 = require('ssh2');
 const waitcb = require('./waitcb');
 
-async function sftp_get_stream_range(url, first, last, {log = ignore} = {})
+async function sftp_get_stream_range(url, first, last, {user_friendly_status = ignore} = {})
 {
     const u = new URL(url);
     const host = u.host;
@@ -11,7 +11,7 @@ async function sftp_get_stream_range(url, first, last, {log = ignore} = {})
     const password = decodeURIComponent(u.password);
     const pathname = u.pathname;
 
-    log('Establishing connection...');
+    user_friendly_status('Establishing connection...');
     const conn = new ssh2.Client();
     await new Promise(function (resolve, reject) {
         conn.on('ready', resolve);
@@ -19,10 +19,10 @@ async function sftp_get_stream_range(url, first, last, {log = ignore} = {})
         conn.connect({host, port, username, password});
     });
 
-    log('Asking for an sftp service...');
+    user_friendly_status('Asking for an sftp service...');
     const sftp = await waitcb(cb => conn.sftp(cb));
 
-    log('Requesting file info...');
+    user_friendly_status('Requesting file info...');
     const stat = await waitcb(cb => sftp.stat(pathname, cb));
 
     if (first < 0 || last >= stat.size) {
@@ -36,6 +36,7 @@ async function sftp_get_stream_range(url, first, last, {log = ignore} = {})
         last,
         total: stat.size,
     };
+    out.total = out.content_range.total;
     out.once('error', function () {
         conn.destroy();
     });

package/src/stream_lines.js

@@ -0,0 +1,11 @@
+const stream_strpbrk = require('./stream_strpbrk');
+
+/**
+ * Split stream into lines
+ */
+function stream_lines()
+{
+    return stream_strpbrk('\r\n');
+}
+
+module.exports = stream_lines;