Merge branch 'master' into ddb-firebaseserverappsettings-name

Author: DellaBitta

.changeset/chilly-moons-play.md

@@ -0,0 +1,5 @@
+---
+'@firebase/util': patch
+---
+
+fix: browser detection (detect either window or web worker)

.changeset/clever-dryers-double.md

@@ -0,0 +1,6 @@
+---
+'@firebase/app': patch
+'firebase': patch
+---
+
+Guard the use of `FinalizationRegistry` in `FirebaseServerApp` initialization based on the availability of `FinalizationRegistry` in the runtime.

.changeset/fifty-mayflies-hug.md

@@ -0,0 +1,5 @@
+---
+'@firebase/app': patch
+---
+
+fix: server app should initialize in web workers

.changeset/flat-scissors-suffer.md

@@ -0,0 +1,6 @@
+---
+'@firebase/firestore': patch
+'firebase': patch
+---
+
+Fix persistence multi-tab snapshot listener metadata sync issue.

.gitignore

@@ -98,5 +98,6 @@ docs/
 *.tfstate
 *.tfstate.*
 
-# generated test case text data
+# vertexai test data
+vertexai-sdk-test-data
 mocks-lookup.ts

packages/app/src/api.ts

@@ -48,7 +48,12 @@ import {
   LogOptions,
   setUserLogHandler
 } from '@firebase/logger';
-import { deepEqual, getDefaultAppConfig, isBrowser } from '@firebase/util';
+import {
+  deepEqual,
+  getDefaultAppConfig,
+  isBrowser,
+  isWebWorker
+} from '@firebase/util';
 
 export { FirebaseError } from '@firebase/util';
 
@@ -230,7 +235,7 @@ export function initializeServerApp(
   _options: FirebaseOptions | FirebaseApp,
   _serverAppConfig: FirebaseServerAppSettings
 ): FirebaseServerApp {
-  if (isBrowser()) {
+  if (isBrowser() && !isWebWorker()) {
     // FirebaseServerApp isn't designed to be run in browsers.
     throw ERROR_FACTORY.create(AppError.INVALID_SERVER_APP_ENVIRONMENT);
   }

packages/app/src/firebaseServerApp.ts

@@ -32,7 +32,7 @@ export class FirebaseServerAppImpl
   implements FirebaseServerApp
 {
   private readonly _serverConfig: FirebaseServerAppSettings;
-  private _finalizationRegistry: FinalizationRegistry<object>;
+  private _finalizationRegistry: FinalizationRegistry<object> | null;
   private _refCount: number;
 
   constructor(
@@ -67,9 +67,12 @@ export class FirebaseServerAppImpl
       ...serverConfig
     };
 
-    this._finalizationRegistry = new FinalizationRegistry(() => {
-      this.automaticCleanup();
-    });
+    this._finalizationRegistry = null;
+    if (typeof FinalizationRegistry !== 'undefined') {
+      this._finalizationRegistry = new FinalizationRegistry(() => {
+        this.automaticCleanup();
+      });
+    }
 
     this._refCount = 0;
     this.incRefCount(this._serverConfig.releaseOnDeref);
@@ -97,7 +100,7 @@ export class FirebaseServerAppImpl
       return;
     }
     this._refCount++;
-    if (obj !== undefined) {
+    if (obj !== undefined && this._finalizationRegistry !== null) {
       this._finalizationRegistry.register(obj, this);
     }
   }

packages/firestore/src/core/sync_engine_impl.ts

@@ -1095,7 +1095,13 @@ export async function syncEngineEmitNewSnapsAndNotifyLocalStore(
           // secondary clients to update query state.
           if (viewSnapshot || remoteEvent) {
             if (syncEngineImpl.isPrimaryClient) {
-              const isCurrent = viewSnapshot && !viewSnapshot.fromCache;
+              // Query state is set to `current` if:
+              // - There is a view change and it is up-to-date, or,
+              // - There is a global snapshot, the Target is current, and no changes to be resolved
+              const isCurrent = viewSnapshot
+                ? !viewSnapshot.fromCache
+                : remoteEvent?.targetChanges.get(queryView.targetId)?.current;
+
               syncEngineImpl.sharedClientState.updateQueryState(
                 queryView.targetId,
                 isCurrent ? 'current' : 'not-current'

packages/firestore/test/unit/specs/listen_spec.test.ts

@@ -1895,4 +1895,40 @@ describeSpec('Listens:', [], () => {
         .restoreListen(query1, 'resume-token-1000', /* expectedCount= */ 1);
     }
   );
+
+  specTest(
+    'Global snapshots would not alter query state if there is no changes',
+    ['multi-client'],
+    () => {
+      const query1 = query('collection');
+      const docA = doc('collection/a', 1000, { key: 'a' });
+      return (
+        client(0)
+          .becomeVisible()
+          .expectPrimaryState(true)
+          // Populate the cache first
+          .userListens(query1)
+          .watchAcksFull(query1, 1000, docA)
+          .expectEvents(query1, { added: [docA] })
+          .userUnlistens(query1)
+          .watchRemoves(query1)
+          // Listen to the query in the primary client
+          .userListens(query1, { resumeToken: 'resume-token-1000' })
+          .expectEvents(query1, {
+            added: [docA],
+            fromCache: true
+          })
+          .watchAcksFull(query1, 2000, docA)
+          .expectEvents(query1, { fromCache: false })
+          // Reproduces: https://github.com/firebase/firebase-js-sdk/issues/8314
+          // Watch could send a global snapshot from time to time. If there are no view changes,
+          // the query should not be marked as "not-current" as the Target is up to date.
+          .watchSnapshots(3000, [], 'resume-token-3000')
+          // Listen to the query in the secondary tab. The snapshot is up to date.
+          .client(1)
+          .userListens(query1)
+          .expectEvents(query1, { added: [docA], fromCache: false })
+      );
+    }
+  );
 });

packages/util/src/environment.ts

@@ -18,6 +18,11 @@
 import { CONSTANTS } from './constants';
 import { getDefaults } from './defaults';
 
+/**
+ * Type placeholder for `WorkerGlobalScope` from `webworker`
+ */
+declare class WorkerGlobalScope {}
+
 /**
  * Returns navigator.userAgent string or '' if it's not defined.
  * @return user agent string
@@ -77,7 +82,18 @@ export function isNode(): boolean {
  * Detect Browser Environment
  */
 export function isBrowser(): boolean {
-  return typeof self === 'object' && self.self === self;
+  return typeof window !== 'undefined' || isWebWorker();
+}
+
+/**
+ * Detect Web Worker context
+ */
+export function isWebWorker(): boolean {
+  return (
+    typeof WorkerGlobalScope !== 'undefined' &&
+    typeof self !== 'undefined' &&
+    self instanceof WorkerGlobalScope
+  );
 }
 
 /**