Updates to include downloading (closes #61)

Author: auser

Diff for: .gitignore

@@ -55,3 +55,4 @@ android/gradlew.bat
 android/gradle/
 .idea
 .idea
+coverage

Diff for: ios/Firestack/FirestackStorage.m

@@ -15,6 +15,12 @@ @implementation FirestackStorage
 
 RCT_EXPORT_MODULE(FirestackStorage);
 
+// Run on a different thread
+- (dispatch_queue_t)methodQueue
+{
+  return dispatch_queue_create("io.fullstack.firestack.storage", DISPATCH_QUEUE_SERIAL);
+}
+
 RCT_EXPORT_METHOD(downloadUrl: (NSString *) storageUrl
                   path:(NSString *) path
     callback:(RCTResponseSenderBlock) callback)
@@ -225,6 +231,7 @@ - (void) addUploadObservers:(FIRStorageUploadTask *) uploadTask
     [downloadTask observeStatus:FIRStorageTaskStatusFailure handler:^(FIRStorageTaskSnapshot *snapshot) {
         if (snapshot.error != nil) {
             NSDictionary *errProps = [[NSMutableDictionary alloc] init];
+            NSLog(@"Error in download: %@", snapshot.error);
 
             switch (snapshot.error.code) {
                 case FIRStorageErrorCodeObjectNotFound:
@@ -249,6 +256,29 @@ - (void) addUploadObservers:(FIRStorageUploadTask *) uploadTask
         }}];
 }
 
+// This is just too good not to use, but I don't want to take credit for
+// this work from RNFS
+// https://github.com/johanneslumpe/react-native-fs/blob/master/RNFSManager.m
+- (NSString *)getPathForDirectory:(int)directory
+{
+  NSArray *paths = NSSearchPathForDirectoriesInDomains(directory, NSUserDomainMask, YES);
+  return [paths firstObject];
+}
+
+- (NSDictionary *)constantsToExport
+{
+  return @{
+           @"MAIN_BUNDLE_PATH": [[NSBundle mainBundle] bundlePath],
+           @"CACHES_DIRECTORY_PATH": [self getPathForDirectory:NSCachesDirectory],
+           @"DOCUMENT_DIRECTORY_PATH": [self getPathForDirectory:NSDocumentDirectory],
+           @"EXTERNAL_DIRECTORY_PATH": [NSNull null],
+           @"EXTERNAL_STORAGE_DIRECTORY_PATH": [NSNull null],
+           @"TEMP_DIRECTORY_PATH": NSTemporaryDirectory(),
+           @"LIBRARY_DIRECTORY_PATH": [self getPathForDirectory:NSLibraryDirectory],
+           @"FILETYPE_REGULAR": NSFileTypeRegular,
+           @"FILETYPE_DIRECTORY": NSFileTypeDirectory
+           };
+}
 
 // Not sure how to get away from this... yet
 - (NSArray<NSString *> *)supportedEvents {

Diff for: lib/firestack.js

@@ -59,7 +59,6 @@ export class Firestack extends Singleton {
     if (!this.configurePromise) {
       const firestackOptions = Object.assign({}, this.options, opts);
 
-      log.info('Calling native configureWithOptions')
       this.configurePromise = promisify('configureWithOptions', FirestackModule)(firestackOptions)
         .then((configuredProperties) => {
           log.info('Native configureWithOptions success', configuredProperties);
@@ -117,18 +116,6 @@ export class Firestack extends Singleton {
     if (!this._cloudMessaging) { this._cloudMessaging = new CloudMessaging(this); }
     return this._cloudMessaging;
   }
-  // Storage
-  //
-  // /**
-  //  * Configure the library to store the storage url
-  //  * @param {string} url A string of your firebase storage url
-  //  * @return {Promise}
-  //  */
-  // setStorageUrl(url) {
-  //   return promisify('setStorageUrl')(url);
-  // }
-
-
 
   // other
   get ServerValue() {
@@ -166,6 +153,13 @@ export class Firestack extends Singleton {
     return this._store;
   }
 
+  get constants() {
+    if (!this._constants) {
+      this._constants = Object.assign({}, Storage.constants)
+    }
+    return this._constants;
+  }
+
   /**
    * Set the redux store helper
    */

Diff for: lib/modules/base.js

@@ -28,6 +28,12 @@ export class Base {
     return logs[this.namespace];
   }
 
+  _addConstantExports(constants) {
+    Object.keys(constants).forEach(name => {
+      FirestackModule[name] = constants[name];
+    });
+  }
+
   _addToFirestackInstance(...methods) {
     methods.forEach(name => {
       this.firestack[name] = this[name].bind(this);

Diff for: lib/modules/storage.js

@@ -37,9 +37,13 @@ class StorageRef extends ReferenceBase {
     const path = this.pathToString();
     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);
+      })
   }
 }
 
@@ -52,10 +56,6 @@ export class Storage extends Base {
     }
 
     this.refs = {};
-
-    this._addToFirestackInstance(
-      'uploadFile'
-    )
   }
 
   ref(...path) {
@@ -110,6 +110,18 @@ export class Storage extends Base {
     return path.join('-');
   }
 
+  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
+  };
+
   get namespace() {
     return 'firestack:storage'
   }