fix fetch instrumentation bugs

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+# 6.2.6
+
+### New in this release
+* Fixed a bug in the fetch instrumentation where customer options were inadvertently removed when no headers were specified. Now, options will be preserved even when headers are absent.
+* Addressed an issue that resulted in app crashes when an invalid URL was encountered in the capacitor plugin. To mitigate this, a valid URL checker has been implemented to ensure that mobilerequest events are created only with valid URLs.
+
+
 # 6.2.5
 
 ### New in this release

package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic-cordova-plugin",
-  "version": "6.2.5",
+  "version": "6.2.6",
   "description": "New Relic Cordova Plugin for iOS and Android",
   "repo": "https://github.com/newrelic/newrelic-cordova-plugin/",
   "scripts": {

plugin.xml

@@ -6,7 +6,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-  id="newrelic-cordova-plugin" version="6.2.5">
+  id="newrelic-cordova-plugin" version="6.2.6">
   <name>NewRelic</name>
   <description>New Relic Cordova Plugin for iOS and Android</description>
   <author>New Relic</author>

www/js/newrelic.js

@@ -1,4 +1,3 @@
-cordova.define("newrelic-cordova-plugin.NewRelic", function(require, exports, module) {
     /*
      * Copyright (c) 2022-present New Relic Corporation. All rights reserved.
      * SPDX-License-Identifier: Apache-2.0
@@ -402,7 +401,9 @@ cordova.define("newrelic-cordova-plugin.NewRelic", function(require, exports, mo
                           networkRequest.body = "";
                         }
 
+                        if(isValidURL(networkRequest.url)) {   
                         NewRelic.noticeHttpTransaction(networkRequest.url, networkRequest.method, networkRequest.status, networkRequest.startTime, networkRequest.endTime, networkRequest.bytesSent, networkRequest.bytesreceived, networkRequest.body,networkRequest.params);
+                        }
                        }
                 },
                 false
@@ -479,7 +480,10 @@ cordova.define("newrelic-cordova-plugin.NewRelic", function(require, exports, mo
             }
           });
         } else {
-          options = {headers:{}};
+           if(options === undefined) {
+                  options = {};
+           }
+          options['headers'] = {};
           options.headers['newrelic'] = headers['newrelic'];
           options.headers['traceparent'] = headers['traceparent'];
           options.headers['tracestate'] = headers['tracestate'];
@@ -514,6 +518,8 @@ cordova.define("newrelic-cordova-plugin.NewRelic", function(require, exports, mo
 
     function handleFetchSuccess(response, method, url, startTime,headers,params) {
         response.text().then((v)=>{
+
+        if(isValidURL(url)) {    
         NewRelic.noticeHttpTransaction(
           url,
           method,
@@ -526,9 +532,19 @@ cordova.define("newrelic-cordova-plugin.NewRelic", function(require, exports, mo
           params,
           headers
          );
+        }
 
         });
     }
+
+    function isValidURL(url) {
+        try {
+          const newUrl = new URL(url);
+          return newUrl.protocol === 'http:' || newUrl.protocol === 'https:';
+        } catch (err) {
+          return false;
+        }
+      }
 
     const defaultLog = window.console.log;
     const defaultWarn = window.console.warn;
@@ -666,5 +682,4 @@ cordova.define("newrelic-cordova-plugin.NewRelic", function(require, exports, mo
 
     module.exports = NewRelic;
 
-    });