Fixed datasbase ios off event

Author: auser

ios/Firestack/Firestack.h

@@ -26,6 +26,9 @@
 - (void) debugLog:(NSString *)title
               msg:(NSString *)msg;
 
+- (void) sendJSEvent:(NSString *)title
+               props:(NSDictionary *)props;
+
 
 @property (nonatomic) BOOL debug;
 @property (atomic) BOOL configured;

ios/Firestack/FirestackDatabase.m

@@ -6,6 +6,7 @@
 //  Copyright © 2016 Facebook. All rights reserved.
 //
 
+#import "Firestack.h"
 #import "FirestackDatabase.h"
 #import "FirestackEvents.h"
 
@@ -215,18 +216,20 @@ - (int) eventTypeFromName:(NSString *)name
 }
 
 - (void) cleanup {
-    FIRDatabaseReference *ref = [self getRef];
+    if (self.childValueHandler > 0) {
+        [self removeEventHandler:DATABASE_VALUE_EVENT];
+    }
     if (self.childAddedHandler > 0) {
-        [ref removeObserverWithHandle:self.childAddedHandler];
+        [self removeEventHandler:DATABASE_CHILD_ADDED_EVENT];
     }
     if (self.childModifiedHandler > 0) {
-        [ref removeObserverWithHandle:self.childModifiedHandler];
+        [self removeEventHandler:DATABASE_CHILD_MODIFIED_EVENT];
     }
     if (self.childRemovedHandler > 0) {
-        [ref removeObserverWithHandle:self.childRemovedHandler];
+        [self removeEventHandler:DATABASE_CHILD_REMOVED_EVENT];
     }
     if (self.childMovedHandler > 0) {
-        [ref removeObserverWithHandle:self.childMovedHandler];
+        [self removeEventHandler:DATABASE_CHILD_MOVED_EVENT];
     }
 }
 
@@ -377,7 +380,7 @@ @implementation FirestackDatabase
         [r setEventHandler:handle
                    forName:eventName];
 
-        [self saveDBHandle:path dbRef:r];
+        // [self saveDBHandle:path dbRef:r];
 
         callback(@[[NSNull null], @{
                    @"result": @"success",
@@ -425,14 +428,15 @@ @implementation FirestackDatabase
     FirestackDBReference *r = [self getDBHandle:path];
     if (eventName == nil || [eventName isEqualToString:@""]) {
         [r cleanup];
+        [self removeDBHandle:path];
     } else {
         [r removeEventHandler:eventName];
         if (![r hasListeners]) {
             [self removeDBHandle:path];
         }
     }
 
-    [self saveDBHandle:path dbRef:r];
+    // [self saveDBHandle:path dbRef:r];
 
     callback(@[[NSNull null], @{
                    @"result": @"success",

lib/modules/database.js

@@ -195,11 +195,17 @@ class DatabaseRef extends ReferenceBase {
     });
   }
 
-  once(evt='once') {
+  once(evt='once', cb) {
     const path = this.dbPath();
     const modifiers = this.dbModifiers();
     return promisify('onOnce', FirestackDatabase)(path, modifiers, evt)
       .then(({snapshot}) => new DataSnapshot(this, snapshot))
+      .then(snapshot => {
+        if (cb && typeof cb === 'function') {
+          cb(snapshot);
+        }
+        return snapshot;
+      })
   }
 
   off(evt='') {
@@ -208,7 +214,7 @@ class DatabaseRef extends ReferenceBase {
       .then(({callback, subscriptions}) => {
         return promisify('off', FirestackDatabase)(path, evt)
           .then(() => {
-            this.listeners[evt]
+            // subscriptions.forEach(sub => sub.remove());
             delete this.listeners[evt];
             callback(this);
             return subscriptions;
@@ -388,7 +394,7 @@ export class Database extends Base {
     }
 
     const callback = (ref) => {
-      const key = this._pathKey(path);
+      const key = this._pathKey(ref.path);
       this.refs[key] = ref;
     }
     const subscriptions = [this.successListener, this.errorListener];
@@ -399,7 +405,9 @@ export class Database extends Base {
     const key = this._pathKey(path);
     // Remove subscription
     if (dbSubscriptions[key]) {
-      if (dbSubscriptions[key][evt]) {
+      if (!evt || evt === "") {
+        dbSubscriptions[key] = {};
+      } else if (dbSubscriptions[key][evt]) {
         delete dbSubscriptions[key][evt];
       }
       if (Object.keys(dbSubscriptions[key]).length <= 0) {
@@ -419,7 +427,7 @@ export class Database extends Base {
       }
     }
     const callback = (ref) => {
-      const key = this._pathKey(path);
+      const key = this._pathKey(ref.path);
       delete this.refs[key];
     }
     const subscriptions = [this.successListener, this.errorListener];