Updated presence api

Author: auser

ios/Firestack/FirestackDatabase.m

@@ -384,10 +384,10 @@ @implementation FirestackDatabase
                    @"handle": @(handle)
                    }]);
     } else {
-      callback(@{
+      callback(@[@{
                    @"result": @"exists",
                    @"msg": @"Listener already exists"
-                   });
+                   }]);
     }
 }
 

lib/modules/presence.js

@@ -6,38 +6,33 @@ class PresenceRef extends ReferenceBase {
   constructor(presence, ref, pathParts) {
     super(presence.firestack);
 
+    this.presence = presence;
     const db = this.firestack.database;
     this.ref = ref;
+    this.lastOnlineRef = this.ref.child('lastOnline');
+
     this._connectedRef = db.ref('.info/connected');
     this._pathParts = pathParts;
 
     this._onConnect = [];
   }
 
-  setOnline(path) {
-    let connectedDeviceRef = this.ref;
-    if (path) {
-      this._pathParts.push(path);
-      connectedDeviceRef = this.ref.child(path);
-    }
-
-    this._lastOnlineRef = connectedDeviceRef.child('lastOnline');
-
-    this._connectedDeviceRef = connectedDeviceRef;
+  setOnline() {
+    this.ref.setAt({online: true})
     this._connectedRef.on('value', (snapshot) => {
       const val = snapshot.val();
       if (val) {
         // add self to connection list
         // this.ref.push()
-        connectedDeviceRef.setAt({
+        this.ref.setAt({
           online: true
         })
         .then(() => {
           this._disconnect();
 
           this._onConnect.forEach(fn => {
             if (fn && typeof fn === 'function') {
-              fn.bind(this)(this._connectedDeviceRef);
+              fn.bind(this)(this.ref);
             }
           })
         })
@@ -47,19 +42,20 @@ class PresenceRef extends ReferenceBase {
   }
 
   setOffline() {
-    if (this._connectedDeviceRef) {
-      this._connectedDeviceRef.setAt({online: false})
-        .then(() => this._connectedDeviceRef.off('value'))
+    if (this.ref) {
+      this.ref.setAt({online: false})
+        .then(() => this.ref.off('value'))
+      this.presence.off(this._pathParts);
     }
     return this;
   }
 
   _disconnect() {
-    if (this._connectedDeviceRef) {
-      this._connectedDeviceRef.onDisconnect()
+    if (this.ref) {
+      this.ref.onDisconnect()
         .setValue({online: false});
       // set last online time
-      this._lastOnlineRef.onDisconnect()
+      this.lastOnlineRef.onDisconnect()
         .setValue(this.firestack.ServerValue.TIMESTAMP)
     }
   }
@@ -85,26 +81,32 @@ export class Presence extends Base {
 
   on(key) {
     invariant(key, 'You must supply a key for presence');
-    this.path = ['/presence/connections'].concat(key);
-    return this._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;
+    }
 
-  ref(dbRef, path) {
-    return new PresenceRef(this, dbRef, path);
+    return this.instances[pathKey];
   }
 
-  _presence() {
-    const key = this._presenceKey();
-    if (!this.instances[key]) {
-      const _ref = this.firestack.database.ref(key);
-      this.log.debug('Created new presence object for ', key)
-      this.instances[key] = new PresenceRef(this, _ref, this.path);
+  off(path) {
+    const pathKey = this._presenceKey(path);
+    if (this.instances[pathKey]) {
+      delete this.instances[pathKey];
     }
-    return this.instances[key];
   }
 
-  _presenceKey() {
-    return this.path.join('/');
+  ref(dbRef, path) {
+    return new PresenceRef(this, dbRef, path);
+  }
+
+  _presenceKey(path) {
+    return (path || this.path).join('/');
   }
 
   get namespace() {