Feat: Improve the response handling flow.

- This gives the body being passed to the handlers more meaning.
MindscapeHQ · Nov 26, 2021 · e88a5e1 · e88a5e1
1 parent 7aa0eec
commit e88a5e1
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/src/raygun.network-tracking.js b/src/raygun.network-tracking.js
@@ -187,12 +187,11 @@ window.raygunNetworkTrackingFactory = function(window, Raygun) {
 
         self.executeHandlers(self.requestHandlers, metadata);
 
-        promise.then(
-          self.wrapWithHandler(function(response) {
-            var body = 'N/A when the fetch response does not support clone()';
+        promise
+          .then(function (response) {
             var ourResponse = typeof response.clone === 'function' ? response.clone() : undefined;
 
-            function executeHandlers() {
+            function executeResponseHandlers(body) {
               Raygun.Utilities.log('tracking fetch response for', url);
               self.executeHandlers(self.responseHandlers, {
                 status: response.status,
@@ -205,30 +204,37 @@ window.raygunNetworkTrackingFactory = function(window, Raygun) {
             }
 
             if (ourResponse && typeof ourResponse.text === 'function') {
-              // Return the promise so that it may be handled by the
-              // parent catch should `executeHandlers` fail.
-              return ourResponse.text()
-                .then(function(text) {
-                  body = Raygun.Utilities.truncate(text, 500);
-
-                  executeHandlers();
-                })
-                .catch(function() { executeHandlers(); });
+              // Return the promise so that it may be handled by the parent catch.
+              return ourResponse.text().then(
+                // Fulfilled
+                function (text) {
+                  var truncatedResponseText = Raygun.Utilities.truncate(text, 500);
+                  executeResponseHandlers(truncatedResponseText);
+                },
+                // Rejected
+                function (reason) {
+                  var err = '';
+                  if (reason instanceof Error) {
+                    err = ': ' + reason.message;
+                  } else if (typeof reason === 'string') {
+                    err = ': ' + reason;
+                  }
+                  executeResponseHandlers('N/A response.text() rejected' + err);
+                }
+              );
             }
 
-            executeHandlers();
+            executeResponseHandlers('N/A when the fetch response does not support clone()');
           })
-        ).catch(
-          function(error) {
+          .catch(function (error) {
             self.executeHandlers(self.errorHandlers, {
               metadata: {
                 requestUrl: url,
                 error: error.toString(),
                 duration: new Date().getTime() - initTime,
               },
             });
-          }
-        );
+          });
 
         return promise;
       };