Implements firestack.database().ServerValue.TIMESTAMP synchronously and timestamp is now used for .push()

Author: Salakar

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

@@ -1,5 +1,6 @@
 package io.fullstack.firestack;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -207,6 +208,7 @@ public void onHostDestroy() {
   public Map<String, Object> getConstants() {
     final Map<String, Object> constants = new HashMap<>();
     constants.put("googleApiAvailability", getPlayServicesStatus());
+    constants.put("serverTimeOffset", new Date().getTime() - Long.parseLong(ServerValue.TIMESTAMP.get(".sv")));
     return constants;
   }
 }

lib/firestack.js

@@ -171,7 +171,7 @@ export default class Firestack extends Singleton {
     return this._remoteConfig;
   }
 
-  // other
+  // // TODO remove as deprecated and its in the wrong place anyway
   get ServerValue(): Promise<*> {
     return promisify('serverValue', FirestackModule)();
   }

lib/modules/database/index.js

@@ -6,8 +6,9 @@ import { NativeModules, NativeEventEmitter } from 'react-native';
 import { Base } from './../base';
 import Snapshot from './snapshot.js';
 import Reference from './reference.js';
-import { promisify, isFunction } from './../../utils';
+import { promisify } from './../../utils';
 
+const FirestackModule = NativeModules.Firestack;
 const FirestackDatabase = NativeModules.FirestackDatabase;
 const FirestackDatabaseEvt = new NativeEventEmitter(FirestackDatabase);
 
@@ -18,6 +19,7 @@ export default class Database extends Base {
   constructor(firestack: Object, options: Object = {}) {
     super(firestack, options);
     this.subscriptions = {};
+    this.serverTimeOffset = FirestackModule.serverTimeOffset || 0;
     this.persistenceEnabled = false;
     this.namespace = 'firestack:database';
 
@@ -31,9 +33,20 @@ export default class Database extends Base {
       err => this._handleDatabaseError(err)
     );
 
+    this.offsetRef = this.ref('.info/serverTimeOffset');
+    this.offsetRef.on('value', (snapshot) => {
+      this.serverTimeOffset = snapshot.val() || this.serverTimeOffset;
+    });
+
     this.log.debug('Created new Database instance', this.options);
   }
 
+  get ServerValue() {
+    return {
+      TIMESTAMP: this._getServerTime(),
+    };
+  }
+
   /**
    * Returns a new firestack reference instance
    * @param path
@@ -143,7 +156,9 @@ export default class Database extends Base {
   /**
    *  INTERNALS
    */
-
+  _getServerTime() {
+    return new Date().getTime() + this.serverTimeOffset;
+  }
 
   /**
    *

lib/modules/database/reference.js

@@ -78,7 +78,7 @@ export default class Reference extends ReferenceBase {
   push(value: any, onComplete: Function) {
     if (value === null || value === undefined) {
       // todo add server timestamp to push id call.
-      const _paths = this.path.concat([generatePushID()]);
+      const _paths = this.path.concat([generatePushID(this.db.serverTimeOffset)]);
       return new Reference(this.db, _paths);
     }