Merge branch 'master' into rusha

Author: ThaUnknown

.github/workflows/stale.yml

@@ -12,7 +12,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/stale@v5
+    - uses: actions/stale@v6
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?'

CHANGELOG.md

@@ -1,3 +1,24 @@
+## [5.0.9](https://github.com/webtorrent/create-torrent/compare/v5.0.8...v5.0.9) (2022-11-10)
+
+
+### Bug Fixes
+
+* hash faster than callback ([#186](https://github.com/webtorrent/create-torrent/issues/186)) ([298f356](https://github.com/webtorrent/create-torrent/commit/298f356c9ba7832c22eee954025ab50bf29dc922))
+
+## [5.0.8](https://github.com/webtorrent/create-torrent/compare/v5.0.7...v5.0.8) (2022-11-10)
+
+
+### Bug Fixes
+
+* **deps:** update dependency minimist to ^1.2.7 ([#162](https://github.com/webtorrent/create-torrent/issues/162)) ([b81eb98](https://github.com/webtorrent/create-torrent/commit/b81eb98b3a0b0358c40cac387a3a324ae0b4616a))
+
+## [5.0.7](https://github.com/webtorrent/create-torrent/compare/v5.0.6...v5.0.7) (2022-11-10)
+
+
+### Bug Fixes
+
+* drop block-stream, drop streamx ([#185](https://github.com/webtorrent/create-torrent/issues/185)) ([4e0669c](https://github.com/webtorrent/create-torrent/commit/4e0669c3b2f92a4c0d115bcb6b01c26a21f9dbd6))
+
 ## [5.0.6](https://github.com/webtorrent/create-torrent/compare/v5.0.5...v5.0.6) (2022-09-02)
 
 

index.js

@@ -1,17 +1,15 @@
 /*! create-torrent. MIT License. WebTorrent LLC <https://webtorrent.io/opensource> */
 const bencode = require('bencode')
-const BlockStream = require('block-stream2')
+const blockIterator = require('block-iterator')
 const calcPieceLength = require('piece-length')
 const corePath = require('path')
-const { BlobReadStream } = require('fast-blob-stream')
 const isFile = require('is-file')
 const junk = require('junk')
 const joinIterator = require('join-async-iterator')
-const once = require('once')
 const parallel = require('run-parallel')
 const queueMicrotask = require('queue-microtask')
 const { sha1 } = require('uint8-util')
-const { Transform, PassThrough, Readable } = require('streamx')
+require('fast-readable-async-iterator')
 
 const getFiles = require('./get-files') // browser exclude
 
@@ -176,10 +174,10 @@ function _parseInput (input, opts, cb) {
       const file = {}
 
       if (isBlob(item)) {
-        file.getStream = getBlobStream(item)
+        file.getStream = item.stream()
         file.length = item.size
       } else if (Buffer.isBuffer(item)) {
-        file.getStream = getBufferStream(item)
+        file.getStream = [item] // wrap in iterable to write entire buffer at once instead of unwrapping all bytes
         file.length = item.length
       } else if (isReadable(item)) {
         file.getStream = getStreamStream(item, file)
@@ -206,73 +204,42 @@ function _parseInput (input, opts, cb) {
 
 const MAX_OUTSTANDING_HASHES = 5
 
-function getPieceList (files, pieceLength, estimatedTorrentLength, opts, cb) {
-  cb = once(cb)
+async function getPieceList (files, pieceLength, estimatedTorrentLength, opts, cb) {
   const pieces = []
   let length = 0
   let hashedLength = 0
 
   const streams = files.map(file => file.getStream)
 
+  const onProgress = opts.onProgress
+
   let remainingHashes = 0
   let pieceNum = 0
   let ended = false
 
-  const multistream = Readable.from(joinIterator(streams))
-  const blockstream = new BlockStream(pieceLength, { zeroPadding: false })
-
-  multistream.on('error', onError)
-
-  multistream
-    .pipe(blockstream)
-    .on('data', onData)
-    .on('end', onEnd)
-    .on('error', onError)
-
-  function onData (chunk) {
-    length += chunk.length
-
-    const i = pieceNum
-    sha1(chunk, hash => {
-      pieces[i] = hash
-      remainingHashes -= 1
-      if (remainingHashes < MAX_OUTSTANDING_HASHES) {
-        blockstream.resume()
-      }
-      hashedLength += chunk.length
-      if (opts.onProgress) opts.onProgress(hashedLength, estimatedTorrentLength)
-      maybeDone()
-    })
-    remainingHashes += 1
-    if (remainingHashes >= MAX_OUTSTANDING_HASHES) {
-      blockstream.pause()
+  const iterator = blockIterator(joinIterator(streams), pieceLength, { zeroPadding: false })
+  try {
+    for await (const chunk of iterator) {
+      await new Promise(resolve => {
+        length += chunk.length
+        const i = pieceNum
+        ++pieceNum
+        if (++remainingHashes < MAX_OUTSTANDING_HASHES) resolve()
+        sha1(chunk, hash => {
+          pieces[i] = hash
+          --remainingHashes
+          hashedLength += chunk.length
+          if (onProgress) onProgress(hashedLength, estimatedTorrentLength)
+          resolve()
+          if (ended && remainingHashes === 0) cb(null, Buffer.from(pieces.join(''), 'hex'), length)
+        })
+      })
     }
-    pieceNum += 1
-  }
-
-  function onEnd () {
+    if (remainingHashes === 0) return cb(null, Buffer.from(pieces.join(''), 'hex'), length)
     ended = true
-    maybeDone()
-  }
-
-  function onError (err) {
-    cleanup()
+  } catch (err) {
     cb(err)
   }
-
-  function cleanup () {
-    multistream.removeListener('error', onError)
-    blockstream.removeListener('data', onData)
-    blockstream.removeListener('end', onEnd)
-    blockstream.removeListener('error', onError)
-  }
-
-  function maybeDone () {
-    if (ended && remainingHashes === 0) {
-      cleanup()
-      cb(null, Buffer.from(pieces.join(''), 'hex'), length)
-    }
-  }
 }
 
 function onFiles (files, opts, cb) {
@@ -409,45 +376,18 @@ function isReadable (obj) {
 }
 
 /**
- * Convert a `File` to a lazy readable stream.
- * @param  {File|Blob} file
- * @return {function}
- */
-function getBlobStream (file) {
-  return () => new BlobReadStream(file)
-}
-
-/**
- * Convert a `Buffer` to a lazy readable stream.
- * @param  {Buffer} buffer
- * @return {function}
- */
-function getBufferStream (buffer) {
-  return () => {
-    const s = new PassThrough()
-    s.end(buffer)
-    return s
-  }
-}
-
-/**
- * Convert a readable stream to a lazy readable stream. Adds instrumentation to track
+ * Convert a readable stream to a lazy async iterator. Adds instrumentation to track
  * the number of bytes in the stream and set `file.length`.
  *
+ * @generator
  * @param  {Stream} readable
  * @param  {Object} file
- * @return {function}
+ * @return {Uint8Array} stream data/chunk
  */
-function getStreamStream (readable, file) {
-  return () => {
-    const counter = new Transform()
-    counter._transform = function (data, cb) {
-      file.length += data.length
-      this.push(data)
-      cb()
-    }
-    readable.pipe(counter)
-    return counter
+async function * getStreamStream (readable, file) {
+  for await (const chunk of readable) {
+    file.length += chunk.length
+    yield chunk
   }
 }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-torrent",
   "description": "Create .torrent files",
-  "version": "5.0.6",
+  "version": "5.0.9",
   "author": {
     "name": "WebTorrent LLC",
     "email": "feross@webtorrent.io",
@@ -19,17 +19,15 @@
   },
   "dependencies": {
     "bencode": "^2.0.3",
-    "block-stream2": "^2.1.0",
-    "fast-blob-stream": "^1.1.1",
+    "block-iterator": "^1.0.1",
+    "fast-readable-async-iterator": "^1.1.1",
     "is-file": "^1.0.0",
     "join-async-iterator": "^1.1.1",
     "junk": "^3.1.0",
-    "minimist": "^1.2.5",
-    "once": "^1.4.0",
+    "minimist": "^1.2.7",
     "piece-length": "^2.0.1",
     "queue-microtask": "^1.2.3",
     "run-parallel": "^1.2.0",
-    "streamx": "^2.12.4",
     "uint8-util": "^1.0.1"
   },
   "devDependencies": {