Merge branch 'realtime-handle-notifications' into realtime-tests

Author: Samruddhi90

packages/remote-config/src/client/realtime_handler.ts

@@ -452,10 +452,6 @@ export class RealtimeHandler {
   private async handleNotifications(
     reader: ReadableStreamDefaultReader<Uint8Array>
   ): Promise<void> {
-    if (reader == null) {
-      return;
-    }
-
     let partialConfigUpdateMessage: string;
     let currentConfigUpdateMessage = '';
 
@@ -618,7 +614,8 @@ export class RealtimeHandler {
       // Update backoff metadata if the connection failed in the foreground.
       const connectionFailed =
         !this.isInBackground &&
-        (responseCode == null || this.isStatusCodeRetryable(responseCode));
+        (responseCode === undefined ||
+          this.isStatusCodeRetryable(responseCode));
 
       if (connectionFailed) {
         await this.updateBackoffMetadataWithLastFailedStreamConnectionTime(
@@ -633,7 +630,6 @@ export class RealtimeHandler {
         const firebaseError = ERROR_FACTORY.create(
           ErrorCode.CONFIG_UPDATE_STREAM_ERROR,
           {
-            httpStatus: responseCode,
             originalErrorMessage: errorMessage
           }
         );

packages/remote-config/src/client/rest_client.ts

@@ -82,16 +82,14 @@ export class RestClient implements RemoteConfigFetchClient {
 
     const url = `${urlBase}/v1/projects/${this.projectId}/namespaces/${this.namespace}:fetch?key=${this.apiKey}`;
 
-    const fetchType = request.fetchType || 'BASE';
-    const fetchAttempt = request.fetchAttempt || 1;
-
     const headers = {
       'Content-Type': 'application/json',
       'Content-Encoding': 'gzip',
       // Deviates from pure decorator by not passing max-age header since we don't currently have
       // service behavior using that header.
-      'If-None-Match': request.eTag || '*',
-      'X_FIREBASE_RC_FETCH_TYPE': `${fetchType}/${fetchAttempt}`
+      'If-None-Match': request.eTag || '*'
+      // TODO: Add this header once CORS error is fixed internally.
+      //'X-Firebase-RC-Fetch-Type': `${fetchType}/${fetchAttempt}`
     };
 
     const requestBody: FetchRequestBody = {

packages/remote-config/src/errors.ts

@@ -78,11 +78,13 @@ const ERROR_DESCRIPTION_MAP: { readonly [key in ErrorCode]: string } = {
   [ErrorCode.CUSTOM_SIGNAL_MAX_ALLOWED_SIGNALS]:
     'Setting more than {$maxSignals} custom signals is not supported.',
   [ErrorCode.CONFIG_UPDATE_STREAM_ERROR]:
-    'The stream was not able to connect to the backend.',
-  [ErrorCode.CONFIG_UPDATE_UNAVAILABLE]: 'The Realtime service is unavailable.',
+    'The stream was not able to connect to the backend: {$originalErrorMessage}.',
+  [ErrorCode.CONFIG_UPDATE_UNAVAILABLE]:
+    'The Realtime service is unavailable: {$originalErrorMessage}',
   [ErrorCode.CONFIG_UPDATE_MESSAGE_INVALID]:
-    'The stream invalidation message was unparsable.',
-  [ErrorCode.CONFIG_UPDATE_NOT_FETCHED]: 'Unable to fetch the latest config.'
+    'The stream invalidation message was unparsable: {$originalErrorMessage}',
+  [ErrorCode.CONFIG_UPDATE_NOT_FETCHED]:
+    'Unable to fetch the latest config: {$originalErrorMessage}'
 };
 
 // Note this is effectively a type system binding a code to params. This approach overlaps with the
@@ -102,10 +104,7 @@ interface ErrorParams {
   [ErrorCode.FETCH_PARSE]: { originalErrorMessage: string };
   [ErrorCode.FETCH_STATUS]: { httpStatus: number };
   [ErrorCode.CUSTOM_SIGNAL_MAX_ALLOWED_SIGNALS]: { maxSignals: number };
-  [ErrorCode.CONFIG_UPDATE_STREAM_ERROR]: {
-    httpStatus?: number;
-    originalErrorMessage?: string;
-  };
+  [ErrorCode.CONFIG_UPDATE_STREAM_ERROR]: { originalErrorMessage: string };
   [ErrorCode.CONFIG_UPDATE_UNAVAILABLE]: { originalErrorMessage: string };
   [ErrorCode.CONFIG_UPDATE_MESSAGE_INVALID]: { originalErrorMessage: string };
   [ErrorCode.CONFIG_UPDATE_NOT_FETCHED]: { originalErrorMessage: string };