git: fix conflict

ilyhalight · Jan 9, 2025 · 3ce13ce · 3ce13ce
2 parents 36ab540 + bbc65e6
commit 3ce13ce
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/dist/vot-min.user.js b/dist/vot-min.user.js
diff --git a/dist/vot.user.js b/dist/vot.user.js
@@ -2580,17 +2580,21 @@ async function GM_fetch(url, opts = {}) {
         timeout,
         headers: Object.fromEntries(new Headers(fetchOptions.headers || {})),
         onload: (resp) => {
+          const headers = {};
+          resp.responseHeaders
+            .trim()
+            .split(/\r?\n/)
+            .forEach((line) => {
+              const [name, value] = line.split(/:\s*/);
+              if (name && value) {
+                headers[name.trim()] = value.trim();
+              }
+            });
+
           resolve(
             new Response(resp.response, {
               status: resp.status,
-              headers: new Headers(
-                Object.fromEntries(
-                  resp.responseHeaders
-                    .trim()
-                    .split(/\r?\n/)
-                    .map((line) => line.split(/:\s*/)),
-                ),
-              ),
+              headers: new Headers(headers),
             }),
           );
         },

diff --git a/src/utils/utils.js b/src/utils/utils.js
@@ -139,17 +139,21 @@ async function GM_fetch(url, opts = {}) {
         timeout,
         headers: Object.fromEntries(new Headers(fetchOptions.headers || {})),
         onload: (resp) => {
+          const headers = {};
+          resp.responseHeaders
+            .trim()
+            .split(/\r?\n/)
+            .forEach((line) => {
+              const [name, value] = line.split(/:\s*/);
+              if (name && value) {
+                headers[name.trim()] = value.trim();
+              }
+            });
+
           resolve(
             new Response(resp.response, {
               status: resp.status,
-              headers: new Headers(
-                Object.fromEntries(
-                  resp.responseHeaders
-                    .trim()
-                    .split(/\r?\n/)
-                    .map((line) => line.split(/:\s*/)),
-                ),
-              ),
+              headers: new Headers(headers),
             }),
           );
         },