@whitesev/pops 3.2.2 → 3.3.0

package/dist/types/src/PopsCore.d.ts

@@ -1,19 +1,27 @@
-declare const PopsCoreDefaultEnv: {
+declare const OriginPrototype: {
+    Object: {
+        defineProperty: <T>(o: T, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => T;
+    };
+};
+declare const PopsCoreDefaultApi: {
     document: Document;
     window: Window & typeof globalThis;
     globalThis: typeof globalThis;
     self: Window & typeof globalThis;
+    setTimeout: typeof setTimeout;
+    setInterval: typeof setInterval;
+    clearTimeout: typeof clearTimeout;
+    clearInterval: typeof clearInterval;
 };
 declare const PopsCore: {
-    init(option?: typeof PopsCoreDefaultEnv): void;
+    init(option?: typeof PopsCoreDefaultApi): void;
     readonly document: Document;
     readonly window: Window & typeof globalThis;
     readonly globalThis: typeof globalThis;
     readonly self: Window & typeof globalThis;
-};
-declare const OriginPrototype: {
-    Object: {
-        defineProperty: <T>(o: T, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => T;
-    };
+    readonly setTimeout: typeof setTimeout;
+    readonly setInterval: typeof setInterval;
+    readonly clearTimeout: typeof clearTimeout;
+    readonly clearInterval: typeof clearInterval;
 };
 export { PopsCore, OriginPrototype };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@whitesev/pops",
-  "version": "3.2.2",
-  "description": "弹窗库，包含了alert、confirm、prompt、drawer、loading、iframe、rightClickMenu等组件",
+  "version": "3.3.0",
+  "description": "弹窗库，包含了alert、confirm、prompt、drawer、folder、loading、iframe、panel、tooltip、searchSuggestion、rightClickMenu组件",
   "keywords": [
     "ScriptCat",
     "TamperMonkey",
@@ -40,8 +40,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "any-touch": "^2.2.0",
-    "worker-timers": "8.0.30"
+    "any-touch": "^2.2.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.2",

package/src/PopsCore.ts

@@ -1,36 +1,52 @@
-const PopsCoreDefaultEnv = {
+const OriginPrototype = {
+  Object: {
+    defineProperty: Object.defineProperty,
+  },
+};
+
+const PopsCoreDefaultApi = {
   document: document,
   window: window,
   globalThis: globalThis,
   self: self,
+  setTimeout: globalThis.setTimeout.bind(globalThis),
+  setInterval: globalThis.setInterval.bind(globalThis),
+  clearTimeout: globalThis.clearTimeout.bind(globalThis),
+  clearInterval: globalThis.clearInterval.bind(globalThis),
 };
 
-const PopsCoreEnv = Object.assign({}, PopsCoreDefaultEnv);
+const PopsCoreApi = Object.assign({}, PopsCoreDefaultApi);
 
 const PopsCore = {
-  init(option?: typeof PopsCoreDefaultEnv) {
+  init(option?: typeof PopsCoreDefaultApi) {
     if (!option) {
-      option = Object.assign({}, PopsCoreDefaultEnv);
+      option = Object.assign({}, PopsCoreDefaultApi);
     }
-    Object.assign(PopsCoreEnv, option);
+    Object.assign(PopsCoreApi, option);
   },
   get document() {
-    return PopsCoreEnv.document;
+    return PopsCoreApi.document;
   },
   get window() {
-    return PopsCoreEnv.window;
+    return PopsCoreApi.window;
   },
   get globalThis() {
-    return PopsCoreEnv.globalThis;
+    return PopsCoreApi.globalThis;
   },
   get self() {
-    return PopsCoreEnv.self;
+    return PopsCoreApi.self;
   },
-};
-
-const OriginPrototype = {
-  Object: {
-    defineProperty: Object.defineProperty,
+  get setTimeout() {
+    return PopsCoreApi.setTimeout;
+  },
+  get setInterval() {
+    return PopsCoreApi.setInterval;
+  },
+  get clearTimeout() {
+    return PopsCoreApi.clearTimeout;
+  },
+  get clearInterval() {
+    return PopsCoreApi.clearInterval;
   },
 };
 

package/src/utils/PopsUtils.ts

@@ -1,11 +1,5 @@
 import { PopsCore } from "../PopsCore";
 import type { PopsUtilsOwnObject } from "../types/main";
-import {
-  clearInterval as WorkerClearInterval,
-  clearTimeout as WorkerClearTimeout,
-  setInterval as WorkerSetInterval,
-  setTimeout as WorkerSetTimeout,
-} from "worker-timers";
 import AnyTouch from "any-touch";
 
 class PopsUtils {
@@ -356,49 +350,25 @@ class PopsUtils {
    * 自动使用 Worker 执行 setTimeout
    */
   setTimeout(callback: (...args: any[]) => any, timeout: number = 0) {
-    try {
-      return WorkerSetTimeout(callback, timeout);
-    } catch {
-      return setTimeout(callback, timeout);
-    }
+    return PopsCore.setTimeout(callback, timeout);
   }
   /**
    * 配合 .setTimeout 使用
    */
   clearTimeout(timeId: number | undefined) {
-    try {
-      if (timeId != null) {
-        WorkerClearTimeout(timeId);
-      }
-    } catch {
-      // TODO
-    } finally {
-      clearTimeout(timeId);
-    }
+    return PopsCore.clearTimeout(timeId);
   }
   /**
    * 自动使用 Worker 执行 setInterval
    */
   setInterval(callback: (...args: any[]) => any, timeout: number = 0) {
-    try {
-      return WorkerSetInterval(callback, timeout);
-    } catch {
-      return setInterval(callback, timeout);
-    }
+    return PopsCore.setInterval(callback, timeout);
   }
   /**
    * 配合 .setInterval 使用
    */
   clearInterval(timeId: number | undefined) {
-    try {
-      if (timeId != null) {
-        WorkerClearInterval(timeId);
-      }
-    } catch {
-      // 忽略
-    } finally {
-      clearInterval(timeId);
-    }
+    return PopsCore.clearInterval(timeId);
   }
   /**
    * 覆盖对象中的数组新值