Merge pull request #483 from ipfs-shipyard/feat/upload-status

Upload screen feedback and bugfixes

add-on/_locales/en/messages.json

@@ -366,6 +366,14 @@
     "message": "drop it here to share",
     "description": "Partial info stats beneath the header on the share files page (quickUpload_drop_it_here)"
   },
+  "quickUpload_state_uploading": {
+    "message": "Upload in progress..",
+    "description": "Status label on the share files page (quickUpload_state_uploading)"
+  },
+  "quickUpload_state_buffering": {
+    "message": "(buffering, please wait)",
+    "description": "Status label on the share files page (quickUpload_state_buffering)"
+  },
   "quickUpload_options_show": {
     "message": "upload options",
     "description": "Button on the share files page (quickUpload_options_show)"

add-on/src/popup/quick-upload.js

@@ -5,6 +5,8 @@ const browser = require('webextension-polyfill')
 const choo = require('choo')
 const html = require('choo/html')
 const logo = require('./logo')
+const fileReaderPullStream = require('filereader-pull-stream')
+const filesize = require('filesize')
 
 document.title = browser.i18n.getMessage('panel_quickUpload')
 
@@ -14,13 +16,31 @@ app.use(quickUploadStore)
 app.route('*', quickUploadPage)
 app.mount('#root')
 
+/* disabled in favor of fileReaderPullStream
 function file2buffer (file) {
   return new Promise((resolve, reject) => {
     const reader = new FileReader()
     reader.onloadend = () => resolve(Buffer.from(reader.result))
     reader.onerror = reject
     reader.readAsArrayBuffer(file)
   })
+} */
+
+function progressHandler (doneBytes, totalBytes, state, emitter) {
+  state.message = browser.i18n.getMessage('quickUpload_state_uploading')
+  // console.log('Upload progress:', doneBytes)
+  if (doneBytes && doneBytes > 0) {
+    const format = { standard: 'iec', round: 0, output: 'object' }
+    const done = filesize(doneBytes, format)
+    const total = filesize(totalBytes, format)
+    const percent = ((doneBytes / totalBytes) * 100).toFixed(0)
+    state.progress = `${done.value} ${done.symbol} / ${total.value} ${total.symbol} (${percent}%)`
+  } else {
+    // This is a gracefull fallback for environments in which progress reporting is delayed
+    // until entire file/chunk is bufferend into memory (eg. js-ipfs-api)
+    state.progress = browser.i18n.getMessage('quickUpload_state_buffering')
+  }
+  emitter.emit('render')
 }
 
 function quickUploadStore (state, emitter) {
@@ -55,25 +75,45 @@ function quickUploadStore (state, emitter) {
       const { ipfsCompanion } = await browser.runtime.getBackgroundPage()
       const uploadTab = await browser.tabs.getCurrent()
       const files = []
+      let totalSize = 0
       for (let file of event.target.files) {
-        const buffer = await file2buffer(file)
+        // const uploadContent = await file2buffer(file)
+        const uploadContent = fileReaderPullStream(file, {chunkSize: 32 * 1024 * 1024})
         files.push({
           path: file.name,
-          content: buffer
+          content: uploadContent
         })
+        totalSize += file.size
+      }
+      if (!browser.runtime.id.includes('@')) {
+        // we are in non-Firefox runtime (we know for a fact that Chrome puts no @ in id)
+        if (state.ipfsNodeType === 'external' && totalSize >= 134217728) {
+          // avoid crashing Chrome until the source of issue is fixed in js-ipfs-api
+          // - https://github.com/ipfs-shipyard/ipfs-companion/issues/464
+          // - https://github.com/ipfs/js-ipfs-api/issues/654
+          throw new Error('Unable to process payload bigger than 128MiB in Chrome. See: js-ipfs-api/issues/654')
+        }
       }
+      progressHandler(0, totalSize, state, emitter)
+      emitter.emit('render')
+      // TODO: update flag below after wrapping support is released with new js-ipfs
+      // TODO: also enable multiple file selection in <input type=file> (blocked for js-ipfs for now)
+      const wrapFlag = (state.wrapWithDirectory || files.length > 1) && state.ipfsNodeType !== 'embedded'
       const uploadOptions = {
-        wrapWithDirectory: state.wrapWithDirectory || files.length > 1,
+        progress: (len) => progressHandler(len, totalSize, state, emitter),
+        wrapWithDirectory: wrapFlag,
         pin: state.pinUpload
       }
       const result = await ipfsCompanion.ipfsAddAndShow(files, uploadOptions)
+      emitter.emit('render')
       console.log('Upload result', result)
       // close upload tab as it will be replaced with a new tab with uploaded content
-      browser.tabs.remove(uploadTab.id)
+      await browser.tabs.remove(uploadTab.id)
     } catch (err) {
       console.error('Unable to perform quick upload', err)
       // keep upload tab and display error message in it
-      state.message = `Unable to upload to IPFS API: ${err}`
+      state.message = `Unable to upload to IPFS API:`
+      state.progress = `${err}`
       emitter.emit('render')
     }
   })
@@ -129,7 +169,7 @@ function quickUploadPage (state, emit) {
           </div>
         </header>
         <label for="quickUploadInput" class='db relative mt5 hover-inner-shadow' style="border:solid 2px #6ACAD1">
-          <input class="db absolute pointer w-100 h-100 top-0 o-0" type="file" id="quickUploadInput" multiple onchange=${onFileInputChange} />
+          <input class="db pointer w-100 h-100 top-0 o-0" type="file" id="quickUploadInput" ${state.ipfsNodeType === 'external' ? 'multiple' : null} onchange=${onFileInputChange} />
           <div class='dt dim' style='padding-left: 100px; height: 300px'>
             <div class='dtc v-mid'>
               <span class="f3 link dim br1 ph4 pv3 dib white" style="background: #6ACAD1">
@@ -141,7 +181,7 @@ function quickUploadPage (state, emit) {
                 </emph>
                 ${browser.i18n.getMessage('quickUpload_drop_it_here')}
               </span>
-              <p class='f4'>${state.message}</p>
+              <p class='f4 db'>${state.message}<span class='code db absolute fr pv2'>${state.progress}</span></p>
             </div>
           </div>
         </label>

package.json

@@ -93,6 +93,8 @@
     "choo": "6.8.0",
     "doc-sniff": "1.0.1",
     "file-type": "7.6.0",
+    "filereader-pull-stream": "1.0.0",
+    "filesize": "3.6.1",
     "ipfs": "0.28.2",
     "ipfs-api": "21.0.0",
     "ipfs-css": "0.3.0",

yarn.lock

@@ -3188,6 +3188,16 @@ filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
+filereader-pull-stream@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/filereader-pull-stream/-/filereader-pull-stream-1.0.0.tgz#9cd17b66a5085a8770ab58c2882396b3d4f2e030"
+  dependencies:
+    typedarray-to-buffer "^3.1.2"
+
+filesize@3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
+
 filesize@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.0.tgz#22d079615624bb6fd3c04026120628a41b3f4efa"
@@ -4999,7 +5009,7 @@ is-symbol@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
 
-is-typedarray@~1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
 
@@ -9881,6 +9891,12 @@ type-detect@^4.0.0, type-detect@^4.0.5:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
 
+typedarray-to-buffer@^3.1.2:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  dependencies:
+    is-typedarray "^1.0.0"
+
 typedarray-to-buffer@~1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-1.0.4.tgz#9bb8ba0e841fb3f4cf1fe7c245e9f3fa8a5fe99c"