diff options
| author | Cas <6506529+ThaUnknown@users.noreply.github.com> | 2022-09-02 23:22:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-02 23:22:50 +0300 |
| commit | 18aec6041d10ee533fab41f2e718eba8f15d45ab (patch) | |
| tree | bb3d2fce3a3a39c2e19976572782d65dc3a36b8f | |
| parent | 6666eb493f3a74f44de9533eb2e8a42b41664158 (diff) | |
| parent | 5b67491a70675520fbb13b3bfbcf03c389327dd7 (diff) | |
Merge pull request #2349 from ThaUnknown/multistream
fix: drop multi-stream
| -rw-r--r-- | lib/torrent.js | 5 | ||||
| -rw-r--r-- | 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 e05f5d6..2c3464a 100644 --- a/package.json +++ b/package.json @@ -52,11 +52,11 @@ "fast-blob-stream": "^1.1.0", "fs-chunk-store": "^2.0.5", "immediate-chunk-store": "^2.2.0", + "join-async-iterator": "^1.1.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", |