Merge pull request #7 from devshackio/v3

Various fixes

Author: Salakar

android/src/main/java/io/fullstack/firestack/Utils.java

@@ -38,7 +38,7 @@ public static void todoNote(final String tag, final String name, final Callback
    * send a JS event
    **/
   public static void sendEvent(final ReactContext context, final String eventName, final WritableMap params) {
-    if (context.hasActiveCatalystInstance()) {
+    if (context != null && context.hasActiveCatalystInstance()) {
       context
           .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
           .emit(eventName, params);

android/src/main/java/io/fullstack/firestack/storage/FirestackStorage.java

@@ -111,16 +111,10 @@ public void downloadFile(final String urlStr,
       @Override
       public void doInBackground(StreamDownloadTask.TaskSnapshot taskSnapshot, InputStream inputStream) throws IOException {
         int indexOfLastSlash = localFile.lastIndexOf("/");
-        String pathMinusFileName = localFile.substring(0, indexOfLastSlash) + "/";
-        String filename = localFile.substring(indexOfLastSlash + 1);
+        String pathMinusFileName = indexOfLastSlash>0 ? localFile.substring(0, indexOfLastSlash) + "/" : "/";
+        String filename = indexOfLastSlash>0 ? localFile.substring(indexOfLastSlash+1) : localFile;
         File fileWithJustPath = new File(pathMinusFileName);
-        if (!fileWithJustPath.mkdirs()) {
-          Log.e(TAG, "Directory not created");
-          WritableMap error = Arguments.createMap();
-          error.putString("message", "Directory not created");
-          callback.invoke(error);
-          return;
-        }
+        fileWithJustPath.mkdirs();
         File fileWithFullPath = new File(pathMinusFileName, filename);
         FileOutputStream output = new FileOutputStream(fileWithFullPath);
         int bufferSize = 1024;
@@ -162,17 +156,17 @@ public void onSuccess(final StorageMetadata storageMetadata) {
             callback.invoke(null, data);
           }
         })
-            .addOnFailureListener(new OnFailureListener() {
-              @Override
-              public void onFailure(@NonNull Exception exception) {
-                final int errorCode = 1;
-                WritableMap data = Arguments.createMap();
-                StorageException storageException = StorageException.fromException(exception);
-                data.putString("description", storageException.getMessage());
-                data.putInt("code", errorCode);
-                callback.invoke(makeErrorPayload(errorCode, exception));
-              }
-            });
+        .addOnFailureListener(new OnFailureListener() {
+          @Override
+          public void onFailure(@NonNull Exception exception) {
+            final int errorCode = 1;
+            WritableMap data = Arguments.createMap();
+            StorageException storageException = StorageException.fromException(exception);
+            data.putString("description", storageException.getMessage());
+            data.putInt("code", errorCode);
+            callback.invoke(makeErrorPayload(errorCode, exception));
+          }
+        });
       }
     }).addOnFailureListener(new OnFailureListener() {
       @Override

firestack.android.js

@@ -1,7 +1,6 @@
 /**
- * @providesModule Firestack
  * @flow
  */
 import Firestack from './lib/firestack'
 
-export default Firestack
+export default Firestack

firestack.ios.js

@@ -1,5 +1,4 @@
 /**
- * @providesModule Firestack
  * @flow
  */
 import Firestack from './lib/firestack'

lib/firestack.js

@@ -209,7 +209,7 @@ export default class Firestack extends Singleton {
   /**
    * Redux store
    **/
-  get store(): Object {
+  get store(): ?Object {
     return this._store;
   }
 

lib/modules/base.js

@@ -11,8 +11,9 @@ const FirestackModuleEvt = new NativeEventEmitter(FirestackModule);
 
 const logs = {};
 
+type FirestackOptions = {};
 export class Base extends EventEmitter {
-  constructor(firestack, options = {}) {
+  constructor(firestack: Object, options: FirestackOptions = {}) {
     super();
     this.firestack = firestack;
     this.eventHandlers = {};
@@ -22,7 +23,7 @@ export class Base extends EventEmitter {
   }
 
   // Logger
-  get log() {
+  get log(): Log {
     if (!logs[this.namespace]) {
       const debug = this.firestack._debug;
       logs[this.namespace] = new Log(this.namespace, debug);
@@ -38,7 +39,7 @@ export class Base extends EventEmitter {
   }
 
   // TODO unused - do we need this anymore?
-  _addToFirestackInstance(...methods) {
+  _addToFirestackInstance(...methods: Array<string>) {
     methods.forEach(name => {
       this.firestack[name] = this[name].bind(this);
     })
@@ -47,15 +48,17 @@ export class Base extends EventEmitter {
   /**
    * app instance
    **/
-  get app() {
+  get app(): Object {
     return this.firestack.app;
   }
 
-  whenReady(fn) {
-    return this.firestack.configurePromise.then(fn);
+  whenReady(promise: Promise<*>): Promise<*> {
+    return this.firestack.configurePromise.then((result) => {
+      return promise;
+    });
   }
 
-  get namespace() {
+  get namespace(): string {
     return 'firestack:base';
   }
 
@@ -88,25 +91,21 @@ export class Base extends EventEmitter {
 }
 
 export class ReferenceBase extends Base {
-  constructor(firestack, path) {
+  constructor(firestack: Object, path: Array<string> | string) {
     super(firestack);
 
-    this.path = Array.isArray(path) ?
-      path :
-      (typeof path == 'string' ?
-        [path] : []);
+    this.path = Array.isArray(path) ?  path : (typeof path == 'string' ?  [path] : []);
 
     // sanitize path, just in case
-    this.path = this.path
-      .filter(str => str !== "");
+    this.path = this.path.filter(str => str !== '');
   }
 
-  get key() {
+  get key(): string {
     const path = this.path;
     return path.length === 0 ? '/' : path[path.length - 1];
   }
 
-  pathToString() {
+  pathToString(): string {
     let path = this.path;
     let pathStr = (path.length > 0 ? path.join('/') : '/');
     if (pathStr[0] != '/') {

lib/modules/storage.js

@@ -1,3 +1,4 @@
+/* @flow */
 import { NativeModules, NativeEventEmitter } from 'react-native';
 
 import { promisify, noop } from '../utils';
@@ -13,9 +14,14 @@ class StorageRef extends ReferenceBase {
     this.storage = storage;
   }
 
-  downloadUrl() {
+  downloadUrl(): Promise<Object> {
     const path = this.pathToString();
-    return promisify('downloadUrl', FirestackStorage)(this.storage.storageUrl, path);
+    this.log.debug('downloadUrl(', path, ')');
+    return promisify('downloadUrl', FirestackStorage)(this.storage.storageUrl, path)
+      .catch(err => {
+        this.log.error('Error downloading URL for ', path, '.  Error: ', err);
+        throw err;
+      });
   }
 
   /**
@@ -24,8 +30,9 @@ class StorageRef extends ReferenceBase {
    * @param listener
    * @return {Promise}
    */
-  download(downloadPath: string, listener: Function = noop) {
+  download(downloadPath: string, listener: Function = noop): Promise<Object> {
     const path = this.pathToString();
+    this.log.debug('download(', path, ') -> ', downloadPath);
     const listeners = [
       this.storage._addListener('download_progress', listener),
       this.storage._addListener('download_paused', listener),
@@ -34,19 +41,22 @@ class StorageRef extends ReferenceBase {
 
     return promisify('downloadFile', FirestackStorage)(this.storage.storageUrl, path, downloadPath)
       .then((res) => {
-        console.log('res --->', res);
-        listeners.forEach(this.storage._removeListener);
+        this.log.debug('res --->', res);
+        listeners.forEach(listener => listener.remove());
         return res;
       })
-      .catch((downloadError) => {
-        console.log('Got an error ->', downloadError);
-        return Promise.reject(downloadError);
+      .catch(err => {
+        this.log.error('Error downloading ', path, ' to ', downloadPath, '.  Error: ', err);
+        throw err;
       });
   }
 }
 
+type StorageOptionsType = {
+  storageBucket?: ?string,
+};
 export default class Storage extends Base {
-  constructor(firestack, options = {}) {
+  constructor(firestack: Object, options:StorageOptionsType={}) {
     super(firestack, options);
 
     if (this.options.storageBucket) {
@@ -56,8 +66,8 @@ export default class Storage extends Base {
     this.refs = {};
   }
 
-  ref(...path) {
-    const key = this._pathKey(path);
+  ref(...path: Array<string>): StorageRef {
+    const key = this._pathKey(...path);
     if (!this.refs[key]) {
       const ref = new StorageRef(this, path);
       this.refs[key] = ref;
@@ -73,8 +83,9 @@ export default class Storage extends Base {
    * @param listener
    * @return {Promise}
    */
-  uploadFile(name: string, filePath: string, metadata: Object = {}, listener: Function = noop) {
+  uploadFile(name: string, filePath: string, metadata: Object = {}, listener: Function = noop): Promise<Object> {
     const _filePath = filePath.replace('file://', '');
+    this.log.debug('uploadFile(', _filepath, ') -> ', name);
     const listeners = [
       this._addListener('upload_paused', listener),
       this._addListener('upload_resumed', listener),
@@ -83,29 +94,30 @@ export default class Storage extends Base {
 
     return promisify('uploadFile', FirestackStorage)(this.storageUrl, name, _filePath, metadata)
       .then((res) => {
-        listeners.forEach(this._removeListener);
+        listeners.forEach(listener => listener.remove());
         return res;
+      })
+      .catch(err => {
+        this.log.error('Error uploading file ', name, ' to ', filepath, '.  Error: ', err);
+        throw err;
       });
   }
 
-  getRealPathFromURI(uri) {
+  getRealPathFromURI(uri: string): Promise<string> {
     return promisify('getRealPathFromURI', FirestackStorage)(uri);
   }
 
-  _addListener(evt, cb) {
-    return FirestackStorageEvt.addListener(evt, cb);
-  }
-
-  _removeListener(evt) {
-    return FirestackStorageEvt.removeListener(evt);
+  _addListener(evt: string, cb: (evt: Object) => Object): {remove: () => void} {
+    let listener = FirestackStorageEvt.addListener(evt, cb);
+    return listener;
   }
 
-  setStorageUrl(url) {
+  setStorageUrl(url: string): void {
     // return promisify('setStorageUrl', FirestackStorage)(url);
     this.storageUrl = `gs://${url}`;
   }
 
-  _pathKey(...path) {
+  _pathKey(...path: Array<string>): string {
     return path.join('-');
   }
 
@@ -121,8 +133,8 @@ export default class Storage extends Base {
     FILETYPE_DIRECTORY: FirestackStorage.FILETYPE_DIRECTORY,
   };
 
-  get namespace() {
-    return 'firestack:storage';
+  get namespace(): string {
+    return 'firestack:storage'
   }
 }
 

lib/utils/window-or-global.js

@@ -2,4 +2,4 @@
 // https://github.com/purposeindustries/window-or-global
 module.exports = (typeof self === 'object' && self.self === self && self) ||
   (typeof global === 'object' && global.global === global && global) ||
-  this
+  this;