Merge branch 'master' into mrschmidt/standalonescript

Author: schmidt-sebastian

.changeset/blue-geese-approve.md

@@ -0,0 +1,6 @@
+---
+"@firebase/firestore": patch
+"@firebase/webchannel-wrapper": patch
+---
+
+Fix an issue that prevented `experimentalAutoDetectLongPolling` from working correctly.

.changeset/curvy-planets-sneeze.md

@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
   },
   "devDependencies": {
-    "firebase": "8.0.2",
+    "firebase": "8.1.0",
     "@types/chai": "4.2.14",
     "@types/mocha": "7.0.2",
     "chai": "4.2.0",

.changeset/many-snails-kneel.md

@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@firebase/app": "0.6.13",
-    "@firebase/firestore": "2.0.2",
+    "@firebase/firestore": "2.0.3",
     "@types/mocha": "7.0.2",
     "gulp": "4.0.2",
     "gulp-filter": "6.0.0",

.changeset/proud-pigs-work.md

@@ -9,7 +9,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "8.0.2",
+    "firebase": "8.1.0",
     "chai": "4.2.0",
     "chromedriver": "86.0.0",
     "express": "4.17.1",

integration/firebase/package.json

@@ -41,7 +41,7 @@
     "@firebase/app-compat": "0.0.900",
     "@firebase/auth-exp": "0.0.900",
     "@firebase/functions-exp": "0.0.900",
-    "@firebase/firestore": "2.0.2",
+    "@firebase/firestore": "2.0.3",
     "@firebase/performance-exp": "0.0.900",
     "@firebase/remote-config-exp": "0.0.900"
   },

integration/firestore/package.json

@@ -1,5 +1,11 @@
 # Unreleased
 
+## 0.8.0
+
+### Minor Changes
+
+- [`34973cde2`](https://github.com/firebase/firebase-js-sdk/commit/34973cde218e570baccd235d5bb6c6146559f80b) [#3812](https://github.com/firebase/firebase-js-sdk/pull/3812) - Add a `get` method for database queries that returns server result when connected
+
 ## 0.7.1
 
 ### Patch Changes

integration/messaging/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/database",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",

packages-exp/firebase-exp/package.json

@@ -1,5 +1,17 @@
 # firebase
 
+## 8.1.0
+
+### Minor Changes
+
+- [`34973cde2`](https://github.com/firebase/firebase-js-sdk/commit/34973cde218e570baccd235d5bb6c6146559f80b) [#3812](https://github.com/firebase/firebase-js-sdk/pull/3812) - Add a `get` method for database queries that returns server result when connected
+
+### Patch Changes
+
+- Updated dependencies [[`6c6c49ad6`](https://github.com/firebase/firebase-js-sdk/commit/6c6c49ad6b3c3d66e9ecb8397c4ac39bea256e80), [`e0bf3f70b`](https://github.com/firebase/firebase-js-sdk/commit/e0bf3f70bf82f3587e60ab4484fe37d01cea0051), [`34973cde2`](https://github.com/firebase/firebase-js-sdk/commit/34973cde218e570baccd235d5bb6c6146559f80b)]:
+  - @firebase/firestore@2.0.3
+  - @firebase/database@0.8.0
+
 ## 8.0.2
 
 ### Patch Changes

packages/database/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "8.0.2",
+  "version": "8.1.0",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -48,8 +48,8 @@
     "@firebase/app": "0.6.13",
     "@firebase/app-types": "0.6.1",
     "@firebase/auth": "0.15.2",
-    "@firebase/database": "0.7.1",
-    "@firebase/firestore": "2.0.2",
+    "@firebase/database": "0.8.0",
+    "@firebase/firestore": "2.0.3",
     "@firebase/functions": "0.6.1",
     "@firebase/installations": "0.4.19",
     "@firebase/messaging": "0.7.3",

packages/database/package.json

@@ -1,5 +1,13 @@
 # @firebase/firestore
 
+## 2.0.3
+
+### Patch Changes
+
+- [`6c6c49ad6`](https://github.com/firebase/firebase-js-sdk/commit/6c6c49ad6b3c3d66e9ecb8397c4ac39bea256e80) [#4053](https://github.com/firebase/firebase-js-sdk/pull/4053) - Internal changes for the upcoming modular API.
+
+* [`e0bf3f70b`](https://github.com/firebase/firebase-js-sdk/commit/e0bf3f70bf82f3587e60ab4484fe37d01cea0051) [#4080](https://github.com/firebase/firebase-js-sdk/pull/4080) (fixes [#4071](https://github.com/firebase/firebase-js-sdk/issues/4071)) - Fixes a regression introduced in v8.0.2 that returned invalid values for `DocumentChange.newIndex`.
+
 ## 2.0.2
 
 ### Patch Changes

packages/firebase/CHANGELOG.md

@@ -40,7 +40,7 @@ export class Bytes {
     } catch (e) {
       throw new FirestoreError(
         Code.INVALID_ARGUMENT,
-        'Failed to construct Bytes from Base64 string: ' + e
+        'Failed to construct data from Base64 string: ' + e
       );
     }
   }

packages/firebase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/firestore",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "engines": {
     "node": "^8.13.0 || >=10.10.0"
   },

packages/firestore/CHANGELOG.md

@@ -17,8 +17,8 @@
 
 import { isBase64Available } from '../platform/base64';
 import { Code, FirestoreError } from '../util/error';
-import { ByteString } from '../util/byte_string';
 import { Bytes } from '../../lite/src/api/bytes';
+import { Compat } from '../compat/compat';
 
 /** Helper function to assert Uint8Array is available at runtime. */
 function assertUint8ArrayAvailable(): void {
@@ -40,42 +40,30 @@ function assertBase64Available(): void {
   }
 }
 
-/**
- * Immutable class holding a blob (binary data).
- *
- * This class is directly exposed in the public API. It extends the Bytes class
- * of the firestore-exp API to support `instanceof Bytes` checks during user
- * data conversion.
- *
- * Note that while you can't hide the constructor in JavaScript code, we are
- * using the hack above to make sure no-one outside this module can call it.
- */
-export class Blob extends Bytes {
+/** Immutable class holding a blob (binary data) */
+export class Blob extends Compat<Bytes> {
   static fromBase64String(base64: string): Blob {
     assertBase64Available();
-    try {
-      return new Blob(ByteString.fromBase64String(base64));
-    } catch (e) {
-      throw new FirestoreError(
-        Code.INVALID_ARGUMENT,
-        'Failed to construct Blob from Base64 string: ' + e
-      );
-    }
+    return new Blob(Bytes.fromBase64String(base64));
   }
 
   static fromUint8Array(array: Uint8Array): Blob {
     assertUint8ArrayAvailable();
-    return new Blob(ByteString.fromUint8Array(array));
+    return new Blob(Bytes.fromUint8Array(array));
   }
 
   toBase64(): string {
     assertBase64Available();
-    return super.toBase64();
+    return this._delegate.toBase64();
   }
 
   toUint8Array(): Uint8Array {
     assertUint8ArrayAvailable();
-    return super.toUint8Array();
+    return this._delegate.toUint8Array();
+  }
+
+  isEqual(other: Blob): boolean {
+    return this._delegate.isEqual(other._delegate);
   }
 
   toString(): string {

packages/firestore/lite/src/api/bytes.ts

@@ -46,6 +46,7 @@ import { isValidResourceName } from '../remote/serializer';
 import { logError } from '../util/log';
 import { ByteString } from '../util/byte_string';
 import { Blob } from './blob';
+import { Bytes } from '../../lite/src/api/bytes';
 import { DocumentReference, Firestore } from './database';
 
 export type ServerTimestampBehavior = 'estimate' | 'previous' | 'none';
@@ -174,7 +175,7 @@ export class UserDataWriter extends AbstractUserDataWriter {
   }
 
   protected convertBytes(bytes: ByteString): Blob {
-    return new Blob(bytes);
+    return new Blob(new Bytes(bytes));
   }
 
   protected convertReference(name: string): DocumentReference {

packages/firestore/package.json

@@ -22,7 +22,12 @@ import {
   WebChannel,
   WebChannelError,
   WebChannelOptions,
-  XhrIo
+  XhrIo,
+  getStatEventTarget,
+  EventTarget,
+  StatEvent,
+  Event,
+  Stat
 } from '@firebase/webchannel-wrapper';
 
 import {
@@ -164,6 +169,7 @@ export class WebChannelConnection extends RestConnection {
       '/channel'
     ];
     const webchannelTransport = createWebChannelTransport();
+    const requestStats = getStatEventTarget();
     const request: WebChannelOptions = {
       // Required for backend stickiness, routing behavior is based on this
       // parameter.
@@ -257,12 +263,13 @@ export class WebChannelConnection extends RestConnection {
     // Note that eventually this function could go away if we are confident
     // enough the code is exception free.
     const unguardedEventListen = <T>(
-      type: string,
-      fn: (param?: T) => void
+      target: EventTarget,
+      type: string | number,
+      fn: (param: T) => void
     ): void => {
       // TODO(dimond): closure typing seems broken because WebChannel does
       // not implement goog.events.Listenable
-      channel.listen(type, (param: unknown) => {
+      target.listen(type, (param: unknown) => {
         try {
           fn(param as T);
         } catch (e) {
@@ -273,21 +280,21 @@ export class WebChannelConnection extends RestConnection {
       });
     };
 
-    unguardedEventListen(WebChannel.EventType.OPEN, () => {
+    unguardedEventListen(channel, WebChannel.EventType.OPEN, () => {
       if (!closed) {
         logDebug(LOG_TAG, 'WebChannel transport opened.');
       }
     });
 
-    unguardedEventListen(WebChannel.EventType.CLOSE, () => {
+    unguardedEventListen(channel, WebChannel.EventType.CLOSE, () => {
       if (!closed) {
         closed = true;
         logDebug(LOG_TAG, 'WebChannel transport closed');
         streamBridge.callOnClose();
       }
     });
 
-    unguardedEventListen<Error>(WebChannel.EventType.ERROR, err => {
+    unguardedEventListen<Error>(channel, WebChannel.EventType.ERROR, err => {
       if (!closed) {
         closed = true;
         logWarn(LOG_TAG, 'WebChannel transport errored:', err);
@@ -308,10 +315,11 @@ export class WebChannelConnection extends RestConnection {
     }
 
     unguardedEventListen<WebChannelResponse>(
+      channel,
       WebChannel.EventType.MESSAGE,
       msg => {
         if (!closed) {
-          const msgData = msg!.data[0];
+          const msgData = msg.data[0];
           hardAssert(!!msgData, 'Got a webchannel message without data.');
           // TODO(b/35143891): There is a bug in One Platform that caused errors
           // (and only errors) to be wrapped in an extra array. To be forward
@@ -348,6 +356,14 @@ export class WebChannelConnection extends RestConnection {
       }
     );
 
+    unguardedEventListen<StatEvent>(requestStats, Event.STAT_EVENT, event => {
+      if (event.stat === Stat.PROXY) {
+        logDebug(LOG_TAG, 'Detected buffering proxy');
+      } else if (event.stat === Stat.NOPROXY) {
+        logDebug(LOG_TAG, 'Detected no buffering proxy');
+      }
+    });
+
     setTimeout(() => {
       // Technically we could/should wait for the WebChannel opened event,
       // but because we want to send the first message with the WebChannel

packages/firestore/src/api/blob.ts

@@ -15,4 +15,4 @@
  * limitations under the License.
  */
 
-export * from '../node/serializer';
+export * from '../browser_lite/serializer';

packages/firestore/src/api/user_data_writer.ts

@@ -48,7 +48,7 @@ describe('Blob', () => {
 
   it('Blob throws on invalid Base64 strings', () => {
     expect(() => Blob.fromBase64String('not-base64!')).to.throw(
-      /Failed to construct Blob from Base64 string:/
+      /Failed to construct data from Base64 string:/
     );
   });
 

packages/firestore/src/platform/browser/webchannel_connection.ts

@@ -1,5 +1,12 @@
 # @firebase/rules-unit-testing
 
+## 1.1.2
+
+### Patch Changes
+
+- Updated dependencies [[`34973cde2`](https://github.com/firebase/firebase-js-sdk/commit/34973cde218e570baccd235d5bb6c6146559f80b)]:
+  - [email protected]
+
 ## 1.1.1
 
 ### Patch Changes

packages/firestore/src/platform/node_lite/serializer.ts

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/rules-unit-testing",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -19,7 +19,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "8.0.2",
+    "firebase": "8.1.0",
     "@firebase/logger": "0.2.6",
     "@firebase/util": "0.3.4",
     "request": "2.88.2"

packages/firestore/test/unit/api/blob.test.ts

@@ -40,7 +40,7 @@
     "rxjs": "6.x.x"
   },
   "devDependencies": {
-    "firebase": "8.0.2",
+    "firebase": "8.1.0",
     "rollup": "2.33.2",
     "@rollup/plugin-commonjs": "15.1.0",
     "@rollup/plugin-node-resolve": "9.0.0",

packages/rules-unit-testing/CHANGELOG.md

@@ -64,3 +64,16 @@ goog.net.WebChannel.Options.internalChannelParams;
 
 /** @type {boolean|undefined} */
 goog.net.WebChannel.Options.forceLongPolling;
+
+/** @type {boolean|undefined} */
+goog.net.WebChannel.Options.detectBufferingProxy;
+
+goog.labs.net.webChannel.requestStats.Event = {};
+goog.labs.net.webChannel.requestStats.Event.STAT_EVENT;
+
+goog.labs.net.webChannel.requestStats.StatEvent = {};
+goog.labs.net.webChannel.requestStats.StatEvent.stat;
+
+goog.labs.net.webChannel.requestStats.Stat = {};
+goog.labs.net.webChannel.requestStats.Stat.PROXY;
+goog.labs.net.webChannel.requestStats.Stat.NOPROXY;