From 5d87d1b32356f6b75ed4f9aefe91f3ddf1ecebdb Mon Sep 17 00:00:00 2001 From: ThaUnknown <6506529+ThaUnknown@users.noreply.github.com> Date: Mon, 4 Jul 2022 16:36:39 +0200 Subject: fix: drop multi-stream --- lib/torrent.js | 5 +++-- package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/torrent.js b/lib/torrent.js index ff4dcdd..b1ff330 100644 --- a/lib/torrent.js +++ b/lib/torrent.js @@ -17,7 +17,7 @@ const get = require('simple-get') const ImmediateChunkStore = require('immediate-chunk-store') const ltDontHave = require('lt_donthave') const MemoryChunkStore = require('memory-chunk-store') -const MultiStream = require('multistream') +const joinIterator = require('join-async-iterator') const parallel = require('run-parallel') const parallelLimit = require('run-parallel-limit') const parseTorrent = require('parse-torrent') @@ -29,6 +29,7 @@ const sha1 = require('simple-sha1') const throughput = require('throughput') const utMetadata = require('ut_metadata') const utPex = require('ut_pex') // browser exclude +const { Readable } = require('streamx') const File = require('./file.js') const Peer = require('./peer.js') @@ -1784,7 +1785,7 @@ class Torrent extends EventEmitter { if (!Array.isArray(streams)) streams = [streams] if (!cb) cb = noop - const readable = new MultiStream(streams) + const readable = Readable.from(joinIterator(streams)) const writable = new ChunkStoreWriteStream(this.store, this.pieceLength) pump(readable, writable, err => { diff --git a/package.json b/package.json index 6175ad1..0ba173f 100644 --- a/package.json +++ b/package.json @@ -51,11 +51,11 @@ "escape-html": "^1.0.3", "fs-chunk-store": "^2.0.5", "immediate-chunk-store": "^2.2.0", + "join-async-iterator": "^1.0.0", "load-ip-set": "^2.2.1", "lt_donthave": "^1.0.1", "memory-chunk-store": "^1.3.5", "mime": "^3.0.0", - "multistream": "^4.1.0", "package-json-versionify": "^1.0.4", "parse-torrent": "^9.1.5", "pump": "^3.0.0", -- cgit v1.2.3