Merge branch 'master' into yifany-log-verbosity

Mocha version in master branch is updated to 5.2.0.

Author: yifanyang

.github/CODEOWNERS

@@ -19,9 +19,9 @@ packages/storage  @schmidt-sebastian
 packages/storage-types  @schmidt-sebastian
 
 # Messaging Code
-packages/messaging  @gauntface @pinarx @mmermerkaya @dwoffinden
-packages/messaging-types  @gauntface @pinarx @mmermerkaya @dwoffinden
-integration/messaging  @gauntface @pinarx @mmermerkaya @dwoffinden
+packages/messaging  @pinarx @mmermerkaya @dwoffinden
+packages/messaging-types  @pinarx @mmermerkaya @dwoffinden
+integration/messaging  @pinarx @mmermerkaya @dwoffinden
 
 # Auth Code
 packages/auth  @bojeil-google @wti806

integration/browserify/package.json

@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.5.8"
+    "firebase": "5.5.9"
   },
   "devDependencies": {
     "@babel/core": "7.0.0-beta.47",
@@ -22,6 +22,6 @@
     "karma-sauce-launcher": "1.2.0",
     "karma-spec-reporter": "0.0.32",
     "mkdirp": "0.5.1",
-    "mocha": "5.0.5"
+    "mocha": "5.2.0"
   }
 }

integration/firebase-typings/package.json

@@ -6,7 +6,7 @@
     "test": "tsc index.ts --outDir dist"
   },
   "dependencies": {
-    "firebase": "5.5.8"
+    "firebase": "5.5.9"
   },
   "devDependencies": {
     "typescript": "2.8.1"

integration/firestore/package.json

@@ -21,7 +21,7 @@
     "karma-firefox-launcher": "1.1.0",
     "karma-mocha": "1.3.0",
     "karma-spec-reporter": "0.0.32",
-    "mocha": "5.0.5",
+    "mocha": "5.2.0",
     "ts-loader": "3.5.0",
     "typescript": "2.8.1",
     "webpack": "3.11.0",

integration/messaging/package.json

@@ -8,14 +8,14 @@
     "test:manual": "mocha --exit"
   },
   "dependencies": {
-    "firebase": "5.5.8"
+    "firebase": "5.5.9"
   },
   "devDependencies": {
     "chai": "4.1.2",
     "chromedriver": "2.37.0",
     "express": "4.16.3",
     "geckodriver": "1.11.0",
-    "mocha": "5.0.5",
+    "mocha": "5.2.0",
     "node-fetch": "2.1.2",
     "selenium-assistant": "5.3.0",
     "sinon": "4.5.0"

integration/typescript/package.json

@@ -6,7 +6,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.5.8"
+    "firebase": "5.5.9"
   },
   "devDependencies": {
     "@babel/core": "7.0.0-beta.47",
@@ -23,7 +23,7 @@
     "karma-sauce-launcher": "1.2.0",
     "karma-spec-reporter": "0.0.32",
     "karma-typescript": "3.0.12",
-    "mocha": "5.0.5",
+    "mocha": "5.2.0",
     "npm-run-all": "4.1.2",
     "typescript": "2.8.1"
   }

integration/webpack/package.json

@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.5.8"
+    "firebase": "5.5.9"
   },
   "devDependencies": {
     "@babel/core": "7.0.0-beta.47",
@@ -20,7 +20,7 @@
     "karma-mocha": "1.3.0",
     "karma-sauce-launcher": "1.2.0",
     "karma-spec-reporter": "0.0.32",
-    "mocha": "5.0.5",
+    "mocha": "5.2.0",
     "webpack": "3.11.0"
   }
 }

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "The primary entrypoint to the Firebase JS SDK",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
@@ -22,7 +22,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@firebase/app-types": "0.3.2",
-    "@firebase/util": "0.2.2",
+    "@firebase/util": "0.2.3",
     "tslib": "1.9.0",
     "dom-storage": "2.1.0",
     "xmlhttprequest": "1.8.0"
@@ -42,7 +42,7 @@
     "karma-sourcemap-loader": "0.3.7",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "2.0.9",
-    "mocha": "5.0.5",
+    "mocha": "5.2.0",
     "npm-run-all": "4.1.2",
     "nyc": "11.6.0",
     "rollup": "0.57.1",

packages/database/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/database",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "@firebase/database-types": "0.3.2",
-    "@firebase/logger": "0.1.1",
-    "@firebase/util": "0.2.2",
+    "@firebase/logger": "0.1.2",
+    "@firebase/util": "0.2.3",
     "faye-websocket": "0.11.1",
     "tslib": "1.9.0"
   },
@@ -44,7 +44,7 @@
     "karma-sourcemap-loader": "0.3.7",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "2.0.9",
-    "mocha": "5.0.5",
+    "mocha": "5.2.0",
     "npm-run-all": "4.1.2",
     "nyc": "11.6.0",
     "rollup": "0.57.1",

packages/database/test/helpers/EventAccumulator.ts

@@ -17,7 +17,7 @@
 export const EventAccumulatorFactory = {
   waitsForCount: maxCount => {
     let count = 0;
-    const condition = () => ea.eventData.length >= count;
+    const condition = () => count >= maxCount;
     const ea = new EventAccumulator(condition);
     ea.onReset(() => {
       count = 0;

packages/firebase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "5.5.8",
+  "version": "5.5.9",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -35,12 +35,12 @@
   "module": "dist/index.esm.js",
   "react-native": "dist/index.rn.cjs.js",
   "dependencies": {
-    "@firebase/app": "0.3.4",
+    "@firebase/app": "0.3.5",
     "@firebase/auth": "0.7.9",
-    "@firebase/database": "0.3.6",
-    "@firebase/firestore": "0.8.7",
-    "@firebase/functions": "0.3.2",
-    "@firebase/messaging": "0.3.6",
+    "@firebase/database": "0.3.7",
+    "@firebase/firestore": "0.8.8",
+    "@firebase/functions": "0.3.3",
+    "@firebase/messaging": "0.3.7",
     "@firebase/polyfill": "0.3.3",
     "@firebase/storage": "0.2.4"
   },

packages/firestore/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/firestore",
-  "version": "0.8.7",
+  "version": "0.8.8",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "scripts": {
@@ -26,7 +26,7 @@
   ],
   "dependencies": {
     "@firebase/firestore-types": "0.7.0",
-    "@firebase/logger": "0.1.1",
+    "@firebase/logger": "0.1.2",
     "@firebase/webchannel-wrapper": "0.2.11",
     "grpc": "1.16.0",
     "tslib": "1.9.0"
@@ -55,7 +55,7 @@
     "karma-webpack": "2.0.9",
     "long": "3.2.0",
     "mkdirp": "0.5.1",
-    "mocha": "5.0.5",
+    "mocha": "5.2.0",
     "npm-run-all": "4.1.2",
     "nyc": "11.6.0",
     "prettier": "1.12.0",

packages/firestore/src/local/indexeddb_schema.ts

@@ -23,6 +23,7 @@ import { SnapshotVersion } from '../core/snapshot_version';
 import { BATCHID_UNKNOWN } from '../model/mutation_batch';
 import { encode, EncodedResourcePath } from './encoded_resource_path';
 import { removeMutationBatch } from './indexeddb_mutation_queue';
+import { getHighestListenSequenceNumber } from './indexeddb_query_cache';
 import { dbDocumentSize } from './indexeddb_remote_document_cache';
 import { LocalSerializer } from './local_serializer';
 import { PersistencePromise } from './persistence_promise';
@@ -39,8 +40,10 @@ import { SimpleDbSchemaConverter, SimpleDbTransaction } from './simple_db';
  *    https://github.com/firebase/firebase-ios-sdk/issues/1548
  * 4. Multi-Tab Support.
  * 5. Removal of held write acks.
+ * 6. Create document global for tracking document cache size.
+ * 7. Ensure every cached document has a sentinel row with a sequence number.
  */
-export const SCHEMA_VERSION = 6;
+export const SCHEMA_VERSION = 7;
 
 /** Performs database creation and schema upgrades. */
 export class SchemaConverter implements SimpleDbSchemaConverter {
@@ -115,6 +118,10 @@ export class SchemaConverter implements SimpleDbSchemaConverter {
       });
     }
 
+    if (fromVersion < 7 && toVersion >= 7) {
+      p = p.next(() => this.ensureSequenceNumbers(txn));
+    }
+
     return p;
   }
 
@@ -172,6 +179,53 @@ export class SchemaConverter implements SimpleDbSchemaConverter {
       });
     });
   }
+
+  /**
+   * Ensures that every document in the remote document cache has a corresponding sentinel row
+   * with a sequence number. Missing rows are given the most recently used sequence number.
+   */
+  private ensureSequenceNumbers(
+    txn: SimpleDbTransaction
+  ): PersistencePromise<void> {
+    const documentTargetStore = txn.store<
+      DbTargetDocumentKey,
+      DbTargetDocument
+    >(DbTargetDocument.store);
+    const documentsStore = txn.store<DbRemoteDocumentKey, DbRemoteDocument>(
+      DbRemoteDocument.store
+    );
+
+    return getHighestListenSequenceNumber(txn).next(currentSequenceNumber => {
+      const writeSentinelKey = (
+        path: ResourcePath
+      ): PersistencePromise<void> => {
+        return documentTargetStore.put(
+          new DbTargetDocument(0, encode(path), currentSequenceNumber)
+        );
+      };
+
+      const promises: Array<PersistencePromise<void>> = [];
+      return documentsStore
+        .iterate((key, doc) => {
+          const path = new ResourcePath(key);
+          const docSentinelKey = sentinelKey(path);
+          promises.push(
+            documentTargetStore.get(docSentinelKey).next(maybeSentinel => {
+              if (!maybeSentinel) {
+                return writeSentinelKey(path);
+              } else {
+                return PersistencePromise.resolve();
+              }
+            })
+          );
+        })
+        .next(() => PersistencePromise.waitFor(promises));
+    });
+  }
+}
+
+function sentinelKey(path: ResourcePath): DbTargetDocumentKey {
+  return [0, encode(path)];
 }
 
 // TODO(mikelehen): Get rid of "as any" if/when TypeScript fixes their types.

packages/firestore/src/platform_node/grpc_connection.ts

@@ -113,7 +113,17 @@ export class GrpcConnection implements Connection {
         ? grpc.credentials.createSsl()
         : grpc.credentials.createInsecure();
       this.cachedStub = {
-        stub: new this.firestore.Firestore(this.databaseInfo.host, credentials),
+        stub: new this.firestore.Firestore(
+          this.databaseInfo.host,
+          credentials,
+          {
+            // We do our own connection backoff (that for example is aware of whether or
+            // not a write stream error is permanent or not) so we don't want gRPC to do
+            // backoff on top of that. 100ms is the minimum value that gRPC allows.
+            'grpc.initial_reconnect_backoff_ms': 100,
+            'grpc.max_reconnect_backoff_ms': 100
+          }
+        ),
         token
       };
     }