VLC support

Fixes #404

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+**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?**

CHANGELOG.md

@@ -1,17 +1,163 @@
-# WebTorrent.app Version History
+# WebTorrent Desktop Version History
 
-## v0.0.1
+## UNRELEASED
+
+### Added
+### Changed
+
+- Use Squirrel.Windows 1.3.0
+  - Fix installing when the app is already installed
+  - Don't kill unrelated processes on uninstall
+
+### Fixed
+
+## v0.3.3 - 2016-04-07
+
+### Fixed
+
+- App icon was incorrect (OS X)
+
+## v0.3.2 - 2016-04-07
+
+### Added
+
+- Register WebTorrent as default handler for magnet links (OS X)
+
+### Changed
+
+- Faster startup time (50ms)
+- Update Electron to 0.37.5
+  - Remove the white flash when loading pages and resizing the window
+  - Fix crash when sending IPC messages
+
+### Fixed
+
+- Fix installation bugs with .deb file (Linux)
+- Pause audio reliably when closing the window
+- Enforce minimimum window size when resizing player (for audio-only .mov files, which are 0x0)
+
+## v0.3.1 - 2016-04-06
+
+### Added
+
+- Add crash reporter to torrent engine process
+
+### Fixed
+
+- Fix cast screen background: cover, don't tile
+
+## v0.3.0 - 2016-04-06
+
+### Added
+
+- **Ubuntu/Debian support!** (.deb installer)
+- **DLNA streaming support**
+- Add "File > Quit" menu item (Linux)
+- App uninstaller (Windows)
+- Crash reporting
+
+### Changed
+
+- On startup, do not re-verify files when timestamps are unchanged
+- Moved torrent engine to an independent process, for better UI performance
+- Removed media queries (UI resizing based on window width)
+- Improved Chromecast icon, when connected
+
+### Fixed
+
+- "Download Complete" notification shows consistently
+- Create new torrents and seed them without copying to temporary folder
+- Clicking the "Download Complete" notification will always activate app
+- Fixed harmless "-psn_###" error on first app startup
+- Hide play buttons on unplayable torrents
+- Better error handling when Chromecast/Airplay cannot connect
+- Show player controls immediately on mouse move
+- When creating a torrent, show it in UI immediately
+- Stop casting to TV when player is closed
+- Torrent engine: Fixed memory leaks in `torrent-discovery` and `bittorrent-tracker`
+- Torrent engine: Fixed sub-optimal tcp/webrtc connection timeouts
+- Torrent engine: Throttle web seed connections to maximum of 4
+
+Thanks to @dcposch, @grunjol, and @feross for contributing to this release.
+
+## v0.2.0 - 2016-03-29
+
+### Added
+
+- Minimise to tray (Windows, Linux)
+- Show spinner and download speed when player is stalled waiting for data
+- Highlight window on drag-and-drop
+- Show notification to update to new app version (Linux)
+  - We have an auto-updater for Windows and Mac. We don't have one for Linux yet, so
+    Linux users need to download new versions manually.
+
+### Changed
+
+- Renamed WebTorrent.app to WebTorrent Desktop
+- Add Cosmos Laundromat as a default torrent
+
+### Fixed
+
+- Only capture media keys when player is active
+- Update WebTorrent to 0.88.1 for performance improvements
+  - When seeding, do not proactively connect to new peers
+  - When seeding, do not accept new peers from peer exchange (ut_pex)
+  - Fixed leaks, and other improvements that result in less garbage collection
+
+Thanks to @dcposch, @ungoldman, and @feross for contributing to this release.
+
+## v0.1.1 - 2016-03-28
+
+- Performance improvements
+  - Improve app startup time by over 100%
+  - Reduce the number of DOM updates substantially
+  - Update UI immediately anytime state is changed, instead on 1 second interval
+- Added right-click menu
+  - Save .torrent File
+  - Copy Instant.io Link to Clipboard
+  - Copy Magnet Link to Clipbaord
+- Added keyboard shortcut for volume up (⌘/Ctrl + ↑) and volume down (⌘/Ctrl + ↓)
+- Add desktop launcher shortcuts, like OS X has, for KDE and GNOME (Linux)
+- Add "About" window (Windows, Linux)
+- Better default window size that fits all the default torrents
+- Fixed
+  - Crash when ".local/share/{applications,icons}" path did not exist (Linux)
+  - WebTorrent executable can be moved without breaking torrents in the client
+  - Video progress bar shows progress for current file, not full torrent
+  - Video player window shows file title instead of torrent title
+
+Thanks to @dcposch, @ungoldman, @rom1504, @grunjol, @Flet, and @feross for contributing to
+this release.
+
+## v0.1.0 - 2016-03-25
+
+- **Windows support!**
+  - Includes auto-updater, just like the OS X version.
+  - Installs desktop and start menu shortcuts.
+- **Audio file support!**
+  - Supports playback of .mp3, .aac, .ogg, .wav
+  - Audio file metadata gets shown in the UI
+- Top menu is no longer automatically hidden (Windows)
+- When magnet links are opened from third-party apps, the WebTorrent window now gets focus.
+- Subtler app sounds.
+- Fix for an issue that caused some magnet links to fail to open.
+
+**NOTE:** OS X users must install v0.1.0 manually because the app bundle ID was changed in this release, and the auto-updater cannot handle this condition.
+
+Thanks to @dcposch, @ungoldman, and @feross for contributing to this release.
+
+## v0.0.1 - 2016-03-21
 
 - Wait 10 seconds (instead of 60 seconds) after app launch before checking for updates.
 
-## v0.0.0
+## v0.0.0 - 2016-03-21
 
-The first official release of WebTorrent.app, the streaming torrent client for OS X,
+The first official release of WebTorrent Desktop, the streaming torrent client for OS X,
 Windows, and Linux. For now, we're only releasing binaries for OS X.
 
-WebTorrent.app is in ALPHA and under very active development – expect lots more polish in
+WebTorrent Desktop is in ALPHA and under very active development – expect lots more polish in
 the coming weeks! If you know JavaScript and want to help us out, there's
-[lots to do](https://github.com/feross/webtorrent-app/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)!
+[lots to do](https://github.com/feross/webtorrent-desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)!
 
 ### Features
 

CONTRIBUTING.md

@@ -4,44 +4,72 @@ Contributions welcome!
 
 **Before spending lots of time on something, ask for feedback on your idea first!**
 
-Please search issues and pull requests before adding something new to avoid duplicating efforts and conversations.
+Please search issues and pull requests before adding something new to avoid duplicating
+efforts and conversations.
 
-This project welcomes non-code contributions, too! The following types of contributions are welcome:
+This project welcomes non-code contributions, too! The following types of contributions
+are welcome:
 
 - **Ideas**: participate in an issue thread or start your own to have your voice heard.
-- **Writing**: contribute your expertise in an area by helping expand the included content.
+- **Writing**: contribute your expertise in an area by helping expand the included docs.
-- **Copy editing**: fix typos, clarify language, and generally improve the quality of the content.
+- **Copy editing**: fix typos, clarify language, and improve the quality of the docs.
-- **Formatting**: help keep content easy to read with consistent formatting.
+- **Formatting**: help keep docs easy to read with consistent formatting.
 
 ## Code Style
 
 [![standard][standard-image]][standard-url]
 
-This repository uses [`standard`][standard-url] to maintain code style and consistency, and to avoid style arguments. `npm test` runs `standard` automatically, so you don't have to!
+This repository uses [`standard`][standard-url] to maintain code style and consistency,
+and to avoid style arguments. `npm test` runs `standard` automatically, so you don't have
+to!
 
 [standard-image]: https://cdn.rawgit.com/feross/standard/master/badge.svg
 [standard-url]: https://github.com/feross/standard
 
-# Project Governance
+## Project Governance
 
-**This is an [OPEN Open Source Project](http://openopensource.org/).**
+Individuals making significant and valuable contributions are given commit-access to the
+project to contribute as they see fit. This project is more like an open wiki than a
+standard guarded open source project.
 
-Individuals making significant and valuable contributions are given commit-access to the project to contribute as they see fit. This project is more like an open wiki than a standard guarded open source project.
+### Rules
-
-## Rules
 
 There are a few basic ground-rules for contributors:
 
 1. **No `--force` pushes** or modifying the Git history in any way.
-1. **Non-master branches** ought to be used for ongoing work.
+2. **Non-master branches** should be used for ongoing work.
-1. **External API changes and significant modifications** ought to be subject to an **internal pull-request** to solicit feedback from other contributors.
+3. **Significant modifications** like API changes should be subject to a **pull request**
-1. Internal pull-requests to solicit feedback are *encouraged* for any other non-trivial contribution but left to the discretion of the contributor.
+   to solicit feedback from other contributors.
-1. Contributors should attempt to adhere to the prevailing code style.
+4. **Pull requests** are *encouraged* for all contributions to solicit feedback, but left to
+   the discretion of the contributor.
 
-## Releases
+### Releases
 
 Declaring formal releases remains the prerogative of the project maintainer.
 
-## Changes to this arrangement
+### Changes to this arrangement
 
-This is an experiment and feedback is welcome! This document may also be subject to pull-requests or changes by contributors where you believe you have something valuable to add or change.
+This is an experiment and feedback is welcome! This document may also be subject to pull-
+requests or changes by contributors where you believe you have something valuable to add
+or change.
+
+## Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+- (a) The contribution was created in whole or in part by me and I have the right to
+  submit it under the open source license indicated in the file; or
+
+- (b) The contribution is based upon previous work that, to the best of my knowledge, is
+  covered under an appropriate open source license and I have the right under that license
+  to submit that work with modifications, whether created in whole or in part by me, under
+  the same open source license (unless I am permitted to submit under a different
+  license), as indicated in the file; or
+
+- (c) The contribution was provided directly to me by some other person who certified
+  (a), (b) or (c) and I have not modified it.
+
+- (d) I understand and agree that this project and the contribution are public and that a
+  record of the contribution (including all personal information I submit with it,
+  including my sign-off) is maintained indefinitely and may be redistributed consistent
+  with this project or the open source license(s) involved.

README.md

@@ -2,7 +2,7 @@
   <br>
   <a href="https://webtorrent.io"><img src="https://webtorrent.io/img/WebTorrent.png" alt="WebTorrent" width="200"></a>
   <br>
-  WebTorrent.app
+  WebTorrent Desktop
   <br>
   <br>
 </h1>
@@ -10,24 +10,19 @@
 <h4 align="center">The streaming torrent client. For OS X, Windows, and Linux.</h4>
 
 <p align="center">
-    <a href="https://gitter.im/feross/webtorrent">
+  <a href="https://gitter.im/feross/webtorrent"><img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg" alt="Gitter"></a>
-        <img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg"
+  <a href="https://travis-ci.org/feross/webtorrent-desktop"><img src="https://img.shields.io/travis/feross/webtorrent-desktop/master.svg" alt="Travis"></a>
-             alt="Gitter">
+  <a href="https://github.com/feross/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/feross/webtorrent-desktop.svg" alt="Release"></a>
-    </a>
-    <a href="https://travis-ci.org/feross/webtorrent-app">
-        <img src="https://img.shields.io/travis/feross/webtorrent-app/master.svg"
-             alt="Travis Build">
-    </a>
 </p>
 
 ## Install
 
-**WebTorrent.app** is still under very active development. Expect a release very soon!
+**WebTorrent Desktop** is still under very active development. You can download the latest version from the [releases](https://github.com/feross/webtorrent-desktop/releases) page.
 
 ## Screenshot
 
 <p align="center">
-  <img src="./static/screenshot.png" width="562" height="630" alt="screenshot" align="center">
+  <img src="https://webtorrent.io/img/screenshot-main.png" width="562" height="630" alt="screenshot" align="center">
 </p>
 
 ## How to Contribute
@@ -58,10 +53,33 @@ To build for one platform:
 $ npm run package -- [platform]
 ```
 
-Where `[platform]` is `--darwin`, `--linux`, or `--win32`.
+Where `[platform]` is `darwin`, `linux`, `win32`, or `all` (default).
 
-To package a Windows app from non-Windows platforms, [Wine](https://www.winehq.org/) needs
+The following optional arguments are available:
-to be installed. On OS X, it is installable via [Homebrew](http://brew.sh/).
+
+- `--sign` - Sign the application (OS X, Windows)
+- `--package=[type]` - Package single output type.
+   - `deb` - Debian package
+   - `zip` - Linux zip file
+   - `dmg` - OS X disk image
+   - `exe` - Windows installer
+   - `portable` - Windows portable app
+   - `all` - All platforms (default)
+
+Note: Even with the `--package` option, the auto-update files (.nupkg for Windows, *-darwin.zip for OS X) will always be produced.
+
+#### Windows build notes
+
+To package the Windows app from non-Windows platforms, [Wine](https://www.winehq.org/) needs
+to be installed.
+
+On OS X, first install [XQuartz](http://www.xquartz.org/), then run:
+
+```
+brew install wine
+```
+
+(Requires the [Homebrew](http://brew.sh/) package manager.)
 
 ### Code Style
 
@@ -70,4 +88,3 @@ to be installed. On OS X, it is installable via [Homebrew](http://brew.sh/).
 ## License
 
 MIT. Copyright (c) [Feross Aboukhadijeh](http://feross.org).
-

bin/clean.js

@@ -1,17 +1,22 @@
 #!/usr/bin/env node
 
 /**
- * Remove all traces of WebTorrent.app from the system (config and temp files).
+ * Remove all traces of WebTorrent Desktop from the system (config and temp files).
  * Useful for developers.
  */
 
-var config = require('../config')
 var os = require('os')
 var path = require('path')
 var pathExists = require('path-exists')
 var rimraf = require('rimraf')
 
+var config = require('../config')
+var handlers = require('../main/handlers')
+
 rimraf.sync(config.CONFIG_PATH)
 
 var tmpPath = path.join(pathExists.sync('/tmp') ? '/tmp' : os.tmpDir(), 'webtorrent')
 rimraf.sync(tmpPath)
+
+// Uninstall .torrent file and magnet link handlers
+handlers.uninstall()

bin/cmd.js

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+
+var electron = require('electron-prebuilt')
+var cp = require('child_process')
+var path = require('path')
+
+var child = cp.spawn(electron, [path.join(__dirname, '..')], {stdio: 'inherit'})
+child.on('close', function (code) {
+  process.exit(code)
+})

bin/package.js

@@ -4,28 +4,59 @@
  * Builds app binaries for OS X, Linux, and Windows.
  */
 
-var config = require('../config')
 var cp = require('child_process')
 var electronPackager = require('electron-packager')
 var fs = require('fs')
+var minimist = require('minimist')
+var mkdirp = require('mkdirp')
 var path = require('path')
+var rimraf = require('rimraf')
+var series = require('run-series')
+var zip = require('cross-zip')
+
+var config = require('../config')
 var pkg = require('../package.json')
 
 var BUILD_NAME = config.APP_NAME + '-v' + config.APP_VERSION
 
+/*
+ * Path to folder with the following files:
+ *   - Windows Authenticode private key and cert (authenticode.p12)
+ *   - Windows Authenticode password file (authenticode.txt)
+ */
+var CERT_PATH = process.platform === 'win32'
+  ? 'D:'
+  : '/Volumes/Certs'
+
+var DIST_PATH = path.join(config.ROOT_PATH, 'dist')
+
+var argv = minimist(process.argv.slice(2), {
+  boolean: [
+    'sign'
+  ],
+  default: {
+    package: 'all',
+    sign: false
+  },
+  string: [
+    'package'
+  ]
+})
+
 function build () {
-  var platform = process.argv[2]
+  rimraf.sync(DIST_PATH)
-  if (platform === '--darwin') {
+  var platform = argv._[0]
+  if (platform === 'darwin') {
     buildDarwin(printDone)
-  } else if (platform === '--win32') {
+  } else if (platform === 'win32') {
     buildWin32(printDone)
-  } else if (platform === '--linux') {
+  } else if (platform === 'linux') {
     buildLinux(printDone)
   } else {
-    buildDarwin(function (err, buildPath) {
+    buildDarwin(function (err) {
-      printDone(err, buildPath)
+      printDone(err)
-      buildWin32(function (err, buildPath) {
+      buildWin32(function (err) {
-        printDone(err, buildPath)
+        printDone(err)
         buildLinux(printDone)
       })
     })
@@ -36,8 +67,9 @@ var all = {
   // Build 64 bit binaries only.
   arch: 'x64',
 
-  // The application source directory.
+  // The human-readable copyright line for the app. Maps to the `LegalCopyright` metadata
-  dir: config.ROOT_PATH,
+  // property on Windows, and `NSHumanReadableCopyright` on OS X.
+  'app-copyright': config.APP_COPYRIGHT,
 
   // The release version of the application. Maps to the `ProductVersion` metadata
   // property on Windows, and `CFBundleShortVersionString` on OS X.
@@ -57,15 +89,18 @@ var all = {
   // Windows requires the build version to start with a number :/ so we stick on a prefix
   'build-version': '0-' + cp.execSync('git rev-parse --short HEAD').toString().replace('\n', ''),
 
+  // The application source directory.
+  dir: config.ROOT_PATH,
+
   // Pattern which specifies which files to ignore when copying files to create the
   // package(s).
-  ignore: /^\/dist|\/(appveyor.yml|AUTHORS|CONTRIBUTORS|bench|benchmark|benchmark\.js|bin|bower\.json|component\.json|coverage|doc|docs|docs\.mli|dragdrop\.min\.js|example|examples|example\.html|example\.js|externs|ipaddr\.min\.js|Makefile|min|minimist|perf|rusha|simplepeer\.min\.js|simplewebsocket\.min\.js|static\/screenshot\.png|test|tests|test\.js|tests\.js|webtorrent\.min\.js|\.[^\/]*|.*\.md|.*\.markdown)$/,
+  ignore: /^\/dist|\/(appveyor.yml|\.appveyor.yml|\.github|appdmg|AUTHORS|CONTRIBUTORS|bench|benchmark|benchmark\.js|bin|bower\.json|component\.json|coverage|doc|docs|docs\.mli|dragdrop\.min\.js|example|examples|example\.html|example\.js|externs|ipaddr\.min\.js|Makefile|min|minimist|perf|rusha|simplepeer\.min\.js|simplewebsocket\.min\.js|static\/screenshot\.png|test|tests|test\.js|tests\.js|webtorrent\.min\.js|\.[^\/]*|.*\.md|.*\.markdown)$/,
 
   // The application name.
   name: config.APP_NAME,
 
   // The base directory where the finished package(s) are created.
-  out: path.join(config.ROOT_PATH, 'dist'),
+  out: DIST_PATH,
 
   // Replace an already existing output directory.
   overwrite: true,
@@ -75,21 +110,21 @@ var all = {
   prune: true,
 
   // The Electron version with which the app is built (without the leading 'v')
-  version: pkg.devDependencies['electron-prebuilt']
+  version: pkg.dependencies['electron-prebuilt']
 }
 
 var darwin = {
   platform: 'darwin',
 
   // The bundle identifier to use in the application's plist (OS X only).
-  'app-bundle-id': 'io.webtorrent.app',
+  'app-bundle-id': 'io.webtorrent.webtorrent',
 
   // The application category type, as shown in the Finder via "View" -> "Arrange by
   // Application Category" when viewing the Applications directory (OS X only).
   'app-category-type': 'public.app-category.utilities',
 
   // The bundle identifier to use in the application helper's plist (OS X only).
-  'helper-bundle-id': 'io.webtorrent.app.helper',
+  'helper-bundle-id': 'io.webtorrent.webtorrent-helper',
 
   // Application icon.
   icon: config.APP_ICON + '.icns'
@@ -104,16 +139,13 @@ var win32 = {
     // Company that produced the file.
     CompanyName: config.APP_NAME,
 
-    // Copyright notices that apply to the file.
-    LegalCopyright: config.APP_COPYRIGHT,
-
     // Name of the program, displayed to users
     FileDescription: config.APP_NAME,
 
     // Original name of the file, not including a path. This information enables an
     // application to determine whether a file has been renamed by a user. The format of
     // the name depends on the file system for which the file was created.
-    OriginalFilename: 'WebTorrent.exe',
+    OriginalFilename: config.APP_NAME + '.exe',
 
     // Name of the product with which the file is distributed.
     ProductName: config.APP_NAME,
@@ -129,7 +161,10 @@ var win32 = {
 }
 
 var linux = {
-  platform: 'linux'
+  platform: 'linux',
+
+  // Build 32/64 bit binaries.
+  arch: 'all'
 
   // Note: Application icon for Linux is specified via the BrowserWindow `icon` option.
 }
@@ -137,12 +172,12 @@ var linux = {
 build()
 
 function buildDarwin (cb) {
-  var appDmg = require('appdmg')
   var plist = require('plist')
-  var sign = require('electron-osx-sign')
 
+  console.log('OS X: Packaging electron...')
   electronPackager(Object.assign({}, all, darwin), function (err, buildPath) {
     if (err) return cb(err)
+    console.log('OS X: Packaged electron. ' + buildPath[0])
 
     var appPath = path.join(buildPath[0], config.APP_NAME + '.app')
     var contentsPath = path.join(appPath, 'Contents')
@@ -150,6 +185,8 @@ function buildDarwin (cb) {
     var infoPlistPath = path.join(contentsPath, 'Info.plist')
     var infoPlist = plist.parse(fs.readFileSync(infoPlistPath, 'utf8'))
 
+    // TODO: Use new `extend-info` and `extra-resource` opts to electron-packager,
+    // available as of v6.
     infoPlist.CFBundleDocumentTypes = [
       {
         CFBundleTypeExtensions: [ 'torrent' ],
@@ -177,16 +214,30 @@ function buildDarwin (cb) {
       }
     ]
 
-    infoPlist.NSHumanReadableCopyright = config.APP_COPYRIGHT
-
     fs.writeFileSync(infoPlistPath, plist.build(infoPlist))
 
     // Copy torrent file icon into app bundle
     cp.execSync(`cp ${config.APP_FILE_ICON + '.icns'} ${resourcesPath}`)
 
     if (process.platform === 'darwin') {
+      if (argv.sign) {
+        signApp(function (err) {
+          if (err) return cb(err)
+          pack(cb)
+        })
+      } else {
+        printWarning()
+        pack(cb)
+      }
+    } else {
+      printWarning()
+    }
+
+    function signApp (cb) {
+      var sign = require('electron-osx-sign')
+
       /*
-       * Sign the app with Apple Developer ID certificate. We sign the app for 2 reasons:
+       * Sign the app with Apple Developer ID certificates. We sign the app for 2 reasons:
        *   - So the auto-updater (Squirrrel.Mac) can check that app updates are signed by
        *     the same author as the current version.
        *   - So users will not a see a warning about the app coming from an "Unidentified
@@ -204,57 +255,221 @@ function buildDarwin (cb) {
         verbose: true
       }
 
+      console.log('OS X: Signing app...')
       sign(signOpts, function (err) {
         if (err) return cb(err)
+        console.log('OS X: Signed app.')
+        cb(null)
+      })
+    }
 
-        // Create .zip file (used by the auto-updater)
+    function pack (cb) {
-        var zipPath = path.join(buildPath[0], BUILD_NAME + '.zip')
+      packageZip() // always produce .zip file, used for automatic updates
-        cp.execSync(`zip -r -y ${zipPath} ${appPath}`)
 
-        // Create a .dmg (OS X disk image) file, for easy user installation.
+      if (argv.package === 'dmg' || argv.package === 'all') {
-        var dmgOpts = {
+        packageDmg(cb)
-          basepath: config.ROOT_PATH,
+      }
-          target: path.join(buildPath[0], BUILD_NAME + '.dmg'),
+    }
-          specification: {
+
-            title: config.APP_NAME,
+    function packageZip () {
-            icon: config.APP_ICON + '.icns',
+      // Create .zip file (used by the auto-updater)
-            background: path.join(config.STATIC_PATH, 'appdmg.png'),
+      console.log('OS X: Creating zip...')
-            'icon-size': 128,
+
-            contents: [
+      var inPath = path.join(buildPath[0], config.APP_NAME + '.app')
-              { x: 122, y: 240, type: 'file', path: appPath },
+      var outPath = path.join(DIST_PATH, BUILD_NAME + '-darwin.zip')
-              { x: 380, y: 240, type: 'link', path: '/Applications' },
+      zip(inPath, outPath)
-              // Hide hidden icons out of view, for users who have hidden files shown.
+
-              // https://github.com/LinusU/node-appdmg/issues/45#issuecomment-153924954
+      console.log('OS X: Created zip.')
-              { x: 50, y: 500, type: 'position', path: '.background' },
+    }
-              { x: 100, y: 500, type: 'position', path: '.DS_Store' },
+
-              { x: 150, y: 500, type: 'position', path: '.Trashes' },
+    function packageDmg (cb) {
-              { x: 200, y: 500, type: 'position', path: '.VolumeIcon.icns' }
+      console.log('OS X: Creating dmg...')
-            ]
+
-          }
+      var appDmg = require('appdmg')
+
+      var targetPath = path.join(DIST_PATH, BUILD_NAME + '.dmg')
+      rimraf.sync(targetPath)
+
+      // Create a .dmg (OS X disk image) file, for easy user installation.
+      var dmgOpts = {
+        basepath: config.ROOT_PATH,
+        target: targetPath,
+        specification: {
+          title: config.APP_NAME,
+          icon: config.APP_ICON + '.icns',
+          background: path.join(config.STATIC_PATH, 'appdmg.png'),
+          'icon-size': 128,
+          contents: [
+            { x: 122, y: 240, type: 'file', path: appPath },
+            { x: 380, y: 240, type: 'link', path: '/Applications' },
+            // Hide hidden icons out of view, for users who have hidden files shown.
+            // https://github.com/LinusU/node-appdmg/issues/45#issuecomment-153924954
+            { x: 50, y: 500, type: 'position', path: '.background' },
+            { x: 100, y: 500, type: 'position', path: '.DS_Store' },
+            { x: 150, y: 500, type: 'position', path: '.Trashes' },
+            { x: 200, y: 500, type: 'position', path: '.VolumeIcon.icns' }
+          ]
         }
+      }
 
-        var dmg = appDmg(dmgOpts)
+      var dmg = appDmg(dmgOpts)
-        dmg.on('error', cb)
+      dmg.on('error', cb)
-        dmg.on('progress', function (info) {
+      dmg.on('progress', function (info) {
-          if (info.type === 'step-begin') console.log(info.title + '...')
+        if (info.type === 'step-begin') console.log(info.title + '...')
-        })
+      })
-        dmg.on('finish', function (info) {
+      dmg.on('finish', function (info) {
-          cb(null, buildPath)
+        console.log('OS X: Created dmg.')
-        })
+        cb(null)
       })
     }
   })
 }
 
 function buildWin32 (cb) {
-  electronPackager(Object.assign({}, all, win32), cb)
+  var installer = require('electron-winstaller')
+
+  console.log('Windows: Packaging electron...')
+  electronPackager(Object.assign({}, all, win32), function (err, buildPath) {
+    if (err) return cb(err)
+    console.log('Windows: Packaged electron. ' + buildPath[0])
+
+    var signWithParams
+    if (process.platform === 'win32') {
+      if (argv.sign) {
+        var certificateFile = path.join(CERT_PATH, 'authenticode.p12')
+        var certificatePassword = fs.readFileSync(path.join(CERT_PATH, 'authenticode.txt'), 'utf8')
+        var timestampServer = 'http://timestamp.comodoca.com'
+        signWithParams = `/a /f "${certificateFile}" /p "${certificatePassword}" /tr "${timestampServer}" /td sha256`
+      } else {
+        printWarning()
+      }
+    } else {
+      printWarning()
+    }
+
+    var tasks = []
+    if (argv.package === 'exe' || argv.package === 'all') {
+      tasks.push((cb) => packageInstaller(cb))
+    }
+    if (argv.package === 'portable' || argv.package === 'all') {
+      tasks.push((cb) => packagePortable(cb))
+    }
+    series(tasks, cb)
+
+    function packageInstaller (cb) {
+      console.log('Windows: Creating installer...')
+      installer.createWindowsInstaller({
+        appDirectory: buildPath[0],
+        authors: config.APP_TEAM,
+        description: config.APP_NAME,
+        exe: config.APP_NAME + '.exe',
+        iconUrl: config.GITHUB_URL_RAW + '/static/' + config.APP_NAME + '.ico',
+        loadingGif: path.join(config.STATIC_PATH, 'loading.gif'),
+        name: config.APP_NAME,
+        noMsi: true,
+        outputDirectory: DIST_PATH,
+        productName: config.APP_NAME,
+        remoteReleases: config.GITHUB_URL,
+        setupExe: config.APP_NAME + 'Setup-v' + config.APP_VERSION + '.exe',
+        setupIcon: config.APP_ICON + '.ico',
+        signWithParams: signWithParams,
+        title: config.APP_NAME,
+        usePackageJson: false,
+        version: pkg.version
+      }).then(function () {
+        console.log('Windows: Created installer.')
+        cb(null)
+      }).catch(cb)
+    }
+
+    function packagePortable (cb) {
+      // Create Windows portable app
+      console.log('Windows: Creating portable app...')
+
+      var portablePath = path.join(buildPath[0], 'Portable Settings')
+      mkdirp.sync(portablePath)
+
+      var inPath = path.join(DIST_PATH, path.basename(buildPath[0]))
+      var outPath = path.join(DIST_PATH, BUILD_NAME + '-win.zip')
+      zip(inPath, outPath)
+
+      console.log('Windows: Created portable app.')
+      cb(null)
+    }
+  })
 }
 
 function buildLinux (cb) {
-  electronPackager(Object.assign({}, all, linux), cb)
+  console.log('Linux: Packaging electron...')
+  electronPackager(Object.assign({}, all, linux), function (err, buildPath) {
+    if (err) return cb(err)
+    console.log('Linux: Packaged electron. ' + buildPath[0])
+
+    var tasks = []
+    buildPath.forEach(function (filesPath) {
+      var destArch = filesPath.split('-').pop()
+
+      if (argv.package === 'deb' || argv.package === 'all') {
+        tasks.push((cb) => packageDeb(filesPath, destArch, cb))
+      }
+      if (argv.package === 'zip' || argv.package === 'all') {
+        tasks.push((cb) => packageZip(filesPath, destArch, cb))
+      }
+    })
+    series(tasks, cb)
+  })
+
+  function packageDeb (filesPath, destArch, cb) {
+    // Create .deb file for Debian-based platforms
+    console.log(`Linux: Creating ${destArch} deb...`)
+
+    var deb = require('nobin-debian-installer')()
+    var destPath = path.join('/opt', pkg.name)
+
+    deb.pack({
+      package: pkg,
+      info: {
+        arch: destArch === 'x64' ? 'amd64' : 'i386',
+        targetDir: DIST_PATH,
+        depends: 'libc6 (>= 2.4)',
+        scripts: {
+          postinst: path.join(config.STATIC_PATH, 'linux', 'postinst'),
+          prerm: path.join(config.STATIC_PATH, 'linux', 'prerm')
+        }
+      }
+    }, [{
+      src: ['./**'],
+      dest: destPath,
+      expand: true,
+      cwd: filesPath
+    }], function (err) {
+      if (err) return cb(err)
+      console.log(`Linux: Created ${destArch} deb.`)
+      cb(null)
+    })
+  }
+
+  function packageZip (filesPath, destArch, cb) {
+    // Create .zip file for Linux
+    console.log(`Linux: Creating ${destArch} zip...`)
+
+    var inPath = path.join(DIST_PATH, path.basename(filesPath))
+    var outPath = path.join(DIST_PATH, BUILD_NAME + '-linux-' + destArch + '.zip')
+    zip(inPath, outPath)
+
+    console.log(`Linux: Created ${destArch} zip.`)
+    cb(null)
+  }
 }
 
-function printDone (err, buildPath) {
+function printDone (err) {
   if (err) console.error(err.message || err)
-  else console.log('Built ' + buildPath[0])
+}
+
+/*
+ * Print a large warning when signing is disabled so we are less likely to accidentally
+ * ship unsigned binaries to users.
+ */
+function printWarning () {
+  console.log(fs.readFileSync(path.join(__dirname, 'warning.txt'), 'utf8'))
 }

bin/release-_post.sh

@@ -2,7 +2,8 @@
 set -e
 
 git diff --exit-code
-npm run package
+npm run package -- --sign
 git push
 git push --tags
+npm publish
 gh-release

bin/release-_pre.sh

@@ -6,4 +6,6 @@ npm run update-authors
 git diff --exit-code
 rm -rf node_modules/
 npm install
+npm prune
+npm dedupe
 npm test

bin/warning.txt

@@ -0,0 +1,12 @@
+
+*********************************************************
+       _    _  ___  ______ _   _ _____ _   _ _____
+      | |  | |/ _ \ | ___ \ \ | |_   _| \ | |  __ \
+      | |  | / /_\ \| |_/ /  \| | | | |  \| | |  \/
+      | |/\| |  _  ||    /| . ` | | | | . ` | | __
+      \  /\  / | | || |\ \| |\  |_| |_| |\  | |_\ \
+       \/  \/\_| |_/\_| \_\_| \_/\___/\_| \_/\____/
+
+  Application is NOT signed. Do not ship this to users!
+
+*********************************************************

config.js

@@ -1,38 +1,59 @@
-var applicationConfigPath = require('application-config-path')
+var appConfig = require('application-config')('WebTorrent')
 var path = require('path')
+var pathExists = require('path-exists')
 
 var APP_NAME = 'WebTorrent'
+var APP_TEAM = 'The WebTorrent Project'
 var APP_VERSION = require('./package.json').version
 
+var PORTABLE_PATH = path.join(path.dirname(process.execPath), 'Portable Settings')
+
 module.exports = {
-  APP_COPYRIGHT: 'Copyright © 2014-2016 The WebTorrent Project',
+  APP_COPYRIGHT: 'Copyright © 2014-2016 ' + 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 + ' (BETA)',
 
-  AUTO_UPDATE_URL: 'https://webtorrent.io/app/update?version=' + APP_VERSION,
+  AUTO_UPDATE_CHECK_STARTUP_DELAY: 5 * 1000 /* 5 seconds */,
-  AUTO_UPDATE_CHECK_STARTUP_DELAY: 10 * 1000 /* 10 seconds */,
+  AUTO_UPDATE_URL: 'https://webtorrent.io/desktop/update' +
+    '?version=' + APP_VERSION + '&platform=' + process.platform,
 
-  CONFIG_PATH: applicationConfigPath(APP_NAME),
+  CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
-  CONFIG_POSTER_PATH: path.join(applicationConfigPath(APP_NAME), 'Posters'),
-  CONFIG_TORRENT_PATH: path.join(applicationConfigPath(APP_NAME), 'Torrents'),
 
-  INDEX: 'file://' + path.join(__dirname, 'renderer', 'index.html'),
+  CONFIG_PATH: getConfigPath(),
+  CONFIG_POSTER_PATH: path.join(getConfigPath(), 'Posters'),
+  CONFIG_TORRENT_PATH: path.join(getConfigPath(), 'Torrents'),
 
+  GITHUB_URL: 'https://github.com/feross/webtorrent-desktop',
+  GITHUB_URL_RAW: 'https://raw.githubusercontent.com/feross/webtorrent-desktop/master',
+
+  IS_PORTABLE: isPortable(),
   IS_PRODUCTION: isProduction(),
 
   ROOT_PATH: __dirname,
   STATIC_PATH: path.join(__dirname, 'static'),
 
-  SOUND_ADD: 'file://' + path.join(__dirname, 'static', 'sound', 'add.wav'),
+  WINDOW_ABOUT: 'file://' + path.join(__dirname, 'renderer', 'about.html'),
-  SOUND_DELETE: 'file://' + path.join(__dirname, 'static', 'sound', 'delete.wav'),
+  WINDOW_MAIN: 'file://' + path.join(__dirname, 'renderer', 'main.html'),
-  SOUND_DISABLE: 'file://' + path.join(__dirname, 'static', 'sound', 'disable.wav'),
+  WINDOW_WEBTORRENT: 'file://' + path.join(__dirname, 'renderer', 'webtorrent.html'),
-  SOUND_DONE: 'file://' + path.join(__dirname, 'static', 'sound', 'done.wav'),
+
-  SOUND_ENABLE: 'file://' + path.join(__dirname, 'static', 'sound', 'enable.wav'),
+  WINDOW_MIN_HEIGHT: 38 + (120 * 2), // header height + 2 torrents
-  SOUND_ERROR: 'file://' + path.join(__dirname, 'static', 'sound', 'error.wav'),
+  WINDOW_MIN_WIDTH: 425
-  SOUND_PLAY: 'file://' + path.join(__dirname, 'static', 'sound', 'play.wav'),
+}
-  SOUND_STARTUP: 'file://' + path.join(__dirname, 'static', 'sound', 'startup.wav')
+
+function getConfigPath () {
+  if (isPortable()) {
+    return PORTABLE_PATH
+  } else {
+    return path.dirname(appConfig.filePath)
+  }
+}
+
+function isPortable () {
+  return process.platform === 'win32' && isProduction() && pathExists(PORTABLE_PATH)
 }
 
 function isProduction () {

crash-reporter.js

@@ -0,0 +1,15 @@
+module.exports = {
+  init
+}
+
+var config = require('./config')
+var electron = require('electron')
+
+function init () {
+  electron.crashReporter.start({
+    companyName: config.APP_NAME,
+    productName: config.APP_NAME,
+    submitURL: config.CRASH_REPORT_URL
+  })
+  console.log('crash reporter started')
+}

main/auto-updater.js

@@ -3,9 +3,11 @@ module.exports = {
 }
 
 var electron = require('electron')
+var get = require('simple-get')
 
 var config = require('../config')
 var log = require('./log')
+var windows = require('./windows')
 
 var autoUpdater = electron.autoUpdater
 
@@ -20,7 +22,7 @@ function init () {
    * We always check for updates on app startup. To keep app startup fast, we delay this
    * first check so it happens when there is less going on.
    */
-  setTimeout(() => autoUpdater.checkForUpdates(), config.AUTO_UPDATE_CHECK_STARTUP_DELAY)
+  setTimeout(checkForUpdates, config.AUTO_UPDATE_CHECK_STARTUP_DELAY)
 
   autoUpdater.on('checking-for-update', () => log('Checking for app update'))
   autoUpdater.on('update-available', () => log('App update available'))
@@ -29,3 +31,20 @@ function init () {
     log('App update downloaded: ', releaseName, updateURL)
   })
 }
+
+function checkForUpdates () {
+  // Electron's built-in auto updater only supports Mac and Windows, for now
+  if (process.platform !== 'linux') {
+    return autoUpdater.checkForUpdates()
+  }
+
+  // If we're on Linux, we have to do it ourselves
+  get.concat(config.AUTO_UPDATE_URL, function (err, res, data) {
+    if (err) return log('Error checking for app update: ' + err.message)
+    if (![200, 204].includes(res.statusCode)) return log('Error checking for app update, got HTTP ' + res.statusCode)
+    if (res.statusCode !== 200) return
+
+    var obj = JSON.parse(data)
+    windows.main.send('dispatch', 'updateAvailable', obj.version)
+  })
+}

main/handlers.js

@@ -0,0 +1,329 @@
+module.exports = {
+  install,
+  uninstall
+}
+
+var path = require('path')
+
+function install () {
+  if (process.platform === 'darwin') {
+    installDarwin()
+  }
+  if (process.platform === 'win32') {
+    installWin32()
+  }
+  if (process.platform === 'linux') {
+    installLinux()
+  }
+}
+
+function uninstall () {
+  if (process.platform === 'darwin') {
+    uninstallDarwin()
+  }
+  if (process.platform === 'win32') {
+    uninstallWin32()
+  }
+  if (process.platform === 'linux') {
+    uninstallLinux()
+  }
+}
+
+function installDarwin () {
+  var electron = require('electron')
+  var app = electron.app
+
+  // On OS X, only protocols that are listed in Info.plist can be set as the default
+  // handler at runtime.
+  app.setAsDefaultProtocolClient('magnet')
+
+  // File handlers are registered in the Info.plist.
+}
+
+function uninstallDarwin () {}
+
+function installWin32 () {
+  var Registry = require('winreg')
+
+  var log = require('./log')
+
+  var iconPath = path.join(process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico')
+
+  registerProtocolHandlerWin32('magnet', 'URL:BitTorrent Magnet URL', iconPath, process.execPath)
+  registerFileHandlerWin32('.torrent', 'io.webtorrent.torrent', 'BitTorrent Document', iconPath, process.execPath)
+
+  /**
+   * To add a protocol handler, the following keys must be added to the Windows registry:
+   *
+   * HKEY_CLASSES_ROOT
+   *   $PROTOCOL
+   *     (Default) = "$NAME"
+   *     URL Protocol = ""
+   *     DefaultIcon
+   *       (Default) = "$ICON"
+   *     shell
+   *       open
+   *         command
+   *           (Default) = "$COMMAND" "%1"
+   *
+   * Source: https://msdn.microsoft.com/en-us/library/aa767914.aspx
+   *
+   * However, the "HKEY_CLASSES_ROOT" key can only be written by the Administrator user.
+   * So, we instead write to "HKEY_CURRENT_USER\Software\Classes", which is inherited by
+   * "HKEY_CLASSES_ROOT" anyway, and can be written by unprivileged users.
+   */
+
+  function registerProtocolHandlerWin32 (protocol, name, icon, command) {
+    var protocolKey = new Registry({
+      hive: Registry.HKCU, // HKEY_CURRENT_USER
+      key: '\\Software\\Classes\\' + protocol
+    })
+
+    setProtocol()
+
+    function setProtocol (err) {
+      if (err) log.error(err.message)
+      protocolKey.set('', Registry.REG_SZ, name, setURLProtocol)
+    }
+
+    function setURLProtocol (err) {
+      if (err) log.error(err.message)
+      protocolKey.set('URL Protocol', Registry.REG_SZ, '', setIcon)
+    }
+
+    function setIcon (err) {
+      if (err) log.error(err.message)
+
+      var iconKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + protocol + '\\DefaultIcon'
+      })
+      iconKey.set('', Registry.REG_SZ, icon, setCommand)
+    }
+
+    function setCommand (err) {
+      if (err) log.error(err.message)
+
+      var commandKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
+      })
+      commandKey.set('', Registry.REG_SZ, '"' + command + '" "%1"', done)
+    }
+
+    function done (err) {
+      if (err) log.error(err.message)
+    }
+  }
+
+  /**
+   * To add a file handler, the following keys must be added to the Windows registry:
+   *
+   * HKEY_CLASSES_ROOT
+   *   $EXTENSION
+   *     (Default) = "$EXTENSION_ID"
+   *   $EXTENSION_ID
+   *     (Default) = "$NAME"
+   *     DefaultIcon
+   *       (Default) = "$ICON"
+   *     shell
+   *       open
+   *         command
+   *           (Default) = "$COMMAND" "%1"
+   */
+  function registerFileHandlerWin32 (ext, id, name, icon, command) {
+    setExt()
+
+    function setExt () {
+      var extKey = new Registry({
+        hive: Registry.HKCU, // HKEY_CURRENT_USER
+        key: '\\Software\\Classes\\' + ext
+      })
+      extKey.set('', Registry.REG_SZ, id, setId)
+    }
+
+    function setId (err) {
+      if (err) log.error(err.message)
+
+      var idKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + id
+      })
+      idKey.set('', Registry.REG_SZ, name, setIcon)
+    }
+
+    function setIcon (err) {
+      if (err) log.error(err.message)
+
+      var iconKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + id + '\\DefaultIcon'
+      })
+      iconKey.set('', Registry.REG_SZ, icon, setCommand)
+    }
+
+    function setCommand (err) {
+      if (err) log.error(err.message)
+
+      var commandKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + id + '\\shell\\open\\command'
+      })
+      commandKey.set('', Registry.REG_SZ, '"' + command + '" "%1"', done)
+    }
+
+    function done (err) {
+      if (err) log.error(err.message)
+    }
+  }
+}
+
+function uninstallWin32 () {
+  var Registry = require('winreg')
+
+  unregisterProtocolHandlerWin32('magnet', process.execPath)
+  unregisterFileHandlerWin32('.torrent', 'io.webtorrent.torrent', process.execPath)
+
+  function unregisterProtocolHandlerWin32 (protocol, command) {
+    getCommand()
+
+    function getCommand () {
+      var commandKey = new Registry({
+        hive: Registry.HKCU, // HKEY_CURRENT_USER
+        key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
+      })
+      commandKey.get('', function (err, item) {
+        if (!err && item.value.indexOf(command) >= 0) {
+          destroyProtocol()
+        }
+      })
+    }
+
+    function destroyProtocol () {
+      var protocolKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + protocol
+      })
+      protocolKey.destroy(function () {})
+    }
+  }
+
+  function unregisterFileHandlerWin32 (ext, id, command) {
+    eraseId()
+
+    function eraseId () {
+      var idKey = new Registry({
+        hive: Registry.HKCU, // HKEY_CURRENT_USER
+        key: '\\Software\\Classes\\' + id
+      })
+      idKey.destroy(getExt)
+    }
+
+    function getExt () {
+      var extKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + ext
+      })
+      extKey.get('', function (err, item) {
+        if (!err && item.value === id) {
+          destroyExt()
+        }
+      })
+    }
+
+    function destroyExt () {
+      var extKey = new Registry({
+        hive: Registry.HKCU, // HKEY_CURRENT_USER
+        key: '\\Software\\Classes\\' + ext
+      })
+      extKey.destroy(function () {})
+    }
+  }
+}
+
+function installLinux () {
+  var fs = require('fs-extra')
+  var os = require('os')
+  var path = require('path')
+
+  var config = require('../config')
+  var log = require('./log')
+
+  installDesktopFile()
+  installIconFile()
+
+  function installDesktopFile () {
+    var templatePath = path.join(config.STATIC_PATH, 'linux', 'webtorrent-desktop.desktop')
+    fs.readFile(templatePath, 'utf8', writeDesktopFile)
+  }
+
+  function writeDesktopFile (err, desktopFile) {
+    if (err) return log.error(err.message)
+
+    var appPath = config.IS_PRODUCTION ? path.dirname(process.execPath) : config.ROOT_PATH
+    var execPath = process.execPath + (config.IS_PRODUCTION ? '' : ' \.')
+    var tryExecPath = process.execPath
+
+    desktopFile = desktopFile.replace(/\$APP_NAME/g, config.APP_NAME)
+    desktopFile = desktopFile.replace(/\$APP_PATH/g, appPath)
+    desktopFile = desktopFile.replace(/\$EXEC_PATH/g, execPath)
+    desktopFile = desktopFile.replace(/\$TRY_EXEC_PATH/g, tryExecPath)
+
+    var desktopFilePath = path.join(
+      os.homedir(),
+      '.local',
+      'share',
+      'applications',
+      'webtorrent-desktop.desktop'
+    )
+    fs.mkdirp(path.dirname(desktopFilePath))
+    fs.writeFile(desktopFilePath, desktopFile, function (err) {
+      if (err) return log.error(err.message)
+    })
+  }
+
+  function installIconFile () {
+    var iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
+    fs.readFile(iconStaticPath, writeIconFile)
+  }
+
+  function writeIconFile (err, iconFile) {
+    if (err) return log.error(err.message)
+
+    var iconFilePath = path.join(
+      os.homedir(),
+      '.local',
+      'share',
+      'icons',
+      'webtorrent-desktop.png'
+    )
+    fs.mkdirp(path.dirname(iconFilePath))
+    fs.writeFile(iconFilePath, iconFile, function (err) {
+      if (err) return log.error(err.message)
+    })
+  }
+}
+
+function uninstallLinux () {
+  var os = require('os')
+  var path = require('path')
+  var fs = require('fs-extra')
+
+  var desktopFilePath = path.join(
+    os.homedir(),
+    '.local',
+    'share',
+    'applications',
+    'webtorrent-desktop.desktop'
+  )
+  fs.removeSync(desktopFilePath)
+
+  var iconFilePath = path.join(
+    os.homedir(),
+    '.local',
+    'share',
+    'icons',
+    'webtorrent-desktop.png'
+  )
+  fs.removeSync(iconFilePath)
+}

main/index.js

@@ -1,108 +1,135 @@
 var electron = require('electron')
 
 var app = electron.app
+var ipcMain = electron.ipcMain
 
 var autoUpdater = require('./auto-updater')
 var config = require('../config')
+var crashReporter = require('../crash-reporter')
+var handlers = require('./handlers')
 var ipc = require('./ipc')
 var log = require('./log')
 var menu = require('./menu')
-var registerProtocolHandler = require('./register-handlers')
 var shortcuts = require('./shortcuts')
+var squirrelWin32 = require('./squirrel-win32')
 var windows = require('./windows')
+var tray = require('./tray')
 
-// Prevent multiple instances of the app from running at the same time. New instances
+var shouldQuit = false
-// signal this instance and exit.
-var shouldQuit = app.makeSingleInstance(function (newArgv) {
-  newArgv = sliceArgv(newArgv)
-
-  if (app.ipcReady) {
-    log('Second app instance attempted to open but was prevented')
-
-    newArgv.forEach(function (torrentId) {
-      windows.main.send('dispatch', 'onOpen', torrentId)
-    })
-
-    if (windows.main.isMinimized()) {
-      windows.main.restore()
-    }
-    windows.main.focus()
-  } else {
-    argv.push(...newArgv)
-  }
-})
-
-if (shouldQuit) {
-  app.quit()
-}
-
 var argv = sliceArgv(process.argv)
 
-app.on('open-file', onOpen)
+if (process.platform === 'win32') {
-app.on('open-url', onOpen)
+  shouldQuit = squirrelWin32.handleEvent(argv[0])
-app.on('will-finish-launching', function () {
+  argv = argv.filter((arg) => arg.indexOf('--squirrel') === -1)
-  autoUpdater.init()
+}
-  setupCrashReporter()
-})
 
-app.ipcReady = false // main window has finished loading and IPC is ready
+if (!shouldQuit) {
-app.isQuitting = false
+  // Prevent multiple instances of app from running at same time. New instances signal
-
+  // this instance and quit.
-app.on('ready', function () {
+  shouldQuit = app.makeSingleInstance(onAppOpen)
-  menu.init()
+  if (shouldQuit) {
-  windows.createMainWindow()
-  shortcuts.init()
-  registerProtocolHandler()
-})
-
-app.on('ipcReady', function () {
-  log('IS_PRODUCTION:', config.IS_PRODUCTION)
-  if (argv.length) {
-    log('command line args:', process.argv)
-  }
-  argv.forEach(function (torrentId) {
-    windows.main.send('dispatch', 'onOpen', torrentId)
-  })
-})
-
-app.on('before-quit', function () {
-  app.isQuitting = true
-})
-
-app.on('activate', function () {
-  if (windows.main) {
-    windows.main.show()
-  } else {
-    windows.createMainWindow(menu)
-  }
-})
-
-app.on('window-all-closed', function () {
-  if (process.platform !== 'darwin') {
     app.quit()
   }
-})
+}
 
-ipc.init()
+if (!shouldQuit) {
+  init()
+}
+
+function init () {
+  if (config.IS_PORTABLE) {
+    app.setPath('userData', config.CONFIG_PATH)
+  }
+
+  app.ipcReady = false // main window has finished loading and IPC is ready
+  app.isQuitting = false
+
+  // Open handlers must be added as early as possible
+  app.on('open-file', onOpen)
+  app.on('open-url', onOpen)
+
+  ipc.init()
+
+  app.on('will-finish-launching', function () {
+    crashReporter.init()
+    autoUpdater.init()
+  })
+
+  app.on('ready', function () {
+    menu.init()
+    windows.createMainWindow()
+    windows.createWebTorrentHiddenWindow()
+    shortcuts.init()
+    tray.init()
+    handlers.install()
+  })
+
+  app.on('ipcReady', function () {
+    log('Command line args:', argv)
+    processArgv(argv)
+  })
+
+  app.on('before-quit', function (e) {
+    if (app.isQuitting) return
+
+    app.isQuitting = true
+    e.preventDefault()
+    windows.main.send('dispatch', 'saveState') /* try to save state on exit */
+    ipcMain.once('savedState', () => app.quit())
+    setTimeout(() => app.quit(), 2000) /* quit after 2 secs, at most */
+  })
+
+  app.on('activate', function () {
+    windows.createMainWindow()
+  })
+}
 
 function onOpen (e, torrentId) {
   e.preventDefault()
+
   if (app.ipcReady) {
     windows.main.send('dispatch', 'onOpen', torrentId)
+    // Magnet links opened from Chrome won't focus the app without a setTimeout. The
+    // confirmation dialog Chrome shows causes Chrome to steal back the focus.
+    // Electron issue: https://github.com/atom/electron/issues/4338
+    setTimeout(function () {
+      windows.focusWindow(windows.main)
+    }, 100)
   } else {
     argv.push(torrentId)
   }
 }
 
+function onAppOpen (newArgv) {
+  newArgv = sliceArgv(newArgv)
+
+  if (app.ipcReady) {
+    log('Second app instance opened, but was prevented:', newArgv)
+    windows.focusWindow(windows.main)
+
+    processArgv(newArgv)
+  } else {
+    argv.push(...newArgv)
+  }
+}
+
 function sliceArgv (argv) {
   return argv.slice(config.IS_PRODUCTION ? 1 : 2)
 }
 
-function setupCrashReporter () {
+function processArgv (argv) {
-  // require('crash-reporter').start({
+  argv.forEach(function (arg) {
-  //   productName: 'WebTorrent',
+    if (arg === '-n') {
-  //   companyName: 'WebTorrent',
+      windows.main.send('dispatch', 'showOpenSeedFiles')
-  //   submitURL: 'https://webtorrent.io/crash-report',
+    } else if (arg === '-o') {
-  //   autoSubmit: true
+      windows.main.send('dispatch', 'showOpenTorrentFile')
-  // })
+    } else if (arg === '-u') {
+      windows.main.send('showOpenTorrentAddress')
+    } else if (arg.startsWith('-psn')) {
+      // Ignore OS X launchd "process serial number" argument
+      // More: https://github.com/feross/webtorrent-desktop/issues/214
+    } else {
+      windows.main.send('dispatch', 'onOpen', arg)
+    }
+  })
 }

main/ipc.js

@@ -1,8 +1,7 @@
 module.exports = {
-  init: init
+  init
 }
 
-var debug = require('debug')('webtorrent-app:ipcMain')
 var electron = require('electron')
 
 var app = electron.app
@@ -12,21 +11,33 @@ var powerSaveBlocker = electron.powerSaveBlocker
 var log = require('./log')
 var menu = require('./menu')
 var windows = require('./windows')
+var shortcuts = require('./shortcuts')
 
 // has to be a number, not a boolean, and undefined throws an error
 var powerSaveBlockID = 0
 
 function init () {
   ipcMain.on('ipcReady', function (e) {
-    console.timeEnd('init')
     app.ipcReady = true
     app.emit('ipcReady')
+    windows.main.show()
+    console.timeEnd('init')
   })
 
-  ipcMain.on('showOpenTorrentFile', function (e) {
+  var messageQueueMainToWebTorrent = []
-    menu.showOpenTorrentFile()
+  ipcMain.on('ipcReadyWebTorrent', function (e) {
+    app.ipcReadyWebTorrent = true
+    log('sending %d queued messages from the main win to the webtorrent window',
+      messageQueueMainToWebTorrent.length)
+    messageQueueMainToWebTorrent.forEach(function (message) {
+      windows.webtorrent.send(message.name, ...message.args)
+      log('webtorrent: sent queued %s', message.name)
+    })
   })
 
+  ipcMain.on('showOpenTorrentFile', menu.showOpenTorrentFile)
+  ipcMain.on('showOpenSeedFiles', menu.showOpenSeedFiles)
+
   ipcMain.on('setBounds', function (e, bounds, maximize) {
     setBounds(bounds, maximize)
   })
@@ -58,19 +69,69 @@ function init () {
 
   ipcMain.on('blockPowerSave', blockPowerSave)
   ipcMain.on('unblockPowerSave', unblockPowerSave)
+
+  ipcMain.on('onPlayerOpen', function () {
+    menu.onPlayerOpen()
+    shortcuts.registerPlayerShortcuts()
+  })
+  ipcMain.on('onPlayerClose', function () {
+    menu.onPlayerClose()
+    shortcuts.unregisterPlayerShortcuts()
+  })
+
+  ipcMain.on('focusWindow', function (e, windowName) {
+    windows.focusWindow(windows[windowName])
+  })
+
+  // Capture all events
+  var oldEmit = ipcMain.emit
+  ipcMain.emit = function (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') {
+        // Send message to main window
+        windows.main.send(name, ...args)
+        log('webtorrent: got %s', name)
+      } else if (app.ipcReadyWebTorrent) {
+        // Send message to webtorrent window
+        windows.webtorrent.send(name, ...args)
+        log('webtorrent: sent %s', name)
+      } else {
+        // Queue message for webtorrent window, it hasn't finished loading yet
+        messageQueueMainToWebTorrent.push({
+          name: name,
+          args: args
+        })
+        log('webtorrent: queueing %s', name)
+      }
+      return
+    }
+
+    // Emit all other events normally
+    oldEmit.call(ipcMain, name, e, ...args)
+  }
 }
 
 function setBounds (bounds, maximize) {
   // Do nothing in fullscreen
-  if (!windows.main || windows.main.isFullScreen()) return
+  if (!windows.main || windows.main.isFullScreen()) {
+    log('setBounds: not setting bounds because we\'re in full screen')
+    return
+  }
 
   // Maximize or minimize, if the second argument is present
   var willBeMaximized
   if (maximize === true) {
-    if (!windows.main.isMaximized()) windows.main.maximize()
+    if (!windows.main.isMaximized()) {
+      log('setBounds: maximizing')
+      windows.main.maximize()
+    }
     willBeMaximized = true
   } else if (maximize === false) {
-    if (windows.main.isMaximized()) windows.main.unmaximize()
+    if (windows.main.isMaximized()) {
+      log('setBounds: unmaximizing')
+      windows.main.unmaximize()
+    }
     willBeMaximized = false
   } else {
     willBeMaximized = windows.main.isMaximized()
@@ -78,12 +139,23 @@ function setBounds (bounds, maximize) {
 
   // Assuming we're not maximized or maximizing, set the window size
   if (!willBeMaximized) {
+    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
+      var screen = require('screen')
+      var scr = screen.getDisplayMatching(windows.main.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))
+    }
     windows.main.setBounds(bounds, true)
+  } else {
+    log('setBounds: not setting bounds because of window maximization')
   }
 }
 
 function setAspectRatio (aspectRatio, extraSize) {
-  debug('setAspectRatio %o %o', aspectRatio, extraSize)
+  log('setAspectRatio %o %o', aspectRatio, extraSize)
   if (windows.main) {
     windows.main.setAspectRatio(aspectRatio, extraSize)
   }
@@ -91,13 +163,13 @@ function setAspectRatio (aspectRatio, extraSize) {
 
 // Display string in dock badging area (OS X)
 function setBadge (text) {
-  debug('setBadge %s', text)
+  log('setBadge %s', text)
   if (app.dock) app.dock.setBadge(String(text))
 }
 
 // Show progress bar. Valid range is [0, 1]. Remove when < 0; indeterminate when > 1.
 function setProgress (progress) {
-  debug('setProgress %s', progress)
+  log('setProgress %s', progress)
   if (windows.main) {
     windows.main.setProgressBar(progress)
   }
@@ -105,12 +177,12 @@ function setProgress (progress) {
 
 function blockPowerSave () {
   powerSaveBlockID = powerSaveBlocker.start('prevent-display-sleep')
-  debug('blockPowerSave %d', powerSaveBlockID)
+  log('blockPowerSave %d', powerSaveBlockID)
 }
 
 function unblockPowerSave () {
   if (powerSaveBlocker.isStarted(powerSaveBlockID)) {
     powerSaveBlocker.stop(powerSaveBlockID)
-    debug('unblockPowerSave %d', powerSaveBlockID)
+    log('unblockPowerSave %d', powerSaveBlockID)
   }
 }

main/menu.js

@@ -1,18 +1,21 @@
 module.exports = {
-  init: init,
+  init,
-  onToggleFullScreen: onToggleFullScreen,
+  onToggleFullScreen,
-  onWindowHide: onWindowHide,
+  onWindowHide,
-  onWindowShow: onWindowShow,
+  onWindowShow,
-  showOpenTorrentFile: showOpenTorrentFile,
+  onPlayerOpen,
-  toggleFullScreen: toggleFullScreen
+  onPlayerClose,
+  showOpenSeedFiles,
+  showOpenTorrentFile,
+  toggleFullScreen
 }
 
-var debug = require('debug')('webtorrent-app:menu')
 var electron = require('electron')
 
 var app = electron.app
 
 var config = require('../config')
+var log = require('./log')
 var windows = require('./windows')
 
 var appMenu, dockMenu
@@ -26,7 +29,7 @@ function init () {
 }
 
 function toggleFullScreen (flag) {
-  debug('toggleFullScreen %s', flag)
+  log('toggleFullScreen %s', flag)
   if (windows.main && windows.main.isVisible()) {
     flag = flag != null ? flag : !windows.main.isFullScreen()
     windows.main.setFullScreen(flag)
@@ -35,7 +38,7 @@ function toggleFullScreen (flag) {
 
 // Sets whether the window should always show on top of other windows
 function toggleFloatOnTop (flag) {
-  debug('toggleFloatOnTop %s', flag)
+  log('toggleFloatOnTop %s', flag)
   if (windows.main) {
     flag = flag != null ? flag : !windows.main.isAlwaysOnTop()
     windows.main.setAlwaysOnTop(flag)
@@ -43,37 +46,52 @@ function toggleFloatOnTop (flag) {
   }
 }
 
+function increaseVolume () {
+  if (windows.main) {
+    windows.main.send('dispatch', 'changeVolume', 0.1)
+  }
+}
+
+function decreaseVolume () {
+  if (windows.main) {
+    windows.main.send('dispatch', 'changeVolume', -0.1)
+  }
+}
+
 function toggleDevTools () {
-  debug('toggleDevTools')
+  log('toggleDevTools')
   if (windows.main) {
     windows.main.toggleDevTools()
   }
 }
 
-function reloadWindow () {
+function showWebTorrentWindow () {
-  debug('reloadWindow')
+  windows.webtorrent.show()
-  if (windows.main) {
+  windows.webtorrent.webContents.openDevTools({ detach: true })
-    windows.main.webContents.reloadIgnoringCache()
-  }
-}
-
-function addFakeDevice (device) {
-  debug('addFakeDevice %s', device)
-  windows.main.send('addFakeDevice', device)
 }
 
 function onWindowShow () {
-  debug('onWindowShow')
+  log('onWindowShow')
   getMenuItem('Full Screen').enabled = true
   getMenuItem('Float on Top').enabled = true
 }
 
 function onWindowHide () {
-  debug('onWindowHide')
+  log('onWindowHide')
   getMenuItem('Full Screen').enabled = false
   getMenuItem('Float on Top').enabled = false
 }
 
+function onPlayerOpen () {
+  getMenuItem('Increase Volume').enabled = true
+  getMenuItem('Decrease Volume').enabled = true
+}
+
+function onPlayerClose () {
+  getMenuItem('Increase Volume').enabled = false
+  getMenuItem('Decrease Volume').enabled = false
+}
+
 function onToggleFullScreen (isFullScreen) {
   isFullScreen = isFullScreen != null ? isFullScreen : windows.main.isFullScreen()
   windows.main.setMenuBarVisibility(!isFullScreen)
@@ -91,13 +109,16 @@ function getMenuItem (label) {
 }
 
 // Prompts the user for a file or folder, then makes a torrent out of the data
-function showCreateTorrent () {
+function showOpenSeedFiles () {
+  // Allow only a single selection
+  // To create a multi-file torrent, the user must select a folder
   electron.dialog.showOpenDialog({
     title: 'Select a file or folder for the torrent file.',
-    properties: [ 'openFile', 'openDirectory', 'multiSelections' ]
+    properties: [ 'openFile', 'openDirectory' ]
   }, function (filenames) {
     if (!Array.isArray(filenames)) return
-    windows.main.send('dispatch', 'seed', filenames)
+    var fileOrFolder = filenames[0]
+    windows.main.send('dispatch', 'showCreateTorrent', fileOrFolder)
   })
 }
 
@@ -105,6 +126,7 @@ function showCreateTorrent () {
 function showOpenTorrentFile () {
   electron.dialog.showOpenDialog(windows.main, {
     title: 'Select a .torrent file to open.',
+    filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
     properties: [ 'openFile', 'multiSelections' ]
   }, function (filenames) {
     if (!Array.isArray(filenames)) return
@@ -120,36 +142,44 @@ function showOpenTorrentAddress () {
 }
 
 function getAppMenuTemplate () {
+  var fileMenu = [
+    {
+      label: 'Create New Torrent...',
+      accelerator: 'CmdOrCtrl+N',
+      click: showOpenSeedFiles
+    },
+    {
+      label: 'Open Torrent File...',
+      accelerator: 'CmdOrCtrl+O',
+      click: showOpenTorrentFile
+    },
+    {
+      label: 'Open Torrent Address...',
+      accelerator: 'CmdOrCtrl+U',
+      click: showOpenTorrentAddress
+    },
+    {
+      type: 'separator'
+    },
+    {
+      label: process.platform === 'windows' ? 'Close' : 'Close Window',
+      accelerator: 'CmdOrCtrl+W',
+      role: 'close'
+    }
+  ]
+
+  // File > Quit for Linux users with distros where the system tray is broken
+  if (process.platform === 'linux') {
+    fileMenu.push({
+      label: 'Quit',
+      click: () => app.quit()
+    })
+  }
+
   var template = [
     {
       label: 'File',
-      submenu: [
+      submenu: fileMenu
-        {
-          label: 'Create New Torrent...',
-          accelerator: 'CmdOrCtrl+N',
-          click: showCreateTorrent
-        },
-        {
-          label: 'Open Torrent File...',
-          accelerator: 'CmdOrCtrl+O',
-          click: showOpenTorrentFile
-        },
-        {
-          label: 'Open Torrent Address...',
-          accelerator: 'CmdOrCtrl+U',
-          click: showOpenTorrentAddress
-        },
-        {
-          type: 'separator'
-        },
-        {
-          label: process.platform === 'darwin'
-            ? 'Close Window'
-            : 'Close',
-          accelerator: 'CmdOrCtrl+W',
-          role: 'close'
-        }
-      ]
     },
     {
       label: 'Edit',
@@ -195,14 +225,24 @@ function getAppMenuTemplate () {
         {
           type: 'separator'
         },
+        {
+          label: 'Increase Volume',
+          accelerator: 'CmdOrCtrl+Up',
+          click: increaseVolume,
+          enabled: false
+        },
+        {
+          label: 'Decrease Volume',
+          accelerator: 'CmdOrCtrl+Down',
+          click: decreaseVolume,
+          enabled: false
+        },
+        {
+          type: 'separator'
+        },
         {
           label: 'Developer',
           submenu: [
-            {
-              label: 'Reload',
-              accelerator: 'CmdOrCtrl+R',
-              click: reloadWindow
-            },
             {
               label: 'Developer Tools',
               accelerator: process.platform === 'darwin'
@@ -211,15 +251,11 @@ function getAppMenuTemplate () {
               click: toggleDevTools
             },
             {
-              type: 'separator'
+              label: 'Show WebTorrent Process',
-            },
+              accelerator: process.platform === 'darwin'
-            {
+                ? 'Alt+Command+P'
-              label: 'Add Fake Airplay',
+                : 'Ctrl+Shift+P',
-              click: () => addFakeDevice('airplay')
+              click: showWebTorrentWindow
-            },
-            {
-              label: 'Add Fake Chromecast',
-              click: () => addFakeDevice('chromecast')
             }
           ]
         }
@@ -246,26 +282,26 @@ function getAppMenuTemplate () {
         },
         {
           label: 'Contribute on GitHub',
-          click: () => electron.shell.openExternal('https://github.com/feross/webtorrent-app')
+          click: () => electron.shell.openExternal(config.GITHUB_URL)
         },
         {
           type: 'separator'
         },
         {
           label: 'Report an Issue...',
-          click: () => electron.shell.openExternal('https://github.com/feross/webtorrent-app/issues')
+          click: () => electron.shell.openExternal(config.GITHUB_URL + '/issues')
         }
       ]
     }
   ]
 
   if (process.platform === 'darwin') {
-    var name = app.getName()
+    // WebTorrent menu (OS X)
     template.unshift({
-      label: name,
+      label: config.APP_NAME,
       submenu: [
         {
-          label: 'About ' + name,
+          label: 'About ' + config.APP_NAME,
           role: 'about'
         },
         {
@@ -280,7 +316,7 @@ function getAppMenuTemplate () {
           type: 'separator'
         },
         {
-          label: 'Hide ' + name,
+          label: 'Hide ' + config.APP_NAME,
           accelerator: 'Command+H',
           role: 'hide'
         },
@@ -299,12 +335,12 @@ function getAppMenuTemplate () {
         {
           label: 'Quit',
           accelerator: 'Command+Q',
-          click: function () { app.quit() }
+          click: () => app.quit()
         }
       ]
     })
 
-    // Window menu
+    // Window menu (OS X)
     template[4].submenu.push(
       {
         type: 'separator'
@@ -314,6 +350,17 @@ function getAppMenuTemplate () {
         role: 'front'
       }
     )
+  } else {
+    // Help menu (Windows, Linux)
+    template[4].submenu.push(
+      {
+        type: 'separator'
+      },
+      {
+        label: 'About ' + config.APP_NAME,
+        click: windows.createAboutWindow
+      }
+    )
   }
 
   return template
@@ -324,7 +371,7 @@ function getDockMenuTemplate () {
     {
       label: 'Create New Torrent...',
       accelerator: 'CmdOrCtrl+N',
-      click: showCreateTorrent
+      click: showOpenSeedFiles
     },
     {
       label: 'Open Torrent File...',

main/register-handlers.js

@@ -1,125 +0,0 @@
-var log = require('./log')
-
-module.exports = function () {
-  if (process.platform === 'win32') {
-    var path = require('path')
-    var iconPath = path.join(process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico')
-    registerProtocolHandlerWin32('magnet', 'URL:BitTorrent Magnet URL', iconPath, process.execPath)
-    registerFileHandlerWin32('.torrent', 'io.webtorrent.torrent', 'BitTorrent Document', iconPath, process.execPath)
-  }
-  if (process.platform === 'linux') {
-    installDesktopFile()
-    installDesktopIcon()
-  }
-}
-
-function installDesktopFile () {
-  var config = require('../config')
-  var fs = require('fs')
-  var path = require('path')
-  var os = require('os')
-
-  var templatePath = path.join(config.STATIC_PATH, 'webtorrent.desktop')
-  var desktopFile = fs.readFileSync(templatePath, 'utf8')
-
-  desktopFile = desktopFile.replace(/\$APP_NAME/g, config.APP_NAME)
-  desktopFile = desktopFile.replace(/\$APP_PATH/g, path.dirname(process.execPath))
-  desktopFile = desktopFile.replace(/\$EXEC_PATH/g, process.execPath)
-
-  var desktopFilePath = path.join(os.homedir(), '.local', 'share', 'applications', 'webtorrent.desktop')
-  fs.writeFileSync(desktopFilePath, desktopFile)
-}
-
-function installDesktopIcon () {
-  var config = require('../config')
-  var fs = require('fs')
-  var path = require('path')
-  var os = require('os')
-
-  var iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
-  var iconFile = fs.readFileSync(iconStaticPath)
-
-  var iconFilePath = path.join(os.homedir(), '.local', 'share', 'icons', 'webtorrent.png')
-  fs.writeFileSync(iconFilePath, iconFile)
-}
-
-/**
- * To add a protocol handler on Windows, the following keys must be added to the Windows
- * registry:
- *
- * HKEY_CLASSES_ROOT
- *   $PROTOCOL
- *     (Default) = "$NAME"
- *     URL Protocol = ""
- *     DefaultIcon
- *       (Default) = "$ICON"
- *     shell
- *       open
- *         command
- *           (Default) = "$COMMAND" "%1"
- *
- * Source: https://msdn.microsoft.com/en-us/library/aa767914.aspx
- *
- * However, the "HKEY_CLASSES_ROOT" key can only be written by the Administrator user.
- * So, we instead write to "HKEY_CURRENT_USER\Software\Classes", which is inherited by
- * "HKEY_CLASSES_ROOT" anyway, and can be written by unprivileged users.
- */
-
-function registerProtocolHandlerWin32 (protocol, name, icon, command) {
-  var Registry = require('winreg')
-
-  var protocolKey = new Registry({
-    hive: Registry.HKCU, // HKEY_CURRENT_USER
-    key: '\\Software\\Classes\\' + protocol
-  })
-  protocolKey.set('', Registry.REG_SZ, name, callback)
-  protocolKey.set('URL Protocol', Registry.REG_SZ, '', callback)
-
-  var iconKey = new Registry({
-    hive: Registry.HKCU,
-    key: '\\Software\\Classes\\' + protocol + '\\DefaultIcon'
-  })
-  iconKey.set('', Registry.REG_SZ, icon, callback)
-
-  var commandKey = new Registry({
-    hive: Registry.HKCU,
-    key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
-  })
-  commandKey.set('', Registry.REG_SZ, '"' + command + '" "%1"', callback)
-
-  function callback (err) {
-    if (err) log.error(err.message || err)
-  }
-}
-
-function registerFileHandlerWin32 (ext, id, name, icon, command) {
-  var Registry = require('winreg')
-
-  var extKey = new Registry({
-    hive: Registry.HKCU, // HKEY_CURRENT_USER
-    key: '\\Software\\Classes\\' + ext
-  })
-  extKey.set('', Registry.REG_SZ, id, callback)
-
-  var idKey = new Registry({
-    hive: Registry.HKCU,
-    key: '\\Software\\Classes\\' + id
-  })
-  idKey.set('', Registry.REG_SZ, name, callback)
-
-  var iconKey = new Registry({
-    hive: Registry.HKCU,
-    key: '\\Software\\Classes\\' + id + '\\DefaultIcon'
-  })
-  iconKey.set('', Registry.REG_SZ, icon, callback)
-
-  var commandKey = new Registry({
-    hive: Registry.HKCU,
-    key: '\\Software\\Classes\\' + id + '\\shell\\open\\command'
-  })
-  commandKey.set('', Registry.REG_SZ, '"' + command + '" "%1"', callback)
-
-  function callback (err) {
-    if (err) log.error(err.message || err)
-  }
-}

main/shortcuts.js

@@ -1,5 +1,7 @@
 module.exports = {
-  init: init
+  init,
+  registerPlayerShortcuts,
+  unregisterPlayerShortcuts
 }
 
 var electron = require('electron')
@@ -11,11 +13,17 @@ var menu = require('./menu')
 var windows = require('./windows')
 
 function init () {
-  // Special "media key" for play/pause, available on some keyboards
-  globalShortcut.register('MediaPlayPause', () => windows.main.send('dispatch', 'playPause'))
-
   // ⌘+Shift+F is an alternative fullscreen shortcut to the ones defined in menu.js.
   // Electron does not support multiple accelerators for a single menu item, so this
   // is registered separately here.
   localShortcut.register('CmdOrCtrl+Shift+F', menu.toggleFullScreen)
 }
+
+function registerPlayerShortcuts () {
+  // Special "media key" for play/pause, available on some keyboards
+  globalShortcut.register('MediaPlayPause', () => windows.main.send('dispatch', 'playPause'))
+}
+
+function unregisterPlayerShortcuts () {
+  globalShortcut.unregister('MediaPlayPause')
+}

main/squirrel-win32.js

@@ -0,0 +1,139 @@
+module.exports = {
+  handleEvent
+}
+
+var cp = require('child_process')
+var electron = require('electron')
+var fs = require('fs')
+var os = require('os')
+var path = require('path')
+
+var app = electron.app
+
+var handlers = require('./handlers')
+
+var exeName = path.basename(process.execPath)
+var updateDotExe = path.join(process.execPath, '..', '..', 'Update.exe')
+
+function handleEvent (cmd) {
+  if (cmd === '--squirrel-install') {
+    // App was installed. Install desktop/start menu shortcuts.
+    createShortcuts(function () {
+      // Ensure user sees install splash screen so they realize that Setup.exe actually
+      // installed an application and isn't the application itself.
+      setTimeout(function () {
+        app.quit()
+      }, 3000)
+    })
+    return true
+  }
+
+  if (cmd === '--squirrel-updated') {
+    // App was updated. (Called on new version of app)
+    updateShortcuts(function () {
+      app.quit()
+    })
+    return true
+  }
+
+  if (cmd === '--squirrel-uninstall') {
+    // App was just uninstalled. Undo anything we did in the --squirrel-install and
+    // --squirrel-updated handlers
+
+    // Uninstall .torrent file and magnet link handlers
+    handlers.uninstall()
+
+    // Remove desktop/start menu shortcuts.
+    // HACK: add a callback to handlers.uninstall() so we can remove this setTimeout
+    setTimeout(function () {
+      removeShortcuts(function () {
+        app.quit()
+      })
+    }, 1000)
+
+    return true
+  }
+
+  if (cmd === '--squirrel-obsolete') {
+    // App will be updated. (Called on outgoing version of app)
+    app.quit()
+    return true
+  }
+
+  if (cmd === '--squirrel-firstrun') {
+    // This is called on the app's first run. 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) {
+  var stdout = ''
+
+  var child
+  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
+  })
+
+  var error = null
+  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 Squirrel's Update.exe with the given arguments and invoke the callback when the
+// command completes.
+function spawnUpdate (args, cb) {
+  spawn(updateDotExe, args, cb)
+}
+
+// Create desktop/start menu shortcuts using the Squirrel Update.exe command line API
+function createShortcuts (cb) {
+  spawnUpdate(['--createShortcut', exeName], cb)
+}
+
+// Update desktop/start menu shortcuts using the Squirrel Update.exe command line API
+function updateShortcuts (cb) {
+  var homeDir = os.homedir()
+  if (homeDir) {
+    var desktopShortcutPath = path.join(homeDir, 'Desktop', 'WebTorrent.lnk')
+    // Check if the desktop shortcut has been previously deleted and and keep it deleted
+    // if it was
+    fs.access(desktopShortcutPath, function (err) {
+      var 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/start menu shortcuts using the Squirrel Update.exe command line API
+function removeShortcuts (cb) {
+  spawnUpdate(['--removeShortcut', exeName], cb)
+}

main/tray.js

@@ -0,0 +1,83 @@
+module.exports = {
+  init,
+  hasTray
+}
+
+var cp = require('child_process')
+var path = require('path')
+var electron = require('electron')
+
+var app = electron.app
+var Menu = electron.Menu
+var Tray = electron.Tray
+
+var windows = require('./windows')
+
+var trayIcon
+
+function init () {
+  // OS X has no tray icon
+  if (process.platform === 'darwin') return
+
+  // On Linux, asynchronously check for libappindicator1
+  if (process.platform === 'linux') {
+    checkLinuxTraySupport(function (supportsTray) {
+      if (supportsTray) createTrayIcon()
+    })
+  }
+
+  // Windows always supports minimize-to-tray
+  if (process.platform === 'win32') createTrayIcon()
+}
+
+function hasTray () {
+  return !!trayIcon
+}
+
+function createTrayIcon () {
+  trayIcon = new Tray(path.join(__dirname, '..', 'static', 'WebTorrentSmall.png'))
+
+  // On Windows, left click to open the app, right click for context menu
+  // On Linux, any click (right or left) opens the context menu
+  trayIcon.on('click', showApp)
+
+  // Show the tray context menu, and keep the available commands up to date
+  updateTrayMenu()
+  windows.main.on('show', updateTrayMenu)
+  windows.main.on('hide', updateTrayMenu)
+}
+
+function checkLinuxTraySupport (cb) {
+  // Check that we're on Ubuntu (or another debian system) and that we have
+  // libappindicator1. If WebTorrent was installed from the deb file, we should
+  // 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(false)
+    // Unfortunately there's no cleaner way, as far as I can tell, to check
+    // whether a debian package is installed:
+    cb(stdout.endsWith('\tinstall\n'))
+  })
+}
+
+function updateTrayMenu () {
+  var showHideMenuItem
+  if (windows.main.isVisible()) {
+    showHideMenuItem = { label: 'Hide to tray', click: hideApp }
+  } else {
+    showHideMenuItem = { label: 'Show', click: showApp }
+  }
+  var contextMenu = Menu.buildFromTemplate([
+    showHideMenuItem,
+    { label: 'Quit', click: () => app.quit() }
+  ])
+  trayIcon.setContextMenu(contextMenu)
+}
+
+function showApp () {
+  windows.main.show()
+}
+
+function hideApp () {
+  windows.main.hide()
+  windows.main.send('dispatch', 'backToList')
+}

main/windows.js

@@ -1,39 +1,107 @@
 var windows = module.exports = {
+  about: null,
   main: null,
-  createMainWindow: createMainWindow
+  createAboutWindow,
+  createWebTorrentHiddenWindow,
+  createMainWindow,
+  focusWindow
 }
 
 var electron = require('electron')
 
-var app = electron.app
-
 var config = require('../config')
 var menu = require('./menu')
+var tray = require('./tray')
 
-function createMainWindow () {
+function createAboutWindow () {
-  var win = windows.main = new electron.BrowserWindow({
+  if (windows.about) {
-    autoHideMenuBar: true, // Hide top menu bar unless Alt key is pressed (Windows, Linux)
+    return focusWindow(windows.about)
-    backgroundColor: '#282828',
+  }
-    darkTheme: true, // Forces dark theme (GTK+3)
+  var win = windows.about = new electron.BrowserWindow({
+    backgroundColor: '#ECECEC',
+    show: false,
+    center: true,
+    resizable: false,
     icon: config.APP_ICON + '.png',
-    minWidth: 375,
+    title: process.platform !== 'darwin'
-    minHeight: 38 + (120 * 2), // header height + 2 torrents
+      ? 'About ' + config.APP_WINDOW_TITLE
-    show: false, // Hide window until DOM finishes loading
+      : '',
-    title: config.APP_NAME,
+    useContentSize: true, // Specify web page size without OS chrome
-    titleBarStyle: 'hidden-inset', // Hide OS chrome, except traffic light buttons (OS X)
+    width: 300,
-    width: 450,
+    height: 170,
-    height: 38 + (120 * 4) // header height + 4 torrents
+    minimizable: false,
+    maximizable: false,
+    fullscreen: false,
+    skipTaskbar: true
   })
-  win.loadURL(config.INDEX)
+  win.loadURL(config.WINDOW_ABOUT)
 
-  win.webContents.on('dom-ready', function () {
+  // No window menu
-    menu.onToggleFullScreen()
+  win.setMenu(null)
-  })
 
   win.webContents.on('did-finish-load', function () {
     win.show()
   })
 
+  win.once('closed', function () {
+    windows.about = null
+  })
+}
+
+function createWebTorrentHiddenWindow () {
+  var win = windows.webtorrent = new electron.BrowserWindow({
+    backgroundColor: '#1E1E1E',
+    show: false,
+    center: true,
+    title: 'webtorrent-hidden-window',
+    useContentSize: true,
+    width: 150,
+    height: 150,
+    minimizable: false,
+    maximizable: false,
+    resizable: false,
+    fullscreenable: false,
+    fullscreen: false,
+    skipTaskbar: true
+  })
+  win.loadURL(config.WINDOW_WEBTORRENT)
+
+  // Prevent killing the WebTorrent process
+  win.on('close', function (e) {
+    if (!electron.app.isQuitting) {
+      e.preventDefault()
+      win.hide()
+    }
+  })
+
+  win.once('closed', function () {
+    windows.webtorrent = null
+  })
+}
+
+function createMainWindow () {
+  if (windows.main) {
+    return focusWindow(windows.main)
+  }
+  var win = windows.main = new electron.BrowserWindow({
+    backgroundColor: '#1E1E1E',
+    darkTheme: true, // Forces dark theme (GTK+3)
+    icon: config.APP_ICON + 'Smaller.png', // Window and Volume Mixer icon.
+    minWidth: config.WINDOW_MIN_WIDTH,
+    minHeight: config.WINDOW_MIN_HEIGHT,
+    show: false, // Hide window until DOM finishes loading
+    title: config.APP_WINDOW_TITLE,
+    titleBarStyle: 'hidden-inset', // Hide OS chrome, except traffic light buttons (OS X)
+    useContentSize: true, // Specify web page size without OS chrome
+    width: 500,
+    height: 38 + (120 * 5) // header height + 4 torrents
+  })
+  win.loadURL(config.WINDOW_MAIN)
+
+  win.webContents.on('dom-ready', function () {
+    menu.onToggleFullScreen()
+  })
+
   win.on('blur', menu.onWindowHide)
   win.on('focus', menu.onWindowShow)
 
@@ -41,10 +109,12 @@ function createMainWindow () {
   win.on('leave-full-screen', () => menu.onToggleFullScreen(false))
 
   win.on('close', function (e) {
-    if (process.platform === 'darwin' && !app.isQuitting) {
+    if (process.platform !== 'darwin' && !tray.hasTray()) {
+      electron.app.quit()
+    } else if (!electron.app.isQuitting) {
       e.preventDefault()
-      win.send('dispatch', 'pause')
       win.hide()
+      win.send('dispatch', 'backToList')
     }
   })
 
@@ -52,3 +122,10 @@ function createMainWindow () {
     windows.main = null
   })
 }
+
+function focusWindow (win) {
+  if (win.isMinimized()) {
+    win.restore()
+  }
+  win.show() // shows and gives focus
+}

package.json

@@ -1,64 +1,84 @@
 {
-  "name": "webtorrent-app",
+  "name": "webtorrent-desktop",
   "description": "WebTorrent, the streaming torrent client. For OS X, Windows, and Linux.",
-  "version": "0.0.1",
+  "version": "0.3.3",
   "author": {
     "name": "Feross Aboukhadijeh",
     "email": "feross@feross.org",
     "url": "http://feross.org"
   },
+  "bin": {
+    "webtorrent-desktop": "./bin/cmd.js"
+  },
   "bugs": {
-    "url": "https://github.com/feross/webtorrent-app/issues"
+    "url": "https://github.com/feross/webtorrent-desktop/issues"
   },
   "dependencies": {
     "airplay-js": "guerrerocarlos/node-airplay-js",
-    "application-config": "^0.2.0",
+    "application-config": "feross/node-application-config",
-    "application-config-path": "^0.1.0",
+    "bitfield": "^1.0.2",
     "chromecasts": "^1.8.0",
-    "create-torrent": "^3.22.1",
+    "concat-stream": "^1.5.1",
-    "debug": "^2.2.0",
+    "create-torrent": "^3.24.5",
+    "deep-equal": "^1.0.1",
+    "dlnacasts": "^0.0.3",
     "drag-drop": "^2.11.0",
     "electron-localshortcut": "^0.6.0",
+    "electron-prebuilt": "0.37.6",
+    "fs-extra": "^0.27.0",
     "hyperx": "^2.0.2",
+    "languagedetect": "^1.1.1",
     "main-loop": "^3.2.0",
-    "mkdirp": "^0.5.1",
+    "musicmetadata": "^2.0.2",
     "network-address": "^1.1.0",
     "prettier-bytes": "^1.0.1",
+    "simple-get": "^2.0.0",
+    "srt-to-vtt": "^1.1.1",
     "upload-element": "^1.0.1",
     "virtual-dom": "^2.1.1",
-    "webtorrent": "^0.86.0",
+    "wcjs-player": "^0.5.7",
-    "winreg": "^1.0.1"
+    "webchimera.js": "^0.2.3",
+    "webtorrent": "0.x",
+    "winreg": "^1.1.1"
   },
   "devDependencies": {
-    "appdmg": "^0.3.6",
+    "cross-zip": "^1.0.0",
     "electron-osx-sign": "^0.3.0",
-    "electron-packager": "^5.0.0",
+    "electron-packager": "^7.0.0",
-    "electron-prebuilt": "0.37.2",
+    "electron-winstaller": "feross/windows-installer#build",
-    "gh-release": "^2.0.2",
+    "gh-release": "^2.0.3",
-    "path-exists": "^2.1.0",
+    "minimist": "^1.2.0",
+    "nobin-debian-installer": "^0.0.9",
     "plist": "^1.2.0",
-    "rimraf": "^2.5.2",
+    "run-series": "^1.1.4",
     "standard": "^6.0.5"
   },
   "homepage": "https://webtorrent.io",
   "keywords": [
+    "desktop",
     "electron",
-    "electron-app"
+    "electron-app",
+    "webtorrent"
   ],
   "license": "MIT",
   "main": "index.js",
+  "optionalDependencies": {
+    "appdmg": "^0.3.6"
+  },
   "productName": "WebTorrent",
   "repository": {
     "type": "git",
-    "url": "git://github.com/feross/webtorrent-app.git"
+    "url": "git://github.com/feross/webtorrent-desktop.git"
   },
   "scripts": {
     "clean": "node ./bin/clean.js",
-    "debug": "DEBUG=* electron .",
+    "package": "node ./bin/package.js",
-    "package": "npm prune && npm dedupe && node ./bin/package.js",
-    "size": "npm run package -- --darwin && du -ch dist/WebTorrent-darwin-x64 | grep total",
     "start": "electron .",
     "test": "standard",
     "update-authors": "./bin/update-authors.sh"
+  },
+  "cmake-js": {
+    "runtime": "electron",
+    "runtimeVersion": "0.37.5"
   }
 }

renderer/about.html

@@ -0,0 +1,35 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style>
+      body {
+        background-color: #ECECEC;
+        font-family: BlinkMacSystemFont, 'Helvetica Neue', Helvetica, sans-serif;
+        text-align: center;
+        overflow: hidden;
+        font-size: 16px;
+        -webkit-user-select: none;
+      }
+      img {
+        width: 65px;
+        height: 65px;
+      }
+      h1 {
+        font-size: 0.9em;
+        -webkit-user-select: text;
+      }
+      p {
+        font-size: 0.8em;
+        -webkit-user-select: text;
+      }
+    </style>
+  </head>
+  <body>
+    <img src="../static/WebTorrent.png">
+    <h1>WebTorrent</h1>
+    <p>Version <script>document.write(require('../package.json').version)</script></p>
+    <p><script>document.write(require('../config').APP_COPYRIGHT)</script></p>
+  </body>
+</html>

renderer/index.css

@@ -49,34 +49,6 @@ table {
   background-color: rgb(40, 40, 40);
 }
 
-.loading {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  bottom: 0;
-}
-
-.loading .icon {
-  font-size: 42px;
-  display: block;
-  text-align: center;
-  animation: spin-ccw 2s infinite linear;
-}
-
-@keyframes spin {
-  from { transform: rotate(0deg); }
-  to   { transform: rotate(360deg); }
-}
-
-@keyframes spin-ccw {
-  from { transform: rotate(360deg); }
-  to   { transform: rotate(0deg); }
-}
-
 @keyframes fadein {
   from { opacity: 0; }
   to   { opacity: 1; }
@@ -141,28 +113,32 @@ table {
   opacity: 0.3;
 }
 
-/*
+.float-right {
- * BUTTONS
+  float: right;
- */
-
-a,
-i {
-  cursor: default;
-  -webkit-app-region: no-drag;
 }
 
-a:not(.disabled):hover,
+.expand-collapse {
-i:not(.disabled):hover {
+  cursor: pointer;
-  -webkit-filter: brightness(1.3);
 }
 
-.btn {
+.expand-collapse.expanded::before {
-  width: 40px;
+  content: '▲'
-  height: 40px;
+}
-  border-radius: 20px;
+
-  font-size: 22px;
+.expand-collapse.collapsed::before {
-  transition: all 0.1s ease-out;
+  content: '▼'
-  text-align: center;
+}
+
+.expand-collapse::before {
+  margin-right: 5px;
+}
+
+.expand-collapse.collapsed {
+  display: block;
+}
+
+.collapsed {
+  display: none;
 }
 
 /*
@@ -181,10 +157,10 @@ i:not(.disabled):hover {
   left: 0;
   top: 0;
   right: 0;
-  z-index: 1000;
   transition: opacity 0.15s ease-out;
   font-size: 14px;
   line-height: 1.5em;
+  z-index: 1;
 }
 
 .app:not(.is-focused) .header {
@@ -270,6 +246,10 @@ i:not(.disabled):hover {
  * MODAL POPOVERS
  */
 
+.modal {
+  z-index: 2;
+}
+
 .modal .modal-background {
   content: ' ';
   position: fixed;
@@ -290,42 +270,139 @@ i:not(.disabled):hover {
   width: calc(100% - 20px);
   max-width: 600px;
   box-shadow: 2px 2px 10px 0px rgba(0,0,0,0.4);
-  background-color: white;
+  background-color: #eee;
   color: #222;
   padding: 20px;
 }
 
+.modal label {
+  font-size: 16px;
+  font-weight: bold;
+}
+
 .open-torrent-address-modal input {
-  width: calc(100% - 100px)
+  width: 100%;
+}
+
+.create-torrent-page {
+  padding: 10px 25px;
+  overflow: hidden;
+}
+
+.create-torrent-page .torrent-attribute {
+  white-space: nowrap;
+}
+
+.create-torrent-page .torrent-attribute>* {
+  display: inline-block;
+}
+
+.create-torrent-page .torrent-attribute label {
+  width: 60px;
+  margin-right: 10px;
+  vertical-align: top;
+}
+
+.create-torrent-page .torrent-attribute>div {
+  width: calc(100% - 90px);
+}
+
+.create-torrent-page .torrent-attribute div {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.create-torrent-page .torrent-attribute textarea {
+  width: calc(100% - 80px);
+  height: 80px;
+  color: #eee;
+  background-color: transparent;
+  line-height: 1.5;
+  font-size: 14px;
+  font-family: inherit;
+  border-radius: 2px;
+  padding: 4px 6px;
+}
+
+.create-torrent-page textarea.torrent-trackers {
+  height: 200px;
+}
+
+.create-torrent-page input.torrent-is-private {
+  width: initial;
+  margin: 0;
 }
 
 /*
  * BUTTONS
+ * See https://www.google.com/design/spec/components/buttons.html
  */
 
-button {
+a,
+i { /* Links and icons */
+  cursor: default;
+  -webkit-app-region: no-drag;
+}
+
+a:not(.disabled):hover,
+i:not(.disabled):hover { /* Show they're clickable without pointer: cursor */
+  -webkit-filter: brightness(1.3);
+}
+
+.button-round { /* Circular icon buttons, used on <i> tags */
+  width: 40px;
+  height: 40px;
+  border-radius: 20px;
+  font-size: 22px;
+  transition: all 0.1s ease-out;
+  text-align: center;
+}
+
+button { /* Rectangular text buttons */
   background: transparent;
   margin-left: 10px;
   padding: 0;
   border: none;
+  border-radius: 3px;
   font-size: 14px;
   font-weight: bold;
-  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);
   cursor: pointer;
   color: #aaa;
+  outline: none;
 }
 
-button.primary {
+button.button-flat {
-  color: #0cf;
+  color: #222;
+  padding: 7px 18px;
 }
 
-button:hover {
+button.button-flat.light {
-  -webkit-filter: brightness(1.1);
+  color: #eee;
 }
 
-button:active {
+button.button-flat:hover,
-  -webkit-filter: brightness(1.1);
+button.button-flat:focus { /* Material design: focused */
-  text-shadow: none;
+  background-color: rgba(153, 153, 153, 0.2);
+}
+
+button.button-flat:active { /* Material design: pressed */
+  background-color: rgba(153, 153, 153, 0.4);
+}
+
+button.button-raised {
+  background-color: #2196f3;
+  color: #eee;
+  padding: 7px 18px;
+}
+
+button.button-raised:hover,
+button.button-raised:focus {
+  background-color: #38a0f5;
+}
+
+button.button-raised:active {
+  background-color: #51abf6;
 }
 
 /*
@@ -338,31 +415,7 @@ input {
   padding: 6px;
   border: 1px solid #bbb;
   border-radius: 3px;
-  box-shadow: 1px 1px 1px 0px rgba(0,0,0,0.1);
+  outline: none;
-}
-
-/*
- * PLAYER
- */
-
-.player {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  background-color: #000;
-}
-
-.player .letterbox {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  background-size: cover;
-  background-position: center center;
-}
-
-.player video {
-  display: block;
-  width: 100%;
 }
 
 /*
@@ -373,7 +426,7 @@ input {
   background: linear-gradient(to bottom right, #4B79A1, #283E51);
   background-repeat: no-repeat;
   background-size: cover;
-  background-position: 0 50%;
+  background-position: center;
   transition: -webkit-filter 0.1s ease-out;
   position: relative;
   animation: fadein .4s;
@@ -396,10 +449,15 @@ input {
   position: absolute;
   top: 20px;
   left: 20px;
-  width: calc(100% - 150px);
+  right: 20px;
+  width: calc(100% - 40px);
   text-shadow: rgba(0, 0, 0, 0.5) 0 0 4px;
 }
 
+.torrent:hover .metadata {
+  width: calc(100% - 150px);
+}
+
 .torrent .metadata span:not(:last-child)::after {
   content: ' — ';
 }
@@ -456,12 +514,12 @@ input {
   background-color: #F44336;
 }
 
-.torrent.timeout .play,
+.torrent.timeout .play {
-.torrent.unplayable .play {
   padding-top: 8px;
 }
 
-.torrent.requested .play {
+.torrent.requested .play,
+.loading-spinner {
   border-top: 6px solid rgba(255, 255, 255, 0.2);
   border-right: 6px solid rgba(255, 255, 255, 0.2);
   border-bottom: 6px solid rgba(255, 255, 255, 0.2);
@@ -524,6 +582,17 @@ body.drag .torrent-placeholder span {
   color: #def;
 }
 
+body.drag .app::after {
+  content: ' ';
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 3;
+}
+
 /*
  * TORRENT LIST: EXPANDED TORRENT DETAILS
  */
@@ -586,6 +655,32 @@ body.drag .torrent-placeholder span {
   text-align: right;
 }
 
+/*
+ * PLAYER
+ */
+
+.player {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  background-color: #000;
+}
+
+.player .letterbox {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  background-size: cover;
+  background-position: center;
+}
+
+.player .video-player {
+  display: block;
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
+
 /*
  * PLAYER CONTROLS
  */
@@ -661,9 +756,10 @@ body.drag .torrent-placeholder span {
   margin: 0 auto;
 }
 
-.player-controls .chromecast,
+.player-controls .device,
-.player-controls .airplay,
 .player-controls .fullscreen,
+.player-controls .closed-captions,
+.player-controls .volume-icon,
 .player-controls .back {
   display: block;
   width: 20px;
@@ -671,12 +767,13 @@ body.drag .torrent-placeholder span {
   margin: 5px;
 }
 
+.player-controls .volume,
 .player-controls .back {
   float: left;
 }
 
-.player-controls .chromecast,
+.player-controls .device,
-.player-controls .airplay,
+.player-controls .closed-captions,
 .player-controls .fullscreen {
   float: right;
 }
@@ -685,17 +782,50 @@ body.drag .torrent-placeholder span {
   margin-right: 15px;
 }
 
-.player-controls .chromecast,
+.player-controls .volume-icon,
-.player-controls .airplay {
+.player-controls .device {
   font-size: 18px; /* make the cast icons less huge */
   margin-top: 8px !important;
 }
 
-.player-controls .chromecast.active,
+.player-controls .closed-captions.active,
-.player-controls .airplay.active {
+.player-controls .device.active {
   color: #9af;
 }
 
+.player-controls .volume {
+  display: block;
+  width: 90px;
+}
+
+.player-controls .volume-icon {
+  float: left;
+  margin-right: 0px;
+}
+
+.player-controls .volume-slider {
+  -webkit-appearance: none;
+  width: 50px;
+  height: 3px;
+  border: none;
+  padding: 0;
+  vertical-align: sub;
+}
+
+.player-controls .volume-slider::-webkit-slider-thumb {
+  -webkit-appearance: none;
+  background-color: #fff;
+  opacity: 1.0;
+  width: 10px;
+  height: 10px;
+  border: 1px solid #303233;
+  border-radius: 50%;
+}
+
+.player-controls .volume-slider:focus {
+  outline: none;
+}
+
 .player .playback-bar:hover .loading-bar {
   height: 5px;
 }
@@ -706,6 +836,15 @@ body.drag .torrent-placeholder span {
   height: 14px;
 }
 
+::cue {
+  background: none;
+  color: #FFF;
+  font: 24px;
+  line-height: 1.3em;
+  text-shadow: #000 -1px 0 1px, #000 1px 0 1px, #000 0 -1px 1px, #000 0 1px 1px, rgba(50, 50, 50, 0.5) 2px 2px 0;
+}
+
+
 /*
  * CHROMECAST / AIRPLAY CONTROLS
  */
@@ -732,17 +871,95 @@ body.drag .torrent-placeholder span {
   font-weight: bold;
 }
 
+/*
+ * Subtitles list
+ */
+
+.subtitles-list {
+  position: fixed;
+  background: rgba(40, 40, 40, 0.8);
+  min-width: 100px;
+  bottom: 45px;
+  right: 3px;
+  transition: opacity 0.15s ease-out;
+  padding: 5px 10px;
+  border-radius: 3px;
+  margin: 0;
+  list-style-type: none;
+  color: rgba(255, 255, 255, 0.8);
+}
+
+.subtitles-list i {
+  font-size: 11px; /* make the cast icons less huge */
+  margin-right: 4px !important;
+}
+
+/*
+ * MEDIA OVERLAY / AUDIO DETAILS
+ */
+
+.media-overlay-background {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  background-size: cover;
+  background-position: center center;
+}
+
+.media-overlay {
+  max-width: calc(100% - 80px);
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  align-self: center;
+  margin: 0 auto;
+  font-weight: bold;
+  font-size: 24px;
+  line-height: 2;
+}
+
+.media-stalled .loading-spinner {
+  width: 40px;
+  height: 40px;
+  margin: 40px auto;
+}
+
+.media-stalled .loading-status {
+  font-size: 18px;
+  font-weight: normal;
+  text-align: center;
+}
+
+.audio-metadata div {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.audio-metadata .audio-title {
+  font-size: 32px;
+}
+
+.audio-metadata label {
+  display:inline-block;
+  width: 100px;
+  text-align: right;
+  font-weight: normal;
+  margin-right: 25px;
+}
+
 /*
  * ERRORS
  */
 
 .error-popover {
   position: fixed;
-  z-index: 1001;
   top: 36px;
   margin: 0;
   width: 100%;
   overflow: hidden;
+  z-index: 1;
 }
 
 .app.hide-header .error-popover {
@@ -772,29 +989,3 @@ body.drag .torrent-placeholder span {
 .error-popover .error:last-child {
   border-bottom: none;
 }
-
-/*
- * MEDIA QUERIES
- */
-
-@media only screen and (min-width: 700px) {
-  body {
-    font-size: 16px;
-    line-height: 1.5em;
-  }
-  .torrent,
-  .torrent-placeholder {
-    height: 150px;
-  }
-}
-
-@media only screen and (min-width: 900px) {
-  body {
-    font-size: 18px;
-    line-height: 1.5em;
-  }
-  .torrent,
-  .torrent-placeholder {
-    height: 180px;
-  }
-}

renderer/lib/cast.js

@@ -1,159 +1,363 @@
-var chromecasts = require('chromecasts')()
-var airplay = require('airplay-js')
-
-var config = require('../../config')
-var state = require('../state')
-
 // The Cast module talks to Airplay and Chromecast
 // * Modifies state when things change
 // * Starts and stops casting, provides remote video controls
 module.exports = {
   init,
-  openChromecast,
+  open,
-  openAirplay,
+  close,
-  stopCasting,
+  play,
-  playPause,
+  pause,
   seek,
-  isCasting
+  setVolume
 }
 
+var airplay = require('airplay-js')
+var chromecasts = require('chromecasts')()
+var dlnacasts = require('dlnacasts')()
+
+var config = require('../../config')
+
+// App state. Cast modifies state.playing and state.errors in response to events
+var state
+
 // Callback to notify module users when state has changed
 var update
 
-function init (callback) {
+// setInterval() for updating cast status
+var statusInterval = null
+
+// Start looking for cast devices on the local network
+function init (appState, callback) {
+  state = appState
   update = callback
 
-  // Start polling Chromecast or Airplay, whenever we're connected
+  // Listen for devices: Chromecast, DLNA and Airplay
-  setInterval(() => pollCastStatus(state), 1000)
-
-  // Listen for devices: Chromecast and Airplay
   chromecasts.on('update', function (player) {
-    state.devices.chromecast = player
+    state.devices.chromecast = chromecastPlayer(player)
-    addChromecastEvents()
+  })
+
+  dlnacasts.on('update', function (player) {
+    state.devices.dlna = dlnaPlayer(player)
   })
 
   var browser = airplay.createBrowser()
   browser.on('deviceOn', function (player) {
-    state.devices.airplay = player
+    state.devices.airplay = airplayPlayer(player)
-    addAirplayEvents()
   }).start()
 }
 
-function addChromecastEvents () {
+// chromecast player implementation
-  state.devices.chromecast.on('error', function (err) {
+function chromecastPlayer (player) {
-    state.devices.chromecast.errorMessage = err.message
+  function addEvents () {
-    update()
+    player.on('error', function (err) {
-  })
-  state.devices.chromecast.on('disconnect', function () {
-    state.playing.location = 'local'
-    update()
-  })
-}
-
-function addAirplayEvents () {}
-
-// Update our state from the remote TV
-function pollCastStatus (state) {
-  if (state.playing.location === 'chromecast') {
-    state.devices.chromecast.status(function (err, status) {
-      if (err) return console.log('Error getting %s status: %o', state.playing.location, err)
-      state.video.isPaused = status.playerState === 'PAUSED'
-      state.video.currentTime = status.currentTime
-      update()
-    })
-  } else if (state.playing.location === 'airplay') {
-    state.devices.airplay.status(function (status) {
-      state.video.isPaused = status.rate === 0
-      state.video.currentTime = status.position
-      update()
-    })
-  }
-}
-
-function openChromecast () {
-  if (state.playing.location !== 'local') {
-    throw new Error('You can\'t connect to Chromecast when already connected to another device')
-  }
-
-  state.playing.location = 'chromecast-pending'
-  var torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
-  state.devices.chromecast.play(state.server.networkURL, {
-    type: 'video/mp4',
-    title: config.APP_NAME + ' — ' + torrentSummary.name
-  }, function (err) {
-    state.playing.location = err ? 'local' : 'chromecast'
-    update()
-  })
-  update()
-}
-
-function openAirplay () {
-  if (state.playing.location !== 'local') {
-    throw new Error('You can\'t connect to Airplay when already connected to another device')
-  }
-
-  state.playing.location = 'airplay-pending'
-  state.devices.airplay.play(state.server.networkURL, 0, function (res) {
-    if (res.statusCode !== 200) {
       state.playing.location = 'local'
       state.errors.push({
         time: new Date().getTime(),
-        message: 'Couldn\'t connect to Airplay'
+        message: 'Could not connect to Chromecast. ' + err.message
       })
-    } else {
+      update()
-      state.playing.location = 'airplay'
+    })
+    player.on('disconnect', function () {
+      state.playing.location = 'local'
+      update()
+    })
+  }
+
+  function open () {
+    var torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
+    player.play(state.server.networkURL, {
+      type: 'video/mp4',
+      title: config.APP_NAME + ' - ' + torrentSummary.name
+    }, function (err) {
+      if (err) {
+        state.playing.location = 'local'
+        state.errors.push({
+          time: new Date().getTime(),
+          message: 'Could not connect to Chromecast. ' + err.message
+        })
+      } else {
+        state.playing.location = 'chromecast'
+      }
+      update()
+    })
+  }
+
+  function play (callback) {
+    player.play(null, null, callback)
+  }
+
+  function pause (callback) {
+    player.pause(callback)
+  }
+
+  function stop (callback) {
+    player.stop(callback)
+  }
+
+  function status () {
+    player.status(function (err, status) {
+      if (err) return console.log('error getting %s status: %o', state.playing.location, err)
+      state.playing.isPaused = status.playerState === 'PAUSED'
+      state.playing.currentTime = status.currentTime
+      state.playing.volume = status.volume.muted ? 0 : status.volume.level
+      update()
+    })
+  }
+
+  function seek (time, callback) {
+    player.seek(time, callback)
+  }
+
+  function volume (volume, callback) {
+    player.volume(volume, callback)
+  }
+
+  addEvents()
+
+  return {
+    player: player,
+    open: open,
+    play: play,
+    pause: pause,
+    stop: stop,
+    status: status,
+    seek: seek,
+    volume: volume
+  }
+}
+
+// airplay player implementation
+function airplayPlayer (player) {
+  function open () {
+    player.play(state.server.networkURL, 0, function (res) {
+      if (res.statusCode !== 200) {
+        state.playing.location = 'local'
+        state.errors.push({
+          time: new Date().getTime(),
+          message: 'Could not connect to AirPlay.'
+        })
+      } else {
+        state.playing.location = 'airplay'
+      }
+      update()
+    })
+  }
+
+  function play (callback) {
+    player.rate(1, callback)
+  }
+
+  function pause (callback) {
+    player.rate(0, callback)
+  }
+
+  function stop (callback) {
+    player.stop(callback)
+  }
+
+  function status () {
+    player.status(function (status) {
+      state.playing.isPaused = status.rate === 0
+      state.playing.currentTime = status.position
+      // TODO: get airplay volume, implementation needed. meanwhile set value in setVolume
+      // According to docs is in [-30 - 0] (db) range
+      // should be converted to [0 - 1] using (val / 30 + 1)
+      update()
+    })
+  }
+
+  function seek (time, callback) {
+    player.scrub(time, callback)
+  }
+
+  function volume (volume, callback) {
+    // TODO remove line below once we can fetch the information in status update
+    state.playing.volume = volume
+    volume = (volume - 1) * 30
+    player.volume(volume, callback)
+  }
+
+  return {
+    player: player,
+    open: open,
+    play: play,
+    pause: pause,
+    stop: stop,
+    status: status,
+    seek: seek,
+    volume: volume
+  }
+}
+
+// DLNA player implementation
+function dlnaPlayer (player) {
+  function addEvents () {
+    player.on('error', function (err) {
+      state.playing.location = 'local'
+      state.errors.push({
+        time: new Date().getTime(),
+        message: 'Could not connect to DLNA. ' + err.message
+      })
+      update()
+    })
+    player.on('disconnect', function () {
+      state.playing.location = 'local'
+      update()
+    })
+  }
+
+  function open () {
+    var torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
+    player.play(state.server.networkURL, {
+      type: 'video/mp4',
+      title: config.APP_NAME + ' - ' + torrentSummary.name,
+      seek: state.playing.currentTime > 10 ? state.playing.currentTime : 0
+    }, function (err) {
+      if (err) {
+        state.playing.location = 'local'
+        state.errors.push({
+          time: new Date().getTime(),
+          message: 'Could not connect to DLNA. ' + err.message
+        })
+      } else {
+        state.playing.location = 'dlna'
+      }
+      update()
+    })
+  }
+
+  function play (callback) {
+    player.play(null, null, callback)
+  }
+
+  function pause (callback) {
+    player.pause(callback)
+  }
+
+  function stop (callback) {
+    player.stop(callback)
+  }
+
+  function status () {
+    player.status(function (err, status) {
+      if (err) return console.log('error getting %s status: %o', state.playing.location, err)
+      state.playing.isPaused = status.playerState === 'PAUSED'
+      state.playing.currentTime = status.currentTime
+      state.playing.volume = status.volume.level
+      update()
+    })
+  }
+
+  function seek (time, callback) {
+    player.seek(time, callback)
+  }
+
+  function volume (volume, callback) {
+    player.volume(volume, function (err) {
+      // quick volume update
+      state.playing.volume = volume
+      callback(err)
+    })
+  }
+
+  addEvents()
+
+  return {
+    player: player,
+    open: open,
+    play: play,
+    pause: pause,
+    stop: stop,
+    status: status,
+    seek: seek,
+    volume: volume
+  }
+}
+
+// Start polling cast device state, whenever we're connected
+function startStatusInterval () {
+  statusInterval = setInterval(function () {
+    var device = getDevice()
+    if (device) {
+      device.status()
     }
-    update()
+  }, 1000)
-  })
+}
+
+function open (location) {
+  if (state.playing.location !== 'local') {
+    throw new Error('You can\'t connect to ' + location + ' when already connected to another device')
+  }
+
+  state.playing.location = location + '-pending'
+  var device = getDevice(location)
+  if (device) {
+    getDevice(location).open()
+    startStatusInterval()
+  }
+
   update()
 }
 
-// Stops Chromecast or Airplay, move video back to local screen
+// Stops casting, move video back to local screen
-function stopCasting () {
+function close () {
-  if (state.playing.location === 'chromecast') {
+  var device = getDevice()
-    state.devices.chromecast.stop(stoppedCasting)
+  if (device) {
-  } else if (state.playing.location === 'airplay') {
+    device.stop(stoppedCasting)
-    state.devices.airplay.stop(stoppedCasting)
+    clearInterval(statusInterval)
-  } else if (state.playing.location.endsWith('-pending')) {
+  } else {
-    // Connecting to Chromecast took too long or errored out. Let the user cancel
     stoppedCasting()
   }
 }
 
 function stoppedCasting () {
   state.playing.location = 'local'
-  state.video.jumpToTime = state.video.currentTime
+  state.playing.jumpToTime = state.playing.currentTime
   update()
 }
 
-// Checks whether we are connected and already casting
+function getDevice (location) {
-// Returns false if we not casting (state.playing.location === 'local')
+  if (location && state.devices[location]) {
-// or if we're trying to connect but haven't yet ('chromecast-pending', etc)
+    return state.devices[location]
-function isCasting () {
+  } else if (state.playing.location === 'chromecast') {
-  return state.playing.location === 'chromecast' || state.playing.location === 'airplay'
+    return state.devices.chromecast
+  } else if (state.playing.location === 'airplay') {
+    return state.devices.airplay
+  } else if (state.playing.location === 'dlna') {
+    return state.devices.dlna
+  } else {
+    return null
+  }
 }
 
-function playPause () {
+function play () {
-  var device
+  var device = getDevice()
-  if (state.playing.location === 'chromecast') {
+  if (device) {
-    device = state.devices.chromecast
+    device.play(castCallback)
-    if (!state.video.isPaused) device.pause(castCallback)
+  }
-    else device.play(null, null, castCallback)
+}
-  } else if (state.playing.location === 'airplay') {
+
-    device = state.devices.airplay
+function pause () {
-    if (!state.video.isPaused) device.rate(0, castCallback)
+  var device = getDevice()
-    else device.rate(1, castCallback)
+  if (device) {
+    device.pause(castCallback)
   }
 }
 
 function seek (time) {
-  if (state.playing.location === 'chromecast') {
+  var device = getDevice()
-    state.devices.chromecast.seek(time, castCallback)
+  if (device) {
-  } else if (state.playing.location === 'airplay') {
+    device.seek(time, castCallback)
-    state.devices.airplay.scrub(time, castCallback)
+  }
+}
+
+function setVolume (volume) {
+  var device = getDevice()
+  if (device) {
+    device.volume(volume, castCallback)
   }
 }
 
 function castCallback () {
-  console.log(state.playing.location + ' callback: %o', arguments)
+  console.log('%s callback: %o', state.playing.location, arguments)
 }

renderer/lib/dispatcher.js

@@ -0,0 +1,38 @@
+module.exports = {
+  setDispatch,
+  dispatch,
+  dispatcher
+}
+
+// Memoize most of our event handlers, which are functions in the form
+// () => dispatch(<args>)
+// ... this prevents virtual-dom from updating every listener on every update()
+var _dispatchers = {}
+var _dispatch = () => {}
+
+function setDispatch (dispatch) {
+  _dispatch = dispatch
+}
+
+// Get a _memoized event handler that calls dispatch()
+// All args must be JSON-able
+function dispatcher (...args) {
+  var json = JSON.stringify(args)
+  var handler = _dispatchers[json]
+  if (!handler) {
+    handler = _dispatchers[json] = (e) => {
+      if (e && e.stopPropagation && e.currentTarget) {
+        // Don't click on whatever is below the button
+        e.stopPropagation()
+        // Don't register clicks on disabled buttons
+        if (e.currentTarget.classList.contains('disabled')) return
+      }
+      _dispatch.apply(null, args)
+    }
+  }
+  return handler
+}
+
+function dispatch (...args) {
+  _dispatch.apply(null, args)
+}

renderer/lib/location-history.js

@@ -4,44 +4,59 @@ function LocationHistory () {
   if (!new.target) return new LocationHistory()
   this._history = []
   this._forward = []
+  this._pending = null
 }
 
-LocationHistory.prototype.go = function (page) {
+LocationHistory.prototype.go = function (page, cb) {
   console.log('go', page)
   this.clearForward()
-  this._go(page)
+  this._go(page, cb)
 }
 
-LocationHistory.prototype._go = function (page) {
+LocationHistory.prototype._go = function (page, cb) {
+  if (this._pending) return
   if (page.onbeforeload) {
+    this._pending = page
     page.onbeforeload((err) => {
-      if (err) return
+      if (this._pending !== page) return /* navigation was cancelled */
+      this._pending = null
+      if (err) {
+        if (cb) cb(err)
+        return
+      }
       this._history.push(page)
+      if (cb) cb()
     })
   } else {
     this._history.push(page)
+    if (cb) cb()
   }
 }
 
-LocationHistory.prototype.back = function () {
+LocationHistory.prototype.back = function (cb) {
   if (this._history.length <= 1) return
 
   var page = this._history.pop()
 
   if (page.onbeforeunload) {
+    // TODO: this is buggy. If the user clicks back twice, then those pages
+    // may end up in _forward in the wrong order depending on which onbeforeunload
+    // call finishes first.
     page.onbeforeunload(() => {
       this._forward.push(page)
+      if (cb) cb()
     })
   } else {
     this._forward.push(page)
+    if (cb) cb()
   }
 }
 
-LocationHistory.prototype.forward = function () {
+LocationHistory.prototype.forward = function (cb) {
   if (this._forward.length === 0) return
 
   var page = this._forward.pop()
-  this._go(page)
+  this._go(page, cb)
 }
 
 LocationHistory.prototype.clearForward = function () {
@@ -59,3 +74,11 @@ LocationHistory.prototype.hasBack = function () {
 LocationHistory.prototype.hasForward = function () {
   return this._forward.length > 0
 }
+
+LocationHistory.prototype.pending = function () {
+  return this._pending
+}
+
+LocationHistory.prototype.clearPending = function () {
+  this._pending = null
+}

renderer/lib/sound.js

@@ -0,0 +1,71 @@
+module.exports = {
+  preload,
+  play
+}
+
+var config = require('../../config')
+var path = require('path')
+
+/* Cache of Audio elements, for instant playback */
+var cache = {}
+
+var sounds = {
+  ADD: {
+    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'add.wav'),
+    volume: 0.2
+  },
+  DELETE: {
+    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'delete.wav'),
+    volume: 0.1
+  },
+  DISABLE: {
+    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'disable.wav'),
+    volume: 0.2
+  },
+  DONE: {
+    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'done.wav'),
+    volume: 0.2
+  },
+  ENABLE: {
+    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'enable.wav'),
+    volume: 0.2
+  },
+  ERROR: {
+    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'error.wav'),
+    volume: 0.2
+  },
+  PLAY: {
+    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'play.wav'),
+    volume: 0.2
+  },
+  STARTUP: {
+    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'startup.wav'),
+    volume: 0.4
+  }
+}
+
+function preload () {
+  for (var name in sounds) {
+    if (!cache[name]) {
+      var sound = sounds[name]
+      var audio = cache[name] = new window.Audio()
+      audio.volume = sound.volume
+      audio.src = sound.url
+    }
+  }
+}
+
+function play (name) {
+  var audio = cache[name]
+  if (!audio) {
+    var sound = sounds[name]
+    if (!sound) {
+      throw new Error('Invalid sound name')
+    }
+    audio = cache[name] = new window.Audio()
+    audio.volume = sound.volume
+    audio.src = sound.url
+  }
+  audio.currentTime = 0
+  audio.play()
+}

renderer/lib/torrent-player.js

@@ -1,5 +1,8 @@
 module.exports = {
-  isPlayable: isPlayable
+  isPlayable,
+  isVideo,
+  isAudio,
+  isPlayableTorrent
 }
 
 var path = require('path')
@@ -8,6 +11,19 @@ var path = require('path')
  * Determines whether a file in a torrent is audio/video we can play
  */
 function isPlayable (file) {
-  var extname = path.extname(file.name)
+  return isVideo(file) || isAudio(file)
-  return ['.mp4', '.m4v', '.webm', '.mov', '.mkv'].indexOf(extname) !== -1
+}
+
+function isVideo (file) {
+  var ext = path.extname(file.name).toLowerCase()
+  return ['.mp4', '.m4v', '.webm', '.mov', '.mkv'].indexOf(ext) !== -1
+}
+
+function isAudio (file) {
+  var ext = path.extname(file.name).toLowerCase()
+  return ['.mp3', '.aac', '.ogg', '.wav'].indexOf(ext) !== -1
+}
+
+function isPlayableTorrent (torrentSummary) {
+  return torrentSummary.files && torrentSummary.files.some(isPlayable)
 }

renderer/lib/torrent-poster.js

@@ -20,7 +20,7 @@ function torrentPoster (torrent, cb) {
 
 function getLargestFileByExtension (torrent, extensions) {
   var files = torrent.files.filter(function (file) {
-    var extname = path.extname(file.name)
+    var extname = path.extname(file.name).toLowerCase()
     return extensions.indexOf(extname) !== -1
   })
   if (files.length === 0) return undefined
@@ -64,6 +64,8 @@ function torrentPosterFromVideo (file, torrent, cb) {
 
       server.destroy()
 
+      if (buf.length === 0) return cb(new Error('Generated poster contains no data'))
+
       cb(null, buf, '.jpg')
     }
   }

renderer/lib/torrent-summary.js

@@ -0,0 +1,24 @@
+module.exports = {
+  getPosterPath,
+  getTorrentPath
+}
+
+var path = require('path')
+var 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.CONFIG_TORRENT_PATH, torrentSummary.torrentFileName)
+}
+
+// Expects a torrentSummary
+// Returns an absolute path to the poster image, or null if unavailable
+function getPosterPath (torrentSummary) {
+  if (!torrentSummary || !torrentSummary.posterFileName) return null
+  var posterPath = path.join(config.CONFIG_POSTER_PATH, torrentSummary.posterFileName)
+  // Work around a Chrome bug (reproduced in vanilla Chrome, not just Electron):
+  // Backslashes in URLS in CSS cause bizarre string encoding issues
+  return posterPath.replace(/\\/g, '/')
+}

renderer/main.html

@@ -6,7 +6,6 @@
     <link rel="stylesheet" href="index.css" charset="utf-8">
   </head>
   <body>
-    <div class="loading"><i class="icon">sync</i></div>
     <script async src="index.js"></script>
   </body>
 </html>

renderer/state.js

@@ -1,112 +1,264 @@
-var os = require('os')
+var electron = require('electron')
 var path = require('path')
 
+var remote = electron.remote
+
 var config = require('../config')
 var LocationHistory = require('./lib/location-history')
 
 module.exports = {
-  /*
+  getInitialState,
-   * Temporary state disappears once the program exits.
+  getDefaultPlayState,
-   * It can contain complex objects like open connections, etc.
+  getDefaultSavedState
-   */
+}
-  client: null, /* the WebTorrent client */
+
-  server: null, /* local WebTorrent-to-HTTP server */
+function getInitialState () {
-  prev: {}, /* used for state diffing in updateElectron() */
+  return {
-  location: new LocationHistory(),
+    /*
-  window: {
+     * Temporary state disappears once the program exits.
-    bounds: null, /* {x, y, width, height } */
+     * It can contain complex objects like open connections, etc.
-    isFocused: true,
+     */
-    isFullScreen: false,
+    client: null, /* the WebTorrent client */
-    title: config.APP_NAME /* current window title */
+    server: null, /* local WebTorrent-to-HTTP server */
-  },
+    prev: {}, /* used for state diffing in updateElectron() */
-  selectedInfoHash: null, /* the torrent we've selected to view details. see state.torrents */
+    location: new LocationHistory(),
-  playing: { /* the torrent and file we're currently streaming */
+    window: {
+      bounds: null, /* {x, y, width, height } */
+      isFocused: true,
+      isFullScreen: false,
+      title: config.APP_WINDOW_TITLE
+    },
+    selectedInfoHash: null, /* the torrent we've selected to view details. see state.torrents */
+    playing: getDefaultPlayState(), /* the media (audio or video) that we're currently playing */
+    devices: { /* playback devices like Chromecast and AppleTV */
+      airplay: null, /* airplay client. finds and manages AppleTVs */
+      chromecast: null /* chromecast client. finds and manages Chromecasts */
+    },
+    dock: {
+      badge: 0,
+      progress: 0
+    },
+    modal: null, /* modal popover */
+    errors: [], /* user-facing errors */
+    nextTorrentKey: 1, /* identify torrents for IPC between the main and webtorrent windows */
+
+    /*
+     * Saved state is read from and written to a file every time the app runs.
+     * It should be simple and minimal and must be JSON.
+     * It must never contain absolute paths since we have a portable app.
+     *
+     * Config path:
+     *
+     * OS X                 ~/Library/Application Support/WebTorrent/config.json
+     * Linux (XDG)          $XDG_CONFIG_HOME/WebTorrent/config.json
+     * Linux (Legacy)       ~/.config/WebTorrent/config.json
+     * Windows (> Vista)    %LOCALAPPDATA%/WebTorrent/config.json
+     * Windows (XP, 2000)   %USERPROFILE%/Local Settings/Application Data/WebTorrent/config.json
+     *
+     * Also accessible via `require('application-config')('WebTorrent').filePath`
+     */
+    saved: {}
+  }
+}
+
+/* Whenever we stop playing video or audio, here's what we reset state.playing to */
+function getDefaultPlayState () {
+  return {
     infoHash: null, /* the info hash of the torrent we're playing */
     fileIndex: null, /* the zero-based index within the torrent */
-    location: 'local' /* 'local', 'chromecast', 'airplay' */
+    location: 'local', /* 'local', 'chromecast', 'airplay' */
-  },
+    type: null, /* 'audio' or 'video', could be 'other' if ever support eg streaming to VLC */
-  devices: { /* playback devices like Chromecast and AppleTV */
-    airplay: null, /* airplay client. finds and manages AppleTVs */
-    chromecast: null /* chromecast client. finds and manages Chromecasts */
-  },
-  video: { /* state of the video player screen */
     currentTime: 0, /* seconds */
     duration: 1, /* seconds */
     isPaused: true,
-    mouseStationarySince: 0 /* Unix time in ms */
+    isStalled: false,
-  },
+    lastTimeUpdate: 0, /* Unix time in ms */
-  dock: {
+    mouseStationarySince: 0, /* Unix time in ms */
-    badge: 0,
+    subtitles: {
-    progress: 0
+      tracks: [], /* subtitles file (Buffer) */
-  },
+      enabled: false
-  errors: [], /* user-facing errors */
+    }
+  }
+}
 
-  /*
+/* If the saved state file doesn't exist yet, here's what we use instead */
-   * Saved state is read from and written to a file every time the app runs.
+function getDefaultSavedState () {
-   * It should be simple and minimal and must be JSON.
+  return {
-   *
-   * Config path:
-   *
-   * OS X                 ~/Library/Application Support/WebTorrent/config.json
-   * Linux (XDG)          $XDG_CONFIG_HOME/WebTorrent/config.json
-   * Linux (Legacy)       ~/.config/WebTorrent/config.json
-   * Windows (> Vista)    %LOCALAPPDATA%/WebTorrent/config.json
-   * Windows (XP, 2000)   %USERPROFILE%/Local Settings/Application Data/WebTorrent/config.json
-   *
-   * Also accessible via `require('application-config')('WebTorrent').filePath`
-   */
-  saved: {},
-
-  /* If the saved state file doesn't exist yet, here's what we use instead */
-  defaultSavedState: {
     version: 1, /* make sure we can upgrade gracefully later */
     torrents: [
       {
         status: 'paused',
         infoHash: '88594aaacbde40ef3e2510c47374ec0aa396c08e',
+        magnetURI: 'magnet:?xt=urn:btih:88594aaacbde40ef3e2510c47374ec0aa396c08e&dn=bbb_sunflower_1080p_30fps_normal.mp4&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.publicbt.com%3A80%2Fannounce&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&tr=wss%3A%2F%2Ftracker.webtorrent.io&ws=http%3A%2F%2Fdistribution.bbb3d.renderfarming.net%2Fvideo%2Fmp4%2Fbbb_sunflower_1080p_30fps_normal.mp4',
         displayName: 'Big Buck Bunny',
-        posterURL: path.join(config.ROOT_PATH, 'static', 'bigBuckBunny.jpg'),
+        posterURL: 'bigBuckBunny.jpg',
-        torrentPath: path.join(config.ROOT_PATH, 'static', 'bigBuckBunny.torrent'),
+        torrentPath: 'bigBuckBunny.torrent',
         files: [
           {
-            'name': 'bbb_sunflower_1080p_30fps_normal.mp4',
+            length: 276134947,
-            'length': 276134947,
+            name: 'bbb_sunflower_1080p_30fps_normal.mp4'
-            'numPiecesPresent': 0,
-            'numPieces': 527
           }
         ]
       },
       {
         status: 'paused',
         infoHash: '6a9759bffd5c0af65319979fb7832189f4f3c35d',
+        magnetURI: 'magnet:?xt=urn:btih:6a9759bffd5c0af65319979fb7832189f4f3c35d&dn=sintel.mp4&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&tr=wss%3A%2F%2Ftracker.webtorrent.io&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fsintel-1024-surround.mp4',
         displayName: 'Sintel',
-        posterURL: path.join(config.ROOT_PATH, 'static', 'sintel.jpg'),
+        posterURL: 'sintel.jpg',
-        torrentPath: path.join(config.ROOT_PATH, 'static', 'sintel.torrent'),
+        torrentPath: 'sintel.torrent',
         files: [
           {
-            'name': 'sintel.mp4',
+            length: 129241752,
-            'length': 129241752,
+            name: 'sintel.mp4'
-            'numPiecesPresent': 0,
-            'numPieces': 987
           }
         ]
       },
       {
         status: 'paused',
         infoHash: '02767050e0be2fd4db9a2ad6c12416ac806ed6ed',
+        magnetURI: 'magnet:?xt=urn:btih:02767050e0be2fd4db9a2ad6c12416ac806ed6ed&dn=tears_of_steel_1080p.webm&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&tr=wss%3A%2F%2Ftracker.webtorrent.io',
         displayName: 'Tears of Steel',
-        posterURL: path.join(config.ROOT_PATH, 'static', 'tearsOfSteel.jpg'),
+        posterURL: 'tearsOfSteel.jpg',
-        torrentPath: path.join(config.ROOT_PATH, 'static', 'tearsOfSteel.torrent'),
+        torrentPath: 'tearsOfSteel.torrent',
         files: [
           {
-            'name': 'tears_of_steel_1080p.webm',
+            length: 571346576,
-            'length': 571346576,
+            name: 'tears_of_steel_1080p.webm'
-            'numPiecesPresent': 0,
+          }
-            'numPieces': 2180
+        ]
+      },
+      {
+        status: 'paused',
+        infoHash: '6a02592d2bbc069628cd5ed8a54f88ee06ac0ba5',
+        magnetURI: 'magnet:?xt=urn:btih:6a02592d2bbc069628cd5ed8a54f88ee06ac0ba5&dn=CosmosLaundromatFirstCycle&tr=http%3A%2F%2Fbt1.archive.org%3A6969%2Fannounce&tr=http%3A%2F%2Fbt2.archive.org%3A6969%2Fannounce&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&tr=wss%3A%2F%2Ftracker.webtorrent.io&ws=http%3A%2F%2Fia601508.us.archive.org%2F14%2Fitems%2F&ws=http%3A%2F%2Fia801508.us.archive.org%2F14%2Fitems%2F&ws=https%3A%2F%2Farchive.org%2Fdownload%2F',
+        displayName: 'Cosmos Laundromat (Preview)',
+        posterURL: 'cosmosLaundromat.jpg',
+        torrentPath: 'cosmosLaundromat.torrent',
+        files: [
+          {
+            length: 223580,
+            name: 'Cosmos Laundromat - First Cycle (1080p).gif'
+          },
+          {
+            length: 220087570,
+            name: 'Cosmos Laundromat - First Cycle (1080p).mp4'
+          },
+          {
+            length: 56832560,
+            name: 'Cosmos Laundromat - First Cycle (1080p).ogv'
+          },
+          {
+            length: 3949,
+            name: 'CosmosLaundromat-FirstCycle1080p.en.srt'
+          },
+          {
+            length: 3907,
+            name: 'CosmosLaundromat-FirstCycle1080p.es.srt'
+          },
+          {
+            length: 4119,
+            name: 'CosmosLaundromat-FirstCycle1080p.fr.srt'
+          },
+          {
+            length: 3941,
+            name: 'CosmosLaundromat-FirstCycle1080p.it.srt'
+          },
+          {
+            length: 11264,
+            name: 'CosmosLaundromatFirstCycle_meta.sqlite'
+          },
+          {
+            length: 1204,
+            name: 'CosmosLaundromatFirstCycle_meta.xml'
+          }
+        ]
+      },
+      {
+        status: 'paused',
+        infoHash: '3ba219a8634bf7bae3d848192b2da75ae995589d',
+        magnetURI: 'magnet:?xt=urn:btih:3ba219a8634bf7bae3d848192b2da75ae995589d&dn=The+WIRED+CD+-+Rip.+Sample.+Mash.+Share.&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&tr=wss%3A%2F%2Ftracker.webtorrent.io&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F',
+        displayName: 'The WIRED CD - Rip. Sample. Mash. Share.',
+        posterURL: 'wired-cd.jpg',
+        torrentPath: 'wired-cd.torrent',
+        files: [
+          {
+            length: 1964275,
+            name: '01 - Beastie Boys - Now Get Busy.mp3'
+          },
+          {
+            length: 3610523,
+            name: '02 - David Byrne - My Fair Lady.mp3'
+          },
+          {
+            length: 2759377,
+            name: '03 - Zap Mama - Wadidyusay.mp3'
+          },
+          {
+            length: 5816537,
+            name: '04 - My Morning Jacket - One Big Holiday.mp3'
+          },
+          {
+            length: 2106421,
+            name: '05 - Spoon - Revenge!.mp3'
+          },
+          {
+            length: 3347550,
+            name: '06 - Gilberto Gil - Oslodum.mp3'
+          },
+          {
+            length: 2107577,
+            name: '07 - Dan The Automator - Relaxation Spa Treatment.mp3'
+          },
+          {
+            length: 3108130,
+            name: '08 - Thievery Corporation - Dc 3000.mp3'
+          },
+          {
+            length: 3051528,
+            name: '09 - Le Tigre - Fake French.mp3'
+          },
+          {
+            length: 3270259,
+            name: '10 - Paul Westerberg - Looking Up In Heaven.mp3'
+          },
+          {
+            length: 3263528,
+            name: '11 - Chuck D - No Meaning No (feat. Fine Arts Militia).mp3'
+          },
+          {
+            length: 6380952,
+            name: '12 - The Rapture - Sister Saviour (Blackstrobe Remix).mp3'
+          },
+          {
+            length: 6550396,
+            name: '13 - Cornelius - Wataridori 2.mp3'
+          },
+          {
+            length: 3034692,
+            name: '14 - DJ Danger Mouse - What U Sittin\' On (feat. Jemini, Cee Lo And Tha Alkaholiks).mp3'
+          },
+          {
+            length: 3854611,
+            name: '15 - DJ Dolores - Oslodum 2004.mp3'
+          },
+          {
+            length: 1762120,
+            name: '16 - Matmos - Action At A Distance.mp3'
+          },
+          {
+            length: 4071,
+            name: 'README.md'
+          },
+          {
+            length: 78163,
+            name: 'poster.jpg'
           }
         ]
       }
     ],
-    downloadPath: path.join(os.homedir(), 'Downloads')
+    downloadPath: config.IS_PORTABLE
+      ? path.join(config.CONFIG_PATH, 'Downloads')
+      : remote.app.getPath('downloads')
   }
 }

renderer/views/app.js

@@ -5,22 +5,26 @@ var hyperx = require('hyperx')
 var hx = hyperx(h)
 
 var Header = require('./header')
-var Player = require('./player')
+var Views = {
-var TorrentList = require('./torrent-list')
+  'home': require('./torrent-list'),
+  'player': require('./player'),
+  'create-torrent': require('./create-torrent-page')
+}
 var Modals = {
-  'open-torrent-address-modal': require('./open-torrent-address-modal')
+  'open-torrent-address-modal': require('./open-torrent-address-modal'),
+  'update-available-modal': require('./update-available-modal')
 }
 
-function App (state, dispatch) {
+function App (state) {
   // Hide player controls while playing video, if the mouse stays still for a while
   // Never hide the controls when:
   // * The mouse is over the controls or we're scrubbing (see CSS)
   // * The video is paused
   // * The video is playing remotely on Chromecast or Airplay
   var hideControls = state.location.current().url === 'player' &&
-    state.video.mouseStationarySince !== 0 &&
+    state.playing.mouseStationarySince !== 0 &&
-    new Date().getTime() - state.video.mouseStationarySince > 2000 &&
+    new Date().getTime() - state.playing.mouseStationarySince > 2000 &&
-    !state.video.isPaused &&
+    !state.playing.isPaused &&
     state.playing.location === 'local'
 
   // Hide the header on Windows/Linux when in the player
@@ -38,47 +42,43 @@ function App (state, dispatch) {
 
   return hx`
     <div class='app ${cls.join(' ')}'>
-      ${Header(state, dispatch)}
+      ${Header(state)}
-      ${getErrorPopover()}
+      ${getErrorPopover(state)}
-      <div class='content'>${getView()}</div>
+      <div class='content'>${getView(state)}</div>
-      ${getModal()}
+      ${getModal(state)}
     </div>
   `
-
+}
-  function getErrorPopover () {
+
-    var now = new Date().getTime()
+function getErrorPopover (state) {
-    var recentErrors = state.errors.filter((x) => now - x.time < 5000)
+  var now = new Date().getTime()
-
+  var recentErrors = state.errors.filter((x) => now - x.time < 5000)
-    var errorElems = recentErrors.map(function (error) {
+
-      return hx`<div class='error'>${error.message}</div>`
+  var errorElems = recentErrors.map(function (error) {
-    })
+    return hx`<div class='error'>${error.message}</div>`
-    return hx`
+  })
-    <div class='error-popover ${recentErrors.length > 0 ? 'visible' : 'hidden'}'>
+  return hx`
-        <div class='title'>Error</div>
+  <div class='error-popover ${recentErrors.length > 0 ? 'visible' : 'hidden'}'>
-        ${errorElems}
+      <div class='title'>Error</div>
-      </div>
+      ${errorElems}
-    `
+    </div>
-  }
+  `
-
+}
-  function getModal () {
+
-    if (state.modal) {
+function getModal (state) {
-      var contents = Modals[state.modal](state, dispatch)
+  if (!state.modal) return
-      return hx`
+  var contents = Modals[state.modal.id](state)
-        <div class='modal'>
+  return hx`
-          <div class='modal-background'></div>
+    <div class='modal'>
-          <div class='modal-content add-file-modal'>
+      <div class='modal-background'></div>
-            ${contents}
+      <div class='modal-content'>
-          </div>
+        ${contents}
-        </div>
+      </div>
-      `
+    </div>
-    }
+  `
-  }
+}
-
+
-  function getView () {
+function getView (state) {
-    if (state.location.current().url === 'home') {
+  var url = state.location.current().url
-      return TorrentList(state, dispatch)
+  return Views[url](state)
-    } else if (state.location.current().url === 'player') {
-      return Player(state, dispatch)
-    }
-  }
 }

renderer/views/create-torrent-page.js

@@ -0,0 +1,138 @@
+module.exports = CreateTorrentPage
+
+var h = require('virtual-dom/h')
+var hyperx = require('hyperx')
+var hx = hyperx(h)
+
+var createTorrent = require('create-torrent')
+var path = require('path')
+var prettyBytes = require('prettier-bytes')
+
+var {dispatch} = require('../lib/dispatcher')
+
+function CreateTorrentPage (state) {
+  var info = state.location.current()
+
+  // Preprocess: exclude .DS_Store and other dotfiles
+  var files = info.files
+    .filter((f) => !f.name.startsWith('.'))
+    .map((f) => ({name: f.name, path: f.path, size: f.size}))
+
+  // First, extract the base folder that the files are all in
+  var pathPrefix = info.folderPath
+  if (!pathPrefix) {
+    if (files.length > 0) {
+      pathPrefix = files.map((x) => x.path).reduce(findCommonPrefix)
+      if (!pathPrefix.endsWith('/') && !pathPrefix.endsWith('\\')) {
+        pathPrefix = path.dirname(pathPrefix)
+      }
+    } else {
+      pathPrefix = files[0]
+    }
+  }
+
+  // Sanity check: show the number of files and total size
+  var numFiles = files.length
+  console.log('FILES', files)
+  var totalBytes = files
+    .map((f) => f.size)
+    .reduce((a, b) => a + b, 0)
+  var torrentInfo = `${numFiles} files, ${prettyBytes(totalBytes)}`
+
+  // Then, use the name of the base folder (or sole file, for a single file torrent)
+  // as the default name. Show all files relative to the base folder.
+  var defaultName = path.basename(pathPrefix)
+  var basePath = path.dirname(pathPrefix)
+  var maxFileElems = 100
+  var fileElems = files.slice(0, maxFileElems).map(function (file) {
+    var relativePath = files.length === 0 ? file.name : path.relative(pathPrefix, file.path)
+    return hx`<div>${relativePath}</div>`
+  })
+  if (files.length > maxFileElems) {
+    fileElems.push(hx`<div>+ ${maxFileElems - files.length} more</div>`)
+  }
+  var trackers = createTorrent.announceList.join('\n')
+  var collapsedClass = info.showAdvanced ? 'expanded' : 'collapsed'
+
+  return hx`
+    <div class='create-torrent-page'>
+      <h2>Create torrent ${defaultName}</h2>
+      <p class="torrent-info">
+        ${torrentInfo}
+      </p>
+      <p class='torrent-attribute'>
+        <label>Path:</label>
+        <div class='torrent-attribute'>${pathPrefix}</div>
+      </p>
+      <div class='expand-collapse ${collapsedClass}' onclick=${handleToggleShowAdvanced}>
+        ${info.showAdvanced ? 'Basic' : 'Advanced'}
+      </div>
+      <div class="create-torrent-advanced ${collapsedClass}">
+        <p class='torrent-attribute'>
+          <label>Comment:</label>
+          <textarea class='torrent-attribute torrent-comment'></textarea>
+        </p>
+        <p class='torrent-attribute'>
+          <label>Trackers:</label>
+          <textarea class='torrent-attribute torrent-trackers'>${trackers}</textarea>
+        </p>
+        <p class='torrent-attribute'>
+          <label>Private:</label>
+          <input type='checkbox' class='torrent-is-private' value='torrent-is-private'>
+        </p>
+        <p class='torrent-attribute'>
+          <label>Files:</label>
+          <div>${fileElems}</div>
+        </p>
+      </div>
+      <p class="float-right">
+        <button class='button-flat light' onclick=${handleCancel}>Cancel</button>
+        <button class='button-raised' onclick=${handleOK}>Create Torrent</button>
+      </p>
+    </div>
+  `
+
+  function handleOK () {
+    var announceList = document.querySelector('.torrent-trackers').value
+      .split('\n')
+      .map((s) => s.trim())
+      .filter((s) => s !== '')
+    var isPrivate = document.querySelector('.torrent-is-private').checked
+    var comment = document.querySelector('.torrent-comment').value.trim()
+    var options = {
+      // We can't let the user choose their own name if we want WebTorrent
+      // to use the files in place rather than creating a new folder.
+      // If we ever want to add support for that:
+      // name: document.querySelector('.torrent-name').value
+      name: defaultName,
+      path: basePath,
+      files: files,
+      announce: announceList,
+      private: isPrivate,
+      comment: comment
+    }
+    dispatch('createTorrent', options)
+    dispatch('backToList')
+  }
+
+  function handleCancel () {
+    dispatch('backToList')
+  }
+
+  function handleToggleShowAdvanced () {
+    // TODO: what's the clean way to handle this?
+    // Should every button on every screen have its own dispatch()?
+    info.showAdvanced = !info.showAdvanced
+    dispatch('update')
+  }
+}
+
+// Finds the longest common prefix
+function findCommonPrefix (a, b) {
+  for (var i = 0; i < a.length && i < b.length; i++) {
+    if (a.charCodeAt(i) !== b.charCodeAt(i)) break
+  }
+  if (i === a.length) return a
+  if (i === b.length) return b
+  return a.substring(0, i)
+}

renderer/views/header.js

@@ -4,7 +4,9 @@ var h = require('virtual-dom/h')
 var hyperx = require('hyperx')
 var hx = hyperx(h)
 
-function Header (state, dispatch) {
+var {dispatcher} = require('../lib/dispatcher')
+
+function Header (state) {
   return hx`
     <div class='header'>
       ${getTitle()}
@@ -12,13 +14,13 @@ function Header (state, dispatch) {
         <i.icon.back
           class=${state.location.hasBack() ? '' : 'disabled'}
           title='Back'
-          onclick=${() => dispatch('back')}>
+          onclick=${dispatcher('back')}>
           chevron_left
         </i>
         <i.icon.forward
           class=${state.location.hasForward() ? '' : 'disabled'}
           title='Forward'
-          onclick=${() => dispatch('forward')}>
+          onclick=${dispatcher('forward')}>
           chevron_right
         </i>
       </div>
@@ -40,7 +42,7 @@ function Header (state, dispatch) {
         <i
           class='icon add'
           title='Add torrent'
-          onclick=${() => dispatch('showOpenTorrentFile')}>
+          onclick=${dispatcher('showOpenTorrentFile')}>
           add
         </i>
       `

renderer/views/open-torrent-address-modal.js

@@ -4,28 +4,33 @@ var h = require('virtual-dom/h')
 var hyperx = require('hyperx')
 var hx = hyperx(h)
 
-function OpenTorrentAddressModal (state, dispatch) {
+var {dispatch} = require('../lib/dispatcher')
+
+function OpenTorrentAddressModal (state) {
   return hx`
     <div class='open-torrent-address-modal'>
-      <p><strong>Enter torrent address or magnet link</strong></p>
+      <p><label>Enter torrent address or magnet link</label></p>
       <p>
-        <input id='add-torrent-url' type='text' autofocus onkeypress=${handleKeyPress} />
+        <input id='add-torrent-url' type='text' onkeypress=${handleKeyPress} />
-        <button class='primary' onclick=${handleOK}>OK</button>
-        <button class='cancel' onclick=${handleCancel}>Cancel</button>
       </p>
+      <p class='float-right'>
+        <button class='button button-flat' onclick=${handleCancel}>CANCEL</button>
+          <button class='button button-raised' onclick=${handleOK}>OK</button>
+      </p>
+      <script>document.querySelector('#add-torrent-url').focus()</script>
     </div>
   `
-
+}
-  function handleKeyPress (e) {
+
-    if (e.which === 13) handleOK() /* hit Enter to submit */
+function handleKeyPress (e) {
-  }
+  if (e.which === 13) handleOK() /* hit Enter to submit */
-
+}
-  function handleOK () {
+
-    dispatch('exitModal')
+function handleOK () {
-    dispatch('addTorrent', document.querySelector('#add-torrent-url').value)
+  dispatch('exitModal')
-  }
+  dispatch('addTorrent', document.querySelector('#add-torrent-url').value)
-
+}
-  function handleCancel () {
+
-    dispatch('exitModal')
+function handleCancel () {
-  }
+  dispatch('exitModal')
 }

renderer/views/player.js

@@ -4,58 +4,117 @@ var h = require('virtual-dom/h')
 var hyperx = require('hyperx')
 var hx = hyperx(h)
 
+var WebChimeraPlayer = require('wcjs-player')
+var prettyBytes = require('prettier-bytes')
+var Bitfield = require('bitfield')
+
+var TorrentSummary = require('../lib/torrent-summary')
+var {dispatch, dispatcher} = require('../lib/dispatcher')
+
 // Shows a streaming video player. Standard features + Chromecast + Airplay
-function Player (state, dispatch) {
+function Player (state) {
   // 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
   var showVideo = state.playing.location === 'local'
   return hx`
     <div
       class='player'
-      onmousemove=${() => dispatch('videoMouseMoved')}>
+      onmousemove=${dispatcher('mediaMouseMoved')}>
-      ${showVideo ? renderVideo(state, dispatch) : renderCastScreen(state, dispatch)}
+      ${showVideo ? renderMedia(state) : renderCastScreen(state)}
-      ${renderPlayerControls(state, dispatch)}
+      ${renderPlayerControls(state)}
-    </div>
+      </div>
   `
 }
 
-function renderVideo (state, dispatch) {
+function renderMedia (state) {
+  if (!state.server) return
+  if (false) return renderMediaTag(state)
+  else return renderMediaVLC(state)
+}
+
+// Renders using a <video> or <audio> tag
+// Handles only a subset of codecs, but it's cleaner and more efficient
+// See renderMediaVLC()
+function renderMediaTag (state) {
   // Unfortunately, play/pause can't be done just by modifying HTML.
   // Instead, grab the DOM node and play/pause it if necessary
-  var videoElement = document.querySelector('video')
+  var mediaElement = document.querySelector(state.playing.type) /* get the <video> or <audio> tag */
-  if (videoElement !== null) {
+  if (mediaElement !== null) {
-    if (state.video.isPaused && !videoElement.paused) {
+    if (state.playing.isPaused && !mediaElement.paused) {
-      videoElement.pause()
+      mediaElement.pause()
-    } else if (!state.video.isPaused && videoElement.paused) {
+    } else if (!state.playing.isPaused && mediaElement.paused) {
-      videoElement.play()
+      mediaElement.play()
     }
     // When the user clicks or drags on the progress bar, jump to that position
-    if (state.video.jumpToTime) {
+    if (state.playing.jumpToTime) {
-      videoElement.currentTime = state.video.jumpToTime
+      mediaElement.currentTime = state.playing.jumpToTime
-      state.video.jumpToTime = null
+      state.playing.jumpToTime = null
     }
-    state.video.currentTime = videoElement.currentTime
+    // Set volume
-    state.video.duration = videoElement.duration
+    if (state.playing.setVolume !== null && isFinite(state.playing.setVolume)) {
+      mediaElement.volume = state.playing.setVolume
+      state.playing.setVolume = null
+    }
+
+    // fix textTrack cues not been removed <track> rerender
+    if (state.playing.subtitles.change) {
+      var tracks = mediaElement.textTracks
+      for (var j = 0; j < tracks.length; j++) {
+        // mode is not an <track> attribute, only available on DOM
+        tracks[j].mode = (tracks[j].label === state.playing.subtitles.change) ? 'showing' : 'hidden'
+      }
+      state.playing.subtitles.change = null
+    }
+
+    state.playing.currentTime = mediaElement.currentTime
+    state.playing.duration = mediaElement.duration
+    state.playing.volume = mediaElement.volume
   }
 
+  // Add subtitles to the <video> tag
+  var trackTags = []
+  if (state.playing.subtitles.enabled && state.playing.subtitles.tracks.length > 0) {
+    for (var i = 0; i < state.playing.subtitles.tracks.length; i++) {
+      var track = state.playing.subtitles.tracks[i]
+      trackTags.push(hx`
+        <track
+          ${track.selected ? 'default' : ''}
+          label=${track.label}
+          type='subtitles'
+          src=${track.buffer}>
+      `)
+    }
+  }
+
+  // Create the <audio> or <video> tag
+  var mediaTag = hx`
+    <div
+      src='${state.server.localURL}'
+      ondblclick=${dispatcher('toggleFullScreen')}
+      onloadedmetadata=${onLoadedMetadata}
+      onended=${onEnded}
+      onstalling=${dispatcher('mediaStalled')}
+      onerror=${dispatcher('mediaError')}
+      ontimeupdate=${dispatcher('mediaTimeUpdate')}
+      autoplay>
+      ${trackTags}
+    </div>
+  `
+  mediaTag.tagName = state.playing.type // conditional tag name
+
+  // Show the media.
   return hx`
     <div
       class='letterbox'
-      onmousemove=${() => dispatch('videoMouseMoved')}>
+      onmousemove=${dispatcher('mediaMouseMoved')}>
-      <video
+      ${mediaTag}
-        src='${state.server.localURL}'
+      ${renderOverlay(state)}
-        ondblclick=${() => dispatch('toggleFullScreen')}
-        onloadedmetadata=${onLoadedMetadata}
-        onended=${onEnded}
-        onplay=${() => dispatch('videoPlaying')}
-        onpause=${() => dispatch('videoPaused')}
-        autoplay>
-      </video>
     </div>
   `
 
   // As soon as the video loads enough to know the video dimensions, resize the window
   function onLoadedMetadata (e) {
+    if (state.playing.type !== 'video') return
     var video = e.target
     var dimensions = {
       width: video.videoWidth,
@@ -66,41 +125,243 @@ function renderVideo (state, dispatch) {
 
   // When the video completes, pause the video instead of looping
   function onEnded (e) {
-    state.video.isPaused = true
+    state.playing.isPaused = true
   }
 }
 
-function renderCastScreen (state, dispatch) {
+// Renders using WebChimera.js to render using VLC
-  var isChromecast = state.playing.location.startsWith('chromecast')
+// That lets us play media that the <video> tag can't play
-  var isAirplay = state.playing.location.startsWith('airplay')
+function renderMediaVLC (state) {
-  var isStarting = state.playing.location.endsWith('-pending')
+  // Unfortunately, WebChimera can't be done just by modifying HTML.
-  if (!isChromecast && !isAirplay) throw new Error('Unimplemented cast type')
+  // Instead, grab the DOM node
+  if (document.querySelector('#media-player')) {
+    if (!state.playing.chimera) {
+      state.playing.chimera = new WebChimeraPlayer('#media-player')
+        .addPlayer({
+          autoplay: true,
+          vlcArgs: ['-vvv'],
+          wcjsRendererOptions: {'fallbackRenderer': true}
+        })
+        .onPlaying(dispatcher('mediaPlaying'))
+        .onPaused(dispatcher('mediaPaused'))
+        .onBuffering(dispatcher('mediaStalled'))
+        .onTime(dispatcher('mediaTimeUpdate'))
+        .onEnded(onEnded)
+        .onFrameSetup(onLoadedMetadata)
+        .addPlaylist(state.server.localURL)
+      state.playing.chimera.ui(false)
+    } else {
+      var player = state.playing.chimera
+      if (state.playing.isPaused && player.playing()) {
+        player.pause()
+      } else if (!state.playing.isPaused && !player.playing()) {
+        player.play()
+      }
+      // When the user clicks or drags on the progress bar, jump to that position
+      if (state.playing.jumpToTime) {
+        player.time(state.playing.jumpToTime * 1000) // WebChimera expects milliseconds
+        state.playing.jumpToTime = null
+      }
+      // Set volume
+      if (state.playing.setVolume !== null && isFinite(state.playing.setVolume)) {
+        player.volume(Math.round(state.playing.setVolume * 100)) // WebChimera expects integer percent
+        state.playing.setVolume = null
+      }
 
-  // Show a nice title image, if possible
+      state.playing.currentTime = player.time() / 1000
-  var style = {}
+      state.playing.duration = player.length() / 1000
-  var infoHash = state.playing.infoHash
+      state.playing.volume = player.volume() / 100
-  var torrentSummary = state.saved.torrents.find((x) => x.infoHash === infoHash)
+    }
-  if (torrentSummary && torrentSummary.posterURL) {
+  } else {
-    var cleanURL = torrentSummary.posterURL.replace(/\\/g, '/')
+    state.playing.chimera = null
-    style.backgroundImage = `radial-gradient(circle at center, rgba(0,0,0,0.4) 0%,rgba(0,0,0,1) 100%), url(${cleanURL})`
   }
 
-  // Show whether we're connected to Chromecast / Airplay
+  // Add subtitles to the <video> tag
+  var trackTags = []
+  if (state.playing.subtitles.enabled && state.playing.subtitles.tracks.length > 0) {
+    for (var i = 0; i < state.playing.subtitles.tracks.length; i++) {
+      var track = state.playing.subtitles.tracks[i]
+      trackTags.push(hx`
+        <track
+        default=${track.selected ? 'default' : ''}
+        label=${track.language}
+        type='subtitles'
+        src=${track.buffer}>
+      `)
+    }
+  }
+
+  // Create the <audio> or <video> tag
+  var mediaType = state.playing.type /* 'video' or 'audio' */
+  var mediaTag = hx`
+    <div id='media-player' class='${mediaType}-player'>
+      ${trackTags}
+    </div>
+  `
+
+  // Show the media.
+  return hx`
+    <div
+      class='letterbox'
+      onmousemove=${dispatcher('mediaMouseMoved')}>
+      ${mediaTag}
+      ${renderOverlay(state)}
+    </div>
+  `
+
+  // As soon as the video loads enough to know the video dimensions, resize the window
+  function onLoadedMetadata (e) {
+    if (mediaType !== 'video') return
+    var dimensions = {
+      width: player.width(),
+      height: player.height()
+    }
+    dispatch('setDimensions', dimensions)
+  }
+
+  // When the video completes, pause the video instead of looping
+  function onEnded (e) {
+    state.playing.isPaused = true
+  }
+}
+
+function renderOverlay (state) {
+  var elems = []
+  var audioMetadataElem = renderAudioMetadata(state)
+  var spinnerElem = renderLoadingSpinner(state)
+  if (audioMetadataElem) elems.push(audioMetadataElem)
+  if (spinnerElem) elems.push(spinnerElem)
+
+  // Video fills the window, centered with black bars if necessary
+  // Audio gets a static poster image and a summary of the file metadata.
+  var style
+  if (state.playing.type === 'audio') {
+    style = { backgroundImage: cssBackgroundImagePoster(state) }
+  } else if (elems.length !== 0) {
+    style = { backgroundImage: cssBackgroundImageDarkGradient() }
+  } else {
+    return /* Video, not audio, and it isn't stalled, so no spinner. No overlay needed. */
+  }
+
+  return hx`
+    <div class='media-overlay-background' style=${style}>
+      <div class='media-overlay'>${elems}</div>
+    </div>
+  `
+}
+
+function renderAudioMetadata (state) {
+  var torrentSummary = getPlayingTorrentSummary(state)
+  var fileSummary = torrentSummary.files[state.playing.fileIndex]
+  if (!fileSummary.audioInfo) return
+  var info = fileSummary.audioInfo
+
+  // Get audio track info
+  var title = info.title
+  if (!title) {
+    title = fileSummary.name
+  }
+  var artist = info.artist && info.artist[0]
+  var album = info.album
+  if (album && info.year && !album.includes(info.year)) {
+    album += ' (' + info.year + ')'
+  }
+  var track
+  if (info.track && info.track.no && info.track.of) {
+    track = info.track.no + ' of ' + info.track.of
+  }
+
+  // Show a small info box in the middle of the screen with title/album/artist/etc
+  var elems = []
+  if (artist) elems.push(hx`<div class='audio-artist'><label>Artist</label>${artist}</div>`)
+  if (album) elems.push(hx`<div class='audio-album'><label>Album</label>${album}</div>`)
+  if (track) elems.push(hx`<div class='audio-track'><label>Track</label>${track}</div>`)
+
+  // Align the title with the artist/etc info, if available. Otherwise, center the title
+  var emptyLabel = hx`<label></label>`
+  elems.unshift(hx`<div class='audio-title'>${elems.length ? emptyLabel : undefined}${title}</div>`)
+
+  return hx`<div class='audio-metadata'>${elems}</div>`
+}
+
+function renderLoadingSpinner (state) {
+  if (state.playing.isPaused) return
+  var isProbablyStalled = state.playing.isStalled ||
+    (new Date().getTime() - state.playing.lastTimeUpdate > 2000)
+  if (!isProbablyStalled) return
+
+  var prog = getPlayingTorrentSummary(state).progress || {}
+  var fileProgress = 0
+  if (prog.files) {
+    var file = prog.files[state.playing.fileIndex]
+    fileProgress = Math.floor(100 * file.numPiecesPresent / file.numPieces)
+  }
+
+  return hx`
+    <div class='media-stalled'>
+      <div class='loading-spinner'>&nbsp;</div>
+      <div class='loading-status ellipsis'>
+        <span class='progress'>${fileProgress}%</span> downloaded,
+        <span>↓ ${prettyBytes(prog.downloadSpeed || 0)}/s</span>
+        <span>↑ ${prettyBytes(prog.uploadSpeed || 0)}/s</span>
+      </div>
+    </div>
+  `
+}
+
+function renderCastScreen (state) {
+  var castIcon, castType
+  if (state.playing.location.startsWith('chromecast')) {
+    castIcon = 'cast_connected'
+    castType = 'Chromecast'
+  } else if (state.playing.location.startsWith('airplay')) {
+    castIcon = 'airplay'
+    castType = 'AirPlay'
+  } else if (state.playing.location.startsWith('dlna')) {
+    castIcon = 'tv'
+    castType = 'DLNA'
+  }
+
+  var isStarting = state.playing.location.endsWith('-pending')
   var castStatus = isStarting ? 'Connecting...' : 'Connected'
+
+  // Show a nice title image, if possible
+  var style = {
+    backgroundImage: cssBackgroundImagePoster(state)
+  }
+
   return hx`
     <div class='letterbox' style=${style}>
       <div class='cast-screen'>
-        <i class='icon'>${isAirplay ? 'airplay' : 'cast'}</i>
+        <i class='icon'>${castIcon}</i>
-        <div class='cast-type'>${isAirplay ? 'AirPlay' : 'Chromecast'}</div>
+        <div class='cast-type'>${castType}</div>
         <div class='cast-status'>${castStatus}</div>
       </div>
     </div>
   `
 }
 
-function renderPlayerControls (state, dispatch) {
+function renderSubtitlesOptions (state) {
-  var positionPercent = 100 * state.video.currentTime / state.video.duration
+  var subtitles = state.playing.subtitles
+  if (subtitles.tracks.length && subtitles.show) {
+    return hx`<ul.subtitles-list>
+      ${subtitles.tracks.map(function (w, i) {
+        return hx`<li onclick=${dispatcher('selectSubtitle', w.label)}><i.icon>${w.selected ? 'radio_button_checked' : 'radio_button_unchecked'}</i>${w.label}</li>`
+      })}
+        <li onclick=${dispatcher('selectSubtitle', '')}><i.icon>${!subtitles.enabled ? 'radio_button_checked' : 'radio_button_unchecked'}</i>None</li>
+      </ul>
+    `
+  }
+}
+
+function renderPlayerControls (state) {
+  var positionPercent = 100 * state.playing.currentTime / state.playing.duration
   var playbackCursorStyle = { left: 'calc(' + positionPercent + '% - 8px)' }
+  var captionsClass = state.playing.subtitles.tracks.length === 0
+    ? 'disabled'
+    : state.playing.subtitles.enabled
+      ? 'active'
+      : ''
 
   var elements = [
     hx`
@@ -115,110 +376,221 @@ function renderPlayerControls (state, dispatch) {
     `,
     hx`
       <i class='icon fullscreen'
-        onclick=${() => dispatch('toggleFullScreen')}>
+        onclick=${dispatcher('toggleFullScreen')}>
         ${state.window.isFullScreen ? 'fullscreen_exit' : 'fullscreen'}
       </i>
     `
   ]
 
+  if (state.playing.type === 'video') {
+    // show closed captions icon
+    elements.push(hx`
+      <i.icon.closed-captions
+        class=${captionsClass}
+        onclick=${handleSubtitles}>
+        closed_captions
+      </i>
+    `)
+  }
+
   // If we've detected a Chromecast or AppleTV, the user can play video there
   var isOnChromecast = state.playing.location.startsWith('chromecast')
   var isOnAirplay = state.playing.location.startsWith('airplay')
-  var chromecastClass, chromecastHandler, airplayClass, airplayHandler
+  var isOnDlna = state.playing.location.startsWith('dlna')
+  var chromecastClass, chromecastHandler, airplayClass, airplayHandler, dlnaClass, dlnaHandler
   if (isOnChromecast) {
     chromecastClass = 'active'
+    dlnaClass = 'disabled'
     airplayClass = 'disabled'
-    chromecastHandler = () => dispatch('stopCasting')
+    chromecastHandler = dispatcher('closeDevice')
     airplayHandler = undefined
+    dlnaHandler = undefined
   } else if (isOnAirplay) {
     chromecastClass = 'disabled'
+    dlnaClass = 'disabled'
     airplayClass = 'active'
     chromecastHandler = undefined
-    airplayHandler = () => dispatch('stopCasting')
+    airplayHandler = dispatcher('closeDevice')
+    dlnaHandler = undefined
+  } else if (isOnDlna) {
+    chromecastClass = 'disabled'
+    dlnaClass = 'active'
+    airplayClass = 'disabled'
+    chromecastHandler = undefined
+    airplayHandler = undefined
+    dlnaHandler = dispatcher('closeDevice')
   } else {
     chromecastClass = ''
     airplayClass = ''
-    chromecastHandler = () => dispatch('openChromecast')
+    dlnaClass = ''
-    airplayHandler = () => dispatch('openAirplay')
+    chromecastHandler = dispatcher('openDevice', 'chromecast')
+    airplayHandler = dispatcher('openDevice', 'airplay')
+    dlnaHandler = dispatcher('openDevice', 'dlna')
   }
   if (state.devices.chromecast || isOnChromecast) {
+    var castIcon = isOnChromecast ? 'cast_connected' : 'cast'
     elements.push(hx`
-      <i.icon.chromecast
+      <i.icon.device
         class=${chromecastClass}
         onclick=${chromecastHandler}>
-        cast
+        ${castIcon}
       </i>
     `)
   }
   if (state.devices.airplay || isOnAirplay) {
     elements.push(hx`
-      <i.icon.airplay
+      <i.icon.device
         class=${airplayClass}
         onclick=${airplayHandler}>
         airplay
       </i>
     `)
   }
+  if (state.devices.dlna || isOnDlna) {
+    elements.push(hx`
+      <i.icon.device
+        class=${dlnaClass}
+        onclick=${dlnaHandler}>
+        tv
+      </i>
+    `)
+  }
 
   // On OSX, the back button is in the title bar of the window; see app.js
   // On other platforms, we render one over the video on mouseover
   if (process.platform !== 'darwin') {
     elements.push(hx`
       <i.icon.back
-        onclick=${() => dispatch('back')}>
+        onclick=${dispatcher('back')}>
         chevron_left
       </i>
     `)
   }
 
+  // render volume
+  var volume = state.playing.volume
+  var volumeIcon = 'volume_' + (volume === 0 ? 'off' : volume < 0.3 ? 'mute' : volume < 0.6 ? 'down' : 'up')
+  var volumeStyle = { background: '-webkit-gradient(linear, left top, right top, ' +
+    'color-stop(' + (volume * 100) + '%, #eee), ' +
+    'color-stop(' + (volume * 100) + '%, #727272))'
+  }
+
+  elements.push(hx`
+    <div.volume
+      onwheel=${handleVolumeWheel}>
+        <i.icon.volume-icon onmousedown=${handleVolumeMute}>
+          ${volumeIcon}
+        </i>
+        <input.volume-slider
+          type='range' min='0' max='1' step='0.05' value=${volumeChanging !== false ? volumeChanging : volume}
+          onmousedown=${handleVolumeScrub}
+          onmouseup=${handleVolumeScrub}
+          onmousemove=${handleVolumeScrub}
+          onwheel=${handleVolumeWheel}
+          style=${volumeStyle}
+        />
+    </div>
+  `)
+
   // Finally, the big button in the center plays or pauses the video
   elements.push(hx`
-    <i class='icon play-pause' onclick=${() => dispatch('playPause')}>
+    <i class='icon play-pause' onclick=${dispatcher('playPause')}>
-      ${state.video.isPaused ? 'play_arrow' : 'pause'}
+      ${state.playing.isPaused ? 'play_arrow' : 'pause'}
     </i>
   `)
 
-  return hx`<div class='player-controls'>${elements}</div>`
+  return hx`
+    <div class='player-controls'>
+      ${elements}
+      ${renderSubtitlesOptions(state)}
+    </div>
+  `
 
   // Handles a click or drag to scrub (jump to another position in the video)
   function handleScrub (e) {
-    dispatch('videoMouseMoved')
+    dispatch('mediaMouseMoved')
     var windowWidth = document.querySelector('body').clientWidth
     var fraction = e.clientX / windowWidth
-    var position = fraction * state.video.duration /* seconds */
+    var position = fraction * state.playing.duration /* seconds */
     dispatch('playbackJump', position)
   }
+
+  // Handles volume change by wheel
+  function handleVolumeWheel (e) {
+    dispatch('changeVolume', (-e.deltaY | e.deltaX) / 500)
+  }
+
+  // Handles volume muting and Unmuting
+  function handleVolumeMute (e) {
+    if (state.playing.volume === 0.0) {
+      dispatch('setVolume', 1.0)
+    } else {
+      dispatch('setVolume', 0.0)
+    }
+  }
+
+  // Handles volume slider scrub
+  function handleVolumeScrub (e) {
+    switch (e.type) {
+      case 'mouseup':
+        volumeChanging = false
+        dispatch('setVolume', e.offsetX / 50)
+        break
+      case 'mousedown':
+        volumeChanging = this.value
+        break
+      case 'mousemove':
+        // only change if move was started by click
+        if (volumeChanging !== false) {
+          volumeChanging = this.value
+        }
+        break
+    }
+  }
+
+  function handleSubtitles (e) {
+    if (!state.playing.subtitles.tracks.length || e.ctrlKey || e.metaKey) {
+      // if no subtitles available select it
+      dispatch('openSubtitles')
+    } else {
+      dispatch('showSubtitles')
+    }
+  }
 }
 
+// lets scrub without sending to volume backend
+var volumeChanging = false
+
 // Renders the loading bar. Shows which parts of the torrent are loaded, which
 // can be "spongey" / non-contiguous
 function renderLoadingBar (state) {
-  var torrent = state.client.get(state.playing.infoHash)
+  var torrentSummary = getPlayingTorrentSummary(state)
-  if (torrent === null) {
+  if (!torrentSummary.progress) {
     return []
   }
 
   // Find all contiguous parts of the torrent which are loaded
+  var prog = torrentSummary.progress
+  var fileProg = prog.files[state.playing.fileIndex]
   var parts = []
-  var lastPartPresent = false
+  var lastPiecePresent = false
-  var numParts = torrent.pieces.length
+  for (var i = fileProg.startPiece; i <= fileProg.endPiece; i++) {
-  for (var i = 0; i < numParts; i++) {
+    var partPresent = Bitfield.prototype.get.call(prog.bitfield, i)
-    var partPresent = torrent.bitfield.get(i)
+    if (partPresent && !lastPiecePresent) {
-    if (partPresent && !lastPartPresent) {
+      parts.push({start: i - fileProg.startPiece, count: 1})
-      parts.push({start: i, count: 1})
     } else if (partPresent) {
       parts[parts.length - 1].count++
     }
-    lastPartPresent = partPresent
+    lastPiecePresent = partPresent
   }
 
-  // Output an list of rectangles to show loading progress
+  // Output some bars to show which parts of the file are loaded
   return hx`
     <div class='loading-bar'>
       ${parts.map(function (part) {
         var style = {
-          left: (100 * part.start / numParts) + '%',
+          left: (100 * part.start / fileProg.numPieces) + '%',
-          width: (100 * part.count / numParts) + '%'
+          width: (100 * part.count / fileProg.numPieces) + '%'
         }
 
         return hx`<div class='loading-bar-part' style=${style}></div>`
@@ -226,3 +598,21 @@ function renderLoadingBar (state) {
     </div>
   `
 }
+
+// Returns the CSS background-image string for a poster image + dark vignette
+function cssBackgroundImagePoster (state) {
+  var torrentSummary = getPlayingTorrentSummary(state)
+  var posterPath = TorrentSummary.getPosterPath(torrentSummary)
+  if (!posterPath) return ''
+  return cssBackgroundImageDarkGradient() + `, url(${posterPath})`
+}
+
+function cssBackgroundImageDarkGradient () {
+  return 'radial-gradient(circle at center, ' +
+    'rgba(0,0,0,0.4) 0%, rgba(0,0,0,1) 100%)'
+}
+
+function getPlayingTorrentSummary (state) {
+  var infoHash = state.playing.infoHash
+  return state.saved.torrents.find((x) => x.infoHash === infoHash)
+}

renderer/views/torrent-list.js

@@ -5,9 +5,11 @@ var hyperx = require('hyperx')
 var hx = hyperx(h)
 var prettyBytes = require('prettier-bytes')
 
+var TorrentSummary = require('../lib/torrent-summary')
 var TorrentPlayer = require('../lib/torrent-player')
+var {dispatcher} = require('../lib/dispatcher')
 
-function TorrentList (state, dispatch) {
+function TorrentList (state) {
   var torrentRows = state.saved.torrents.map(
     (torrentSummary) => renderTorrent(torrentSummary))
   return hx`
@@ -24,19 +26,16 @@ function TorrentList (state, dispatch) {
   function renderTorrent (torrentSummary) {
     // Get ephemeral data (like progress %) directly from the WebTorrent handle
     var infoHash = torrentSummary.infoHash
-    var torrent = state.client.torrents.find((x) => x.infoHash === infoHash)
+    var isSelected = infoHash && state.selectedInfoHash === infoHash
-    var isSelected = state.selectedInfoHash === infoHash
 
     // Background image: show some nice visuals, like a frame from the movie, if possible
     var style = {}
-    if (torrentSummary.posterURL) {
+    if (torrentSummary.posterFileName) {
       var gradient = isSelected
         ? 'linear-gradient(to bottom, rgba(0, 0, 0, 0.8) 0%, rgba(0, 0, 0, 0.4) 100%)'
         : 'linear-gradient(to bottom, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0) 100%)'
-      // Work around a Chrome bug (reproduced in vanilla Chrome, not just Electron):
+      var posterPath = TorrentSummary.getPosterPath(torrentSummary)
-      // Backslashes in URLS in CSS cause bizarre string encoding issues
+      style.backgroundImage = gradient + `, url('${posterPath}')`
-      var cleanURL = torrentSummary.posterURL.replace(/\\/g, '/')
-      style.backgroundImage = gradient + `, url('${cleanURL}')`
     }
 
     // Foreground: name of the torrent, basic info like size, play button,
@@ -45,37 +44,40 @@ function TorrentList (state, dispatch) {
     //  playStatus turns the play button into a loading spinner or error icon
     if (torrentSummary.playStatus) classes.push(torrentSummary.playStatus)
     if (isSelected) classes.push('selected')
+    if (!infoHash) classes.push('disabled')
     classes = classes.join(' ')
     return hx`
-      <div style=${style} class=${classes} onclick=${() => dispatch('toggleSelectTorrent', infoHash)}>
+      <div style=${style} class=${classes}
-        ${renderTorrentMetadata(torrent, torrentSummary)}
+        oncontextmenu=${infoHash && dispatcher('openTorrentContextMenu', infoHash)}
-        ${renderTorrentButtons(torrentSummary)}
+        onclick=${infoHash && dispatcher('toggleSelectTorrent', infoHash)}>
-        ${isSelected ? renderTorrentDetails(torrent, torrentSummary) : ''}
+        ${renderTorrentMetadata(torrentSummary)}
+        ${infoHash ? renderTorrentButtons(torrentSummary) : ''}
+        ${isSelected ? renderTorrentDetails(torrentSummary) : ''}
       </div>
     `
   }
 
   // Show name, download status, % complete
-  function renderTorrentMetadata (torrent, torrentSummary) {
+  function renderTorrentMetadata (torrentSummary) {
     var name = torrentSummary.name || 'Loading torrent...'
     var elements = [hx`
       <div class='name ellipsis'>${name}</div>
     `]
 
-    // If a torrent is paused and we only get the torrentSummary
+    // If it's downloading/seeding then show progress info
-    // If it's downloading/seeding then we have more information
+    var prog = torrentSummary.progress
-    if (torrent) {
+    if (torrentSummary.status !== 'paused' && prog) {
-      var progress = Math.floor(100 * torrent.progress)
+      var progress = Math.floor(100 * prog.progress)
-      var downloaded = prettyBytes(torrent.downloaded)
+      var downloaded = prettyBytes(prog.downloaded)
-      var total = prettyBytes(torrent.length || 0)
+      var total = prettyBytes(prog.length || 0)
       if (downloaded !== total) downloaded += ` / ${total}`
 
       elements.push(hx`
         <div class='status ellipsis'>
           ${getFilesLength()}
           <span>${getPeers()}</span>
-          <span>↓ ${prettyBytes(torrent.downloadSpeed || 0)}/s</span>
+          <span>↓ ${prettyBytes(prog.downloadSpeed || 0)}/s</span>
-          <span>↑ ${prettyBytes(torrent.uploadSpeed || 0)}/s</span>
+          <span>↑ ${prettyBytes(prog.uploadSpeed || 0)}/s</span>
         </div>
       `)
       elements.push(hx`
@@ -89,13 +91,13 @@ function TorrentList (state, dispatch) {
     return hx`<div class='metadata'>${elements}</div>`
 
     function getPeers () {
-      var count = torrent.numPeers === 1 ? 'peer' : 'peers'
+      var count = prog.numPeers === 1 ? 'peer' : 'peers'
-      return `${torrent.numPeers} ${count}`
+      return `${prog.numPeers} ${count}`
     }
 
     function getFilesLength () {
-      if (torrent.ready && torrent.files.length > 1) {
+      if (torrentSummary.files && torrentSummary.files.length > 1) {
-        return hx`<span class='files'>${torrent.files.length} files</span>`
+        return hx`<span class='files'>${torrentSummary.files.length} files</span>`
       }
     }
   }
@@ -103,9 +105,12 @@ function TorrentList (state, dispatch) {
   // Download button toggles between torrenting (DL/seed) and paused
   // Play button starts streaming the torrent immediately, unpausing if needed
   function renderTorrentButtons (torrentSummary) {
-    var playIcon, playTooltip
+    var infoHash = torrentSummary.infoHash
+
+    var playIcon, playTooltip, playClass
     if (torrentSummary.playStatus === 'unplayable') {
-      playIcon = 'warning'
+      playIcon = 'play_arrow'
+      playClass = 'disabled'
       playTooltip = 'Sorry, WebTorrent can\'t play any of the files in this torrent. ' +
         'View details and click on individual files to open them in another program.'
     } else if (torrentSummary.playStatus === 'timeout') {
@@ -128,52 +133,59 @@ function TorrentList (state, dispatch) {
       downloadTooltip = 'Click to start torrenting.'
     }
 
-    return hx`
+    // Only show the play button for torrents that contain playable media
-      <div class='buttons'>
+    var playButton
-        <i.btn.icon.play
+    if (TorrentPlayer.isPlayableTorrent(torrentSummary)) {
-          title='${playTooltip}'
+      playButton = hx`
-          onclick=${(e) => handleButton('play', e)}>
+        <i.button-round.icon.play
+          title=${playTooltip}
+          class=${playClass}
+          onclick=${dispatcher('play', infoHash)}>
           ${playIcon}
         </i>
-        <i.btn.icon.download
+      `
-          class='${torrentSummary.status}'
+    }
-          title='${downloadTooltip}'
+
-          onclick=${(e) => handleButton('toggleTorrent', e)}>
+    return hx`
+      <div class='buttons'>
+        ${playButton}
+        <i.button-round.icon.download
+          class=${torrentSummary.status}
+          title=${downloadTooltip}
+          onclick=${dispatcher('toggleTorrent', infoHash)}>
           ${downloadIcon}
         </i>
         <i
           class='icon delete'
           title='Remove torrent'
-          onclick=${(e) => handleButton('deleteTorrent', e)}>
+          onclick=${dispatcher('deleteTorrent', infoHash)}>
           close
         </i>
       </div>
     `
-
-    function handleButton (action, e) {
-      // Prevent propagation so that we don't select/unselect the torrent
-      e.stopPropagation()
-      dispatch(action, torrentSummary)
-    }
   }
 
   // Show files, per-file download status and play buttons, and so on
-  function renderTorrentDetails (torrent, torrentSummary) {
+  function renderTorrentDetails (torrentSummary) {
+    var infoHash = torrentSummary.infoHash
     var filesElement
     if (!torrentSummary.files) {
       // We don't know what files this torrent contains
-      var message = torrent
+      var message = torrentSummary.status === 'paused'
-        ? 'Downloading torrent data using magnet link...'
+        ? 'Failed to load torrent info. Click the download button to try again...'
-        : 'Failed to download torrent data from magnet link. Click the download button to try again...'
+        : 'Downloading torrent info...'
       filesElement = hx`<div class='files warning'>${message}</div>`
     } else {
       // We do know the files. List them and show download stats for each one
       var fileRows = torrentSummary.files.map(
-        (file, index) => renderFileRow(torrent, torrentSummary, file, index))
+        (file, index) => renderFileRow(torrentSummary, file, index))
       filesElement = hx`
         <div class='files'>
           <strong>Files</strong>
-          <span class='open-folder' onclick=${handleOpenFolder}>Open folder</span>
+          <span class='open-folder'
+            onclick=${dispatcher('openFolder', infoHash)}>
+            Open folder
+          </span>
           <table>
             ${fileRows}
           </table>
@@ -186,29 +198,31 @@ function TorrentList (state, dispatch) {
         ${filesElement}
       </div>
     `
-
-    function handleOpenFolder (e) {
-      e.stopPropagation()
-      dispatch('openFolder', torrentSummary)
-    }
   }
 
   // Show a single torrentSummary file in the details view for a single torrent
-  function renderFileRow (torrent, torrentSummary, file, index) {
+  function renderFileRow (torrentSummary, file, index) {
     // First, find out how much of the file we've downloaded
-    var isDone = file.numPiecesPresent === file.numPieces
+    var isDone = false
-    var progress = Math.round(100 * file.numPiecesPresent / (file.numPieces || 0)) + '%'
+    var progress = ''
+    if (torrentSummary.progress && torrentSummary.progress.files) {
+      var fileProg = torrentSummary.progress.files[index]
+      isDone = fileProg.numPiecesPresent === fileProg.numPieces
+      progress = Math.round(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
+    }
 
     // Second, render the file as a table row
+    var infoHash = torrentSummary.infoHash
     var icon
     var rowClass = ''
-    if (state.playing.infoHash === torrentSummary.infoHash && state.playing.fileIndex === index) {
+    var handleClick
-      icon = 'pause_arrow' /* playing? add option to pause */
+    if (TorrentPlayer.isPlayable(file)) {
-    } else if (TorrentPlayer.isPlayable(file)) {
       icon = 'play_arrow' /* playable? add option to play */
+      handleClick = dispatcher('play', infoHash, index)
     } else {
       icon = 'description' /* file icon, opens in OS default app */
       rowClass = isDone ? '' : 'disabled'
+      handleClick = dispatcher('openFile', infoHash, index)
     }
     return hx`
       <tr onclick=${handleClick} class='${rowClass}'>
@@ -220,17 +234,5 @@ function TorrentList (state, dispatch) {
         <td class='col-size'>${prettyBytes(file.length)}</td>
       </tr>
     `
-
-    // Finally, let the user click on the row to play media or open files
-    function handleClick (e) {
-      e.stopPropagation()
-      if (icon === 'pause_arrow') {
-        throw new Error('Unimplemented') // TODO: pause audio
-      } else if (icon === 'play_arrow') {
-        dispatch('play', torrentSummary, index)
-      } else if (isDone) {
-        dispatch('openFile', torrentSummary, index)
-      }
-    }
   }
 }

renderer/views/update-available-modal.js

@@ -0,0 +1,32 @@
+module.exports = UpdateAvailableModal
+
+var h = require('virtual-dom/h')
+var hyperx = require('hyperx')
+var hx = hyperx(h)
+
+var electron = require('electron')
+
+var {dispatch} = require('../lib/dispatcher')
+
+function UpdateAvailableModal (state) {
+  return hx`
+    <div class='update-available-modal'>
+      <p><strong>A new version of WebTorrent is available: v${state.modal.version}</strong></p>
+      <p>We have an auto-updater for Windows and Mac. We don't have one for Linux yet, so you'll have to download the new version manually.</p>
+      <p>
+        <button class='primary' onclick=${handleOK}>Show Download Page</button>
+        <button class='cancel' onclick=${handleCancel}>Skip This Release</button>
+      </p>
+    </div>
+  `
+
+  function handleOK () {
+    electron.shell.openExternal('https://github.com/feross/webtorrent-desktop/releases')
+    dispatch('exitModal')
+  }
+
+  function handleCancel () {
+    dispatch('skipVersion', state.modal.version)
+    dispatch('exitModal')
+  }
+}

renderer/webtorrent.html

@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style>
+      body {
+        background-color: #282828;
+        margin: 5px;
+        overflow: hidden;
+      }
+      img {
+        width: 140px;
+        height: 140px;
+      }
+    </style>
+  </head>
+  <body>
+    <script async src="webtorrent.js"></script>
+    <img src="../static/WebTorrent.png">
+  </body>
+</html>

renderer/webtorrent.js

@@ -0,0 +1,325 @@
+// To keep the UI snappy, we run WebTorrent in its own hidden window, a separate
+// process from the main window.
+console.time('init')
+
+var WebTorrent = require('webtorrent')
+var defaultAnnounceList = require('create-torrent').announceList
+var deepEqual = require('deep-equal')
+var electron = require('electron')
+var fs = require('fs-extra')
+var musicmetadata = require('musicmetadata')
+var networkAddress = require('network-address')
+var path = require('path')
+
+var crashReporter = require('../crash-reporter')
+var config = require('../config')
+var torrentPoster = require('./lib/torrent-poster')
+
+// Report when the process crashes
+crashReporter.init()
+
+// Send & receive messages from the main window
+var ipc = electron.ipcRenderer
+
+// Force use of webtorrent trackers on all torrents
+global.WEBTORRENT_ANNOUNCE = defaultAnnounceList
+  .map((arr) => arr[0])
+  .filter((url) => url.indexOf('wss://') === 0 || url.indexOf('ws://') === 0)
+
+// Connect to the WebTorrent and BitTorrent networks. WebTorrent Desktop is a hybrid
+// client, as explained here: https://webtorrent.io/faq
+var client = window.client = new WebTorrent()
+
+// WebTorrent-to-HTTP streaming sever
+var server = window.server = null
+
+// Used for diffing, so we only send progress updates when necessary
+var prevProgress = window.prevProgress = null
+
+init()
+
+function init () {
+  client.on('warning', (err) => ipc.send('wt-warning', null, err.message))
+  client.on('error', (err) => ipc.send('wt-error', null, err.message))
+
+  ipc.on('wt-start-torrenting', (e, torrentKey, torrentID, path, fileModtimes) =>
+    startTorrenting(torrentKey, torrentID, path, fileModtimes))
+  ipc.on('wt-stop-torrenting', (e, infoHash) =>
+    stopTorrenting(infoHash))
+  ipc.on('wt-create-torrent', (e, torrentKey, options) =>
+    createTorrent(torrentKey, options))
+  ipc.on('wt-save-torrent-file', (e, torrentKey) =>
+    saveTorrentFile(torrentKey))
+  ipc.on('wt-generate-torrent-poster', (e, torrentKey) =>
+    generateTorrentPoster(torrentKey))
+  ipc.on('wt-get-audio-metadata', (e, infoHash, index) =>
+    getAudioMetadata(infoHash, index))
+  ipc.on('wt-start-server', (e, infoHash, index) =>
+    startServer(infoHash, index))
+  ipc.on('wt-stop-server', (e) =>
+    stopServer())
+
+  ipc.send('ipcReadyWebTorrent')
+
+  setInterval(updateTorrentProgress, 1000)
+}
+
+// Starts a given TorrentID, which can be an infohash, magnet URI, etc. Returns WebTorrent object
+// See https://github.com/feross/webtorrent/blob/master/docs/api.md#clientaddtorrentid-opts-function-ontorrent-torrent-
+function startTorrenting (torrentKey, torrentID, path, fileModtimes) {
+  console.log('starting torrent %s: %s', torrentKey, torrentID)
+  var torrent
+  try {
+    torrent = client.add(torrentID, {
+      path: path,
+      fileModtimes: fileModtimes
+    })
+  } catch (err) {
+    return ipc.send('wt-error', torrentKey, err.message)
+  }
+  // If we add a duplicate magnet URI or infohash, WebTorrent returns the
+  // existing torrent object! (If we add a duplicate torrent file, it creates a
+  // new torrent object and raises an error later.) Workaround:
+  if (torrent.key) {
+    return ipc.send('wt-error', torrentKey, 'Can\'t add duplicate torrent')
+  }
+  torrent.key = torrentKey
+  addTorrentEvents(torrent)
+  return torrent
+}
+
+function stopTorrenting (infoHash) {
+  var torrent = client.get(infoHash)
+  torrent.destroy()
+}
+
+// Create a new torrent, start seeding
+function createTorrent (torrentKey, options) {
+  console.log('creating torrent', torrentKey, options)
+  var paths = options.files.map((f) => f.path)
+  var torrent = client.seed(paths, options)
+  torrent.key = torrentKey
+  addTorrentEvents(torrent)
+  ipc.send('wt-new-torrent')
+}
+
+function addTorrentEvents (torrent) {
+  torrent.on('warning', (err) =>
+    ipc.send('wt-warning', torrent.key, err.message))
+  torrent.on('error', (err) =>
+    ipc.send('wt-error', torrent.key, err.message))
+  torrent.on('infoHash', () =>
+    ipc.send('wt-infohash', torrent.key, torrent.infoHash))
+  torrent.on('metadata', torrentMetadata)
+  torrent.on('ready', torrentReady)
+  torrent.on('done', torrentDone)
+
+  function torrentMetadata () {
+    var info = getTorrentInfo(torrent)
+    ipc.send('wt-metadata', torrent.key, info)
+
+    updateTorrentProgress()
+  }
+
+  function torrentReady () {
+    var info = getTorrentInfo(torrent)
+    ipc.send('wt-ready', torrent.key, info)
+    ipc.send('wt-ready-' + torrent.infoHash, torrent.key, info) // TODO: hack
+
+    updateTorrentProgress()
+  }
+
+  function torrentDone () {
+    var info = getTorrentInfo(torrent)
+    ipc.send('wt-done', torrent.key, info)
+
+    updateTorrentProgress()
+
+    torrent.getFileModtimes(function (err, fileModtimes) {
+      if (err) return onError(err)
+      ipc.send('wt-file-modtimes', torrent.key, fileModtimes)
+    })
+  }
+}
+
+// Produces a JSON saveable summary of a torrent
+function getTorrentInfo (torrent) {
+  return {
+    infoHash: torrent.infoHash,
+    magnetURI: torrent.magnetURI,
+    name: torrent.name,
+    path: torrent.path,
+    files: torrent.files.map(getTorrentFileInfo),
+    bytesReceived: torrent.received
+  }
+}
+
+// Produces a JSON saveable summary of a file in a torrent
+function getTorrentFileInfo (file) {
+  return {
+    name: file.name,
+    length: file.length,
+    path: file.path,
+    numPiecesPresent: 0,
+    numPieces: null
+  }
+}
+
+// Every time we resolve a magnet URI, save the torrent file so that we never
+// have to download it again. Never ask the DHT the same question twice.
+function saveTorrentFile (torrentKey) {
+  var torrent = getTorrent(torrentKey)
+  checkIfTorrentFileExists(torrent.infoHash, function (torrentPath, exists) {
+    var fileName = torrent.infoHash + '.torrent'
+    if (exists) {
+      // We've already saved the file
+      return ipc.send('wt-file-saved', torrentKey, fileName)
+    }
+
+    // Otherwise, save the .torrent file, under the app config folder
+    fs.mkdir(config.CONFIG_TORRENT_PATH, function (_) {
+      fs.writeFile(torrentPath, torrent.torrentFile, function (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)
+      })
+    })
+  })
+}
+
+// Checks whether we've already resolved a given infohash to a torrent file
+// Calls back with (torrentPath, exists). Logs, does not call back on error
+function checkIfTorrentFileExists (infoHash, cb) {
+  var torrentPath = path.join(config.CONFIG_TORRENT_PATH, infoHash + '.torrent')
+  fs.exists(torrentPath, function (exists) {
+    cb(torrentPath, exists)
+  })
+}
+
+// Save a JPG that represents a torrent.
+// Auto chooses either a frame from a video file, an image, etc
+function generateTorrentPoster (torrentKey) {
+  var torrent = getTorrent(torrentKey)
+  torrentPoster(torrent, function (err, buf, extension) {
+    if (err) return console.log('error generating poster: %o', err)
+    // save it for next time
+    fs.mkdirp(config.CONFIG_POSTER_PATH, function (err) {
+      if (err) return console.log('error creating poster dir: %o', err)
+      var posterFileName = torrent.infoHash + extension
+      var posterFilePath = path.join(config.CONFIG_POSTER_PATH, posterFileName)
+      fs.writeFile(posterFilePath, buf, function (err) {
+        if (err) return console.log('error saving poster: %o', err)
+        // show the poster
+        ipc.send('wt-poster', torrentKey, posterFileName)
+      })
+    })
+  })
+}
+
+function updateTorrentProgress () {
+  var progress = getTorrentProgress()
+  // TODO: diff torrent-by-torrent, not once for the whole update
+  if (prevProgress && deepEqual(progress, prevProgress, {strict: true})) {
+    return /* don't send heavy object if it hasn't changed */
+  }
+  ipc.send('wt-progress', progress)
+  prevProgress = progress
+}
+
+function getTorrentProgress () {
+  // First, track overall progress
+  var progress = client.progress
+  var hasActiveTorrents = client.torrents.some(function (torrent) {
+    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
+  var torrentProg = client.torrents.map(function (torrent) {
+    var fileProg = torrent.files && torrent.files.map(function (file, index) {
+      var numPieces = file._endPiece - file._startPiece + 1
+      var numPiecesPresent = 0
+      for (var piece = file._startPiece; piece <= file._endPiece; piece++) {
+        if (torrent.bitfield.get(piece)) numPiecesPresent++
+      }
+      return {
+        startPiece: file._startPiece,
+        endPiece: file._endPiece,
+        numPieces,
+        numPiecesPresent
+      }
+    })
+    return {
+      torrentKey: torrent.key,
+      ready: torrent.ready,
+      progress: torrent.progress,
+      downloaded: torrent.downloaded,
+      downloadSpeed: torrent.downloadSpeed,
+      uploadSpeed: torrent.uploadSpeed,
+      numPeers: torrent.numPeers,
+      length: torrent.length,
+      bitfield: torrent.bitfield,
+      files: fileProg
+    }
+  })
+
+  return {
+    torrents: torrentProg,
+    progress,
+    hasActiveTorrents
+  }
+}
+
+function startServer (infoHash, index) {
+  var torrent = client.get(infoHash)
+  if (torrent.ready) startServerFromReadyTorrent(torrent, index)
+  else torrent.on('ready', () => startServerFromReadyTorrent(torrent, index))
+}
+
+function startServerFromReadyTorrent (torrent, index, cb) {
+  if (server) return
+
+  // start the streaming torrent-to-http server
+  server = torrent.createServer()
+  server.listen(0, function () {
+    var port = server.address().port
+    var urlSuffix = ':' + port + '/' + index
+    var info = {
+      torrentKey: torrent.key,
+      localURL: 'http://localhost' + urlSuffix,
+      networkURL: 'http://' + networkAddress() + urlSuffix
+    }
+
+    ipc.send('wt-server-running', info)
+    ipc.send('wt-server-' + torrent.infoHash, info) // TODO: hack
+  })
+}
+
+function stopServer () {
+  if (!server) return
+  server.destroy()
+  server = null
+}
+
+function getAudioMetadata (infoHash, index) {
+  var torrent = client.get(infoHash)
+  var file = torrent.files[index]
+  musicmetadata(file.createReadStream(), function (err, info) {
+    if (err) return
+    console.log('got audio metadata for %s: %o', file.name, info)
+    ipc.send('wt-audio-metadata', infoHash, index, info)
+  })
+}
+
+// Gets a WebTorrent handle by torrentKey
+// Throws an Error if we're not currently torrenting anything w/ that key
+function getTorrent (torrentKey) {
+  var ret = client.torrents.find((x) => x.key === torrentKey)
+  if (!ret) throw new Error('missing torrent key ' + torrentKey)
+  return ret
+}
+
+function onError (err) {
+  console.log(err)
+}

static/linux/postinst

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+chmod +x /opt/webtorrent-desktop/WebTorrent
+ln -s -f /opt/webtorrent-desktop/WebTorrent /usr/bin/webtorrent-desktop

static/linux/prerm

@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+rm /usr/bin/webtorrent-desktop

static/linux/webtorrent-desktop.desktop

@@ -0,0 +1,33 @@
+[Desktop Entry]
+Name=$APP_NAME
+Version=1.0
+GenericName=BitTorrent Client
+X-GNOME-FullName=$APP_NAME
+Comment=Download and share files over BitTorrent
+Encoding=UTF-8
+Type=Application
+Icon=webtorrent-desktop
+Terminal=false
+Path=$APP_PATH
+Exec=$EXEC_PATH %U
+TryExec=$TRY_EXEC_PATH
+StartupNotify=false
+Categories=Network;FileTransfer;P2P;
+MimeType=application/x-bittorrent;x-scheme-handler/magnet;
+
+Actions=CreateNewTorrent;OpenTorrentFile;OpenTorrentAddress;
+
+[Desktop Action CreateNewTorrent]
+Name=Create New Torrent...
+Exec=$EXEC_PATH -n
+Path=$APP_PATH
+
+[Desktop Action OpenTorrentFile]
+Name=Open Torrent File...
+Exec=$EXEC_PATH -o
+Path=$APP_PATH
+
+[Desktop Action OpenTorrentAddress]
+Name=Open Torrent Address...
+Exec=$EXEC_PATH -u
+Path=$APP_PATH

static/webtorrent.desktop

@@ -1,16 +0,0 @@
-[Desktop Entry]
-Name=$APP_NAME
-Version=1.0
-GenericName=BitTorrent Client
-X-GNOME-FullName=$APP_NAME
-Comment=Download and share files over BitTorrent
-Encoding=UTF-8
-Type=Application
-Icon=webtorrent
-Terminal=false
-Path=$APP_PATH
-Exec=$EXEC_PATH %U
-TryExec=$EXEC_PATH
-StartupNotify=false
-Categories=Network;FileTransfer;P2P;
-MimeType=application/x-bittorrent;x-scheme-handler/magnet;