@firebase/database 0.13.1 → 0.13.2-canary.13550089f

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Unreleased
 
+## 0.13.2
+
+### Patch Changes
+
+- [`578dc5836`](https://github.com/firebase/firebase-js-sdk/commit/578dc58365c6c71d8ad01dd8b9dbe829e76de068) [#6273](https://github.com/firebase/firebase-js-sdk/pull/6273) - Fixed issue where `get()` saved results incorrectly for non-default queries.
+
+* [`efe2000fc`](https://github.com/firebase/firebase-js-sdk/commit/efe2000fc499e2c85c4e5e0fef6741ff3bad2eb0) [#6363](https://github.com/firebase/firebase-js-sdk/pull/6363) - Extract uuid function into @firebase/util
+
+* Updated dependencies [[`efe2000fc`](https://github.com/firebase/firebase-js-sdk/commit/efe2000fc499e2c85c4e5e0fef6741ff3bad2eb0)]:
+  - @firebase/util@1.6.2
+  - @firebase/component@0.5.16
+
 ## 0.13.1
 
 ### Patch Changes

package/dist/index.esm2017.js

@@ -4,7 +4,7 @@ import { stringify, jsonEval, contains, assert, isNodeSdk, base64, stringToByteA
 import { Logger, LogLevel } from '@firebase/logger';
 
 const name = "@firebase/database";
-const version = "0.13.1";
+const version = "0.13.2-canary.13550089f";
 
 /**
  * @license
@@ -1852,7 +1852,7 @@ class WebSocketConnection {
             if (isNodeSdk()) {
                 const device = this.nodeAdmin ? 'AdminNode' : 'Node';
                 // UA Format: Firebase/<wire_protocol>/<sdk_version>/<platform>/<device>
-                const options = {
+                options = {
                     headers: {
                         'User-Agent': `Firebase/${PROTOCOL_VERSION}/${SDK_VERSION}/${process.platform}/${device}`,
                         'X-Firebase-GMPID': this.applicationId || ''
@@ -3010,7 +3010,7 @@ function pathEquals(path, other) {
     return true;
 }
 /**
- * @returns True if this path is a parent (or the same as) other
+ * @returns True if this path is a parent of (or the same as) other
  */
 function pathContains(path, other) {
     let i = path.pieceNum_;
@@ -3180,7 +3180,6 @@ class VisibilityMonitor extends EventEmitter {
  */
 const RECONNECT_MIN_DELAY = 1000;
 const RECONNECT_MAX_DELAY_DEFAULT = 60 * 5 * 1000; // 5 minutes in milliseconds (Case: 1858)
-const GET_CONNECT_TIMEOUT = 3 * 1000;
 const RECONNECT_MAX_DELAY_FOR_ADMINS = 30 * 1000; // 30 seconds for admin clients (likely to be a backend server)
 const RECONNECT_DELAY_MULTIPLIER = 1.3;
 const RECONNECT_DELAY_RESET_TIMEOUT = 30000; // Reset delay back to MIN_DELAY after being connected for 30sec.
@@ -3269,9 +3268,6 @@ class PersistentConnection extends ServerActions {
             onComplete: (message) => {
                 const payload = message['d'];
                 if (message['s'] === 'ok') {
-                    this.onDataUpdate_(request['p'], payload, 
-                    /*isMerge*/ false, 
-                    /*tag*/ null);
                     deferred.resolve(payload);
                 }
                 else {
@@ -3282,21 +3278,6 @@ class PersistentConnection extends ServerActions {
         this.outstandingGets_.push(outstandingGet);
         this.outstandingGetCount_++;
         const index = this.outstandingGets_.length - 1;
-        if (!this.connected_) {
-            setTimeout(() => {
-                const get = this.outstandingGets_[index];
-                if (get === undefined || outstandingGet !== get) {
-                    return;
-                }
-                delete this.outstandingGets_[index];
-                this.outstandingGetCount_--;
-                if (this.outstandingGetCount_ === 0) {
-                    this.outstandingGets_ = [];
-                }
-                this.log_('get ' + index + ' timed out on connection');
-                deferred.reject(new Error('Client is offline.'));
-            }, GET_CONNECT_TIMEOUT);
-        }
         if (this.connected_) {
             this.sendGet_(index);
         }
@@ -3311,7 +3292,7 @@ class PersistentConnection extends ServerActions {
             this.listens.set(pathString, new Map());
         }
         assert(query._queryParams.isDefault() || !query._queryParams.loadsAllData(), 'listen() called for non-default but complete query');
-        assert(!this.listens.get(pathString).has(queryId), 'listen() called twice for same path/queryId.');
+        assert(!this.listens.get(pathString).has(queryId), `listen() called twice for same path/queryId.`);
         const listenSpec = {
             onComplete,
             hashFn: currentHashFn,
@@ -9861,6 +9842,30 @@ function syncTreeRemoveEventRegistration(syncTree, query, eventRegistration, can
     }
     return cancelEvents;
 }
+/**
+ * This function was added to support non-listener queries,
+ * specifically for use in repoGetValue. It sets up all the same
+ * local cache data-structures (SyncPoint + View) that are
+ * needed for listeners without installing an event registration.
+ * If `query` is not `loadsAllData`, it will also provision a tag for
+ * the query so that query results can be merged into the sync
+ * tree using existing logic for tagged listener queries.
+ *
+ * @param syncTree - Synctree to add the query to.
+ * @param query - Query to register
+ * @returns tag as a string if query is not a default query, null if query is not.
+ */
+function syncTreeRegisterQuery(syncTree, query) {
+    const { syncPoint, serverCache, writesCache, serverCacheComplete } = syncTreeRegisterSyncPoint(query, syncTree);
+    const view = syncPointGetView(syncPoint, query, writesCache, serverCache, serverCacheComplete);
+    if (!syncPoint.views.has(query._queryIdentifier)) {
+        syncPoint.views.set(query._queryIdentifier, view);
+    }
+    if (!query._queryParams.loadsAllData()) {
+        return syncTreeTagForQuery_(syncTree, query);
+    }
+    return null;
+}
 /**
  * Apply new server data for the specified tagged query.
  *
@@ -9901,11 +9906,11 @@ function syncTreeApplyTaggedQueryMerge(syncTree, path, changedChildren, tag) {
     }
 }
 /**
- * Add an event callback for the specified query.
- *
- * @returns Events to raise.
+ * Creates a new syncpoint for a query and creates a tag if the view doesn't exist.
+ * Extracted from addEventRegistration to allow `repoGetValue` to properly set up the SyncTree
+ * without actually listening on a query.
  */
-function syncTreeAddEventRegistration(syncTree, query, eventRegistration) {
+function syncTreeRegisterSyncPoint(query, syncTree) {
     const path = query._path;
     let serverCache = null;
     let foundAncestorDefaultView = false;
@@ -9954,6 +9959,22 @@ function syncTreeAddEventRegistration(syncTree, query, eventRegistration) {
         syncTree.tagToQueryMap.set(tag, queryKey);
     }
     const writesCache = writeTreeChildWrites(syncTree.pendingWriteTree_, path);
+    return {
+        syncPoint,
+        writesCache,
+        serverCache,
+        serverCacheComplete,
+        foundAncestorDefaultView,
+        viewAlreadyExists
+    };
+}
+/**
+ * Add an event callback for the specified query.
+ *
+ * @returns Events to raise.
+ */
+function syncTreeAddEventRegistration(syncTree, query, eventRegistration) {
+    const { syncPoint, serverCache, writesCache, serverCacheComplete, viewAlreadyExists, foundAncestorDefaultView } = syncTreeRegisterSyncPoint(query, syncTree);
     let events = syncPointAddEventRegistration(syncPoint, query, eventRegistration, writesCache, serverCache, serverCacheComplete);
     if (!viewAlreadyExists && !foundAncestorDefaultView) {
         const view = syncPointViewForQuery(syncPoint, query);
@@ -11184,9 +11205,25 @@ function repoGetValue(repo, query) {
     }
     return repo.server_.get(query).then(payload => {
         const node = nodeFromJSON(payload).withIndex(query._queryParams.getIndex());
-        const events = syncTreeApplyServerOverwrite(repo.serverSyncTree_, query._path, node);
-        eventQueueRaiseEventsAtPath(repo.eventQueue_, query._path, events);
-        return Promise.resolve(node);
+        // if this is a filtered query, then overwrite at path
+        if (query._queryParams.loadsAllData()) {
+            syncTreeApplyServerOverwrite(repo.serverSyncTree_, query._path, node);
+        }
+        else {
+            // Simulate `syncTreeAddEventRegistration` without events/listener setup.
+            // We do this (along with the syncTreeRemoveEventRegistration` below) so that
+            // `repoGetValue` results have the same cache effects as initial listener(s)
+            // updates.
+            const tag = syncTreeRegisterQuery(repo.serverSyncTree_, query);
+            syncTreeApplyTaggedQueryOverwrite(repo.serverSyncTree_, query._path, node, tag);
+            // Call `syncTreeRemoveEventRegistration` with a null event registration, since there is none.
+            // Note: The below code essentially unregisters the query and cleans up any views/syncpoints temporarily created above.
+        }
+        const cancels = syncTreeRemoveEventRegistration(repo.serverSyncTree_, query, null);
+        if (cancels.length > 0) {
+            repoLog(repo, 'unexpected cancel events in repoGetValue');
+        }
+        return node;
     }, err => {
         repoLog(repo, 'get for query ' + stringify(query) + ' failed: ' + err);
         return Promise.reject(new Error(err));