saves stream to file

app/fileReceiver.js

@@ -1,7 +1,7 @@
 import Nanobus from 'nanobus';
 import Keychain from './keychain';
 import { bytes } from './utils';
-import { metadata, downloadFile, downloadStream } from './api';
+import { metadata } from './api';
 
 export default class FileReceiver extends Nanobus {
   constructor(fileInfo) {
@@ -52,107 +52,57 @@ export default class FileReceiver extends Nanobus {
   }
 
   async streamToArrayBuffer(stream, streamSize, onprogress) {
-    try {
-      const result = new Uint8Array(streamSize);
-      let offset = 0;
-      const reader = stream.getReader();
-      let state = await reader.read();
-      while (!state.done) {
-        result.set(state.value, offset);
-        offset += state.value.length;
-        state = await reader.read();
-        onprogress([offset, streamSize]);
-      }
-
-      onprogress([streamSize, streamSize]);
-      return result.slice(0, offset).buffer;
-    } catch (e) {
-      console.log(e);
-      throw (e);
+    const result = new Uint8Array(streamSize);
+    let offset = 0;
+    const reader = stream.getReader();
+    let state = await reader.read();
+    while (!state.done) {
+      result.set(state.value, offset);
+      offset += state.value.length;
+      state = await reader.read();
+      onprogress([offset, streamSize]);
     }
+
+    onprogress([streamSize, streamSize]);
+    return result.slice(0, offset).buffer;
   }
 
   async download(noSave = false) {
     const onprogress = p => {
       this.progress = p;
       this.emit('progress');
-    }
+    };
 
     try {
       this.state = 'downloading';
-      this.downloadRequest = downloadStream(
-        this.fileInfo.id,
-        this.keychain
-      );
+
+      const auth = await this.keychain.authHeader();
+      const info = {
+        key: this.fileInfo.secretKey,
+        nonce: this.fileInfo.nonce,
+        filename: this.fileInfo.name,
+        auth: auth
+      };
+      navigator.serviceWorker.controller.postMessage(info);
 
       onprogress([0, this.fileInfo.size]);
-      const download = await this.downloadRequest.result;
-      const plainstream = this.keychain.decryptStream(download);
-
-      //temporary
-      const plaintext = await this.streamToArrayBuffer(
-        plainstream,
-        this.fileInfo.size,
-        onprogress
-      );
-      this.downloadRequest = null;
-
-      this.msg = 'decryptingFile';
-      this.state = 'decrypting';
-      this.emit('decrypting');
 
       if (!noSave) {
-        await saveFile({
-          plaintext,
-          name: decodeURIComponent(this.fileInfo.name),
-          type: this.fileInfo.type
-        });
+        const downloadUrl = `${location.protocol}//${
+          location.host
+        }/api/download/${this.fileInfo.id}`;
+        const a = document.createElement('a');
+        a.href = downloadUrl;
+        document.body.appendChild(a);
+        a.click();
+        URL.revokeObjectURL(downloadUrl);
       }
 
-      this.msg = 'downloadFinish';
-      this.state = 'complete';
+      //this.msg = 'downloadFinish';
+      //this.state = 'complete';
     } catch (e) {
       this.downloadRequest = null;
       throw e;
     }
   }
 }
-
-async function saveFile(file) {
-  return new Promise(function(resolve, reject) {
-    const dataView = new DataView(file.plaintext);
-    const blob = new Blob([dataView], { type: file.type });
-
-    if (navigator.msSaveBlob) {
-      navigator.msSaveBlob(blob, file.name);
-      return resolve();
-    } else if (/iPhone|fxios/i.test(navigator.userAgent)) {
-      // This method is much slower but createObjectURL
-      // is buggy on iOS
-      const reader = new FileReader();
-      reader.addEventListener('loadend', function() {
-        if (reader.error) {
-          return reject(reader.error);
-        }
-        if (reader.result) {
-          const a = document.createElement('a');
-          a.href = reader.result;
-          a.download = file.name;
-          document.body.appendChild(a);
-          a.click();
-        }
-        resolve();
-      });
-      reader.readAsDataURL(blob);
-    } else {
-      const downloadUrl = URL.createObjectURL(blob);
-      const a = document.createElement('a');
-      a.href = downloadUrl;
-      a.download = file.name;
-      document.body.appendChild(a);
-      a.click();
-      URL.revokeObjectURL(downloadUrl);
-      setTimeout(resolve, 100);
-    }
-  });
-}