@whitesev/utils 2.11.0 → 2.11.1

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.0";
+    const version = "2.11.1";
 
     /* eslint-disable */
     // ==UserScript==
@@ -8373,10 +8373,13 @@ define((function () { 'use strict';
         }
         /**
          * 判断页面中是否存在`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*/ `
 (() => {
@@ -8392,11 +8395,26 @@ define((function () { 'use strict';
     }
     );
 })();`;
+                /**
+                 * 返回结果
+                 */
+                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错误
@@ -8408,25 +8426,27 @@ define((function () { 'use strict';
                         });
                         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;
                     }
                 }
             });