@nsnanocat/util 1.8.9 → 1.9.2

package/getStorage.mjs

@@ -19,8 +19,8 @@ export function getStorage(key, names, database) {
 	//Console.debug("Default", `Store.Settings类型: ${typeof Store.Settings}`, `Store.Settings: ${JSON.stringify(Store.Settings)}`);
 	/***************** Database *****************/
 	names.forEach(name => {
-		Store.Settings = { ...Store.Settings, ...database?.[name]?.Settings };
-		Store.Configs = { ...Store.Configs, ...database?.[name]?.Configs };
+		_.merge(Store.Settings, database?.[name]?.Settings);
+		_.merge(Store.Configs, database?.[name]?.Configs);
 	});
 	//Console.debug("Database", `Store.Settings类型: ${typeof Store.Settings}`, `Store.Settings: ${JSON.stringify(Store.Settings)}`);
 	/***************** Argument *****************/

package/package.json

@@ -17,7 +17,8 @@
   "type": "module",
   "scripts": {
     "tsc:build": "npx tsc",
-    "test": "exit 0"
+    "test": "node --test test/*.test.js",
+    "test:merge": "node --test test/Lodash.merge.test.js"
   },
   "repository": {
     "type": "git",
@@ -32,5 +33,5 @@
   "devDependencies": {
     "typescript": "^5.6.3"
   },
-  "version": "1.8.9"
+  "version": "1.9.2"
 }

package/polyfill/Lodash.mjs

@@ -22,6 +22,92 @@ export class Lodash {
 		return result === undefined ? defaultValue : result;
 	}
 
+	/**
+	 * 递归合并源对象的自身可枚举属性到目标对象
+	 * @description 简化版 lodash.merge，用于合并配置对象
+	 *
+	 * 适用情况:
+	 * - 合并嵌套的配置/设置对象
+	 * - 需要深度合并而非浅层覆盖的场景
+	 * - 多个源对象依次合并到目标对象
+	 *
+	 * 限制:
+	 * - 仅处理普通对象 (Plain Object)，不处理 Date/RegExp 等特殊对象
+	 * - Map/Set 仅支持同类型合并，不递归内部值
+	 * - 数组会被直接覆盖，不会合并数组元素
+	 * - 不处理循环引用，可能导致栈溢出
+	 * - 不复制 Symbol 属性和不可枚举属性
+	 * - 不保留原型链，仅处理自身属性
+	 * - 会修改原始目标对象 (mutates target)
+	 *
+	 * @param {object} object - 目标对象
+	 * @param {...object} sources - 源对象(可多个)
+	 * @returns {object} 返回合并后的目标对象
+	 * @example
+	 * const target = { a: { b: 1 }, c: 2 };
+	 * const source = { a: { d: 3 }, e: 4 };
+	 * Lodash.merge(target, source);
+	 * // => { a: { b: 1, d: 3 }, c: 2, e: 4 }
+	 */
+	static merge(object, ...sources) {
+		if (object === null || object === undefined) return object;
+
+		for (const source of sources) {
+			if (source === null || source === undefined) continue;
+
+			for (const key of Object.keys(source)) {
+				const sourceValue = source[key];
+				const targetValue = object[key];
+
+				switch (true) {
+					case Lodash.#isPlainObject(sourceValue) && Lodash.#isPlainObject(targetValue):
+						// 递归合并对象
+						object[key] = Lodash.merge(targetValue, sourceValue);
+						break;
+					case sourceValue instanceof Map && targetValue instanceof Map:
+						// 合并 Map（空 Map 跳过）
+						if (sourceValue.size > 0) {
+							for (const [k, v] of sourceValue) {
+								targetValue.set(k, v);
+							}
+						}
+						break;
+					case sourceValue instanceof Set && targetValue instanceof Set:
+						// 合并 Set（空 Set 跳过）
+						if (sourceValue.size > 0) {
+							for (const v of sourceValue) {
+								targetValue.add(v);
+							}
+						}
+						break;
+					case Array.isArray(sourceValue) && sourceValue.length === 0 && targetValue !== undefined:
+						// 空数组不覆盖已有值
+						break;
+					case (sourceValue instanceof Map && sourceValue.size === 0 && targetValue !== undefined):
+					case (sourceValue instanceof Set && sourceValue.size === 0 && targetValue !== undefined):
+						// 空 Map/Set 不覆盖已有值
+						break;
+					case sourceValue !== undefined:
+						object[key] = sourceValue;
+						break;
+				}
+			}
+		}
+
+		return object;
+	}
+
+	/**
+	 * 判断值是否为普通对象 (Plain Object)
+	 * @param {*} value - 要检查的值
+	 * @returns {boolean} 如果是普通对象返回 true
+	 */
+	static #isPlainObject(value) {
+		if (value === null || typeof value !== "object") return false;
+		const proto = Object.getPrototypeOf(value);
+		return proto === null || proto === Object.prototype;
+	}
+
 	static omit(object = {}, paths = []) {
 		if (!Array.isArray(paths)) paths = [paths.toString()];
 		paths.forEach(path => Lodash.unset(object, path));

package/polyfill/fetch.mjs

@@ -116,6 +116,7 @@ export async function fetch(resource, options = {}) {
 			});
 		case "Quantumult X":
 			// 转换请求参数
+			resource.timeout = resource.timeout * 1000;
 			if (resource.policy) _.set(resource, "opts.policy", resource.policy);
 			if (typeof resource["auto-redirect"] === "boolean") _.set(resource, "opts.redirection", resource["auto-redirect"]);
 			// 转换请求体