@whitesev/utils 2.11.0 → 2.11.2

package/dist/index.esm.js

@@ -237,7 +237,7 @@ const clearTimeout$1 = (timerId) => loadOrReturnBroker().clearTimeout(timerId);
 const setInterval$1 = (...args) => loadOrReturnBroker().setInterval(...args);
 const setTimeout$1 = (...args) => loadOrReturnBroker().setTimeout(...args);
 
-const version = "2.11.0";
+const version = "2.11.2";
 
 /* eslint-disable */
 // ==UserScript==
@@ -7989,9 +7989,22 @@ class Utils {
             return result;
         }
         else {
-            return Array.from(uniqueArrayData).filter((item) => !Array.from(compareArrayData).some(function (item2) {
-                return compareFun(item, item2);
-            }));
+            const compareSet = new Set(compareArrayData);
+            const result = [];
+            for (let i = 0; i < uniqueArrayData.length; i++) {
+                const item = uniqueArrayData[i];
+                let flag = false;
+                for (const compareItem of compareSet) {
+                    if (compareFun(item, compareItem)) {
+                        flag = true;
+                        break;
+                    }
+                }
+                if (!flag) {
+                    result.push(item);
+                }
+            }
+            return result;
         }
     }
     /**
@@ -8371,10 +8384,13 @@ class Utils {
     }
     /**
      * 判断页面中是否存在`worker-src`的CSP规则
+     * @param timeout 超时时间，默认为`1500ms`
      */
-    hasWorkerCSP() {
+    hasWorkerCSP(timeout = 1500) {
         return new Promise((resolve) => {
             let flag = true;
+            let timeId = void 0;
+            let worker = void 0;
             let workerBlobUrl = void 0;
             const workerJs = /*js*/ `
 (() => {
@@ -8390,11 +8406,26 @@ class Utils {
     }
     );
 })();`;
+            /**
+             * 返回结果
+             */
+            const finishCallBack = () => {
+                clearTimeout(timeId);
+                if (worker != null) {
+                    worker.terminate();
+                }
+                // 释放
+                if (typeof workerBlobUrl === "string") {
+                    globalThis.URL.revokeObjectURL(workerBlobUrl);
+                    workerBlobUrl = void 0;
+                }
+                resolve(flag);
+            };
             try {
                 const workerScript = new Blob([workerJs], {
                     type: "application/javascript",
                 });
-                workerBlobUrl = window.URL.createObjectURL(workerScript);
+                workerBlobUrl = globalThis.URL.createObjectURL(workerScript);
                 // @ts-expect-error
                 if (globalThis.trustedTypes && typeof globalThis.trustedTypes.createPolicy === "function") {
                     // 使用这个后虽然不报错，但是仍会有blob错误
@@ -8406,25 +8437,27 @@ class Utils {
                     });
                     workerBlobUrl = workerPolicy.createScriptURL(workerBlobUrl);
                 }
-                const worker = new Worker(workerBlobUrl);
+                worker = new Worker(workerBlobUrl);
                 worker.onmessage = (data) => {
                     if (data.data.success) {
                         flag = false;
+                        finishCallBack();
                     }
                 };
-                setTimeout(() => {
-                    worker.terminate();
-                    resolve(flag);
-                }, 500);
+                timeId = setTimeout(() => {
+                    finishCallBack();
+                }, timeout);
                 worker.postMessage("test");
             }
             catch {
                 flag = true;
+                finishCallBack();
             }
             finally {
                 // 释放
                 if (typeof workerBlobUrl === "string") {
                     globalThis.URL.revokeObjectURL(workerBlobUrl);
+                    workerBlobUrl = void 0;
                 }
             }
         });