chore: bump package version

Update package-lock.json
Update CHANGELOG.md
Update response.dev.js
Update request.dev.js
Update package.json
Update response.js
Update request.js

CHANGELOG.md

@@ -1,6 +1,11 @@
 ### 🛠️ Bug Fixes
-  * 修复 `Surge` 模块`脚本引擎`设置
-  * 修复 `Egern` 模块`参数面板`
+  * 修复 `$argument` 和 `$persistentStore` 载入顺序颠倒的问题
+    * 正确顺序为先读取 `$argument` 再读取 `$persistentStore (BoxJs)`
+    * 即，有相同键名时，`$persistentStore (BoxJs)` 的值会覆盖 `$argument` 的值
 
-### 🔄 Other Changes
-  * 加入 `URL` polyfill 以兼容 `tvOS`
+### 🔣 Dependencies
+  * 升级了 `@nsnanocat/url`
+    * 使用了全新的 `URL` 和 `URLSearchParams` polyfill
+  * 升级了 `@nsnanocat/util`
+    * `util` 由 `submodule` 更改为 `package`
+    * `$platform` 改为 `$app`

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@biliuniverse/global",
-	"version": "0.8.9",
+	"version": "0.8.10",
 	"organizationName": "🪐 BiliUniverse",
 	"displayName": "📺 BiliBili: 🌐 Global",
 	"description": "哔哩哔哩：全球模式\n中国站自动线路及全区搜索",
@@ -39,7 +39,6 @@
 	],
 	"devDependencies": {
 		"@iringo/arguments-builder": "^1.8.2",
-		"@nsnanocat/util": "^1.3.6",
 		"@protobuf-ts/plugin": "^2.9.3",
 		"@rspack/cli": "^1.0.14",
 		"@rspack/core": "^1.0.14",
@@ -48,7 +47,9 @@
 		"typescript": "^5.5.4"
 	},
 	"dependencies": {
-		"@protobuf-ts/runtime-rpc": "^2.9.3",
-		"@protobuf-ts/runtime": "^2.9.3"
+		"@nsnanocat/url": "^1.2.1",
+		"@nsnanocat/util": "^1.5.2",
+		"@protobuf-ts/runtime": "^2.9.3",
+		"@protobuf-ts/runtime-rpc": "^2.9.3"
 	}
 }

rspack.config.js

@@ -35,5 +35,6 @@ export default defineConfig({
 			banner: pkg.homepage,
 		}),
 	],
+	devtool: false,
 	performance: false,
 });

rspack.dev.config.js

@@ -38,5 +38,6 @@ export default defineConfig({
 			banner: pkg.homepage,
 		}),
 	],
+	devtool: false,
 	performance: false,
 });

src/request.dev.js

@@ -1,4 +1,5 @@
-import { $platform, URL, Lodash as _, Storage, fetch, notification, log, logError, wait, done, gRPC } from "@nsnanocat/util";
+import { $app, Lodash as _, Storage, fetch, notification, log, logError, wait, done, gRPC } from "@nsnanocat/util";
+import { URL } from "@nsnanocat/url";
 import database from "./function/database.mjs";
 import setENV from "./function/setENV.mjs";
 import isResponseAvailability from "./function/isResponseAvailability.mjs";
@@ -91,7 +92,7 @@ log(`⚠ FORMAT: ${FORMAT}`, "");
 				case "application/grpc+proto":
 				case "application/octet-stream": {
 					//log(`🚧 $request.body: ${JSON.stringify($request.body)}`, "");
-					let rawBody = $platform === "Quantumult X" ? new Uint8Array($request.bodyBytes ?? []) : ($request.body ?? new Uint8Array());
+					let rawBody = $app === "Quantumult X" ? new Uint8Array($request.bodyBytes ?? []) : ($request.body ?? new Uint8Array());
 					//log(`🚧 isBuffer? ${ArrayBuffer.isView(rawBody)}: ${JSON.stringify(rawBody)}`, "");
 					switch (FORMAT) {
 						case "application/protobuf":
@@ -370,7 +371,7 @@ log(`⚠ FORMAT: ${FORMAT}`, "");
 					log("⚠ 不是 PGC, 跳过", "");
 					break;
 			}
-			switch ($platform) {
+			switch ($app) {
 				// 直通模式，不处理，否则无法进http-response
 				case "Shadowrocket":
 				case "Quantumult X":
@@ -403,7 +404,7 @@ log(`⚠ FORMAT: ${FORMAT}`, "");
 			}
 			break;
 	}
-	switch ($platform) {
+	switch ($app) {
 		// 已有指定策略的请求，根据策略fetch
 		case "Shadowrocket":
 		case "Quantumult X":
@@ -418,7 +419,7 @@ log(`⚠ FORMAT: ${FORMAT}`, "");
 				//log("🚧 finally", `echo $response: ${JSON.stringify($response, null, 2)}`, "");
 				if ($response.headers?.["Content-Encoding"]) $response.headers["Content-Encoding"] = "identity";
 				if ($response.headers?.["content-encoding"]) $response.headers["content-encoding"] = "identity";
-				switch ($platform) {
+				switch ($app) {
 					default:
 						done({ response: $response });
 						break;
@@ -475,7 +476,7 @@ async function mutiFetch(request = {}, proxies = {}, locales = []) {
 	await Promise.allSettled(
 		locales.map(async locale => {
 			request.policy = proxies[locale];
-			if ($platform === "Quantumult X") request.body = undefined;
+			if ($app === "Quantumult X") request.body = undefined;
 			responses[locale] = await fetch(request);
 		}),
 	);

src/request.js

@@ -1,4 +1,5 @@
-import { $platform, URL, Lodash as _, Storage, fetch, notification, log, logError, wait, done, gRPC } from "@nsnanocat/util";
+import { $app, Lodash as _, Storage, fetch, notification, log, logError, wait, done, gRPC } from "@nsnanocat/util";
+import { URL } from "@nsnanocat/url";
 import database from "./function/database.mjs";
 import setENV from "./function/setENV.mjs";
 import isResponseAvailability from "./function/isResponseAvailability.mjs";
@@ -79,7 +80,7 @@ log(`⚠ FORMAT: ${FORMAT}`, "");
 				case "application/grpc+proto":
 				case "application/octet-stream": {
 					//log(`🚧 $request.body: ${JSON.stringify($request.body)}`, "");
-					let rawBody = $platform === "Quantumult X" ? new Uint8Array($request.bodyBytes ?? []) : ($request.body ?? new Uint8Array());
+					let rawBody = $app === "Quantumult X" ? new Uint8Array($request.bodyBytes ?? []) : ($request.body ?? new Uint8Array());
 					//log(`🚧 isBuffer? ${ArrayBuffer.isView(rawBody)}: ${JSON.stringify(rawBody)}`, "");
 					switch (FORMAT) {
 						case "application/protobuf":
@@ -343,7 +344,7 @@ log(`⚠ FORMAT: ${FORMAT}`, "");
 					log("⚠ 不是 PGC, 跳过", "");
 					break;
 			}
-			switch ($platform) {
+			switch ($app) {
 				// 直通模式，不处理，否则无法进http-response
 				case "Shadowrocket":
 				case "Quantumult X":
@@ -376,7 +377,7 @@ log(`⚠ FORMAT: ${FORMAT}`, "");
 			}
 			break;
 	}
-	switch ($platform) {
+	switch ($app) {
 		// 已有指定策略的请求，根据策略fetch
 		case "Shadowrocket":
 		case "Quantumult X":
@@ -390,7 +391,7 @@ log(`⚠ FORMAT: ${FORMAT}`, "");
 			case "object": // 有构造回复数据，返回构造的回复数据
 				if ($response.headers?.["Content-Encoding"]) $response.headers["Content-Encoding"] = "identity";
 				if ($response.headers?.["content-encoding"]) $response.headers["content-encoding"] = "identity";
-				switch ($platform) {
+				switch ($app) {
 					default:
 						done({ response: $response });
 						break;
@@ -446,7 +447,7 @@ async function mutiFetch(request = {}, proxies = {}, locales = []) {
 	await Promise.allSettled(
 		locales.map(async locale => {
 			request.policy = proxies[locale];
-			if ($platform === "Quantumult X") request.body = undefined;
+			if ($app === "Quantumult X") request.body = undefined;
 			responses[locale] = await fetch(request);
 		}),
 	);

src/response.dev.js

@@ -1,4 +1,5 @@
-import { $platform, URL, Lodash as _, Storage, fetch, notification, log, logError, wait, done, gRPC } from "@nsnanocat/util";
+import { $app, Lodash as _, Storage, fetch, notification, log, logError, wait, done, gRPC } from "@nsnanocat/util";
+import { URL } from "@nsnanocat/url";
 import database from "./function/database.mjs";
 import setENV from "./function/setENV.mjs";
 import { WireType, UnknownFieldHandler, reflectionMergePartial, MESSAGE_TYPE, MessageType, BinaryReader, isJsonObject, typeofJsonValue, jsonWriteOptions } from "@protobuf-ts/runtime";
@@ -168,7 +169,7 @@ log(`⚠ FORMAT: ${FORMAT}`, "");
 		case "application/grpc+proto":
 		case "application/octet-stream": {
 			//log(`🚧 $response.body: ${JSON.stringify($response.body)}`, "");
-			let rawBody = $platform === "Quantumult X" ? new Uint8Array($response.bodyBytes ?? []) : ($response.body ?? new Uint8Array());
+			let rawBody = $app === "Quantumult X" ? new Uint8Array($response.bodyBytes ?? []) : ($response.body ?? new Uint8Array());
 			//log(`🚧 isBuffer? ${ArrayBuffer.isView(rawBody)}: ${JSON.stringify(rawBody)}`, "");
 			switch (FORMAT) {
 				case "application/protobuf":

src/response.js

@@ -1,4 +1,5 @@
-import { $platform, URL, Lodash as _, Storage, fetch, notification, log, logError, wait, done, gRPC } from "@nsnanocat/util";
+import { $app, Lodash as _, Storage, fetch, notification, log, logError, wait, done, gRPC } from "@nsnanocat/util";
+import { URL } from "@nsnanocat/url";
 import database from "./function/database.mjs";
 import setENV from "./function/setENV.mjs";
 import { WireType, UnknownFieldHandler, reflectionMergePartial, MESSAGE_TYPE, MessageType, BinaryReader, isJsonObject, typeofJsonValue, jsonWriteOptions } from "@protobuf-ts/runtime";
@@ -159,7 +160,7 @@ log(`⚠ FORMAT: ${FORMAT}`, "");
 		case "application/grpc+proto":
 		case "application/octet-stream": {
 			//log(`🚧 $response.body: ${JSON.stringify($response.body)}`, "");
-			let rawBody = $platform === "Quantumult X" ? new Uint8Array($response.bodyBytes ?? []) : ($response.body ?? new Uint8Array());
+			let rawBody = $app === "Quantumult X" ? new Uint8Array($response.bodyBytes ?? []) : ($response.body ?? new Uint8Array());
 			//log(`🚧 isBuffer? ${ArrayBuffer.isView(rawBody)}: ${JSON.stringify(rawBody)}`, "");
 			switch (FORMAT) {
 				case "application/protobuf":