♻️ 庫引用整理 (#494)

cyfung1031 · web-flow · commit 55e2ecd35ffb · 2025-07-06T19:41:05.000+08:00
diff --git a/packages/filesystem/baidu/baidu.ts b/packages/filesystem/baidu/baidu.ts
@@ -1,4 +1,3 @@
-import { SystemConfig } from "@App/pkg/config/config";
 import { AuthVerify } from "../auth";
 import FileSystem, { File, FileReader, FileWriter } from "../filesystem";
 import { joinPath } from "../utils";
diff --git a/packages/filesystem/factory.ts b/packages/filesystem/factory.ts
@@ -1,4 +1,3 @@
-import i18next from "i18next";
 import BaiduFileSystem from "./baidu/baidu";
 import FileSystem from "./filesystem";
 import GoogleDriveFileSystem from "./googledrive/googledrive";
diff --git a/packages/message/extension_message.ts b/packages/message/extension_message.ts
@@ -1,6 +1,4 @@
-import Logger from "@App/app/logger/logger";
 import { Message, MessageConnect, MessageSend, MessageSender } from "./server";
-import LoggerCore from "@App/app/logger/core";
 
 export class ExtensionMessageSend implements MessageSend {
   constructor() {}
diff --git a/src/app/service/service_worker/gm_api.ts b/src/app/service/service_worker/gm_api.ts
@@ -11,8 +11,8 @@ import { MessageQueue } from "@Packages/message/message_queue";
 import { EmitEventRequest, RuntimeService } from "./runtime";
 import { getIcon, isFirefox } from "@App/pkg/utils/utils";
 import { MockMessageConnect } from "@Packages/message/mock_message";
-import i18next, { i18nName } from "@App/locales/locales";
 import { SystemConfig } from "@App/pkg/config/config";
+import i18next, { i18nName } from "@App/locales/locales";
 import FileSystemFactory from "@Packages/filesystem/factory";
 import FileSystem from "@Packages/filesystem/filesystem";
 import { isWarpTokenError } from "@Packages/filesystem/error";
diff --git a/src/app/service/service_worker/index.ts b/src/app/service/service_worker/index.ts
@@ -1,3 +1,4 @@
+import { ExtServer, ExtVersion } from "@App/app/const";
 import { Server } from "@Packages/message/server";
 import { MessageQueue } from "@Packages/message/message_queue";
 import { ScriptService } from "./script";
@@ -7,10 +8,9 @@ import { RuntimeService } from "./runtime";
 import { ServiceWorkerMessageSend } from "@Packages/message/window_message";
 import { PopupService } from "./popup";
 import { SystemConfig } from "@App/pkg/config/config";
+import { systemConfig } from "@App/pages/store/global";
 import { SynchronizeService } from "./synchronize";
 import { SubscribeService } from "./subscribe";
-import { ExtServer, ExtVersion } from "@App/app/const";
-import { systemConfig } from "@App/pages/store/global";
 import { ScriptDAO } from "@App/app/repo/scripts";
 import { SystemService } from "./system";
 import { Logger, LoggerDAO } from "@App/app/repo/logger";
diff --git a/src/app/service/service_worker/popup.ts b/src/app/service/service_worker/popup.ts
@@ -21,8 +21,6 @@ import {
   subscribeScriptRunStatus,
 } from "../queue";
 import { getStorageName } from "@App/pkg/utils/utils";
-import { SystemConfig } from "@App/pkg/config/config";
-import { UrlMatch } from "@App/pkg/utils/match";
 
 export type ScriptMenuItem = {
   id: number;
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
@@ -1,5 +1,5 @@
 import { fetchScriptInfo, prepareScriptByCode } from "@App/pkg/utils/script";
-import { v4 as uuidv4, v5 as uuidv5 } from "uuid";
+import { v4 as uuidv4 } from "uuid";
 import { Group } from "@Packages/message/server";
 import Logger from "@App/app/logger/logger";
 import LoggerCore from "@App/app/logger/core";
@@ -21,7 +21,7 @@ import { ResourceService } from "./resource";
 import { ValueService } from "./value";
 import { compileScriptCode } from "../content/utils";
 import { SystemConfig } from "@App/pkg/config/config";
-import i18n, { localePath } from "@App/locales/locales";
+import { localePath } from "@App/locales/locales";
 import { arrayMove } from "@dnd-kit/sortable";
 
 export class ScriptService {
diff --git a/src/app/service/service_worker/synchronize.ts b/src/app/service/service_worker/synchronize.ts
@@ -1,7 +1,7 @@
 import LoggerCore from "@App/app/logger/core";
 import Logger from "@App/app/logger/logger";
 import { Resource } from "@App/app/repo/resource";
-import { Script, SCRIPT_STATUS_ENABLE, ScriptCodeDAO, ScriptDAO } from "@App/app/repo/scripts";
+import { Script, SCRIPT_STATUS_ENABLE, ScriptDAO } from "@App/app/repo/scripts";
 import BackupExport from "@App/pkg/backup/export";
 import { BackupData, ResourceBackup, ScriptBackupData, ScriptOptions, ValueStorage } from "@App/pkg/backup/struct";
 import FileSystem, { File } from "@Packages/filesystem/filesystem";
diff --git a/src/app/service/service_worker/value.ts b/src/app/service/service_worker/value.ts
@@ -1,11 +1,10 @@
 import LoggerCore from "@App/app/logger/core";
 import Logger from "@App/app/logger/logger";
-import { Script, SCRIPT_TYPE_NORMAL, ScriptDAO } from "@App/app/repo/scripts";
+import { Script, ScriptDAO } from "@App/app/repo/scripts";
 import { ValueDAO } from "@App/app/repo/value";
-import { GetSender, Group, MessageSend } from "@Packages/message/server";
+import { GetSender, Group } from "@Packages/message/server";
 import { RuntimeService } from "./runtime";
 import { PopupService } from "./popup";
-import { sendMessage } from "@Packages/message/client";
 import Cache from "@App/app/cache";
 import { getStorageName } from "@App/pkg/utils/utils";
 import { ValueUpdateData, ValueUpdateSender } from "../content/exec_script";
diff --git a/src/locales/locales.ts b/src/locales/locales.ts
@@ -1,4 +1,5 @@
-import i18n from "i18next";
+import { SystemConfig } from "@App/pkg/config/config";
+import i18n, { Callback } from "i18next";
 import { initReactI18next } from "react-i18next";
 import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
@@ -16,43 +17,46 @@ import "dayjs/locale/zh-cn";
 import "dayjs/locale/zh-tw";
 import "dayjs/locale/ja";
 import "dayjs/locale/de";
-import { systemConfig } from "@App/pages/store/global";
 
-const uiLanguage = chrome.i18n.getUILanguage();
-
-i18n.use(initReactI18next).init({
-  fallbackLng: "en-US",
-  lng: globalThis.localStorage ? localStorage["language"] || uiLanguage : uiLanguage, // 优先使用localStorage中的语言设置
-  interpolation: {
-    escapeValue: false, // react already safes from xss => https://www.i18next.com/translation-function/interpolation#unescape
-  },
-  resources: {
-    "en-US": { title: "English", translation: enUS },
-    "vi-VN": { title: "Tiếng Việt", translation: viVN },
-    "zh-CN": { title: "简体中文", translation: zhCN },
-    "zh-TW": { title: "繁体中文", translation: zhTW },
-    "ach-UG": { title: "伪语言", translation: achUG },
-    "ja-JP": { title: "日本語", translation: jaJP },
-    "de-DE": { title: "Deutsch", translation: deDE },
-  },
-});
+dayjs.extend(relativeTime);
 
 export let localePath = "";
 
-async function initLanguage() {
-  const lng = await systemConfig.getLanguage();
-  i18n.changeLanguage(lng);
+export function changeLanguage(lng: string, callback?: Callback): void {
+  i18n.changeLanguage(lng, callback);
   dayjs.locale(lng.toLocaleLowerCase());
-  if (lng !== "zh-CN") {
-    localePath = "en";
-  }
 }
 
-setTimeout(() => {
-  initLanguage();
-}, 0);
+// let cachedSystemConfig: SystemConfig;
 
-dayjs.extend(relativeTime);
+export function initLocales(systemConfig: SystemConfig) {
+  // cachedSystemConfig = systemConfig;
+  const uiLanguage = chrome.i18n.getUILanguage();
+  const defaultLanguage = globalThis.localStorage ? localStorage["language"] || uiLanguage : uiLanguage;
+  i18n.use(initReactI18next).init({
+    fallbackLng: "en-US",
+    lng: defaultLanguage, // 优先使用localStorage中的语言设置
+    interpolation: {
+      escapeValue: false, // react already safes from xss => https://www.i18next.com/translation-function/interpolation#unescape
+    },
+    resources: {
+      "en-US": { title: "English", translation: enUS },
+      "vi-VN": { title: "Tiếng Việt", translation: viVN },
+      "zh-CN": { title: "简体中文", translation: zhCN },
+      "zh-TW": { title: "繁体中文", translation: zhTW },
+      "ach-UG": { title: "伪语言", translation: achUG },
+      "ja-JP": { title: "日本語", translation: jaJP },
+      "de-DE": { title: "Deutsch", translation: deDE },
+    },
+  });
+
+  systemConfig.getLanguage().then(lng => {
+    changeLanguage(lng);
+    if (lng !== "zh-CN") {
+      localePath = "en";
+    }
+  });
+}
 
 export function i18nName(script: { name: string; metadata: Metadata }) {
   return script.metadata[`name:${i18n.language.toLowerCase()}`]
diff --git a/src/pages/components/CodeEditor/index.tsx b/src/pages/components/CodeEditor/index.tsx
@@ -1,6 +1,4 @@
-import Cache from "@App/app/cache";
 import { LinterWorker } from "@App/pkg/utils/monaco-editor";
-import { useAppSelector } from "@App/pages/store/hooks";
 import { editor, Range } from "monaco-editor";
 import React, { useEffect, useImperativeHandle, useRef, useState } from "react";
 import { globalCache, systemConfig } from "@App/pages/store/global";
diff --git a/src/pages/components/GMApiSetting/index.tsx b/src/pages/components/GMApiSetting/index.tsx
@@ -4,7 +4,6 @@ import { useTranslation } from "react-i18next";
 import FileSystemParams from "../FileSystemParams";
 import { systemConfig } from "@App/pages/store/global";
 import FileSystemFactory, { FileSystemType } from "@Packages/filesystem/factory";
-import { set } from "node_modules/yaml/dist/schema/yaml-1.1/set";
 
 const CollapseItem = Collapse.Item;
 
diff --git a/src/pages/components/ScriptMenuList/index.tsx b/src/pages/components/ScriptMenuList/index.tsx
@@ -27,9 +27,9 @@ import { ScriptIcons } from "@App/pages/options/routes/utils";
 import { ScriptMenu, ScriptMenuItem } from "@App/app/service/service_worker/popup";
 import { useAppSelector } from "@App/pages/store/hooks";
 import { popupClient, runtimeClient, scriptClient } from "@App/pages/store/features/script";
+import { messageQueue, systemConfig } from "@App/pages/store/global";
 import { i18nName } from "@App/locales/locales";
 import { subscribeScriptRunStatus } from "@App/app/service/queue";
-import { messageQueue, systemConfig } from "@App/pages/store/global";
 
 const CollapseItem = Collapse.Item;
 
diff --git a/src/pages/components/layout/MainLayout.tsx b/src/pages/components/layout/MainLayout.tsx
@@ -24,14 +24,14 @@ import {
 } from "@arco-design/web-react/icon";
 import React, { ReactNode, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
-import "./index.css";
 import { useAppDispatch, useAppSelector } from "@App/pages/store/hooks";
 import { selectThemeMode, setDarkMode } from "@App/pages/store/features/config";
 import { RiFileCodeLine, RiImportLine, RiPlayListAddLine, RiTerminalBoxLine, RiTimerLine } from "react-icons/ri";
 import { scriptClient } from "@App/pages/store/features/script";
 import { useDropzone } from "react-dropzone";
-import i18n, { matchLanguage } from "@App/locales/locales";
 import { systemConfig } from "@App/pages/store/global";
+import i18n, { matchLanguage } from "@App/locales/locales";
+import "./index.css";
 
 const readFile = (file: File): Promise<string> => {
   return new Promise((resolve) => {
diff --git a/src/pages/confirm/main.tsx b/src/pages/confirm/main.tsx
@@ -2,14 +2,14 @@ import React from "react";
 import ReactDOM from "react-dom/client";
 import App from "./App.tsx";
 import MainLayout from "../components/layout/MainLayout.tsx";
-import "@arco-design/web-react/dist/css/arco.css";
-import "@App/locales/locales";
-import "@App/index.css";
 import { Provider } from "react-redux";
 import { store } from "@App/pages/store/store.ts";
 import LoggerCore from "@App/app/logger/core.ts";
-import MessageWriter from "@App/app/logger/message_writer.ts";
 import { message } from "../store/global.ts";
+import MessageWriter from "@App/app/logger/message_writer.ts";
+import "@arco-design/web-react/dist/css/arco.css";
+import "@App/locales/locales";
+import "@App/index.css";
 
 // 初始化日志组件
 const loggerCore = new LoggerCore({
diff --git a/src/pages/import/main.tsx b/src/pages/import/main.tsx
@@ -1,15 +1,15 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
 import App from "./App.tsx";
-import MainLayout from "../components/layout/MainLayout.tsx";
-import "@arco-design/web-react/dist/css/arco.css";
-import "@App/locales/locales";
-import "@App/index.css";
 import { Provider } from "react-redux";
 import { store } from "@App/pages/store/store.ts";
+import MainLayout from "../components/layout/MainLayout.tsx";
 import LoggerCore from "@App/app/logger/core.ts";
-import MessageWriter from "@App/app/logger/message_writer.ts";
 import { message } from "../store/global.ts";
+import MessageWriter from "@App/app/logger/message_writer.ts";
+import "@arco-design/web-react/dist/css/arco.css";
+import "@App/locales/locales";
+import "@App/index.css";
 
 // 初始化日志组件
 const loggerCore = new LoggerCore({
diff --git a/src/pages/install/main.tsx b/src/pages/install/main.tsx
@@ -1,15 +1,15 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
 import App from "./App.tsx";
-import MainLayout from "../components/layout/MainLayout.tsx";
-import "@arco-design/web-react/dist/css/arco.css";
-import "@App/locales/locales";
-import "@App/index.css";
 import { Provider } from "react-redux";
 import { store } from "@App/pages/store/store.ts";
+import MainLayout from "../components/layout/MainLayout.tsx";
 import LoggerCore from "@App/app/logger/core.ts";
-import MessageWriter from "@App/app/logger/message_writer.ts";
 import { message } from "../store/global.ts";
+import MessageWriter from "@App/app/logger/message_writer.ts";
+import "@arco-design/web-react/dist/css/arco.css";
+import "@App/locales/locales";
+import "@App/index.css";
 
 // 初始化日志组件
 const loggerCore = new LoggerCore({
diff --git a/src/pages/options/routes/ScriptList.tsx b/src/pages/options/routes/ScriptList.tsx
@@ -62,6 +62,7 @@ import UserConfigPanel from "@App/pages/components/UserConfigPanel";
 import CloudScriptPlan from "@App/pages/components/CloudScriptPlan";
 import { useTranslation } from "react-i18next";
 import { nextTime, semTime } from "@App/pkg/utils/utils";
+import { message, systemConfig } from "@App/pages/store/global";
 import { i18nName } from "@App/locales/locales";
 import { ListHomeRender, ScriptIcons } from "./utils";
 import { useAppDispatch, useAppSelector } from "@App/pages/store/hooks";
@@ -80,7 +81,6 @@ import {
   synchronizeClient,
   batchDeleteScript,
 } from "@App/pages/store/features/script";
-import { message, systemConfig } from "@App/pages/store/global";
 import { ValueClient } from "@App/app/service/service_worker/client";
 import { loadScriptFavicons } from "@App/pages/store/utils";
 import { store } from "@App/pages/store/store";
diff --git a/src/pages/options/routes/Setting.tsx b/src/pages/options/routes/Setting.tsx
@@ -6,12 +6,12 @@ import prettier from "prettier/standalone";
 import * as babel from "prettier/parser-babel";
 import prettierPluginEstree from "prettier/plugins/estree";
 import GMApiSetting from "@App/pages/components/GMApiSetting";
+import { systemConfig } from "@App/pages/store/global";
 import i18n from "@App/locales/locales";
 import { useTranslation } from "react-i18next";
 import Logger from "@App/app/logger/logger";
 import FileSystemFactory, { FileSystemType } from "@Packages/filesystem/factory";
 import FileSystemParams from "@App/pages/components/FileSystemParams";
-import { systemConfig } from "@App/pages/store/global";
 import { parsePatternMatchesURL } from "@App/pkg/utils/match";
 
 function Setting() {
diff --git a/src/pages/options/routes/Tools.tsx b/src/pages/options/routes/Tools.tsx
@@ -22,7 +22,6 @@ import FileSystemFactory, { FileSystemType } from "@Packages/filesystem/factory"
 import { File, FileReader } from "@Packages/filesystem/filesystem";
 import { message, systemConfig } from "@App/pages/store/global";
 import { synchronizeClient } from "@App/pages/store/features/script";
-import { SystemConfig } from "@App/pkg/config/config";
 import { SystemClient } from "@App/app/service/service_worker/client";
 import { migrateToChromeStorage } from "@App/app/migrate";
 
diff --git a/src/pages/options/routes/script/ScriptEditor.tsx b/src/pages/options/routes/script/ScriptEditor.tsx
@@ -17,9 +17,8 @@ import ScriptStorage from "@App/pages/components/ScriptStorage";
 import ScriptResource from "@App/pages/components/ScriptResource";
 import ScriptSetting from "@App/pages/components/ScriptSetting";
 import { runtimeClient, scriptClient } from "@App/pages/store/features/script";
-import { i18nName } from "@App/locales/locales";
+import i18n, { i18nName } from "@App/locales/locales";
 import { useTranslation } from "react-i18next";
-import i18n from "@App/locales/locales";
 import { IconDelete, IconSearch } from "@arco-design/web-react/icon";
 
 const { Row } = Grid;
diff --git a/src/pages/popup/App.tsx b/src/pages/popup/App.tsx
@@ -19,8 +19,8 @@ import ScriptMenuList from "../components/ScriptMenuList";
 import { popupClient, scriptClient } from "../store/features/script";
 import { ScriptMenu } from "@App/app/service/service_worker/popup";
 import { systemConfig } from "../store/global";
-import { getBrowserVersion, isEdge, isUserScriptsAvailable } from "@App/pkg/utils/utils";
 import { localePath } from "@App/locales/locales";
+import { getBrowserVersion, isEdge, isUserScriptsAvailable } from "@App/pkg/utils/utils";
 
 const CollapseItem = Collapse.Item;
 
diff --git a/src/pages/popup/main.tsx b/src/pages/popup/main.tsx
@@ -1,15 +1,15 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
 import App from "./App.tsx";
+import { Provider } from "react-redux";
+import { store } from "../store/store.ts";
 import LoggerCore from "@App/app/logger/core.ts";
+import { message } from "../store/global.ts";
+import MessageWriter from "@App/app/logger/message_writer.ts";
 import "@arco-design/web-react/dist/css/arco.css";
 import "@App/locales/locales";
 import "@App/index.css";
 import "./index.css";
-import { Provider } from "react-redux";
-import { store } from "../store/store.ts";
-import MessageWriter from "@App/app/logger/message_writer.ts";
-import { message } from "../store/global.ts";
 
 // 初始化日志组件
 const loggerCore = new LoggerCore({
diff --git a/src/pages/store/features/config.ts b/src/pages/store/features/config.ts
@@ -1,4 +1,3 @@
-import { SystemConfig } from "@App/pkg/config/config";
 import { createAppSlice } from "../hooks";
 import { PayloadAction } from "@reduxjs/toolkit";
 import { editor } from "monaco-editor";
diff --git a/src/pages/store/features/script.ts b/src/pages/store/features/script.ts
@@ -13,7 +13,6 @@ import {
   ValueClient,
 } from "@App/app/service/service_worker/client";
 import { message } from "../global";
-import { stat } from "fs";
 
 export const scriptClient = new ScriptClient(message);
 export const subscribeClient = new SubscribeClient(message);
diff --git a/src/pages/store/global.ts b/src/pages/store/global.ts
@@ -1,8 +1,11 @@
+import { MessageQueue } from "@Packages/message/message_queue";
 import { SystemConfig } from "@App/pkg/config/config";
 import { ExtensionMessage } from "@Packages/message/extension_message";
-import { MessageQueue } from "@Packages/message/message_queue";
+import { initLocales } from "@App/locales/locales";
 
-export const message = new ExtensionMessage();
 export const messageQueue = new MessageQueue();
 export const systemConfig = new SystemConfig(messageQueue);
 export const globalCache = new Map<string, any>();
+export const message = new ExtensionMessage();
+
+initLocales(systemConfig);
diff --git a/src/pkg/config/config.ts b/src/pkg/config/config.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import { SystemConfig } from "@App/pkg/config/config";`
`2`	`1`	`import { AuthVerify } from "../auth";`
`3`	`2`	`import FileSystem, { File, FileReader, FileWriter } from "../filesystem";`
`4`	`3`	`import { joinPath } from "../utils";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import i18next from "i18next";`
`2`	`1`	`import BaiduFileSystem from "./baidu/baidu";`
`3`	`2`	`import FileSystem from "./filesystem";`
`4`	`3`	`import GoogleDriveFileSystem from "./googledrive/googledrive";`