@whitesev/utils 2.11.10 → 2.11.12

package/dist/index.amd.js

@@ -239,7 +239,7 @@ define((function () { 'use strict';
     const setInterval$1 = (...args) => loadOrReturnBroker().setInterval(...args);
     const setTimeout$1 = (...args) => loadOrReturnBroker().setTimeout(...args);
 
-    const version = "2.11.10";
+    const version = "2.11.12";
 
     /* eslint-disable */
     // ==UserScript==
@@ -374,8 +374,12 @@ define((function () { 'use strict';
                     }));
             }
             waitForRequestKeys() {
+                /**
+                 * @type {Set<typeof hookInst>}
+                 */
+                const winHookInsts = win.__ajaxHooker.hookInsts;
                 if (!this.request.async) {
-                    win.__ajaxHooker.hookInsts.forEach(({ hookFns, filters }) => {
+                    winHookInsts.forEach(({ hookFns, filters }) => {
                         if (this.shouldFilter(filters))
                             return;
                         hookFns.forEach((fn) => {
@@ -391,10 +395,10 @@ define((function () { 'use strict';
                 }
                 const promises = [];
                 const ignoreKeys = new Set(["type", "async", "response"]);
-                win.__ajaxHooker.hookInsts.forEach(({ hookFns, filters }) => {
+                winHookInsts.forEach(({ hookFns, filters }) => {
                     if (this.shouldFilter(filters))
                         return;
-                    promises.push(Promise.all(hookFns.map((fn) => catchError(fn, this.request))).then(() => {
+                    promises.push(Promise.all(hookFns.map((fn, index) => catchError(fn, this.request, index))).then(() => {
                         const requestKeys = [];
                         for (const key in this.request)
                             !ignoreKeys.has(key) && requestKeys.push(key);
@@ -816,11 +820,52 @@ define((function () { 'use strict';
                 });
             });
         }
+        /**
+         *
+         * @type {import("./../types/ajaxHooker.d.ts").UtilsAjaxHookResult["removeHook"]}
+         */
+        const removeHook = (fn, onlyRemove = false) => {
+            let flag = false;
+            for (let index = hookInst.hookFns.length - 1; index >= 0; index--) {
+                const __fn__ = hookInst.hookFns[index];
+                if (fn === __fn__) {
+                    hookInst.hookFns.splice(index, 1);
+                    flag = true;
+                    if (onlyRemove) {
+                        break;
+                    }
+                }
+            }
+            return flag;
+        };
+        /**
+         *
+         * @type {import("./../types/ajaxHooker.d.ts").UtilsAjaxHookResult["removeFilter"]}
+         */
+        const removeFilter = () => {
+            if (Array.isArray(hookInst.filters)) {
+                hookInst.filters.length = 0;
+            }
+            else {
+                hookInst.filters = [];
+            }
+        };
         return {
-            hook: (fn) => hookInst.hookFns.push(fn),
+            hook: (fn) => {
+                hookInst.hookFns.push(fn);
+                return {
+                    remove: () => {
+                        return removeHook(fn, true);
+                    }
+                };
+            },
             filter: (arr) => {
-                if (Array.isArray(arr))
+                if (Array.isArray(arr)) {
                     hookInst.filters = arr;
+                }
+                return {
+                    remove: removeFilter
+                };
             },
             protect: () => {
                 readonly(win, "XMLHttpRequest", winAh.fakeXHR);
@@ -836,6 +881,8 @@ define((function () { 'use strict';
                     delete win.__ajaxHooker;
                 }
             },
+            removeHook: removeHook,
+            removeFilter: removeFilter
         };
     };
 
@@ -1234,10 +1281,50 @@ define((function () { 'use strict';
             Object.keys(realXhr).forEach((key) => (fakeXhr[key] = realXhr[key]));
             fakeXhr.prototype = realXhr.prototype;
             win.fetch = fakeFetch;
+            /**
+             *
+             * @type {import("./../types/ajaxHooker.d.ts").UtilsAjaxHookResult["removeHook"]}
+             */
+            const removeHook = (fn, onlyRemove = false) => {
+                let flag = false;
+                for (let index = hookFns.length - 1; index >= 0; index--) {
+                    const __fn__ = hookFns[index];
+                    if (fn === __fn__) {
+                        hookFns.splice(index, 1);
+                        flag = true;
+                        if (onlyRemove) {
+                            break;
+                        }
+                    }
+                }
+                return flag;
+            };
+            /**
+             *
+             * @type {import("./../types/ajaxHooker.d.ts").UtilsAjaxHookResult["removeFilter"]}
+             */
+            const removeFilter = () => {
+                if (Array.isArray(filter)) {
+                    filter.length = 0;
+                }
+                else {
+                    filter = void 0;
+                }
+            };
             return {
-                hook: (fn) => hookFns.push(fn),
+                hook: (fn) => {
+                    hookFns.push(fn);
+                    return {
+                        remove: () => {
+                            return removeHook(fn, true);
+                        }
+                    };
+                },
                 filter: (arr) => {
                     filter = Array.isArray(arr) && arr.map(toFilterObj);
+                    return {
+                        remove: removeFilter
+                    };
                 },
                 protect: () => {
                     readonly(win, "XMLHttpRequest", fakeXhr);
@@ -1247,6 +1334,8 @@ define((function () { 'use strict';
                     writable(win, "XMLHttpRequest", realXhr);
                     writable(win, "fetch", realFetch);
                 },
+                removeHook: removeHook,
+                removeFilter: removeFilter
             };
         })();
     };
@@ -2671,42 +2760,42 @@ define((function () { 'use strict';
                         const method = requestOption.method;
                         if (method === "GET" || method === "HEAD") {
                             // GET类型，data如果有，那么需要转为searchParams
-                            const urlObj = new URL(requestOption.url);
+                            const urlInst = new URL(requestOption.url);
                             let urlSearch = "";
-                            let isHandler = false;
+                            let deleteData = false;
                             if (typeof requestOption.data === "string") {
-                                isHandler = true;
+                                deleteData = true;
                                 urlSearch = requestOption.data;
                             }
                             else if (typeof requestOption.data === "object") {
-                                isHandler = true;
+                                deleteData = true;
                                 // URLSearchParams参数可以转普通的string:string，包括FormData
                                 const searchParams = new URLSearchParams(requestOption.data);
                                 urlSearch = searchParams.toString();
                             }
-                            if (isHandler) {
+                            if (deleteData) {
                                 // GET/HEAD请求不支持data参数
                                 // 对data进行处理了才可以删除
                                 Reflect.deleteProperty(requestOption, "data");
                             }
-                            if (urlSearch != "") {
-                                if (urlObj.search === "") {
+                            if (urlSearch.trim() != "") {
+                                if (urlInst.search.trim() === "") {
                                     // url没有search参数，直接覆盖
-                                    urlObj.search = urlSearch;
+                                    urlInst.search = urlSearch;
                                 }
                                 else {
                                     // 有search参数
-                                    if (urlObj.search.endsWith("&")) {
+                                    if (urlInst.search.trim().endsWith("&")) {
                                         // xxx=xxx&
-                                        urlObj.search = urlObj.search + urlSearch;
+                                        urlInst.search = urlInst.search + urlSearch;
                                     }
                                     else {
                                         // xxx=xxx&xxx=
-                                        urlObj.search = `${urlObj.search}&${urlSearch}`;
+                                        urlInst.search = `${urlInst.search}&${urlSearch}`;
                                     }
                                 }
                             }
-                            requestOption.url = urlObj.toString();
+                            requestOption.url = urlInst.toString();
                         }
                         else if (method === "POST" && requestOption.headers != null) {
                             // POST类型，data如果是FormData，那么需要转为string
@@ -2716,10 +2805,10 @@ define((function () { 'use strict';
                                     typeof requestOption.headers[headerKey] === "string");
                             });
                             if (ContentTypeIndex !== -1) {
-                                const ContentTypeKey = headersKeyList[ContentTypeIndex];
-                                const ContentType = requestOption.headers[ContentTypeKey];
+                                const contentTypeKey = headersKeyList[ContentTypeIndex];
+                                const contentType = requestOption.headers[contentTypeKey].toLowerCase();
                                 // 设置了Content-Type
-                                if (ContentType.includes("application/json")) {
+                                if (contentType.includes("application/json")) {
                                     // application/json
                                     if (requestOption.data instanceof FormData) {
                                         const entries = {};
@@ -2732,16 +2821,16 @@ define((function () { 'use strict';
                                         requestOption.data = JSON.stringify(requestOption.data);
                                     }
                                 }
-                                else if (ContentType.includes("application/x-www-form-urlencoded")) {
+                                else if (contentType.includes("application/x-www-form-urlencoded")) {
                                     // application/x-www-form-urlencoded
                                     if (typeof requestOption.data === "object") {
                                         requestOption.data = new URLSearchParams(requestOption.data).toString();
                                     }
                                 }
-                                else if (ContentType.includes("multipart/form-data")) {
+                                else if (contentType.includes("multipart/form-data")) {
                                     // multipart/form-data
                                     if (requestOption.data instanceof FormData) {
-                                        Reflect.deleteProperty(requestOption.headers, ContentTypeKey);
+                                        Reflect.deleteProperty(requestOption.headers, contentTypeKey);
                                     }
                                 }
                             }
@@ -5699,20 +5788,25 @@ define((function () { 'use strict';
         }
         /**
          * ajax劫持库，支持xhr和fetch劫持。
-         * + 来源：https://bbs.tampermonkey.net.cn/thread-3284-1-1.html
-         * + 作者：cxxjackie
-         * + 版本：1.4.8
-         * + 旧版本：1.2.4
-         * + 文档：https://scriptcat.org/zh-CN/script-show-page/637/
-         * @param useOldVersion 是否使用旧版本，默认false
-         */
-        ajaxHooker = (useOldVersion = false) => {
-            if (useOldVersion) {
-                return AjaxHooker1_2_4();
-            }
-            else {
-                return ajaxHooker();
-            }
+         * + 来源: https://bbs.tampermonkey.net.cn/thread-3284-1-1.html
+         * + 作者: cxxjackie
+         * + 实现方式: Proxy
+         * + 版本: `1.4.8`
+         * + 文档: https://scriptcat.org/zh-CN/script-show-page/637/
+         */
+        ajaxHooker = () => {
+            return ajaxHooker();
+        };
+        /**
+         * ajax劫持库，支持xhr和fetch劫持。
+         * + 来源: https://bbs.tampermonkey.net.cn/thread-3284-1-1.html
+         * + 作者: cxxjackie
+         * + 实现方式: Object.defineProperty
+         * + 版本: `1.2.4`
+         * + 文档: https://scriptcat.org/zh-CN/script-show-page/637/
+         */
+        oldAjaxHooker = () => {
+            return AjaxHooker1_2_4();
         };
         canvasClickByPosition(canvasElement, clientX = 0, clientY = 0, view = this.windowApi.window) {
             if (!(canvasElement instanceof HTMLCanvasElement)) {
@@ -6306,10 +6400,11 @@ define((function () { 'use strict';
                         left: maxRect.left,
                     };
                 }
-                let calcZIndex = zIndex + deviation;
+                const calcZIndex = zIndex + deviation;
                 if (calcZIndex >= maxZIndexCompare) {
                     // 不要超过最大值
-                    calcZIndex = maxZIndexCompare;
+                    // 超过就忽略
+                    return;
                 }
                 return {
                     /** 计算偏移量后的z-index值 */
@@ -7236,6 +7331,26 @@ define((function () { 'use strict';
             }
             return content;
         }
+        /**
+         * 监听页面元素改变并处理
+         * @param target 需要监听的元素，如果不存在，可以等待它出现
+         * @param observer_config MutationObserver的配置
+         * @example
+          Utils.mutationObserver(document.querySelector("div.xxxx"),{
+            "callback":(mutations, observer)=>{},
+            "config":{childList:true,attributes:true}
+          });
+          * @example
+          Utils.mutationObserver(document.querySelectorAll("div.xxxx"),{
+            "callback":(mutations, observer)=>{},
+            "config":{childList:true,attributes:true}}
+          );
+          * @example
+          Utils.mutationObserver($("div.xxxx"),{
+          "callback":(mutations, observer)=>{},
+          "config":{childList:true,attributes:true}}
+          );
+          **/
         mutationObserver(target, observer_config) {
             const that = this;
             const default_obverser_config = {
@@ -7278,16 +7393,24 @@ define((function () { 'use strict';
                     characterDataOldValue: void 0,
                 },
                 immediate: false,
+                once: false,
             };
             observer_config = that.assign(default_obverser_config, observer_config);
             const windowMutationObserver = this.windowApi.window.MutationObserver ||
                 this.windowApi.window.webkitMutationObserver ||
                 this.windowApi.window.MozMutationObserver;
             // 观察者对象
-            const mutationObserver = new windowMutationObserver(function (mutations, observer) {
+            const handler = (mutations, observer) => {
+                if (observer_config.once) {
+                    // 仅触发一次
+                    observer.disconnect();
+                }
                 if (typeof observer_config.callback === "function") {
                     observer_config.callback(mutations, observer);
                 }
+            };
+            const mutationObserver = new windowMutationObserver(function (mutations, observer) {
+                handler(mutations, observer);
             });
             if (Array.isArray(target) || target instanceof NodeList) {
                 // 传入的是数组或者元素数组
@@ -7296,7 +7419,7 @@ define((function () { 'use strict';
                 });
             }
             else if (that.isJQuery(target)) {
-                /* 传入的参数是jQuery对象 */
+                // 传入的参数是jQuery对象
                 target.each((_, item) => {
                     mutationObserver.observe(item, observer_config.config);
                 });
@@ -7305,16 +7428,14 @@ define((function () { 'use strict';
                 mutationObserver.observe(target, observer_config.config);
             }
             if (observer_config.immediate) {
-                /* 主动触发一次 */
-                if (typeof observer_config.callback === "function") {
-                    observer_config.callback([], mutationObserver);
-                }
+                // 主动触发一次
+                handler([], mutationObserver);
             }
             return mutationObserver;
         }
         /**
          * 使用观察器观察元素出现在视图内，出现的话触发回调
-         * @param target 目标元素
+         * @param $el 目标元素
          * @param callback 触发的回调
          * @param options 观察器配置
          * @example
@@ -7322,34 +7443,47 @@ define((function () { 'use strict';
          *     console.log("该元素出现在视图内");
          * }))
          */
-        mutationVisible(target, callback, options) {
+        mutationVisible($el, callback, options) {
             if (typeof IntersectionObserver === "undefined") {
                 throw new TypeError("IntersectionObserver is not defined");
             }
-            if (target == null) {
+            if ($el == null) {
                 throw new TypeError("mutatuinVisible target is null");
             }
+            options = options || {};
             let defaultOptions = {
                 root: null,
                 rootMargin: "0px 0px 0px 0px",
                 threshold: [0.01, 0.99],
             };
-            defaultOptions = this.assign(defaultOptions, options || {});
+            defaultOptions = this.assign(defaultOptions, options);
+            const handler = (entries, observer) => {
+                if (options.once) {
+                    // 仅触发一次
+                    observer.disconnect();
+                }
+                if (typeof callback === "function") {
+                    callback(entries, observer);
+                }
+            };
             const intersectionObserver = new IntersectionObserver((entries, observer) => {
                 if (entries[0].isIntersecting) {
-                    if (typeof callback === "function") {
-                        callback(entries, observer);
-                    }
+                    handler(entries, observer);
                 }
             }, defaultOptions);
-            if (Array.isArray(target)) {
-                target.forEach((item) => {
-                    intersectionObserver.observe(item);
+            if (Array.isArray($el)) {
+                $el.forEach(($elItem) => {
+                    intersectionObserver.observe($elItem);
                 });
             }
             else {
-                intersectionObserver.observe(target);
+                intersectionObserver.observe($el);
             }
+            if (options.immediate) {
+                // 立即触发
+                handler([], intersectionObserver);
+            }
+            return intersectionObserver;
         }
         /**
          * 去除全局window下的Utils，返回控制权
@@ -8138,12 +8272,25 @@ define((function () { 'use strict';
         }
         /**
          * 将UrlSearchParams格式的字符串转为对象
+         * @param searhParamsStr 字符串或对象
+         * @example
+         * Utils.searchParamStrToObj("xxx=xx&xx2=xx2")
+         * @example
+         * Utils.searchParamStrToObj(new URLSearchParams({
+         *   test1: 1,
+         *   test2: 2
+         * }))
          */
         searchParamStrToObj(searhParamsStr) {
-            if (typeof searhParamsStr !== "string") {
-                return {};
+            const params = {};
+            if (searhParamsStr == null) {
+                return params;
             }
-            return Object.fromEntries(new URLSearchParams(searhParamsStr));
+            const urlSearchParams = searhParamsStr instanceof URLSearchParams ? searhParamsStr : new URLSearchParams(searhParamsStr);
+            urlSearchParams.forEach((value, key) => {
+                Reflect.set(params, key, value);
+            });
+            return params;
         }
         /**
          * 提供一个封装了 try-catch 的函数，可以执行传入的函数并捕获其可能抛出的错误，并通过传入的错误处理函数进行处理。