0.23.0

AUTHORS.md

@@ -77,7 +77,5 @@
 - Ameet Kaustav (akaustav@users.noreply.github.com)
 - gpatarin (gael.patarin@outlook.com)
 - Gael Patarin (gael.patarin@outlook.com)
-- Subin Siby (mail@subinsb.com)
-- Hinara (hinara.turevel@gmail.com)
 
 #### Generated by bin/update-authors.sh.

CHANGELOG.md

@@ -1,38 +1,15 @@
 # WebTorrent Desktop Version History
 
-## v0.24.0 - 2020-08-28
-
-### Added
-
-- Support the `.m2ts` video container format ([hicom150](https://github.com/hicom150))
-
-### Changed
-
-- Update to Electron 10.1.0 [\#1864](https://github.com/webtorrent/webtorrent-desktop/pull/1864) ([feross](https://github.com/feross))
-- Update the Windows installer loading image [\#1841](https://github.com/webtorrent/webtorrent-desktop/pull/1841) ([alxhotel](https://github.com/alxhotel))
-
-### Fixed
-
-- Fix music metadata not showing up [\#1847](https://github.com/webtorrent/webtorrent-desktop/pull/1847) ([Borewit](https://github.com/Borewit))
-- Fix the "Play in VLC" functionality [\#1850](https://github.com/webtorrent/webtorrent-desktop/pull/1850) ([Hinara](https://github.com/Hinara))
-- Prevent shortcuts from activating when user input elements are focused [\#1840](https://github.com/webtorrent/webtorrent-desktop/pull/1840) ([subins2000](https://github.com/subins2000))
-
 ## v0.23.0 - 2020-07-15
 
-🔒 This release contains a critical security fix. Please update as soon as possible.
-
-### Added
-
-- Add macOS Notarization [\#1834](https://github.com/webtorrent/webtorrent-desktop/pull/1834) ([feross](https://github.com/feross))
+This release contains a critical security fix.
 
 ### Changed
 
-- Update to Electron 10 beta [\#1834](https://github.com/webtorrent/webtorrent-desktop/pull/1834) ([feross](https://github.com/feross))
+- Update to Electron 10 beta [\#1834](https://github.com/webtorrent/webtorrent-desktop/pull/1834)
 
 ## v0.22.0 - 2020-07-15
 
-❤️✨ A new version of WebTorrent Desktop is out! ❤️✨
-
 ### Added
 
 - Linux `.rpm` packages and `arm64` builds are now available! [\#1694](https://github.com/webtorrent/webtorrent-desktop/pull/1694) ([hicom150](https://github.com/hicom150))
@@ -46,7 +23,7 @@
 - Update to Electron 9 [\#1729](https://github.com/webtorrent/webtorrent-desktop/pull/1729) [\#1832](https://github.com/webtorrent/webtorrent-desktop/issues/1832)
 - Update to music-metadata 4.8.0 [\#1719](https://github.com/webtorrent/webtorrent-desktop/pull/1719) ([Borewit](https://github.com/Borewit))
 - Update Windows build documentation [\#1715](https://github.com/webtorrent/webtorrent-desktop/pull/1715) ([RecoX](https://github.com/RecoX))
-- Remove unneeded dependencies ([feross](https://github.com/feross))
+- Remove unneeded dependencies
 
 ### Fixed
 
@@ -55,8 +32,8 @@
 - Fix percentage rounding error [\#1716](https://github.com/webtorrent/webtorrent-desktop/pull/1716) ([pR0Ps](https://github.com/pR0Ps))
 - Fix path-selector in preferences page [\#1702](https://github.com/webtorrent/webtorrent-desktop/pull/1702) ([314eter](https://github.com/314eter))
 - Fix path-selector in preferences page [\#1704](https://github.com/webtorrent/webtorrent-desktop/pull/1702) ([mathiasvr](https://github.com/mathiasvr))
-- Fix: Increase height of 'About' window [\#1737](https://github.com/webtorrent/webtorrent-desktop/pull/1737) ([akaustav](https://github.com/akaustav))
-- Fix "Save Torrent File As..." [\#1743](https://github.com/webtorrent/webtorrent-desktop/pull/1743) ([gpatarin](https://github.com/gpatarin))
+- Fix: Increase height of 'About' window [\#1737](https://github.com/webtorrent/webtorrent-desktop/pull/1737)
+- Fix "Save Torrent File As..." [\#1743](https://github.com/webtorrent/webtorrent-desktop/pull/1743)
 
 ## v0.21.0 - 2019-09-14
 

bin/darwin-entitlements.plist

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>com.apple.security.cs.allow-jit</key>
-    <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
-    <key>com.apple.security.cs.debugger</key>
-    <true/>
-  </dict>
-</plist>

bin/package.js

@@ -266,7 +266,6 @@ function buildDarwin (cb) {
 
     function signApp (cb) {
       const sign = require('electron-osx-sign')
-      const { notarize } = require('electron-notarize')
 
       /*
        * Sign the app with Apple Developer ID certificates. We sign the app for 2 reasons:
@@ -282,37 +281,16 @@ function buildDarwin (cb) {
        *   - Membership in the Apple Developer Program
        */
       const signOpts = {
-        verbose: true,
         app: appPath,
         platform: 'darwin',
-        identity: 'Developer ID Application: WebTorrent, LLC (5MAMC8G3L8)',
-        hardenedRuntime: true,
-        entitlements: path.join(config.ROOT_PATH, 'bin', 'darwin-entitlements.plist'),
-        'entitlements-inherit': path.join(config.ROOT_PATH, 'bin', 'darwin-entitlements.plist'),
-        'signature-flags': 'library'
-      }
-
-      const notarizeOpts = {
-        appBundleId: darwin.appBundleId,
-        appPath,
-        appleId: 'feross@feross.org',
-        appleIdPassword: '@keychain:AC_PASSWORD'
+        verbose: true
       }
 
       console.log('Mac: Signing app...')
       sign(signOpts, function (err) {
         if (err) return cb(err)
         console.log('Mac: Signed app.')
-
-        console.log('Mac: Notarizing app...')
-        notarize(notarizeOpts).then(
-          function () {
-            console.log('Mac: Notarized app.')
-            cb(null)
-          },
-          function (err) {
-            cb(err)
-          })
+        cb(null)
       })
     }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "webtorrent-desktop",
   "description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
-  "version": "0.24.0",
+  "version": "0.23.0",
   "author": {
     "name": "WebTorrent, LLC",
     "email": "feross@webtorrent.io",
@@ -16,8 +16,8 @@
     "arch": "^2.1.2",
     "auto-launch": "^5.0.5",
     "bitfield": "^3.0.0",
-    "capture-frame": "^4.0.0",
-    "chokidar": "^3.4.2",
+    "capture-frame": "^3.0.2",
+    "chokidar": "^3.4.1",
     "chromecasts": "^1.9.1",
     "create-torrent": "^4.4.2",
     "debounce": "^1.2.0",
@@ -25,11 +25,11 @@
     "drag-drop": "^6.0.2",
     "es6-error": "^4.1.1",
     "fn-getter": "^1.0.0",
-    "iso-639-1": "^2.1.4",
+    "iso-639-1": "^2.1.3",
     "languagedetect": "^2.0.0",
     "location-history": "^1.1.2",
     "material-ui": "^0.20.2",
-    "music-metadata": "^7.0.2",
+    "music-metadata": "6.3.6",
     "network-address": "^1.1.2",
     "parse-torrent": "^7.1.3",
     "prettier-bytes": "^1.0.4",
@@ -39,7 +39,7 @@
     "rimraf": "^3.0.2",
     "run-parallel": "^1.1.9",
     "semver": "^7.3.2",
-    "simple-concat": "^1.0.1",
+    "simple-concat": "^1.0.0",
     "simple-get": "^4.0.0",
     "srt-to-vtt": "^1.1.3",
     "vlc-command": "^1.2.0",
@@ -50,20 +50,19 @@
     "babel-eslint": "^10.1.0",
     "buble": "^0.20.0",
     "cross-zip": "^3.1.0",
-    "depcheck": "^1.2.0",
-    "electron": "~10.1.0",
-    "electron-notarize": "^1.0.0",
+    "depcheck": "^1.0.0",
+    "electron": "~9.1.0",
     "electron-osx-sign": "^0.4.17",
-    "electron-packager": "^15.1.0",
+    "electron-packager": "^15.0.0",
     "electron-winstaller": "^4.0.1",
     "gh-release": "^3.5.0",
     "minimist": "^1.2.5",
     "nodemon": "^2.0.4",
-    "open": "^7.2.1",
+    "open": "^7.0.4",
     "plist": "^3.0.1",
     "pngjs": "^5.0.0",
     "run-series": "^1.1.8",
-    "spectron": "~11.1.0",
+    "spectron": "~11.0.0",
     "standard": "*",
     "tape": "^5.0.1",
     "walk-sync": "^2.2.0"
@@ -87,7 +86,7 @@
   "optionalDependencies": {
     "appdmg": "^0.6.0",
     "electron-installer-debian": "^3.1.0",
-    "electron-installer-redhat": "^3.2.0"
+    "electron-installer-redhat": "^3.1.0"
   },
   "private": true,
   "productName": "WebTorrent",

src/crash-reporter.js

@@ -7,9 +7,8 @@ function init () {
   const electron = require('electron')
 
   electron.crashReporter.start({
+    companyName: config.APP_NAME,
     productName: config.APP_NAME,
-    submitURL: config.CRASH_REPORT_URL,
-    globalExtra: { _companyName: config.APP_NAME },
-    compress: true
+    submitURL: config.CRASH_REPORT_URL
   })
 }

src/main/external-player.js

@@ -17,12 +17,12 @@ let proc = null
 function checkInstall (playerPath, cb) {
   // check for VLC if external player has not been specified by the user
   // otherwise assume the player is installed
-  if (!playerPath) return vlcCommand(cb)
+  if (playerPath == null) return vlcCommand(cb)
   process.nextTick(() => cb(null))
 }
 
 function spawn (playerPath, url, title) {
-  if (playerPath) return spawnExternal(playerPath, [url])
+  if (playerPath != null) return spawnExternal(playerPath, [url])
 
   // Try to find and use VLC if external player is not specified
   vlcCommand((err, vlcPath) => {

src/main/index.js

@@ -3,13 +3,10 @@ console.time('init')
 const electron = require('electron')
 const app = electron.app
 
-// Start crash reporter early, so it takes effect for child processes
-const crashReporter = require('../crash-reporter')
-crashReporter.init()
-
 const parallel = require('run-parallel')
 
 const config = require('../config')
+const crashReporter = require('../crash-reporter')
 const ipc = require('./ipc')
 const log = require('./log')
 const menu = require('./menu')
@@ -112,6 +109,10 @@ function init () {
 
   ipc.init()
 
+  app.once('will-finish-launching', function () {
+    crashReporter.init()
+  })
+
   app.once('ipcReady', function () {
     log('Command line args:', argv)
     processArgv(argv)

src/main/squirrel-win32.js

@@ -2,9 +2,11 @@ module.exports = {
   handleEvent
 }
 
-const path = require('path')
-const spawn = require('child_process').spawn
+const cp = require('child_process')
 const electron = require('electron')
+const fs = require('fs')
+const os = require('os')
+const path = require('path')
 
 const app = electron.app
 
@@ -13,29 +15,137 @@ const handlers = require('./handlers')
 const EXE_NAME = path.basename(process.execPath)
 const UPDATE_EXE = path.join(process.execPath, '..', '..', 'Update.exe')
 
-const run = function (args, done) {
-  spawn(UPDATE_EXE, args, { detached: true })
-    .on('close', done)
-}
-
 function handleEvent (cmd) {
-  if (cmd === '--squirrel-install' || cmd === '--squirrel-updated') {
-    run([`--createShortcut=${EXE_NAME}`], app.quit)
+  if (cmd === '--squirrel-install') {
+    // App was installed. Install desktop/start menu shortcuts.
+    createShortcuts(function () {
+      // Ensure user sees install splash screen so they realize that Setup.exe actually
+      // installed an application and isn't the application itself.
+      setTimeout(function () {
+        app.quit()
+      }, 3000)
+    })
+    return true
+  }
+
+  if (cmd === '--squirrel-updated') {
+    // App was updated. (Called on new version of app)
+    updateShortcuts(function () {
+      app.quit()
+    })
     return true
   }
 
   if (cmd === '--squirrel-uninstall') {
+    // App was just uninstalled. Undo anything we did in the --squirrel-install and
+    // --squirrel-updated handlers
+
     // Uninstall .torrent file and magnet link handlers
     handlers.uninstall()
 
-    run([`--removeShortcut=${EXE_NAME}`], app.quit)
+    // Remove desktop/start menu shortcuts.
+    // HACK: add a callback to handlers.uninstall() so we can remove this setTimeout
+    setTimeout(function () {
+      removeShortcuts(function () {
+        app.quit()
+      })
+    }, 1000)
+
     return true
   }
 
   if (cmd === '--squirrel-obsolete') {
+    // App will be updated. (Called on outgoing version of app)
     app.quit()
     return true
   }
 
+  if (cmd === '--squirrel-firstrun') {
+    // App is running for the first time. Do not quit, allow startup to continue.
+    return false
+  }
+
   return false
 }
+
+/**
+ * Spawn a command and invoke the callback when it completes with an error and
+ * the output from standard out.
+ */
+function spawn (command, args, cb) {
+  let stdout = ''
+  let error = null
+  let child = null
+  try {
+    child = cp.spawn(command, args)
+  } catch (err) {
+    // Spawn can throw an error
+    process.nextTick(function () {
+      cb(error, stdout)
+    })
+    return
+  }
+
+  child.stdout.on('data', function (data) {
+    stdout += data
+  })
+
+  child.on('error', function (processError) {
+    error = processError
+  })
+
+  child.on('close', function (code, signal) {
+    if (code !== 0 && !error) error = new Error('Command failed: #{signal || code}')
+    if (error) error.stdout = stdout
+    cb(error, stdout)
+  })
+}
+
+/**
+ * Spawn the Squirrel `Update.exe` command with the given arguments and invoke
+ * the callback when the command completes.
+ */
+function spawnUpdate (args, cb) {
+  spawn(UPDATE_EXE, args, cb)
+}
+
+/**
+ * Create desktop and start menu shortcuts using the Squirrel `Update.exe`
+ * command.
+ */
+function createShortcuts (cb) {
+  spawnUpdate(['--createShortcut', EXE_NAME], cb)
+}
+
+/**
+ * Update desktop and start menu shortcuts using the Squirrel `Update.exe`
+ * command.
+ */
+function updateShortcuts (cb) {
+  const homeDir = os.homedir()
+  if (homeDir) {
+    const desktopShortcutPath = path.join(homeDir, 'Desktop', 'WebTorrent.lnk')
+    // If the desktop shortcut was deleted by the user, then keep it deleted.
+    fs.access(desktopShortcutPath, function (err) {
+      const desktopShortcutExists = !err
+      createShortcuts(function () {
+        if (desktopShortcutExists) {
+          cb()
+        } else {
+          // Remove the unwanted desktop shortcut that was recreated
+          fs.unlink(desktopShortcutPath, cb)
+        }
+      })
+    })
+  } else {
+    createShortcuts(cb)
+  }
+}
+
+/**
+ * Remove desktop and start menu shortcuts using the Squirrel `Update.exe`
+ * command.
+ */
+function removeShortcuts (cb) {
+  spawnUpdate(['--removeShortcut', EXE_NAME], cb)
+}

src/main/windows/about.js

@@ -26,8 +26,7 @@ function init () {
     useContentSize: true,
     webPreferences: {
       nodeIntegration: true,
-      enableBlinkFeatures: 'AudioVideoTracks',
-      enableRemoteModule: true
+      enableBlinkFeatures: 'AudioVideoTracks'
     },
     width: 300
   })

src/main/windows/main.js

@@ -44,8 +44,7 @@ function init (state, options) {
     width: initialBounds.width,
     webPreferences: {
       nodeIntegration: true,
-      enableBlinkFeatures: 'AudioVideoTracks',
-      enableRemoteModule: true
+      enableBlinkFeatures: 'AudioVideoTracks'
     },
     x: initialBounds.x,
     y: initialBounds.y

src/main/windows/webtorrent.js

@@ -26,8 +26,7 @@ function init () {
     useContentSize: true,
     webPreferences: {
       nodeIntegration: true,
-      enableBlinkFeatures: 'AudioVideoTracks',
-      enableRemoteModule: true
+      enableBlinkFeatures: 'AudioVideoTracks'
     },
     width: 150
   })

src/renderer/lib/media-extensions.js

@@ -5,7 +5,7 @@ const mediaExtensions = {
     '.ogg', '.opus', '.spx', '.wma', '.wav', '.wv', '.wvp'],
   video: [
     '.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', '.mpg', '.mpeg',
-    '.ogv', '.webm', '.wmv', '.m2ts'],
+    '.ogv', '.webm', '.wmv'],
   image: ['.gif', '.jpg', '.jpeg', '.png']
 }
 

src/renderer/lib/torrent-poster.js

@@ -166,8 +166,7 @@ function torrentPosterFromVideo (torrent, cb) {
     function onSeeked () {
       video.removeEventListener('seeked', onSeeked)
 
-      const frame = captureFrame(video)
-      const buf = frame && frame.image
+      const buf = captureFrame(video)
 
       // unload video element
       video.pause()

src/renderer/main.js

@@ -14,6 +14,9 @@ Module.prototype.require = function (id) {
 
 console.time('init')
 
+const crashReporter = require('../crash-reporter')
+crashReporter.init()
+
 // Perf optimization: Start asynchronously read on config file before all the
 // blocking require() calls below.
 
@@ -521,9 +524,6 @@ function onPaste (e) {
 }
 
 function onKeydown (e) {
-  // prevent event fire on user input elements
-  if (editableHtmlTags.has(e.target.tagName.toLowerCase())) return
-
   const key = e.key
 
   if (key === 'ArrowLeft') {

src/renderer/webtorrent.js

@@ -12,10 +12,14 @@ const networkAddress = require('network-address')
 const path = require('path')
 const WebTorrent = require('webtorrent')
 
+const crashReporter = require('../crash-reporter')
 const config = require('../config')
 const { TorrentKeyNotFoundError } = require('./lib/errors')
 const torrentPoster = require('./lib/torrent-poster')
 
+// Report when the process crashes
+crashReporter.init()
+
 // Send & receive messages from the main window
 const ipc = electron.ipcRenderer
 
@@ -343,10 +347,7 @@ function getAudioMetadata (infoHash, index) {
     skipCovers: true,
     fileSize: file.length,
     observer: event => {
-      ipc.send('wt-audio-metadata', infoHash, index, {
-        common: metadata.common,
-        format: metadata.format
-      })
+      ipc.send('wt-audio-metadata', infoHash, index, event.metadata)
     }
   }
   const onMetadata = file.done