@firebase/database 0.13.0-20220505222723 → 0.13.0-canary.094da9eed

package/dist/index.standalone.js

@@ -987,7 +987,7 @@ var WebSocketConnection = /** @class */ (function () {
         this.bytesReceived = 0;
         this.log_ = logWrapper(this.connId);
         this.stats_ = statsManagerGetCollection(repoInfo);
-        this.connURL = WebSocketConnection.connectionURL_(repoInfo, transportSessionId, lastSessionId, appCheckToken);
+        this.connURL = WebSocketConnection.connectionURL_(repoInfo, transportSessionId, lastSessionId, appCheckToken, applicationId);
         this.nodeAdmin = repoInfo.nodeAdmin;
     }
     /**
@@ -997,7 +997,7 @@ var WebSocketConnection = /** @class */ (function () {
      * @param lastSessionId - Optional lastSessionId if there was a previous connection
      * @returns connection url
      */
-    WebSocketConnection.connectionURL_ = function (repoInfo, transportSessionId, lastSessionId, appCheckToken) {
+    WebSocketConnection.connectionURL_ = function (repoInfo, transportSessionId, lastSessionId, appCheckToken, applicationId) {
         var urlParams = {};
         urlParams[VERSION_PARAM] = PROTOCOL_VERSION;
         if (!util.isNodeSdk() &&
@@ -1015,6 +1015,9 @@ var WebSocketConnection = /** @class */ (function () {
         if (appCheckToken) {
             urlParams[APP_CHECK_TOKEN_PARAM] = appCheckToken;
         }
+        if (applicationId) {
+            urlParams[APPLICATION_ID_PARAM] = applicationId;
+        }
         return repoInfoConnectionURL(repoInfo, WEBSOCKET, urlParams);
     };
     /**
@@ -1030,10 +1033,11 @@ var WebSocketConnection = /** @class */ (function () {
         // Assume failure until proven otherwise.
         PersistentStorage.set('previous_websocket_failure', true);
         try {
+            var options = void 0;
             if (util.isNodeSdk()) {
                 var device = this.nodeAdmin ? 'AdminNode' : 'Node';
                 // UA Format: Firebase/<wire_protocol>/<sdk_version>/<platform>/<device>
-                var options = {
+                var options_1 = {
                     headers: {
                         'User-Agent': "Firebase/" + PROTOCOL_VERSION + "/" + SDK_VERSION + "/" + process.platform + "/" + device,
                         'X-Firebase-GMPID': this.applicationId || ''
@@ -1045,10 +1049,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.headers['Authorization'] = "Bearer " + this.authToken;
+                    options_1.headers['Authorization'] = "Bearer " + this.authToken;
                 }
                 if (this.appCheckToken) {
-                    options.headers['X-Firebase-AppCheck'] = this.appCheckToken;
+                    options_1.headers['X-Firebase-AppCheck'] = this.appCheckToken;
                 }
                 // Plumb appropriate http_proxy environment variable into faye-websocket if it exists.
                 var env = process['env'];
@@ -1056,19 +1060,10 @@ var WebSocketConnection = /** @class */ (function () {
                     ? env['HTTPS_PROXY'] || env['https_proxy']
                     : env['HTTP_PROXY'] || env['http_proxy'];
                 if (proxy) {
-                    options['proxy'] = { origin: proxy };
+                    options_1['proxy'] = { origin: proxy };
                 }
-                this.mySock = new WebSocketImpl(this.connURL, [], options);
-            }
-            else {
-                var options = {
-                    headers: {
-                        'X-Firebase-GMPID': this.applicationId || '',
-                        'X-Firebase-AppCheck': this.appCheckToken || ''
-                    }
-                };
-                this.mySock = new WebSocketImpl(this.connURL, [], options);
             }
+            this.mySock = new WebSocketImpl(this.connURL, [], options);
         }
         catch (e) {
             this.log_('Error instantiating WebSocket.');