@whitesev/utils 2.2.1 → 2.2.2

package/dist/index.umd.js

@@ -2176,11 +2176,11 @@
                 }
                 if (details.fetch) {
                     const { fetchDetails, fetchRequestInit, abortController } = this.context.HttpxRequestDetails.handleFetchDetail(details);
-                    this.fetch(fetchDetails, fetchRequestInit, abortController);
+                    return this.fetch(fetchDetails, fetchRequestInit, abortController);
                 }
                 else {
                     Reflect.deleteProperty(details, "fetchInit");
-                    this.xmlHttpRequest(details);
+                    return this.xmlHttpRequest(details);
                 }
             },
             /**
@@ -2188,7 +2188,7 @@
              * @param details
              */
             xmlHttpRequest(details) {
-                this.context.GM_Api.xmlHttpRequest(details);
+                return this.context.GM_Api.xmlHttpRequest(details);
             },
             /**
              * 使用fetch发送请求
@@ -2339,6 +2339,10 @@
          * 当前使用请求时，输出请求的配置
          */
         #LOG_DETAILS = false;
+        /**
+         * 实例化，可传入GM_xmlhttpRequest，未传入则使用window.fetch
+         * @param __xmlHttpRequest__
+         */
         constructor(__xmlHttpRequest__) {
             if (typeof __xmlHttpRequest__ !== "function") {
                 console.warn("Httpx未传入GM_xmlhttpRequest函数或传入的GM_xmlhttpRequest不是Function，强制使用window.fetch");
@@ -2434,79 +2438,177 @@
         }
         /**
          * GET 请求
+         * @param url 网址
+         * @param details 配置
          */
-        async get(...args) {
-            let that = this;
+        async get(...args // @ts-ignore
+        ) {
             let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-            return new Promise((resolve, reject) => {
-                let requestDetails = that.HttpxRequestDetails.getDetails("GET", details, resolve, reject);
+            let abortFn = null;
+            const promise = new Promise((resolve, reject) => {
+                let requestDetails = this.HttpxRequestDetails.getDetails("GET", details, resolve, reject);
                 Reflect.deleteProperty(requestDetails, "onprogress");
-                requestDetails = that.HttpxRequestDetails.handle(requestDetails);
-                that.HttpxRequest.request(requestDetails);
+                // @ts-ignore
+                requestDetails = this.HttpxRequestDetails.handle(requestDetails);
+                const requestResult = this.HttpxRequest.request(requestDetails);
+                if (requestResult != null &&
+                    typeof requestResult.abort === "function") {
+                    abortFn = requestResult.abort;
+                }
             });
+            Object.defineProperty(promise, "abort", {
+                value: () => {
+                    return () => {
+                        if (typeof abortFn === "function") {
+                            abortFn();
+                        }
+                    };
+                },
+            });
+            return promise;
         }
         /**
          * POST 请求
          */
-        async post(...args) {
-            let that = this;
+        async post(...args // @ts-ignore
+        ) {
             let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-            return new Promise((resolve, reject) => {
-                let requestDetails = that.HttpxRequestDetails.getDetails("POST", details, resolve, reject);
-                requestDetails = that.HttpxRequestDetails.handle(requestDetails);
-                that.HttpxRequest.request(requestDetails);
+            let abortFn = null;
+            const promise = new Promise((resolve, reject) => {
+                let requestDetails = this.HttpxRequestDetails.getDetails("POST", details, resolve, reject);
+                // @ts-ignore
+                requestDetails = this.HttpxRequestDetails.handle(requestDetails);
+                const requestResult = this.HttpxRequest.request(requestDetails);
+                if (requestResult != null &&
+                    typeof requestResult.abort === "function") {
+                    abortFn = requestResult.abort;
+                }
+            });
+            Object.defineProperty(promise, "abort", {
+                value: () => {
+                    return () => {
+                        if (typeof abortFn === "function") {
+                            abortFn();
+                        }
+                    };
+                },
             });
+            return promise;
         }
         /**
          * HEAD 请求
          */
-        async head(...args) {
-            let that = this;
+        async head(...args // @ts-ignore
+        ) {
             let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-            return new Promise((resolve, reject) => {
-                let requestDetails = that.HttpxRequestDetails.getDetails("HEAD", details, resolve, reject);
+            let abortFn = null;
+            const promise = new Promise((resolve, reject) => {
+                let requestDetails = this.HttpxRequestDetails.getDetails("HEAD", details, resolve, reject);
                 Reflect.deleteProperty(requestDetails, "onprogress");
-                requestDetails = that.HttpxRequestDetails.handle(requestDetails);
-                that.HttpxRequest.request(requestDetails);
+                // @ts-ignore
+                requestDetails = this.HttpxRequestDetails.handle(requestDetails);
+                const requestResult = this.HttpxRequest.request(requestDetails);
+                if (requestResult != null &&
+                    typeof requestResult.abort === "function") {
+                    abortFn = requestResult.abort;
+                }
+            });
+            Object.defineProperty(promise, "abort", {
+                value: () => {
+                    return () => {
+                        if (typeof abortFn === "function") {
+                            abortFn();
+                        }
+                    };
+                },
             });
+            return promise;
         }
         /**
          * OPTIONS 请求
          */
-        async options(...args) {
-            let that = this;
+        async options(...args // @ts-ignore
+        ) {
             let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-            return new Promise((resolve, reject) => {
-                let requestDetails = that.HttpxRequestDetails.getDetails("OPTIONS", details, resolve, reject);
+            let abortFn = null;
+            const promise = new Promise((resolve, reject) => {
+                let requestDetails = this.HttpxRequestDetails.getDetails("OPTIONS", details, resolve, reject);
                 Reflect.deleteProperty(requestDetails, "onprogress");
-                requestDetails = that.HttpxRequestDetails.handle(requestDetails);
-                that.HttpxRequest.request(requestDetails);
+                // @ts-ignore
+                requestDetails = this.HttpxRequestDetails.handle(requestDetails);
+                const requestResult = this.HttpxRequest.request(requestDetails);
+                if (requestResult != null &&
+                    typeof requestResult.abort === "function") {
+                    abortFn = requestResult.abort;
+                }
             });
+            Object.defineProperty(promise, "abort", {
+                value: () => {
+                    return () => {
+                        if (typeof abortFn === "function") {
+                            abortFn();
+                        }
+                    };
+                },
+            });
+            return promise;
         }
         /**
          * DELETE 请求
          */
-        async delete(...args) {
-            let that = this;
+        async delete(...args // @ts-ignore
+        ) {
             let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-            return new Promise((resolve, reject) => {
-                let requestDetails = that.HttpxRequestDetails.getDetails("DELETE", details, resolve, reject);
+            let abortFn = null;
+            const promise = new Promise((resolve, reject) => {
+                let requestDetails = this.HttpxRequestDetails.getDetails("DELETE", details, resolve, reject);
                 Reflect.deleteProperty(requestDetails, "onprogress");
-                requestDetails = that.HttpxRequestDetails.handle(requestDetails);
-                that.HttpxRequest.request(requestDetails);
+                // @ts-ignore
+                requestDetails = this.HttpxRequestDetails.handle(requestDetails);
+                const requestResult = this.HttpxRequest.request(requestDetails);
+                if (requestResult != null &&
+                    typeof requestResult.abort === "function") {
+                    abortFn = requestResult.abort;
+                }
             });
+            Object.defineProperty(promise, "abort", {
+                value: () => {
+                    return () => {
+                        if (typeof abortFn === "function") {
+                            abortFn();
+                        }
+                    };
+                },
+            });
+            return promise;
         }
         /**
          * PUT 请求
          */
-        async put(...args) {
-            let that = this;
+        async put(...args // @ts-ignore
+        ) {
             let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-            return new Promise((resolve, reject) => {
-                let requestDetails = that.HttpxRequestDetails.getDetails("PUT", details, resolve, reject);
-                requestDetails = that.HttpxRequestDetails.handle(requestDetails);
-                that.HttpxRequest.request(requestDetails);
+            let abortFn = null;
+            const promise = new Promise((resolve, reject) => {
+                let requestDetails = this.HttpxRequestDetails.getDetails("PUT", details, resolve, reject);
+                // @ts-ignore
+                requestDetails = this.HttpxRequestDetails.handle(requestDetails);
+                const requestResult = this.HttpxRequest.request(requestDetails);
+                if (requestResult != null &&
+                    typeof requestResult.abort === "function") {
+                    abortFn = requestResult.abort;
+                }
+            });
+            Object.defineProperty(promise, "abort", {
+                value: () => {
+                    return () => {
+                        if (typeof abortFn === "function") {
+                            abortFn();
+                        }
+                    };
+                },
             });
+            return promise;
         }
     }
 
@@ -3555,7 +3657,7 @@
             this.windowApi = new WindowApi(option);
         }
         /** 版本号 */
-        version = "2024.9.1";
+        version = "2024.9.4";
         addStyle(cssText) {
             if (typeof cssText !== "string") {
                 throw new Error("Utils.addStyle 参数cssText 必须为String类型");