cleanup storage / listeners

Author: Salakar

lib/modules/storage.js

@@ -1,11 +1,11 @@
+import { NativeModules, NativeEventEmitter } from 'react-native';
+
+import { promisify, noop } from '../utils';
+import { Base, ReferenceBase } from './base';
 
-import {NativeModules, NativeEventEmitter} from 'react-native';
 const FirestackStorage = NativeModules.FirestackStorage;
 const FirestackStorageEvt = new NativeEventEmitter(FirestackStorage);
 
-import promisify from '../utils/promisify'
-import { Base, ReferenceBase } from './base'
-
 class StorageRef extends ReferenceBase {
   constructor(storage, path) {
     super(storage.firestack, path);
@@ -21,34 +21,32 @@ class StorageRef extends ReferenceBase {
   /**
    * Downloads a reference to the device
    * @param {String} downloadPath Where to store the file
+   * @param listener
    * @return {Promise}
    */
-  download (downloadPath, cb) {
-    let callback = cb;
-    if (!callback || typeof callback !== 'function') {
-      callback = (evt) => {};
-    }
-
-    const listeners = [];
-    listeners.push(this.storage._addListener('download_progress', callback));
-    listeners.push(this.storage._addListener('download_paused', callback));
-    listeners.push(this.storage._addListener('download_resumed', callback));
-
+  download(downloadPath: string, listener: Function = noop) {
     const path = this.pathToString();
+    const listeners = [
+      this.storage._addListener('download_progress', listener),
+      this.storage._addListener('download_paused', listener),
+      this.storage._addListener('download_resumed', listener),
+    ];
+
     return promisify('downloadFile', FirestackStorage)(this.storage.storageUrl, path, downloadPath)
       .then((res) => {
         console.log('res --->', res);
         listeners.forEach(this.storage._removeListener);
         return res;
       })
-      .catch(err => {
-        console.log('Got an error ->', err);
-      })
+      .catch((downloadError) => {
+        console.log('Got an error ->', downloadError);
+        return Promise.reject(downloadError);
+      });
   }
 }
 
 export default class Storage extends Base {
-  constructor(firestack, options={}) {
+  constructor(firestack, options = {}) {
     super(firestack, options);
 
     if (this.options.storageBucket) {
@@ -70,23 +68,20 @@ export default class Storage extends Base {
   /**
    * Upload a filepath
    * @param  {string} name     The destination for the file
-   * @param  {string} filepath The local path of the file
+   * @param  {string} filePath The local path of the file
    * @param  {object} metadata An object containing metadata
+   * @param listener
    * @return {Promise}
    */
-  uploadFile(name, filepath, metadata={}, cb) {
-    let callback = cb;
-    if (!callback || typeof callback !== 'function') {
-      callback = (evt) => {}
-    }
-
-    filepath = filepath.replace("file://", "");
-
-    const listeners = [];
-    listeners.push(this._addListener('upload_progress', callback));
-    listeners.push(this._addListener('upload_paused', callback));
-    listeners.push(this._addListener('upload_resumed', callback));
-    return promisify('uploadFile', FirestackStorage)(this.storageUrl, name, filepath, metadata)
+  uploadFile(name: string, filePath: string, metadata: Object = {}, listener: Function = noop) {
+    const _filePath = filePath.replace('file://', '');
+    const listeners = [
+      this._addListener('upload_paused', listener),
+      this._addListener('upload_resumed', listener),
+      this._addListener('upload_progress', listener),
+    ];
+
+    return promisify('uploadFile', FirestackStorage)(this.storageUrl, name, _filePath, metadata)
       .then((res) => {
         listeners.forEach(this._removeListener);
         return res;
@@ -115,19 +110,19 @@ export default class Storage extends Base {
   }
 
   static constants = {
-      'MAIN_BUNDLE_PATH': FirestackStorage.MAIN_BUNDLE_PATH,
-      'CACHES_DIRECTORY_PATH': FirestackStorage.CACHES_DIRECTORY_PATH,
-      'DOCUMENT_DIRECTORY_PATH': FirestackStorage.DOCUMENT_DIRECTORY_PATH,
-      'EXTERNAL_DIRECTORY_PATH': FirestackStorage.EXTERNAL_DIRECTORY_PATH,
-      'EXTERNAL_STORAGE_DIRECTORY_PATH': FirestackStorage.EXTERNAL_STORAGE_DIRECTORY_PATH,
-      'TEMP_DIRECTORY_PATH': FirestackStorage.TEMP_DIRECTORY_PATH,
-      'LIBRARY_DIRECTORY_PATH': FirestackStorage.LIBRARY_DIRECTORY_PATH,
-      'FILETYPE_REGULAR': FirestackStorage.FILETYPE_REGULAR,
-      'FILETYPE_DIRECTORY': FirestackStorage.FILETYPE_DIRECTORY
+    MAIN_BUNDLE_PATH: FirestackStorage.MAIN_BUNDLE_PATH,
+    CACHES_DIRECTORY_PATH: FirestackStorage.CACHES_DIRECTORY_PATH,
+    DOCUMENT_DIRECTORY_PATH: FirestackStorage.DOCUMENT_DIRECTORY_PATH,
+    EXTERNAL_DIRECTORY_PATH: FirestackStorage.EXTERNAL_DIRECTORY_PATH,
+    EXTERNAL_STORAGE_DIRECTORY_PATH: FirestackStorage.EXTERNAL_STORAGE_DIRECTORY_PATH,
+    TEMP_DIRECTORY_PATH: FirestackStorage.TEMP_DIRECTORY_PATH,
+    LIBRARY_DIRECTORY_PATH: FirestackStorage.LIBRARY_DIRECTORY_PATH,
+    FILETYPE_REGULAR: FirestackStorage.FILETYPE_REGULAR,
+    FILETYPE_DIRECTORY: FirestackStorage.FILETYPE_DIRECTORY,
   };
 
   get namespace() {
-    return 'firestack:storage'
+    return 'firestack:storage';
   }
 }