@whitesev/utils 2.2.0 → 2.2.2

package/dist/index.cjs.js

@@ -2172,11 +2172,11 @@ class Httpx {
             }
             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);
             }
         },
         /**
@@ -2184,7 +2184,7 @@ class Httpx {
          * @param details
          */
         xmlHttpRequest(details) {
-            this.context.GM_Api.xmlHttpRequest(details);
+            return this.context.GM_Api.xmlHttpRequest(details);
         },
         /**
          * 使用fetch发送请求
@@ -2335,6 +2335,10 @@ class Httpx {
      * 当前使用请求时，输出请求的配置
      */
     #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");
@@ -2430,79 +2434,177 @@ class Httpx {
     }
     /**
      * 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;
     }
 }
 
@@ -3551,7 +3653,7 @@ class Utils {
         this.windowApi = new WindowApi(option);
     }
     /** 版本号 */
-    version = "2024.8.30";
+    version = "2024.9.4";
     addStyle(cssText) {
         if (typeof cssText !== "string") {
             throw new Error("Utils.addStyle 参数cssText 必须为String类型");
@@ -4935,6 +5037,19 @@ class Utils {
         return this.windowApi.globalThis.matchMedia("(prefers-color-scheme: dark)")
             .matches;
     }
+    /**
+     * 判断元素是否在页面中可见
+     * @param element 需要检查的元素，可以是普通元素|数组形式的元素|通过querySelectorAll获取的元素数组
+     * @param inView
+     * + true 在窗口可视区域
+     * + false 不在窗口可视区域
+     * @returns
+     * + true 可见
+     * + false 不可见
+     * @example
+     * Utils.isVisible(document.documentElement)
+     * > true
+     */
     isVisible(element, inView = false) {
         let needCheckDomList = [];
         if (element instanceof Array || element instanceof NodeList) {