@firebase/database-compat 0.2.1 → 0.2.2-canary.13550089f

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @firebase/database-compat
 
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies [[`578dc5836`](https://github.com/firebase/firebase-js-sdk/commit/578dc58365c6c71d8ad01dd8b9dbe829e76de068), [`efe2000fc`](https://github.com/firebase/firebase-js-sdk/commit/efe2000fc499e2c85c4e5e0fef6741ff3bad2eb0)]:
+  - @firebase/database@0.13.2
+  - @firebase/util@1.6.2
+  - @firebase/component@0.5.16
+  - @firebase/database-types@0.9.10
+
 ## 0.2.1
 
 ### Patch Changes

package/dist/index.esm2017.js

@@ -5,7 +5,7 @@ import { errorPrefix, validateArgCount, validateCallback, validateContextObject,
 import { Logger } from '@firebase/logger';
 
 const name = "@firebase/database-compat";
-const version = "0.2.1";
+const version = "0.2.2-canary.13550089f";
 
 /**
  * @license

package/dist/index.esm5.js

@@ -6,7 +6,7 @@ import { __extends } from 'tslib';
 import { Logger } from '@firebase/logger';
 
 var name = "@firebase/database-compat";
-var version = "0.2.1";
+var version = "0.2.2-canary.13550089f";
 
 /**
  * @license

package/dist/index.js

@@ -12,7 +12,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var firebase__default = /*#__PURE__*/_interopDefaultLegacy(firebase);
 
 var name = "@firebase/database-compat";
-var version = "0.2.1";
+var version = "0.2.2-canary.13550089f";
 
 /**
  * @license

package/dist/index.standalone.js

@@ -4383,7 +4383,7 @@ var WebSocketConnection = /** @class */ (function () {
             if (util.isNodeSdk()) {
                 var device = this.nodeAdmin ? 'AdminNode' : 'Node';
                 // UA Format: Firebase/<wire_protocol>/<sdk_version>/<platform>/<device>
-                var options_1 = {
+                options = {
                     headers: {
                         'User-Agent': "Firebase/" + PROTOCOL_VERSION + "/" + SDK_VERSION + "/" + process.platform + "/" + device,
                         'X-Firebase-GMPID': this.applicationId || ''
@@ -4395,10 +4395,10 @@ var WebSocketConnection = /** @class */ (function () {
                 // Note that this header is just used to bypass appcheck, and the token should still be sent
                 // through the websocket connection once it is established.
                 if (this.authToken) {
-                    options_1.headers['Authorization'] = "Bearer " + this.authToken;
+                    options.headers['Authorization'] = "Bearer " + this.authToken;
                 }
                 if (this.appCheckToken) {
-                    options_1.headers['X-Firebase-AppCheck'] = this.appCheckToken;
+                    options.headers['X-Firebase-AppCheck'] = this.appCheckToken;
                 }
                 // Plumb appropriate http_proxy environment variable into faye-websocket if it exists.
                 var env = process['env'];
@@ -4406,7 +4406,7 @@ var WebSocketConnection = /** @class */ (function () {
                     ? env['HTTPS_PROXY'] || env['https_proxy']
                     : env['HTTP_PROXY'] || env['http_proxy'];
                 if (proxy) {
-                    options_1['proxy'] = { origin: proxy };
+                    options['proxy'] = { origin: proxy };
                 }
             }
             this.mySock = new WebSocketImpl(this.connURL, [], options);
@@ -6475,7 +6475,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) {
     var i = path.pieceNum_;
@@ -6649,7 +6649,6 @@ var VisibilityMonitor = /** @class */ (function (_super) {
  */
 var RECONNECT_MIN_DELAY = 1000;
 var RECONNECT_MAX_DELAY_DEFAULT = 60 * 5 * 1000; // 5 minutes in milliseconds (Case: 1858)
-var GET_CONNECT_TIMEOUT = 3 * 1000;
 var RECONNECT_MAX_DELAY_FOR_ADMINS = 30 * 1000; // 30 seconds for admin clients (likely to be a backend server)
 var RECONNECT_DELAY_MULTIPLIER = 1.3;
 var RECONNECT_DELAY_RESET_TIMEOUT = 30000; // Reset delay back to MIN_DELAY after being connected for 30sec.
@@ -6728,7 +6727,6 @@ var PersistentConnection = /** @class */ (function (_super) {
         }
     };
     PersistentConnection.prototype.get = function (query) {
-        var _this = this;
         this.initConnection_();
         var deferred = new util.Deferred();
         var request = {
@@ -6741,9 +6739,6 @@ var PersistentConnection = /** @class */ (function (_super) {
             onComplete: function (message) {
                 var payload = message['d'];
                 if (message['s'] === 'ok') {
-                    _this.onDataUpdate_(request['p'], payload, 
-                    /*isMerge*/ false, 
-                    /*tag*/ null);
                     deferred.resolve(payload);
                 }
                 else {
@@ -6754,21 +6749,6 @@ var PersistentConnection = /** @class */ (function (_super) {
         this.outstandingGets_.push(outstandingGet);
         this.outstandingGetCount_++;
         var index = this.outstandingGets_.length - 1;
-        if (!this.connected_) {
-            setTimeout(function () {
-                var 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);
         }
@@ -6783,7 +6763,7 @@ var PersistentConnection = /** @class */ (function (_super) {
             this.listens.set(pathString, new Map());
         }
         util.assert(query._queryParams.isDefault() || !query._queryParams.loadsAllData(), 'listen() called for non-default but complete query');
-        util.assert(!this.listens.get(pathString).has(queryId), 'listen() called twice for same path/queryId.');
+        util.assert(!this.listens.get(pathString).has(queryId), "listen() called twice for same path/queryId.");
         var listenSpec = {
             onComplete: onComplete,
             hashFn: currentHashFn,
@@ -13528,6 +13508,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) {
+    var _a = syncTreeRegisterSyncPoint(query, syncTree), syncPoint = _a.syncPoint, serverCache = _a.serverCache, writesCache = _a.writesCache, serverCacheComplete = _a.serverCacheComplete;
+    var 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.
  *
@@ -13568,11 +13572,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) {
     var path = query._path;
     var serverCache = null;
     var foundAncestorDefaultView = false;
@@ -13621,6 +13625,22 @@ function syncTreeAddEventRegistration(syncTree, query, eventRegistration) {
         syncTree.tagToQueryMap.set(tag, queryKey);
     }
     var writesCache = writeTreeChildWrites(syncTree.pendingWriteTree_, path);
+    return {
+        syncPoint: syncPoint,
+        writesCache: writesCache,
+        serverCache: serverCache,
+        serverCacheComplete: serverCacheComplete,
+        foundAncestorDefaultView: foundAncestorDefaultView,
+        viewAlreadyExists: viewAlreadyExists
+    };
+}
+/**
+ * Add an event callback for the specified query.
+ *
+ * @returns Events to raise.
+ */
+function syncTreeAddEventRegistration(syncTree, query, eventRegistration) {
+    var _a = syncTreeRegisterSyncPoint(query, syncTree), syncPoint = _a.syncPoint, serverCache = _a.serverCache, writesCache = _a.writesCache, serverCacheComplete = _a.serverCacheComplete, viewAlreadyExists = _a.viewAlreadyExists, foundAncestorDefaultView = _a.foundAncestorDefaultView;
     var events = syncPointAddEventRegistration(syncPoint, query, eventRegistration, writesCache, serverCache, serverCacheComplete);
     if (!viewAlreadyExists && !foundAncestorDefaultView) {
         var view = syncPointViewForQuery(syncPoint, query);
@@ -14863,9 +14883,25 @@ function repoGetValue(repo, query) {
     }
     return repo.server_.get(query).then(function (payload) {
         var node = nodeFromJSON(payload).withIndex(query._queryParams.getIndex());
-        var 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.
+            var 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.
+        }
+        var cancels = syncTreeRemoveEventRegistration(repo.serverSyncTree_, query, null);
+        if (cancels.length > 0) {
+            repoLog(repo, 'unexpected cancel events in repoGetValue');
+        }
+        return node;
     }, function (err) {
         repoLog(repo, 'get for query ' + util.stringify(query) + ' failed: ' + err);
         return Promise.reject(new Error(err));