fix 1

Author: gsiddh

src/mcp/tools/messaging/get_delivery_data.ts

@@ -2,10 +2,9 @@ import { z } from "zod";
 import { tool } from "../../tool";
 import { mcpError, toContent } from "../../util";
 import { getAndroidDeliveryData } from "../../../messaging/getDeliveryData";
-import { FirebaseError } from "../../../error";
-import { logger } from "../../../logger";
 
 export const get_fcm_delivery_data = tool(
+  "messaging",
   {
     name: "get_fcm_delivery_data",
     description:
@@ -33,9 +32,11 @@ export const get_fcm_delivery_data = tool(
   },
   async ({ appId, pageSize, pageToken }, { projectId }) => {
     if (!appId.includes(":android:")) {
-      throw new FirebaseError(`Invalid app id provided: ${appId}. Currently fcm delivery data is only available for android apps.`)
+      return mcpError(`Invalid app id provided: ${appId}. Currently fcm delivery data is only available for android apps.`)
     }
 
-    return toContent(await getAndroidDeliveryData(projectId, appId, { pageSize, pageToken }))
+    return toContent(
+      await getAndroidDeliveryData(projectId, appId, { pageSize, pageToken }),
+    );
   },
 );

src/messaging/getDeliveryData.ts

@@ -2,7 +2,7 @@ import { messagingDataApiOrigin } from "../api";
 import { Client } from "../apiv2";
 import { logger } from "../logger";
 import { FirebaseError } from "../error";
-import { ListAndroidDeliveryDataResponse, ListAndroidDeliveryDataRequest } from "./interfaces";
+import { ListAndroidDeliveryDataResponse } from "./interfaces";
 
 const TIMEOUT = 10000;
 
@@ -24,9 +24,9 @@ export async function getAndroidDeliveryData(
     // API docs for fetching Android delivery data are here: 
     // https://firebase.google.com/docs/reference/fcmdata/rest/v1beta1/projects.androidApps.deliveryData/list#http-request 
 
-    const customHeaders = {
-      "Content-Type": "application/json",
-      "x-goog-user-project": projectId,
+    const customHeaders ={
+        "Content-Type": "application/json",
+        "x-goog-user-project": projectId,
     };
 
     // set up query params
@@ -38,17 +38,20 @@ export async function getAndroidDeliveryData(
       params.set("pageToken", options.pageToken);
     }
 
+    logger.debug(`requesting android delivery data for ${projectId}, ${androidAppId}`)
+
     const res = await apiClient.request<null, ListAndroidDeliveryDataResponse>({
       method: "GET",
       path: `/projects/${projectId}/androidApps/${androidAppId}/deliveryData`,
+      queryParams: params,
       headers: customHeaders,
       timeout: TIMEOUT,
     });
-
+    
     logger.debug(`${res.status}, ${res.response}, ${res.body}`);
     return res.body;
   } catch (err: any) {
     logger.debug(err.message);
-    throw new FirebaseError(`Failed to fetch delivery data for project ${projectId} and ${androidAppId}, ${err}.`, { original: err });
+    throw new FirebaseError(`Failed to fetch delivery data for project ${projectId} and ${androidAppId}, ${err}.`, {original: err});
   }
 }

src/messaging/interfaces.ts

@@ -132,30 +132,17 @@ export interface AndroidDeliveryData {
   /** The app ID to which the messages were sent. */
   appId: string;
   /** The date represented by this entry. */
-  // TODO: where to get the date type from
-  // date: string;
+  date: {
+    year: number;
+    month: number;
+    day: number;
+  };
   /** The analytics label associated with the messages sent. */
   analyticsLabel: string;
   /** The data for the specified combination. */
   data: Data;
 }
 
-/**
- * Request message for ListAndroidDeliveryData.
- */
-export interface ListAndroidDeliveryDataRequest {
-  /**
-   * The maximum number of entries to return.
-   * If unspecified, at most 1,000 entries will be returned.
-   */
-  pageSize?: number;
-  /**
-   * A page token, received from a previous `ListAndroidDeliveryDataRequest` call.
-   * Provide this to retrieve the subsequent page.
-   */
-  pageToken?: string;
-}
-
 /**
  * Response message for ListAndroidDeliveryData.
  */