@whitesev/utils 2.5.9 → 2.6.1

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

@@ -56,11 +56,12 @@ declare class Utils {
      * ajax劫持库，支持xhr和fetch劫持。
      * + 来源：https://bbs.tampermonkey.net.cn/thread-3284-1-1.html
      * + 作者：cxxjackie
-     * + 版本：1.4.3
+     * + 版本：1.4.4
+     * + 旧版本：1.2.4
      * + 文档：https://scriptcat.org/zh-CN/script-show-page/637/
      * @param useOldVersion 是否使用旧版本，默认false
      */
-    ajaxHooker: () => UtilsAjaxHookResult;
+    ajaxHooker: (useOldVersion?: boolean) => UtilsAjaxHookResult;
     /**
      * 根据坐标点击canvas元素的内部位置
      * @param canvasElement 画布元素

package/package.json

@@ -1,52 +1,52 @@
-{
-  "name": "@whitesev/utils",
-  "version": "2.5.9",
-  "description": "一个常用的工具库",
-  "main": "dist/index.cjs.js",
-  "module": "dist/index.esm.js",
-  "types": "dist/types/index.d.ts",
-  "jsdelivr": "dist/index.umd.js",
-  "exports": {
-    "./package.json": "./package.json",
-    "./dist/*": "./dist/*",
-    ".": {
-      "import": "./dist/index.esm.js",
-      "require": "./dist/index.cjs.js",
-      "types": "./dist/types/index.d.ts"
-    }
-  },
-  "files": [
-    "dist",
-    "src"
-  ],
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "keywords": [
-    "typescript",
-    "Utils",
-    "工具类",
-    "TamperMonkey",
-    "VioletMonkey",
-    "ScriptCat"
-  ],
-  "author": "WhiteSev",
-  "license": "MIT",
-  "dependencies": {
-    "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-commonjs": "^26.0.1",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
-    "rollup-plugin-clear": "^2.0.7",
-    "tslib": "^2.6.3"
-  },
-  "devDependencies": {
-    "typescript": "^5.5.4"
-  },
-  "scripts": {
-    "dev": "rollup --config --watch",
-    "build": "rollup --config",
-    "build:all": "rollup --config",
-    "build:all-new": "rollup --config"
-  }
-}
+{
+	"name": "@whitesev/utils",
+	"version": "2.6.1",
+	"description": "一个常用的工具库",
+	"main": "dist/index.cjs.js",
+	"module": "dist/index.esm.js",
+	"types": "dist/types/index.d.ts",
+	"jsdelivr": "dist/index.umd.js",
+	"exports": {
+		"./package.json": "./package.json",
+		"./dist/*": "./dist/*",
+		".": {
+			"import": "./dist/index.esm.js",
+			"require": "./dist/index.cjs.js",
+			"types": "./dist/types/index.d.ts"
+		}
+	},
+	"files": [
+		"dist",
+		"src"
+	],
+	"scripts": {
+		"dev": "rollup --config --watch",
+		"build": "rollup --config",
+		"build:all": "rollup --config",
+		"build:all-new": "rollup --config"
+	},
+	"publishConfig": {
+		"registry": "https://registry.npmjs.org/"
+	},
+	"keywords": [
+		"typescript",
+		"Utils",
+		"工具类",
+		"TamperMonkey",
+		"VioletMonkey",
+		"ScriptCat"
+	],
+	"author": "WhiteSev",
+	"license": "MIT",
+	"dependencies": {
+		"@rollup/plugin-babel": "^6.0.4",
+		"@rollup/plugin-commonjs": "^26.0.1",
+		"@rollup/plugin-node-resolve": "^15.2.3",
+		"@rollup/plugin-typescript": "^11.1.6",
+		"rollup-plugin-clear": "^2.0.7",
+		"tslib": "^2.6.3"
+	},
+	"devDependencies": {
+		"typescript": "^5.5.4"
+	}
+}

package/src/Utils.ts

@@ -2,6 +2,7 @@ import { ColorConversion } from "./ColorConversion";
 import { GBKEncoder } from "./GBKEncoder";
 import { UtilsGMCookie } from "./UtilsGMCookie";
 import { AjaxHooker } from "./ajaxHooker/ajaxHooker.js";
+import { AjaxHooker1_2_4 } from "./ajaxHooker/ajaxHooker1.2.4";
 import { GMMenu } from "./UtilsGMMenu";
 import { Hooks } from "./Hooks";
 import { Httpx } from "./Httpx";
@@ -23,7 +24,6 @@ import {
 } from "./types/global";
 import type { WindowApiOption } from "./types/WindowApi";
 import { ModuleRaid } from "./ModuleRaid";
-import { AjaxHooker1_2_4 } from "./ajaxHooker/ajaxHooker1.2.4";
 
 class Utils {
 	private windowApi: typeof WindowApi.prototype;
@@ -31,7 +31,7 @@ class Utils {
 		this.windowApi = new WindowApi(option);
 	}
 	/** 版本号 */
-	version = "2025.1.11";
+	version = "2025.2.8";
 
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个
@@ -209,11 +209,12 @@ class Utils {
 	 * ajax劫持库，支持xhr和fetch劫持。
 	 * + 来源：https://bbs.tampermonkey.net.cn/thread-3284-1-1.html
 	 * + 作者：cxxjackie
-	 * + 版本：1.4.3
+	 * + 版本：1.4.4
+	 * + 旧版本：1.2.4
 	 * + 文档：https://scriptcat.org/zh-CN/script-show-page/637/
 	 * @param useOldVersion 是否使用旧版本，默认false
 	 */
-	ajaxHooker: () => UtilsAjaxHookResult = (useOldVersion: boolean = false) => {
+	ajaxHooker = (useOldVersion: boolean = false): UtilsAjaxHookResult => {
 		if (useOldVersion) {
 			return AjaxHooker1_2_4();
 		} else {

package/src/ajaxHooker/ajaxHooker.js

@@ -1,14 +1,13 @@
 // @name         ajaxHooker
 // @author       cxxjackie
-// @version      1.4.3
-// @updateLog    修复特殊情况下有部分请求头丢失的问题。
-// @updateLog    xhr事件增加currentTarget劫持。
+// @version      1.4.4
+// @updateLog    修复头条、抖音部分站点下this引用错误的问题。
 // @supportURL   https://bbs.tampermonkey.net.cn/thread-3284-1-1.html
 
 export const AjaxHooker = function () {
 	return (function () {
 		"use strict";
-		const version = "1.4.3";
+		const version = "1.4.4";
 		const hookInst = {
 			hookFns: [],
 			filters: [],
@@ -542,6 +541,57 @@ export const AjaxHooker = function () {
 		win.fetch = winAh.fakeFetch;
 		resProto.clone = winAh.fakeFetchClone;
 		winAh.hookInsts.add(hookInst);
+		// 针对头条、抖音 secsdk.umd.js 的兼容性处理
+		class AHFunction {
+			call(thisArg, ...args) {
+				if (
+					thisArg &&
+					thisArg.__ajaxHooker &&
+					thisArg.__ajaxHooker.proxyXhr === thisArg
+				) {
+					thisArg = thisArg.__ajaxHooker.originalXhr;
+				}
+				return Reflect.apply(this, thisArg, args);
+			}
+			apply(thisArg, args) {
+				if (
+					thisArg &&
+					thisArg.__ajaxHooker &&
+					thisArg.__ajaxHooker.proxyXhr === thisArg
+				) {
+					thisArg = thisArg.__ajaxHooker.originalXhr;
+				}
+				return Reflect.apply(this, thisArg, args || []);
+			}
+		}
+		function hookSecsdk(csrf) {
+			Object.setPrototypeOf(
+				csrf.nativeXMLHttpRequestSetRequestHeader,
+				AHFunction.prototype
+			);
+			Object.setPrototypeOf(
+				csrf.nativeXMLHttpRequestOpen,
+				AHFunction.prototype
+			);
+			Object.setPrototypeOf(
+				csrf.nativeXMLHttpRequestSend,
+				AHFunction.prototype
+			);
+		}
+		if (win.secsdk) {
+			if (win.secsdk.csrf && win.secsdk.csrf.nativeXMLHttpRequestOpen)
+				hookSecsdk(win.secsdk.csrf);
+		} else {
+			defineProp(win, "secsdk", emptyFn, (secsdk) => {
+				delete win.secsdk;
+				win.secsdk = secsdk;
+				defineProp(secsdk, "csrf", emptyFn, (csrf) => {
+					delete secsdk.csrf;
+					secsdk.csrf = csrf;
+					if (csrf.nativeXMLHttpRequestOpen) hookSecsdk(csrf);
+				});
+			});
+		}
 		return {
 			hook: (fn) => hookInst.hookFns.push(fn),
 			filter: (arr) => {