@firebase/database 0.14.0 → 0.14.1-canary.68369740a

package/dist/index.standalone.js

@@ -754,16 +754,18 @@ var RepoInfo = /** @class */ (function () {
      * @param nodeAdmin - Whether this instance uses Admin SDK credentials
      * @param persistenceKey - Override the default session persistence storage key
      */
-    function RepoInfo(host, secure, namespace, webSocketOnly, nodeAdmin, persistenceKey, includeNamespaceInQueryParams) {
+    function RepoInfo(host, secure, namespace, webSocketOnly, nodeAdmin, persistenceKey, includeNamespaceInQueryParams, isUsingEmulator) {
         if (nodeAdmin === void 0) { nodeAdmin = false; }
         if (persistenceKey === void 0) { persistenceKey = ''; }
         if (includeNamespaceInQueryParams === void 0) { includeNamespaceInQueryParams = false; }
+        if (isUsingEmulator === void 0) { isUsingEmulator = false; }
         this.secure = secure;
         this.namespace = namespace;
         this.webSocketOnly = webSocketOnly;
         this.nodeAdmin = nodeAdmin;
         this.persistenceKey = persistenceKey;
         this.includeNamespaceInQueryParams = includeNamespaceInQueryParams;
+        this.isUsingEmulator = isUsingEmulator;
         this._host = host.toLowerCase();
         this._domain = this._host.substr(this._host.indexOf('.') + 1);
         this.internalHost =
@@ -2005,8 +2007,8 @@ var FirebaseIFrameScriptHolder = /** @class */ (function () {
         if (this.myIFrame) {
             //We have to actually remove all of the html inside this iframe before removing it from the
             //window, or IE will continue loading and executing the script tags we've already added, which
-            //can lead to some errors being thrown. Setting innerHTML seems to be the easiest way to do this.
-            this.myIFrame.doc.body.innerHTML = '';
+            //can lead to some errors being thrown. Setting textContent seems to be the safest way to do this.
+            this.myIFrame.doc.body.textContent = '';
             setTimeout(function () {
                 if (_this.myIFrame !== null) {
                     document.body.removeChild(_this.myIFrame);
@@ -2568,7 +2570,12 @@ var Connection = /** @class */ (function () {
         if (MESSAGE_DATA in controlData) {
             var payload = controlData[MESSAGE_DATA];
             if (cmd === SERVER_HELLO) {
-                this.onHandshake_(payload);
+                var handshakePayload = tslib.__assign({}, payload);
+                if (this.repoInfo_.isUsingEmulator) {
+                    // Upon connecting, the emulator will pass the hostname that it's aware of, but we prefer the user's set hostname via `connectDatabaseEmulator` over what the emulator passes.
+                    handshakePayload.h = this.repoInfo_.host;
+                }
+                this.onHandshake_(handshakePayload);
             }
             else if (cmd === END_TRANSMISSION) {
                 this.log_('recvd end transmission on primary');
@@ -13923,7 +13930,8 @@ var useRestClient = false;
  */
 function repoManagerApplyEmulatorSettings(repo, host, port, tokenProvider) {
     repo.repoInfo_ = new RepoInfo("".concat(host, ":").concat(port), 
-    /* secure= */ false, repo.repoInfo_.namespace, repo.repoInfo_.webSocketOnly, repo.repoInfo_.nodeAdmin, repo.repoInfo_.persistenceKey, repo.repoInfo_.includeNamespaceInQueryParams);
+    /* secure= */ false, repo.repoInfo_.namespace, repo.repoInfo_.webSocketOnly, repo.repoInfo_.nodeAdmin, repo.repoInfo_.persistenceKey, repo.repoInfo_.includeNamespaceInQueryParams, 
+    /*isUsingEmulator=*/ true);
     if (tokenProvider) {
         repo.authTokenProvider_ = tokenProvider;
     }