cleanup utils

Author: Salakar

lib/firestack.js

@@ -2,12 +2,10 @@
  * @providesModule Firestack
  * @flow
  */
-
-
 import { NativeModules, NativeEventEmitter } from 'react-native';
 
 import Log from './utils/log';
-import promisify from './utils/promisify';
+import { promisify } from './utils';
 import Singleton from './utils/singleton';
 
 // modules
@@ -32,9 +30,8 @@ export default class Firestack extends Singleton {
   /**
    *
    * @param options
-   * @param name - TODO support naming multiple instances
    */
-  constructor(options: Object, name: string) {
+  constructor(options: Object) {
     const instance = super(options);
 
     instance.options = options || {};

lib/modules/auth.js

@@ -1,9 +1,9 @@
 // @flow
 import { NativeModules, NativeEventEmitter } from 'react-native';
 
+import User from './user';
 import { Base } from './base';
-import { default as User } from './user';
-import promisify from '../utils/promisify';
+import { promisify } from '../utils';
 
 const FirestackAuth = NativeModules.FirestackAuth;
 const FirestackAuthEvt = new NativeEventEmitter(FirestackAuth);

lib/modules/base.js

@@ -1,9 +1,9 @@
 /**
  * @flow
  */
-import { NativeModules, NativeEventEmitter, AsyncStorage } from 'react-native';
+import { NativeModules, NativeEventEmitter } from 'react-native';
 
-import Log from '../utils/log'
+import Log from '../utils/log';
 import EventEmitter from './../utils/eventEmitter';
 
 const FirestackModule = NativeModules.Firestack;
@@ -32,7 +32,7 @@ export class Base extends EventEmitter {
 
   // TODO unused - do we need this anymore?
   _addConstantExports(constants) {
-    Object.keys(constants).forEach(name => {
+    Object.keys(constants).forEach((name) => {
       FirestackModule[name] = constants[name];
     });
   }

lib/modules/database/disconnect.js

@@ -1,7 +1,7 @@
 /* @flow */
 
 import { NativeModules } from 'react-native';
-import promisify from './../../utils/promisify';
+import { promisify } from './../../utils';
 import Reference from './reference';
 
 const FirestackDatabase = NativeModules.FirestackDatabase;

lib/modules/database/index.js

@@ -7,7 +7,7 @@ import { NativeModules, NativeEventEmitter } from 'react-native';
 const FirestackDatabase = NativeModules.FirestackDatabase;
 const FirestackDatabaseEvt = new NativeEventEmitter(FirestackDatabase);
 
-import promisify from './../../utils/promisify';
+import { promisify } from './../../utils';
 
 import { Base } from './../base';
 import Reference from './reference.js';

lib/modules/database/reference.js

@@ -2,7 +2,7 @@
  * @flow
  */
 import { NativeModules } from 'react-native';
-import promisify from './../../utils/promisify';
+import { promisify } from './../../utils';
 import { ReferenceBase } from './../base';
 import Snapshot from './snapshot.js';
 import Disconnect from './disconnect.js';

lib/modules/messaging.js

@@ -1,6 +1,6 @@
 import { NativeModules, NativeEventEmitter } from 'react-native';
 import { Base } from './base';
-import promisify from '../utils/promisify';
+import { promisify } from '../utils';
 
 const FirestackCloudMessaging = NativeModules.FirestackCloudMessaging;
 const FirestackCloudMessagingEvt = new NativeEventEmitter(FirestackCloudMessaging);

lib/modules/presence.js

@@ -1,6 +1,6 @@
-import invariant from 'invariant'
-import promisify from '../utils/promisify'
-import { Base, ReferenceBase } from './base'
+import invariant from 'invariant';
+import { promisify } from '../utils';
+import { Base, ReferenceBase } from './base';
 
 class PresenceRef extends ReferenceBase {
   constructor(presence, ref, pathParts) {
@@ -18,33 +18,33 @@ class PresenceRef extends ReferenceBase {
   }
 
   setOnline() {
-    this.ref.setAt({online: true})
+    this.ref.setAt({ online: true });
     this._connectedRef.on('value', (snapshot) => {
       const val = snapshot.val();
       if (val) {
         // add self to connection list
         // this.ref.push()
         this.ref.setAt({
-          online: true
-        })
-        .then(() => {
-          this._disconnect();
-
-          this._onConnect.forEach(fn => {
-            if (fn && typeof fn === 'function') {
-              fn.bind(this)(this.ref);
-            }
-          })
+          online: true,
         })
+          .then(() => {
+            this._disconnect();
+
+            this._onConnect.forEach((fn) => {
+              if (fn && typeof fn === 'function') {
+                fn.bind(this)(this.ref);
+              }
+            });
+          });
       }
     });
     return this;
   }
 
   setOffline() {
     if (this.ref) {
-      this.ref.setAt({online: false})
-        .then(() => this.ref.off('value'))
+      this.ref.setAt({ online: false })
+        .then(() => this.ref.off('value'));
       this.presence.off(this._pathParts);
     }
     return this;
@@ -53,10 +53,10 @@ class PresenceRef extends ReferenceBase {
   _disconnect() {
     if (this.ref) {
       this.ref.onDisconnect()
-        .setValue({online: false});
+        .setValue({ online: false });
       // set last online time
       this.lastOnlineRef.onDisconnect()
-        .setValue(this.firestack.ServerValue.TIMESTAMP)
+        .setValue(this.firestack.ServerValue.TIMESTAMP);
     }
   }
 
@@ -72,7 +72,7 @@ class PresenceRef extends ReferenceBase {
 }
 
 export default class Presence extends Base {
-  constructor(firestack, options={}) {
+  constructor(firestack, options = {}) {
     super(firestack, options);
 
     this.instances = {};
@@ -85,7 +85,7 @@ export default class Presence extends Base {
     const pathKey = this._presenceKey(path);
     if (!this.instances[pathKey]) {
       const _ref = this.firestack.database.ref(pathKey);
-      this.log.debug('Created new presence object for ', pathKey)
+      this.log.debug('Created new presence object for ', pathKey);
       const inst = new PresenceRef(this, _ref, path);
 
       this.instances[pathKey] = inst;
@@ -110,6 +110,6 @@ export default class Presence extends Base {
   }
 
   get namespace() {
-    return 'firestack:presence'
+    return 'firestack:presence';
   }
 }

lib/utils/index.js

@@ -10,3 +10,34 @@ export function reverseKeyValues(object) {
   }
   return output;
 }
+
+/**
+ * No operation func
+ */
+export function noop() {
+}
+
+
+// internal promise handler
+const _handler = (resolve, reject, err, resp) => {
+  // resolve / reject after events etc
+  setImmediate(() => {
+    if (err) return reject(err);
+    return resolve(resp);
+  });
+};
+
+/**
+ * Wraps a native module method to support promises.
+ * @param fn
+ * @param NativeModule
+ */
+export function promisify(fn, NativeModule) {
+  return (...args) => {
+    return new Promise((resolve, reject) => {
+      const _fn = typeof fn === 'function' ? fn : NativeModule[fn];
+      if (!_fn || typeof _fn !== 'function') return reject(new Error('Missing function for promisify.'));
+      return _fn.apply(NativeModule, [...args, _handler.bind(_handler, resolve, reject)]);
+    });
+  };
+}