Update firestackModule setAt,getAt,updateAt,removeAt, added Log shim

auser · auser · commit b0eedfa3e774 · 2016-08-18T15:35:29.000-07:00
diff --git a/android/src/main/java/io/fullstack/firestack/FirestackModule.java b/android/src/main/java/io/fullstack/firestack/FirestackModule.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.util.Log;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -38,6 +39,7 @@ class FirestackModule extends ReactContextBaseJavaModule {
   public FirestackModule(ReactApplicationContext reactContext) {
     super(reactContext);
     this.context = reactContext;
+    Log.d(TAG, "New FirestackModule instance");
   }
 
   @Override
@@ -46,38 +48,53 @@ public String getName() {
   }
 
   @ReactMethod
-  public void configureWithOptions(ReadableMap params, final Callback onComplete) {
-    System.out.println("Calling configureWithOptions");
-    Log.i(TAG, "configureWithOptions");
+  public void configureWithOptions(ReadableMap params, @Nullable final Callback onComplete) {
+    Log.d(TAG, "configureWithOptions");
+
     ReactContext mCtx = getReactApplicationContext();
     FirebaseOptions.Builder builder = new FirebaseOptions.Builder();
 
+    if (params.hasKey("applicationId")) {
+      final String applicationId = params.getString("applicationId");
+      Log.d(TAG, "Setting applicationId from params " + applicationId);
+      builder.setApplicationId(applicationId);
+    }
     if (params.hasKey("apiKey")) {
-        builder.setApiKey(params.getString("apiKey"));
+      final String apiKey = params.getString("apiKey");
+      Log.d(TAG, "Setting API key from params " + apiKey);
+      builder.setApiKey(apiKey);
     }
     if (params.hasKey("gcmSenderID")) {
-        builder.setGcmSenderId(params.getString("gcmSenderID"));
+      final String gcmSenderID = params.getString("gcmSenderID");
+      Log.d(TAG, "Setting gcmSenderID from params" + gcmSenderID );
+      builder.setGcmSenderId(gcmSenderID);
     }
     if (params.hasKey("storageBucket")) {
-        builder.setStorageBucket(params.getString("storageBucket"));
+      final String storageBucket = params.getString("storageBucket");
+      Log.d(TAG, "Setting storageBucket from params" + storageBucket);
+      builder.setStorageBucket(storageBucket);
     }
     if (params.hasKey("databaseURL")) {
-        builder.setDatabaseUrl(params.getString("databaseURL"));
+      final String databaseURL = params.getString("databaseURL");
+      Log.d(TAG, "Setting databaseURL from params" + databaseURL);
+      builder.setDatabaseUrl(databaseURL);
     }
     if (params.hasKey("clientID")) {
-        builder.setApplicationId(params.getString("clientID"));
+      final String clientID = params.getString("clientID");
+      Log.d(TAG, "Setting clientID from params" + clientID);
+      builder.setApplicationId(clientID);
     }
 
     try {
         Log.i(TAG, "Configuring");
         FirebaseApp app = FirebaseApp.initializeApp(mCtx, builder.build());
         Log.i(TAG, "Configured");
-        onComplete.invoke();
+        onComplete.invoke(app);
     }
     catch (Exception ex){
         Log.e(TAG, "ERROR configureWithOptions");
         Log.e(TAG, ex.getMessage());
-        onComplete.invoke();
+        onComplete.invoke(ex.getMessage());
     }
   }
 
diff --git a/lib/debug_shim.js b/lib/debug_shim.js
@@ -0,0 +1,47 @@
+// document hack
+if (!global.document) {
+  global.document = { documentElement: { style: { WebkitAppearance: true } } }
+}
+if(!window.localStorage) window.localStorage = {};
+
+let debug = () => {};
+
+export class Log {
+
+  constructor(namespace) {
+    this._namespace = namespace || 'firestack';
+    this.l = null;
+    this.loggers = {};
+  }
+
+  enable(booleanOrStringDebug) {
+    if (booleanOrStringDebug) {
+      window.localStorage.debug = 
+        typeof booleanOrStringDebug === 'string' ? booleanOrStringDebug : '*';
+    }
+  }
+
+  info(...args) {
+    this._logger('info')(...args);
+  }
+
+  error(...args) {
+    this._logger('error')(...args);
+  }
+
+  _logger(level) {
+    if (!this.loggers[level]) {
+      this.loggers[level] = this._debug()(`${this._namespace}:${level}`)
+    }
+    return this.loggers[level];
+  }
+
+  _debug() {
+    if (!this.l) {
+      this.l = debug = require('debug');
+    }
+    return this.l;
+  }
+}
+
+export default Log;
diff --git a/lib/firestack.js b/lib/firestack.js
@@ -2,6 +2,8 @@
  * @providesModule Firestack
  * @flow
  */
+import Log from './debug_shim'
+
 const firebase = require('firebase');
 
 const app = require('firebase/app');
@@ -16,20 +18,26 @@ const FirebaseHelper = NativeModules.Firestack;
 import promisify from './promisify'
 import RemoteConfig from './remoteConfig'
 
+let log;
 export class Firestack {
 
   constructor(options) {
     this.options = options || {};
+    this._debug = options.debug || false;
+    log = this._log = new Log('firestack');
+
+    log.enable(this._debug);
+    log.info('Creating new instance');
 
     this._remoteConfig = options.remoteConfig || {};
     delete options.remoteConfig;
 
     this.configured = this.options.configure || false;
-    this._debug = options.debug || false;
     this.auth = null;
 
     this.eventHandlers = {};
 
+    log.info('Calling configure with options', options);
     this.configure(options);
   }
 
@@ -38,17 +46,19 @@ export class Firestack {
     const firestackOptions = Object.assign({}, this.options, opts);
     try {
       this.appInstance = app.initializeApp(firestackOptions);
+      log.info('JS app initialized');
     } catch (e) {
-      console.log('Error occurred while calling configure', e);
+      log.error('JS error while calling initializeApp', e);
     }
 
+    log.info('Calling native configureWithOptions')
     return promisify('configureWithOptions')(firestackOptions)
     .then((...args) => {
-      console.log('Native configureWithOptions success', args);
+      log.info('Native configureWithOptions success', args);
       this.configured = true;
       return args;
     }).catch((err) => {
-      console.log('Native error occurred while calling configure', e);
+      log.error('Native error occurred while calling configure', e);
     })
   }
 
diff --git a/lib/firestackModule.js b/lib/firestackModule.js
@@ -5,6 +5,10 @@ import invariant from 'invariant'
 const createTypes = (prefix) => {
   const c = (str) => `${prefix.toUpperCase()}_${str.toUpperCase()}`
   return {
+    ACTION_CALL: c('call_function'),
+    ACTION_SUCCESS: c('call_function_success'),
+    ACTION_FAIL: c('call_function_failure'),
+
     ACTION_LISTEN: c('listen'),
     ACTION_UNLISTEN: c('unlisten'),
     ACTION_REMOVE: c('remove'),
@@ -159,9 +163,10 @@ export class FirestackModule {
     const toObject = this._toObject;
 
     return new Promise((resolve, reject) => {
-      ref.set(value, error => {
+      ref.set(value, (error, snapshot) => {
         this._handleUpdate(T.ACTION_SET, null, (state) => {
           if (cb) {
+    console.log('error ->', error, snapshot);
             cb(toObject(snapshot, state));
           }
           return error ? reject(error) : resolve(value)
@@ -176,7 +181,7 @@ export class FirestackModule {
     const toObject = this._toObject;
 
     return new Promise((resolve, reject) => {
-      ref.update(value, error => {
+      ref.update(value, (error, snapshot) => {
         this._handleUpdate(T.ACTION_UPDATE, null, (state) => {
           if (cb) {
             cb(toObject(snapshot, state));
@@ -193,7 +198,7 @@ export class FirestackModule {
     const toObject = this._toObject;
 
     return new Promise((resolve, reject) => {
-      ref.remove(value, error => {
+      ref.remove(value, (error, snapshot) => {
         this._handleUpdate(T.ACTION_SET, null, (state) => {
           if (cb) {
             cb(toObject(snapshot, state));
@@ -206,13 +211,24 @@ export class FirestackModule {
 
   // hackish, for now
   get actions() {
+    const T = this._types;
     return [
       'listen', 'unlisten',
       'getAt', 'setAt', 'updateAt', 'removeAt'
     ].reduce((sum, name) => {
       return {
         ...sum,
-        [name]: this[name].bind(this)
+        [name]: (...args) => (dispatch, getState) => {
+          const fn = this[name].bind(this);
+          fn.apply(this, args)
+          .then((resp) => {
+            dispatch({type: T.ACTION_SUCCESS, payload: resp});
+          })
+          .catch((err) => {
+            dispatch({type: T.ACTION_FAIL, payload: err});
+          });
+          return {type: T.ACTION_CALL, payload: name}
+        }
       }
     }, {})
   }
