use cr62 download api

fix #11326
requires brave/muon#342

Author: bridiver

app/filtering.js

@@ -23,9 +23,7 @@ const config = require('../js/constants/config')
 const locale = require('./locale')
 const {isSessionPartition} = require('../js/state/frameStateUtil')
 const ipcMain = electron.ipcMain
-const dialog = electron.dialog
 const app = electron.app
-const uuid = require('uuid')
 const path = require('path')
 const fs = require('fs')
 const getOrigin = require('../js/lib/urlutil').getOrigin
@@ -553,6 +551,10 @@ function updateDownloadState (win, downloadId, item, state) {
 }
 
 function registerForDownloadListener (session) {
+  session.on('default-download-directory-changed', (e, newPath) => {
+    appActions.changeSetting(settings.DEFAULT_DOWNLOAD_SAVE_PATH, newPath)
+  })
+
   session.on('will-download', function (event, item, webContents) {
     if (webContents.isDestroyed()) {
       event.preventDefault()
@@ -568,51 +570,30 @@ function registerForDownloadListener (session) {
       webContents.forceClose()
     }
 
-    // special handling for data URLs where another 'will-download' event handler is trying to suggest a filename via item.setSavePath
-    // see the IPC handler for RENDER_URL_TO_PDF in app/index.js for example
-    let itemFilename
-    if (item.getURL().match(/^data:/) && item.getSavePath()) {
-      itemFilename = path.basename(item.getSavePath())
-    } else {
-      itemFilename = item.getFilename()
+    if (getSetting(settings.DOWNLOAD_ALWAYS_ASK)) {
+      item.setPrompt(true)
     }
 
-    const defaultDir = (getSetting(settings.DOWNLOAD_DEFAULT_PATH) || getSetting(settings.DEFAULT_DOWNLOAD_SAVE_PATH) || app.getPath('downloads'))
-    let savePath
-    if (process.env.SPECTRON || (!getSetting(settings.DOWNLOAD_ALWAYS_ASK) && !item.promptForSaveLocation())) {
-      let willOverwrite = true
-      let matchedFilenames = 0
-      while (willOverwrite) {
-        savePath = path.join(defaultDir, (matchedFilenames ? `${itemFilename.replace(new RegExp(`${path.extname(itemFilename)}$`), '')} (${matchedFilenames})${path.extname(itemFilename)}` : itemFilename))
-        if (!fs.existsSync(savePath)) {
-          willOverwrite = false
-        } else {
-          matchedFilenames++
-        }
+    const downloadId = item.getGuid()
+    item.on('updated', function (e, st) {
+      if (!item.getSavePath()) {
+        return
       }
-    } else {
-      savePath = dialog.showSaveDialog(win, { defaultPath: path.join(defaultDir, itemFilename) })
-    }
-
-    // User cancelled out of save dialog prompt
-    if (!savePath) {
-      event.preventDefault()
-      return
-    }
-
-    item.setSavePath(savePath)
-    appActions.changeSetting(settings.DEFAULT_DOWNLOAD_SAVE_PATH, path.dirname(savePath))
-
-    const downloadId = uuid.v4()
-    updateDownloadState(win, downloadId, item, downloadStates.PENDING)
-    if (win) {
-      win.webContents.send(messages.SHOW_DOWNLOADS_TOOLBAR)
-    }
-    item.on('updated', function () {
       const state = item.isPaused() ? downloadStates.PAUSED : downloadStates.IN_PROGRESS
       updateDownloadState(win, downloadId, item, state)
+      if (win) {
+        win.webContents.send(messages.SHOW_DOWNLOADS_TOOLBAR)
+      }
+      item.on('removed', function () {
+        updateElectronDownloadItem(downloadId, item, downloadStates.CANCELLED)
+        appActions.mergeDownloadDetail(downloadId)
+      })
     })
+
     item.on('done', function (e, state) {
+      if (!item.getSavePath()) {
+        return
+      }
       updateDownloadState(win, downloadId, item, state)
     })
   })

app/pdf.js

@@ -4,83 +4,50 @@
 
 'use strict'
 
-const electron = require('electron')
-const config = require('../js/constants/config')
-const BrowserWindow = electron.BrowserWindow
-
-const renderUrlToPdf = (appState, action) => {
-  let url = action.url
-  let savePath = action.savePath
-  let openAfterwards = action.openAfterwards
+const tabs = require('./browser/tabs')
+const {fileUrl} = require('../../js/lib/appUrlUtil')
+const {getWebContents} = require('./browser/webContentsCache')
+
+const renderToPdf = (appState, action) => {
+  const tab = getWebContents(action.tabId)
+  if (!tab || tab.isDestroyed()) {
+    return
+  }
 
-  let currentBw = BrowserWindow.getFocusedWindow()
+  const savePath = action.savePath
+  const openAfterwards = action.openAfterwards
 
-  let bw = new BrowserWindow({
-    show: false,
-    width: 0,
-    height: 0,
-    focusable: false,
-    backgroundColor: '#ffffff',
-    webPreferences: {
-      partition: 'default'
+  tab.printToPDF({}, function (err, data) {
+    if (err) {
+      throw err
     }
-  })
-
-  let wv = bw.webContents
-
-  let whenReadyToGeneratePDF = () => {
-    wv.printToPDF({}, function (err, data) {
-      if (err) {
-        throw err
-      }
 
-      let pdfDataURI = 'data:application/pdf;base64,' + data.toString('base64')
-
-      // need to put our event handler first so we can set filename
-      //   specifically, needs to execute ahead of app/filtering.js:registerForDownloadListener (which opens the dialog box)
-      let listeners = wv.session.listeners('will-download')
-      wv.session.removeAllListeners('will-download')
-
-      wv.downloadURL(pdfDataURI, true)
-      wv.session.once('will-download', function (event, item) {
-        if (savePath) {
-          item.setSavePath(savePath)
-        }
+    if (tab.isDestroyed()) {
+      return
+    }
 
-        item.once('done', function (event, state) {
-          if (state === 'completed') {
-            let finalSavePath = item && item.getSavePath()
+    let pdfDataURI = 'data:application/pdf;base64,' + data.toString('base64')
+    tab.downloadURL(pdfDataURI, true, savePath, (downloadItem) => {
+      downloadItem.once('done', function (event, state) {
+        if (state === 'completed') {
+          let finalSavePath = downloadItem.getSavePath()
 
-            if (openAfterwards && savePath) {
-              currentBw.webContents.loadURL('file://' + finalSavePath)
+          if (openAfterwards && finalSavePath) {
+            let createProperties = {
+              url: fileUrl(finalSavePath)
             }
+            if (tab && !tab.isDestoyed()) {
+              createProperties.openerTabId = tab.getId()
+            }
+            tabs.create(createProperties)
           }
-
-          if (bw) {
-            try {
-              bw.close()
-            } catch (exc) {}
-          }
-        })
-      })
-      // add back other event handlers (esp. add/filtering.js:registerForDownloadListener which opens the dialog box)
-      listeners.forEach(function (listener) {
-        wv.session.on('will-download', listener)
+        }
       })
     })
-  }
-
-  let afterLoaded = () => {
-    let removeCharEncodingArtifactJS = 'document.body.outerHTML = document.body.outerHTML.replace(/Â/g, "")'
-    wv.executeScriptInTab(config.braveExtensionId, removeCharEncodingArtifactJS, {}, whenReadyToGeneratePDF)
-  }
-
-  bw.loadURL(url)
-  wv.on('did-finish-load', afterLoaded)
-
+  })
   return appState
 }
 
 module.exports = {
-  renderUrlToPdf
+  renderToPdf
 }

js/about/aboutActions.js

@@ -341,12 +341,11 @@ const aboutActions = {
   },
 
   /**
-   * Dispatches a message to render a URL into a PDF file
+   * Dispatches a message to render the tab into a PDF file
    */
-  renderUrlToPdf: function (url, savePath) {
+  renderToPdf: function (savePath) {
     aboutActions.dispatchAction({
-      actionType: appConstants.APP_RENDER_URL_TO_PDF,
-      url: url,
+      actionType: appConstants.APP_RENDER_TO_PDF,
       savePath: savePath
     })
   }

js/about/contributionStatement.js

@@ -3,7 +3,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ReactDOM = require('react-dom')
 const Immutable = require('immutable')
 const {makeImmutable} = require('../../app/common/state/immutableUtil')
 const {getBase64FromImageUrl} = require('../lib/imageUtil')
@@ -129,20 +128,13 @@ class ContributionStatement extends React.Component {
     getBase64FromImageUrl(verifiedIcon).then(src => this.setState({verifiedIcon: src}))
   }
 
-  get htmlDataURL () {
-    let generatedStylesheet = document.head.querySelector('style').outerHTML
-    let dataURL = 'data:text/html,' + encodeURIComponent('<html><head><meta charset="utf-8">' + generatedStylesheet + '</head><body>' + ReactDOM.findDOMNode(this).outerHTML + '</body></html>')
-
-    return dataURL
-  }
-
   receiptFileName (transaction) {
     transaction = makeImmutable(transaction || this.transaction)
     return `${transaction.get('exportFilenamePrefix')}.pdf`
   }
 
   renderPdf () {
-    aboutActions.renderUrlToPdf(this.htmlDataURL, this.receiptFileName())
+    aboutActions.renderToPdf(this.receiptFileName())
   }
 
   get transaction () {

js/constants/appConstants.js

@@ -73,7 +73,7 @@ const appConstants = {
   APP_DEFAULT_BROWSER_UPDATED: _,
   APP_DEFAULT_BROWSER_CHECK_COMPLETE: _,
   APP_POPULATE_HISTORY: _,
-  APP_RENDER_URL_TO_PDF: _,
+  APP_RENDER_TO_PDF: _,
   APP_DATA_URL_COPIED: _,
   APP_DOWNLOAD_REVEALED: _,
   APP_DOWNLOAD_OPENED: _,

js/stores/appStore.js

@@ -517,9 +517,9 @@ const handleAppAction = (action) => {
         calculateTopSites(false)
       }
       break
-    case appConstants.APP_RENDER_URL_TO_PDF:
+    case appConstants.APP_RENDER_TO_PDF:
       const pdf = require('../../app/pdf')
-      appState = pdf.renderUrlToPdf(appState, action)
+      appState = pdf.renderToPdf(appState, action)
       break
     case appConstants.APP_SET_OBJECT_ID:
       let obj = appState.getIn(action.objectPath)