Began reporting client sdk information

docs-devsite/index.md

@@ -19,6 +19,7 @@ https://github.com/firebase/firebase-js-sdk
 |  [@firebase/app](./app.md#app_package) | Firebase App |
 |  [@firebase/app-check](./app-check.md#app-check_package) | The Firebase App Check Web SDK. |
 |  [@firebase/auth](./auth.md#auth_package) | Firebase Authentication |
+|  [@firebase/data-connect](./data-connect.md#data-connect_package) | Firebase Data Connect |
 |  [@firebase/database](./database.md#database_package) | Firebase Realtime Database |
 |  [@firebase/firestore](./firestore.md#firestore_package) | Cloud Firestore |
 |  [@firebase/functions](./functions.md#functions_package) | Cloud Functions for Firebase |

packages/data-connect/src/api/DataConnect.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
 import {
   FirebaseApp,
   _getProvider,
   _removeServiceInstance,
@@ -36,7 +36,6 @@
 
 import { MutationManager } from './Mutation';
 
-
 /**
  * Connector Config for calling Data Connect backend.
  */
@@ -131,10 +130,10 @@
 
     if (this._authProvider) {
       this._authTokenProvider = new FirebaseAuthProvider(
-            this.app.name,
-            this.app.options,
-            this._authProvider
-          );
+        this.app.name,
+        this.app.options,
+        this._authProvider
+      );
     }
 
     this.initialized = true;
@@ -239,7 +238,7 @@
 /**
  * Delete DataConnect instance
  * @param dataConnect DataConnect instance
- * @returns 
+ * @returns
  */
 export function terminate(dataConnect: DataConnect): Promise<void> {
   return dataConnect._delete();

packages/data-connect/src/api/Mutation.ts

@@ -40,7 +40,7 @@
   mutationName: string
 ): MutationRef<Data, undefined>;
 /**
- * 
+ *
  * @param dcInstance Data Connect instance
  * @param mutationName name of mutation
  * @param variables variables to send with mutation
@@ -51,7 +51,7 @@
   variables: Variables
 ): MutationRef<Data, Variables>;
 /**
- * 
+ *
  * @param dcInstance Data Connect instance
  * @param mutationName name of mutation
  * @param variables variables to send with mutation
@@ -95,7 +95,7 @@
       return obj;
     });
     this._inflight.push(result);
     const removePromise = () =>
       (this._inflight = this._inflight.filter(promise => promise !== result));
     result.then(removePromise, removePromise);
     return withRefPromise;

packages/data-connect/src/core/FirebaseAuthProvider.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
 import { FirebaseOptions } from '@firebase/app';
 import {
   FirebaseAuthInternal,
   FirebaseAuthInternalName,
@@ -74,9 +74,8 @@
     this._auth?.addAuthTokenListener(listener);
   }
   removeTokenChangeListener(listener: (token: string | null) => void): void {
     this._authProvider
       .get()
       .then(auth => auth.removeAuthTokenListener(listener));
   }
 }
-

packages/data-connect/src/core/QueryManager.ts

@@ -73,7 +73,7 @@
   constructor(private transport: DataConnectTransport) {
     this._queries = new Map();
   }
   track<Data, Variables>(
     queryName: string,
     variables: Variables,
     initialCache?: OpResult<Data>
@@ -113,7 +113,7 @@
       userCallback: onResultCallback,
       errCallback: onErrorCallback
     };
     const unsubscribe = () => {
       const trackedQuery = this._queries.get(key)!;
       trackedQuery.subscriptions = trackedQuery.subscriptions.filter(
         sub => sub !== subscription
@@ -163,9 +163,7 @@
           queryRef.variables
         )}. Calling executeQuery.`
       );
-      const promise = this.executeQuery(
-        queryRef as QueryRef<Data, Variables>
-      );
+      const promise = this.executeQuery(queryRef as QueryRef<Data, Variables>);
       // We want to ignore the error and let subscriptions handle it
       promise.then(undefined, err => {});
     }
@@ -217,11 +215,11 @@
 
     return newR;
   }
   enableEmulator(host: string, port: number) {
     this.transport.useEmulator(host, port);
   }
 }
 function compareDates(str1: string, str2: string) {
   const date1 = new Date(str1);
   const date2 = new Date(str2);
   return date1.getTime() < date2.getTime();

packages/data-connect/src/index.ts

@@ -29,9 +29,8 @@ export * from './api.browser';
 
 registerDataConnect();
 
-
 declare module '@firebase/component' {
   interface NameServiceMapping {
     'data-connect': DataConnect;
   }
-}
+}

packages/data-connect/src/network/fetch.ts

@@ -16,12 +16,16 @@
  */
 
 import { Code, DataConnectError } from '../core/error';
+import { SDK_VERSION } from '../core/version';
 import { logDebug, logError } from '../logger';
 
 let connectFetch: typeof fetch | null = globalThis.fetch;
 export function initializeFetch(fetchImpl: typeof fetch) {
   connectFetch = fetchImpl;
 }
+function getGoogApiClientValue(): string {
+  return 'gl-js/ fire/' + SDK_VERSION;
+}
 export function dcFetch<T, U>(
   url: string,
   body: U,
@@ -32,7 +36,8 @@ export function dcFetch<T, U>(
     throw new DataConnectError(Code.OTHER, 'No Fetch Implementation detected!');
   }
   const headers: HeadersInit = {
-    'Content-Type': 'application/json'
+    'Content-Type': 'application/json',
+    'X-Goog-Api-Client': getGoogApiClientValue()
   };
   if (accessToken) {
     headers['X-Firebase-Auth-Token'] = accessToken;
@@ -44,9 +49,13 @@ export function dcFetch<T, U>(
     method: 'POST',
     headers,
     signal
-  }).catch(err => {
-    throw new DataConnectError(Code.OTHER, "Failed to fetch: " + JSON.stringify(err));
   })
+    .catch(err => {
+      throw new DataConnectError(
+        Code.OTHER,
+        'Failed to fetch: ' + JSON.stringify(err)
+      );
+    })
     .then(async response => {
       let jsonResponse = null;
       try {

packages/data-connect/src/util/map.ts

@@ -15,7 +15,11 @@
  * limitations under the License.
  */
 
-export function setIfNotExists<T>(map: Map<string, T>, key: string, val: T): void {
+export function setIfNotExists<T>(
+  map: Map<string, T>,
+  key: string,
+  val: T
+): void {
   if (!map.has(key)) {
     map.set(key, val);
   }

packages/data-connect/test/emulatorSeeder.ts

@@ -38,8 +38,6 @@ import * as path from 'path';
 //      }
 //    }
 
-
-
 import { ReferenceType } from '../src';
 
 //  }

packages/data-connect/test/queries.test.ts

@@ -31,8 +31,10 @@ import {
   QueryResult,
   SerializedRef,
   subscribe,
-  terminate
-, SOURCE_CACHE, SOURCE_SERVER } from '../src';
+  terminate,
+  SOURCE_CACHE,
+  SOURCE_SERVER
+} from '../src';
 
 import { setupQueries } from './emulatorSeeder';
 import { getConnectionConfig, initDatabase, PROJECT_ID } from './util';
@@ -161,7 +163,9 @@ describe('DataConnect Tests', async () => {
     });
     connectDataConnectEmulator(fakeInstance, 'localhost', Number(0));
     const taskListQuery = queryRef<TaskListResponse>(dc, 'listPosts');
-    expect(await executeQuery(taskListQuery)).to.eventually.be.rejectedWith('ECONNREFUSED');
+    expect(await executeQuery(taskListQuery)).to.eventually.be.rejectedWith(
+      'ECONNREFUSED'
+    );
   });
 });
 async function waitForFirstEvent<Data, Variables>(