brave · dcposch · Nov 2, 2016 · Nov 2, 2016 · Nov 2, 2016 · Nov 2, 2016
diff --git a/.gitignore b/.gitignore
@@ -52,6 +52,7 @@ win64-dist
 Brave.tar.bz2
 
 app/extensions/brave/gen
+app/extensions/torrent/gen
 *.pfx
 buildConfig.js
 

diff --git a/app/browser/tabs.js b/app/browser/tabs.js
@@ -1,6 +1,6 @@
 const {app, BrowserWindow, session, webContents} = require('electron')
 const extensions = process.atomBinding('extension')
-const { getIndexHTML } = require('../../js/lib/appUrlUtil')
+const { getBraveExtIndexHTML } = require('../../js/lib/appUrlUtil')
 
 let currentWebContents = {}
 let activeTab = null
@@ -13,7 +13,7 @@ const tabs = {
   init: () => {
     app.on('web-contents-created', function (event, tab) {
       // TODO(bridiver) - also exclude extension action windows??
-      if (extensions.isBackgroundPage(tab) || tab.getURL() === getIndexHTML()) {
+      if (extensions.isBackgroundPage(tab) || tab.getURL() === getBraveExtIndexHTML()) {
         return
       }
       let tabId = tab.getId()

diff --git a/app/browser/webtorrent.js b/app/browser/webtorrent.js
@@ -0,0 +1,42 @@
+const electron = require('electron')
+const ipc = electron.ipcMain
+const messages = require('../../js/constants/messages')
+const WebTorrentRemoteServer = require('webtorrent-remote/server')
+
+module.exports = {init}
+
+// Set to see communication between WebTorrent and torrent viewer tabs
+const DEBUG_IPC = false
+if (DEBUG_IPC) console.log('WebTorrent IPC debugging enabled')
+
+// Connects to the BitTorrent network
+// Communicates with the WebTorrentRemoteClients via message passing
+let server = null
+let channels = {}
+
+// Receive messages via the window process, ultimately from the UI in a <webview> process
+function init () {
+  if (DEBUG_IPC) console.log('WebTorrent IPC init')
+  server = new WebTorrentRemoteServer(send, {trace: DEBUG_IPC})
+  ipc.on(messages.TORRENT_MESSAGE, function (e, msg) {
+    if (DEBUG_IPC) console.log('Received IPC: ' + JSON.stringify(msg))
+    channels[msg.clientKey] = e.sender
+    server.receive(msg)
+  })
+}
+
+// Send messages from the browser process (here), thru the window process, to the <webview>
+function send (msg) {
+  if (DEBUG_IPC) console.log('Sending IPC: ' + JSON.stringify(msg))
+  const channel = channels[msg.clientKey]
+  if (!channel) {
+    if (DEBUG_IPC) console.error('Ignoring unrecognized clientKey ' + msg.clientKey)
+    return
+  }
+  if (channel.isDestroyed()) {
+    if (DEBUG_IPC) console.log('Removing destroyed channel, clientKey ' + msg.clientKey)
+    delete channels[msg.clientKey]
+    return
+  }
+  channel.send(messages.TORRENT_MESSAGE, msg)
+}
diff --git a/app/extensions.js b/app/extensions.js
@@ -4,7 +4,7 @@ const extensionActions = require('./common/actions/extensionActions')
 const config = require('../js/constants/config')
 const appConfig = require('../js/constants/appConfig')
 const {fileUrl} = require('../js/lib/appUrlUtil')
-const {getAppUrl, getExtensionsPath, getIndexHTML} = require('../js/lib/appUrlUtil')
+const {getExtensionsPath, getBraveExtUrl, getBraveExtIndexHTML} = require('../js/lib/appUrlUtil')
 const {getSetting} = require('../js/settings')
 const settings = require('../js/constants/settings')
 const extensionStates = require('../js/constants/extensionStates')
@@ -15,7 +15,21 @@ const appActions = require('../js/actions/appActions')
 const fs = require('fs')
 const path = require('path')
 
+// Takes Content Security Policy flags, for example { 'default-src': '*' }
+// Returns a CSP string, for example 'default-src: *;'
+let concatCSP = (cspDirectives) => {
+  let csp = ''
+  for (let directive in cspDirectives) {
+    csp += directive + ' ' + cspDirectives[directive] + '; '
+  }
+  return csp.trim()
+}
+
+// Returns the Chromium extension manifest for the braveExtension
+// The braveExtension handles about: pages, ad blocking, and a few other things
 let generateBraveManifest = () => {
+  const indexHTML = getBraveExtIndexHTML()
+
   let baseManifest = {
     name: 'brave',
     manifest_version: 2,
@@ -32,7 +46,7 @@ let generateBraveManifest = () => {
           'http://*/*', 'https://*/*', 'file://*', 'data:*', 'about:srcdoc'
         ],
         exclude_globs: [
-          getIndexHTML()
+          indexHTML
         ],
         match_about_blank: true,
         js: [
@@ -55,7 +69,7 @@ let generateBraveManifest = () => {
           'http://*/*', 'https://*/*', 'file://*', 'data:*', 'about:srcdoc'
         ],
         exclude_globs: [
-          getIndexHTML()
+          indexHTML
         ],
         js: [
           'content/scripts/adInsertion.js',
@@ -70,13 +84,13 @@ let generateBraveManifest = () => {
         matches: ['<all_urls>'],
         include_globs: [
           'http://*/*', 'https://*/*', 'file://*', 'data:*', 'about:srcdoc',
-          getIndexHTML(),
-          getAppUrl('about-*.html'),
-          getAppUrl('about-*.html') + '#*'
+          indexHTML,
+          getBraveExtUrl('about-*.html'),
+          getBraveExtUrl('about-*.html') + '#*'
         ],
         exclude_globs: [
-          getAppUrl('about-blank.html'),
-          getAppUrl('about-blank.html') + '#*'
+          getBraveExtUrl('about-blank.html'),
+          getBraveExtUrl('about-blank.html') + '#*'
         ],
         js: [
           'content/scripts/spellCheck.js',
@@ -93,13 +107,13 @@ let generateBraveManifest = () => {
           '<all_urls>'
         ],
         include_globs: [
-          getIndexHTML(),
-          getAppUrl('about-*.html'),
-          getAppUrl('about-*.html') + '#*'
+          indexHTML,
+          getBraveExtUrl('about-*.html'),
+          getBraveExtUrl('about-*.html') + '#*'
         ],
         exclude_globs: [
-          getAppUrl('about-blank.html'),
-          getAppUrl('about-blank.html') + '#*'
+          getBraveExtUrl('about-blank.html'),
+          getBraveExtUrl('about-blank.html') + '#*'
         ]
       }
     ],
@@ -137,15 +151,52 @@ let generateBraveManifest = () => {
     cspDirectives['style-src'] = '\'self\' \'unsafe-inline\' http://' + devServer
   }
 
-  var csp = ''
-  for (var directive in cspDirectives) {
-    csp += directive + ' ' + cspDirectives[directive] + '; '
-  }
-  baseManifest.content_security_policy = csp.trim()
+  baseManifest.content_security_policy = concatCSP(cspDirectives)
 
   return baseManifest
 }
 
+// Returns the Chromium extension manifest for the torrentExtension
+// The torrentExtension handles magnet: URLs
+// Analagous to the PDFJS extension, it shows a special UI for that type of resource
+let generateTorrentManifest = () => {
+  let cspDirectives = {
+    'default-src': '\'self\'',
+    'media-src': '\'self\' http://localhost:*',
+    'frame-src': 'http://localhost:*',
+    'form-action': '\'none\'',
+    'referrer': 'no-referrer',
+    'style-src': '\'self\' \'unsafe-inline\''
+  }
+
+  return {
+    name: 'Torrent Viewer',
+    manifest_version: 2,
+    version: '1.0',
+    content_security_policy: concatCSP(cspDirectives),
+    content_scripts: [],
+    permissions: [
+      'externally_connectable.all_urls', 'tabs', '<all_urls>'
+    ],
+    externally_connectable: {
+      matches: [
+        '<all_urls>'
+      ]
+    },
+    icons: {
+      128: 'img/webtorrent-128.png',
+      48: 'img/webtorrent-48.png',
+      16: 'img/webtorrent-16.png'
+    },
+    web_accessible_resources: [
+      'img/favicon.ico',
+      'img/webtorrent-128.png'
+    ],
+    incognito: 'split',
+    key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyWl+wMvL0wZX3JUs7GeZAvxMP+LWEh2bwMV1HyuBra/lGZIq3Fmh0+AFnvFPXz1NpQkbLS3QWyqhdIn/lepGwuc2ma0glPzzmieqwctUurMGSGManApGO1MkcbSPhb+R1mx8tMam5+wbme4WoW37PI3oATgOs2NvHYuP60qol3U7b/zB3IWuqtwtqKe2Q1xY17btvPuz148ygWWIHneedt0jwfr6Zp+CSLARB9Heq/jqGXV4dPSVZ5ebBHLQ452iZkHxS6fm4Z+IxjKdYs3HNj/s8xbfEZ2ydnArGdJ0lpSK9jkDGYyUBugq5Qp3FH6zV89WqBvoV1dqUmL9gxbHsQIDAQAB'
+  }
+}
+
 const extensionInfo = {
   isEnabled: function (extensionId) {
     return this.extensionState[extensionId] === extensionStates.ENABLED
@@ -246,7 +297,7 @@ module.exports.init = () => {
   let loadExtension = (extensionId, extensionPath, manifest = {}, manifestLocation = 'unpacked') => {
     if (!extensionInfo.isLoaded(extensionId) && !extensionInfo.isLoading(extensionId)) {
       extensionInfo.setState(extensionId, extensionStates.LOADING)
-      if (extensionId === config.braveExtensionId) {
+      if (extensionId === config.braveExtensionId || extensionId === config.torrentExtensionId) {
         session.defaultSession.extensions.load(extensionPath, manifest, manifestLocation)
         return
       }
@@ -289,9 +340,16 @@ module.exports.init = () => {
     }
   }
 
-  // Manually install only the braveExtension
+  // Manually install the braveExtension and torrentExtension
   extensionInfo.setState(config.braveExtensionId, extensionStates.REGISTERED)
   loadExtension(config.braveExtensionId, getExtensionsPath('brave'), generateBraveManifest(), 'component')
+  if (getSetting(settings.TORRENT_VIEWER_ENABLED)) {
+    extensionInfo.setState(config.torrentExtensionId, extensionStates.REGISTERED)
+    loadExtension(config.torrentExtensionId, getExtensionsPath('torrent'), generateTorrentManifest(), 'component')
+  } else {
+    extensionInfo.setState(config.torrentExtensionId, extensionStates.DISABLED)
+    extensionActions.extensionDisabled(config.torrentExtensionId)
+  }
 
   let registerComponents = () => {
     if (getSetting(settings.PDFJS_ENABLED)) {

diff --git a/app/extensions/brave/locales/bn-BD/preferences.properties b/app/extensions/brave/locales/bn-BD/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave is your default browser.
 notDefaultBrowser=Brave is not your default browser.
 setAsDefault=Set as default…
 checkDefaultOnStartup=Always check on startup
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/bn-IN/preferences.properties b/app/extensions/brave/locales/bn-IN/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave is your default browser.
 notDefaultBrowser=Brave is not your default browser.
 setAsDefault=Set as default…
 checkDefaultOnStartup=Always check on startup
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/cs/preferences.properties b/app/extensions/brave/locales/cs/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave je váš výchozí prohlížeč.
 notDefaultBrowser=Brave není váš výchozí prohlížeč.
 setAsDefault=Nastavit jako výchozí...
 checkDefaultOnStartup=Vždy prověřit při spuštění
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/de-DE/preferences.properties b/app/extensions/brave/locales/de-DE/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave ist ihr Standardbrowser.
 notDefaultBrowser=Brave ist nicht Ihr Standardbrowser.
 setAsDefault=Als Standard festlegen...
 checkDefaultOnStartup=Bei jedem Start überprüfen
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave is your default browser.
 notDefaultBrowser=Brave is not your default browser.
 setAsDefault=Set as default…
 checkDefaultOnStartup=Always check on startup
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/es/preferences.properties b/app/extensions/brave/locales/es/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave es tu navegador predeterminado.
 notDefaultBrowser=Brave no es tu navegador predeterminado.
 setAsDefault=Establecer como predeterminado...
 checkDefaultOnStartup=Comprobar siempre al inicio
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/eu/preferences.properties b/app/extensions/brave/locales/eu/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave is your default browser.
 notDefaultBrowser=Brave is not your default browser.
 setAsDefault=Lehenetsiz ezarri...
 checkDefaultOnStartup=Always check on startup
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/fr-FR/preferences.properties b/app/extensions/brave/locales/fr-FR/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave est votre navigateur par défaut.
 notDefaultBrowser=Brave n'est pas votre navigateur par défaut.
 setAsDefault=Définir par défaut…
 checkDefaultOnStartup=Toujours vérifier au démarrage
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/hi-IN/preferences.properties b/app/extensions/brave/locales/hi-IN/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave is your default browser.
 notDefaultBrowser=Brave is not your default browser.
 setAsDefault=Set as default…
 checkDefaultOnStartup=Always check on startup
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/id-ID/preferences.properties b/app/extensions/brave/locales/id-ID/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave adalah peramban bawaan Anda.
 notDefaultBrowser=Brave bukan peramban bawaan Anda.
 setAsDefault=Atur sebagai bawaan...
 checkDefaultOnStartup=Selalu periksa saat memulai
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/it-IT/preferences.properties b/app/extensions/brave/locales/it-IT/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave è il tuo browser predefinito.
 notDefaultBrowser=Brave non è il tuo browser predefinito
 setAsDefault=Imposta come predefinito
 checkDefaultOnStartup=Controlla sempre all'avvio
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/ja-JP/preferences.properties b/app/extensions/brave/locales/ja-JP/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Braveは既定のブラウザーです。
 notDefaultBrowser=Braveは既定のブラウザーではありません。
 setAsDefault=既定にする
 checkDefaultOnStartup=起動時に常に確認する
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/ko-KR/preferences.properties b/app/extensions/brave/locales/ko-KR/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave is your default browser.
 notDefaultBrowser=Brave is not your default browser.
 setAsDefault=Set as default…
 checkDefaultOnStartup=Always check on startup
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/ms-MY/preferences.properties b/app/extensions/brave/locales/ms-MY/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave ialah pelayar piawai anda.
 notDefaultBrowser=Brave bukan pelayar piawai anda.
 setAsDefault=Tetapkan sebagai piawai...
 checkDefaultOnStartup=Sentiasa semak semasa permulaan
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/nl-NL/preferences.properties b/app/extensions/brave/locales/nl-NL/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave is your default browser.
 notDefaultBrowser=Brave is not your default browser.
 setAsDefault=Set as default…
 checkDefaultOnStartup=Always check on startup
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/pl-PL/preferences.properties b/app/extensions/brave/locales/pl-PL/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave is your default browser.
 notDefaultBrowser=Brave is not your default browser.
 setAsDefault=Set as default…
 checkDefaultOnStartup=Always check on startup
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/pt-BR/preferences.properties b/app/extensions/brave/locales/pt-BR/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=O Brave é o seu navegador padrão.
 notDefaultBrowser=O Brave não é o seu navegador padrão.
 setAsDefault=Definir como padrão...
 checkDefaultOnStartup=Sempre verificar na inicialização
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/ru/preferences.properties b/app/extensions/brave/locales/ru/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave является браузером по умолчанию
 notDefaultBrowser=Brave не является браузером по умолчанию.
 setAsDefault=Установить по умолчанию…
 checkDefaultOnStartup=Всегда проверять при запуске
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/sl/preferences.properties b/app/extensions/brave/locales/sl/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave je vaš privzeti brskalnik:
 notDefaultBrowser=Brave ni vaš privzeti brskalnik:
 setAsDefault=Določi kot privzeto ...
 checkDefaultOnStartup=Vedno preveri ob zagonu
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/ta/preferences.properties b/app/extensions/brave/locales/ta/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave is your default browser.
 notDefaultBrowser=Brave is not your default browser.
 setAsDefault=Set as default…
 checkDefaultOnStartup=Always check on startup
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/te/preferences.properties b/app/extensions/brave/locales/te/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave is your default browser.
 notDefaultBrowser=Brave is not your default browser.
 setAsDefault=Set as default…
 checkDefaultOnStartup=Always check on startup
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/tr-TR/preferences.properties b/app/extensions/brave/locales/tr-TR/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave is your default browser.
 notDefaultBrowser=Brave is not your default browser.
 setAsDefault=Set as default…
 checkDefaultOnStartup=Always check on startup
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/uk/preferences.properties b/app/extensions/brave/locales/uk/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave є вашим типовим браузером.
 notDefaultBrowser=Brave не є вашим типовим браузером.
 setAsDefault=Встановити типовим…
 checkDefaultOnStartup=Завжди перевіряти при запуску
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/brave/locales/zh-CN/preferences.properties b/app/extensions/brave/locales/zh-CN/preferences.properties
@@ -267,3 +267,4 @@ defaultBrowser=Brave 是您的默认浏览器。
 notDefaultBrowser=Brave 不是您的默认浏览器。
 setAsDefault=设置为默认值...
 checkDefaultOnStartup=总是在启动时检查
+useTorrentViewer=Enable Torrent Viewer (requires browser restart)
diff --git a/app/extensions/torrent/ext/l20n.min.js b/app/extensions/torrent/ext/l20n.min.js
diff --git a/app/extensions/torrent/img/favicon.ico b/app/extensions/torrent/img/favicon.ico
diff --git a/app/extensions/torrent/img/webtorrent-128.png b/app/extensions/torrent/img/webtorrent-128.png
diff --git a/app/extensions/torrent/img/webtorrent-16.png b/app/extensions/torrent/img/webtorrent-16.png
diff --git a/app/extensions/torrent/img/webtorrent-48.png b/app/extensions/torrent/img/webtorrent-48.png
diff --git a/app/extensions/torrent/img/webtorrent.png b/app/extensions/torrent/img/webtorrent.png
diff --git a/app/extensions/torrent/js/webtorrent.js b/app/extensions/torrent/js/webtorrent.js
@@ -0,0 +1,17 @@
+(function () {
+  let webtorrentEntryPage = 'gen/webtorrentPage.entry.js'
+
+  chrome.ipc.on('language', (e, detail) => {
+    document.l10n.requestLanguages([detail.langCode])
+    document.getElementsByName('availableLanguages')[0].content = detail.languageCodes.join(', ')
+  })
+
+  window.addEventListener('load', function () {
+    var po = document.createElement('script')
+    po.async = true
+    po.src = webtorrentEntryPage
+    var s = document.getElementsByTagName('script')[0]
+    s.parentNode.insertBefore(po, s)
+    chrome.ipc.send('request-language')
+  })
+})()
diff --git a/app/extensions/torrent/locales/en-US/app.properties b/app/extensions/torrent/locales/en-US/app.properties
@@ -0,0 +1,21 @@
+startPrompt=Start Downloading "{{name}}"?
+startPromptUntitled=Start Downloading?
+startDownload=Start Download
+saveTorrentFile=Save Torrent File
+legalNotice=When you start a torrent, its data will be made available to others by means of upload. You are responsible for abiding by your local laws.
+missingFilesList=Click "Start Download" to load the torrent file list.
+loadingFilesList=Loading the torrent file list...
+name=Name
+size=Size
+poweredByWebTorrent=Powered By WebTorrent.
+seeding=Seeding
+seedingTorrent=Seeding Torrent
+downloading=Downloading
+downloadingTorrent=Downloading Torrent
+files=Files
+num=#
+downloadFile=Download
+torrentStatus=Torrent Status
+torrentLoadingInfo=Loading torrent info...
+torrentUntitled=Untitled torrent
+torrentLoadingMedia=Loading...