调整API输出结果

Author: cyfung1031

src/app/service/content/gm_api/gm_api.ts

@@ -1385,24 +1385,26 @@ export default class GMApi extends GM_Base {
   }
 
   @GMContext.API({ alias: "GM_runExclusive" })
-  ["GM.runExclusive"](lockKey: string, cb: (...args: any) => any, timeout: number = -1) {
+  ["GM.runExclusive"]<T>(lockKey: string, cb: () => T | PromiseLike<T>, timeout: number = -1): Promise<T> {
     lockKey = `${lockKey}`; // 转化为字串
     if (!lockKey || !this.scriptRes) {
-      throw new Error("Invalid Calling");
+      throw new Error("GM.runExclusive: Invalid Calling");
     }
     const key = `${getStorageName(this.scriptRes).replace(/:/g, ":_")}::${lockKey.replace(/:/g, ":_")}`;
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
       let killConn: (() => any) | null | undefined = undefined;
       let error: any;
       let result: any;
       let done = false;
       const onDisconnected = () => {
         killConn = null; // before resolve, set disconnectFn to null
-        resolve({
-          result,
-          error,
-          done,
-        });
+        if (error) {
+          reject(error);
+        } else if (!done) {
+          reject(new Error("GM.runExclusive: Incomplete Action"));
+        } else {
+          resolve(result);
+        }
       };
       const onStart = async (con: MessageConnect) => {
         try {
@@ -1438,7 +1440,7 @@ export default class GMApi extends GM_Base {
       });
       if (timeout > 0) {
         setTimeout(() => {
-          error = new Error("timeout");
+          error = new Error("GM.runExclusive: Timeout Error");
           killConn?.();
           onDisconnected(); // in case .disconnect() not working
         }, timeout);