Merge branch 'master' into esm

* fix: modernify code

* standard fix

* fixes

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github: feross
-custom: https://paypal.me/borewit

.github/ISSUE_TEMPLATE.md

@@ -1,11 +0,0 @@
-<!-- DO NOT POST LINKS OR REFERENCES TO COPYRIGHTED CONTENT IN YOUR ISSUE. -->
-
-**What version of WebTorrent Desktop?** (See the 'About WebTorrent' menu)
-
-**What operating system and version?**
-
-**What did you do?**
-
-**What did you expect to happen?**
-
-**What actually happened?**

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -0,0 +1,20 @@
+---
+name: "🐞 Bug report"
+about: Report an issue with this software
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- DO NOT POST LINKS OR REFERENCES TO COPYRIGHTED CONTENT IN YOUR ISSUE. -->
+
+**What version of WebTorrent Desktop are you using?**
+
+**What operating system and version?**
+
+**What happened?**
+
+**What did you expect to happen?**
+
+**Are you willing to submit a pull request to fix this bug?**

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -0,0 +1,20 @@
+---
+name: "⭐️ Feature request"
+about: Request a new feature to be added
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- DO NOT POST LINKS OR REFERENCES TO COPYRIGHTED CONTENT IN YOUR ISSUE. -->
+
+**What version of WebTorrent Desktop are you using?**
+
+**What operating system and version?**
+
+**What problem do you want to solve?**
+
+**What do you think is the correct solution to this problem?**
+
+**Are you willing to submit a pull request to implement this change?**

.github/config.yml

@@ -1,15 +0,0 @@
-# ProBot Request Info (https://probot.github.io/apps/request-info/)
-
-requestInfoReplyComment: >
-  👋 We would appreciate it if you could provide us with more information about this
-  issue. <br><br> ![](https://feross.net/s/cats/14.gif)
-requestInfoLabelToAdd: 'need more info'
-
-# ProBot Welcome (https://probot.github.io/apps/welcome/)
-
-newPRWelcomeComment: >
-  🙌 Thanks for opening this pull request! You're awesome.
-  <br><br> ![](https://feross.net/s/cats/6.gif)
-firstPRMergeComment: >
-  🎉 Congrats on getting your first pull request landed! <br><br>
-  ![](https://feross.net/s/cats/29.gif)

.github/lock.yml

@@ -1,4 +0,0 @@
-# ProBot Lock (https://probot.github.io/apps/lock/)
-
-daysUntilLock: 365
-lockComment: false

.github/no-response.yml

@@ -1,9 +0,0 @@
-# ProBot No Response (https://probot.github.io/apps/no-response/)
-
-daysUntilClose: 14
-responseRequiredLabel: 'need more info'
-closeComment: >
-  This issue has been automatically closed because there was no response to a
-  request for more information from the issue opener. Please leave a comment or
-  open a new issue if you have additional information related to this issue.
-  <br><br> ![](https://feross.net/s/cats/7.gif)

.github/stale.yml

@@ -1,17 +0,0 @@
-# ProBot Stale (https://probot.github.io/apps/stale/)
-
-daysUntilStale: 90
-daysUntilClose: 14
-exemptLabels:
-  - accepted
-  - blocked
-  - bug
-  - enhancement
-  - greenkeeper
-  - 'help wanted'
-  - meta
-staleLabel: stale
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs.
-closeComment: false

.github/workflows/ci.yml

@@ -0,0 +1,21 @@
+name: ci
+on: [push,pull_request]
+jobs:
+  test:
+    name: Node ${{ matrix.node }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        node:
+          - '16'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+      - run: npm install
+      - run: npm run build --if-present
+      - run: npm test

.github/workflows/package.yml

@@ -0,0 +1,69 @@
+name: package
+on: 
+  workflow_dispatch:
+jobs:
+  package_linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '16'
+    - uses: actions/cache@v2
+      with:
+        path: ~/.npm
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
+    - run: npm install
+    - run: npm run package -- linux
+    - uses: actions/upload-artifact@v2
+      with:
+        name: linux
+        path: |
+          dist/*.deb
+          dist/*.rpm
+          dist/*.zip
+  package_macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '16'
+    - uses: actions/cache@v2
+      with:
+        path: ~/.npm
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
+    - run: npm install
+    - run: npm run package -- darwin
+    - uses: actions/upload-artifact@v2
+      with:
+        name: macos
+        path: |
+          dist/*.dmg
+          dist/*.zip
+  package_windows:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '16'
+    - uses: actions/cache@v2
+      with:
+        path: ~/.npm
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
+    - run: npm install
+    - run: npm run package -- win32
+    - uses: actions/upload-artifact@v2
+      with:
+        name: windows
+        path: |
+          dist/*.exe
+          dist/*.nupkg
+          dist/*.zip

.github/workflows/stale.yml

@@ -0,0 +1,23 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '0 12 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v4
+      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?'
+        stale-pr-message: 'Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?'
+        exempt-issue-labels: accepted,blocked,bug,dependency,enhancement,'help wanted',question,security,meta
+        exempt-pr-labels: accepted,blocked,bug,dependency,enhancement,'help wanted',question,security,meta
+        stale-issue-label: 'stale'
+        stale-pr-label: 'stale'

.gitignore

@@ -2,6 +2,7 @@ node_modules/
 build/
 dist/
 npm-debug.log*
+.vscode/
 
 # JetBrains IntelliJ IDEA project files
 .idea

.travis.yml

@@ -1,3 +0,0 @@
-language: node_js
-node_js:
-  - lts/*

AUTHORS.md

@@ -39,6 +39,7 @@
 - Nuno Campos (nuno.campos@me.com)
 - Ebrahim Byagowi (ebrahim@gnu.org)
 - Josip Janzic (josip@jjanzic.com)
+- Egor Yurtaev (yurtaev.egor@gmail.com)
 - Emil Bay (github@tixz.dk)
 - Borewit (borewit@users.noreply.github.com)
 - greenkeeper[bot] (greenkeeper[bot]@users.noreply.github.com)
@@ -55,6 +56,7 @@
 - Dan Flettre (flettre@gmail.com)
 - Sibiraj (dev.sibiraj@outlook.com)
 - clujin (clujin@gmail.com)
+- Sharon Grossman (sharong1337@gmail.com)
 - Linus Unnebäck (linus@folkdatorn.se)
 - Adrian Tombu (adrian@otso.fr)
 - Lucas (5874806+RecoX@users.noreply.github.com)
@@ -64,7 +66,18 @@
 - Recox (5874806+RecoX@users.noreply.github.com)
 - greenkeeper[bot] (23040076+greenkeeper[bot]@users.noreply.github.com)
 - hicom150 (hicom150@gmail.com)
+- Дамјан Георгиевски (gdamjan@gmail.com)
 - Jimmy Wärting (jimmy@warting.se)
+- Julen Garcia Leunda (hicom150@gmail.com)
 - Feross (feross@feross.org)
+- Daniele Debernardi (drebrez@gmail.com)
+- Chandan Chowdary Bhagam (chandandharana@gmail.com)
+- Pieter Goetschalckx (3.14.e.ter@gmail.com)
+- Carey Metcalfe (carey@cmetcalfe.ca)
+- 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,6 +1,64 @@
 # WebTorrent Desktop Version History
 
-## v0.21.0 - 2019-08
+## 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. [\#1837](https://github.com/webtorrent/webtorrent-desktop/issues/1837#issuecomment-729320901)
+
+### Added
+
+- Add macOS Notarization [\#1834](https://github.com/webtorrent/webtorrent-desktop/pull/1834) ([feross](https://github.com/feross))
+
+### Changed
+
+- Update to Electron 10 beta [\#1834](https://github.com/webtorrent/webtorrent-desktop/pull/1834) ([feross](https://github.com/feross))
+
+## 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))
+- Add support for multiple audio tracks [\#1712](https://github.com/webtorrent/webtorrent-desktop/pull/1712) ([hicom150](https://github.com/hicom150))
+- Improve codec unsupported detection [\#1711](https://github.com/webtorrent/webtorrent-desktop/pull/1711) ([hicom150](https://github.com/hicom150))
+- Report when files are being verified [\#1717](https://github.com/webtorrent/webtorrent-desktop/pull/1717) ([pR0Ps](https://github.com/pR0Ps))
+- Support additional audio files: MPEG-Layer-2, Musepack, Matroska audio, WavePack [\#1772](https://github.com/webtorrent/webtorrent-desktop/pull/1772)
+
+### Changed
+
+- 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))
+
+### Fixed
+
+- Fix a few type errors [\#1720](https://github.com/webtorrent/webtorrent-desktop/pull/1720) ([mathiasvr](https://github.com/mathiasvr))
+- Fix electron SUID sandbox error [\#1707](https://github.com/webtorrent/webtorrent-desktop/pull/1707) ([hicom150](https://github.com/hicom150))
+- 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))
+
+## v0.21.0 - 2019-09-14
 
 ### Added
 

README.md

@@ -35,7 +35,7 @@ Download the latest version of WebTorrent Desktop from
 - Use [Homebrew-Cask](https://github.com/caskroom/homebrew-cask) to install from the command line:
 
   ```
-  $ brew cask install webtorrent
+  $ brew install --cask webtorrent
   ```
 
 - Try the (unstable) development version by cloning the Git repository. See the
@@ -97,7 +97,7 @@ comparing each one to a reference. Why screenshots?
   https://github.com/blog/817-behold-image-view-modes
 
 For MacOS, you'll need a Retina screen for the integration tests to pass. Your screen should have
-the same resolution as a 2016 12" Macbook.
+the same resolution as a 2018 MacBook Pro 13".
 
 For Windows, you'll need Windows 10 with a 1366x768 screen.
 
@@ -125,6 +125,7 @@ The following optional arguments are available:
 - `--sign` - Sign the application (Mac, Windows)
 - `--package=[type]` - Package single output type.
    - `deb` - Debian package
+   - `rpm` - RedHat package
    - `zip` - Linux zip file
    - `dmg` - Mac disk image
    - `exe` - Windows installer
@@ -141,11 +142,12 @@ The Windows app can be packaged from **any** platform.
 Note: Windows code signing only works from **Windows**, for now.
 
 Note: To package the Windows app from non-Windows platforms,
-[Wine](https://www.winehq.org/) needs to be installed. For example on Mac, first
+[Wine](https://www.winehq.org/) and [Mono](https://www.mono-project.com/) need
-install [XQuartz](http://www.xquartz.org/), then run:
+to be installed. For example on Mac, first install
+[XQuartz](http://www.xquartz.org/), then run:
 
 ```
-brew install wine
+brew install wine mono
 ```
 
 (Requires the [Homebrew](http://brew.sh/) package manager.)
@@ -163,7 +165,6 @@ If packaging from Mac, install system dependencies with Homebrew by running:
 ```
 npm run install-system-deps
 ```
-
 #### Recommended readings to start working in the app
 
 Electron (Framework to make native apps for Windows, OSX and Linux in Javascript):
@@ -173,7 +174,7 @@ React.js (Framework to work with Frontend UI):
 https://reactjs.org/docs/getting-started.html
 
 Material UI (React components that implement Google's Material Design.):
-https://material-ui.com/getting-started
+https://material-ui.com/getting-started/installation
 
 ### Privacy
 

RELEASE_PROCESS.md

@@ -46,6 +46,11 @@
 
   ```
   npm run package -- darwin --sign
+  ```
+
+  Move the `.zip` and `.dmg` file somewhere because the next step wipes the `dist/` folder away.
+
+  ```
   npm run package -- linux --sign
   ```
 
@@ -75,11 +80,23 @@
   been downloaded, even though the files are byte for byte identical. This ensures that the
   codesigning worked and is valid.
 
-- Smoke test WebTorrent Desktop on each platform.
+- Smoke test WebTorrent Desktop on each platform. Before a release, check that the following basic use cases work correctly:
 
-  See Smoke Tests below for details. Open DevTools
+  1. Click "Play" to stream a built-in torrent (e.g. Sintel)
-  on Windows and Mac, and ensure that the auto updater is running. If the auto updater does not
+    - Ensure that seeking to undownloaded region works and plays immediately.
-  run, users will successfully auto update to this new version, and then be stuck there forever.
+    - Ensure that sintel.mp4 gets downloaded to `~/Downloads`.
+
+  2. Check that the auto-updater works
+    - Open the console and check for the line "No update available" to indicate that the auto-updater is working. (If the auto updater does not run, users will successfully auto update to this new version, and then be stuck there forever.)
+
+  3. Add a new .torrent file via drag-and-drop.
+    - Ensure that it gets added to the list and starts downloading.
+
+  4. Remove a torrent from the client
+    - Ensure that the file is removed from `~/Downloads`
+
+  5. Create and seed a new a torrent via drag-and-drop.
+    - Ensure that the torrent gets created and seeding begins.
 
 ### 4. Ship it
 
@@ -88,25 +105,5 @@
   Create a pull request in [webtorrent.io](https://github.com/webtorrent/webtorrent.io). Update
   `config.js`, updating the desktop app version.
 
-  As soon as this PR is merged, Jenkins will automatically redeploy the WebTorrent website, and
+  Once this PR is merged and Feross redeploys the WebTorrent website,
   hundreds of thousands of users around the world will start auto updating. **Merge with care.**
-
-## Smoke Tests
-
-Before a release, check that the following basic use cases work correctly:
-
-1. Click "Play" to stream a built-in torrent (e.g. Sintel)
-  - Ensure that seeking to undownloaded region works and plays immediately.
-  - Ensure that sintel.mp4 gets downloaded to `~/Downloads`.
-
-2. Check that the auto-updater works
-  - Open the console and check for the line "No update available" to indicate
-
-3. Add a new .torrent file via drag-and-drop.
-  - Ensure that it gets added to the list and starts downloading
-
-4. Remove a torrent from the client
-  - Ensure that the file is removed from `~/Downloads`
-
-5. Create and seed a new a torrent via drag-and-drop.
-  - Ensure that the torrent gets created and seeding begins.

bin/darwin-entitlements.plist

@@ -0,0 +1,12 @@
+<?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/extra-lint.js

@@ -1,39 +0,0 @@
-#!/usr/bin/env node
-
-const walkSync = require('walk-sync')
-const fs = require('fs')
-const path = require('path')
-
-let hasErrors = false
-
-// Find all Javascript source files
-const files = walkSync('src', { globs: ['**/*.js'] })
-console.log('Running extra-lint on ' + files.length + ' files...')
-
-// Read each file, line by line
-files.forEach(function (file) {
-  const filepath = path.join('src', file)
-  const lines = fs.readFileSync(filepath, 'utf8').split('\n')
-
-  lines.forEach(function (line, i) {
-    let error
-
-    // No lines over 100 characters
-    if (line.length > 100) {
-      error = 'Line >100 chars'
-    }
-
-    if (line.match(/^var /) || line.match(/ var /)) {
-      error = 'Use const or let'
-    }
-
-    if (error) {
-      const name = path.basename(file)
-      console.log('%s:%d - %s:\n%s', name, i + 1, error, line)
-      hasErrors = true
-    }
-  })
-})
-
-if (hasErrors) process.exit(1)
-else console.log('Looks good!')

bin/package.js

@@ -8,7 +8,6 @@ const cp = require('child_process')
 const electronPackager = require('electron-packager')
 const fs = require('fs')
 const minimist = require('minimist')
-const mkdirp = require('mkdirp')
 const os = require('os')
 const path = require('path')
 const rimraf = require('rimraf')
@@ -37,7 +36,7 @@ const argv = minimist(process.argv.slice(2), {
 })
 
 function build () {
-  console.log('Reinstalling node_modules...')
+  console.log('Installing node_modules...')
   rimraf.sync(NODE_MODULES_PATH)
   cp.execSync('npm ci', { stdio: 'inherit' })
 
@@ -173,8 +172,8 @@ const linux = {
   // Build for Linux.
   platform: 'linux',
 
-  // Build x64 binary onle.
+  // Build x64, armv7l, and arm64 binaries.
-  arch: 'x64'
+  arch: ['x64', 'armv7l', 'arm64']
 
   // Note: Application icon for Linux is specified via the BrowserWindow `icon` option.
 }
@@ -267,6 +266,7 @@ 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,16 +282,37 @@ function buildDarwin (cb) {
        *   - Membership in the Apple Developer Program
        */
       const signOpts = {
+        verbose: true,
         app: appPath,
         platform: 'darwin',
-        verbose: true
+        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'
       }
 
       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)
+          })
       })
     }
 
@@ -430,7 +451,7 @@ function buildWin32 (cb) {
         // remoteToken: process.env.WEBTORRENT_GITHUB_API_TOKEN,
         setupExe: config.APP_NAME + 'Setup-v' + config.APP_VERSION + '.exe',
         setupIcon: config.APP_ICON + '.ico',
-        signWithParams: signWithParams,
+        signWithParams,
         title: config.APP_NAME,
         usePackageJson: false,
         version: pkg.version
@@ -457,13 +478,13 @@ function buildWin32 (cb) {
       console.log('Windows: Creating portable app...')
 
       const portablePath = path.join(filesPath, 'Portable Settings')
-      mkdirp.sync(portablePath)
+      fs.mkdirSync(portablePath, { recursive: true })
 
       const downloadsPath = path.join(portablePath, 'Downloads')
-      mkdirp.sync(downloadsPath)
+      fs.mkdirSync(downloadsPath, { recursive: true })
 
       const tempPath = path.join(portablePath, 'Temp')
-      mkdirp.sync(tempPath)
+      fs.mkdirSync(tempPath, { recursive: true })
 
       const inPath = path.join(DIST_PATH, path.basename(filesPath))
       const outPath = path.join(DIST_PATH, BUILD_NAME + '-win.zip')
@@ -485,11 +506,16 @@ function buildLinux (cb) {
 
     const tasks = []
     buildPath.forEach(function (filesPath) {
+      const destArch = filesPath.split('-').pop()
+
       if (argv.package === 'deb' || argv.package === 'all') {
-        tasks.push((cb) => packageDeb(filesPath, cb))
+        tasks.push((cb) => packageDeb(filesPath, destArch, cb))
+      }
+      if (argv.package === 'rpm' || argv.package === 'all') {
+        tasks.push((cb) => packageRpm(filesPath, destArch, cb))
       }
       if (argv.package === 'zip' || argv.package === 'all') {
-        tasks.push((cb) => packageZip(filesPath, cb))
+        tasks.push((cb) => packageZip(filesPath, destArch, cb))
       }
     })
     series(tasks, cb)
@@ -497,16 +523,65 @@ function buildLinux (cb) {
     cb(err)
   })
 
-  function packageDeb (filesPath, cb) {
+  function packageDeb (filesPath, destArch, cb) {
+    // Linux convention for Debian based 'x64' is 'amd64'
+    if (destArch === 'x64') {
+      destArch = 'amd64'
+    }
+
     // Create .deb file for Debian-based platforms
-    console.log('Linux: Creating deb...')
+    console.log(`Linux: Creating ${destArch} deb...`)
 
     const installer = require('electron-installer-debian')
 
     const options = {
       src: filesPath + '/',
       dest: DIST_PATH,
-      arch: 'amd64',
+      arch: destArch,
+      bin: 'WebTorrent',
+      icon: {
+        '48x48': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png'),
+        '256x256': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png')
+      },
+      categories: ['Network', 'FileTransfer', 'P2P'],
+      mimeType: ['application/x-bittorrent', 'x-scheme-handler/magnet', 'x-scheme-handler/stream-magnet'],
+      desktopTemplate: path.join(config.STATIC_PATH, 'linux/webtorrent-desktop.ejs'),
+      lintianOverrides: [
+        'unstripped-binary-or-object',
+        'embedded-library',
+        'missing-dependency-on-libc',
+        'changelog-file-missing-in-native-package',
+        'description-synopsis-is-duplicated',
+        'setuid-binary',
+        'binary-without-manpage',
+        'shlib-with-executable-bit'
+      ]
+    }
+
+    installer(options).then(
+      () => {
+        console.log(`Linux: Created ${destArch} deb.`)
+        cb(null)
+      },
+      (err) => cb(err)
+    )
+  }
+
+  function packageRpm (filesPath, destArch, cb) {
+    // Linux convention for RedHat based 'x64' is 'x86_64'
+    if (destArch === 'x64') {
+      destArch = 'x86_64'
+    }
+
+    // Create .rpm file for RedHat-based platforms
+    console.log(`Linux: Creating ${destArch} rpm...`)
+
+    const installer = require('electron-installer-redhat')
+
+    const options = {
+      src: filesPath + '/',
+      dest: DIST_PATH,
+      arch: destArch,
       bin: 'WebTorrent',
       icon: {
         '48x48': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png'),
@@ -519,22 +594,22 @@ function buildLinux (cb) {
 
     installer(options).then(
       () => {
-        console.log('Linux: Created deb.')
+        console.log(`Linux: Created ${destArch} rpm.`)
         cb(null)
       },
       (err) => cb(err)
     )
   }
 
-  function packageZip (filesPath, cb) {
+  function packageZip (filesPath, destArch, cb) {
     // Create .zip file for Linux
-    console.log('Linux: Creating zip...')
+    console.log(`Linux: Creating ${destArch} zip...`)
 
     const inPath = path.join(DIST_PATH, path.basename(filesPath))
-    const outPath = path.join(DIST_PATH, BUILD_NAME + '-linux.zip')
+    const outPath = path.join(DIST_PATH, `${BUILD_NAME}-linux-${destArch}.zip`)
     zip.zipSync(inPath, outPath)
 
-    console.log('Linux: Created zip.')
+    console.log(`Linux: Created ${destArch} zip.`)
     cb(null)
   }
 }

bin/update-authors.sh

@@ -13,6 +13,7 @@ while (<>) {
   next if /(dc\@DCs-MacBook.local)/;
   next if /(rolandoguedes\@gmail.com)/;
   next if /(grunjol\@users.noreply.github.com)/;
+  next if /(dependabot)/;
   $seen{$_} = push @authors, "- ", $_;
 }
 END {

electron.cjs

@@ -0,0 +1 @@
+module.exports = require('electron')

index.cjs

@@ -0,0 +1 @@
+import('./build/main/index.js')

index.js

@@ -1 +0,0 @@
-require('./build/main')

package.json

@@ -1,77 +1,89 @@
 {
   "name": "webtorrent-desktop",
+  "type": "module",
   "description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
-  "version": "0.20.0",
+  "version": "0.24.0",
   "author": {
     "name": "WebTorrent, LLC",
     "email": "feross@webtorrent.io",
     "url": "https://webtorrent.io"
   },
+  "babel": {
+    "plugins": [
+      [
+        "@babel/plugin-transform-react-jsx",
+        {
+          "useBuiltIns": true
+        }
+      ]
+    ]
+  },
   "bugs": {
     "url": "https://github.com/webtorrent/webtorrent-desktop/issues"
   },
   "dependencies": {
+    "@electron/remote": "2.0.1",
     "airplayer": "github:webtorrent/airplayer#fix-security",
-    "application-config": "^1.0.1",
+    "application-config": "2.0.0",
-    "arch": "^2.1.1",
+    "arch": "2.2.0",
-    "auto-launch": "^5.0.5",
+    "auto-launch": "5.0.5",
-    "bitfield": "^3.0.0",
+    "bitfield": "4.0.0",
-    "capture-frame": "^3.0.0",
+    "capture-frame": "4.0.0",
-    "chokidar": "^3.0.2",
+    "chokidar": "3.5.2",
-    "chromecasts": "^1.9.1",
+    "chromecasts": "1.10.2",
-    "cp-file": "^7.0.0",
+    "create-torrent": "5.0.1",
-    "create-torrent": "^4.4.1",
+    "debounce": "1.2.1",
-    "debounce": "^1.2.0",
+    "dlnacasts": "0.1.0",
-    "deep-equal": "^1.1.0",
+    "drag-drop": "7.2.0",
-    "dlnacasts": "^0.1.0",
+    "es6-error": "4.1.1",
-    "drag-drop": "^5.0.1",
+    "fn-getter": "1.0.0",
-    "es6-error": "^4.1.1",
+    "iso-639-1": "2.1.9",
-    "fn-getter": "^1.0.0",
+    "languagedetect": "2.0.0",
-    "iso-639-1": "^2.1.0",
+    "location-history": "1.1.2",
-    "languagedetect": "^1.2.0",
+    "material-ui": "0.20.2",
-    "location-history": "^1.1.1",
+    "music-metadata": "7.11.4",
-    "material-ui": "^0.20.2",
+    "network-address": "1.1.2",
-    "mkdirp": "^0.5.1",
+    "parse-torrent": "9.1.4",
-    "music-metadata": "^4.5.3",
+    "prettier-bytes": "1.0.4",
-    "network-address": "^1.1.2",
+    "prop-types": "15.7.2",
-    "parse-torrent": "^7.0.1",
+    "react": "17.0.2",
-    "prettier-bytes": "^1.0.4",
+    "react-dom": "17.0.2",
-    "prop-types": "^15.7.2",
+    "rimraf": "3.0.2",
-    "react": "^16.9.0",
+    "run-parallel": "1.2.0",
-    "react-dom": "^16.9.0",
+    "semver": "7.3.5",
-    "rimraf": "^3.0.0",
+    "simple-concat": "1.0.1",
-    "run-parallel": "^1.1.9",
+    "simple-get": "4.0.0",
-    "semver": "^6.3.0",
+    "srt-to-vtt": "1.1.3",
-    "simple-concat": "^1.0.0",
+    "vlc-command": "1.2.0",
-    "simple-get": "^3.0.3",
+    "webtorrent": "1.5.6",
-    "srt-to-vtt": "^1.1.3",
+    "winreg": "1.2.4"
-    "vlc-command": "^1.2.0",
-    "webtorrent": ">=0.107.16",
-    "winreg": "^1.2.4"
   },
   "devDependencies": {
-    "babel-eslint": "^10.0.3",
+    "@babel/cli": "7.15.7",
-    "buble": "^0.19.8",
+    "@babel/core": "7.15.8",
-    "cross-zip": "^2.1.6",
+    "@babel/eslint-parser": "7.15.8",
-    "depcheck": "^0.8.3",
+    "@babel/plugin-transform-react-jsx": "7.14.9",
-    "electron": "~6.0.9",
+    "cross-zip": "4.0.0",
-    "electron-osx-sign": "^0.4.13",
+    "depcheck": "1.4.2",
-    "electron-packager": "^14.0.6",
+    "electron": "15.2.0",
-    "electron-winstaller": "^4.0.0",
+    "electron-notarize": "1.1.1",
-    "gh-release": "^3.5.0",
+    "electron-osx-sign": "0.5.0",
-    "minimist": "^1.2.0",
+    "electron-packager": "15.4.0",
-    "nodemon": "^1.19.2",
+    "electron-winstaller": "5.0.0",
-    "open": "^6.4.0",
+    "gh-release": "6.0.1",
-    "plist": "^3.0.1",
+    "minimist": "1.2.5",
-    "pngjs": "^3.4.0",
+    "nodemon": "2.0.13",
-    "run-series": "^1.1.8",
+    "open": "8.3.0",
-    "spectron": "^8.0.0",
+    "plist": "3.0.4",
-    "standard": "*",
+    "pngjs": "6.0.0",
-    "tape": "^4.11.0",
+    "run-series": "1.1.9",
-    "walk-sync": "^2.0.2"
+    "spectron": "15.0.0",
+    "standard": "16.0.4",
+    "tape": "5.3.1"
   },
   "engines": {
-    "node": ">=4.0.0"
+    "node": "^16.0.0",
+    "npm": "^7.10.0 || ^8.0.0"
   },
   "homepage": "https://webtorrent.io",
   "keywords": [
@@ -85,10 +97,11 @@
     "webtorrent"
   ],
   "license": "MIT",
-  "main": "index.js",
+  "main": "index.cjs",
   "optionalDependencies": {
     "appdmg": "^0.6.0",
-    "electron-installer-debian": "^2.0.0"
+    "electron-installer-debian": "^3.1.0",
+    "electron-installer-redhat": "^3.3.0"
   },
   "private": true,
   "productName": "WebTorrent",
@@ -97,19 +110,24 @@
     "url": "git://github.com/webtorrent/webtorrent-desktop.git"
   },
   "scripts": {
-    "build": "buble src --output build",
+    "build": "babel src --out-dir build",
     "clean": "node ./bin/clean.js",
     "gh-release": "gh-release",
-    "install-system-deps": "brew install fakeroot dpkg",
+    "install-system-deps": "brew install fakeroot dpkg rpm",
     "open-config": "node ./bin/open-config.js",
     "package": "node ./bin/package.js",
-    "start": "npm run build && electron .",
+    "start": "npm run build && electron --no-sandbox .",
-    "test": "standard && depcheck --ignores=standard,babel-eslint --ignore-dirs=build,dist && node ./bin/extra-lint.js",
+    "test": "standard && depcheck --ignores=standard,@babel/eslint-parser --ignore-dirs=build,dist",
     "test-integration": "npm run build && node ./test",
     "update-authors": "./bin/update-authors.sh",
     "watch": "nodemon --exec \"npm run start\" --ext js,css --ignore build/ --ignore dist/"
   },
   "standard": {
-    "parser": "babel-eslint"
+    "parser": "@babel/eslint-parser"
+  },
+  "renovate": {
+    "extends": [
+      "github>webtorrent/renovate-config"
+    ]
   }
 }

src/config.js

@@ -1,16 +1,13 @@
-const appConfig = require('application-config')('WebTorrent')
+import applicationConfig from 'application-config'
-appConfig.filePath = appConfig.filePath.replace('\\Local\\', '\\Roaming\\')
+import path from 'path'
-const path = require('path')
+import arch from 'arch'
-const electron = require('electron')
+import fs from 'fs'
-const arch = require('arch')
+import electron from '../electron.cjs'
-
-// console.log('electron appData: ', (electron.remote ? electron.remote : electron).app.getPath('appData'))
-console.log('appConfig.filePath', appConfig.filePath)
 
+const appConfig = applicationConfig('WebTorrent')
 const APP_NAME = 'WebTorrent'
 const APP_TEAM = 'WebTorrent, LLC'
-const APP_VERSION = require('../package.json').version
+const APP_VERSION = JSON.parse(fs.readFileSync('package.json').toString()).version
-
 const IS_TEST = isTest()
 const PORTABLE_PATH = IS_TEST
   ? path.join(process.platform === 'win32' ? 'C:\\Windows\\Temp' : '/tmp', 'WebTorrentTest')
@@ -21,93 +18,6 @@ const IS_PORTABLE = isPortable()
 const UI_HEADER_HEIGHT = 38
 const UI_TORRENT_HEIGHT = 100
 
-module.exports = {
-  ANNOUNCEMENT_URL: 'https://webtorrent.io/desktop/announcement',
-  AUTO_UPDATE_URL: 'https://webtorrent.io/desktop/update',
-  CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
-  TELEMETRY_URL: 'https://webtorrent.io/desktop/telemetry',
-
-  APP_COPYRIGHT: 'Copyright © 2014-2019 ' + APP_TEAM,
-  APP_FILE_ICON: path.join(__dirname, '..', 'static', 'WebTorrentFile'),
-  APP_ICON: path.join(__dirname, '..', 'static', 'WebTorrent'),
-  APP_NAME: APP_NAME,
-  APP_TEAM: APP_TEAM,
-  APP_VERSION: APP_VERSION,
-  APP_WINDOW_TITLE: APP_NAME,
-
-  CONFIG_PATH: getConfigPath(),
-
-  DEFAULT_TORRENTS: [
-    // {
-    //   testID: 'bbb',
-    //   name: 'Big Buck Bunny',
-    //   posterFileName: 'bigBuckBunny.jpg',
-    //   torrentFileName: 'bigBuckBunny.torrent'
-    // },
-    {
-      testID: 'cosmos',
-      name: 'Cosmos Laundromat (Preview)',
-      posterFileName: 'cosmosLaundromat.jpg',
-      torrentFileName: 'cosmosLaundromat.torrent'
-    },
-    {
-      testID: 'sintel',
-      name: 'Sintel',
-      posterFileName: 'sintel.jpg',
-      torrentFileName: 'sintel.torrent'
-    },
-    {
-      testID: 'tears',
-      name: 'Tears of Steel',
-      posterFileName: 'tearsOfSteel.jpg',
-      torrentFileName: 'tearsOfSteel.torrent'
-    },
-    {
-      testID: 'wired',
-      name: 'The WIRED CD - Rip. Sample. Mash. Share',
-      posterFileName: 'wiredCd.jpg',
-      torrentFileName: 'wiredCd.torrent'
-    }
-  ],
-
-  DELAYED_INIT: 3000 /* 3 seconds */,
-
-  DEFAULT_DOWNLOAD_PATH: getDefaultDownloadPath(),
-
-  GITHUB_URL: 'https://github.com/webtorrent/webtorrent-desktop',
-  GITHUB_URL_ISSUES: 'https://github.com/webtorrent/webtorrent-desktop/issues',
-  GITHUB_URL_RAW: 'https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/master',
-  GITHUB_URL_RELEASES: 'https://github.com/webtorrent/webtorrent-desktop/releases',
-
-  HOME_PAGE_URL: 'https://webtorrent.io',
-  TWITTER_PAGE_URL: 'https://twitter.com/WebTorrentApp',
-
-  IS_PORTABLE: IS_PORTABLE,
-  IS_PRODUCTION: IS_PRODUCTION,
-  IS_TEST: IS_TEST,
-
-  OS_SYSARCH: arch() === 'x64' ? 'x64' : 'ia32',
-
-  POSTER_PATH: path.join(getConfigPath(), 'Posters'),
-  ROOT_PATH: path.join(__dirname, '..'),
-  STATIC_PATH: path.join(__dirname, '..', 'static'),
-  TORRENT_PATH: path.join(getConfigPath(), 'Torrents'),
-
-  WINDOW_ABOUT: 'file://' + path.join(__dirname, '..', 'static', 'about.html'),
-  WINDOW_MAIN: 'file://' + path.join(__dirname, '..', 'static', 'main.html'),
-  WINDOW_WEBTORRENT: 'file://' + path.join(__dirname, '..', 'static', 'webtorrent.html'),
-
-  WINDOW_INITIAL_BOUNDS: {
-    width: 500,
-    height: UI_HEADER_HEIGHT + (UI_TORRENT_HEIGHT * 6) // header + 6 torrents
-  },
-  WINDOW_MIN_HEIGHT: UI_HEADER_HEIGHT + (UI_TORRENT_HEIGHT * 2), // header + 2 torrents
-  WINDOW_MIN_WIDTH: 425,
-
-  UI_HEADER_HEIGHT: UI_HEADER_HEIGHT,
-  UI_TORRENT_HEIGHT: UI_TORRENT_HEIGHT
-}
-
 function getConfigPath () {
   if (IS_PORTABLE) {
     return PORTABLE_PATH
@@ -125,17 +35,13 @@ function getDefaultDownloadPath () {
 }
 
 function getPath (key) {
-  if (!process.versions.electron) {
+  if (!process.versions.electron || process.type !== 'browser') {
     // Node.js process
     return ''
-  } else if (process.type === 'renderer') {
+  }
-    // Electron renderer process
-    return electron.remote.app.getPath(key)
-  } else {
   // Electron main process
   return electron.app.getPath(key)
 }
-}
 
 function isTest () {
   return process.env.NODE_ENV === 'test'
@@ -151,8 +57,6 @@ function isPortable () {
     return false
   }
 
-  const fs = require('fs')
-
   try {
     // This line throws if the "Portable Settings" folder does not exist, and does
     // nothing otherwise.
@@ -178,3 +82,117 @@ function isProduction () {
     return !/\/electron$/.test(process.execPath)
   }
 }
+
+export const ANNOUNCEMENT_URL = 'https://webtorrent.io/desktop/announcement'
+export const AUTO_UPDATE_URL = 'https://webtorrent.io/desktop/update'
+export const CRASH_REPORT_URL = 'https://webtorrent.io/desktop/crash-report'
+export const TELEMETRY_URL = 'https://webtorrent.io/desktop/telemetry'
+export const APP_COPYRIGHT = `Copyright © 2014-${new Date().getFullYear()} ${APP_TEAM}`
+export const APP_FILE_ICON = new URL('../static/WebTorrentFile', import.meta.url).pathname // path.join(__dirname, '..',
+// 'static', 'WebTorrentFile')
+export const APP_ICON = new URL('../static/WebTorrent', import.meta.url).pathname // path.join(__dirname, '..',
+// 'static',
+// 'WebTorrent')
+export const CONFIG_PATH = getConfigPath()
+export const DEFAULT_TORRENTS = [
+  {
+    testID: 'bbb',
+    name: 'Big Buck Bunny',
+    posterFileName: 'bigBuckBunny.jpg',
+    torrentFileName: 'bigBuckBunny.torrent'
+  },
+  {
+    testID: 'cosmos',
+    name: 'Cosmos Laundromat (Preview)',
+    posterFileName: 'cosmosLaundromat.jpg',
+    torrentFileName: 'cosmosLaundromat.torrent'
+  },
+  {
+    testID: 'sintel',
+    name: 'Sintel',
+    posterFileName: 'sintel.jpg',
+    torrentFileName: 'sintel.torrent'
+  },
+  {
+    testID: 'tears',
+    name: 'Tears of Steel',
+    posterFileName: 'tearsOfSteel.jpg',
+    torrentFileName: 'tearsOfSteel.torrent'
+  },
+  {
+    testID: 'wired',
+    name: 'The WIRED CD - Rip. Sample. Mash. Share',
+    posterFileName: 'wiredCd.jpg',
+    torrentFileName: 'wiredCd.torrent'
+  }
+]
+export const DELAYED_INIT = 3000 /* 3 seconds */
+export const DEFAULT_DOWNLOAD_PATH = getDefaultDownloadPath()
+export const GITHUB_URL = 'https://github.com/webtorrent/webtorrent-desktop'
+export const GITHUB_URL_ISSUES = 'https://github.com/webtorrent/webtorrent-desktop/issues'
+export const GITHUB_URL_RAW = 'https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/master'
+export const GITHUB_URL_RELEASES = 'https://github.com/webtorrent/webtorrent-desktop/releases'
+export const HOME_PAGE_URL = 'https://webtorrent.io'
+export const TWITTER_PAGE_URL = 'https://twitter.com/WebTorrentApp'
+export const OS_SYSARCH = arch() === 'x64' ? 'x64' : 'ia32'
+export const POSTER_PATH = path.join(getConfigPath(), 'Posters')
+export const ROOT_PATH = new URL('../', import.meta.url).pathname
+export const STATIC_PATH = new URL('../static', import.meta.url).pathname
+export const TORRENT_PATH = path.join(getConfigPath(), 'Torrents')
+export const WINDOW_ABOUT = 'file://' + new URL('../static/about.html', import.meta.url).pathname
+export const WINDOW_MAIN = 'file://' + new URL('../static/main.html', import.meta.url).pathname
+export const WINDOW_WEBTORRENT = 'file://' + new URL('../static/webtorrent.html', import.meta.url).pathname
+export const WINDOW_INITIAL_BOUNDS = {
+  width: 500,
+  height: UI_HEADER_HEIGHT + (UI_TORRENT_HEIGHT * 6) // header + 6 torrents
+}
+export const WINDOW_MIN_HEIGHT = UI_HEADER_HEIGHT + (UI_TORRENT_HEIGHT * 2)
+export const WINDOW_MIN_WIDTH = 425
+export { APP_NAME }
+export { APP_TEAM }
+export { APP_VERSION }
+export { APP_NAME as APP_WINDOW_TITLE }
+export { IS_PORTABLE }
+export { IS_PRODUCTION }
+export { IS_TEST }
+export { UI_HEADER_HEIGHT }
+export { UI_TORRENT_HEIGHT }
+export default {
+  ANNOUNCEMENT_URL,
+  AUTO_UPDATE_URL,
+  CRASH_REPORT_URL,
+  TELEMETRY_URL,
+  APP_COPYRIGHT,
+  APP_FILE_ICON,
+  APP_ICON,
+  APP_NAME,
+  APP_TEAM,
+  APP_VERSION,
+  APP_WINDOW_TITLE: APP_NAME,
+  CONFIG_PATH,
+  DEFAULT_TORRENTS,
+  DELAYED_INIT,
+  DEFAULT_DOWNLOAD_PATH,
+  GITHUB_URL,
+  GITHUB_URL_ISSUES,
+  GITHUB_URL_RAW,
+  GITHUB_URL_RELEASES,
+  HOME_PAGE_URL,
+  TWITTER_PAGE_URL,
+  IS_PORTABLE,
+  IS_PRODUCTION,
+  IS_TEST,
+  OS_SYSARCH,
+  POSTER_PATH,
+  ROOT_PATH,
+  STATIC_PATH,
+  TORRENT_PATH,
+  WINDOW_ABOUT,
+  WINDOW_MAIN,
+  WINDOW_WEBTORRENT,
+  WINDOW_INITIAL_BOUNDS,
+  WINDOW_MIN_HEIGHT,
+  WINDOW_MIN_WIDTH,
+  UI_HEADER_HEIGHT,
+  UI_TORRENT_HEIGHT
+}

src/crash-reporter.js

@@ -1,14 +1,13 @@
-module.exports = {
+import electron from '../electron.cjs'
-  init
-}
-
-function init () {
-  const config = require('./config')
-  const electron = require('electron')
 
+async function init () {
+  const config = await import('./config.js')
   electron.crashReporter.start({
-    companyName: config.APP_NAME,
     productName: config.APP_NAME,
-    submitURL: config.CRASH_REPORT_URL
+    submitURL: config.CRASH_REPORT_URL,
+    globalExtra: { _companyName: config.APP_NAME },
+    compress: true
   })
 }
+
+export default { init }

src/main/announcement.js

@@ -1,11 +1,6 @@
-module.exports = {
+import electron from '../../electron.cjs'
-  init
+import config from '../config.js'
-}
+import log from './log.js'
-
-const electron = require('electron')
-
-const config = require('../config')
-const log = require('./log')
 
 const ANNOUNCEMENT_URL =
   `${config.ANNOUNCEMENT_URL}?version=${config.APP_VERSION}&platform=${process.platform}`
@@ -24,8 +19,8 @@ const ANNOUNCEMENT_URL =
  *     "detail": "Please update to v0.xx as soon as possible..."
  *   }
  */
-function init () {
+async function init () {
-  const get = require('simple-get')
+  const { default: get } = await import('simple-get')
   get.concat(ANNOUNCEMENT_URL, onResponse)
 }
 
@@ -50,7 +45,7 @@ function onResponse (err, res, data) {
     title: data.title,
     message: data.message,
     detail: data.detail
-  }, noop)
+  })
 }
 
-function noop () {}
+export default { init }

src/main/dialog.js

@@ -1,20 +1,13 @@
-module.exports = {
+import electron from '../../electron.cjs'
-  openSeedFile,
+import log from './log.js'
-  openSeedDirectory,
+import * as windows from './windows/index.js'
-  openTorrentFile,
-  openTorrentAddress,
-  openFiles
-}
 
-const electron = require('electron')
+const { dialog } = electron
-
-const log = require('./log')
-const windows = require('./windows')
 
 /**
  * Show open dialog to create a single-file torrent.
  */
-function openSeedFile () {
+export function openSeedFile () {
   if (!windows.main.win) return
   log('openSeedFile')
   const opts = {
@@ -29,7 +22,7 @@ function openSeedFile () {
  * Windows and Linux, open dialogs are for files *or* directories only, not both,
  * so this function shows a directory dialog on those platforms.
  */
-function openSeedDirectory () {
+export function openSeedDirectory () {
   if (!windows.main.win) return
   log('openSeedDirectory')
   const opts = process.platform === 'darwin'
@@ -48,7 +41,7 @@ function openSeedDirectory () {
  * Show flexible open dialog that supports selecting .torrent files to add, or
  * a file or folder to create a single-file or single-directory torrent.
  */
-function openFiles () {
+export function openFiles () {
   if (!windows.main.win) return
   log('openFiles')
   const opts = process.platform === 'darwin'
@@ -61,17 +54,16 @@ function openFiles () {
         properties: ['openFile']
       }
   setTitle(opts.title)
-  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
+  const selectedPaths = dialog.showOpenDialogSync(windows.main.win, opts)
   resetTitle()
   if (!Array.isArray(selectedPaths)) return
   windows.main.dispatch('onOpen', selectedPaths)
-  })
 }
 
 /*
  * Show open dialog to open a .torrent file.
  */
-function openTorrentFile () {
+export function openTorrentFile () {
   if (!windows.main.win) return
   log('openTorrentFile')
   const opts = {
@@ -80,19 +72,18 @@ function openTorrentFile () {
     properties: ['openFile', 'multiSelections']
   }
   setTitle(opts.title)
-  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
+  const selectedPaths = dialog.showOpenDialogSync(windows.main.win, opts)
   resetTitle()
   if (!Array.isArray(selectedPaths)) return
-    selectedPaths.forEach(function (selectedPath) {
+  selectedPaths.forEach(selectedPath => {
     windows.main.dispatch('addTorrent', selectedPath)
   })
-  })
 }
 
 /*
  * Show modal dialog to open a torrent URL (magnet uri, http torrent link, etc.)
  */
-function openTorrentAddress () {
+export function openTorrentAddress () {
   log('openTorrentAddress')
   windows.main.dispatch('openTorrentAddress')
 }
@@ -116,9 +107,8 @@ function resetTitle () {
  */
 function showOpenSeed (opts) {
   setTitle(opts.title)
-  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
+  const selectedPaths = dialog.showOpenDialogSync(windows.main.win, opts)
   resetTitle()
   if (!Array.isArray(selectedPaths)) return
   windows.main.dispatch('showCreateTorrent', selectedPaths)
-  })
 }

src/main/dock.js

@@ -1,13 +1,8 @@
-module.exports = {
+import electron from '../../electron.cjs'
-  downloadFinished,
+import * as dialog from './dialog.js'
-  init,
+import log from './log.js'
-  setBadge
-}
 
-const { app, Menu } = require('electron')
+const { app, Menu } = electron
-
-const dialog = require('./dialog')
-const log = require('./log')
 
 /**
  * Add a right-click menu to the dock icon. (Mac)
@@ -34,7 +29,7 @@ function setBadge (count) {
   if (process.platform === 'darwin' ||
       (process.platform === 'linux' && app.isUnityRunning())) {
     log(`setBadge: ${count}`)
-    app.setBadgeCount(Number(count))
+    app.badgeCount = Number(count)
   }
 }
 
@@ -57,3 +52,5 @@ function getMenuTemplate () {
     }
   ]
 }
+
+export default { downloadFinished, init, setBadge }

src/main/external-player.js

@@ -1,28 +1,20 @@
-module.exports = {
+import cp from 'child_process'
-  spawn,
+import path from 'path'
-  kill,
+import vlcCommand from 'vlc-command'
-  checkInstall
+import log from './log.js'
-}
+import * as windows from './windows'
-
-const cp = require('child_process')
-const path = require('path')
-const vlcCommand = require('vlc-command')
-
-const log = require('./log')
-const windows = require('./windows')
-
 // holds a ChildProcess while we're playing a video in an external player, null otherwise
 let proc = null
 
-function checkInstall (playerPath, cb) {
+export 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 == null) return vlcCommand(cb)
+  if (!playerPath) return vlcCommand(cb)
   process.nextTick(() => cb(null))
 }
 
-function spawn (playerPath, url, title) {
+export function spawn (playerPath, url, title) {
-  if (playerPath != null) return spawnExternal(playerPath, [url])
+  if (playerPath) return spawnExternal(playerPath, [url])
 
   // Try to find and use VLC if external player is not specified
   vlcCommand((err, vlcPath) => {
@@ -37,7 +29,7 @@ function spawn (playerPath, url, title) {
   })
 }
 
-function kill () {
+export function kill () {
   if (!proc) return
   log(`Killing external player, pid ${proc.pid}`)
   proc.kill('SIGKILL') // kill -9

src/main/folder-watcher.js

@@ -1,7 +1,7 @@
-const chokidar = require('chokidar')
+import * as chokidar from 'chokidar'
-const log = require('./log')
+import log from './log.js'
 
-class FolderWatcher {
+export class FolderWatcher {
   constructor ({ window, state }) {
     this.window = window
     this.state = state
@@ -46,5 +46,3 @@ class FolderWatcher {
     this.watching = false
   }
 }
-
-module.exports = FolderWatcher

src/main/handlers.js

@@ -1,12 +1,7 @@
-module.exports = {
+import config from '../config.js'
-  install,
+import path from 'path'
-  uninstall
-}
 
-const config = require('../config')
+export function install () {
-const path = require('path')
-
-function install () {
   switch (process.platform) {
     case 'darwin': installDarwin()
       break
@@ -15,7 +10,7 @@ function install () {
   }
 }
 
-function uninstall () {
+export function uninstall () {
   switch (process.platform) {
     case 'darwin': uninstallDarwin()
       break
@@ -24,10 +19,8 @@ function uninstall () {
   }
 }
 
-function installDarwin () {
+async function installDarwin () {
-  const electron = require('electron')
+  const { app } = await import('electron')
-  const app = electron.app
-
   // On Mac, only protocols that are listed in `Info.plist` can be set as the
   // default handler at runtime.
   app.setAsDefaultProtocolClient('magnet')
@@ -44,33 +37,14 @@ if (!config.IS_PRODUCTION) {
   EXEC_COMMAND.push(config.ROOT_PATH)
 }
 
-function installWin32 () {
+async function installWin32 () {
-  const Registry = require('winreg')
+  const Registry = await import('wingreg')
+  const log = await import('./log')
 
-  const log = require('./log')
+  const iconPath = path.join(process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico')
-
+  registerProtocolHandlerWin32('magnet', 'URL:BitTorrent Magnet URL', iconPath, EXEC_COMMAND)
-  const iconPath = path.join(
+  registerProtocolHandlerWin32('stream-magnet', 'URL:BitTorrent Stream-Magnet URL', iconPath, EXEC_COMMAND)
-    process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico'
+  registerFileHandlerWin32('.torrent', 'io.webtorrent.torrent', 'BitTorrent Document', iconPath, EXEC_COMMAND)
-  )
-  registerProtocolHandlerWin32(
-    'magnet',
-    'URL:BitTorrent Magnet URL',
-    iconPath,
-    EXEC_COMMAND
-  )
-  registerProtocolHandlerWin32(
-    'stream-magnet',
-    'URL:BitTorrent Stream-Magnet URL',
-    iconPath,
-    EXEC_COMMAND
-  )
-  registerFileHandlerWin32(
-    '.torrent',
-    'io.webtorrent.torrent',
-    'BitTorrent Document',
-    iconPath,
-    EXEC_COMMAND
-  )
 
   /**
    * To add a protocol handler, the following keys must be added to the Windows registry:
@@ -198,9 +172,8 @@ function installWin32 () {
   }
 }
 
-function uninstallWin32 () {
+async function uninstallWin32 () {
-  const Registry = require('winreg')
+  const Registry = await import('winreg')
-
   unregisterProtocolHandlerWin32('magnet', EXEC_COMMAND)
   unregisterProtocolHandlerWin32('stream-magnet', EXEC_COMMAND)
   unregisterFileHandlerWin32('.torrent', 'io.webtorrent.torrent', EXEC_COMMAND)

src/main/index.js

@@ -1,19 +1,25 @@
+/* eslint-disable import/first */
 console.time('init')
 
-const electron = require('electron')
+import * as RemoteMain from '@electron/remote/main/index.js'
-const app = electron.app
+RemoteMain.initialize()
+import electron from '../../electron.cjs'
+const { app, ipcMain } = electron
 
-const parallel = require('run-parallel')
+// Start crash reporter early, so it takes effect for child processes
+import crashReporter from '../crash-reporter.js'
+crashReporter.init()
 
-const config = require('../config')
+import fs from 'fs'
-const crashReporter = require('../crash-reporter')
+import parallel from 'run-parallel'
-const ipc = require('./ipc')
+import config from '../config.js'
-const log = require('./log')
+import ipc from './ipc.js'
-const menu = require('./menu')
+import log from './log.js'
-const State = require('../renderer/lib/state')
+import menu from './menu.js'
-const windows = require('./windows')
+import State from '../renderer/lib/state.js'
+import * as windows from './windows/index.js'
 
-const WEBTORRENT_VERSION = require('webtorrent/package.json').version
+const WEBTORRENT_VERSION = JSON.parse(fs.readFileSync('node_modules/webtorrent/package.json').toString()).version
 
 let shouldQuit = false
 let argv = sliceArgv(process.argv)
@@ -51,27 +57,30 @@ if (!shouldQuit && !config.IS_PORTABLE) {
 if (shouldQuit) {
   app.quit()
 } else {
-  init()
+  init().catch(console.error)
 }
 
-function init () {
+async function init () {
+  console.log('index init')
+  app.whenReady().then(() => {
+    console.log('readyyyy')
+  })
   app.on('second-instance', (event, commandLine, workingDirectory) => onAppOpen(commandLine))
   if (config.IS_PORTABLE) {
-    const path = require('path')
+    console.log('is portable')
+    const path = await import('path')
     // Put all user data into the "Portable Settings" folder
     app.setPath('userData', config.CONFIG_PATH)
     // Put Electron crash files, etc. into the "Portable Settings\Temp" folder
     app.setPath('temp', path.join(config.CONFIG_PATH, 'Temp'))
   }
 
-  const ipcMain = electron.ipcMain
-
   let isReady = false // app ready, windows can be created
   app.ipcReady = false // main window has finished loading and IPC is ready
   app.isQuitting = false
 
   parallel({
-    appReady: (cb) => app.on('ready', () => cb(null)),
+    appReady: (cb) => app.whenReady().then(cb),
     state: (cb) => State.load(cb)
   }, onReady)
 
@@ -81,9 +90,9 @@ function init () {
     isReady = true
     const state = results.state
 
-    windows.main.init(state, { hidden: hidden })
-    windows.webtorrent.init()
     menu.init()
+    windows.main.init(state, { hidden })
+    windows.webtorrent.init()
 
     // To keep app startup fast, some code is delayed.
     setTimeout(() => {
@@ -109,17 +118,13 @@ function init () {
 
   ipc.init()
 
-  app.once('will-finish-launching', function () {
+  app.once('ipcReady', () => {
-    crashReporter.init()
-  })
-
-  app.once('ipcReady', function () {
     log('Command line args:', argv)
     processArgv(argv)
     console.timeEnd('init')
   })
 
-  app.on('before-quit', function (e) {
+  app.on('before-quit', e => {
     if (app.isQuitting) return
 
     app.isQuitting = true
@@ -132,18 +137,19 @@ function init () {
     }, 4000) // quit after 4 secs, at most
   })
 
-  app.on('activate', function () {
+  app.on('activate', () => {
+    console.log('activate')
     if (isReady) windows.main.show()
   })
 }
 
-function delayedInit (state) {
+async function delayedInit (state) {
   if (app.isQuitting) return
 
-  const announcement = require('./announcement')
+  const { default: announcement } = await import('./announcement.js')
-  const dock = require('./dock')
+  const { default: dock } = await import('./dock.js')
-  const updater = require('./updater')
+  const { default: updater } = await import('./updater.js')
-  const FolderWatcher = require('./folder-watcher')
+  const { FolderWatcher } = await import('./folder-watcher.js')
   const folderWatcher = new FolderWatcher({ window: windows.main, state })
 
   announcement.init()
@@ -156,13 +162,13 @@ function delayedInit (state) {
   }
 
   if (process.platform === 'win32') {
-    const userTasks = require('./user-tasks')
+    const userTasks = await import('./user-tasks.js')
     userTasks.init()
   }
 
   if (process.platform !== 'darwin') {
-    const tray = require('./tray')
+    const { init: trayInit } = await import('./tray.js')
-    tray.init()
+    trayInit()
   }
 }
 
@@ -199,17 +205,21 @@ function onAppOpen (newArgv) {
 // Development: 2 args, eg: electron .
 // Test: 4 args, eg: electron -r .../mocks.js .
 function sliceArgv (argv) {
-  return argv.slice(config.IS_PRODUCTION ? 1
+  return argv.slice(
-    : config.IS_TEST ? 4
+    config.IS_PRODUCTION
-      : 2)
+      ? 1
+      : config.IS_TEST
+        ? 4
+        : 2
+  )
 }
 
-function processArgv (argv) {
+async function processArgv (argv) {
   const torrentIds = []
-  argv.forEach(function (arg) {
+  await Promise.all(argv.forEach(async arg => {
     if (arg === '-n' || arg === '-o' || arg === '-u') {
       // Critical path: Only load the 'dialog' package if it is needed
-      const dialog = require('./dialog')
+      const dialog = await import('./dialog')
       if (arg === '-n') {
         dialog.openSeedDirectory()
       } else if (arg === '-o') {
@@ -232,7 +242,7 @@ function processArgv (argv) {
       // running.
       torrentIds.push(arg)
     }
-  })
+  }))
   if (torrentIds.length > 0) {
     windows.main.dispatch('onOpen', torrentIds)
   }

src/main/ipc.js

@@ -1,15 +1,10 @@
-module.exports = {
+import electron from '../../electron.cjs'
-  init,
-  setModule
-}
 
-const electron = require('electron')
+import log from './log.js'
+import menu from './menu.js'
+import * as windows from './windows/index.js'
 
-const app = electron.app
+const { app, ipcMain } = electron
-
-const log = require('./log')
-const menu = require('./menu')
-const windows = require('./windows')
 
 // Messages from the main process, to be sent once the WebTorrent process starts
 const messageQueueMainToWebTorrent = []
@@ -23,18 +18,16 @@ function setModule (name, module) {
 }
 
 function init () {
-  const ipc = electron.ipcMain
+  ipcMain.once('ipcReady', e => {
-
-  ipc.once('ipcReady', function (e) {
     app.ipcReady = true
     app.emit('ipcReady')
   })
 
-  ipc.once('ipcReadyWebTorrent', function (e) {
+  ipcMain.once('ipcReadyWebTorrent', e => {
     app.ipcReadyWebTorrent = true
     log('sending %d queued messages from the main win to the webtorrent window',
       messageQueueMainToWebTorrent.length)
-    messageQueueMainToWebTorrent.forEach(function (message) {
+    messageQueueMainToWebTorrent.forEach(message => {
       windows.webtorrent.send(message.name, ...message.args)
       log('webtorrent: sent queued %s', message.name)
     })
@@ -44,12 +37,12 @@ function init () {
    * Dialog
    */
 
-  ipc.on('openTorrentFile', () => {
+  ipcMain.on('openTorrentFile', async () => {
-    const dialog = require('./dialog')
+    const dialog = await import('./dialog')
     dialog.openTorrentFile()
   })
-  ipc.on('openFiles', () => {
+  ipcMain.on('openFiles', async () => {
-    const dialog = require('./dialog')
+    const dialog = await import('./dialog')
     dialog.openFiles()
   })
 
@@ -57,12 +50,12 @@ function init () {
    * Dock
    */
 
-  ipc.on('setBadge', (e, ...args) => {
+  ipcMain.on('setBadge', async (e, ...args) => {
-    const dock = require('./dock')
+    const dock = await import('./dock')
     dock.setBadge(...args)
   })
-  ipc.on('downloadFinished', (e, ...args) => {
+  ipcMain.on('downloadFinished', async (e, ...args) => {
-    const dock = require('./dock')
+    const dock = await import('./dock')
     dock.downloadFinished(...args)
   })
 
@@ -70,10 +63,10 @@ function init () {
    * Player Events
    */
 
-  ipc.on('onPlayerOpen', function () {
+  ipcMain.on('onPlayerOpen', async () => {
-    const powerSaveBlocker = require('./power-save-blocker')
+    const powerSaveBlocker = await import('./power-save-blocker')
-    const shortcuts = require('./shortcuts')
+    const shortcuts = await import('./shortcuts')
-    const thumbar = require('./thumbar')
+    const thumbar = await import('./thumbar')
 
     menu.togglePlaybackControls(true)
     powerSaveBlocker.enable()
@@ -81,17 +74,17 @@ function init () {
     thumbar.enable()
   })
 
-  ipc.on('onPlayerUpdate', function (e, ...args) {
+  ipcMain.on('onPlayerUpdate', async (e, ...args) => {
-    const thumbar = require('./thumbar')
+    const thumbar = await import('./thumbar')
 
     menu.onPlayerUpdate(...args)
     thumbar.onPlayerUpdate(...args)
   })
 
-  ipc.on('onPlayerClose', function () {
+  ipcMain.on('onPlayerClose', async () => {
-    const powerSaveBlocker = require('./power-save-blocker')
+    const powerSaveBlocker = await import('./power-save-blocker')
-    const shortcuts = require('./shortcuts')
+    const shortcuts = await import('./shortcuts')
-    const thumbar = require('./thumbar')
+    const thumbar = await import('./thumbar')
 
     menu.togglePlaybackControls(false)
     powerSaveBlocker.disable()
@@ -99,17 +92,17 @@ function init () {
     thumbar.disable()
   })
 
-  ipc.on('onPlayerPlay', function () {
+  ipcMain.on('onPlayerPlay', async () => {
-    const powerSaveBlocker = require('./power-save-blocker')
+    const powerSaveBlocker = await import('./power-save-blocker')
-    const thumbar = require('./thumbar')
+    const thumbar = await import('./thumbar')
 
     powerSaveBlocker.enable()
     thumbar.onPlayerPlay()
   })
 
-  ipc.on('onPlayerPause', function () {
+  ipcMain.on('onPlayerPause', async () => {
-    const powerSaveBlocker = require('./power-save-blocker')
+    const powerSaveBlocker = await import('./power-save-blocker')
-    const thumbar = require('./thumbar')
+    const thumbar = await import('./thumbar')
 
     powerSaveBlocker.disable()
     thumbar.onPlayerPause()
@@ -119,7 +112,7 @@ function init () {
    * Folder Watcher Events
    */
 
-  ipc.on('startFolderWatcher', function () {
+  ipcMain.on('startFolderWatcher', () => {
     if (!modules.folderWatcher) {
       log('IPC ERR: folderWatcher module is not defined.')
       return
@@ -128,7 +121,7 @@ function init () {
     modules.folderWatcher.start()
   })
 
-  ipc.on('stopFolderWatcher', function () {
+  ipcMain.on('stopFolderWatcher', () => {
     if (!modules.folderWatcher) {
       log('IPC ERR: folderWatcher module is not defined.')
       return
@@ -141,16 +134,16 @@ function init () {
    * Shell
    */
 
-  ipc.on('openItem', (e, ...args) => {
+  ipcMain.on('openPath', async (e, ...args) => {
-    const shell = require('./shell')
+    const shell = await import('./shell')
-    shell.openItem(...args)
+    shell.openPath(...args)
   })
-  ipc.on('showItemInFolder', (e, ...args) => {
+  ipcMain.on('showItemInFolder', async (e, ...args) => {
-    const shell = require('./shell')
+    const shell = await import('./shell')
     shell.showItemInFolder(...args)
   })
-  ipc.on('moveItemToTrash', (e, ...args) => {
+  ipcMain.on('moveItemToTrash', async (e, ...args) => {
-    const shell = require('./shell')
+    const shell = await import('./shell')
     shell.moveItemToTrash(...args)
   })
 
@@ -158,8 +151,8 @@ function init () {
    * File handlers
    */
 
-  ipc.on('setDefaultFileHandler', (e, flag) => {
+  ipcMain.on('setDefaultFileHandler', async (e, flag) => {
-    const handlers = require('./handlers')
+    const handlers = await import('./handlers')
 
     if (flag) handlers.install()
     else handlers.uninstall()
@@ -169,8 +162,8 @@ function init () {
    * Auto start on login
    */
 
-  ipc.on('setStartup', (e, flag) => {
+  ipcMain.on('setStartup', async (e, flag) => {
-    const startup = require('./startup')
+    const startup = await import('./startup')
 
     if (flag) startup.install()
     else startup.uninstall()
@@ -182,37 +175,39 @@ function init () {
 
   const main = windows.main
 
-  ipc.on('setAspectRatio', (e, ...args) => main.setAspectRatio(...args))
+  ipcMain.on('setAspectRatio', (e, ...args) => main.setAspectRatio(...args))
-  ipc.on('setBounds', (e, ...args) => main.setBounds(...args))
+  ipcMain.on('setBounds', (e, ...args) => main.setBounds(...args))
-  ipc.on('setProgress', (e, ...args) => main.setProgress(...args))
+  ipcMain.on('setProgress', (e, ...args) => main.setProgress(...args))
-  ipc.on('setTitle', (e, ...args) => main.setTitle(...args))
+  ipcMain.on('setTitle', (e, ...args) => main.setTitle(...args))
-  ipc.on('show', () => main.show())
+  ipcMain.on('show', () => main.show())
-  ipc.on('toggleFullScreen', (e, ...args) => main.toggleFullScreen(...args))
+  ipcMain.on('toggleFullScreen', (e, ...args) => main.toggleFullScreen(...args))
-  ipc.on('setAllowNav', (e, ...args) => menu.setAllowNav(...args))
+  ipcMain.on('setAllowNav', (e, ...args) => menu.setAllowNav(...args))
 
   /**
    * External Media Player
    */
 
-  ipc.on('checkForExternalPlayer', function (e, path) {
+  ipcMain.on('checkForExternalPlayer', async (e, path) => {
-    const externalPlayer = require('./external-player')
+    const externalPlayer = await import('./external-player')
 
-    externalPlayer.checkInstall(path, function (err) {
+    externalPlayer.checkInstall(path, err => {
       windows.main.send('checkForExternalPlayer', !err)
     })
   })
 
-  ipc.on('openExternalPlayer', (e, ...args) => {
+  ipcMain.on('openExternalPlayer', async (e, ...args) => {
-    const externalPlayer = require('./external-player')
+    const externalPlayer = await import('./external-player')
-    const thumbar = require('./thumbar')
+    const shortcuts = await import('./shortcuts')
+    const thumbar = await import('./thumbar')
 
     menu.togglePlaybackControls(false)
+    shortcuts.disable()
     thumbar.disable()
     externalPlayer.spawn(...args)
   })
 
-  ipc.on('quitExternalPlayer', () => {
+  ipcMain.on('quitExternalPlayer', async () => {
-    const externalPlayer = require('./external-player')
+    const externalPlayer = await import('./external-player')
     externalPlayer.kill()
   })
 
@@ -220,11 +215,12 @@ function init () {
    * Message passing
    */
 
-  const oldEmit = ipc.emit
+  const oldEmit = ipcMain.emit
-  ipc.emit = function (name, e, ...args) {
+  ipcMain.emit = (name, e, ...args) => {
     // Relay messages between the main window and the WebTorrent hidden window
     if (name.startsWith('wt-') && !app.isQuitting) {
-      if (e.sender.browserWindowOptions.title === 'webtorrent-hidden-window') {
+      console.dir(e.sender.getTitle())
+      if (e.sender.getTitle() === 'WebTorrent Hidden Window') {
         // Send message to main window
         windows.main.send(name, ...args)
         log('webtorrent: got %s', name)
@@ -235,8 +231,8 @@ function init () {
       } else {
         // Queue message for webtorrent window, it hasn't finished loading yet
         messageQueueMainToWebTorrent.push({
-          name: name,
+          name,
-          args: args
+          args
         })
         log('webtorrent: queueing %s', name)
       }
@@ -244,6 +240,13 @@ function init () {
     }
 
     // Emit all other events normally
-    oldEmit.call(ipc, name, e, ...args)
+    oldEmit.call(ipcMain, name, e, ...args)
   }
 }
+
+export { init }
+export { setModule }
+export default {
+  init,
+  setModule
+}

src/main/log.js

@@ -1,5 +1,7 @@
-module.exports = log
+import electron from '../../electron.cjs'
-module.exports.error = error
+import * as windows from './windows/index.js'
+
+const { app } = electron
 
 /**
  * In the main electron process, we do not use console.log() statements because they do
@@ -7,13 +9,7 @@ module.exports.error = error
  * version of the app. Instead use this module, which sends the logs to the main window
  * where they can be viewed in Developer Tools.
  */
-
+export default function log (...args) {
-const electron = require('electron')
-const windows = require('./windows')
-
-const app = electron.app
-
-function log (...args) {
   if (app.ipcReady) {
     windows.main.send('log', ...args)
   } else {
@@ -21,7 +17,7 @@ function log (...args) {
   }
 }
 
-function error (...args) {
+export function error (...args) {
   if (app.ipcReady) {
     windows.main.send('error', ...args)
   } else {

src/main/menu.js

@@ -1,23 +1,12 @@
-module.exports = {
+import electron from '../../electron.cjs'
-  init,
+import config from '../config.js'
-  togglePlaybackControls,
+import * as windows from './windows/index.js'
-  setWindowFocus,
+import shell from './shell.js'
-  setAllowNav,
-  onPlayerUpdate,
-  onToggleAlwaysOnTop,
-  onToggleFullScreen
-}
-
-const electron = require('electron')
-
-const app = electron.app
-
-const config = require('../config')
-const windows = require('./windows')
 
 let menu = null
 
 function init () {
+  console.log('menu init')
   menu = electron.Menu.buildFromTemplate(getMenuTemplate())
   electron.Menu.setApplicationMenu(menu)
 }
@@ -70,12 +59,11 @@ function onToggleFullScreen (flag) {
 }
 
 function getMenuItem (label) {
-  for (let i = 0; i < menu.items.length; i++) {
+  for (const menuItem of menu.items) {
-    const menuItem = menu.items[i].submenu.items.find(function (item) {
+    const submenuItem = menuItem.submenu.items.find(item => item.label === label)
-      return item.label === label
+    if (submenuItem) return submenuItem
-    })
-    if (menuItem) return menuItem
   }
+  return {}
 }
 
 function getMenuTemplate () {
@@ -88,24 +76,24 @@ function getMenuTemplate () {
             ? 'Create New Torrent...'
             : 'Create New Torrent from Folder...',
           accelerator: 'CmdOrCtrl+N',
-          click: () => {
+          click: async () => {
-            const dialog = require('./dialog')
+            const dialog = await import('./dialog')
             dialog.openSeedDirectory()
           }
         },
         {
           label: 'Open Torrent File...',
           accelerator: 'CmdOrCtrl+O',
-          click: () => {
+          click: async () => {
-            const dialog = require('./dialog')
+            const dialog = await import('./dialog')
             dialog.openTorrentFile()
           }
         },
         {
           label: 'Open Torrent Address...',
           accelerator: 'CmdOrCtrl+U',
-          click: () => {
+          click: async () => {
-            const dialog = require('./dialog')
+            const dialog = await import('./dialog')
             dialog.openTorrentAddress()
           }
         },
@@ -288,6 +276,14 @@ function getMenuTemplate () {
         {
           label: 'Resume All',
           click: () => windows.main.dispatch('resumeAllTorrents')
+        },
+        {
+          label: 'Remove All From List',
+          click: () => windows.main.dispatch('confirmDeleteAllTorrents', false)
+        },
+        {
+          label: 'Remove All Data Files',
+          click: () => windows.main.dispatch('confirmDeleteAllTorrents', true)
         }
       ]
     },
@@ -298,21 +294,18 @@ function getMenuTemplate () {
         {
           label: 'Learn more about ' + config.APP_NAME,
           click: () => {
-            const shell = require('./shell')
             shell.openExternal(config.HOME_PAGE_URL)
           }
         },
         {
           label: 'Release Notes',
           click: () => {
-            const shell = require('./shell')
             shell.openExternal(config.GITHUB_URL_RELEASES)
           }
         },
         {
           label: 'Contribute on GitHub',
           click: () => {
-            const shell = require('./shell')
             shell.openExternal(config.GITHUB_URL)
           }
         },
@@ -322,21 +315,18 @@ function getMenuTemplate () {
         {
           label: 'Report an Issue...',
           click: () => {
-            const shell = require('./shell')
             shell.openExternal(config.GITHUB_URL_ISSUES)
           }
         },
         {
           label: 'Follow us on Twitter',
           click: () => {
-            const shell = require('./shell')
             shell.openExternal(config.TWITTER_PAGE_URL)
           }
         }
       ]
     }
   ]
-
   if (process.platform === 'darwin') {
     // WebTorrent menu (Mac)
     template.unshift({
@@ -357,8 +347,7 @@ function getMenuTemplate () {
           type: 'separator'
         },
         {
-          role: 'services',
+          role: 'services'
-          submenu: []
         },
         {
           type: 'separator'
@@ -422,8 +411,8 @@ function getMenuTemplate () {
     // File menu (Windows, Linux)
     template[0].submenu.unshift({
       label: 'Create New Torrent from File...',
-      click: () => {
+      click: async () => {
-        const dialog = require('./dialog')
+        const dialog = await import('./dialog')
         dialog.openSeedFile()
       }
     })
@@ -456,9 +445,26 @@ function getMenuTemplate () {
     // File menu (Linux)
     template[0].submenu.push({
       label: 'Quit',
-      click: () => app.quit()
+      click: () => electron.app.quit()
     })
   }
 
   return template
 }
+
+export { init }
+export { togglePlaybackControls }
+export { setWindowFocus }
+export { setAllowNav }
+export { onPlayerUpdate }
+export { onToggleAlwaysOnTop }
+export { onToggleFullScreen }
+export default {
+  init,
+  togglePlaybackControls,
+  setWindowFocus,
+  setAllowNav,
+  onPlayerUpdate,
+  onToggleAlwaysOnTop,
+  onToggleFullScreen
+}

src/main/power-save-blocker.js

@@ -1,10 +1,5 @@
-module.exports = {
+import { powerSaveBlocker } from 'electron'
-  enable,
+import log from './log.js'
-  disable
-}
-
-const electron = require('electron')
-const log = require('./log')
 
 let blockId = 0
 
@@ -12,23 +7,23 @@ let blockId = 0
  * Block the system from entering low-power (sleep) mode or turning off the
  * display.
  */
-function enable () {
+export function enable () {
-  if (electron.powerSaveBlocker.isStarted(blockId)) {
+  if (powerSaveBlocker.isStarted(blockId)) {
     // If a power saver block already exists, do nothing.
     return
   }
-  blockId = electron.powerSaveBlocker.start('prevent-display-sleep')
+  blockId = powerSaveBlocker.start('prevent-display-sleep')
   log(`powerSaveBlocker.enable: ${blockId}`)
 }
 
 /**
  * Stop blocking the system from entering low-power mode.
  */
-function disable () {
+export function disable () {
-  if (!electron.powerSaveBlocker.isStarted(blockId)) {
+  if (!powerSaveBlocker.isStarted(blockId)) {
     // If a power saver block does not exist, do nothing.
     return
   }
-  electron.powerSaveBlocker.stop(blockId)
+  powerSaveBlocker.stop(blockId)
   log(`powerSaveBlocker.disable: ${blockId}`)
 }

src/main/shell.js

@@ -1,27 +1,22 @@
-module.exports = {
+import electron from '../../electron.cjs'
-  openExternal,
+import log from './log.js'
-  openItem,
-  showItemInFolder,
-  moveItemToTrash
-}
 
-const electron = require('electron')
+const { shell } = electron
-const log = require('./log')
 
 /**
  * Open the given external protocol URL in the desktop’s default manner.
  */
 function openExternal (url) {
   log(`openExternal: ${url}`)
-  electron.shell.openExternal(url)
+  shell.openExternal(url)
 }
 
 /**
  * Open the given file in the desktop’s default manner.
  */
-function openItem (path) {
+function openPath (path) {
-  log(`openItem: ${path}`)
+  log(`openPath: ${path}`)
-  electron.shell.openItem(path)
+  shell.openPath(path)
 }
 
 /**
@@ -29,7 +24,7 @@ function openItem (path) {
  */
 function showItemInFolder (path) {
   log(`showItemInFolder: ${path}`)
-  electron.shell.showItemInFolder(path)
+  shell.showItemInFolder(path)
 }
 
 /**
@@ -37,5 +32,12 @@ function showItemInFolder (path) {
  */
 function moveItemToTrash (path) {
   log(`moveItemToTrash: ${path}`)
-  electron.shell.moveItemToTrash(path)
+  shell.trashItem(path)
+}
+
+export default {
+  openExternal,
+  openPath,
+  showItemInFolder,
+  moveItemToTrash
 }

src/main/shortcuts.js

@@ -1,30 +1,25 @@
-module.exports = {
+import { globalShortcut } from 'electron'
-  disable,
+import * as windows from './windows'
-  enable
-}
 
-const electron = require('electron')
+export function enable () {
-const windows = require('./windows')
-
-function enable () {
   // Register play/pause media key, available on some keyboards.
-  electron.globalShortcut.register(
+  globalShortcut.register(
     'MediaPlayPause',
     () => windows.main.dispatch('playPause')
   )
-  electron.globalShortcut.register(
+  globalShortcut.register(
     'MediaNextTrack',
     () => windows.main.dispatch('nextTrack')
   )
-  electron.globalShortcut.register(
+  globalShortcut.register(
     'MediaPreviousTrack',
     () => windows.main.dispatch('previousTrack')
   )
 }
 
-function disable () {
+export function disable () {
   // Return the media key to the OS, so other apps can use it.
-  electron.globalShortcut.unregister('MediaPlayPause')
+  globalShortcut.unregister('MediaPlayPause')
-  electron.globalShortcut.unregister('MediaNextTrack')
+  globalShortcut.unregister('MediaNextTrack')
-  electron.globalShortcut.unregister('MediaPreviousTrack')
+  globalShortcut.unregister('MediaPreviousTrack')
 }

src/main/squirrel-win32.js

@@ -1,151 +1,33 @@
-module.exports = {
+import { app } from 'electron'
-  handleEvent
+import path from 'path'
-}
+import { spawn } from 'child_process'
-
+import handlers from './handlers.js'
-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
-
-const handlers = require('./handlers')
 
 const EXE_NAME = path.basename(process.execPath)
 const UPDATE_EXE = path.join(process.execPath, '..', '..', 'Update.exe')
 
-function handleEvent (cmd) {
+const run = (args, done) => {
-  if (cmd === '--squirrel-install') {
+  spawn(UPDATE_EXE, args, { detached: true }).on('close', done)
-    // 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') {
+export function handleEvent (cmd) {
-    // App was updated. (Called on new version of app)
+  if (cmd === '--squirrel-install' || cmd === '--squirrel-updated') {
-    updateShortcuts(function () {
+    run([`--createShortcut=${EXE_NAME}`], app.quit)
-      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()
 
-    // Remove desktop/start menu shortcuts.
+    run([`--removeShortcut=${EXE_NAME}`], app.quit)
-    // 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/startup.js

@@ -1,17 +1,12 @@
-module.exports = {
+import { APP_NAME } from '../config.js'
-  install,
+import AutoLaunch from 'auto-launch'
-  uninstall
-}
-
-const { APP_NAME } = require('../config')
-const AutoLaunch = require('auto-launch')
 
 const appLauncher = new AutoLaunch({
   name: APP_NAME,
   isHidden: true
 })
 
-function install () {
+export function install () {
   return appLauncher
     .isEnabled()
     .then(enabled => {
@@ -19,7 +14,7 @@ function install () {
     })
 }
 
-function uninstall () {
+export function uninstall () {
   return appLauncher
     .isEnabled()
     .then(enabled => {

src/main/thumbar.js

@@ -1,21 +1,6 @@
-module.exports = {
+import path from 'path'
-  disable,
+import config from '../config.js'
-  enable,
+import * as windows from './windows'
-  onPlayerPause,
-  onPlayerPlay,
-  onPlayerUpdate
-}
-
-/**
- * On Windows, add a "thumbnail toolbar" with a play/pause button in the taskbar.
- * This provides users a way to access play/pause functionality without restoring
- * or activating the window.
- */
-
-const path = require('path')
-const config = require('../config')
-
-const windows = require('./windows')
 
 const PREV_ICON = path.join(config.STATIC_PATH, 'PreviousTrackThumbnailBarButton.png')
 const PLAY_ICON = path.join(config.STATIC_PATH, 'PlayThumbnailBarButton.png')
@@ -32,7 +17,7 @@ let buttons = []
 /**
  * Show the Windows thumbnail toolbar buttons.
  */
-function enable () {
+export function enable () {
   buttons = [
     {
       tooltip: 'Previous Track',
@@ -56,26 +41,26 @@ function enable () {
 /**
  * Hide the Windows thumbnail toolbar buttons.
  */
-function disable () {
+export function disable () {
   buttons = []
   update()
 }
 
-function onPlayerPause () {
+export function onPlayerPause () {
   if (!isEnabled()) return
   buttons[PLAY_PAUSE].tooltip = 'Play'
   buttons[PLAY_PAUSE].icon = PLAY_ICON
   update()
 }
 
-function onPlayerPlay () {
+export function onPlayerPlay () {
   if (!isEnabled()) return
   buttons[PLAY_PAUSE].tooltip = 'Pause'
   buttons[PLAY_PAUSE].icon = PAUSE_ICON
   update()
 }
 
-function onPlayerUpdate (state) {
+export function onPlayerUpdate (state) {
   if (!isEnabled()) return
   buttons[PREV].flags = [state.hasPrevious ? 'enabled' : 'disabled']
   buttons[NEXT].flags = [state.hasNext ? 'enabled' : 'disabled']

src/main/tray.js

@@ -1,19 +1,10 @@
-module.exports = {
+import { app, Tray, Menu } from 'electron'
-  hasTray,
+import config from '../config.js'
-  init,
+import * as windows from './windows'
-  setWindowFocus
-}
-
-const electron = require('electron')
-
-const app = electron.app
-
-const config = require('../config')
-const windows = require('./windows')
 
 let tray
 
-function init () {
+export function init () {
   if (process.platform === 'linux') {
     initLinux()
   }
@@ -26,17 +17,17 @@ function init () {
 /**
  * Returns true if there a tray icon is active.
  */
-function hasTray () {
+export function hasTray () {
   return !!tray
 }
 
-function setWindowFocus (flag) {
+export function setWindowFocus (flag) {
   if (!tray) return
   updateTrayMenu()
 }
 
 function initLinux () {
-  checkLinuxTraySupport(function (err) {
+  checkLinuxTraySupport(err => {
     if (!err) createTray()
   })
 }
@@ -46,28 +37,20 @@ function initWin32 () {
 }
 
 /**
- * Check for libappindicator1 support before creating tray icon
+ * Check for libappindicator support before creating tray icon.
  */
-function checkLinuxTraySupport (cb) {
+async function checkLinuxTraySupport (cb) {
-  const cp = require('child_process')
+  const cp = await import('child_process')
 
-  // Check that we're on Ubuntu (or another debian system) and that we have
+  // Check that libappindicator libraries are installed in system.
-  // libappindicator1. If WebTorrent was installed from the deb file, we should
+  cp.exec('ldconfig -p | grep libappindicator', (err, stdout) => {
-  // always have it. If it was installed from the zip file, we might not.
-  cp.exec('dpkg --get-selections libappindicator1', function (err, stdout) {
     if (err) return cb(err)
-    // Unfortunately there's no cleaner way, as far as I can tell, to check
-    // whether a debian package is installed:
-    if (stdout.endsWith('\tinstall\n')) {
     cb(null)
-    } else {
-      cb(new Error('debian package not installed'))
-    }
   })
 }
 
 function createTray () {
-  tray = new electron.Tray(getIconPath())
+  tray = new Tray(getIconPath())
 
   // On Windows, left click opens the app, right click opens the context menu.
   // On Linux, any click (left or right) opens the context menu.
@@ -78,7 +61,7 @@ function createTray () {
 }
 
 function updateTrayMenu () {
-  const contextMenu = electron.Menu.buildFromTemplate(getMenuTemplate())
+  const contextMenu = Menu.buildFromTemplate(getMenuTemplate())
   tray.setContextMenu(contextMenu)
 }
 

src/main/updater.js

@@ -1,13 +1,10 @@
-module.exports = {
+import electron from '../../electron.cjs'
-  init
+import get from 'simple-get'
-}
+import config from '../config.js'
+import log from './log.js'
+import * as windows from './windows/index.js'
 
-const electron = require('electron')
+const { autoUpdater } = electron
-const get = require('simple-get')
-
-const config = require('../config')
-const log = require('./log')
-const windows = require('./windows')
 
 const AUTO_UPDATE_URL = config.AUTO_UPDATE_URL +
   '?version=' + config.APP_VERSION +
@@ -22,6 +19,8 @@ function init () {
   }
 }
 
+export default { init }
+
 // The Electron auto-updater does not support Linux yet, so manually check for
 // updates and show the user a modal notification.
 function initLinux () {
@@ -47,31 +46,31 @@ function onResponse (err, res, data) {
 }
 
 function initDarwinWin32 () {
-  electron.autoUpdater.on(
+  autoUpdater.on(
     'error',
-    (err) => log.error(`Update error: ${err.message}`)
+    (err) => log(`Update error: ${err.message}`)
   )
 
-  electron.autoUpdater.on(
+  autoUpdater.on(
     'checking-for-update',
     () => log('Checking for update')
   )
 
-  electron.autoUpdater.on(
+  autoUpdater.on(
     'update-available',
     () => log('Update available')
   )
 
-  electron.autoUpdater.on(
+  autoUpdater.on(
     'update-not-available',
     () => log('No update available')
   )
 
-  electron.autoUpdater.on(
+  autoUpdater.on(
     'update-downloaded',
     (e, notes, name, date, url) => log(`Update downloaded: ${name}: ${url}`)
   )
 
-  electron.autoUpdater.setFeedURL(AUTO_UPDATE_URL)
+  autoUpdater.setFeedURL({ url: AUTO_UPDATE_URL })
-  electron.autoUpdater.checkForUpdates()
+  autoUpdater.checkForUpdates()
 }

src/main/user-tasks.js

@@ -1,15 +1,9 @@
-module.exports = {
+import { app } from 'electron'
-  init
-}
-
-const electron = require('electron')
-
-const app = electron.app
 
 /**
  * Add a user task menu to the app icon on right-click. (Windows)
  */
-function init () {
+export function init () {
   if (process.platform !== 'win32') return
   app.setUserTasks(getUserTasks())
 }

src/main/windows/about.js

@@ -1,11 +1,12 @@
-const about = module.exports = {
+import config from '../../config.js'
+import electron from '../../../electron.cjs'
+import * as RemoteMain from '@electron/remote/main/index.js'
+
+export const about = {
   init,
   win: null
 }
 
-const config = require('../../config')
-const electron = require('electron')
-
 function init () {
   if (about.win) {
     return about.win.show()
@@ -15,7 +16,7 @@ function init () {
     backgroundColor: '#ECECEC',
     center: true,
     fullscreen: false,
-    height: 170,
+    height: 250,
     icon: getIconPath(),
     maximizable: false,
     minimizable: false,
@@ -25,21 +26,26 @@ function init () {
     title: 'About ' + config.APP_WINDOW_TITLE,
     useContentSize: true,
     webPreferences: {
-      nodeIntegration: true
+      nodeIntegration: true,
+      contextIsolation: false,
+      enableBlinkFeatures: 'AudioVideoTracks',
+      enableRemoteModule: true,
+      backgroundThrottling: false
     },
     width: 300
   })
-
+  RemoteMain.enable(win.webContents)
   win.loadURL(config.WINDOW_ABOUT)
 
-  // No menu on the About window
+  win.once('ready-to-show', () => {
-  win.setMenu(null)
-
-  win.once('ready-to-show', function () {
     win.show()
+    // No menu on the About window
+    // Hack: BrowserWindow removeMenu method not working on electron@7
+    // https://github.com/electron/electron/issues/21088
+    win.setMenuBarVisibility(false)
   })
 
-  win.once('closed', function () {
+  win.once('closed', () => {
     about.win = null
   })
 }

src/main/windows/index.js

@@ -1,3 +1,3 @@
-exports.about = require('./about')
+export * from './about.js'
-exports.main = require('./main')
+export * from './main.js'
-exports.webtorrent = require('./webtorrent')
+export * from './webtorrent.js'

src/main/windows/main.js

@@ -1,4 +1,13 @@
-const main = module.exports = {
+import debounce from 'debounce'
+import electron from '../../../electron.cjs'
+import config from '../../config.js'
+import log from '../log.js'
+import menu from '../menu.js'
+import * as RemoteMain from '@electron/remote/main/index.js'
+
+const { app, BrowserWindow, screen } = electron
+
+export const main = {
   dispatch,
   hide,
   init,
@@ -14,15 +23,6 @@ const main = module.exports = {
   win: null
 }
 
-const electron = require('electron')
-const debounce = require('debounce')
-
-const app = electron.app
-
-const config = require('../../config')
-const log = require('../log')
-const menu = require('../menu')
-
 function init (state, options) {
   if (main.win) {
     return main.win.show()
@@ -30,9 +30,8 @@ function init (state, options) {
 
   const initialBounds = Object.assign(config.WINDOW_INITIAL_BOUNDS, state.saved.bounds)
 
-  const win = main.win = new electron.BrowserWindow({
+  const win = main.win = new BrowserWindow({
     backgroundColor: '#282828',
-    backgroundThrottling: false, // do not throttle animations/timers when page is background
     darkTheme: true, // Forces dark theme (GTK+3)
     height: initialBounds.height,
     icon: getIconPath(), // Window icon (Windows, Linux)
@@ -44,12 +43,17 @@ function init (state, options) {
     useContentSize: true, // Specify web page size without OS chrome
     width: initialBounds.width,
     webPreferences: {
-      nodeIntegration: true
+      nodeIntegration: true,
+      contextIsolation: false,
+      enableBlinkFeatures: 'AudioVideoTracks',
+      enableRemoteModule: true,
+      backgroundThrottling: false
     },
     x: initialBounds.x,
     y: initialBounds.y
   })
-
+  RemoteMain.enable(win.webContents)
+  console.log(config.WINDOW_MAIN)
   win.loadURL(config.WINDOW_MAIN)
 
   win.once('ready-to-show', () => {
@@ -64,7 +68,7 @@ function init (state, options) {
     menu.onToggleFullScreen(main.win.isFullScreen())
   })
 
-  win.webContents.on('will-navigate', (e, url) => {
+  win.webContents.on('will-navigate', (e) => {
     // Prevent drag-and-drop from navigating the Electron window, which can happen
     // before our drag-and-drop handlers have been initialized.
     e.preventDefault()
@@ -96,10 +100,10 @@ function init (state, options) {
     send('windowBoundsChanged', e.sender.getBounds())
   }, 1000))
 
-  win.on('close', e => {
+  win.on('close', async e => {
     if (process.platform !== 'darwin') {
-      const tray = require('../tray')
+      const { hasTray } = await import('../tray.js')
-      if (!tray.hasTray()) {
+      if (!hasTray()) {
         app.quit()
         return
       }
@@ -150,7 +154,7 @@ function setBounds (bounds, maximize) {
     log('setBounds: maximizing')
     main.win.maximize()
   } else if (maximize === false && main.win.isMaximized()) {
-    log('setBounds: unmaximizing')
+    log('setBounds: minimizing')
     main.win.unmaximize()
   }
 
@@ -160,7 +164,7 @@ function setBounds (bounds, maximize) {
     log(`setBounds: setting bounds to ${JSON.stringify(bounds)}`)
     if (bounds.x === null && bounds.y === null) {
       // X and Y not specified? By default, center on current screen
-      const scr = electron.screen.getDisplayMatching(main.win.getBounds())
+      const scr = screen.getDisplayMatching(main.win.getBounds())
       bounds.x = Math.round(scr.bounds.x + (scr.bounds.width / 2) - (bounds.width / 2))
       bounds.y = Math.round(scr.bounds.y + (scr.bounds.height / 2) - (bounds.height / 2))
       log(`setBounds: centered to ${JSON.stringify(bounds)}`)

src/main/windows/webtorrent.js

@@ -1,4 +1,8 @@
-const webtorrent = module.exports = {
+import electron from '../../../electron.cjs'
+import config from '../../config.js'
+import * as RemoteMain from '@electron/remote/main/index.js'
+
+export const webtorrent = {
   init,
   send,
   show,
@@ -6,14 +10,9 @@ const webtorrent = module.exports = {
   win: null
 }
 
-const electron = require('electron')
-
-const config = require('../../config')
-
 function init () {
   const win = webtorrent.win = new electron.BrowserWindow({
     backgroundColor: '#1E1E1E',
-    backgroundThrottling: false, // do not throttle animations/timers when page is background
     center: true,
     fullscreen: false,
     fullscreenable: false,
@@ -26,15 +25,18 @@ function init () {
     title: 'webtorrent-hidden-window',
     useContentSize: true,
     webPreferences: {
-      nodeIntegration: true
+      nodeIntegration: true,
+      contextIsolation: false,
+      enableBlinkFeatures: 'AudioVideoTracks',
+      enableRemoteModule: true,
+      backgroundThrottling: false
     },
     width: 150
   })
-
+  RemoteMain.enable(win.webContents)
   win.loadURL(config.WINDOW_WEBTORRENT)
-
   // Prevent killing the WebTorrent process
-  win.on('close', function (e) {
+  win.on('close', e => {
     if (electron.app.isQuitting) {
       return
     }

src/renderer/components/create-torrent-error-page.js

@@ -1,8 +1,7 @@
-const React = require('react')
+import * as React from 'react'
+import { dispatcher } from '../lib/dispatcher.js'
 
-const { dispatcher } = require('../lib/dispatcher')
+export default class CreateTorrentErrorPage extends React.Component {
-
-module.exports = class CreateTorrentErrorPage extends React.Component {
   render () {
     return (
       <div className='create-torrent'>

src/renderer/components/delete-all-torrents-modal.js

@@ -0,0 +1,30 @@
+import * as React from 'react'
+import ModalOKCancel from './modal-ok-cancel.js'
+import { dispatch, dispatcher } from '../lib/dispatcher.js'
+
+export default class DeleteAllTorrentsModal extends React.Component {
+  render () {
+    const { state: { modal: { deleteData } } } = this.props
+    const message = deleteData
+      ? 'Are you sure you want to remove all the torrents from the list and delete the data files?'
+      : 'Are you sure you want to remove all the torrents from the list?'
+    const buttonText = deleteData ? 'REMOVE DATA' : 'REMOVE'
+
+    return (
+      <div>
+        <p><strong>{message}</strong></p>
+        <ModalOKCancel
+          cancelText='CANCEL'
+          onCancel={dispatcher('exitModal')}
+          okText={buttonText}
+          onOK={handleRemove}
+        />
+      </div>
+    )
+
+    function handleRemove () {
+      dispatch('deleteAllTorrents', deleteData)
+      dispatch('exitModal')
+    }
+  }
+}

src/renderer/components/header.js

@@ -1,8 +1,7 @@
-const React = require('react')
+import * as React from 'react'
+import { dispatcher } from '../lib/dispatcher.js'
 
-const { dispatcher } = require('../lib/dispatcher')
+export default class Header extends React.Component {
-
-class Header extends React.Component {
   render () {
     const loc = this.props.state.location
     return (
@@ -56,5 +55,3 @@ class Header extends React.Component {
     )
   }
 }
-
-module.exports = Header

src/renderer/components/heading.js

@@ -1,9 +1,8 @@
-const React = require('react')
+import * as React from 'react'
-const PropTypes = require('prop-types')
+import PropTypes from 'prop-types'
+import * as colors from 'material-ui/styles/colors'
 
-const colors = require('material-ui/styles/colors')
+export default class Heading extends React.Component {
-
-class Heading extends React.Component {
   static get propTypes () {
     return {
       level: PropTypes.number
@@ -31,5 +30,3 @@ class Heading extends React.Component {
     )
   }
 }
-
-module.exports = Heading

src/renderer/components/modal-ok-cancel.js

@@ -1,8 +1,10 @@
-const React = require('react')
+import * as React from 'react'
-const FlatButton = require('material-ui/FlatButton').default
+import flatButton from 'material-ui/FlatButton'
-const RaisedButton = require('material-ui/RaisedButton').default
+import raisedButton from 'material-ui/RaisedButton'
 
-module.exports = class ModalOKCancel extends React.Component {
+const FlatButton = flatButton.default
+const RaisedButton = raisedButton.default
+export default class ModalOKCancel extends React.Component {
   render () {
     const cancelStyle = { marginRight: 10, color: 'black' }
     const { cancelText, onCancel, okText, onOK } = this.props

src/renderer/components/open-torrent-address-modal.js

@@ -1,12 +1,14 @@
-const React = require('react')
+import * as React from 'react'
-const TextField = require('material-ui/TextField').default
+import textField from 'material-ui/TextField'
-const { clipboard } = require('electron')
+import electron from 'electron'
+import ModalOKCancel from './modal-ok-cancel.js'
+import { dispatch, dispatcher } from '../lib/dispatcher.js'
+import { isMagnetLink } from '../lib/torrent-player.js'
 
-const ModalOKCancel = require('./modal-ok-cancel')
+const TextField = textField.default
-const { dispatch, dispatcher } = require('../lib/dispatcher')
+const { clipboard } = electron
-const { isMagnetLink } = require('../lib/torrent-player')
 
-module.exports = class OpenTorrentAddressModal extends React.Component {
+export default class OpenTorrentAddressModal extends React.Component {
   render () {
     return (
       <div className='open-torrent-address-modal'>

src/renderer/components/path-selector.js

@@ -1,19 +1,17 @@
-const path = require('path')
+import path from 'path'
-
+import * as colors from 'material-ui/styles/colors'
-const colors = require('material-ui/styles/colors')
+import remote from '@electron/remote'
-const electron = require('electron')
+import * as React from 'react'
-const React = require('react')
+import PropTypes from 'prop-types'
-const PropTypes = require('prop-types')
+import raisedButton from 'material-ui/RaisedButton'
-
+import textField from 'material-ui/TextField'
-const remote = electron.remote
-
-const RaisedButton = require('material-ui/RaisedButton').default
-const TextField = require('material-ui/TextField').default
 
+const RaisedButton = raisedButton.default
+const TextField = textField.default
 // Lets you pick a file or directory.
 // Uses the system Open File dialog.
 // You can't edit the text field directly.
-class PathSelector extends React.Component {
+export default class PathSelector extends React.Component {
   static propTypes () {
     return {
       className: PropTypes.string,
@@ -32,19 +30,14 @@ class PathSelector extends React.Component {
 
   handleClick () {
     const opts = Object.assign({
-      defaultPath: this.props.value && path.dirname(this.props.value),
+      defaultPath: path.dirname(this.props.value || ''),
       properties: ['openFile', 'openDirectory']
     }, this.props.dialog)
 
-    remote.dialog.showOpenDialog(
+    const filenames = remote.dialog.showOpenDialogSync(remote.getCurrentWindow(), opts)
-      remote.getCurrentWindow(),
-      opts,
-      (filenames) => {
     if (!Array.isArray(filenames)) return
     this.props.onChange && this.props.onChange(filenames[0])
   }
-    )
-  }
 
   render () {
     const id = this.props.title.replace(' ', '-').toLowerCase()
@@ -88,5 +81,3 @@ class PathSelector extends React.Component {
     )
   }
 }
-
-module.exports = PathSelector

src/renderer/components/remove-torrent-modal.js

@@ -1,9 +1,8 @@
-const React = require('react')
+import * as React from 'react'
+import ModalOKCancel from './modal-ok-cancel.js'
+import { dispatch, dispatcher } from '../lib/dispatcher.js'
 
-const ModalOKCancel = require('./modal-ok-cancel')
+export default class RemoveTorrentModal extends React.Component {
-const { dispatch, dispatcher } = require('../lib/dispatcher')
-
-module.exports = class RemoveTorrentModal extends React.Component {
   render () {
     const state = this.props.state
     const message = state.modal.deleteData

src/renderer/components/show-more.js

@@ -1,9 +1,10 @@
-const React = require('react')
+import * as React from 'react'
-const PropTypes = require('prop-types')
+import PropTypes from 'prop-types'
+import raisedButton from 'material-ui/RaisedButton'
 
-const RaisedButton = require('material-ui/RaisedButton').default
+const RaisedButton = raisedButton.default
 
-class ShowMore extends React.Component {
+export default class ShowMore extends React.Component {
   static get propTypes () {
     return {
       defaultExpanded: PropTypes.bool,
@@ -21,11 +22,9 @@ class ShowMore extends React.Component {
 
   constructor (props) {
     super(props)
-
     this.state = {
       expanded: !!this.props.defaultExpanded
     }
-
     this.handleClick = this.handleClick.bind(this)
   }
 
@@ -51,5 +50,3 @@ class ShowMore extends React.Component {
     )
   }
 }
-
-module.exports = ShowMore

src/renderer/components/unsupported-media-modal.js

@@ -1,10 +1,9 @@
-const React = require('react')
+import * as React from 'react'
-const electron = require('electron')
+import { shell } from 'electron'
+import ModalOKCancel from './modal-ok-cancel.js'
+import { dispatcher } from '../lib/dispatcher.js'
 
-const ModalOKCancel = require('./modal-ok-cancel')
+export default class UnsupportedMediaModal extends React.Component {
-const { dispatcher } = require('../lib/dispatcher')
-
-module.exports = class UnsupportedMediaModal extends React.Component {
   render () {
     const state = this.props.state
     const err = state.modal.error
@@ -36,7 +35,7 @@ module.exports = class UnsupportedMediaModal extends React.Component {
   }
 
   onInstall () {
-    electron.shell.openExternal('http://www.videolan.org/vlc/')
+    shell.openExternal('https://www.videolan.org/vlc/')
 
     // TODO: dcposch send a dispatch rather than modifying state directly
     const state = this.props.state

src/renderer/components/update-available-modal.js

@@ -1,10 +1,9 @@
-const React = require('react')
+import * as React from 'react'
-const electron = require('electron')
+import { shell } from 'electron'
+import ModalOKCancel from './modal-ok-cancel.js'
+import { dispatch } from '../lib/dispatcher.js'
 
-const ModalOKCancel = require('./modal-ok-cancel')
+export default class UpdateAvailableModal extends React.Component {
-const { dispatch } = require('../lib/dispatcher')
-
-module.exports = class UpdateAvailableModal extends React.Component {
   render () {
     const state = this.props.state
     return (
@@ -25,7 +24,7 @@ module.exports = class UpdateAvailableModal extends React.Component {
 
     function handleShow () {
       // TODO: use the GitHub urls from config.js
-      electron.shell.openExternal('https://github.com/webtorrent/webtorrent-desktop/releases')
+      shell.openExternal('https://github.com/webtorrent/webtorrent-desktop/releases')
       dispatch('exitModal')
     }
 

src/renderer/controllers/audio-tracks-controller.js

@@ -0,0 +1,17 @@
+import { dispatch } from '../lib/dispatcher.js'
+
+export default class AudioTracksController {
+  constructor (state) {
+    this.state = state
+  }
+
+  selectAudioTrack (ix) {
+    this.state.playing.audioTracks.selectedIndex = ix
+    dispatch('skip', 0.2) // HACK: hardcoded seek value for smooth audio change
+  }
+
+  toggleAudioTracksMenu () {
+    const audioTracks = this.state.playing.audioTracks
+    audioTracks.showMenu = !audioTracks.showMenu
+  }
+}

src/renderer/controllers/folder-watcher-controller.js

@@ -1,6 +1,6 @@
-const { ipcRenderer } = require('electron')
+import { ipcRenderer } from 'electron'
 
-module.exports = class FolderWatcherController {
+export default class FolderWatcherController {
   start () {
     console.log('-- IPC: start folder watcher')
     ipcRenderer.send('startFolderWatcher')

src/renderer/controllers/media-controller.js

@@ -1,10 +1,8 @@
-const { ipcRenderer } = require('electron')
+import { ipcRenderer } from 'electron'
-const telemetry = require('../lib/telemetry')
+import telemetry from '../lib/telemetry.js'
-const Playlist = require('../lib/playlist')
+import Playlist from '../lib/playlist.js'
 
-// Controls local play back: the <video>/<audio> tag and VLC
+export default class MediaController {
-// Does not control remote casting (Chromecast etc)
-module.exports = class MediaController {
   constructor (state) {
     this.state = state
   }
@@ -23,10 +21,10 @@ module.exports = class MediaController {
       telemetry.logPlayAttempt('error')
       state.playing.location = 'error'
       ipcRenderer.send('checkForExternalPlayer', state.saved.prefs.externalPlayerPath)
-      ipcRenderer.once('checkForExternalPlayer', function (e, isInstalled) {
+      ipcRenderer.once('checkForExternalPlayer', (e, isInstalled) => {
         state.modal = {
           id: 'unsupported-media-modal',
-          error: error,
+          error,
           externalPlayerInstalled: isInstalled
         }
       })
@@ -56,7 +54,7 @@ module.exports = class MediaController {
     const state = this.state
     state.playing.location = 'external'
 
-    const onServerRunning = function () {
+    const onServerRunning = () => {
       state.playing.isReady = true
       telemetry.logPlayAttempt('external')
 

src/renderer/controllers/playback-controller.js

@@ -1,21 +1,29 @@
-const electron = require('electron')
+import { ipcRenderer } from 'electron'
-const path = require('path')
+import path from 'path'
-
+import Cast from '../lib/cast.js'
-const Cast = require('../lib/cast')
+import { dispatch } from '../lib/dispatcher.js'
-const { dispatch } = require('../lib/dispatcher')
+import telemetry from '../lib/telemetry.js'
-const telemetry = require('../lib/telemetry')
+import { UnplayableFileError, UnplayableTorrentError } from '../lib/errors.js'
-const { UnplayableFileError, UnplayableTorrentError } = require('../lib/errors')
+import sound from '../lib/sound.js'
-const sound = require('../lib/sound')
+import TorrentPlayer from '../lib/torrent-player.js'
-const TorrentPlayer = require('../lib/torrent-player')
+import TorrentSummary from '../lib/torrent-summary.js'
-const TorrentSummary = require('../lib/torrent-summary')
+import Playlist from '../lib/playlist.js'
-const Playlist = require('../lib/playlist')
+import State from '../lib/state.js'
-const State = require('../lib/state')
+// Checks whether we are connected and already casting
-
+// Returns false if we not casting (state.playing.location === 'local')
-const ipcRenderer = electron.ipcRenderer
+// or if we're trying to connect but haven't yet ('chromecast-pending', etc)
-
+function isCasting (state) {
-// Controls playback of torrents and files within torrents
+  return state.playing.location === 'chromecast' ||
-// both local (<video>,<audio>,external player) and remote (cast)
+        state.playing.location === 'airplay' ||
-module.exports = class PlaybackController {
+        state.playing.location === 'dlna'
+}
+function restoreBounds (state) {
+  ipcRenderer.send('setAspectRatio', 0)
+  if (state.window.bounds) {
+    ipcRenderer.send('setBounds', state.window.bounds, false)
+  }
+}
+export default class PlaybackController {
   constructor (state, config, update) {
     this.state = state
     this.config = config
@@ -28,12 +36,10 @@ module.exports = class PlaybackController {
   // * If no file index is provided, restore the most recently viewed file or autoplay the first
   playFile (infoHash, index /* optional */) {
     this.pauseActiveTorrents(infoHash)
-
     const state = this.state
     if (state.location.url() === 'player') {
       this.updatePlayer(infoHash, index, false, (err) => {
-        if (err) dispatch('error', err)
+        if (err) { dispatch('error', err) } else { this.play() }
-        else this.play()
       })
     } else {
       let initialized = false
@@ -41,13 +47,10 @@ module.exports = class PlaybackController {
         url: 'player',
         setup: (cb) => {
           const torrentSummary = TorrentSummary.getByKey(state, infoHash)
-
           if (index === undefined || initialized) index = torrentSummary.mostRecentFileIndex
           if (index === undefined) index = torrentSummary.files.findIndex(TorrentPlayer.isPlayable)
           if (index === undefined) return cb(new UnplayableTorrentError())
-
           initialized = true
-
           this.openPlayer(infoHash, index, (err) => {
             if (!err) this.play()
             cb(err)
@@ -55,45 +58,37 @@ module.exports = class PlaybackController {
         },
         destroy: () => this.closePlayer()
       }, (err) => {
-        if (err) dispatch('error', err)
+        if (err) { dispatch('error', err) }
       })
     }
   }
 
   // Open a file in OS default app.
-  openItem (infoHash, index) {
+  openPath (infoHash, index) {
     const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
-    const filePath = path.join(
+    const filePath = path.join(torrentSummary.path, torrentSummary.files[index].path)
-      torrentSummary.path,
+    ipcRenderer.send('openPath', filePath)
-      torrentSummary.files[index].path)
-    ipcRenderer.send('openItem', filePath)
   }
 
   // Toggle (play or pause) the currently playing media
   playPause () {
     const state = this.state
     if (state.location.url() !== 'player') return
-
     // force rerendering if window is hidden,
     // in order to bypass `raf` and play/pause media immediately
     const mediaTag = document.querySelector('video,audio')
     if (!state.window.isVisible && mediaTag) {
-      if (state.playing.isPaused) mediaTag.play()
+      if (state.playing.isPaused) { mediaTag.play() } else { mediaTag.pause() }
-      else mediaTag.pause()
     }
-
+    if (state.playing.isPaused) { this.play() } else { this.pause() }
-    if (state.playing.isPaused) this.play()
-    else this.pause()
   }
 
   pauseActiveTorrents (infoHash) {
     // Playback Priority: pause all active torrents if needed.
     if (!this.state.saved.prefs.highestPlaybackPriority) return
-
     // Do not pause active torrents if playing a fully downloaded torrent.
     const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
     if (torrentSummary.status === 'seeding') return
-
     dispatch('prioritizeTorrent', infoHash)
   }
 
@@ -101,10 +96,8 @@ module.exports = class PlaybackController {
   nextTrack () {
     const state = this.state
     if (Playlist.hasNext(state) && state.playing.location !== 'external') {
-      this.updatePlayer(
+      this.updatePlayer(state.playing.infoHash, Playlist.getNextIndex(state), false, (err) => {
-        state.playing.infoHash, Playlist.getNextIndex(state), false, (err) => {
+        if (err) { dispatch('error', err) } else { this.play() }
-          if (err) dispatch('error', err)
-          else this.play()
       })
     }
   }
@@ -113,10 +106,8 @@ module.exports = class PlaybackController {
   previousTrack () {
     const state = this.state
     if (Playlist.hasPrevious(state) && state.playing.location !== 'external') {
-      this.updatePlayer(
+      this.updatePlayer(state.playing.infoHash, Playlist.getPreviousIndex(state), false, (err) => {
-        state.playing.infoHash, Playlist.getPreviousIndex(state), false, (err) => {
+        if (err) { dispatch('error', err) } else { this.play() }
-          if (err) dispatch('error', err)
-          else this.play()
       })
     }
   }
@@ -154,8 +145,21 @@ module.exports = class PlaybackController {
       console.error('Tried to skip to a non-finite time ' + time)
       return console.trace()
     }
-    if (isCasting(this.state)) Cast.seek(time)
+    if (isCasting(this.state)) { Cast.seek(time) } else { this.state.playing.jumpToTime = time }
-    else this.state.playing.jumpToTime = time
+  }
+
+  // Show video preview
+  preview (x) {
+    if (!Number.isFinite(x)) {
+      console.error('Tried to preview a non-finite position ' + x)
+      return console.trace()
+    }
+    this.state.playing.previewXCoord = x
+  }
+
+  // Hide video preview
+  clearPreview () {
+    this.state.playing.previewXCoord = null
   }
 
   // Change playback speed. 1 = faster, -1 = slower
@@ -193,7 +197,6 @@ module.exports = class PlaybackController {
   setVolume (volume) {
     // check if its in [0.0 - 1.0] range
     volume = Math.max(0, Math.min(1, volume))
-
     const state = this.state
     if (isCasting(state)) {
       Cast.setVolume(volume)
@@ -210,7 +213,6 @@ module.exports = class PlaybackController {
   showOrHidePlayerControls () {
     const state = this.state
     const hideControls = state.shouldHidePlayerControls()
-
     if (hideControls !== state.playing.hideControls) {
       state.playing.hideControls = hideControls
       return true
@@ -222,13 +224,10 @@ module.exports = class PlaybackController {
   openPlayer (infoHash, index, cb) {
     const state = this.state
     const torrentSummary = TorrentSummary.getByKey(state, infoHash)
-
     state.playing.infoHash = torrentSummary.infoHash
     state.playing.isReady = false
-
     // update UI to show pending playback
     sound.play('PLAY')
-
     this.startServer(torrentSummary)
     ipcRenderer.send('onPlayerOpen')
     this.updatePlayer(infoHash, index, true, cb)
@@ -237,15 +236,12 @@ module.exports = class PlaybackController {
   // Starts WebTorrent server for media streaming
   startServer (torrentSummary) {
     const state = this.state
-
     if (torrentSummary.status === 'paused') {
       dispatch('startTorrentingSummary', torrentSummary.torrentKey)
-      ipcRenderer.once('wt-ready-' + torrentSummary.infoHash,
+      ipcRenderer.once('wt-ready-' + torrentSummary.infoHash, () => onTorrentReady())
-        () => onTorrentReady())
     } else {
       onTorrentReady()
     }
-
     function onTorrentReady () {
       ipcRenderer.send('wt-start-server', torrentSummary.infoHash)
       ipcRenderer.once('wt-server-running', () => { state.playing.isReady = true })
@@ -255,25 +251,22 @@ module.exports = class PlaybackController {
   // Called each time the current file changes
   updatePlayer (infoHash, index, resume, cb) {
     const state = this.state
-
     const torrentSummary = TorrentSummary.getByKey(state, infoHash)
     const fileSummary = torrentSummary.files[index]
-
     if (!TorrentPlayer.isPlayable(fileSummary)) {
       torrentSummary.mostRecentFileIndex = undefined
       return cb(new UnplayableFileError())
     }
-
     torrentSummary.mostRecentFileIndex = index
-
     // update state
     state.playing.infoHash = infoHash
     state.playing.fileIndex = index
     state.playing.fileName = fileSummary.name
-    state.playing.type = TorrentPlayer.isVideo(fileSummary) ? 'video'
+    state.playing.type = TorrentPlayer.isVideo(fileSummary)
-      : TorrentPlayer.isAudio(fileSummary) ? 'audio'
+      ? 'video'
+      : TorrentPlayer.isAudio(fileSummary)
+        ? 'audio'
         : 'other'
-
         // pick up where we left off
     let jumpToTime = 0
     if (resume && fileSummary.currentTime) {
@@ -284,30 +277,24 @@ module.exports = class PlaybackController {
       }
     }
     state.playing.jumpToTime = jumpToTime
-
     // if it's audio, parse out the metadata (artist, title, etc)
     if (torrentSummary.status === 'paused') {
       ipcRenderer.once('wt-ready-' + torrentSummary.infoHash, getAudioMetadata)
     } else {
       getAudioMetadata()
     }
-
     function getAudioMetadata () {
       if (state.playing.type === 'audio') {
         ipcRenderer.send('wt-get-audio-metadata', torrentSummary.infoHash, index)
       }
     }
-
     // if it's video, check for subtitles files that are done downloading
     dispatch('checkForSubtitles')
-
     // enable previously selected subtitle track
     if (fileSummary.selectedSubtitle) {
       dispatch('addSubtitles', [fileSummary.selectedSubtitle], true)
     }
-
     state.window.title = fileSummary.name
-
     // play in VLC if set as default player (Preferences / Playback / Play in VLC)
     if (this.state.saved.prefs.openExternalPlayer) {
       dispatch('openExternalPlayer')
@@ -315,10 +302,8 @@ module.exports = class PlaybackController {
       cb()
       return
     }
-
     // otherwise, play the video
     this.update()
-
     ipcRenderer.send('onPlayerUpdate', Playlist.hasNext(state), Playlist.hasPrevious(state))
     cb()
   }
@@ -349,33 +334,13 @@ module.exports = class PlaybackController {
       dispatch('toggleFullScreen', false)
     }
     restoreBounds(state)
-
     // Tell the WebTorrent process to kill the torrent-to-HTTP server
     ipcRenderer.send('wt-stop-server')
-
     ipcRenderer.send('onPlayerClose')
-
     // Playback Priority: resume previously paused downloads.
     if (this.state.saved.prefs.highestPlaybackPriority) {
       dispatch('resumePausedTorrents')
     }
-
     this.update()
   }
 }
-
-// Checks whether we are connected and already casting
-// Returns false if we not casting (state.playing.location === 'local')
-// or if we're trying to connect but haven't yet ('chromecast-pending', etc)
-function isCasting (state) {
-  return state.playing.location === 'chromecast' ||
-    state.playing.location === 'airplay' ||
-    state.playing.location === 'dlna'
-}
-
-function restoreBounds (state) {
-  ipcRenderer.send('setAspectRatio', 0)
-  if (state.window.bounds) {
-    ipcRenderer.send('setBounds', state.window.bounds, false)
-  }
-}

src/renderer/controllers/prefs-controller.js

@@ -1,8 +1,7 @@
-const { dispatch } = require('../lib/dispatcher')
+import { dispatch } from '../lib/dispatcher.js'
-const ipcRenderer = require('electron').ipcRenderer
+import { ipcRenderer } from 'electron'
 
-// Controls the Preferences screen
+export default class PrefsController {
-module.exports = class PrefsController {
   constructor (state, config) {
     this.state = state
     this.config = config
@@ -13,7 +12,7 @@ module.exports = class PrefsController {
     const state = this.state
     state.location.go({
       url: 'preferences',
-      setup: function (cb) {
+      setup (cb) {
         // initialize preferences
         state.window.title = 'Preferences'
         ipcRenderer.send('setAllowNav', false)

src/renderer/controllers/subtitles-controller.js

@@ -1,26 +1,22 @@
-const electron = require('electron')
+import remote from '@electron/remote'
-const fs = require('fs')
+import fs from 'fs'
-const path = require('path')
+import path from 'path'
-const parallel = require('run-parallel')
+import parallel from 'run-parallel'
+import { dispatch } from '../lib/dispatcher.js'
 
-const remote = electron.remote
+export default class SubtitlesController {
-
-const { dispatch } = require('../lib/dispatcher')
-
-module.exports = class SubtitlesController {
   constructor (state) {
     this.state = state
   }
 
   openSubtitles () {
-    remote.dialog.showOpenDialog({
+    const filenames = remote.dialog.showOpenDialogSync({
       title: 'Select a subtitles file.',
       filters: [{ name: 'Subtitles', extensions: ['vtt', 'srt'] }],
       properties: ['openFile']
-    }, (filenames) => {
+    })
     if (!Array.isArray(filenames)) return
     this.addSubtitles(filenames, true)
-    })
   }
 
   selectSubtitle (ix) {
@@ -40,12 +36,11 @@ module.exports = class SubtitlesController {
 
     // Read the files concurrently, then add all resulting subtitle tracks
     const tasks = files.map((file) => (cb) => loadSubtitle(file, cb))
-    parallel(tasks, function (err, tracks) {
+    parallel(tasks, (err, tracks) => {
       if (err) return dispatch('error', err)
 
-      for (let i = 0; i < tracks.length; i++) {
       // No dupes allowed
-        const track = tracks[i]
+      tracks.forEach((track, i) => {
         let trackIndex = subtitles.tracks.findIndex((t) =>
           track.filePath === t.filePath)
 
@@ -58,7 +53,7 @@ module.exports = class SubtitlesController {
         if (autoSelect && (i === 0 || isSystemLanguage(track.language))) {
           subtitles.selectedIndex = trackIndex
         }
-      }
+      })
 
       // Finally, make sure no two tracks have the same label
       relabelSubtitles(subtitles)
@@ -86,18 +81,18 @@ module.exports = class SubtitlesController {
   }
 }
 
-function loadSubtitle (file, cb) {
+async function loadSubtitle (file, cb) {
   // Lazy load to keep startup fast
-  const concat = require('simple-concat')
+  const concat = await import('simple-concat')
-  const LanguageDetect = require('languagedetect')
+  const LanguageDetect = await import('languagedetect')
-  const srtToVtt = require('srt-to-vtt')
+  const srtToVtt = await import('srt-to-vtt')
 
   // Read the .SRT or .VTT file, parse it, add subtitle track
   const filePath = file.path || file
 
   const vttStream = fs.createReadStream(filePath).pipe(srtToVtt())
 
-  concat(vttStream, function (err, buf) {
+  concat(vttStream, (err, buf) => {
     if (err) return dispatch('error', 'Can\'t parse subtitles file.')
 
     // Detect what language the subtitles are in
@@ -110,7 +105,7 @@ function loadSubtitle (file, cb) {
       buffer: 'data:text/vtt;base64,' + buf.toString('base64'),
       language: langDetected,
       label: langDetected,
-      filePath: filePath
+      filePath
     }
 
     cb(null, track)
@@ -119,8 +114,8 @@ function loadSubtitle (file, cb) {
 
 // Checks whether a language name like 'English' or 'German' matches the system
 // language, aka the current locale
-function isSystemLanguage (language) {
+async function isSystemLanguage (language) {
-  const iso639 = require('iso-639-1')
+  const iso639 = await import('iso-639-1')
   const osLangISO = window.navigator.language.split('-')[0] // eg 'en'
   const langIso = iso639.getCode(language) // eg 'de' if language is 'German'
   return langIso === osLangISO
@@ -130,7 +125,7 @@ function isSystemLanguage (language) {
 // Labels each track by language, eg 'German', 'English', 'English 2', ...
 function relabelSubtitles (subtitles) {
   const counts = {}
-  subtitles.tracks.forEach(function (track) {
+  subtitles.tracks.forEach(track => {
     const lang = track.language
     counts[lang] = (counts[lang] || 0) + 1
     track.label = counts[lang] > 1 ? (lang + ' ' + counts[lang]) : lang

src/renderer/controllers/torrent-controller.js

@@ -1,11 +1,10 @@
-const path = require('path')
+import path from 'path'
-const ipcRenderer = require('electron').ipcRenderer
+import { ipcRenderer } from 'electron'
+import TorrentSummary from '../lib/torrent-summary.js'
+import sound from '../lib/sound.js'
+import { dispatch } from '../lib/dispatcher.js'
 
-const TorrentSummary = require('../lib/torrent-summary')
+export default class TorrentController {
-const sound = require('../lib/sound')
-const { dispatch } = require('../lib/dispatcher')
-
-module.exports = class TorrentController {
   constructor (state) {
     this.state = state
   }
@@ -25,7 +24,7 @@ module.exports = class TorrentController {
       }
 
       torrentSummary = {
-        torrentKey: torrentKey,
+        torrentKey,
         status: 'new'
       }
       torrents.unshift(torrentSummary)
@@ -177,7 +176,7 @@ function showDoneNotification (torrent) {
     silent: true
   })
 
-  notif.onclick = function () {
+  notif.onclick = () => {
     ipcRenderer.send('show')
   }
 

src/renderer/controllers/torrent-list-controller.js

@@ -1,18 +1,18 @@
-const fs = require('fs')
+import fs from 'fs'
-const path = require('path')
+import path from 'path'
-const electron = require('electron')
+import electron from 'electron'
+import remote from '@electron/remote'
 
-const { dispatch } = require('../lib/dispatcher')
+import { dispatch } from '../lib/dispatcher.js'
-const { TorrentKeyNotFoundError } = require('../lib/errors')
+import { TorrentKeyNotFoundError } from '../lib/errors.js'
-const sound = require('../lib/sound')
+import sound from '../lib/sound.js'
-const TorrentSummary = require('../lib/torrent-summary')
+import TorrentSummary from '../lib/torrent-summary.js'
 
-const ipcRenderer = electron.ipcRenderer
+const { ipcRenderer, clipboard } = electron
 
 const instantIoRegex = /^(https:\/\/)?instant\.io\/#/
 
-// Controls the torrent list: creating, adding, deleting, & manipulating torrents
+export default class TorrentListController {
-module.exports = class TorrentListController {
   constructor (state) {
     this.state = state
   }
@@ -55,7 +55,7 @@ module.exports = class TorrentListController {
     if (files.length === 0 || typeof files[0] !== 'string') {
       this.state.location.go({
         url: 'create-torrent',
-        files: files,
+        files,
         setup: (cb) => {
           this.state.window.title = 'Create New Torrent'
           cb(null)
@@ -95,7 +95,7 @@ module.exports = class TorrentListController {
     if (!fileOrFolder) return start()
 
     // Existing torrent: check that the path is still there
-    fs.stat(fileOrFolder, function (err) {
+    fs.stat(fileOrFolder, err => {
       if (err) {
         s.error = 'path-missing'
         dispatch('backToList')
@@ -157,10 +157,8 @@ module.exports = class TorrentListController {
 
   prioritizeTorrent (infoHash) {
     this.state.saved.torrents
-      .filter((torrent) => { // We're interested in active torrents only.
+      .filter(torrent => ['downloading', 'seeding'].includes(torrent.status)) // Active torrents only.
-        return (['downloading', 'seeding'].indexOf(torrent.status) !== -1)
+      .forEach((torrent) => { // Pause all active torrents except the one that started playing.
-      })
-      .map((torrent) => { // Pause all active torrents except the one that started playing.
         if (infoHash === torrent.infoHash) return
 
         // Pause torrent without playing sounds.
@@ -175,7 +173,7 @@ module.exports = class TorrentListController {
   resumePausedTorrents () {
     console.log('Playback Priority: resuming paused torrents')
     if (!this.state.saved.torrentsToResume || !this.state.saved.torrentsToResume.length) return
-    this.state.saved.torrentsToResume.map((infoHash) => {
+    this.state.saved.torrentsToResume.forEach((infoHash) => {
       this.toggleTorrent(infoHash)
     })
 
@@ -201,26 +199,43 @@ module.exports = class TorrentListController {
     }
   }
 
+  confirmDeleteAllTorrents (deleteData) {
+    this.state.modal = {
+      id: 'delete-all-torrents-modal',
+      deleteData
+    }
+  }
+
   // TODO: use torrentKey, not infoHash
   deleteTorrent (infoHash, deleteData) {
-    ipcRenderer.send('wt-stop-torrenting', infoHash)
-
     const index = this.state.saved.torrents.findIndex((x) => x.infoHash === infoHash)
 
     if (index > -1) {
       const summary = this.state.saved.torrents[index]
-
+      deleteTorrentFile(summary, deleteData)
-      // remove torrent and poster file
-      deleteFile(TorrentSummary.getTorrentPath(summary))
-      deleteFile(TorrentSummary.getPosterPath(summary))
-
-      // optionally delete the torrent data
-      if (deleteData) moveItemToTrash(summary)
 
       // remove torrent from saved list
       this.state.saved.torrents.splice(index, 1)
       dispatch('stateSave')
+
+      // prevent user from going forward to a deleted torrent
+      this.state.location.clearForward('player')
+      sound.play('DELETE')
+    } else {
+      throw new TorrentKeyNotFoundError(infoHash)
     }
+  }
+
+  deleteAllTorrents (deleteData) {
+    // Go back to list before the current playing torrent is deleted
+    if (this.state.location.url() === 'player') {
+      dispatch('backToList')
+    }
+
+    this.state.saved.torrents.forEach((summary) => deleteTorrentFile(summary, deleteData))
+
+    this.state.saved.torrents = []
+    dispatch('stateSave')
 
     // prevent user from going forward to a deleted torrent
     this.state.location.clearForward('player')
@@ -237,79 +252,90 @@ module.exports = class TorrentListController {
 
   openTorrentContextMenu (infoHash) {
     const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
-    const menu = new electron.remote.Menu()
+    const menu = new remote.Menu()
 
-    menu.append(new electron.remote.MenuItem({
+    menu.append(new remote.MenuItem({
       label: 'Remove From List',
       click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, false)
     }))
 
-    menu.append(new electron.remote.MenuItem({
+    menu.append(new remote.MenuItem({
       label: 'Remove Data File',
       click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, true)
     }))
 
-    menu.append(new electron.remote.MenuItem({
+    menu.append(new remote.MenuItem({
       type: 'separator'
     }))
 
     if (torrentSummary.files) {
-      menu.append(new electron.remote.MenuItem({
+      menu.append(new remote.MenuItem({
         label: process.platform === 'darwin' ? 'Show in Finder' : 'Show in Folder',
         click: () => showItemInFolder(torrentSummary)
       }))
-      menu.append(new electron.remote.MenuItem({
+      menu.append(new remote.MenuItem({
         type: 'separator'
       }))
     }
 
-    menu.append(new electron.remote.MenuItem({
+    menu.append(new remote.MenuItem({
       label: 'Copy Magnet Link to Clipboard',
-      click: () => electron.clipboard.writeText(torrentSummary.magnetURI)
+      click: () => clipboard.writeText(torrentSummary.magnetURI)
     }))
 
-    menu.append(new electron.remote.MenuItem({
+    menu.append(new remote.MenuItem({
       label: 'Copy Instant.io Link to Clipboard',
-      click: () => electron.clipboard.writeText(`https://instant.io/#${torrentSummary.infoHash}`)
+      click: () => clipboard.writeText(`https://instant.io/#${torrentSummary.infoHash}`)
     }))
 
-    menu.append(new electron.remote.MenuItem({
+    menu.append(new remote.MenuItem({
       label: 'Save Torrent File As...',
       click: () => dispatch('saveTorrentFileAs', torrentSummary.torrentKey),
       enabled: torrentSummary.torrentFileName != null
     }))
 
-    menu.popup(electron.remote.getCurrentWindow())
+    menu.append(new remote.MenuItem({
+      type: 'separator'
+    }))
+
+    const sortedByName = this.state.saved.prefs.sortByName
+    menu.append(new remote.MenuItem({
+      label: `${sortedByName ? '✓ ' : ''}Sort by Name`,
+      click: () => dispatch('updatePreferences', 'sortByName', !sortedByName)
+    }))
+
+    menu.popup({ window: remote.getCurrentWindow() })
   }
 
   // Takes a torrentSummary or torrentKey
   // Shows a Save File dialog, then saves the .torrent file wherever the user requests
   saveTorrentFileAs (torrentKey) {
     const torrentSummary = TorrentSummary.getByKey(this.state, torrentKey)
-    if (!torrentSummary) throw new Error('Missing torrentKey: ' + torrentKey)
+    if (!torrentSummary) throw new TorrentKeyNotFoundError(torrentKey)
     const downloadPath = this.state.saved.prefs.downloadPath
     const newFileName = path.parse(torrentSummary.name).name + '.torrent'
-    const win = electron.remote.getCurrentWindow()
+    const win = remote.getCurrentWindow()
     const opts = {
       title: 'Save Torrent File',
       defaultPath: path.join(downloadPath, newFileName),
       filters: [
         { name: 'Torrent Files', extensions: ['torrent'] },
         { name: 'All Files', extensions: ['*'] }
-      ]
+      ],
+      buttonLabel: 'Save'
     }
 
-    electron.remote.dialog.showSaveDialog(win, opts, function (savePath) {
+    const savePath = remote.dialog.showSaveDialogSync(win, opts)
-      console.log('Saving torrent ' + torrentKey + ' to ' + savePath)
+
     if (!savePath) return // They clicked Cancel
+    console.log('Saving torrent ' + torrentKey + ' to ' + savePath)
     const torrentPath = TorrentSummary.getTorrentPath(torrentSummary)
-      fs.readFile(torrentPath, function (err, torrentFile) {
+    fs.readFile(torrentPath, (err, torrentFile) => {
       if (err) return dispatch('error', err)
-        fs.writeFile(savePath, torrentFile, function (err) {
+      fs.writeFile(savePath, torrentFile, err => {
         if (err) return dispatch('error', err)
       })
     })
-    })
   }
 }
 
@@ -319,11 +345,11 @@ function findFilesRecursive (paths, cb_) {
   if (paths.length > 1) {
     let numComplete = 0
     const ret = []
-    paths.forEach(function (path) {
+    paths.forEach(path => {
-      findFilesRecursive([path], function (fileObjs) {
+      findFilesRecursive([path], fileObjs => {
         ret.push(...fileObjs)
         if (++numComplete === paths.length) {
-          ret.sort((a, b) => a.path < b.path ? -1 : a.path > b.path)
+          ret.sort((a, b) => a.path < b.path ? -1 : Number(a.path > b.path))
           cb_(ret)
         }
       })
@@ -332,7 +358,7 @@ function findFilesRecursive (paths, cb_) {
   }
 
   const fileOrFolder = paths[0]
-  fs.stat(fileOrFolder, function (err, stat) {
+  fs.stat(fileOrFolder, (err, stat) => {
     if (err) return dispatch('error', err)
 
     // Files: return name, path, and size
@@ -347,7 +373,7 @@ function findFilesRecursive (paths, cb_) {
 
     // Folders: recurse, make a list of all the files
     const folderPath = fileOrFolder
-    fs.readdir(folderPath, function (err, fileNames) {
+    fs.readdir(folderPath, (err, fileNames) => {
       if (err) return dispatch('error', err)
       const paths = fileNames.map((fileName) => path.join(folderPath, fileName))
       findFilesRecursive(paths, cb_)
@@ -357,7 +383,7 @@ function findFilesRecursive (paths, cb_) {
 
 function deleteFile (path) {
   if (!path) return
-  fs.unlink(path, function (err) {
+  fs.unlink(path, err => {
     if (err) dispatch('error', err)
   })
 }
@@ -371,3 +397,14 @@ function moveItemToTrash (torrentSummary) {
 function showItemInFolder (torrentSummary) {
   ipcRenderer.send('showItemInFolder', TorrentSummary.getFileOrFolder(torrentSummary))
 }
+
+function deleteTorrentFile (torrentSummary, deleteData) {
+  ipcRenderer.send('wt-stop-torrenting', torrentSummary.infoHash)
+
+  // remove torrent and poster file
+  deleteFile(TorrentSummary.getTorrentPath(torrentSummary))
+  deleteFile(TorrentSummary.getPosterPath(torrentSummary))
+
+  // optionally delete the torrent data
+  if (deleteData) moveItemToTrash(torrentSummary)
+}

src/renderer/controllers/update-controller.js

@@ -1,7 +1,6 @@
-const { dispatch } = require('../lib/dispatcher')
+import { dispatch } from '../lib/dispatcher.js'
 
-// Controls the UI checking for new versions of the app, prompting install
+export default class UpdateController {
-module.exports = class UpdateController {
   constructor (state) {
     this.state = state
   }
@@ -13,7 +12,7 @@ module.exports = class UpdateController {
       console.log('new version skipped by user: v' + version)
       return
     }
-    this.state.modal = { id: 'update-available-modal', version: version }
+    this.state.modal = { id: 'update-available-modal', version }
   }
 
   // Don't show the modal again until the next version

src/renderer/lib/cast.js

@@ -1,40 +1,18 @@
-// The Cast module talks to Airplay and Chromecast
+import http from 'http'
-// * Modifies state when things change
+import config from '../src/config.js'
-// * Starts and stops casting, provides remote video controls
+import { CastingError } from './errors.js'
-module.exports = {
-  init,
-  toggleMenu,
-  selectDevice,
-  stop,
-  play,
-  pause,
-  seek,
-  setVolume,
-  setRate
-}
-
-const http = require('http')
-
-const config = require('../../config')
-const { CastingError } = require('./errors')
-
 // Lazy load these for a ~300ms improvement in startup time
 let airplayer, chromecasts, dlnacasts
-
 // App state. Cast modifies state.playing and state.errors in response to events
 let state
-
 // Callback to notify module users when state has changed
 let update
-
 // setInterval() for updating cast status
 let statusInterval = null
-
 // Start looking for cast devices on the local network
 function init (appState, callback) {
   state = appState
   update = callback
-
   // Don't actually cast during integration tests
   // (Otherwise you'd need a physical Chromecast + AppleTV + DLNA TV to run them.)
   if (config.IS_TEST) {
@@ -43,32 +21,26 @@ function init (appState, callback) {
     state.devices.dlna = testPlayer('dlna')
     return
   }
-
   // Load modules, scan the network for devices
   airplayer = require('airplayer')()
   chromecasts = require('chromecasts')()
   dlnacasts = require('dlnacasts')()
-
   state.devices.chromecast = chromecastPlayer()
   state.devices.dlna = dlnaPlayer()
   state.devices.airplay = airplayPlayer()
-
   // Listen for devices: Chromecast, DLNA and Airplay
-  chromecasts.on('update', function (device) {
+  chromecasts.on('update', device => {
     // TODO: how do we tell if there are *no longer* any Chromecasts available?
     // From looking at the code, chromecasts.players only grows, never shrinks
     state.devices.chromecast.addDevice(device)
   })
-
+  dlnacasts.on('update', device => {
-  dlnacasts.on('update', function (device) {
     state.devices.dlna.addDevice(device)
   })
-
+  airplayer.on('update', device => {
-  airplayer.on('update', function (device) {
     state.devices.airplay.addDevice(device)
   })
 }
-
 // integration test player implementation
 function testPlayer (type) {
   return {
@@ -81,11 +53,9 @@ function testPlayer (type) {
     seek,
     volume
   }
-
   function getDevices () {
     return [{ name: type + '-1' }, { name: type + '-2' }]
   }
-
   function open () { }
   function play () { }
   function pause () { }
@@ -94,7 +64,6 @@ function testPlayer (type) {
   function seek () { }
   function volume () { }
 }
-
 // chromecast player implementation
 function chromecastPlayer () {
   const ret = {
@@ -110,13 +79,11 @@ function chromecastPlayer () {
     volume
   }
   return ret
-
   function getDevices () {
     return chromecasts.players
   }
-
   function addDevice (device) {
-    device.on('error', function (err) {
+    device.on('error', err => {
       if (device !== ret.device) return
       state.playing.location = 'local'
       state.errors.push({
@@ -125,13 +92,12 @@ function chromecastPlayer () {
       })
       update()
     })
-    device.on('disconnect', function () {
+    device.on('disconnect', () => {
       if (device !== ret.device) return
       state.playing.location = 'local'
       update()
     })
   }
-
   function serveSubtitles (callback) {
     const subtitles = state.playing.subtitles
     const selectedSubtitle = subtitles.tracks[subtitles.selectedIndex]
@@ -145,23 +111,22 @@ function chromecastPlayer () {
           'Transfer-Encoding': 'chunked'
         })
         res.end(Buffer.from(selectedSubtitle.buffer.substr(21), 'base64'))
-      }).listen(0, function () {
+      }).listen(0, () => {
         const port = ret.subServer.address().port
         const subtitlesUrl = 'http://' + state.server.networkAddress + ':' + port + '/'
         callback(subtitlesUrl)
       })
     }
   }
-
   function open () {
     const torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
-    serveSubtitles(function (subtitlesUrl) {
+    serveSubtitles(subtitlesUrl => {
       ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, {
         type: 'video/mp4',
         title: config.APP_NAME + ' - ' + torrentSummary.name,
         subtitles: subtitlesUrl ? [subtitlesUrl] : [],
         autoSubtitles: !!subtitlesUrl
-      }, function (err) {
+      }, err => {
         if (err) {
           state.playing.location = 'local'
           state.errors.push({
@@ -175,35 +140,28 @@ function chromecastPlayer () {
       })
     })
   }
-
   function play (callback) {
     ret.device.play(null, null, callback)
   }
-
   function pause (callback) {
     ret.device.pause(callback)
   }
-
   function stop (callback) {
     ret.device.stop(callback)
     if (ret.subServer) {
       ret.subServer.close()
     }
   }
-
   function status () {
     ret.device.status(handleStatus)
   }
-
   function seek (time, callback) {
     ret.device.seek(time, callback)
   }
-
   function volume (volume, callback) {
     ret.device.volume(volume, callback)
   }
 }
-
 // airplay player implementation
 function airplayPlayer () {
   const ret = {
@@ -219,9 +177,8 @@ function airplayPlayer () {
     volume
   }
   return ret
-
   function addDevice (player) {
-    player.on('event', function (event) {
+    player.on('event', event => {
       switch (event.state) {
         case 'loading':
           break
@@ -237,13 +194,11 @@ function airplayPlayer () {
       update()
     })
   }
-
   function getDevices () {
     return airplayer.players
   }
-
   function open () {
-    ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, function (err, res) {
+    ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, (err, res) => {
       if (err) {
         state.playing.location = 'local'
         state.errors.push({
@@ -256,21 +211,17 @@ function airplayPlayer () {
       update()
     })
   }
-
   function play (callback) {
     ret.device.resume(callback)
   }
-
   function pause (callback) {
     ret.device.pause(callback)
   }
-
   function stop (callback) {
     ret.device.stop(callback)
   }
-
   function status () {
-    ret.device.playbackInfo(function (err, res, status) {
+    ret.device.playbackInfo((err, res, status) => {
       if (err) {
         state.playing.location = 'local'
         state.errors.push({
@@ -284,18 +235,15 @@ function airplayPlayer () {
       }
     })
   }
-
   function seek (time, callback) {
     ret.device.scrub(time, callback)
   }
-
   function volume (volume, callback) {
     // AirPlay doesn't support volume
     // TODO: We should just disable the volume slider
     state.playing.volume = volume
   }
 }
-
 // DLNA player implementation
 function dlnaPlayer (player) {
   const ret = {
@@ -311,13 +259,11 @@ function dlnaPlayer (player) {
     volume
   }
   return ret
-
   function getDevices () {
     return dlnacasts.players
   }
-
   function addDevice (device) {
-    device.on('error', function (err) {
+    device.on('error', err => {
       if (device !== ret.device) return
       state.playing.location = 'local'
       state.errors.push({
@@ -326,20 +272,19 @@ function dlnaPlayer (player) {
       })
       update()
     })
-    device.on('disconnect', function () {
+    device.on('disconnect', () => {
       if (device !== ret.device) return
       state.playing.location = 'local'
       update()
     })
   }
-
   function open () {
     const torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
     ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, {
       type: 'video/mp4',
       title: config.APP_NAME + ' - ' + torrentSummary.name,
       seek: state.playing.currentTime > 10 ? state.playing.currentTime : 0
-    }, function (err) {
+    }, err => {
       if (err) {
         state.playing.location = 'local'
         state.errors.push({
@@ -352,56 +297,45 @@ function dlnaPlayer (player) {
       update()
     })
   }
-
   function play (callback) {
     ret.device.play(null, null, callback)
   }
-
   function pause (callback) {
     ret.device.pause(callback)
   }
-
   function stop (callback) {
     ret.device.stop(callback)
   }
-
   function status () {
     ret.device.status(handleStatus)
   }
-
   function seek (time, callback) {
     ret.device.seek(time, callback)
   }
-
   function volume (volume, callback) {
-    ret.device.volume(volume, function (err) {
+    ret.device.volume(volume, err => {
       // quick volume update
       state.playing.volume = volume
       callback(err)
     })
   }
 }
-
 function handleStatus (err, status) {
   if (err || !status) {
-    return console.log('error getting %s status: %o',
+    return console.log('error getting %s status: %o', state.playing.location, err || 'missing response')
-      state.playing.location,
-      err || 'missing response')
   }
   state.playing.isPaused = status.playerState === 'PAUSED'
   state.playing.currentTime = status.currentTime
   state.playing.volume = status.volume.muted ? 0 : status.volume.level
   update()
 }
-
 // Start polling cast device state, whenever we're connected
 function startStatusInterval () {
-  statusInterval = setInterval(function () {
+  statusInterval = setInterval(() => {
     const player = getPlayer()
     if (player) player.status()
   }, 1000)
 }
-
 /*
  * Shows the device menu for a given cast type ('chromecast', 'airplay', etc)
  * The menu lists eg. all Chromecasts detected; the user can click one to cast.
@@ -413,48 +347,38 @@ function toggleMenu (location) {
     state.devices.castMenu = null
     return
   }
-
   // Never cast to two devices at the same time
   if (state.playing.location !== 'local') {
-    throw new CastingError(
+    throw new CastingError(`You can't connect to ${location} when already connected to another device`)
-      `You can't connect to ${location} when already connected to another device`
-    )
   }
-
   // Find all cast devices of the given type
   const player = getPlayer(location)
   const devices = player ? player.getDevices() : []
   if (devices.length === 0) {
     throw new CastingError(`No ${location} devices available`)
   }
-
   // Show a menu
   state.devices.castMenu = { location, devices }
 }
-
 function selectDevice (index) {
   const { location, devices } = state.devices.castMenu
-
   // Start casting
   const player = getPlayer(location)
   player.device = devices[index]
   player.open()
-
   // Poll the casting device's status every few seconds
   startStatusInterval()
-
   // Show the Connecting... screen
   state.devices.castMenu = null
   state.playing.castName = devices[index].name
   state.playing.location = location + '-pending'
   update()
 }
-
 // Stops casting, move video back to local screen
 function stop () {
   const player = getPlayer()
   if (player) {
-    player.stop(function () {
+    player.stop(() => {
       player.device = null
       stoppedCasting()
     })
@@ -463,7 +387,6 @@ function stop () {
     stoppedCasting()
   }
 }
-
 function stoppedCasting () {
   state.playing.location = 'local'
   state.playing.jumpToTime = Number.isFinite(state.playing.currentTime)
@@ -471,7 +394,6 @@ function stoppedCasting () {
     : 0
   update()
 }
-
 function getPlayer (location) {
   if (location) {
     return state.devices[location]
@@ -485,17 +407,14 @@ function getPlayer (location) {
     return null
   }
 }
-
 function play () {
   const player = getPlayer()
   if (player) player.play(castCallback)
 }
-
 function pause () {
   const player = getPlayer()
   if (player) player.pause(castCallback)
 }
-
 function setRate (rate) {
   let player
   let result = true
@@ -511,17 +430,34 @@ function setRate (rate) {
   }
   return result
 }
-
 function seek (time) {
   const player = getPlayer()
-  if (player) player.seek(time, castCallback)
+  if (player) { player.seek(time, castCallback) }
 }
-
 function setVolume (volume) {
   const player = getPlayer()
-  if (player) player.volume(volume, castCallback)
+  if (player) { player.volume(volume, castCallback) }
 }
-
+function castCallback (...args) {
-function castCallback () {
+  console.log('%s callback: %o', state.playing.location, args)
-  console.log('%s callback: %o', state.playing.location, arguments)
+}
+export { init }
+export { toggleMenu }
+export { selectDevice }
+export { stop }
+export { play }
+export { pause }
+export { seek }
+export { setVolume }
+export { setRate }
+export default {
+  init,
+  toggleMenu,
+  selectDevice,
+  stop,
+  play,
+  pause,
+  seek,
+  setVolume,
+  setRate
 }

src/renderer/lib/dispatcher.js

@@ -1,20 +1,11 @@
-module.exports = {
-  dispatch,
-  dispatcher,
-  setDispatch
-}
-
 const dispatchers = {}
-let _dispatch = function () {}
+let _dispatch = () => { }
-
 function setDispatch (dispatch) {
   _dispatch = dispatch
 }
-
 function dispatch (...args) {
   _dispatch(...args)
 }
-
 // Most DOM event handlers are trivial functions like `() => dispatch(<args>)`.
 // For these, `dispatcher(<args>)` is preferred because it memoizes the handler
 // function. This prevents React from updating the listener functions on
@@ -23,17 +14,23 @@ function dispatcher (...args) {
   const str = JSON.stringify(args)
   let handler = dispatchers[str]
   if (!handler) {
-    handler = dispatchers[str] = function (e) {
+    handler = dispatchers[str] = e => {
       // Do not propagate click to elements below the button
       e.stopPropagation()
-
       if (e.currentTarget.classList.contains('disabled')) {
         // Ignore clicks on disabled elements
         return
       }
-
       dispatch(...args)
     }
   }
   return handler
 }
+export { dispatch }
+export { dispatcher }
+export { setDispatch }
+export default {
+  dispatch,
+  dispatcher,
+  setDispatch
+}

src/renderer/lib/errors.js

@@ -1,35 +1,37 @@
-const ExtendableError = require('es6-error')
+import ExtendableError from 'es6-error'
-
 /* Generic errors */
-
+class CastingError extends ExtendableError {
-class CastingError extends ExtendableError {}
+}
-class PlaybackError extends ExtendableError {}
+class PlaybackError extends ExtendableError {
-class SoundError extends ExtendableError {}
+}
-class TorrentError extends ExtendableError {}
+class SoundError extends ExtendableError {
-
+}
+class TorrentError extends ExtendableError {
+}
 /* Playback */
-
 class UnplayableTorrentError extends PlaybackError {
   constructor () { super('Can\'t play any files in torrent') }
 }
-
 class UnplayableFileError extends PlaybackError {
   constructor () { super('Can\'t play that file') }
 }
-
 /* Sound */
-
 class InvalidSoundNameError extends SoundError {
   constructor (name) { super(`Invalid sound name: ${name}`) }
 }
-
 /* Torrent */
-
 class TorrentKeyNotFoundError extends TorrentError {
   constructor (torrentKey) { super(`Can't resolve torrent key ${torrentKey}`) }
 }
-
+export { CastingError }
-module.exports = {
+export { PlaybackError }
+export { SoundError }
+export { TorrentError }
+export { UnplayableTorrentError }
+export { UnplayableFileError }
+export { InvalidSoundNameError }
+export { TorrentKeyNotFoundError }
+export default {
   CastingError,
   PlaybackError,
   SoundError,

src/renderer/lib/media-extensions.js

@@ -1,12 +1,13 @@
 const mediaExtensions = {
   audio: [
     '.aac', '.aif', '.aiff', '.asf', '.dff', '.dsf', '.flac', '.m2a',
-    '.m4a', '.m4b', '.mp2', '.mp3', '.mpc', '.oga', '.ogg', '.opus',
+    '.m2a', '.m4a', '.mpc', '.m4b', '.mka', '.mp2', '.mp3', '.mpc', '.oga',
-    '.spx', '.wma', '.wav', '.wv', '.wvp'],
+    '.ogg', '.opus', '.spx', '.wma', '.wav', '.wv', '.wvp'
+  ],
   video: [
     '.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', '.mpg', '.mpeg',
-    '.ogv', '.webm', '.wmv'],
+    '.ogv', '.webm', '.wmv', '.m2ts'
+  ],
   image: ['.gif', '.jpg', '.jpeg', '.png']
 }
-
+export default mediaExtensions
-module.exports = mediaExtensions

src/renderer/lib/migrations.js

@@ -1,14 +1,8 @@
 /* eslint-disable camelcase */
-
+import fs, { copyFileSync } from 'fs'
-module.exports = {
+import path from 'path'
-  run
+import semver from 'semver'
-}
+import config from '../../config.js'
-
-const fs = require('fs')
-const path = require('path')
-const semver = require('semver')
-
-const config = require('../../config')
 
 // Change `state.saved` (which will be saved back to config.json on exit) as
 // needed, for example to deal with config.json format changes across versions
@@ -29,16 +23,27 @@ function run (state) {
   if (semver.lt(version, '0.17.0')) migrate_0_17_0(saved)
   if (semver.lt(version, '0.17.2')) migrate_0_17_2(saved)
   if (semver.lt(version, '0.21.0')) migrate_0_21_0(saved)
+  if (semver.lt(version, '0.22.0')) migrate_0_22_0(saved)
+
+  if (semver.lt(version, config.APP_VERSION)) {
+    installHandlers(state.saved)
+  }
 
   // Config is now on the new version
   state.saved.version = config.APP_VERSION
 }
 
-function migrate_0_7_0 (saved) {
+// Whenever the app is updated,  re-install default handlers if the user has
-  const cpFile = require('cp-file')
+// enabled them.
-  const path = require('path')
+async function installHandlers (saved) {
+  if (saved.prefs.isFileHandler) {
+    const { ipcRenderer } = await import('electron')
+    ipcRenderer.send('setDefaultFileHandler', true)
+  }
+}
 
-  saved.torrents.forEach(function (ts) {
+function migrate_0_7_0 (saved) {
+  saved.torrents.forEach(ts => {
     const infoHash = ts.infoHash
 
     // Replace torrentPath with torrentFileName
@@ -57,7 +62,7 @@ function migrate_0_7_0 (saved) {
       dst = path.join(config.TORRENT_PATH, infoHash + '.torrent')
       // Synchronous FS calls aren't ideal, but probably OK in a migration
       // that only runs once
-      if (src !== dst) cpFile.sync(src, dst)
+      if (src !== dst) copyFileSync(src, dst)
 
       delete ts.torrentPath
       ts.torrentFileName = infoHash + '.torrent'
@@ -72,12 +77,11 @@ function migrate_0_7_0 (saved) {
       dst = path.join(config.POSTER_PATH, infoHash + extension)
       // Synchronous FS calls aren't ideal, but probably OK in a migration
       // that only runs once
-      if (src !== dst) cpFile.sync(src, dst)
+      if (src !== dst) copyFileSync(src, dst)
 
       delete ts.posterURL
       ts.posterFileName = infoHash + extension
     }
-
     // Fix exception caused by incorrect file ordering.
     // https://github.com/webtorrent/webtorrent-desktop/pull/604#issuecomment-222805214
     delete ts.defaultPlayFileIndex
@@ -102,8 +106,8 @@ function migrate_0_11_0 (saved) {
   }
 }
 
-function migrate_0_12_0 (saved) {
+async function migrate_0_12_0 (saved) {
-  const TorrentSummary = require('./torrent-summary')
+  const TorrentSummary = await import('./torrent-summary')
 
   if (saved.prefs.openExternalPlayer == null && saved.prefs.playInVlc != null) {
     saved.prefs.openExternalPlayer = saved.prefs.playInVlc
@@ -120,7 +124,7 @@ function migrate_0_12_0 (saved) {
     '02767050e0be2fd4db9a2ad6c12416ac806ed6ed.torrent',
     '3ba219a8634bf7bae3d848192b2da75ae995589d.torrent'
   ]
-  saved.torrents.forEach(function (torrentSummary) {
+  saved.torrents.forEach(torrentSummary => {
     if (!defaultTorrentFiles.includes(torrentSummary.torrentFileName)) return
     const fileOrFolder = TorrentSummary.getFileOrFolder(torrentSummary)
     if (!fileOrFolder) return
@@ -134,16 +138,16 @@ function migrate_0_12_0 (saved) {
 }
 
 function migrate_0_14_0 (saved) {
-  saved.torrents.forEach(function (ts) {
+  saved.torrents.forEach(ts => {
     delete ts.defaultPlayFileIndex
   })
 }
 
 function migrate_0_17_0 (saved) {
   // Fix a sad, sad bug that resulted in 100MB+ config.json files
-  saved.torrents.forEach(function (ts) {
+  saved.torrents.forEach(ts => {
     if (!ts.files) return
-    ts.files.forEach(function (file) {
+    ts.files.forEach(file => {
       if (!file.audioInfo || !file.audioInfo.picture) return
       // This contained a Buffer, which 30x'd in size when serialized to JSON
       delete file.audioInfo.picture
@@ -155,19 +159,13 @@ function migrate_0_17_2 (saved) {
   // Remove the trailing dot (.) from the Wired CD torrent name, since
   // folders/files that end in a trailing dot (.) or space are not deletable from
   // Windows Explorer. See: https://github.com/webtorrent/webtorrent-desktop/issues/905
-
-  const cpFile = require('cp-file')
-  const rimraf = require('rimraf')
-
   const OLD_NAME = 'The WIRED CD - Rip. Sample. Mash. Share.'
   const NEW_NAME = 'The WIRED CD - Rip. Sample. Mash. Share'
 
   const OLD_HASH = '3ba219a8634bf7bae3d848192b2da75ae995589d'
   const NEW_HASH = 'a88fda5954e89178c372716a6a78b8180ed4dad3'
 
-  const ts = saved.torrents.find((ts) => {
+  const ts = saved.torrents.find(ts => ts.infoHash === OLD_HASH)
-    return ts.infoHash === OLD_HASH
-  })
 
   if (!ts) return // Wired CD torrent does not exist
 
@@ -190,8 +188,8 @@ function migrate_0_17_2 (saved) {
   } catch (err) {}
   ts.posterFileName = NEW_HASH + '.jpg'
 
-  rimraf.sync(path.join(config.TORRENT_PATH, ts.torrentFileName))
+  fs.rmdirSync(path.join(config.TORRENT_PATH, ts.torrentFileName))
-  cpFile.sync(
+  copyFileSync(
     path.join(config.STATIC_PATH, 'wiredCd.torrent'),
     path.join(config.TORRENT_PATH, NEW_HASH + '.torrent')
   )
@@ -214,3 +212,13 @@ function migrate_0_21_0 (saved) {
     saved.prefs.soundNotifications = true
   }
 }
+
+function migrate_0_22_0 (saved) {
+  if (saved.prefs.externalPlayerPath == null) {
+    saved.prefs.externalPlayerPath = ''
+  }
+}
+
+export default {
+  run
+}

src/renderer/lib/playlist.js

@@ -1,52 +1,36 @@
-module.exports = {
+import TorrentSummary from './torrent-summary.js'
-  hasNext,
+import TorrentPlayer from './torrent-player.js'
-  getNextIndex,
-  hasPrevious,
-  getPreviousIndex,
-  getCurrentLocalURL
-}
-
-const TorrentSummary = require('./torrent-summary')
-const TorrentPlayer = require('./torrent-player')
-
 const cache = {
   infoHash: null,
   previousIndex: null,
   currentIndex: null,
   nextIndex: null
 }
-
 function hasNext (state) {
   updateCache(state)
   return cache.nextIndex !== null
 }
-
 function getNextIndex (state) {
   updateCache(state)
   return cache.nextIndex
 }
-
 function hasPrevious (state) {
   updateCache(state)
   return cache.previousIndex !== null
 }
-
 function getPreviousIndex (state) {
   updateCache(state)
   return cache.previousIndex
 }
-
 function getCurrentLocalURL (state) {
   return state.server
     ? state.server.localURL + '/' + state.playing.fileIndex + '/' +
             encodeURIComponent(state.playing.fileName)
     : ''
 }
-
 function updateCache (state) {
   const infoHash = state.playing.infoHash
   const fileIndex = state.playing.fileIndex
-
   if (infoHash === cache.infoHash) {
     switch (fileIndex) {
       case cache.currentIndex:
@@ -65,12 +49,10 @@ function updateCache (state) {
   } else {
     cache.infoHash = infoHash
   }
-
   cache.previousIndex = findPreviousIndex(state)
   cache.currentIndex = fileIndex
   cache.nextIndex = findNextIndex(state)
 }
-
 function findPreviousIndex (state) {
   const files = TorrentSummary.getByKey(state, state.playing.infoHash).files
   for (let i = state.playing.fileIndex - 1; i >= 0; i--) {
@@ -78,7 +60,6 @@ function findPreviousIndex (state) {
   }
   return null
 }
-
 function findNextIndex (state) {
   const files = TorrentSummary.getByKey(state, state.playing.infoHash).files
   for (let i = state.playing.fileIndex + 1; i < files.length; i++) {
@@ -86,3 +67,15 @@ function findNextIndex (state) {
   }
   return null
 }
+export { hasNext }
+export { getNextIndex }
+export { hasPrevious }
+export { getPreviousIndex }
+export { getCurrentLocalURL }
+export default {
+  hasNext,
+  getNextIndex,
+  hasPrevious,
+  getPreviousIndex,
+  getCurrentLocalURL
+}

src/renderer/lib/sound.js

@@ -1,20 +1,11 @@
-module.exports = {
+import config from '../src/config.js'
-  init,
+import { InvalidSoundNameError } from './errors.js'
-  play
+import path from 'path'
-}
-
-const config = require('../../config')
-const { InvalidSoundNameError } = require('./errors')
-const path = require('path')
-
 const VOLUME = 0.25
-
 // App state to access the soundNotifications preference
 let state
-
 /* Cache of Audio elements, for instant playback */
 const cache = {}
-
 const sounds = {
   ADD: {
     url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'add.wav'),
@@ -49,20 +40,16 @@ const sounds = {
     volume: VOLUME
   }
 }
-
 function init (appState) {
   state = appState
 }
-
 function play (name) {
   if (state == null) {
     return
   }
-
   if (!state.saved.prefs.soundNotifications) {
     return
   }
-
   let audio = cache[name]
   if (!audio) {
     const sound = sounds[name]
@@ -76,3 +63,9 @@ function play (name) {
   audio.currentTime = 0
   audio.play()
 }
+export { init }
+export { play }
+export default {
+  init,
+  play
+}

src/renderer/lib/state.js

@@ -1,30 +1,33 @@
-const appConfig = require('application-config')('WebTorrent')
+import applicationConfig from 'application-config'
-const path = require('path')
+import path from 'path'
-const { EventEmitter } = require('events')
+import { EventEmitter } from 'events'
 
-const config = require('../../config')
+import config from '../../config.js'
 
+const appConfig = applicationConfig('WebTorrent')
 const SAVE_DEBOUNCE_INTERVAL = 1000
 
 appConfig.filePath = path.join(config.CONFIG_PATH, 'config.json')
 
-const State = module.exports = Object.assign(new EventEmitter(), {
+const State = Object.assign(new EventEmitter(), {
   getDefaultPlayState,
   load,
   // state.save() calls are rate-limited. Use state.saveImmediate() to skip limit.
-  save: function () {
+  async save (...args) {
     // Perf optimization: Lazy-require debounce (and it's dependencies)
-    const debounce = require('debounce')
+    const debounce = await import('debounce')
     // After first State.save() invokation, future calls go straight to the
     // debounced function
     State.save = debounce(saveImmediate, SAVE_DEBOUNCE_INTERVAL)
-    State.save(...arguments)
+    State.save(...args)
   },
   saveImmediate
 })
 
-function getDefaultState () {
+export default State
-  const LocationHistory = require('location-history')
+
+async function getDefaultState () {
+  const { default: LocationHistory } = await import('location-history')
 
   return {
     /*
@@ -105,22 +108,26 @@ function getDefaultPlayState () {
       selectedIndex: -1, /* current subtitle track */
       showMenu: false /* popover menu, above the video */
     },
+    audioTracks: {
+      tracks: [],
+      selectedIndex: 0, /* current audio track */
+      showMenu: false /* popover menu, above the video */
+    },
     aspectRatio: 0 /* aspect ratio of the video */
   }
 }
 
 /* If the saved state file doesn't exist yet, here's what we use instead */
-function setupStateSaved (cb) {
+async function setupStateSaved () {
-  const cpFile = require('cp-file')
+  const { copyFileSync, mkdirSync, readFileSync } = await import('fs')
-  const fs = require('fs')
+  const { default: parseTorrent } = await import('parse-torrent')
-  const parseTorrent = require('parse-torrent')
 
   const saved = {
     prefs: {
       downloadPath: config.DEFAULT_DOWNLOAD_PATH,
       isFileHandler: false,
       openExternalPlayer: false,
-      externalPlayerPath: null,
+      externalPlayerPath: '',
       startup: false,
       soundNotifications: true,
       autoAddTorrents: false,
@@ -132,33 +139,28 @@ function setupStateSaved (cb) {
     version: config.APP_VERSION /* make sure we can upgrade gracefully later */
   }
 
-  const tasks = []
+  // TODO: Doing several sync calls during first startup is not ideal
+  mkdirSync(config.POSTER_PATH, { recursive: true })
+  mkdirSync(config.TORRENT_PATH, { recursive: true })
 
   config.DEFAULT_TORRENTS.forEach((t, i) => {
     const infoHash = saved.torrents[i].infoHash
-    tasks.push(
+    // TODO: Doing several sync calls during first startup is not ideal
-      cpFile(
+    copyFileSync(
       path.join(config.STATIC_PATH, t.posterFileName),
       path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName))
     )
-    )
+    copyFileSync(
-    tasks.push(
-      cpFile(
       path.join(config.STATIC_PATH, t.torrentFileName),
       path.join(config.TORRENT_PATH, infoHash + '.torrent')
     )
-    )
   })
 
-  Promise.all(tasks)
+  return saved
-    .then(
-      () => cb(null, saved),
-      err => cb(err)
-    )
 
   function createTorrentObject (t) {
-    // TODO: Doing several fs.readFileSync calls during first startup is not ideal
+    // TODO: Doing several sync calls during first startup is not ideal
-    const torrent = fs.readFileSync(path.join(config.STATIC_PATH, t.torrentFileName))
+    const torrent = readFileSync(path.join(config.STATIC_PATH, t.torrentFileName))
     const parsedTorrent = parseTorrent(torrent)
 
     return {
@@ -203,19 +205,25 @@ function shouldHidePlayerControls () {
     this.playing.playbackRate === 1
 }
 
-function load (cb) {
+async function load (cb) {
-  appConfig.read(function (err, saved) {
+  console.log('state load')
-    if (err || !saved.version) {
+  let saved = await appConfig.read()
-      console.log('Missing config file: Creating new one')
-      setupStateSaved(onSavedState)
-    } else {
-      onSavedState(null, saved)
-    }
-  })
 
-  function onSavedState (err, saved) {
+  if (!saved || !saved.version) {
+    console.log('Missing config file: Creating new one')
+    try {
+      saved = await setupStateSaved()
+    } catch (err) {
+      onSavedState(err)
+      return
+    }
+  }
+
+  onSavedState(null, saved)
+
+  async function onSavedState (err, saved) {
     if (err) return cb(err)
-    const state = getDefaultState()
+    const state = await getDefaultState()
     state.saved = saved
 
     if (process.type === 'renderer') {
@@ -224,12 +232,13 @@ function load (cb) {
       migrations.run(state)
     }
 
+    console.log('calling cb')
     cb(null, state)
   }
 }
 
 // Write state.saved to the JSON state file
-function saveImmediate (state, cb) {
+async function saveImmediate (state, cb) {
   console.log('Saving state to ' + appConfig.filePath)
 
   // Clean up, so that we're not saving any pending state
@@ -238,7 +247,7 @@ function saveImmediate (state, cb) {
   // reading the torrent file or file(s) to seed & don't have an infohash
   copy.torrents = copy.torrents
     .filter((x) => x.infoHash)
-    .map(function (x) {
+    .map(x => {
       const torrent = {}
       for (const key in x) {
         if (key === 'progress' || key === 'torrentKey') {
@@ -252,8 +261,10 @@ function saveImmediate (state, cb) {
       return torrent
     })
 
-  appConfig.write(copy, (err) => {
+  try {
-    if (err) console.error(err)
+    await appConfig.write(copy)
-    else State.emit('stateSaved')
+    State.emit('stateSaved')
-  })
+  } catch (err) {
+    console.error(err)
+  }
 }

src/renderer/lib/telemetry.js

@@ -1,24 +1,14 @@
-// Collects anonymous usage stats and uncaught errors
+import remote from '@electron/remote'
-// Reports back so that we can improve WebTorrent Desktop
+import config from '../../config.js'
-module.exports = {
-  init,
-  send,
-  logUncaughtError,
-  logPlayAttempt
-}
-
-const electron = require('electron')
-
-const config = require('../../config')
 
 let telemetry
 
-function init (state) {
+async function init (state) {
   telemetry = state.saved.telemetry
 
   // First app run
   if (!telemetry) {
-    const crypto = require('crypto')
+    const crypto = await import('crypto')
     telemetry = state.saved.telemetry = {
       userID: crypto.randomBytes(32).toString('hex') // 256-bit random ID
     }
@@ -26,7 +16,7 @@ function init (state) {
   }
 }
 
-function send (state) {
+async function send (state) {
   const now = new Date()
   telemetry.version = config.APP_VERSION
   telemetry.timestamp = now.toISOString()
@@ -42,7 +32,7 @@ function send (state) {
     return reset()
   }
 
-  const get = require('simple-get')
+  const get = await import('simple-get')
 
   const opts = {
     url: config.TELEMETRY_URL,
@@ -50,7 +40,7 @@ function send (state) {
     json: true
   }
 
-  get.post(opts, function (err, res) {
+  get.post(opts, (err, res) => {
     if (err) return console.error('Error sending telemetry', err)
     if (res.statusCode !== 200) {
       return console.error(`Error sending telemetry, status code: ${res.statusCode}`)
@@ -74,7 +64,7 @@ function reset () {
 
 // Track screen resolution
 function getScreenInfo () {
-  return electron.remote.screen.getAllDisplays().map((screen) => ({
+  return remote.screen.getAllDisplays().map((screen) => ({
     width: screen.size.width,
     height: screen.size.height,
     scaleFactor: screen.scaleFactor
@@ -82,8 +72,8 @@ function getScreenInfo () {
 }
 
 // Track basic system info like OS version and amount of RAM
-function getSystemInfo () {
+async function getSystemInfo () {
-  const os = require('os')
+  const os = await import('os')
   return {
     osPlatform: process.platform,
     osRelease: os.type() + ' ' + os.release(),
@@ -106,15 +96,14 @@ function getTorrentStats (state) {
   }
 
   // First, count torrents & total file size
-  for (let i = 0; i < count; i++) {
+  for (const torrent of state.saved.torrents) {
-    const t = state.saved.torrents[i]
+    const stat = byStatus[torrent.status]
-    const stat = byStatus[t.status]
+    if (!torrent || !torrent.files || !stat) continue
-    if (!t || !t.files || !stat) continue
     stat.count++
-    for (let j = 0; j < t.files.length; j++) {
+
-      const f = t.files[j]
+    for (const file of torrent.files) {
-      if (!f || !f.length) continue
+      if (!file || !file.length) continue
-      const fileSizeMB = f.length / (1 << 20)
+      const fileSizeMB = file.length / (1 << 20)
       sizeMB += fileSizeMB
       stat.sizeMB += fileSizeMB
     }
@@ -145,7 +134,7 @@ function roundPow2 (n) {
   if (n <= 0) return 0
   // Otherwise, return 1, 2, 4, 8, etc by rounding in log space
   const log2 = Math.log(n) / Math.log(2)
-  return Math.pow(2, Math.round(log2))
+  return 2 ** Math.round(log2)
 }
 
 // An uncaught error happened in the main process or in one of the windows
@@ -221,3 +210,14 @@ function logPlayAttempt (result) {
   attempts.total = (attempts.total || 0) + 1
   attempts[result] = (attempts[result] || 0) + 1
 }
+
+export { init }
+export { send }
+export { logUncaughtError }
+export { logPlayAttempt }
+export default {
+  init,
+  send,
+  logUncaughtError,
+  logPlayAttempt
+}

src/renderer/lib/time.js

@@ -0,0 +1,17 @@
+function calculateEta (missing, downloadSpeed) {
+  if (downloadSpeed === 0 || missing === 0) return
+  const rawEta = missing / downloadSpeed
+  const hours = Math.floor(rawEta / 3600) % 24
+  const minutes = Math.floor(rawEta / 60) % 60
+  const seconds = Math.floor(rawEta % 60)
+  // Only display hours and minutes if they are greater than 0 but always
+  // display minutes if hours is being displayed
+  const hoursStr = hours ? hours + ' h' : ''
+  const minutesStr = (hours || minutes) ? minutes + ' min' : ''
+  const secondsStr = seconds + ' s'
+  return `${hoursStr} ${minutesStr} ${secondsStr} remaining`
+}
+export { calculateEta }
+export default {
+  calculateEta
+}

src/renderer/lib/torrent-player.js

@@ -1,32 +1,18 @@
-module.exports = {
+import path from 'path'
-  isPlayable,
+import mediaExtensions from './media-extensions.js'
-  isVideo,
-  isAudio,
-  isTorrent,
-  isMagnetLink,
-  isPlayableTorrentSummary
-}
-
-const path = require('path')
-
-const mediaExtensions = require('./media-extensions')
-
 // Checks whether a fileSummary or file path is audio/video that we can play,
 // based on the file extension
 function isPlayable (file) {
   return isVideo(file) || isAudio(file)
 }
-
 // Checks whether a fileSummary or file path is playable video
 function isVideo (file) {
   return mediaExtensions.video.includes(getFileExtension(file))
 }
-
 // Checks whether a fileSummary or file path is playable audio
 function isAudio (file) {
   return mediaExtensions.audio.includes(getFileExtension(file))
 }
-
 // Checks if the argument is either:
 // - a string that's a valid filename ending in .torrent
 // - a file object where obj.name is ends in .torrent
@@ -34,20 +20,30 @@ function isAudio (file) {
 function isTorrent (file) {
   return isTorrentFile(file) || isMagnetLink(file)
 }
-
 function isTorrentFile (file) {
   return getFileExtension(file) === '.torrent'
 }
-
 function isMagnetLink (link) {
   return typeof link === 'string' && /^(stream-)?magnet:/.test(link)
 }
-
 function getFileExtension (file) {
   const name = typeof file === 'string' ? file : file.name
   return path.extname(name).toLowerCase()
 }
-
 function isPlayableTorrentSummary (torrentSummary) {
   return torrentSummary.files && torrentSummary.files.some(isPlayable)
 }
+export { isPlayable }
+export { isVideo }
+export { isAudio }
+export { isTorrent }
+export { isMagnetLink }
+export { isPlayableTorrentSummary }
+export default {
+  isPlayable,
+  isVideo,
+  isAudio,
+  isTorrent,
+  isMagnetLink,
+  isPlayableTorrentSummary
+}

src/renderer/lib/torrent-poster.js

@@ -1,34 +1,20 @@
-module.exports = torrentPoster
+import captureFrame from 'capture-frame'
-
+import path from 'path'
-const captureFrame = require('capture-frame')
+import mediaExtensions from './media-extensions.js'
-const path = require('path')
-
-const mediaExtensions = require('./media-extensions')
-
 const msgNoSuitablePoster = 'Cannot generate a poster from any files in the torrent'
-
 function torrentPoster (torrent, cb) {
   // First, try to use a poster image if available
-  const posterFile = torrent.files.filter(function (file) {
+  const posterFile = torrent.files.filter(file => /^poster\.(jpg|png|gif)$/.test(file.name))[0]
-    return /^poster\.(jpg|png|gif)$/.test(file.name)
-  })[0]
   if (posterFile) return extractPoster(posterFile, cb)
-
   // 'score' each media type based on total size present in torrent
-  const bestScore = ['audio', 'video', 'image'].map(mediaType => {
+  const bestScore = ['audio', 'video', 'image'].map(mediaType => ({
-    return {
     type: mediaType,
     size: calculateDataLengthByExtension(torrent, mediaExtensions[mediaType])
-    }
+  })).sort((a, b) => b.size - a.size)[0] // sort descending on size
-  }).sort((a, b) => { // sort descending on size
-    return b.size - a.size
-  })[0]
-
   if (bestScore.size === 0) {
     // Admit defeat, no video, audio or image had a significant presence
     return cb(new Error(msgNoSuitablePoster))
   }
-
   // Based on which media type is dominant we select the corresponding poster function
   switch (bestScore.type) {
     case 'audio':
@@ -39,7 +25,6 @@ function torrentPoster (torrent, cb) {
       return torrentPosterFromVideo(torrent, cb)
   }
 }
-
 /**
  * Calculate the total data size of file matching one of the provided extensions
  * @param torrent
@@ -51,11 +36,8 @@ function calculateDataLengthByExtension (torrent, extensions) {
   if (files.length === 0) return 0
   return files
     .map(file => file.length)
-    .reduce((a, b) => {
+    .reduce((a, b) => a + b)
-      return a + b
-    })
 }
-
 /**
  * Get the largest file of a given torrent, filtered by provided extension
  * @param torrent Torrent to search in
@@ -65,16 +47,13 @@ function calculateDataLengthByExtension (torrent, extensions) {
 function getLargestFileByExtension (torrent, extensions) {
   const files = filterOnExtension(torrent, extensions)
   if (files.length === 0) return undefined
-  return files.reduce((a, b) => {
+  return files.reduce((a, b) => a.length > b.length ? a : b)
-    return a.length > b.length ? a : b
-  })
 }
-
 /**
  * Filter file on a list extension, can be used to find al image files
  * @param torrent Torrent to filter files from
  * @param extensions File extensions to filter on
- * @returns {number} Array of torrent file objects matching one of the given extensions
+ * @returns {Array} Array of torrent file objects matching one of the given extensions
  */
 function filterOnExtension (torrent, extensions) {
   return torrent.files.filter(file => {
@@ -82,7 +61,6 @@ function filterOnExtension (torrent, extensions) {
     return extensions.indexOf(extname) !== -1
   })
 }
-
 /**
  * Returns a score how likely the file is suitable as a poster
  * @param imgFile File object of an image
@@ -98,7 +76,6 @@ function scoreAudioCoverFile (imgFile) {
     back: 20,
     spectrogram: -80
   }
-
   for (const keyword in relevanceScore) {
     if (fileName === keyword) {
       return relevanceScore[keyword]
@@ -109,18 +86,13 @@ function scoreAudioCoverFile (imgFile) {
   }
   return 0
 }
-
 function torrentPosterFromAudio (torrent, cb) {
   const imageFiles = filterOnExtension(torrent, mediaExtensions.image)
-
   if (imageFiles.length === 0) return cb(new Error(msgNoSuitablePoster))
-
+  const bestCover = imageFiles.map(file => ({
-  const bestCover = imageFiles.map(file => {
+    file,
-    return {
-      file: file,
     score: scoreAudioCoverFile(file)
-    }
+  })).reduce((a, b) => {
-  }).reduce((a, b) => {
     if (a.score > b.score) {
       return a
     }
@@ -133,61 +105,47 @@ function torrentPosterFromAudio (torrent, cb) {
     }
     return b
   })
-
   const extname = path.extname(bestCover.file.name)
   bestCover.file.getBuffer((err, buf) => cb(err, buf, extname))
 }
-
 function torrentPosterFromVideo (torrent, cb) {
   const file = getLargestFileByExtension(torrent, mediaExtensions.video)
-
   const index = torrent.files.indexOf(file)
-
   const server = torrent.createServer(0)
   server.listen(0, onListening)
-
   function onListening () {
     const port = server.address().port
     const url = 'http://localhost:' + port + '/' + index
     const video = document.createElement('video')
     video.addEventListener('canplay', onCanPlay)
-
     video.volume = 0
     video.src = url
     video.play()
-
     function onCanPlay () {
       video.removeEventListener('canplay', onCanPlay)
       video.addEventListener('seeked', onSeeked)
-
       video.currentTime = Math.min((video.duration || 600) * 0.03, 60)
     }
-
     function onSeeked () {
       video.removeEventListener('seeked', onSeeked)
-
+      const frame = captureFrame(video)
-      const buf = captureFrame(video)
+      const buf = frame && frame.image
-
       // unload video element
       video.pause()
       video.src = ''
       video.load()
-
       server.destroy()
-
       if (buf.length === 0) return cb(new Error(msgNoSuitablePoster))
-
       cb(null, buf, '.jpg')
     }
   }
 }
-
 function torrentPosterFromImage (torrent, cb) {
   const file = getLargestFileByExtension(torrent, mediaExtensions.image)
   extractPoster(file, cb)
 }
-
 function extractPoster (file, cb) {
   const extname = path.extname(file.name)
-  file.getBuffer((err, buf) => { return cb(err, buf, extname) })
+  file.getBuffer((err, buf) => cb(err, buf, extname))
 }
+export default torrentPoster

src/renderer/lib/torrent-summary.js

@@ -1,21 +1,11 @@
-module.exports = {
+import path from 'path'
-  getPosterPath,
+import config from '../src/config.js'
-  getTorrentPath,
-  getByKey,
-  getTorrentId,
-  getFileOrFolder
-}
-
-const path = require('path')
-const config = require('../../config')
-
 // Expects a torrentSummary
 // Returns an absolute path to the torrent file, or null if unavailable
 function getTorrentPath (torrentSummary) {
   if (!torrentSummary || !torrentSummary.torrentFileName) return null
   return path.join(config.TORRENT_PATH, torrentSummary.torrentFileName)
 }
-
 // Expects a torrentSummary
 // Returns an absolute path to the poster image, or null if unavailable
 function getPosterPath (torrentSummary) {
@@ -25,7 +15,6 @@ function getPosterPath (torrentSummary) {
   // Backslashes in URLS in CSS cause bizarre string encoding issues
   return posterPath.replace(/\\/g, '/')
 }
-
 // Expects a torrentSummary
 // Returns a torrentID: filename, magnet URI, or infohash
 function getTorrentId (torrentSummary) {
@@ -36,15 +25,12 @@ function getTorrentId (torrentSummary) {
     return s.magnetURI || s.infoHash
   }
 }
-
 // Expects a torrentKey or infoHash
 // Returns the corresponding torrentSummary, or undefined
 function getByKey (state, torrentKey) {
   if (!torrentKey) return undefined
-  return state.saved.torrents.find((x) =>
+  return state.saved.torrents.find((x) => x.torrentKey === torrentKey || x.infoHash === torrentKey)
-    x.torrentKey === torrentKey || x.infoHash === torrentKey)
 }
-
 // Returns the path to either the file (in a single-file torrent) or the root
 // folder (in  multi-file torrent)
 // WARNING: assumes that multi-file torrents consist of a SINGLE folder.
@@ -56,3 +42,15 @@ function getFileOrFolder (torrentSummary) {
   const dirname = ts.files[0].path.split(path.sep)[0]
   return path.join(ts.path, dirname)
 }
+export { getPosterPath }
+export { getTorrentPath }
+export { getByKey }
+export { getTorrentId }
+export { getFileOrFolder }
+export default {
+  getPosterPath,
+  getTorrentPath,
+  getByKey,
+  getTorrentId,
+  getFileOrFolder
+}

src/renderer/main.js

@@ -1,54 +1,43 @@
-/**
+/* eslint-disable import/first */
- * Perf optimization: Hook into require() to modify how certain modules load:
- *
- * - `inline-style-prefixer` (used by `material-ui`) takes ~40ms. It is not
- *   actually used because auto-prefixing is disabled with
- *   `darkBaseTheme.userAgent = false`. Return a fake object.
- */
-const Module = require('module')
-const _require = Module.prototype.require
-Module.prototype.require = function (id) {
-  if (id === 'inline-style-prefixer') return {}
-  return _require.apply(this, arguments)
-}
-
 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.
+// blocking import() calls below.
 
-const State = require('./lib/state')
+import State from './lib/state'
 State.load(onState)
 
-const createGetter = require('fn-getter')
+import createGetter from 'fn-getter'
-const debounce = require('debounce')
+import remote from '@electron/remote'
-const dragDrop = require('drag-drop')
+import debounce from 'debounce'
-const electron = require('electron')
+import dragDrop from 'drag-drop'
-const fs = require('fs')
+import electron from 'electron'
-const React = require('react')
+import fs from 'fs'
-const ReactDOM = require('react-dom')
+import * as React from 'react'
+import * as ReactDOM from 'react-dom'
 
-const config = require('../config')
+import config from '../config.js'
-const telemetry = require('./lib/telemetry')
+import telemetry from './lib/telemetry.js'
-const sound = require('./lib/sound')
+import sound from './lib/sound.js'
-const TorrentPlayer = require('./lib/torrent-player')
+import TorrentPlayer from './lib/torrent-player.js'
+import App from './pages/app.js'
+import { setDispatch } from './lib/dispatcher.js'
 
-// Perf optimization: Needed immediately, so do not lazy load it below
+import TorrentController from './controllers/torrent-controller.js'
-const TorrentListController = require('./controllers/torrent-list-controller')
+import AudioTracksController from './controllers/audio-tracks-controller.js'
+import SubtitlesController from './controllers/subtitles-controller.js'
+import PrefsController from './controllers/prefs-controller.js'
+import PlaybackController from './controllers/playback-controller.js'
+import MediaController from './controllers/media-controller.js'
+import TorrentListController from './controllers/torrent-list-controller.js'
+import UpdateController from './controllers/update-controller.js'
+import FolderWatcherController from './controllers/folder-watcher-controller.js'
 
-const App = require('./pages/app')
+const { clipboard, ipcRenderer } = electron
-
-// Electron apps have two processes: a main process (node) runs first and starts
-// a renderer process (essentially a Chrome window). We're in the renderer process,
-// and this IPC channel receives from and sends messages to the main process
-const ipcRenderer = electron.ipcRenderer
 
 // Yo-yo pattern: state object lives here and percolates down thru all the views.
 // Events come back up from the views via dispatch(...)
-require('./lib/dispatcher').setDispatch(dispatch)
+setDispatch(dispatch)
 
 // From dispatch(...), events are sent to one of the controllers
 let controllers = null
@@ -83,37 +72,15 @@ function onState (err, _state) {
 
   // Create controllers
   controllers = {
-    media: createGetter(() => {
+    media: createGetter(() => new MediaController(state)),
-      const MediaController = require('./controllers/media-controller')
+    playback: createGetter(() => new PlaybackController(state, config, update)),
-      return new MediaController(state)
+    prefs: createGetter(() => new PrefsController(state, config)),
-    }),
+    subtitles: createGetter(() => new SubtitlesController(state)),
-    playback: createGetter(() => {
+    audioTracks: createGetter(() => new AudioTracksController(state)),
-      const PlaybackController = require('./controllers/playback-controller')
+    torrent: createGetter(() => new TorrentController(state)),
-      return new PlaybackController(state, config, update)
+    torrentList: createGetter(() => new TorrentListController(state)),
-    }),
+    update: createGetter(() => new UpdateController(state)),
-    prefs: createGetter(() => {
+    folderWatcher: createGetter(() => new FolderWatcherController())
-      const PrefsController = require('./controllers/prefs-controller')
-      return new PrefsController(state, config)
-    }),
-    subtitles: createGetter(() => {
-      const SubtitlesController = require('./controllers/subtitles-controller')
-      return new SubtitlesController(state)
-    }),
-    torrent: createGetter(() => {
-      const TorrentController = require('./controllers/torrent-controller')
-      return new TorrentController(state)
-    }),
-    torrentList: createGetter(() => {
-      return new TorrentListController(state)
-    }),
-    update: createGetter(() => {
-      const UpdateController = require('./controllers/update-controller')
-      return new UpdateController(state)
-    }),
-    folderWatcher: createGetter(() => {
-      const FolderWatcherController = require('./controllers/folder-watcher-controller')
-      return new FolderWatcherController()
-    })
   }
 
   // Add first page to location history
@@ -129,7 +96,10 @@ function onState (err, _state) {
   resumeTorrents()
 
   // Initialize ReactDOM
-  app = ReactDOM.render(<App state={state} />, document.querySelector('#body'))
+  ReactDOM.render(
+    <App state={state} ref={elem => { app = elem }} />,
+    document.querySelector('#body')
+  )
 
   // Calling update() updates the UI given the current state
   // Do this at least once a second to give every file in every torrentSummary
@@ -151,11 +121,11 @@ function onState (err, _state) {
   // Add YouTube style hotkey shortcuts
   window.addEventListener('keydown', onKeydown)
 
-  const debouncedFullscreenToggle = debounce(function () {
+  const debouncedFullscreenToggle = debounce(() => {
     dispatch('toggleFullScreen')
   }, 1000, true)
 
-  document.addEventListener('wheel', function (event) {
+  document.addEventListener('wheel', event => {
     // ctrlKey detects pinch to zoom, http://crbug.com/289887
     if (event.ctrlKey) {
       event.preventDefault()
@@ -167,7 +137,7 @@ function onState (err, _state) {
   window.addEventListener('focus', onFocus)
   window.addEventListener('blur', onBlur)
 
-  if (electron.remote.getCurrentWindow().isVisible()) {
+  if (remote.getCurrentWindow().isVisible()) {
     sound.play('STARTUP')
   }
 
@@ -197,9 +167,9 @@ function delayedInit () {
 }
 
 // Lazily loads Chromecast and Airplay support
-function lazyLoadCast () {
+async function lazyLoadCast () {
   if (!Cast) {
-    Cast = require('./lib/cast')
+    Cast = (await import('./lib/cast')).default
     Cast.init(state, update) // Search the local network for Chromecast and Airplays
   }
   return Cast
@@ -251,6 +221,11 @@ const dispatchHandlers = {
     controllers.torrentList().confirmDeleteTorrent(infoHash, deleteData),
   deleteTorrent: (infoHash, deleteData) =>
     controllers.torrentList().deleteTorrent(infoHash, deleteData),
+  openTorrentListContextMenu: () => onPaste(),
+  confirmDeleteAllTorrents: (deleteData) =>
+    controllers.torrentList().confirmDeleteAllTorrents(deleteData),
+  deleteAllTorrents: (deleteData) =>
+    controllers.torrentList().deleteAllTorrents(deleteData),
   toggleSelectTorrent: (infoHash) =>
     controllers.torrentList().toggleSelectTorrent(infoHash),
   openTorrentContextMenu: (infoHash) =>
@@ -269,10 +244,12 @@ const dispatchHandlers = {
   previousTrack: () => controllers.playback().previousTrack(),
   skip: (time) => controllers.playback().skip(time),
   skipTo: (time) => controllers.playback().skipTo(time),
+  preview: (x) => controllers.playback().preview(x),
+  clearPreview: () => controllers.playback().clearPreview(),
   changePlaybackRate: (dir) => controllers.playback().changePlaybackRate(dir),
   changeVolume: (delta) => controllers.playback().changeVolume(delta),
   setVolume: (vol) => controllers.playback().setVolume(vol),
-  openItem: (infoHash, index) => controllers.playback().openItem(infoHash, index),
+  openPath: (infoHash, index) => controllers.playback().openPath(infoHash, index),
 
   // Subtitles
   openSubtitles: () => controllers.subtitles().openSubtitles(),
@@ -281,6 +258,10 @@ const dispatchHandlers = {
   checkForSubtitles: () => controllers.subtitles().checkForSubtitles(),
   addSubtitles: (files, autoSelect) => controllers.subtitles().addSubtitles(files, autoSelect),
 
+  // Audio Tracks
+  selectAudioTrack: (index) => controllers.audioTracks().selectAudioTrack(index),
+  toggleAudioTracksMenu: () => controllers.audioTracks().toggleAudioTracksMenu(),
+
   // Local media: <video>, <audio>, external players
   mediaStalled: () => controllers.media().mediaStalled(),
   mediaError: (err) => controllers.media().mediaError(err),
@@ -300,7 +281,7 @@ const dispatchHandlers = {
   // Preferences screen
   preferences: () => controllers.prefs().show(),
   updatePreferences: (key, value) => controllers.prefs().update(key, value),
-  checkDownloadPath: checkDownloadPath,
+  checkDownloadPath,
   startFolderWatcher: () => controllers.folderWatcher().start(),
   stopFolderWatcher: () => controllers.folderWatcher().stop(),
 
@@ -310,20 +291,20 @@ const dispatchHandlers = {
 
   // Navigation between screens (back, forward, ESC, etc)
   exitModal: () => { state.modal = null },
-  backToList: backToList,
+  backToList,
-  escapeBack: escapeBack,
+  escapeBack,
   back: () => state.location.back(),
   forward: () => state.location.forward(),
   cancel: () => state.location.cancel(),
 
   // Controlling the window
-  setDimensions: setDimensions,
+  setDimensions,
   toggleFullScreen: (setTo) => ipcRenderer.send('toggleFullScreen', setTo),
   setTitle: (title) => { state.window.title = title },
   resetTitle: () => { state.window.title = config.APP_WINDOW_TITLE },
 
   // Everything else
-  onOpen: onOpen,
+  onOpen,
   error: onError,
   uncaughtError: (proc, err) => telemetry.logUncaughtError(proc, err),
   stateSave: () => State.save(state),
@@ -385,7 +366,7 @@ function setupIpc () {
 function backToList () {
   // Exit any modals and screens with a back button
   state.modal = null
-  state.location.backToFirst(function () {
+  state.location.backToFirst(() => {
     // If we were already on the torrent list, scroll to the top
     const contentTag = document.querySelector('.content')
     if (contentTag) contentTag.scrollTop = 0
@@ -419,7 +400,7 @@ function resumeTorrents () {
 // Set window dimensions to match video dimensions or fill the screen
 function setDimensions (dimensions) {
   // Don't modify the window size if it's already maximized
-  if (electron.remote.getCurrentWindow().isMaximized()) {
+  if (remote.getCurrentWindow().isMaximized()) {
     state.window.bounds = null
     return
   }
@@ -431,7 +412,7 @@ function setDimensions (dimensions) {
     width: window.outerWidth,
     height: window.outerHeight
   }
-  state.window.wasMaximized = electron.remote.getCurrentWindow().isMaximized
+  state.window.wasMaximized = remote.getCurrentWindow().isMaximized
 
   // Limit window size to screen size
   const screenWidth = window.screen.width
@@ -505,13 +486,16 @@ function onError (err) {
 const editableHtmlTags = new Set(['input', 'textarea'])
 
 function onPaste (e) {
-  if (editableHtmlTags.has(e.target.tagName.toLowerCase())) return
+  if (e && editableHtmlTags.has(e.target.tagName.toLowerCase())) return
-  controllers.torrentList().addTorrent(electron.clipboard.readText())
+  controllers.torrentList().addTorrent(clipboard.readText())
 
   update()
 }
 
 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') {
@@ -551,7 +535,7 @@ function onBlur () {
 }
 
 function onVisibilityChange () {
-  state.window.isVisible = !document.webkitHidden
+  state.window.isVisible = !document.hidden
 }
 
 function onFullscreenChanged (e, isFullScreen) {
@@ -572,7 +556,7 @@ function onWindowBoundsChanged (e, newBounds) {
 }
 
 function checkDownloadPath () {
-  fs.stat(state.saved.prefs.downloadPath, function (err, stat) {
+  fs.stat(state.saved.prefs.downloadPath, (err, stat) => {
     if (err) {
       state.downloadPathStatus = 'missing'
       return console.error(err)

src/renderer/pages/app.js

@@ -1,30 +1,35 @@
-const colors = require('material-ui/styles/colors')
+import * as colors from 'material-ui/styles/colors'
-const createGetter = require('fn-getter')
+import createGetter from 'fn-getter'
-const React = require('react')
+import * as React from 'react'
-
+import darkBaseTheme$0 from 'material-ui/styles/baseThemes/darkBaseTheme'
-const darkBaseTheme = require('material-ui/styles/baseThemes/darkBaseTheme').default
+import getMuiTheme$0 from 'material-ui/styles/getMuiTheme'
-const getMuiTheme = require('material-ui/styles/getMuiTheme').default
+import muiThemeProvider from 'material-ui/styles/MuiThemeProvider'
-const MuiThemeProvider = require('material-ui/styles/MuiThemeProvider').default
+import Header from '../components/header.js'
-
+import TorrentListPage from './torrent-list-page.js'
-const Header = require('../components/header')
+import playerPage from './player-page.js'
-
+import createTorrentPage from './create-torrent-page.js'
-// Perf optimization: Needed immediately, so do not lazy load it below
+import preferencesPage from './preferences-page.js'
-const TorrentListPage = require('./torrent-list-page')
+import openTorrentAddressModal from '../components/open-torrent-address-modal.js'
-
+import removeTorrentModal from '../components/remove-torrent-modal.js'
+import updateAvailableModal from '../components/update-available-modal.js'
+import unsupportedMediaModal from '../components/unsupported-media-modal.js'
+import deleteAllTorrentsModal from '../components/delete-all-torrents-modal.js'
+const darkBaseTheme = { default: darkBaseTheme$0 }.default
+const getMuiTheme = getMuiTheme$0.default
+const MuiThemeProvider = muiThemeProvider.default
 const Views = {
   home: createGetter(() => TorrentListPage),
-  player: createGetter(() => require('./player-page')),
+  player: createGetter(() => playerPage),
-  'create-torrent': createGetter(() => require('./create-torrent-page')),
+  'create-torrent': createGetter(() => createTorrentPage),
-  preferences: createGetter(() => require('./preferences-page'))
+  preferences: createGetter(() => preferencesPage)
 }
 
 const Modals = {
-  'open-torrent-address-modal': createGetter(
+  'open-torrent-address-modal': createGetter(() => openTorrentAddressModal),
-    () => require('../components/open-torrent-address-modal')
+  'remove-torrent-modal': createGetter(() => removeTorrentModal),
-  ),
+  'update-available-modal': createGetter(() => updateAvailableModal),
-  'remove-torrent-modal': createGetter(() => require('../components/remove-torrent-modal')),
+  'unsupported-media-modal': createGetter(() => unsupportedMediaModal),
-  'update-available-modal': createGetter(() => require('../components/update-available-modal')),
+  'delete-all-torrents-modal': createGetter(() => deleteAllTorrentsModal)
-  'unsupported-media-modal': createGetter(() => require('../components/unsupported-media-modal'))
 }
 
 const fontFamily = process.platform === 'win32'
@@ -43,7 +48,7 @@ darkBaseTheme.palette.accent3Color = colors.redA100
 let darkMuiTheme
 let lightMuiTheme
 
-class App extends React.Component {
+export default class App extends React.Component {
   render () {
     const state = this.props.state
 
@@ -84,9 +89,7 @@ class App extends React.Component {
     const recentErrors = state.errors.filter((x) => now - x.time < 5000)
     const hasErrors = recentErrors.length > 0
 
-    const errorElems = recentErrors.map(function (error, i) {
+    const errorElems = recentErrors.map((error, i) => <div key={i} className='error'>{error.message}</div>)
-      return (<div key={i} className='error'>{error.message}</div>)
-    })
     return (
       <div
         key='errors'
@@ -98,12 +101,12 @@ class App extends React.Component {
     )
   }
 
-  getModal () {
+  async getModal () {
     const state = this.props.state
     if (!state.modal) return
 
     if (!lightMuiTheme) {
-      const lightBaseTheme = require('material-ui/styles/baseThemes/lightBaseTheme').default
+      const lightBaseTheme = (await import('material-ui/styles/baseThemes/lightBaseTheme')).default
       lightBaseTheme.fontFamily = fontFamily
       lightBaseTheme.userAgent = false
       lightMuiTheme = getMuiTheme(lightBaseTheme)
@@ -128,5 +131,3 @@ class App extends React.Component {
     return (<View state={state} />)
   }
 }
-
-module.exports = App

src/renderer/pages/create-torrent-page.js

@@ -1,22 +1,25 @@
-const createTorrent = require('create-torrent')
+import createTorrent from 'create-torrent'
-const path = require('path')
+import path from 'path'
-const prettyBytes = require('prettier-bytes')
+import prettyBytes from 'prettier-bytes'
-const React = require('react')
+import * as React from 'react'
+import flatButton from 'material-ui/FlatButton'
+import raisedButton from 'material-ui/RaisedButton'
+import textField from 'material-ui/TextField'
+import checkbox from 'material-ui/Checkbox'
 
-const { dispatch, dispatcher } = require('../lib/dispatcher')
+import { dispatch, dispatcher } from '../lib/dispatcher.js'
+import CreateTorrentErrorPage from '../components/create-torrent-error-page.js'
+import Heading from '../components/heading.js'
+import ShowMore from '../components/show-more.js'
 
-const FlatButton = require('material-ui/FlatButton').default
+const FlatButton = flatButton.default
-const RaisedButton = require('material-ui/RaisedButton').default
+const RaisedButton = raisedButton.default
-const TextField = require('material-ui/TextField').default
+const TextField = textField.default
-const Checkbox = require('material-ui/Checkbox').default
+const Checkbox = checkbox.default
-
-const CreateTorrentErrorPage = require('../components/create-torrent-error-page')
-const Heading = require('../components/heading')
-const ShowMore = require('../components/show-more')
 
 // Shows a basic UI to create a torrent, from an already-selected file or folder.
 // Includes a "Show Advanced..." button and more advanced UI.
-class CreateTorrentPage extends React.Component {
+export default class CreateTorrentPage extends React.Component {
   constructor (props) {
     super(props)
 
@@ -223,5 +226,3 @@ function containsDots (path, pathPrefix) {
   const suffix = path.substring(pathPrefix.length).replace(/\\/g, '/')
   return ('/' + suffix).includes('/.')
 }
-
-module.exports = CreateTorrentPage

src/renderer/pages/player-page.js

@@ -1,16 +1,16 @@
-/* global HTMLMediaElement */
+import * as React from 'react'
+import bitfield from 'bitfield'
+import prettyBytes from 'prettier-bytes'
 
-const React = require('react')
+import TorrentSummary from '../lib/torrent-summary.js'
-const Bitfield = require('bitfield')
+import Playlist from '../lib/playlist.js'
-const prettyBytes = require('prettier-bytes')
+import { dispatch, dispatcher } from '../lib/dispatcher.js'
+import config from '../../config.js'
+import { calculateEta } from '../lib/time.js'
 
-const TorrentSummary = require('../lib/torrent-summary')
+const BitField = bitfield.default
-const Playlist = require('../lib/playlist')
-const { dispatch, dispatcher } = require('../lib/dispatcher')
-const config = require('../../config')
 
-// Shows a streaming video player. Standard features + Chromecast + Airplay
+export default class Player extends React.Component {
-module.exports = class Player extends React.Component {
   render () {
     // Show the video as large as will fit in the window, play immediately
     // If the video is on Chromecast or Airplay, show a title screen instead
@@ -97,25 +97,31 @@ function renderMedia (state) {
       delete file.selectedSubtitle
     }
 
+    // Switch to selected audio track
+    const audioTracks = mediaElement.audioTracks || []
+    for (let j = 0; j < audioTracks.length; j++) {
+      const isSelectedTrack = j === state.playing.audioTracks.selectedIndex
+      audioTracks[j].enabled = isSelectedTrack
+    }
+
     state.playing.volume = mediaElement.volume
   }
 
   // Add subtitles to the <video> tag
   const trackTags = []
   if (state.playing.subtitles.selectedIndex >= 0) {
-    for (let i = 0; i < state.playing.subtitles.tracks.length; i++) {
+    state.playing.subtitles.tracks.forEach((track, i) => {
-      const track = state.playing.subtitles.tracks[i]
       const isSelected = state.playing.subtitles.selectedIndex === i
       trackTags.push(
         <track
           key={i}
-          default={isSelected ? 'default' : ''}
+          default={isSelected}
           label={track.label}
-          type='subtitles'
+          kind='subtitles'
           src={track.buffer}
         />
       )
-    }
+    })
   }
 
   // Create the <audio> or <video> tag
@@ -124,13 +130,13 @@ function renderMedia (state) {
     <MediaTagName
       src={Playlist.getCurrentLocalURL(state)}
       onDoubleClick={dispatcher('toggleFullScreen')}
+      onClick={dispatcher('playPause')}
       onLoadedMetadata={onLoadedMetadata}
       onEnded={onEnded}
       onStalled={dispatcher('mediaStalled')}
       onError={dispatcher('mediaError')}
       onTimeUpdate={dispatcher('mediaTimeUpdate')}
       onEncrypted={dispatcher('mediaEncrypted')}
-      onCanPlay={onCanPlay}
     >
       {trackTags}
     </MediaTagName>
@@ -148,18 +154,53 @@ function renderMedia (state) {
     </div>
   )
 
-  // As soon as we know the video dimensions, resize the window
   function onLoadedMetadata (e) {
-    if (state.playing.type !== 'video') return
+    const mediaElement = e.target
-    const video = e.target
+
-    const dimensions = {
+    // check if we can decode video and audio track
-      width: video.videoWidth,
+    if (state.playing.type === 'video') {
-      height: video.videoHeight
+      if (mediaElement.videoTracks.length === 0) {
-    }
+        dispatch('mediaError', 'Video codec unsupported')
-    dispatch('setDimensions', dimensions)
       }
 
-  function onEnded (e) {
+      if (mediaElement.audioTracks.length === 0) {
+        dispatch('mediaError', 'Audio codec unsupported')
+      }
+
+      dispatch('mediaSuccess')
+
+      const dimensions = {
+        width: mediaElement.videoWidth,
+        height: mediaElement.videoHeight
+      }
+
+      // As soon as we know the video dimensions, resize the window
+      dispatch('setDimensions', dimensions)
+
+      // set audioTracks
+      const tracks = []
+      for (let i = 0; i < mediaElement.audioTracks.length; i++) {
+        tracks.push({
+          label: mediaElement.audioTracks[i].label || `Track ${i + 1}`,
+          language: mediaElement.audioTracks[i].language
+        })
+      }
+
+      state.playing.audioTracks.tracks = tracks
+      state.playing.audioTracks.selectedIndex = 0
+    }
+
+    // check if we can decode audio track
+    if (state.playing.type === 'audio') {
+      if (mediaElement.audioTracks.length === 0) {
+        dispatch('mediaError', 'Audio codec unsupported')
+      }
+
+      dispatch('mediaSuccess')
+    }
+  }
+
+  function onEnded () {
     if (Playlist.hasNext(state)) {
       dispatch('nextTrack')
     } else {
@@ -168,20 +209,6 @@ function renderMedia (state) {
       if (state.window.isFullScreen) dispatch('toggleFullScreen')
     }
   }
-
-  function onCanPlay (e) {
-    const elem = e.target
-    if (elem.readyState < HTMLMediaElement.HAVE_FUTURE_DATA) return
-    if (state.playing.type === 'video' &&
-      elem.webkitVideoDecodedByteCount === 0) {
-      dispatch('mediaError', 'Video codec unsupported')
-    } else if (elem.webkitAudioDecodedByteCount === 0) {
-      dispatch('mediaError', 'Audio codec unsupported')
-    } else {
-      dispatch('mediaSuccess')
-      elem.play()
-    }
-  }
 }
 
 function renderOverlay (state) {
@@ -315,13 +342,13 @@ function renderAudioMetadata (state) {
     format.push(fileSummary.audioInfo.format.codec)
   }
   if (fileSummary.audioInfo.format.bitrate) {
-    format.push(Math.round(fileSummary.audioInfo.format.bitrate / 1000) + ' kbps') // 128 kbps
+    format.push(Math.round(fileSummary.audioInfo.format.bitrate / 1000) + ' kbit/s') // 128 kbit/s
   }
   if (fileSummary.audioInfo.format.sampleRate) {
     format.push(Math.round(fileSummary.audioInfo.format.sampleRate / 100) / 10 + ' kHz')
   }
   if (fileSummary.audioInfo.format.bitsPerSample) {
-    format.push(fileSummary.audioInfo.format.bitsPerSample + ' bit')
+    format.push(fileSummary.audioInfo.format.bitsPerSample + '-bit')
   }
   if (format.length > 0) {
     elems.push((
@@ -402,22 +429,70 @@ function renderCastScreen (state) {
 
   const isStarting = state.playing.location.endsWith('-pending')
   const castName = state.playing.castName
+  const fileName = state.getPlayingFileSummary().name || ''
   let castStatus
   if (isCast && isStarting) castStatus = 'Connecting to ' + castName + '...'
   else if (isCast && !isStarting) castStatus = 'Connected to ' + castName
   else castStatus = ''
 
+  const prog = state.getPlayingTorrentSummary().progress || {}
+
   // Show a nice title image, if possible
   const style = {
     backgroundImage: cssBackgroundImagePoster(state)
   }
 
+  function renderEta (total, downloaded) {
+    const missing = (total || 0) - (downloaded || 0)
+    const downloadSpeed = prog.downloadSpeed || 0
+    if (downloadSpeed === 0 || missing === 0) return
+
+    const etaStr = calculateEta(missing, downloadSpeed)
+
+    return (<span>{etaStr}</span>)
+  }
+
+  function renderDownloadProgress () {
+    if (!prog.files) return
+
+    const fileProg = prog.files[state.playing.fileIndex]
+    const fileProgress = fileProg.numPiecesPresent / fileProg.numPieces
+    const fileLength = state.getPlayingFileSummary().length
+    const fileDownloaded = fileProgress * fileLength
+
+    const progress = Math.round(100 * fileProgress)
+    const total = prettyBytes(fileLength)
+    const completed = prettyBytes(fileDownloaded)
+
+    const downloadSpeed = prettyBytes(prog.downloadSpeed || 0)
+    const uploadSpeed = prettyBytes(prog.uploadSpeed || 0)
+
+    let sizes
+    if (fileProgress < 1) {
+      sizes = <span> | {completed} / {total}</span>
+    } else {
+      sizes = <span> | {completed}</span>
+    }
+
+    return (
+      <div key='download-progress'>
+        <span className='progress'>{progress}% downloaded {sizes}</span>
+        <br />
+        <span>↓ {downloadSpeed}/s ↑ {uploadSpeed}/s | {prog.numPeers || 0} peer(s)</span>
+        <br />
+        {renderEta(fileLength, fileDownloaded)}
+      </div>
+    )
+  }
+
   return (
     <div key='cast' className='letterbox' style={style}>
       <div className='cast-screen'>
         <i className='icon'>{castIcon}</i>
         <div key='type' className='cast-type'>{castType}</div>
         <div key='status' className='cast-status'>{castStatus}</div>
+        <div key='name' className='name'>{fileName}</div>
+        {renderDownloadProgress()}
       </div>
     </div>
   )
@@ -429,7 +504,7 @@ function renderCastOptions (state) {
   const { location, devices } = state.devices.castMenu
   const player = state.devices[location]
 
-  const items = devices.map(function (device, ix) {
+  const items = devices.map((device, ix) => {
     const isSelected = player.device === device
     const name = device.name
     return (
@@ -452,7 +527,7 @@ function renderSubtitleOptions (state) {
   const subtitles = state.playing.subtitles
   if (!subtitles.tracks.length || !subtitles.showMenu) return
 
-  const items = subtitles.tracks.map(function (track, ix) {
+  const items = subtitles.tracks.map((track, ix) => {
     const isSelected = state.playing.subtitles.selectedIndex === ix
     return (
       <li key={ix} onClick={dispatcher('selectSubtitle', ix)}>
@@ -475,6 +550,27 @@ function renderSubtitleOptions (state) {
   )
 }
 
+function renderAudioTrackOptions (state) {
+  const audioTracks = state.playing.audioTracks
+  if (!audioTracks.tracks.length || !audioTracks.showMenu) return
+
+  const items = audioTracks.tracks.map((track, ix) => {
+    const isSelected = state.playing.audioTracks.selectedIndex === ix
+    return (
+      <li key={ix} onClick={dispatcher('selectAudioTrack', ix)}>
+        <i className='icon'>{'radio_button_' + (isSelected ? 'checked' : 'unchecked')}</i>
+        {track.label}
+      </li>
+    )
+  })
+
+  return (
+    <ul key='audio-track-options' className='options-list'>
+      {items}
+    </ul>
+  )
+}
+
 function renderPlayerControls (state) {
   const positionPercent = 100 * state.playing.currentTime / state.playing.duration
   const playbackCursorStyle = { left: 'calc(' + positionPercent + '% - 3px)' }
@@ -483,10 +579,15 @@ function renderPlayerControls (state) {
     : state.playing.subtitles.selectedIndex >= 0
       ? 'active'
       : ''
+  const multiAudioClass = state.playing.audioTracks.tracks.length > 1
+    ? 'active'
+    : 'disabled'
   const prevClass = Playlist.hasPrevious(state) ? '' : 'disabled'
   const nextClass = Playlist.hasNext(state) ? '' : 'disabled'
 
   const elements = [
+    renderPreview(state),
+
     <div key='playback-bar' className='playback-bar'>
       {renderLoadingBar(state)}
       <div
@@ -498,6 +599,8 @@ function renderPlayerControls (state) {
         key='scrub-bar'
         className='scrub-bar'
         draggable='true'
+        onMouseMove={handleScrubPreview}
+        onMouseOut={clearPreview}
         onDragStart={handleDragStart}
         onClick={handleScrub}
         onDrag={handleScrub}
@@ -547,6 +650,14 @@ function renderPlayerControls (state) {
       >
         closed_caption
       </i>
+    ), (
+      <i
+        key='audio-tracks'
+        className={'icon multi-audio float-right ' + multiAudioClass}
+        onClick={handleAudioTracks}
+      >
+        library_music
+      </i>
     ))
   }
 
@@ -561,7 +672,7 @@ function renderPlayerControls (state) {
     airplay: { true: 'airplay', false: 'airplay' },
     dlna: { true: 'tv', false: 'tv' }
   }
-  castTypes.forEach(function (castType) {
+  castTypes.forEach(castType => {
     // Do we show this button (eg. the Chromecast button) at all?
     const isCasting = state.playing.location.startsWith(castType)
     const player = state.devices[castType]
@@ -598,10 +709,14 @@ function renderPlayerControls (state) {
   // Render volume slider
   const volume = state.playing.volume
   const volumeIcon = 'volume_' + (
-    volume === 0 ? 'off'
+    volume === 0
-      : volume < 0.3 ? 'mute'
+      ? 'off'
-        : volume < 0.6 ? 'down'
+      : volume < 0.3
-          : 'up')
+        ? 'mute'
+        : volume < 0.6
+          ? 'down'
+          : 'up'
+  )
   const volumeStyle = {
     background: '-webkit-gradient(linear, left top, right top, ' +
       'color-stop(' + (volume * 100) + '%, #eee), ' +
@@ -644,26 +759,31 @@ function renderPlayerControls (state) {
     ))
   }
 
-  return (
+  const emptyImage = new window.Image(0, 0)
-    <div
+  emptyImage.src = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D'
-      key='controls' className='controls'
-      onMouseEnter={dispatcher('mediaControlsMouseEnter')}
-      onMouseLeave={dispatcher('mediaControlsMouseLeave')}
-    >
-      {elements}
-      {renderCastOptions(state)}
-      {renderSubtitleOptions(state)}
-    </div>
-  )
-
   function handleDragStart (e) {
-    // Prevent the cursor from changing, eg to a green + icon on Mac
     if (e.dataTransfer) {
       const dt = e.dataTransfer
+      // Prevent the cursor from changing, eg to a green + icon on Mac
       dt.effectAllowed = 'none'
+      // Prevent ghost image
+      dt.setDragImage(emptyImage, 0, 0)
     }
   }
 
+  // Handles a scrub hover (preview another position in the video)
+  function handleScrubPreview (e) {
+    // Only show for videos
+    if (!e.clientX || state.playing.type !== 'video') return
+    dispatch('mediaMouseMoved')
+    dispatch('preview', e.clientX)
+  }
+
+  function clearPreview () {
+    if (state.playing.type !== 'video') return
+    dispatch('clearPreview')
+  }
+
   // Handles a click or drag to scrub (jump to another position in the video)
   function handleScrub (e) {
     if (!e.clientX) return
@@ -675,7 +795,7 @@ function renderPlayerControls (state) {
   }
 
   // Handles volume muting and Unmuting
-  function handleVolumeMute (e) {
+  function handleVolumeMute () {
     if (state.playing.volume === 0.0) {
       dispatch('setVolume', 1.0)
     } else {
@@ -696,6 +816,73 @@ function renderPlayerControls (state) {
       dispatch('toggleSubtitlesMenu')
     }
   }
+
+  function handleAudioTracks () {
+    dispatch('toggleAudioTracksMenu')
+  }
+
+  return (
+    <div
+      key='controls' className='controls'
+      onMouseEnter={dispatcher('mediaControlsMouseEnter')}
+      onMouseLeave={dispatcher('mediaControlsMouseLeave')}
+    >
+      {elements}
+      {renderCastOptions(state)}
+      {renderSubtitleOptions(state)}
+      {renderAudioTrackOptions(state)}
+    </div>
+  )
+}
+
+function renderPreview (state) {
+  const { previewXCoord = null } = state.playing
+
+  // Calculate time from x-coord as fraction of track width
+  const windowWidth = document.querySelector('body').clientWidth
+  const fraction = previewXCoord / windowWidth
+  const time = fraction * state.playing.duration /* seconds */
+
+  const height = 70
+  let width = 0
+
+  const previewEl = document.querySelector('video#preview')
+  if (previewEl !== null && previewXCoord !== null) {
+    previewEl.currentTime = time
+
+    // Auto adjust width to maintain video aspect ratio
+    width = Math.floor((previewEl.videoWidth / previewEl.videoHeight) * height)
+  }
+
+  // Center preview window on mouse cursor,
+  // while avoiding falling off the left or right edges
+  const xPos = Math.min(Math.max(previewXCoord - (width / 2), 5), windowWidth - width - 5)
+
+  return (
+    <div
+      key='preview' style={{
+        position: 'absolute',
+        bottom: 50,
+        left: xPos,
+        display: previewXCoord == null && 'none' // Hide preview when XCoord unset
+      }}
+    >
+      <div style={{ width, height, backgroundColor: 'black' }}>
+        <video
+          src={Playlist.getCurrentLocalURL(state)}
+          id='preview'
+          style={{ border: '1px solid lightgrey', borderRadius: 2 }}
+        />
+      </div>
+      <p
+        style={{
+          textAlign: 'center', margin: 5, textShadow: '0 0 2px rgba(0,0,0,.5)', color: '#eee'
+        }}
+      >
+        {formatTime(time, state.playing.duration)}
+      </p>
+    </div>
+  )
 }
 
 // Renders the loading bar. Shows which parts of the torrent are loaded, which
@@ -717,7 +904,7 @@ function renderLoadingBar (state) {
   const parts = []
   let lastPiecePresent = false
   for (let i = fileProg.startPiece; i <= fileProg.endPiece; i++) {
-    const partPresent = Bitfield.prototype.get.call(prog.bitfield, i)
+    const partPresent = BitField.prototype.get.call(prog.bitfield, i)
     if (partPresent && !lastPiecePresent) {
       parts.push({ start: i - fileProg.startPiece, count: 1 })
     } else if (partPresent) {
@@ -727,7 +914,7 @@ function renderLoadingBar (state) {
   }
 
   // Output some bars to show which parts of the file are loaded
-  const loadingBarElems = parts.map(function (part, i) {
+  const loadingBarElems = parts.map((part, i) => {
     const style = {
       left: (100 * part.start / fileProg.numPieces) + '%',
       width: (100 * part.count / fileProg.numPieces) + '%'

src/renderer/pages/preferences-page.js

@@ -1,16 +1,18 @@
-const React = require('react')
+import * as React from 'react'
-const PropTypes = require('prop-types')
+import PropTypes from 'prop-types'
+import * as colors from 'material-ui/styles/colors'
+import checkbox from 'material-ui/Checkbox'
+import raisedButton from 'material-ui/RaisedButton'
 
-const colors = require('material-ui/styles/colors')
+import Heading from '../components/heading.js'
-const Checkbox = require('material-ui/Checkbox').default
+import PathSelector from '../components/path-selector.js'
-const RaisedButton = require('material-ui/RaisedButton').default
+import { dispatch } from '../lib/dispatcher.js'
-const Heading = require('../components/heading')
+import config from '../../config.js'
-const PathSelector = require('../components/path-selector')
 
-const { dispatch } = require('../lib/dispatcher')
+const Checkbox = checkbox.default
-const config = require('../../config')
+const RaisedButton = raisedButton.default
 
-class PreferencesPage extends React.Component {
+export default class PreferencesPage extends React.Component {
   constructor (props) {
     super(props)
 
@@ -286,5 +288,3 @@ class Preference extends React.Component {
     return (<div style={style}>{this.props.children}</div>)
   }
 }
-
-module.exports = PreferencesPage

src/renderer/pages/torrent-list-page.js

@@ -1,14 +1,17 @@
-const React = require('react')
+import * as React from 'react'
-const prettyBytes = require('prettier-bytes')
+import prettyBytes from 'prettier-bytes'
+import checkbox from 'material-ui/Checkbox'
+import linearProgress from 'material-ui/LinearProgress'
 
-const Checkbox = require('material-ui/Checkbox').default
+import TorrentSummary from '../lib/torrent-summary.js'
-const LinearProgress = require('material-ui/LinearProgress').default
+import TorrentPlayer from '../lib/torrent-player.js'
+import { dispatcher } from '../lib/dispatcher.js'
+import { calculateEta } from '../lib/time.js'
 
-const TorrentSummary = require('../lib/torrent-summary')
+const Checkbox = checkbox.default
-const TorrentPlayer = require('../lib/torrent-player')
+const LinearProgress = linearProgress.default
-const { dispatcher } = require('../lib/dispatcher')
 
-module.exports = class TorrentList extends React.Component {
+export default class TorrentList extends React.Component {
   render () {
     const state = this.props.state
 
@@ -35,7 +38,11 @@ module.exports = class TorrentList extends React.Component {
     )
 
     return (
-      <div key='torrent-list' className='torrent-list'>
+      <div
+        key='torrent-list'
+        className='torrent-list'
+        onContextMenu={dispatcher('openTorrentListContextMenu')}
+      >
         {contents}
       </div>
     )
@@ -191,18 +198,9 @@ module.exports = class TorrentList extends React.Component {
       const downloadSpeed = prog.downloadSpeed
       if (downloadSpeed === 0 || missing === 0) return
 
-      const rawEta = missing / downloadSpeed
+      const etaStr = calculateEta(missing, downloadSpeed)
-      const hours = Math.floor(rawEta / 3600) % 24
-      const minutes = Math.floor(rawEta / 60) % 60
-      const seconds = Math.floor(rawEta % 60)
 
-      // Only display hours and minutes if they are greater than 0 but always
+      return (<span key='eta'>{etaStr}</span>)
-      // display minutes if hours is being displayed
-      const hoursStr = hours ? hours + 'h' : ''
-      const minutesStr = (hours || minutes) ? minutes + 'm' : ''
-      const secondsStr = seconds + 's'
-
-      return (<span key='eta'>{hoursStr} {minutesStr} {secondsStr} remaining</span>)
     }
 
     function renderTorrentStatus () {
@@ -212,7 +210,9 @@ module.exports = class TorrentList extends React.Component {
         else if (torrentSummary.progress.progress === 1) status = 'Not seeding'
         else status = 'Paused'
       } else if (torrentSummary.status === 'downloading') {
-        status = 'Downloading'
+        if (!torrentSummary.progress) status = ''
+        else if (!torrentSummary.progress.ready) status = 'Verifying'
+        else status = 'Downloading'
       } else if (torrentSummary.status === 'seeding') {
         status = 'Seeding'
       } else { // torrentSummary.status is 'new' or something unexpected
@@ -282,10 +282,17 @@ module.exports = class TorrentList extends React.Component {
       )
     } else {
       // We do know the files. List them and show download stats for each one
-      const fileRows = torrentSummary.files
+      const sortByName = this.props.state.saved.prefs.sortByName
+      const collator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' })
+      let fileRows = torrentSummary.files
         .filter((file) => !file.path.includes('/.____padding_file/'))
         .map((file, index) => ({ file, index }))
-        .map((object) => this.renderFileRow(torrentSummary, object.file, object.index))
+
+      if (sortByName) {
+        fileRows = fileRows.sort((a, b) => collator.compare(a.file.name, b.file.name))
+      }
+
+      fileRows = fileRows.map((obj) => this.renderFileRow(torrentSummary, obj.file, obj.index))
 
       filesElement = (
         <div key='files' className='files'>
@@ -316,7 +323,7 @@ module.exports = class TorrentList extends React.Component {
         torrentSummary.progress.files[index]) {
       const fileProg = torrentSummary.progress.files[index]
       isDone = fileProg.numPiecesPresent === fileProg.numPieces
-      progress = Math.round(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
+      progress = Math.floor(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
     }
 
     // Second, for media files where we saved our position, show how far we got
@@ -337,7 +344,7 @@ module.exports = class TorrentList extends React.Component {
     } else {
       icon = 'description' /* file icon, opens in OS default app */
       handleClick = isDone
-        ? dispatcher('openItem', infoHash, index)
+        ? dispatcher('openPath', infoHash, index)
         : (e) => e.stopPropagation() // noop if file is not ready
     }
     // TODO: add a css 'disabled' class to indicate that a file cannot be opened/streamed

src/renderer/webtorrent.js

@@ -1,38 +1,33 @@
+/* eslint-disable import/first */
 // To keep the UI snappy, we run WebTorrent in its own hidden window, a separate
 // process from the main window.
 console.time('init')
 
-const crypto = require('crypto')
+import crypto from 'crypto'
-const deepEqual = require('deep-equal')
+import util from 'util'
-const defaultAnnounceList = require('create-torrent').announceList
+import { announceList as defaultAnnounceList } from 'create-torrent'
-const electron = require('electron')
+import electron from 'electron'
-const fs = require('fs')
+import fs from 'fs'
-const mkdirp = require('mkdirp')
+import * as mm from 'music-metadata'
-const mm = require('music-metadata')
+import networkAddress from 'network-address'
-const networkAddress = require('network-address')
+import path from 'path'
-const path = require('path')
+import WebTorrent from 'webtorrent'
-const WebTorrent = require('webtorrent')
 
-const crashReporter = require('../crash-reporter')
+import config from '../config.js'
-const config = require('../config')
+import { TorrentKeyNotFoundError } from './lib/errors.js'
-const { TorrentKeyNotFoundError } = require('./lib/errors')
+import torrentPoster from './lib/torrent-poster.js'
-const torrentPoster = require('./lib/torrent-poster')
 
-// Report when the process crashes
+const { ipcRenderer } = electron
-crashReporter.init()
-
-// Send & receive messages from the main window
-const ipc = electron.ipcRenderer
 
 // Force use of webtorrent trackers on all torrents
-global.WEBTORRENT_ANNOUNCE = defaultAnnounceList
+globalThis.WEBTORRENT_ANNOUNCE = defaultAnnounceList
   .map((arr) => arr[0])
   .filter((url) => url.indexOf('wss://') === 0 || url.indexOf('ws://') === 0)
 
 /**
  * WebTorrent version.
  */
-const VERSION = require('../../package.json').version
+const VERSION = JSON.parse(fs.readFileSync('package.json').toString()).version
 
 /**
  * Version number in Azureus-style. Generated from major and minor semver version.
@@ -73,29 +68,29 @@ init()
 function init () {
   listenToClientEvents()
 
-  ipc.on('wt-start-torrenting', (e, torrentKey, torrentID, path, fileModtimes, selections) =>
+  ipcRenderer.on('wt-start-torrenting', (e, torrentKey, torrentID, path, fileModtimes, selections) =>
     startTorrenting(torrentKey, torrentID, path, fileModtimes, selections))
-  ipc.on('wt-stop-torrenting', (e, infoHash) =>
+  ipcRenderer.on('wt-stop-torrenting', (e, infoHash) =>
     stopTorrenting(infoHash))
-  ipc.on('wt-create-torrent', (e, torrentKey, options) =>
+  ipcRenderer.on('wt-create-torrent', (e, torrentKey, options) =>
     createTorrent(torrentKey, options))
-  ipc.on('wt-save-torrent-file', (e, torrentKey) =>
+  ipcRenderer.on('wt-save-torrent-file', (e, torrentKey) =>
     saveTorrentFile(torrentKey))
-  ipc.on('wt-generate-torrent-poster', (e, torrentKey) =>
+  ipcRenderer.on('wt-generate-torrent-poster', (e, torrentKey) =>
     generateTorrentPoster(torrentKey))
-  ipc.on('wt-get-audio-metadata', (e, infoHash, index) =>
+  ipcRenderer.on('wt-get-audio-metadata', (e, infoHash, index) =>
     getAudioMetadata(infoHash, index))
-  ipc.on('wt-start-server', (e, infoHash) =>
+  ipcRenderer.on('wt-start-server', (e, infoHash) =>
     startServer(infoHash))
-  ipc.on('wt-stop-server', (e) =>
+  ipcRenderer.on('wt-stop-server', () =>
     stopServer())
-  ipc.on('wt-select-files', (e, infoHash, selections) =>
+  ipcRenderer.on('wt-select-files', (e, infoHash, selections) =>
     selectFiles(infoHash, selections))
 
-  ipc.send('ipcReadyWebTorrent')
+  ipcRenderer.send('ipcReadyWebTorrent')
 
   window.addEventListener('error', (e) =>
-    ipc.send('wt-uncaught-error', { message: e.error.message, stack: e.error.stack }),
+    ipcRenderer.send('wt-uncaught-error', { message: e.error.message, stack: e.error.stack }),
   true)
 
   setInterval(updateTorrentProgress, 1000)
@@ -103,8 +98,8 @@ function init () {
 }
 
 function listenToClientEvents () {
-  client.on('warning', (err) => ipc.send('wt-warning', null, err.message))
+  client.on('warning', (err) => ipcRenderer.send('wt-warning', null, err.message))
-  client.on('error', (err) => ipc.send('wt-error', null, err.message))
+  client.on('error', (err) => ipcRenderer.send('wt-error', null, err.message))
 }
 
 // Starts a given TorrentID, which can be an infohash, magnet URI, etc.
@@ -113,8 +108,8 @@ function startTorrenting (torrentKey, torrentID, path, fileModtimes, selections)
   console.log('starting torrent %s: %s', torrentKey, torrentID)
 
   const torrent = client.add(torrentID, {
-    path: path,
+    path,
-    fileModtimes: fileModtimes
+    fileModtimes
   })
   torrent.key = torrentKey
 
@@ -138,44 +133,44 @@ function createTorrent (torrentKey, options) {
   const torrent = client.seed(paths, options)
   torrent.key = torrentKey
   addTorrentEvents(torrent)
-  ipc.send('wt-new-torrent')
+  ipcRenderer.send('wt-new-torrent')
 }
 
 function addTorrentEvents (torrent) {
   torrent.on('warning', (err) =>
-    ipc.send('wt-warning', torrent.key, err.message))
+    ipcRenderer.send('wt-warning', torrent.key, err.message))
   torrent.on('error', (err) =>
-    ipc.send('wt-error', torrent.key, err.message))
+    ipcRenderer.send('wt-error', torrent.key, err.message))
   torrent.on('infoHash', () =>
-    ipc.send('wt-parsed', torrent.key, torrent.infoHash, torrent.magnetURI))
+    ipcRenderer.send('wt-parsed', torrent.key, torrent.infoHash, torrent.magnetURI))
   torrent.on('metadata', torrentMetadata)
   torrent.on('ready', torrentReady)
   torrent.on('done', torrentDone)
 
   function torrentMetadata () {
     const info = getTorrentInfo(torrent)
-    ipc.send('wt-metadata', torrent.key, info)
+    ipcRenderer.send('wt-metadata', torrent.key, info)
 
     updateTorrentProgress()
   }
 
   function torrentReady () {
     const info = getTorrentInfo(torrent)
-    ipc.send('wt-ready', torrent.key, info)
+    ipcRenderer.send('wt-ready', torrent.key, info)
-    ipc.send('wt-ready-' + torrent.infoHash, torrent.key, info)
+    ipcRenderer.send('wt-ready-' + torrent.infoHash, torrent.key, info)
 
     updateTorrentProgress()
   }
 
   function torrentDone () {
     const info = getTorrentInfo(torrent)
-    ipc.send('wt-done', torrent.key, info)
+    ipcRenderer.send('wt-done', torrent.key, info)
 
     updateTorrentProgress()
 
-    torrent.getFileModtimes(function (err, fileModtimes) {
+    torrent.getFileModtimes((err, fileModtimes) => {
       if (err) return onError(err)
-      ipc.send('wt-file-modtimes', torrent.key, fileModtimes)
+      ipcRenderer.send('wt-file-modtimes', torrent.key, fileModtimes)
     })
   }
 }
@@ -208,19 +203,19 @@ function saveTorrentFile (torrentKey) {
   const torrent = getTorrent(torrentKey)
   const torrentPath = path.join(config.TORRENT_PATH, torrent.infoHash + '.torrent')
 
-  fs.access(torrentPath, fs.constants.R_OK, function (err) {
+  fs.access(torrentPath, fs.constants.R_OK, err => {
     const fileName = torrent.infoHash + '.torrent'
     if (!err) {
       // We've already saved the file
-      return ipc.send('wt-file-saved', torrentKey, fileName)
+      return ipcRenderer.send('wt-file-saved', torrentKey, fileName)
     }
 
     // Otherwise, save the .torrent file, under the app config folder
-    mkdirp(config.TORRENT_PATH, function (_) {
+    fs.mkdir(config.TORRENT_PATH, { recursive: true }, _ => {
-      fs.writeFile(torrentPath, torrent.torrentFile, function (err) {
+      fs.writeFile(torrentPath, torrent.torrentFile, err => {
         if (err) return console.log('error saving torrent file %s: %o', torrentPath, err)
         console.log('saved torrent file %s', torrentPath)
-        return ipc.send('wt-file-saved', torrentKey, fileName)
+        return ipcRenderer.send('wt-file-saved', torrentKey, fileName)
       })
     })
   })
@@ -230,17 +225,17 @@ function saveTorrentFile (torrentKey) {
 // Auto chooses either a frame from a video file, an image, etc
 function generateTorrentPoster (torrentKey) {
   const torrent = getTorrent(torrentKey)
-  torrentPoster(torrent, function (err, buf, extension) {
+  torrentPoster(torrent, (err, buf, extension) => {
     if (err) return console.log('error generating poster: %o', err)
     // save it for next time
-    mkdirp(config.POSTER_PATH, function (err) {
+    fs.mkdir(config.POSTER_PATH, { recursive: true }, err => {
       if (err) return console.log('error creating poster dir: %o', err)
       const posterFileName = torrent.infoHash + extension
       const posterFilePath = path.join(config.POSTER_PATH, posterFileName)
-      fs.writeFile(posterFilePath, buf, function (err) {
+      fs.writeFile(posterFilePath, buf, err => {
         if (err) return console.log('error saving poster: %o', err)
         // show the poster
-        ipc.send('wt-poster', torrentKey, posterFileName)
+        ipcRenderer.send('wt-poster', torrentKey, posterFileName)
       })
     })
   })
@@ -249,25 +244,23 @@ function generateTorrentPoster (torrentKey) {
 function updateTorrentProgress () {
   const progress = getTorrentProgress()
   // TODO: diff torrent-by-torrent, not once for the whole update
-  if (prevProgress && deepEqual(progress, prevProgress, { strict: true })) {
+  if (prevProgress && util.isDeepStrictEqual(progress, prevProgress)) {
     return /* don't send heavy object if it hasn't changed */
   }
-  ipc.send('wt-progress', progress)
+  ipcRenderer.send('wt-progress', progress)
   prevProgress = progress
 }
 
 function getTorrentProgress () {
   // First, track overall progress
   const progress = client.progress
-  const hasActiveTorrents = client.torrents.some(function (torrent) {
+  const hasActiveTorrents = client.torrents.some(torrent => torrent.progress !== 1)
-    return torrent.progress !== 1
-  })
 
   // Track progress for every file in each torrent
   // TODO: ideally this would be tracked by WebTorrent, which could do it
   // more efficiently than looping over torrent.bitfield
-  const torrentProg = client.torrents.map(function (torrent) {
+  const torrentProg = client.torrents.map(torrent => {
-    const fileProg = torrent.files && torrent.files.map(function (file, index) {
+    const fileProg = torrent.files && torrent.files.map(file => {
       const numPieces = file._endPiece - file._startPiece + 1
       let numPiecesPresent = 0
       for (let piece = file._startPiece; piece <= file._endPiece; piece++) {
@@ -307,12 +300,12 @@ function startServer (infoHash) {
   else torrent.once('ready', () => startServerFromReadyTorrent(torrent))
 }
 
-function startServerFromReadyTorrent (torrent, cb) {
+function startServerFromReadyTorrent (torrent) {
   if (server) return
 
   // start the streaming torrent-to-http server
   server = torrent.createServer()
-  server.listen(0, function () {
+  server.listen(0, () => {
     const port = server.address().port
     const urlSuffix = ':' + port
     const info = {
@@ -322,8 +315,8 @@ function startServerFromReadyTorrent (torrent, cb) {
       networkAddress: networkAddress()
     }
 
-    ipc.send('wt-server-running', info)
+    ipcRenderer.send('wt-server-running', info)
-    ipc.send('wt-server-' + torrent.infoHash, info)
+    ipcRenderer.send('wt-server-' + torrent.infoHash, info)
   })
 }
 
@@ -341,25 +334,31 @@ function getAudioMetadata (infoHash, index) {
 
   // Set initial matadata to display the filename first.
   const metadata = { title: file.name }
-  ipc.send('wt-audio-metadata', infoHash, index, metadata)
+  ipcRenderer.send('wt-audio-metadata', infoHash, index, metadata)
 
   const options = {
     native: false,
     skipCovers: true,
     fileSize: file.length,
-    observer: event => {
+    observer: () => {
-      ipc.send('wt-audio-metadata', infoHash, index, event.metadata)
+      ipcRenderer.send('wt-audio-metadata', infoHash, index, {
+        common: metadata.common,
+        format: metadata.format
+      })
     }
   }
-  const onMetaData = file.done
+  const onMetadata = file.done
     // If completed; use direct file access
     ? mm.parseFile(path.join(torrent.path, file.path), options)
     // otherwise stream
     : mm.parseStream(file.createReadStream(), file.name, options)
 
-  onMetaData
+  onMetadata
     .then(
-      () => console.log(`metadata for file='${file.name}' completed.`),
+      metadata => {
+        ipcRenderer.send('wt-audio-metadata', infoHash, index, metadata)
+        console.log(`metadata for file='${file.name}' completed.`)
+      },
       err => {
         console.log(
           `error getting audio metadata for ${infoHash}:${index}`,
@@ -386,7 +385,7 @@ function selectFiles (torrentOrInfoHash, selections) {
   // selection with individual selections for each file, so we can
   // select/deselect files later on
   if (!selections) {
-    selections = torrent.files.map((x) => true)
+    selections = new Array(torrent.files.length).fill(true)
   }
 
   // Selections specified incorrectly?
@@ -399,15 +398,15 @@ function selectFiles (torrentOrInfoHash, selections) {
   torrent.deselect(0, torrent.pieces.length - 1, false)
 
   // Add selections (individual files)
-  for (let i = 0; i < selections.length; i++) {
+  selections.forEach((selection, i) => {
     const file = torrent.files[i]
-    if (selections[i]) {
+    if (selection) {
       file.select()
     } else {
       console.log('deselecting file ' + i + ' of torrent ' + torrent.name)
       file.deselect()
     }
-  }
+  })
 }
 
 // Gets a WebTorrent handle by torrentKey
@@ -425,7 +424,7 @@ function onError (err) {
 // TODO: remove this once the following bugs are fixed:
 // https://bugs.chromium.org/p/chromium/issues/detail?id=490143
 // https://github.com/electron/electron/issues/7212
-window.testOfflineMode = function () {
+window.testOfflineMode = () => {
   console.log('Test, going OFFLINE')
   client = window.client = new WebTorrent({
     peerId: PEER_ID,

static/about.html

@@ -32,8 +32,8 @@
     <p>
       Version <script>document.write(require('../package.json').version)</script>
       (<script>document.write(require('webtorrent/package.json').version)</script>)
-      (<script>document.write(process.arch === 'x64' ? '64-bit' : '32-bit')</script>)
+      (<script>document.write(process.arch)</script>)
     </p>
-    <p><script>document.write(require('../config').APP_COPYRIGHT)</script></p>
+    <p><script>document.write(require('../build/config').APP_COPYRIGHT)</script></p>
   </body>
 </html>

static/linux/webtorrent-desktop.ejs

@@ -1,26 +1,25 @@
 [Desktop Entry]
 Type=Application
-<% if (version) { %>Version=<%= version %><% } %>
 Name=<%= productName %>
 <% if (genericName) { %>GenericName=<%= genericName %><% } %>
 <% if (description) { %>Comment=<%= description %><% } %>
 Icon=<%= name %>
-<% if (name) { %>Exec=<%= name %> %U<% } %>
+<% if (name) { %>Exec=<%= name %> --no-sandbox %U<% } %><%/*HACK: --no-sandbox fixes an Electron 6 bug. See: #1703*/%>
 Terminal=false
 Actions=CreateNewTorrent;OpenTorrentFile;OpenTorrentAddress;
 <% if (mimeType && mimeType.length) { %>MimeType=<%= mimeType.join(';') %>;<% } %>
 <% if (categories && categories.length) { %>Categories=<%= categories.join(';') %>;<% } %>
 StartupNotify=true
-<% if (name) { %>StartupWMClass=<%= name %> <% } %>
+StartupWMClass=<%= productName %>
 
 [Desktop Action CreateNewTorrent]
 Name=Create New Torrent...
-<% if (name) { %>Exec=<%= name %> -n <% } %>
+<% if (name) { %>Exec=<%= name %> --no-sandbox -n <% } %><%/*HACK: --no-sandbox fixes an Electron 6 bug. See: #1703*/%>
 
 [Desktop Action OpenTorrentFile]
 Name=Open Torrent File...
-<% if (name) { %>Exec=<%= name %> -o <% } %>
+<% if (name) { %>Exec=<%= name %> --no-sandbox -o <% } %><%/*HACK: --no-sandbox fixes an Electron 6 bug. See: #1703*/%>
 
 [Desktop Action OpenTorrentAddress]
 Name=Open Torrent Address...
-<% if (name) { %>Exec=<%= name %> -u <% } %>
+<% if (name) { %>Exec=<%= name %> --no-sandbox -u <% } %><%/*HACK: --no-sandbox fixes an Electron 6 bug. See: #1703*/%>

static/main.css

@@ -322,6 +322,10 @@ textarea,
  * TORRENT LIST
  */
 
+.torrent-list {
+  height: 100%;
+}
+
 .torrent {
   background: linear-gradient(to bottom right, #4B79A1, #283E51);
   background-repeat: no-repeat;
@@ -558,6 +562,13 @@ body.drag .app::after {
   width: 100%;
 }
 
+.player .name {
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 1.5em;
+  margin-bottom: 6px;
+}
+
 /*
  * PLAYER CONTROLS
  */
@@ -623,6 +634,11 @@ body.drag .app::after {
   margin-top: 6px;
 }
 
+.player .controls .icon.multi-audio {
+  font-size: 26px;
+  margin-top: 6px;
+}
+
 .player .controls .icon.fullscreen {
   font-size: 26px;
   margin-right: 15px;

static/main.html

@@ -8,6 +8,6 @@
   </head>
   <body>
     <div id='body'></div>
-    <script>require('../build/renderer/main.js')</script>
+    <script type="module" src="../build/renderer/main.js"></script>
   </body>
 </html>