fix(getScriptContent): 目前的搜索容易超时报错 #2049

pt-plugins · Nov 11, 2024 · b3fd592 · b3fd592
1 parent d0daff4
commit b3fd592
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 17 deletions.
diff --git a/src/background/pageParser.ts b/src/background/pageParser.ts
@@ -217,9 +217,11 @@ export class PageParser {
     if (script) {
       eval(script);
     } else {
-      APP.getScriptContent(path).done(script => {
+      APP.getScriptContent(path).then(script => {
         this.infoParserCache[path] = script;
         eval(script);
+      }).catch(error => {
+        console.error("Error loading script:", error);
       });
     }
 

diff --git a/src/background/searcher.ts b/src/background/searcher.ts
@@ -482,7 +482,7 @@ export class Searcher {
           if (!entry.parseScript) {
             this.service.debug("searchTorrent: getScriptContent", scriptPath);
             APP.getScriptContent(scriptPath)
-              .done((script: string) => {
+              .then((script: string) => {
                 this.service.debug(
                   "searchTorrent: getScriptContent done",
                   scriptPath
@@ -526,7 +526,7 @@ export class Searcher {
                     }
                   });
               })
-              .fail(error => {
+              .catch(error => {
                 this.service.debug(
                   "searchTorrent: getScriptContent fail",
                   error

diff --git a/src/background/user.ts b/src/background/user.ts
@@ -439,9 +439,11 @@ export class User {
     if (script) {
       eval(script);
     } else {
-      APP.getScriptContent(path).done(script => {
+      APP.getScriptContent(path).then(script => {
         this.infoParserCache[path] = script;
         eval(script);
+      }).catch(error => {
+        console.error("Error loading script:", error);
       });
     }
   }

diff --git a/src/service/api.ts b/src/service/api.ts
@@ -261,19 +261,29 @@ export const APP = {
    * 异步获取脚本内容
    * @param path 路径
    */
-  getScriptContent(path: string): JQueryXHR {
-    let url = `${API.host}/${path}`;
-    // 外部链接
-    if (path.substr(0, 4) === "http") {
-      url = path;
-    } else {
-      url = url.replace("resource//", "resource/");
-    }
-    APP.debugMode && console.log("getScriptContent", url);
-    return $.ajax({
-      url,
-      dataType: "text",
-      timeout: 60000 // Set timeout to 60 seconds (60000 milliseconds)
+  getScriptContent(path: string): Promise<string> {
+    return limit(() => {
+      return new Promise((resolve, reject) => {
+        let url = `${API.host}/${path}`;
+        // 外部链接
+        if (path.substr(0, 4) === "http") {
+          url = path;
+        } else {
+          url = url.replace("resource//", "resource/");
+        }
+        APP.debugMode && console.log("getScriptContent", url);
+        $.ajax({
+          url,
+          dataType: "text",
+          timeout: 30000 // Set timeout to 30 seconds (30000 milliseconds)
+        })
+          .done((result) => {
+            resolve(result);
+          })
+          .fail((jqXHR, status, text) => {
+            reject(status + ", " + text);
+          });
+      });
     });
   },
   /**