@firebase/database 0.14.0 → 0.14.1-canary.0bab0b7a7

package/dist/index.esm2017.js

@@ -4,7 +4,7 @@ import { stringify, jsonEval, contains, assert, isNodeSdk, stringToByteArray, Sh
 import { Logger, LogLevel } from '@firebase/logger';
 
 const name = "@firebase/database";
-const version = "0.14.0";
+const version = "0.14.1-canary.0bab0b7a7";
 
 /**
  * @license
@@ -929,13 +929,14 @@ class RepoInfo {
      * @param nodeAdmin - Whether this instance uses Admin SDK credentials
      * @param persistenceKey - Override the default session persistence storage key
      */
-    constructor(host, secure, namespace, webSocketOnly, nodeAdmin = false, persistenceKey = '', includeNamespaceInQueryParams = false) {
+    constructor(host, secure, namespace, webSocketOnly, nodeAdmin = false, persistenceKey = '', includeNamespaceInQueryParams = false, 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 =
@@ -1580,8 +1581,8 @@ class FirebaseIFrameScriptHolder {
         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(() => {
                 if (this.myIFrame !== null) {
                     document.body.removeChild(this.myIFrame);
@@ -2465,7 +2466,12 @@ class Connection {
         if (MESSAGE_DATA in controlData) {
             const payload = controlData[MESSAGE_DATA];
             if (cmd === SERVER_HELLO) {
-                this.onHandshake_(payload);
+                const handshakePayload = Object.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');
@@ -13453,7 +13459,8 @@ let useRestClient = false;
  */
 function repoManagerApplyEmulatorSettings(repo, host, port, tokenProvider) {
     repo.repoInfo_ = new RepoInfo(`${host}:${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;
     }
@@ -13617,9 +13624,11 @@ function getDatabase(app = getApp(), url) {
     const db = _getProvider(app, 'database').getImmediate({
         identifier: url
     });
-    const emulator = getDefaultEmulatorHostnameAndPort('database');
-    if (emulator) {
-        connectDatabaseEmulator(db, ...emulator);
+    if (!db._instanceStarted) {
+        const emulator = getDefaultEmulatorHostnameAndPort('database');
+        if (emulator) {
+            connectDatabaseEmulator(db, ...emulator);
+        }
     }
     return db;
 }