@dynatrace/cordova-plugin 2.331.1 → 2.335.1

package/files/iOS/Dynatrace.xcframework/tvos-arm64_x86_64-simulator/Dynatrace.framework/_CodeSignature/CodeResources

@@ -6,11 +6,11 @@
 	<dict>
 		<key>Headers/Dynatrace-Swift.h</key>
 		<data>
-		kvZmQQJ66tEhXXDeXBCNm9QPkY4=
+		JPTJnEGc1ujLzn/bS39s2ePHtqY=
 		</data>
 		<key>Headers/Dynatrace.h</key>
 		<data>
-		jajRIjuHpmWFFnoTO9MywwUH2eQ=
+		4129c9b7CHW2ROL0W3GHhaT6nO4=
 		</data>
 		<key>Headers/DynatraceSwiftUI.h</key>
 		<data>
@@ -22,15 +22,15 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		u65bUxoSRsetE6qm6p3Y4TBzrjw=
+		O/5pC5dkpDQcfp6aurLPCS1eD/8=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/Project/arm64-apple-tvos-simulator.swiftsourceinfo</key>
 		<data>
-		oGHg1zHpatLmNH0hKjUSgvi6DJo=
+		d9xq5v8c12x8TugSe432FC8Fj/A=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/Project/x86_64-apple-tvos-simulator.swiftsourceinfo</key>
 		<data>
-		5Okn2qhtQ2XvXsNYRsI9e1BWj2I=
+		qeUS2TWJKNO0yyoE0glI38/N+ho=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-tvos-simulator.abi.json</key>
 		<data>
@@ -38,19 +38,19 @@
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-tvos-simulator.private.swiftinterface</key>
 		<data>
-		qmBuSAo0inLR2X5Up9MwYhWIXxU=
+		iWW39j0zrY7kCNR1YH7dAzo3t+E=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-tvos-simulator.swiftdoc</key>
 		<data>
-		oO1DS0cNmqM9FOqRVtbmiVcI3Bc=
+		TaK6FEb/VtglVhZ0uzznbICcqoQ=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-tvos-simulator.swiftinterface</key>
 		<data>
-		qmBuSAo0inLR2X5Up9MwYhWIXxU=
+		iWW39j0zrY7kCNR1YH7dAzo3t+E=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-tvos-simulator.swiftmodule</key>
 		<data>
-		oMMq4KM0QVIg1/+QWpsZ8GroSxc=
+		tGGX02VHV5WTke4Unfgn7lpzxM8=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-tvos-simulator.abi.json</key>
 		<data>
@@ -58,19 +58,19 @@
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-tvos-simulator.private.swiftinterface</key>
 		<data>
-		TRWUsp26Fg0pk5dNvtMA5URbleU=
+		30AmIfXsb1ENiRGE0SrhnWC2zrU=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-tvos-simulator.swiftdoc</key>
 		<data>
-		amymbDEjwKcE8Z6Z8SgpSQbtHnI=
+		7bavbhFP7nlggkTRSJou+sQZL9M=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-tvos-simulator.swiftinterface</key>
 		<data>
-		TRWUsp26Fg0pk5dNvtMA5URbleU=
+		30AmIfXsb1ENiRGE0SrhnWC2zrU=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-tvos-simulator.swiftmodule</key>
 		<data>
-		Cf8t2TIZfQXpUwHBeZnVCoVIdTQ=
+		NMU7qHVi1h7R/aTijAempxmc9aA=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -87,14 +87,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			Onc05BGDApHwePlrer94iJ4q+xfQBxV0b/IXAkEokJ0=
+			00MPik1nU/D3MIauZvu27bSIOL/9AMwZQj32bdUVd5A=
 			</data>
 		</dict>
 		<key>Headers/Dynatrace.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			J2Pbsy0U+a5fERuIeS8/2QfnGf1AgY4rswHMcCICVfc=
+			i0VMPSoOXJqnX6dqD/b1/Yqd5Op/8YUBt8S7OLcuaOo=
 			</data>
 		</dict>
 		<key>Headers/DynatraceSwiftUI.h</key>
@@ -115,14 +115,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			TTTPk5VFSNFN4dAhhUuHlVgV+abge+rNRW4ISyW3Kuo=
+			RvdY7h5gJBFpn2i0V577JeQ/7EtkXJ4hd5H3OI0OoaM=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/Project/x86_64-apple-tvos-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			Wznf9xXzEQSLDDsseX+1LHdfTMJex4xT1XnvzLXbBS8=
+			s+YsqyOTA03k7gN6AYnPbr1lXYHcnzeTjiJqAO6vzf0=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-tvos-simulator.abi.json</key>
@@ -136,28 +136,28 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			XsmepyMadcBoXTYLkzFFI/30b+NKxk9hidT1jmj4xkE=
+			ZHwazMDO2VrPBewQORdVEoqdhBSFLJwsp0ckjBhBfF4=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-tvos-simulator.swiftdoc</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			6XbJeCCXrnvkPpurQ8OcR3jXRUaUb933K9Mithu2Zlw=
+			jDsK6mD08z6dnABd3uZq5sleVSRQ7JkjbHUmeIkTq64=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-tvos-simulator.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			XsmepyMadcBoXTYLkzFFI/30b+NKxk9hidT1jmj4xkE=
+			ZHwazMDO2VrPBewQORdVEoqdhBSFLJwsp0ckjBhBfF4=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-tvos-simulator.swiftmodule</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			0+QjK+9/wqDwCWscrUMZ+OYYHnniXKlLUafMDpugrZo=
+			au+DXTFHDTUh1R5HLFJ2aLolrcfu3D0kDPECLgG5C6w=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-tvos-simulator.abi.json</key>
@@ -171,28 +171,28 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			HI7++nli2/3WKZFNuUSFnDaukJFcz+ClhZpWJqFF7iw=
+			Ek4KlNj1XU7faUk5y6b/PWb+3a7mQW7bgqwPOmkiY2Q=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-tvos-simulator.swiftdoc</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			ECjYsXiapGZ5XiwuMX3zAknJ6/ndLV/ZHpg191geQSI=
+			iXZ0RYONs7MnnED3ggHu42sFMoolXa6/qYrZXUqcDRY=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-tvos-simulator.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			HI7++nli2/3WKZFNuUSFnDaukJFcz+ClhZpWJqFF7iw=
+			Ek4KlNj1XU7faUk5y6b/PWb+3a7mQW7bgqwPOmkiY2Q=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-tvos-simulator.swiftmodule</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			KXRSVDdV3mb3CZiOTU0x3C/AZ6xuPZ23sWLHTgdYcRU=
+			fq3YTur20EWQnGNqH+1nB8AQvDGAVmz6oFy9zEdpldk=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

package/files/plugin.gradle

@@ -1,3 +1,3 @@
 dependencies {
-	classpath 'com.dynatrace.tools.android:gradle-plugin:8.331.1.1004'
+	classpath 'com.dynatrace.tools.android:gradle-plugin:8.335.1.1001'
 }

package/networking/NativeNetworkInterceptorUtils.js

@@ -33,7 +33,7 @@ var getReferer = function (actionId) {
 };
 var patchPageContext = function (pcCookie, actionId) {
     if (pcCookie != null && pcCookie.length > 0) {
-        var groups = pcCookie.match(/(.+)[h](.+)[v](.+)/);
+        var groups = pcCookie.match(/^([^h]+)h([^v]+)v(.+)$/);
         if (groups != null && groups.length === 4) {
             return "".concat(groups[1], "h").concat(actionId, "v").concat(groups[3]);
         }
@@ -46,7 +46,7 @@ var patchPageContext = function (pcCookie, actionId) {
 var getApplicationId = function () { return typeof dT_ !== 'undefined' && typeof dT_.scv !== 'undefined' ? dT_.scv('app') : ''; };
 var getSessionNumber = function (dtCookie) {
     if (dtCookie !== undefined) {
-        var groups = dtCookie.match(/v_(.+)_srv_(.+)_sn_(.+?)[_](.+)/);
+        var groups = dtCookie.match(/^v_([^_]+)_srv_([^_]+)_sn_([^_]+)_(.+)$/);
         if (groups != null && groups.length === 5) {
             return "v_".concat(groups[1], "_srv_").concat(groups[2], "_sn_").concat(groups[3]);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/cordova-plugin",
-  "version": "2.331.1",
+  "version": "2.335.1",
   "description": "This plugin gives you the ability to use the Dynatrace instrumentation in your hybrid application (Cordova, Ionic, ..). It uses the Mobile Agent, the JavaScript Agent. The Mobile Agent will give you all device specific values containing lifecycle information and the Javascript Agent will allow you to manually instrument your JavaScript/TypeScript code out of the box (Typescript definitions included). The JavaScript Agent will cover the network calls and will automatically detect them.",
   "cordova": {
     "id": "@dynatrace/cordova-plugin",
@@ -40,7 +40,7 @@
   "homepage": "https://www.dynatrace.com/",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "axios": "^1.13.5",
+    "axios": "^1.15.0",
     "jsdom": "^27.0.0",
     "plist": "^3.1.0"
   },

package/plugin.xml

@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     id="@dynatrace/cordova-plugin"
-    version="2.331.1">
+    version="2.335.1">
     <name>Dynatrace</name>
     <description>Dynatrace Cordova Plugin</description>
 
@@ -41,7 +41,7 @@
         <source-file src="other/DynatraceCordovaPlugin.m"/>
     </platform>
 	<platform name="android">
-        <framework src="com.dynatrace.agent:agent-android:8.331.1.1004" />
+        <framework src="com.dynatrace.agent:agent-android:8.335.1.1001" />
 		<source-file src="other/DynatraceCordovaPlugin.java" target-dir="src/com/dynatrace/cordova/plugin" />
 	
 		<config-file target="config.xml" parent="/*">

package/scripts/helpers/FileHelper.js

@@ -67,7 +67,7 @@ var _searchFilePatternInDirectory = function (searchPath, foundFiles, pattern, f
         return [2, new Promise(function (resolve, reject) {
                 (0, fs_1.readdir)(searchPath, function (err, files) {
                     if (err) {
-                        reject('Directory could not be read: ' + (0, path_1.resolve)(searchPath));
+                        reject(new Error('Directory could not be read: ' + (0, path_1.resolve)(searchPath)));
                         return;
                     }
                     var promiseArr = [];
@@ -145,7 +145,7 @@ var readTextFromFile = function (_file) { return __awaiter(void 0, void 0, void
         return [2, new Promise(function (resolve, reject) {
                 (0, fs_1.readFile)(_file, 'utf8', function (err, data) {
                     if (err) {
-                        reject(err + 'Could not read the file: ' + (0, path_1.resolve)(_file));
+                        reject(new Error(err.message + ' Could not read the file: ' + (0, path_1.resolve)(_file)));
                     }
                     resolve(data);
                 });
@@ -158,7 +158,7 @@ var writeTextToFile = function (_file, _text) { return __awaiter(void 0, void 0,
         return [2, new Promise(function (resolve, reject) {
                 (0, fs_1.writeFile)(_file, _text, function (err) {
                     if (err) {
-                        reject(err + ' Could not write to file: ' + (0, path_1.resolve)(_file));
+                        reject(new Error(err.message + ' Could not write to file: ' + (0, path_1.resolve)(_file)));
                     }
                     resolve(_file);
                 });
@@ -238,7 +238,7 @@ exports.deleteDirectory = deleteDirectory;
 var deleteDirectorySync = function (dir) {
     (0, fs_1.accessSync)(dir);
     var files = (0, fs_1.readdirSync)(dir);
-    files.map(function (file) { return (0, exports.deleteFileSync)((0, path_1.join)(dir, file)); });
+    files.forEach(function (file) { return (0, exports.deleteFileSync)((0, path_1.join)(dir, file)); });
     (0, fs_1.rmdirSync)(dir);
 };
 var deleteFile = function (filePath) { return __awaiter(void 0, void 0, void 0, function () {

package/scripts/helpers/InstallHelper.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.moveIosFilesForSPM = exports.replacePackageSwiftWithOriginal = exports.isOptOut = exports.parsedNpmConfig = exports.parsedCapPackageJson = exports.parsedPluginPackageJson = exports.parsedApplicationPackageJson = exports.removeScriptHookAndDeps = exports.addScriptHook = exports.isCapVersionThreeOneOrHigher = exports.removePListModification = exports.removeGradleModification = exports.modifyPackageJsonCap = exports.CAP_HOOK = exports.IONIC_HOOK = void 0;
+exports.moveIosFilesForSPM = exports.replacePackageSwiftWithOriginal = exports.isOptOut = exports.parsedNpmConfig = exports.parsedCapPackageJson = exports.parsedPluginPackageJson = exports.parsedApplicationPackageJson = exports.removeScriptHookAndDeps = exports.addScriptHook = exports.removePListModification = exports.removeGradleModification = exports.modifyPackageJsonCap = exports.CAP_HOOK = exports.IONIC_HOOK = void 0;
 var path_1 = require("path");
 var fs_1 = require("fs");
 var Android_1 = require("../Android");
@@ -75,14 +75,9 @@ var modifyPackageJsonCap = function (install, isOptOut, path) { return __awaiter
                     if (packageJsonParsed.scripts === undefined) {
                         packageJsonParsed.scripts = {};
                     }
-                    if ((0, exports.isCapVersionThreeOneOrHigher)(capPackageJsonParsed)) {
-                        packageJsonParsed = (0, exports.addScriptHook)(packageJsonParsed, exports.CAP_HOOK, capHookValue);
-                        if (packageJsonParsed.scripts[exports.IONIC_HOOK] && packageJsonParsed.scripts[exports.CAP_HOOK]) {
-                            delete packageJsonParsed.scripts[exports.IONIC_HOOK];
-                        }
-                    }
-                    else {
-                        packageJsonParsed = (0, exports.addScriptHook)(packageJsonParsed, exports.IONIC_HOOK, capHookValue);
+                    packageJsonParsed = (0, exports.addScriptHook)(packageJsonParsed, exports.CAP_HOOK, capHookValue);
+                    if (packageJsonParsed.scripts[exports.IONIC_HOOK]) {
+                        delete packageJsonParsed.scripts[exports.IONIC_HOOK];
                     }
                 }
                 else {
@@ -167,11 +162,6 @@ var removePListModification = function () { return __awaiter(void 0, void 0, voi
     });
 }); };
 exports.removePListModification = removePListModification;
-var isCapVersionThreeOneOrHigher = function (packageJson) {
-    var version = packageJson.version;
-    return Number(version.substring(0, version.lastIndexOf('.'))) >= 3.1;
-};
-exports.isCapVersionThreeOneOrHigher = isCapVersionThreeOneOrHigher;
 var addScriptHook = function (packageJsonParsed, hook, value) {
     if (packageJsonParsed.scripts[hook] !== value) {
         packageJsonParsed.scripts[hook] = value;
@@ -226,7 +216,11 @@ var parsedCapPackageJson = function () { return __awaiter(void 0, void 0, void 0
 exports.parsedCapPackageJson = parsedCapPackageJson;
 var parsedNpmConfig = function () {
     try {
-        return JSON.parse((0, child_process_1.execSync)('npm config list --json').toString());
+        var npmBin = process.platform === 'win32'
+            ? (0, path_1.join)((0, path_1.dirname)(process.execPath), 'npm.cmd')
+            : (0, path_1.join)((0, path_1.dirname)(process.execPath), 'npm');
+        var result = (0, child_process_1.spawnSync)(npmBin, ['config', 'list', '--json'], { encoding: 'utf8' });
+        return JSON.parse(result.stdout);
     }
     catch (e) {
         Logger_1.Logger.getInstance().logWarning('Error in parsedNpmConfig => \n' + e + '\nUnable to retrieve npm config list!');

package/scripts/helpers/PathHelper.js

@@ -57,12 +57,7 @@ var getConfigFilePath = function () { return (0, path_1.join)(getApplicationPath
 exports.getConfigFilePath = getConfigFilePath;
 var getAndroidAssetsPath = function () {
     if (isCapacitorApp()) {
-        if ((0, fs_1.existsSync)((0, path_1.join)(getAndroidPathCapacitor(), FOLDER_ANDROID_APP, 'src', 'main', exports.FOLDER_ASSETS, 'public'))) {
-            return (0, path_1.join)(getAndroidPathCapacitor(), FOLDER_ANDROID_APP, 'src', 'main', exports.FOLDER_ASSETS, 'public');
-        }
-        else {
-            return (0, path_1.join)(getAndroidPathCapacitor(), FOLDER_ANDROID_APP, 'src', 'main', exports.FOLDER_ASSETS, 'public');
-        }
+        return getAndroidAssetsPathCapacitor();
     }
     else {
         if ((0, fs_1.existsSync)((0, path_1.join)(getAndroidPath(), exports.FOLDER_ASSETS, FOLDER_WWW))) {
@@ -120,14 +115,7 @@ var getIosPackageSwiftCapacitor = function () { return (0, path_1.join)(getIosSP
 exports.getIosPackageSwiftCapacitor = getIosPackageSwiftCapacitor;
 var getOriginalPackageSwiftCapacitor = function () { return (0, path_1.join)(getApplicationPath(), FOLDER_NODE_MODULES, '@dynatrace', 'cordova-plugin', FILE_PACKAGE_SWIFT_SPM); };
 exports.getOriginalPackageSwiftCapacitor = getOriginalPackageSwiftCapacitor;
-var getAndroidAssetsPathCapacitor = function () {
-    if ((0, fs_1.existsSync)((0, path_1.join)(getAndroidPathCapacitor(), FOLDER_ANDROID_APP, 'src', 'main', exports.FOLDER_ASSETS, 'public'))) {
-        return (0, path_1.join)(getAndroidPathCapacitor(), FOLDER_ANDROID_APP, 'src', 'main', exports.FOLDER_ASSETS, 'public');
-    }
-    else {
-        return (0, path_1.join)(getAndroidPathCapacitor(), FOLDER_ANDROID_APP, 'src', 'main', exports.FOLDER_ASSETS, 'public');
-    }
-};
+var getAndroidAssetsPathCapacitor = function () { return (0, path_1.join)(getAndroidPathCapacitor(), FOLDER_ANDROID_APP, 'src', 'main', exports.FOLDER_ASSETS, 'public'); };
 exports.getAndroidAssetsPathCapacitor = getAndroidAssetsPathCapacitor;
 var getIosAssetsPathCapacitor = function () {
     if ((0, fs_1.existsSync)((0, path_1.join)(getIosPathCapacitor(), 'public'))) {