Merge pull request #6 from Speuta/master

node shell.download(...) use stream chunks and have a progress callback too

Author: fabsharp

dist/index.d.ts

@@ -34,7 +34,7 @@ declare module shell {
    * @param url
    * @param dest
    */
-  const download: (url: string, dest: string, progressCallback? : (progress: any) => {}) => Promise<ShellEntry>;
+  const download: (url: string, dest: string, progressCallback? : (progress: any) => void) => Promise<ShellEntry>;
   /**
    * Check if a file or a directory exists
    * @param url

dist/node-shell.js

@@ -31,4 +31,4 @@ export default [{
         resolve(),
         commonjs()
     ]
-}];
+}];

dist/node-shell.js.map

@@ -18,7 +18,7 @@ export default [{
     input: 'src/node/index.ts',
     output: [{
         file: 'node-test/node-shell.js',
-        format: 'commonjs',
+        format: 'umd',
         sourcemap: 'inline',
         name : 'shell',
     }],
@@ -27,4 +27,4 @@ export default [{
         resolve(),
         commonjs(),
     ]
-}];
+}];

node-test/node-shell.js

@@ -3,7 +3,7 @@ import {mkdir} from "./mkdir";
 import * as log from "./log/index";
 import {ShellEntry} from "../ShellEntry";
 
-export const download = (url : string, dest : string, progressCallback? : (progress: any) => {}) : Promise<ShellEntry> => {
+export const download = (url : string, dest : string, progressCallback? : (progress: any) => void) : Promise<ShellEntry> => {
   return new Promise((resolve, reject) => {
     let extract = extractFileName(dest);
     let newName = extract.file;
@@ -23,7 +23,7 @@ export const download = (url : string, dest : string, progressCallback? : (progr
   });
 };
 
-const launchDownloadStreamXHR = (url : string, entry : FileEntry, progressCallback? : (progress: any) => {}) :Promise<ShellEntry> => {
+const launchDownloadStreamXHR = (url : string, entry : FileEntry, progressCallback? : (progress: any) => void) :Promise<ShellEntry> => {
   return new Promise((resolve, reject) => {
     let xhr = new XMLHttpRequest();
     xhr.open('GET', url, true);
@@ -65,7 +65,7 @@ const launchDownloadStreamXHR = (url : string, entry : FileEntry, progressCallba
   });
 };
 
-const writeFile = (entry : FileEntry, data : Blob, progressCallback? : (progress: any) => {}) :Promise<ShellEntry> => {
+const writeFile = (entry : FileEntry, data : Blob, progressCallback? : (progress: any) => void) :Promise<ShellEntry> => {
   return new Promise((resolve, reject) => {
     entry.createWriter((fileWriter : FileWriter) => {
       fileWriter.onerror = (err) => {

rollup.config.js

@@ -1,25 +1,72 @@
 import {ShellEntry} from "../ShellEntry";
-const http = require('http');
 const fs = require('fs');
-const fetch = require('node-fetch');
 const path = require('path');
 import {getEntry} from "./utils/getEntry";
 import * as log from './log';
 import {mkdir} from "./mkdir";
 
-export const download = (url : string, dest : string) : Promise<ShellEntry> => {
+export const download = (url : string, dest : string, progressCallback? : (progress: any) => void) : Promise<ShellEntry> => {
   return new Promise((resolve, reject) => {
-    fetch(url).then((res) => {
-      // dest could be deep folder
       let parent = path.dirname(dest);
       mkdir(parent).then(() => {
-        const writeStream = fs.createWriteStream(dest);
-        res.body.pipe(writeStream);
-        getEntry(dest).then(entry => {
-          log.info("file downloaded");
-          resolve(entry);
-        }, reject);
+          launchDownloadStreamXHR(url, dest, progressCallback).then((file) => {
+              resolve(file);
+          }).catch((err) => {
+              reject(err);
+          });
       }, reject);
-    }, reject);
   });
-}
+};
+
+const launchDownloadStreamXHR = (url : string, dest : string, progressCallback? : (progress: any) => void) :Promise<ShellEntry> => {
+    return new Promise((resolve, reject) => {
+        let xhr = new XMLHttpRequest();
+        let fileStream = fs.createWriteStream(dest);
+        xhr.open('GET', url, true);
+        xhr.responseType = 'arraybuffer';
+        xhr.onerror = (err) => {
+            reject(err);
+        };
+        if(typeof progressCallback === 'function'){
+            xhr.onprogress = (e) => {
+                if(e.lengthComputable){
+                    progressCallback({
+                        action: 'downloading',
+                        loaded: e.loaded,
+                        total: e.total,
+                        percentDownloading: (e.loaded > 0) ? ((e.loaded / e.total) * 100) : 0,
+                        percent: (e.loaded > 0) ? ((e.loaded / e.total) * 50) : 0,
+                    });
+                }
+            };
+        }
+        xhr.onload = function() {
+            if (this.status == 200) {
+                progressCallback({
+                    action: 'downloading',
+                    loaded: this.response.byteLength,
+                    total: this.response.byteLength,
+                    percentDownloading: 100,
+                    percent: 50,
+                });
+                fileStream.write(Buffer.from(this.response));
+                fileStream.end(() => {
+                    getEntry(dest).then(entry => {
+                        log.info("file downloaded");
+                        if(typeof progressCallback === 'function'){
+                            progressCallback({
+                                action: 'writing',
+                                written: entry.size,
+                                total: entry.size,
+                                percentWriting: 100,
+                                percent: 100,
+                            });
+                            resolve(entry);
+                        }
+                    }, reject);
+                });
+            }
+        };
+        xhr.send();
+    });
+};