@vbarbarosh/node-helpers 3.18.0 → 3.19.0

package/package.json

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

package/src/make_progress.js

@@ -21,10 +21,9 @@ function make_progress(total)
         progress: null,
         percents: null,
         add: function (delta = 0) {
-            const now_minus_5sec = Date.now() - 5000;
+            const now_minus_10sec = Date.now() - 10000;
+            history.splice(0, history.findLastIndex(v => v.time < now_minus_10sec));
             history.push({time: Date.now(), delta});
-            // Keep last 5 seconds
-            history.splice(0, history.findLastIndex(v => v.time < now_minus_5sec));
             out.done += delta;
             out.refresh();
         },
@@ -32,19 +31,17 @@ function make_progress(total)
             out.add(done - out.done);
         },
         refresh: function () {
-            const now_minus_2sec = Date.now() - 2000;
-            const tmp = history.filter(v => v.time >= now_minus_2sec);
-            if (tmp.length > 1) {
-                const items = tmp.reduce((a,v) => a + v.delta, 0);
-                const time_sec = (tmp.pop().time - tmp[0].time)/1000;
-                out.rate = items/time_sec;
+            out.duration = (Date.now() - time0)/1000;
+            out.percents = !out.total ? null : out.done/out.total;
+            out.eta = !out.total ? null : (out.total - out.done)/out.rate;
+            if (history.length) {
+                const delta = history.reduce((a,v) => a + v.delta, 0);
+                const time_sec = (Date.now() - history[0].time)/1000;
+                out.rate = delta/time_sec;
             }
             else {
                 out.rate = out.done/out.duration;
             }
-            out.duration = (Date.now() - time0)/1000;
-            out.percents = !out.total ? null : out.done/out.total;
-            out.eta = !out.total ? null : (out.total - out.done)/out.rate;
         },
     };
     return out;

package/src/stream_hash.js

@@ -0,0 +1,19 @@
+const crypto = require('crypto');
+const stream = require('stream');
+
+function stream_hash(algorithm = 'md5', options)
+{
+    const hash = crypto.createHash(algorithm, options);
+    return new stream.Transform({
+        transform: function (chunk, encoding, next) {
+            hash.update(chunk);
+            next();
+        },
+        flush: function (next) {
+            this.push(hash.digest('hex'));
+            next();
+        },
+    });
+}
+
+module.exports = stream_hash;

package/src/stream_md5.js

@@ -0,0 +1,19 @@
+const crypto = require('crypto');
+const stream = require('stream');
+
+function stream_md5()
+{
+    const md5 = crypto.createHash('md5');
+    return new stream.Transform({
+        transform: function (chunk, encoding, next) {
+            md5.update(chunk, encoding);
+            next();
+        },
+        flush: function (next) {
+            this.push(md5.digest('hex'));
+            next();
+        },
+    });
+}
+
+module.exports = stream_md5;

package/src/stream_multiplex.js

@@ -1,9 +1,12 @@
 const ignore = require('./ignore');
 const stream = require('stream');
-const wait_while = require('./wait_while');
 
 function stream_multiplex(...streams)
 {
+    if (streams.length === 1) {
+        return streams[0];
+    }
+
     // `new stream.Writable()` will ignore second, third, etc. calls to `destroy`
     return stream.Writable({
         objectMode: true,
@@ -12,38 +15,36 @@ function stream_multiplex(...streams)
             next();
         },
         destroy: async function (error, next) {
-            let running = streams.length;
-            streams.forEach(s => s.destroy(error, () => running--));
-            await wait_while(() => running > 0);
-            next();
+            let done = 0;
+            streams.forEach(function (stream) {
+                stream.destroy(error, function () {
+                    if (++done === streams.length) {
+                        next();
+                    }
+                });
+            });
         },
-        write: async function (chunk, enc, next) {
-            let running = streams.length;
+        write: async function (chunk, encoding, next) {
+            let done = 0;
             streams.forEach(function (stream) {
-                stream.write(chunk, function (error) {
-                    running--;
-                    if (error) {
+                stream.write(chunk, encoding, function (error) {
+                    if (++done === streams.length || error) {
                         next(error);
                         next = ignore;
                     }
                 });
             });
-            await wait_while(() => running > 0);
-            next();
         },
         final: async function (next) {
-            let running = streams.length;
+            let done = 0;
             streams.forEach(function (stream) {
                 stream.end(function (error) {
-                    running--;
-                    if (error) {
+                    if (++done === streams.length || error) {
                         next(error);
                         next = ignore;
                     }
                 });
             });
-            await wait_while(() => running > 0);
-            next();
         },
     });
 }

package/src/wait_while.js

@@ -2,6 +2,10 @@ const Promise = require('bluebird');
 
 /**
  * Wait until `fn` returns `true`.
+ *
+ * W A R N I N G
+ * This method was designed mainly for prototyping (where code cleanliness is important).
+ * It might drastically decrease performance.
  */
 function wait_while(fn)
 {