feat(storage): percentageChanges() and downloadURL()

Author: davideast

src/storage/ref.ts

@@ -1,14 +1,24 @@
 import { storage } from 'firebase/app';
-import { createUploadTask } from './task';
+import { createUploadTask, AngularFireUploadTask } from './task';
 import { Observable } from 'rxjs/Observable';
 import { from } from 'rxjs/observable/from';
 
+export interface AngularFireStorageReference {
+  getDownloadURL(): Observable<any>;
+  getMetadata(): Observable<any>;
+  delete(): Observable<any>;
+  child(path: string): any;
+  updateMetatdata(meta: storage.SettableMetadata): Observable<any>;
+  put(data: any, metadata?: storage.UploadMetadata | undefined): AngularFireUploadTask;
+  putString(data: string, format?: string | undefined, metadata?: storage.UploadMetadata | undefined): AngularFireUploadTask;
+}
+
 /**
  * Create an AngularFire wrapped Storage Reference. This object
  * creates observable methods from promise based methods.
  * @param ref 
  */
-export function createStorageRef(ref: storage.Reference) {
+export function createStorageRef(ref: storage.Reference): AngularFireStorageReference {
   return {
     getDownloadURL() { return from(ref.getDownloadURL()); },
     getMetadata() { return from(ref.getMetadata()) },

src/storage/storage.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { storage } from 'firebase/app';
 import { FirebaseApp } from 'angularfire2';
-import { createStorageRef } from './ref';
-import { createUploadTask } from './task';
+import { createStorageRef, AngularFireStorageReference } from './ref';
+import { createUploadTask, AngularFireUploadTask } from './task';
 import { Observable } from 'rxjs/Observable';
 
 /**

src/storage/task.ts

@@ -1,16 +1,43 @@
 import { storage } from 'firebase/app';
 import { fromTask } from './observable/fromTask';
 import { Observable } from 'rxjs/Observable';
+import { map, filter } from 'rxjs/operators';
 
-export function createUploadTask(task: storage.UploadTask) {
-  return {
-    snapshotChanges() { return fromTask(task); },    
+export interface AngularFireUploadTask {
+  snapshotChanges(): Observable<storage.UploadTaskSnapshot | undefined>;
+  percentageChanges(): Observable<number | undefined>;
+  downloadURL(): Observable<string | null>;
+  pause(): boolean;
+  cancel(): boolean;
+  resume(): boolean;
+  then(): Promise<any>;
+  catch(onRejected: (a: Error) => any): Promise<any>;
+}
+
+export function createUploadTask(task: storage.UploadTask): AngularFireUploadTask {
+  return { 
     pause() { return task.pause(); },    
     cancel() { return task.cancel(); },    
     resume() { return task.resume(); },    
     then() { return task.then(); },    
     catch(onRejected: (a: Error) => any) { 
       return task.catch(onRejected);
-    } 
+    },
+    snapshotChanges() { return fromTask(task); },   
+    percentageChanges() { 
+      return fromTask(task).pipe(
+        filter(s => s !== undefined),
+        map(s => {
+          return s!.bytesTransferred / s!.totalBytes * 100;
+        })
+      );
+    },
+    downloadURL() {
+      return fromTask(task).pipe(
+        filter(s => s !== undefined),
+        filter(s => s!.bytesTransferred === s!.totalBytes),
+        map(s => s!.downloadURL)
+      );
+    }
   };
 }