Remove destroy dependency

nodeca · Aug 19, 2020 · 56d1292 · 56d1292
1 parent ae863ef
commit 56d1292
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/lib/flatten-stream.js b/lib/flatten-stream.js
@@ -14,7 +14,6 @@
 
 
 const Denque  = require('denque');
-const destroy = require('destroy');
 const stream  = require('stream');
 const util    = require('util');
 
@@ -56,8 +55,6 @@ function add_data(data, fn) {
   this.queue.push([ data, fn ]);
 }
 
-function is_stream(s) { return s && typeof s.on === 'function'; }
-
 
 FlattenStream.prototype._write = function (data, encoding, callback) {
   add_data.call(this, data, callback);
@@ -72,12 +69,14 @@ FlattenStream.prototype.destroy = function () {
   this.stream_ended = true;
   this.push(null);
 
-  if (this.top_chunk_stream) destroy(this.top_chunk_stream);
+  if (this.top_chunk_stream && typeof this.top_chunk_stream.destroy === 'function') {
+    this.top_chunk_stream.destroy();
+  }
 
   while (!this.queue.isEmpty()) {
     let data = this.queue.shift()[0];
 
-    if (is_stream(data)) destroy(data);
+    if (data && typeof data.destroy === 'function') data.destroy();
   }
 };
 
@@ -104,7 +103,7 @@ FlattenStream.prototype._read = function () {
 
     let [ data, callback ] = this.queue.shift();
 
-    if (is_stream(data)) {
+    if (data && typeof data.on === 'function') {
       // looks like data is a stream
       this.state = STATE_FLOWING;
       this.top_chunk_stream = data;

diff --git a/lib/session.js b/lib/session.js
@@ -8,7 +8,6 @@ const crypto         = require('crypto');
 const Denque         = require('denque');
 const debug_err      = require('debug')('nntp-server.error');
 const debug_net      = require('debug')('nntp-server.network');
-const destroy        = require('destroy');
 const serializeError = require('serialize-error').serializeError;
 const split2         = require('split2');
 const pipeline       = require('stream').pipeline;
@@ -25,8 +24,6 @@ function escape_regexp(str) {
   return str.replace(/[\\^$.*+?()[\]{}|]/g, '\\$&');
 }
 
-function is_stream(s) { return s && typeof s.on === 'function'; }
-
 
 function Command(fn, cmd_line) {
   this.state = CMD_WAIT;
@@ -138,7 +135,7 @@ Session.prototype.current_group = null;
  */
 Session.prototype.write = function (data) {
   if (!this.out_stream.writable) {
-    if (is_stream(data)) destroy(data);
+    if (typeof data.destroy === 'function') data.destroy();
     return;
   }
 

diff --git a/package.json b/package.json
@@ -21,7 +21,6 @@
   "dependencies": {
     "debug": "^4.0.0",
     "denque": "^1.1.1",
-    "destroy": "^1.0.4",
     "serialize-error": "^7.0.1",
     "split2": "^3.0.0"
   },