Replace pump with pipeline

nodeca · Aug 19, 2020 · f2c5f06 · f2c5f06
1 parent f14182b
commit f2c5f06
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 34 deletions.
diff --git a/lib/commands/hdr.js b/lib/commands/hdr.js
@@ -3,9 +3,8 @@
 'use strict';
 
 
-const pump       = require('pump');
 const status     = require('../status');
-const { Readable, Transform } = require('stream');
+const { Readable, Transform, pipeline } = require('stream');
 
 
 const CMD_RE = /^X?HDR ([^\s]+)(?: (?:(\d{1,15})(-(\d{1,15})?)?|(<[^\s<>]+>))?)?$/i;
@@ -85,7 +84,7 @@ module.exports = {
         }
       });
 
-      pump(article_stream, stream);
+      pipeline(article_stream, stream, () => {});
 
       return stream;
     }

diff --git a/lib/commands/list.js b/lib/commands/list.js
@@ -3,9 +3,8 @@
 'use strict';
 
 
-const pump       = require('pump');
 const status     = require('../status');
-const { Readable, Transform } = require('stream');
+const { Readable, Transform, pipeline } = require('stream');
 
 const CMD_RE = /^LIST( (.+))?$/i;
 
@@ -32,7 +31,7 @@ module.exports = {
       }
     });
 
-    pump(groups, stream);
+    pipeline(groups, stream, () => {});
 
     return [
       status._215_INFO_FOLLOWS,

diff --git a/lib/commands/list_active.js b/lib/commands/list_active.js
@@ -3,10 +3,9 @@
 'use strict';
 
 
-const pump       = require('pump');
 const status     = require('../status');
 const wildmat_re = require('../wildmat');
-const { Readable, Transform } = require('stream');
+const { Readable, Transform, pipeline } = require('stream');
 
 
 const CMD_RE = /^LIST ACTIVE( ([^\s]+))?$/i;
@@ -40,7 +39,7 @@ module.exports = {
       }
     });
 
-    pump(groups, stream);
+    pipeline(groups, stream, () => {});
 
     return [
       status._215_INFO_FOLLOWS,

diff --git a/lib/commands/list_newsgroups.js b/lib/commands/list_newsgroups.js
@@ -3,10 +3,9 @@
 'use strict';
 
 
-const pump       = require('pump');
 const status     = require('../status');
 const wildmat_re = require('../wildmat');
-const { Readable, Transform } = require('stream');
+const { Readable, Transform, pipeline } = require('stream');
 
 
 const CMD_RE = /^LIST NEWSGROUPS( ([^\s]+))?$/i;
@@ -40,7 +39,7 @@ module.exports = {
       }
     });
 
-    pump(groups, stream);
+    pipeline(groups, stream, () => {});
 
     return [
       status._215_INFO_FOLLOWS,

diff --git a/lib/commands/listgroup.js b/lib/commands/listgroup.js
@@ -3,9 +3,8 @@
 'use strict';
 
 
-const pump       = require('pump');
 const status     = require('../status');
-const { Readable, Transform } = require('stream');
+const { Readable, Transform, pipeline } = require('stream');
 
 
 const CMD_RE = /^LISTGROUP( ([^\s]+)( (\d{1,15})((-)(\d{1,15})?)?)?)?$/i;
@@ -65,7 +64,7 @@ module.exports = {
       }
     });
 
-    pump(articles, stream);
+    pipeline(articles, stream, () => {});
 
     return [
       `${status._211_GRP_SELECTED} ${g.total} ${g.min_index} ${g.max_index} ${name} list follows`,

diff --git a/lib/commands/newgroups.js b/lib/commands/newgroups.js
@@ -3,9 +3,8 @@
 'use strict';
 
 
-const pump       = require('pump');
 const status     = require('../status');
-const { Readable, Transform } = require('stream');
+const { Readable, Transform, pipeline } = require('stream');
 
 
 const CMD_RE = /^NEWGROUPS (\d{6,8})\s(\d{6})(?:\sGMT)?$/i;
@@ -49,7 +48,7 @@ module.exports = {
       }
     });
 
-    pump(groups, stream);
+    pipeline(groups, stream, () => {});
 
     return [
       status._215_INFO_FOLLOWS,

diff --git a/lib/commands/newnews.js b/lib/commands/newnews.js
@@ -5,10 +5,9 @@
 'use strict';
 
 
-const pump       = require('pump');
 const status     = require('../status');
 const wildmat_re = require('../wildmat');
-const { Readable, Transform } = require('stream');
+const { Readable, Transform, pipeline } = require('stream');
 
 
 const CMD_RE = /^NEWNEWS ([^\s]+)\s(\d{6,8})\s(\d{6})(?:\sGMT)?$/i;
@@ -60,7 +59,7 @@ module.exports = {
       }
     });
 
-    pump(newnews, stream);
+    pipeline(newnews, stream, () => {});
 
     return [
       status._230_NEWNEWS_FOLLOW,

diff --git a/lib/commands/over.js b/lib/commands/over.js
@@ -3,9 +3,8 @@
 'use strict';
 
 
-const pump       = require('pump');
 const status     = require('../status');
-const { Readable, Transform } = require('stream');
+const { Readable, Transform, pipeline } = require('stream');
 
 
 const CMD_RE = /^X?OVER(?: (?:(\d{1,15})(-(\d{1,15})?)?|(<[^\s<>]+>))?)?$/i;
@@ -93,7 +92,7 @@ module.exports = {
         }
       });
 
-      pump(article_stream, stream);
+      pipeline(article_stream, stream, () => {});
 
       return stream;
     }

diff --git a/lib/flatten-stream.js b/lib/flatten-stream.js
@@ -15,7 +15,6 @@
 
 const Denque  = require('denque');
 const destroy = require('destroy');
-const eos     = require('end-of-stream');
 const stream  = require('stream');
 const util    = require('util');
 
@@ -133,7 +132,7 @@ FlattenStream.prototype._read = function () {
       data.on('readable', this.top_chunk_read_fn);
       this.top_chunk_read_fn();
 
-      eos(data, err => {
+      stream.finished(data, err => {
         data.removeListener('readable', this.top_chunk_read_fn);
 
         if (err) {

diff --git a/lib/session.js b/lib/session.js
@@ -11,7 +11,7 @@ const debug_net      = require('debug')('nntp-server.network');
 const destroy        = require('destroy');
 const serializeError = require('serialize-error').serializeError;
 const split2         = require('split2');
-const pump           = require('pump');
+const pipeline       = require('stream').pipeline;
 const flattenStream  = require('./flatten-stream');
 const status         = require('./status');
 
@@ -84,14 +84,14 @@ function Session(server, stream) {
 
   this.write(status._201_SRV_READY_RO);
 
-  pump(stream, this.lines);
+  pipeline(stream, this.lines, () => {});
 
-  pump(this.out_stream, stream);
+  pipeline(this.out_stream, stream, () => {});
 
   if (debug_net.enabled) {
     let debug_logger = split2();
 
-    pump(this.out_stream, debug_logger);
+    pipeline(this.out_stream, debug_logger, () => {});
 
     debug_logger.on('data', line => {
       debug_net('<-- [%s] %s', this.debug_mark, line);

diff --git a/package.json b/package.json
@@ -22,8 +22,6 @@
     "debug": "^4.0.0",
     "denque": "^1.1.1",
     "destroy": "^1.0.4",
-    "end-of-stream": "^1.4.0",
-    "pump": "^3.0.0",
     "serialize-error": "^7.0.1",
     "split2": "^3.0.0"
   },

diff --git a/test/helpers/asline.js b/test/helpers/asline.js
@@ -4,7 +4,7 @@
 
 
 const assert   = require('assert');
-const pump     = require('pump');
+const pipeline = require('stream').pipeline;
 const split2   = require('split2');
 const util     = require('util');
 
@@ -18,7 +18,7 @@ function AsLine(stream, options = {}) {
   this._timeout   = options.timeout;
   this._linebreak = options.linebreak || '\r\n';
 
-  pump(stream, this._input);
+  pipeline(stream, this._input, () => {});
 }