feat: $app & Console

Update boxjs.settings.json Update CHANGELOG.md Update setCaptions.mjs Update response.dev.js Update request.dev.js Update database.mjs Update response.js Update request.js
DualSubs · Nov 29, 2024 · 50cfd75 · 50cfd75
1 parent 7462fb4
commit 50cfd75
Show file tree

Hide file tree

Showing 16 changed files with 773 additions and 764 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "src/utils"]
-	path = src/utils
-	url = https://github.com/NanoCat-Me/utils.git
 [submodule "src/protobuf"]
 	path = src/protobuf
 	url = https://github.com/DualSubs/protobuf.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
 ### 🛠️ Bug Fixes
-  * 修复 `Surge` 模块内置`参数面板`
-  * 修复 `Loon` 插件内置`设置面板`
   * 修复 `$argument` 和 `$persistentStore` 载入顺序颠倒的问题
     * 正确顺序为先读取 `$argument` 再读取 `$persistentStore (BoxJs)`
     * 即，有相同键名时，`$persistentStore (BoxJs)` 的值会覆盖 `$argument` 的值
-### 🔄 Other Changes
-  * util 由 `submodule` 更改为 `package`
+
+### 🔣 Dependencies
+  * 升级了 `@nsnanocat/url`
+    * 使用了全新的 `URL` 和 `URLSearchParams` polyfill
+  * 升级了 `@nsnanocat/util`
+    * `util` 由 `submodule` 更改为 `package`
+    * `$platform` 改为 `$app`
+    * 使用了全新的 `Console` polyfill
diff --git a/arguments-builder.config.ts b/arguments-builder.config.ts
@@ -32,14 +32,6 @@ export default defineConfig({
 		},
 	},
 	args: [
-		{
-			key: "Switch",
-			name: "总功能开关",
-			defaultValue: true,
-			type: "boolean",
-			description: "是否启用此APP修改",
-			exclude: ["surge", "loon"],
-		},
 		{
 			key: "Type",
 			name: "[字幕] 启用类型",

diff --git a/biome.json b/biome.json
@@ -0,0 +1,78 @@
+{
+    "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
+    "files": {
+        "ignore": [
+            "**/*.bundle.js"
+        ],
+        "ignoreUnknown": false
+    },
+    "formatter": {
+        "enabled": true,
+        "indentStyle": "tab",
+        "indentWidth": 2,
+        "lineEnding": "lf",
+        "lineWidth": 320
+    },
+    "javascript": {
+        "formatter": {
+            "arrowParentheses": "asNeeded",
+            "bracketSameLine": true,
+            "quoteStyle": "double"
+        }
+    },
+    "json": {
+        "parser": {
+            "allowComments": true,
+            "allowTrailingCommas": true
+        }
+    },
+    "linter": {
+        "enabled": true,
+        "rules": {
+            "complexity": {
+                "noForEach": "off",
+                "noStaticOnlyClass": "off",
+                "noUselessSwitchCase": "off",
+                "useArrowFunction": "info",
+                "useFlatMap": "off",
+                "useLiteralKeys": "info"
+            },
+            "correctness": {
+                "noInnerDeclarations": "info",
+                "noSelfAssign": "off",
+                "noSwitchDeclarations": "info",
+                "noUnsafeOptionalChaining": "info"
+            },
+            "performance": {
+                "noDelete": "info"
+            },
+            "recommended": true,
+            "style": {
+                "noNegationElse": "off",
+                "noParameterAssign": "off",
+                "noUselessElse": "off",
+                "noVar": "info",
+                "useDefaultParameterLast": "info",
+                "useForOf": "error",
+                "useNodejsImportProtocol": "error",
+                "useNumberNamespace": "error",
+                "useSingleVarDeclarator": "off"
+            },
+            "suspicious": {
+                "noAssignInExpressions": "info",
+                "noDoubleEquals": "info",
+                "noFallthroughSwitchClause": "info",
+                "noGlobalIsNan": "off",
+                "useDefaultSwitchClauseLast": "off"
+            }
+        }
+    },
+    "organizeImports": {
+        "enabled": true
+    },
+    "vcs": {
+        "clientKind": "git",
+        "enabled": true,
+        "useIgnoreFile": true
+    }
+}
diff --git a/rspack.config.js b/rspack.config.js
@@ -15,6 +15,10 @@ export default defineConfig({
 		new NodePolyfillPlugin({
 			//additionalAliases: ['console'],
 		}),
+		new rspack.BannerPlugin({
+			banner: `console.log('Date: ${new Date().toLocaleString("zh-CN", { timeZone: "PRC" })}');`,
+			raw: true,
+		}),
 		new rspack.BannerPlugin({
 			banner: `console.log('Version: ${pkg.version}');`,
 			raw: true,
@@ -24,13 +28,14 @@ export default defineConfig({
 			raw: true,
 		}),
 		new rspack.BannerPlugin({
-			banner: "console.log('🍿️ DualSubs: ▶️ YouTube');",
+			banner: `console.log('${pkg.displayName}');`,
 			raw: true,
 		}),
 		new rspack.BannerPlugin({
-			banner: "https://DualSubs.github.io",
+			banner: pkg.homepage,
 		}),
 	],
+	devtool: false,
 	performance: false,
 	module: {
 		rules: [

diff --git a/rspack.dev.config.js b/rspack.dev.config.js
@@ -15,6 +15,10 @@ export default defineConfig({
 		new NodePolyfillPlugin({
 			//additionalAliases: ['console'],
 		}),
+		new rspack.BannerPlugin({
+			banner: `console.log('Date: ${new Date().toLocaleString("zh-CN", { timeZone: "PRC" })}');`,
+			raw: true,
+		}),
 		new rspack.BannerPlugin({
 			banner: `console.log('Version: ${pkg.version}');`,
 			raw: true,
@@ -24,13 +28,14 @@ export default defineConfig({
 			raw: true,
 		}),
 		new rspack.BannerPlugin({
-			banner: "console.log('🍿️ DualSubs: ▶️ YouTube β');",
+			banner: `console.log('${pkg.displayName}');`,
 			raw: true,
 		}),
 		new rspack.BannerPlugin({
-			banner: "https://DualSubs.github.io",
+			banner: pkg.homepage,
 		}),
 	],
+	devtool: false,
 	performance: false,
 	module: {
 		rules: [

diff --git a/src/function/database.mjs b/src/function/database.mjs
@@ -1,7 +1,6 @@
 export default {
 	Default: {
 		Settings: {
-			Switch: true,
 			Type: "Translate",
 			Types: ["Official", "Translate"],
 			Languages: ["EN", "ZH"],
@@ -20,7 +19,6 @@ export default {
 	},
 	YouTube: {
 		Settings: {
-			Switch: true,
 			Type: "Official",
 			Types: ["Translate", "External"],
 			Languages: ["AUTO", "ZH"],

diff --git a/src/function/setCache.mjs b/src/function/setCache.mjs
@@ -1,4 +1,5 @@
-import { log } from "@nsnanocat/util";
+import { Console } from "@nsnanocat/util";
+
 /**
  * Set Cache
  * @author VirgilClyne
@@ -7,9 +8,9 @@ import { log } from "@nsnanocat/util";
  * @return {Boolean} isSaved
  */
 export default function setCache(cache, cacheSize = 100) {
-	log(`☑️ Set Cache, cacheSize: ${cacheSize}`, "");
+	Console.log("☑️ Set Cache", `cacheSize: ${cacheSize}`);
 	cache = Array.from(cache || []); // Map转Array
 	cache = cache.slice(-cacheSize); // 限制缓存大小
-	log(`✅ Set Cache`, "");
+	Console.log("✅ Set Cache");
 	return cache;
 };
diff --git a/src/function/setCaptions.mjs b/src/function/setCaptions.mjs
@@ -1,10 +1,10 @@
-import { log } from "@nsnanocat/util";
+import { Console } from "@nsnanocat/util";
 
-export default function setCaptions(captions, translationLanguages) {
-    log(`☑️ Set Captions`);
+export default function setCaptions(captions, translationLanguages, hostname) {
+    Console.log("☑️ Set Captions");
     // 有播放器字幕列表渲染器
-    if (captions?.playerCaptionsTracklistRenderer) {
-        log(`⚠ Tracklist`);
+    if (captions?.playerCaptionsTracklistRenderer) { // 有播放器字幕列表渲染器
+        Console.info("Tracklist");
         if (captions?.playerCaptionsTracklistRenderer?.captionTracks) {
             // 改字幕可用性
             captions.playerCaptionsTracklistRenderer.captionTracks = captions?.playerCaptionsTracklistRenderer.captionTracks.map(caption => {
@@ -22,7 +22,7 @@ export default function setCaptions(captions, translationLanguages) {
             });
         };
         // 增加自动翻译可用语言
-        switch (HOST) {
+        switch (hostname) {
             case "www.youtube.com":
             case "tv.youtube.com":
             default:
@@ -38,6 +38,6 @@ export default function setCaptions(captions, translationLanguages) {
             captions.playerCaptionsTracklistRenderer.defaultCaptionTrackIndex = 0;
         };
     };
-    log(`✅ Set Captions, `);
+    Console.log("✅ Set Captions");
     return captions;
 };
diff --git a/src/function/setENV.mjs b/src/function/setENV.mjs
@@ -1,4 +1,4 @@
-import { getStorage, Lodash as _, log } from "@nsnanocat/util";
+import { Console, getStorage, Lodash as _ } from "@nsnanocat/util";
 
 /**
  * Set Environment Variables
@@ -10,19 +10,20 @@ import { getStorage, Lodash as _, log } from "@nsnanocat/util";
  * @return {Object} { Settings, Caches, Configs }
  */
 export default function setENV(name, platforms, database) {
-	log(`☑️ Set Environment Variables`, "");
-	let { Settings, Caches, Configs } = getStorage(name, platforms, database);
+	Console.log("☑️ Set Environment Variables");
+	const { Settings, Caches, Configs } = getStorage(name, platforms, database);
 	/***************** Settings *****************/
 	if (!Array.isArray(Settings?.Types)) Settings.Types = (Settings.Types) ? [Settings.Types] : []; // 只有一个选项时，无逗号分隔
-	log(`✅ Set Environment Variables, Settings: ${typeof Settings}, Settings内容: ${JSON.stringify(Settings)}`, "");
+	Console.debug(`typeof Settings: ${typeof Settings}`, `Settings: ${JSON.stringify(Settings)}`);
 	/***************** Caches *****************/
-	//log(`✅ Set Environment Variables, Caches: ${typeof Caches}, Caches内容: ${JSON.stringify(Caches)}`, "");
+	//Console.debug(`typeof Caches: ${typeof Caches}`, `Caches: ${JSON.stringify(Caches)}`);
 	if (typeof Caches?.Playlists !== "object" || Array.isArray(Caches?.Playlists)) Caches.Playlists = {}; // 创建Playlists缓存
 	Caches.Playlists.Master = new Map(JSON.parse(Caches?.Playlists?.Master || "[]")); // Strings转Array转Map
 	Caches.Playlists.Subtitle = new Map(JSON.parse(Caches?.Playlists?.Subtitle || "[]")); // Strings转Array转Map
 	if (typeof Caches?.Subtitles !== "object") Caches.Subtitles = new Map(JSON.parse(Caches?.Subtitles || "[]")); // Strings转Array转Map
 	if (typeof Caches?.Metadatas !== "object" || Array.isArray(Caches?.Metadatas)) Caches.Metadatas = {}; // 创建Playlists缓存
 	if (typeof Caches?.Metadatas?.Tracks !== "object") Caches.Metadatas.Tracks = new Map(JSON.parse(Caches?.Metadatas?.Tracks || "[]")); // Strings转Array转Map
 	/***************** Configs *****************/
+	Console.log("✅ Set Environment Variables");
 	return { Settings, Caches, Configs };
 };