torrent: Attempt to set infoHash property synchronously

1 files changed, 20 insertions, 5 deletions

diff --git a/lib/torrent.js b/lib/torrent.js
index 0a1a03a..f14cf4e 100644
--- a/lib/torrent.js
+++ b/lib/torrent.js
@@ -187,11 +187,26 @@ Object.defineProperty(Torrent.prototype, 'torrentFileBlobURL', {
 Torrent.prototype._onTorrentId = function (torrentId) {
   var self = this
   if (self.destroyed) return
-  parseTorrent.remote(torrentId, function (err, parsedTorrent) {
-    if (self.destroyed) return
-    if (err) return self._onError(err)
-    self._onParsedTorrent(parsedTorrent)
-  })
+
+  var parsedTorrent
+  try { parsedTorrent = parseTorrent(torrentId) } catch (err) {}
+
+  if (parsedTorrent) {
+    // Attempt to set infoHash property synchronously
+    self.infoHash = parsedTorrent.infoHash
+    process.nextTick(function () {
+      if (self.destroyed) return
+      self._onParsedTorrent(parsedTorrent)
+    })
+  } else {
+    // If torrentId failed to parse, it could be in a form that requires an async
+    // operation, i.e. http/https link, filesystem path, or Blob.
+    parseTorrent.remote(torrentId, function (err, parsedTorrent) {
+      if (self.destroyed) return
+      if (err) return self._onError(err)
+      self._onParsedTorrent(parsedTorrent)
+    })
+  }
 }
 
 Torrent.prototype._onParsedTorrent = function (parsedTorrent) {