Throw session errors and bundle with a promise to a BatchResponse if one exists

Author: jonathanedey

src/messaging/messaging.ts

@@ -209,33 +209,48 @@ export class Messaging {
     // const http2SessionHandler = this.useLegacyTransport ? undefined : new Http2SessionHandler(`https://${FCM_SEND_HOST}`)
     const http2SessionHandler = this.useLegacyTransport ? undefined : new Http2SessionHandler(`https://localhost:3001`);
 
+
     return this.getUrlPath()
       .then((urlPath) => {
-        // Try listening for errors here?
+          // Try listening for errors here?
         if (http2SessionHandler){
-          http2SessionHandler.invoke().catch((error) => {
-            console.log("ERROR TO BE PASSED TO USER:")
-            console.log(error)
-            
-            // Throwing here does nothing since it's still not in the promise that's returned?
-            throw error
+          let batchResponsePromise: Promise<PromiseSettledResult<SendResponse>[]>
+          return new Promise((resolve: (result: PromiseSettledResult<SendResponse>[]) => void, reject) => {
+            http2SessionHandler.invoke().catch((error) => {
+              console.log("ERROR TO BE PASSED TO USER:")
+              console.log(error)
+              reject({error, batchResponsePromise})
+            })
+
+
+            const requests: Promise<SendResponse>[] = copy.map(async (message) => {
+              validateMessage(message);
+              const request: { message: Message; validate_only?: boolean } = { message };
+              if (dryRun) {
+                request.validate_only = true;
+              }
+              return this.messagingRequestHandler.invokeHttp2RequestHandlerForSendResponse(
+                  FCM_SEND_HOST, urlPath, request, http2SessionHandler);
+            });
+            batchResponsePromise = Promise.allSettled(requests)
+            batchResponsePromise.then(resolve).catch((error) => {
+              reject({error, batchResponsePromise})
+            })
           })
         }
 
+        //
         const requests: Promise<SendResponse>[] = copy.map(async (message) => {
           validateMessage(message);
           const request: { message: Message; validate_only?: boolean } = { message };
           if (dryRun) {
             request.validate_only = true;
           }
-          
-          if (http2SessionHandler){
-            return this.messagingRequestHandler.invokeHttp2RequestHandlerForSendResponse(
-              FCM_SEND_HOST, urlPath, request, http2SessionHandler);
-          }
           return this.messagingRequestHandler.invokeHttpRequestHandlerForSendResponse(FCM_SEND_HOST, urlPath, request);
         });
         return Promise.allSettled(requests);
+        //
+
       })
       .then((results) => {
         const responses: SendResponse[] = [];
@@ -253,11 +268,6 @@ export class Messaging {
           failureCount: responses.length - successCount,
         };
       })
-      .finally(() => {
-        if (http2SessionHandler){
-          http2SessionHandler.close()
-        }
-      });
   }
 
   /**

test/integration/messaging.spec.ts

@@ -101,17 +101,26 @@ describe('admin.messaging', () => {
       });
   });
 
-  it('test uncaught error', () => {
+  it('test uncaught error', async () => {
     const messages: Message[] = [message, message, message];
+
     // No longer throws uncatchable error
     return getMessaging().sendEach(messages, true)
       .then((response) => {
         console.log(response.responses)
       })
-      .catch((error) => {
-        // This error isn't passed here even when thrown
+      .catch(async (error) => {
+        // type err = {
+        //   error: any,
+        //   batchResponsePromise: Promise<PromiseSettledResult<SendResponse>[]>
+        // }
+        // If batchResponsePromise is undefined then no messages were sent
+        // The promise should eventally return with the result of each request
         console.log("CAUGHT ERROR")
         console.log(error)
+        await error.batchResponsePromise.then((results: any) => {
+          console.log(results)
+        })
       })
   });