async fetch

Author: max-ostapenko

dist/privacy.js

@@ -30,15 +30,15 @@ function testPropertyStringInResponseBodies(pattern) {
    * @param {function} parser - The function to parse the response.
    * @returns {Promise<Object>} The parsed response or an error object.
    */
-const fetchAndParse = (url, parser) => {
+const fetchAndParse = async (url, parser) => {
   const timeout = 5000;
   const controller = new AbortController();
   const { signal } = controller;
   setTimeout(() => controller.abort(), timeout);
 
   try {
-    const response = fetch(url, { signal });
-    return parser(response);
+    const response = await fetch(url, { signal });
+    return parser(url, await response);
   } catch (error) {
     return {
       status: -1,
@@ -53,9 +53,9 @@ const fetchAndParse = (url, parser) => {
  * @param {Response} response - The response object from the fetch request.
  * @returns {Promise<Object>} A promise that resolves to an object containing the parsed response data.
  */
-const parseDSRdelete = (response) => {
+const parseDSRdelete = (url, response) => {
   let result = {
-    present: response.ok && response.url.endsWith('/dsrdelete.json') && response.headers.get('content-type') === 'application/json',
+    present: response.ok && response.url.endsWith(url) && response.headers.get('content-type') === 'application/json',
     status: response.status,
   };
   Object.assign(result, result.present ? { redirected: response.redirected } : {});
@@ -75,7 +75,7 @@ const parseDSRdelete = (response) => {
     Object.assign(result, result.present ? { error: error.message } : {});
   }
 
-  return Promise.resolve(result);
+  return result;
 }
 
 let sync_metrics = {
@@ -388,7 +388,7 @@ let sync_metrics = {
   * IAB: Data Deletion Request Framework
   * https://github.com/InteractiveAdvertisingBureau/Data-Subject-Rights/blob/main/Data%20Deletion%20Request%20Framework.md
   */
-let iab_ddr = fetchAndParse("/.well-known/dsrdelete.json", parseDSRdelete);
+let iab_ddr = fetchAndParse("/dsrdelete.json", parseDSRdelete);
 
 return Promise.all([iab_ddr]).then(([iab_ddr]) => {
   return JSON.stringify({