fix: responseType问题和gm_xhr url的相对位置处理

scriptscat · Nov 22, 2021 · 288d751 · 288d751
1 parent 4d0e056
commit 288d751
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/apps/grant/background.ts b/src/apps/grant/background.ts
@@ -380,6 +380,7 @@ export class BackgroundGrant {
             responseType: config.responseType,
         };
         if (xhr.readyState === 4) {
+            console.log(xhr);
             if (config.responseType == "arraybuffer" || config.responseType == "blob") {
                 if (xhr.response instanceof ArrayBuffer) {
                     respond.response = URL.createObjectURL(new Blob([xhr.response]));
@@ -389,13 +390,11 @@ export class BackgroundGrant {
                 setTimeout(() => {
                     URL.revokeObjectURL(respond.response);
                 }, 60e3)
-            } else if (config.responseType == "json") {
+            } else {
                 try {
-                    respond.response = JSON.parse(xhr.response);
+                    respond.response = xhr.response;
                 } catch (e) {
                 }
-            } else {
-                respond.response = xhr.response;
             }
             try {
                 respond.responseText = xhr.responseText;
@@ -448,7 +447,7 @@ export class BackgroundGrant {
             let xhr = new XMLHttpRequest();
             xhr.open(config.method || 'GET', config.url, true, config.user || '', config.password || '');
             config.overrideMimeType && xhr.overrideMimeType(config.overrideMimeType);
-
+            xhr.responseType = config.responseType || '';
             let _this = this;
 
             function deal(event: string) {

diff --git a/src/apps/grant/frontend.ts b/src/apps/grant/frontend.ts
@@ -134,10 +134,11 @@ export class FrontendGrant implements ScriptContext {
 
     @FrontendGrant.GMFunction({ depend: ['CAT_fetchBlob'] })
     public async GM_xmlhttpRequest(details: GM_Types.XHRDetails) {
+        let u = new URL(details.url, window.location.href);
         let param: GM_Types.XHRDetails = {
             method: details.method,
             timeout: details.timeout,
-            url: details.url,
+            url: u.href,
             headers: details.headers || {},
             data: details.data,
             cookie: details.cookie,