cleanup presence - added todo's that need fixing

Author: Salakar

lib/modules/presence.js

@@ -1,34 +1,33 @@
-import invariant from 'invariant';
 import { Base, ReferenceBase } from './base';
 
 class PresenceRef extends ReferenceBase {
   constructor(presence, ref, pathParts) {
     super(presence.firestack);
-
     this.ref = ref;
+    this._onConnect = [];
     this.presence = presence;
-    const db = this.firestack.database();
-    this.lastOnlineRef = this.ref.child('lastOnline');
-
-    this._connectedRef = db.ref('.info/connected');
     this._pathParts = pathParts;
-
-    this._onConnect = [];
+    this.lastOnlineRef = this.ref.child('lastOnline');
+    this._connectedRef = this.firestack.database().ref('.info/connected');
   }
 
   setOnline() {
-    this.ref.setAt({ online: true });
+    this.ref.set({ online: true });
+
+    // todo cleanup - creating a ref every time?
     this._connectedRef.on('value', (snapshot) => {
       const val = snapshot.val();
       if (val) {
         // add self to connection list
         // this.ref.push()
-        this.ref.setAt({
+        this.ref.set({
           online: true,
         })
           .then(() => {
             this._disconnect();
 
+            // todo switch to event emitter
+            // todo this will leak
             this._onConnect.forEach((fn) => {
               if (fn && typeof fn === 'function') {
                 fn.bind(this)(this.ref);
@@ -42,27 +41,26 @@ class PresenceRef extends ReferenceBase {
 
   setOffline() {
     if (this.ref) {
-      this.ref.setAt({ online: false })
-        .then(() => this.ref.off('value'));
+      this.ref.set({ online: false }).then(() => this.ref.off('value'));
       this.presence.off(this._pathParts);
     }
     return this;
   }
 
   _disconnect() {
     if (this.ref) {
-      this.ref.onDisconnect()
-        .setValue({ online: false });
-      // set last online time
-      this.lastOnlineRef.onDisconnect()
-        .setValue(this.firestack.ServerValue.TIMESTAMP);
+      this.ref.onDisconnect().setValue({ online: false });
+      // todo ServerValue is a promise? so this should be broken..?
+      this.lastOnlineRef.onDisconnect().setValue(this.firestack.ServerValue.TIMESTAMP);
     }
   }
 
   _pathKey() {
     return this._pathParts.join('/');
   }
 
+  // todo switch to event emitter
+  // todo this will leak
   onConnect(cb) {
     this._onConnect.push(cb);
     return this;
@@ -79,15 +77,13 @@ export default class Presence extends Base {
   }
 
   on(key) {
-    invariant(key, 'You must supply a key for presence');
+    if (!key || !key.length) throw new Error('You must supply a key for presence');
     const path = this.path.concat(key);
     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);
-      const inst = new PresenceRef(this, _ref, path);
-
-      this.instances[pathKey] = inst;
+      this.instances[pathKey] = new PresenceRef(this, _ref, path);
     }
 
     return this.instances[pathKey];