chore: adjust type

src/components/connection/connection-item.tsx

@@ -23,7 +23,7 @@ const Tag = styled("span")(({ theme }) => ({
 }));
 
 interface Props {
-  value: ApiType.ConnectionsItem;
+  value: IConnectionsItem;
 }
 
 const ConnectionItem = (props: Props) => {

src/components/connection/connection-table.tsx

@@ -4,7 +4,7 @@ import { DataGrid, GridColDef } from "@mui/x-data-grid";
 import parseTraffic from "@/utils/parse-traffic";
 
 interface Props {
-  connections: ApiType.ConnectionsItem[];
+  connections: IConnectionsItem[];
 }
 
 const ConnectionTable = (props: Props) => {

src/components/layout/layout-traffic.tsx

@@ -45,7 +45,7 @@ const LayoutTraffic = () => {
       ws = new WebSocket(`ws://${server}/traffic?token=${secret}`);
 
       ws.addEventListener("message", (event) => {
-        const data = JSON.parse(event.data) as ApiType.TrafficItem;
+        const data = JSON.parse(event.data) as ITrafficItem;
         trafficRef.current?.appendData(data);
         setTraffic(data);
       });

src/components/layout/use-log-setup.ts

@@ -21,7 +21,7 @@ export default function useLogSetup() {
     getClashLogs().then(setLogData);
 
     const handler = (event: MessageEvent<any>) => {
-      const data = JSON.parse(event.data) as ApiType.LogItem;
+      const data = JSON.parse(event.data) as ILogItem;
       const time = dayjs().format("MM-DD HH:mm:ss");
       setLogData((l) => {
         if (l.length >= MAX_LOG_NUM) l.shift();

src/components/log/log-item.tsx

@@ -20,7 +20,7 @@ const Item = styled(Box)(({ theme }) => ({
 }));
 
 interface Props {
-  value: ApiType.LogItem;
+  value: ILogItem;
 }
 
 const LogItem = (props: Props) => {

src/components/profile/enhanced.tsx

@@ -14,7 +14,7 @@ import ProfileMore from "./profile-more";
 import Notice from "../base/base-notice";
 
 interface Props {
-  items: CmdType.ProfileItem[];
+  items: IProfileItem[];
   chain: string[];
 }
 

src/components/profile/info-editor.tsx

@@ -21,7 +21,7 @@ import Notice from "../base/base-notice";
 
 interface Props {
   open: boolean;
-  itemData: CmdType.ProfileItem;
+  itemData: IProfileItem;
   onClose: () => void;
 }
 

src/components/profile/profile-item.tsx

@@ -29,7 +29,7 @@ const round = keyframes`
 
 interface Props {
   selected: boolean;
-  itemData: CmdType.ProfileItem;
+  itemData: IProfileItem;
   onSelect: (force: boolean) => void;
 }
 
@@ -117,7 +117,7 @@ const ProfileItem = (props: Props) => {
     setAnchorEl(null);
     setLoadingCache((cache) => ({ ...cache, [itemData.uid]: true }));
 
-    const option: Partial<CmdType.ProfileOption> = {};
+    const option: Partial<IProfileOption> = {};
 
     if (type === 0) {
       option.with_proxy = false;

src/components/profile/profile-more.tsx

@@ -21,7 +21,7 @@ import Notice from "../base/base-notice";
 
 interface Props {
   selected: boolean;
-  itemData: CmdType.ProfileItem;
+  itemData: IProfileItem;
   enableNum: number;
   logInfo?: [string, string][];
   onEnable: () => void;

src/components/proxy/proxy-global.tsx

@@ -13,7 +13,7 @@ import ProxyItem from "./proxy-item";
 interface Props {
   groupName: string;
   curProxy?: string;
-  proxies: ApiType.ProxyItem[];
+  proxies: IProxyItem[];
 }
 
 // this component will be used for DIRECT/GLOBAL

src/components/proxy/proxy-group.tsx

@@ -30,7 +30,7 @@ import ProxyHead from "./proxy-head";
 import ProxyItem from "./proxy-item";
 
 interface Props {
-  group: ApiType.ProxyGroupItem;
+  group: IProxyGroupItem;
 }
 
 const ProxyGroup = ({ group }: Props) => {

src/components/proxy/proxy-item.tsx

@@ -17,7 +17,7 @@ import BaseLoading from "../base/base-loading";
 
 interface Props {
   groupName: string;
-  proxy: ApiType.ProxyItem;
+  proxy: IProxyItem;
   selected: boolean;
   showType?: boolean;
   sx?: SxProps<Theme>;

src/components/proxy/use-filter-sort.ts

@@ -5,7 +5,7 @@ import delayManager from "@/services/delay";
 export type ProxySortType = 0 | 1 | 2;
 
 export default function useFilterSort(
-  proxies: ApiType.ProxyItem[],
+  proxies: IProxyItem[],
   groupName: string,
   filterText: string,
   sortType: ProxySortType
@@ -47,7 +47,7 @@ const regex2 = /type=(.*)/i;
  * according to the regular conditions
  */
 function filterProxies(
-  proxies: ApiType.ProxyItem[],
+  proxies: IProxyItem[],
   groupName: string,
   filterText: string
 ) {
@@ -87,7 +87,7 @@ function filterProxies(
  * sort the proxy
  */
 function sortProxies(
-  proxies: ApiType.ProxyItem[],
+  proxies: IProxyItem[],
   groupName: string,
   sortType: ProxySortType
 ) {

src/components/rule/rule-item.tsx

@@ -19,7 +19,7 @@ const COLOR = [
 
 interface Props {
   index: number;
-  value: ApiType.RuleItem;
+  value: IRuleItem;
 }
 
 const parseColor = (text: string) => {

src/components/setting/mods/sysproxy-viewer.tsx

@@ -89,7 +89,7 @@ const SysproxyViewer = ({ handler }: Props) => {
       return;
     }
 
-    const patch: Partial<CmdType.VergeConfig> = {};
+    const patch: Partial<IVergeConfig> = {};
 
     if (value.guard !== enable_proxy_guard) {
       patch.enable_proxy_guard = value.guard;

src/components/setting/mods/theme-mode-switch.tsx

@@ -1,7 +1,7 @@
 import { useTranslation } from "react-i18next";
 import { Button, ButtonGroup } from "@mui/material";
 
-type ThemeValue = CmdType.VergeConfig["theme_mode"];
+type ThemeValue = IVergeConfig["theme_mode"];
 
 interface Props {
   value?: ThemeValue;

src/components/setting/setting-clash.tsx

@@ -46,10 +46,10 @@ const SettingClash = ({ onError }: Props) => {
   const controllerHandler = useModalHandler();
 
   const onSwitchFormat = (_e: any, value: boolean) => value;
-  const onChangeData = (patch: Partial<ApiType.ConfigData>) => {
+  const onChangeData = (patch: Partial<IConfigData>) => {
     mutateClash((old) => ({ ...(old! || {}), ...patch }), false);
   };
-  const onUpdateData = async (patch: Partial<ApiType.ConfigData>) => {
+  const onUpdateData = async (patch: Partial<IConfigData>) => {
     await updateConfigs(patch);
     await patchClashConfig(patch);
   };

src/components/setting/setting-system.tsx

@@ -46,7 +46,7 @@ const SettingSystem = ({ onError }: Props) => {
   } = vergeConfig ?? {};
 
   const onSwitchFormat = (_e: any, value: boolean) => value;
-  const onChangeData = (patch: Partial<CmdType.VergeConfig>) => {
+  const onChangeData = (patch: Partial<IVergeConfig>) => {
     mutateVerge({ ...vergeConfig, ...patch }, false);
   };
 

src/components/setting/setting-verge.tsx

@@ -42,7 +42,7 @@ const SettingVerge = ({ onError }: Props) => {
   const [configOpen, setConfigOpen] = useState(false);
 
   const onSwitchFormat = (_e: any, value: boolean) => value;
-  const onChangeData = (patch: Partial<CmdType.VergeConfig>) => {
+  const onChangeData = (patch: Partial<IVergeConfig>) => {
     mutateVerge({ ...vergeConfig, ...patch }, false);
   };
 

src/hooks/use-verge-config.ts

@@ -4,7 +4,7 @@ import { getVergeConfig, patchVergeConfig } from "@/services/cmds";
 export const useVergeConfig = () => {
   const { data, mutate } = useSWR("getVergeConfig", getVergeConfig);
 
-  const patchVerge = async (value: Partial<CmdType.VergeConfig>) => {
+  const patchVerge = async (value: Partial<IVergeConfig>) => {
     await patchVergeConfig(value);
     mutate();
   };

src/pages/connections.tsx

@@ -22,14 +22,14 @@ import ConnectionTable from "@/components/connection/connection-table";
 
 const initConn = { uploadTotal: 0, downloadTotal: 0, connections: [] };
 
-type OrderFunc = (list: ApiType.ConnectionsItem[]) => ApiType.ConnectionsItem[];
+type OrderFunc = (list: IConnectionsItem[]) => IConnectionsItem[];
 
 const ConnectionsPage = () => {
   const { t, i18n } = useTranslation();
 
   const [filterText, setFilterText] = useState("");
   const [curOrderOpt, setOrderOpt] = useState("Default");
-  const [connData, setConnData] = useState<ApiType.Connections>(initConn);
+  const [connData, setConnData] = useState<IConnections>(initConn);
 
   const [setting, setSetting] = useRecoilState(atomConnectionSetting);
 
@@ -60,7 +60,7 @@ const ConnectionsPage = () => {
       ws = new WebSocket(`ws://${server}/connections?token=${secret}`);
 
       ws.addEventListener("message", (event) => {
-        const data = JSON.parse(event.data) as ApiType.Connections;
+        const data = JSON.parse(event.data) as IConnections;
 
         // 与前一次connections的展示顺序尽量保持一致
         setConnData((old) => {

src/services/api.ts

@@ -50,11 +50,11 @@ export async function getVersion() {
 /// Get current base configs
 export async function getClashConfig() {
   const instance = await getAxios();
-  return instance.get("/configs") as Promise<ApiType.ConfigData>;
+  return instance.get("/configs") as Promise<IConfigData>;
 }
 
 /// Update current configs
-export async function updateConfigs(config: Partial<ApiType.ConfigData>) {
+export async function updateConfigs(config: Partial<IConfigData>) {
   const instance = await getAxios();
   return instance.patch("/configs", config);
 }
@@ -63,7 +63,7 @@ export async function updateConfigs(config: Partial<ApiType.ConfigData>) {
 export async function getRules() {
   const instance = await getAxios();
   const response = await instance.get<any, any>("/rules");
-  return response?.rules as ApiType.RuleItem[];
+  return response?.rules as IRuleItem[];
 }
 
 /// Get Proxy delay
@@ -90,7 +90,7 @@ export async function updateProxy(group: string, proxy: string) {
 async function getProxiesInner() {
   const instance = await getAxios();
   const response = await instance.get<any, any>("/proxies");
-  return (response?.proxies || {}) as Record<string, ApiType.ProxyItem>;
+  return (response?.proxies || {}) as Record<string, IProxyItem>;
 }
 
 /// Get the Proxy information
@@ -116,7 +116,7 @@ export async function getProxies() {
 
   const { GLOBAL: global, DIRECT: direct, REJECT: reject } = proxyRecord;
 
-  let groups: ApiType.ProxyGroupItem[] = [];
+  let groups: IProxyGroupItem[] = [];
 
   if (global?.all) {
     groups = global.all
@@ -142,7 +142,7 @@ export async function getProxies() {
     )
   );
 
-  const _global: ApiType.ProxyGroupItem = {
+  const _global: IProxyGroupItem = {
     ...global,
     all: global?.all?.map((item) => generateItem(item)) || [],
   };
@@ -155,10 +155,7 @@ export async function getProviders() {
   const instance = await getAxios();
   const response = await instance.get<any, any>("/providers/proxies");
 
-  const providers = (response.providers || {}) as Record<
-    string,
-    ApiType.ProviderItem
-  >;
+  const providers = (response.providers || {}) as Record<string, IProviderItem>;
 
   return Object.fromEntries(
     Object.entries(providers).filter(([key, item]) => {
@@ -179,7 +176,7 @@ export async function providerHealthCheck(name: string) {
 export async function getConnections() {
   const instance = await getAxios();
   const result = await instance.get("/connections");
-  return result as any as ApiType.Connections;
+  return result as any as IConnections;
 }
 
 // Close specific connection

src/services/cmds.ts

@@ -21,23 +21,23 @@ export async function getClashLogs() {
       }
       return null;
     })
-    .filter(Boolean) as ApiType.LogItem[];
+    .filter(Boolean) as ILogItem[];
 }
 
 export async function getProfiles() {
-  return invoke<CmdType.ProfilesConfig>("get_profiles");
+  return invoke<IProfilesConfig>("get_profiles");
 }
 
 export async function enhanceProfiles() {
   return invoke<void>("enhance_profiles");
 }
 
-export async function patchProfilesConfig(profiles: CmdType.ProfilesConfig) {
+export async function patchProfilesConfig(profiles: IProfilesConfig) {
   return invoke<void>("patch_profiles_config", { profiles });
 }
 
 export async function createProfile(
-  item: Partial<CmdType.ProfileItem>,
+  item: Partial<IProfileItem>,
   fileData?: string | null
 ) {
   return invoke<void>("create_profile", { item, fileData });
@@ -62,10 +62,7 @@ export async function importProfile(url: string) {
   });
 }
 
-export async function updateProfile(
-  index: string,
-  option?: CmdType.ProfileOption
-) {
+export async function updateProfile(index: string, option?: IProfileOption) {
   return invoke<void>("update_profile", { index, option });
 }
 
@@ -75,13 +72,13 @@ export async function deleteProfile(index: string) {
 
 export async function patchProfile(
   index: string,
-  profile: Partial<CmdType.ProfileItem>
+  profile: Partial<IProfileItem>
 ) {
   return invoke<void>("patch_profile", { index, profile });
 }
 
 export async function getClashInfo() {
-  return invoke<CmdType.ClashInfo | null>("get_clash_info");
+  return invoke<IClashInfo | null>("get_clash_info");
 }
 
 export async function getRuntimeConfig() {
@@ -100,15 +97,15 @@ export async function getRuntimeLogs() {
   return invoke<Record<string, [string, string][]>>("get_runtime_logs");
 }
 
-export async function patchClashConfig(payload: Partial<ApiType.ConfigData>) {
+export async function patchClashConfig(payload: Partial<IConfigData>) {
   return invoke<void>("patch_clash_config", { payload });
 }
 
 export async function getVergeConfig() {
-  return invoke<CmdType.VergeConfig>("get_verge_config");
+  return invoke<IVergeConfig>("get_verge_config");
 }
 
-export async function patchVergeConfig(payload: CmdType.VergeConfig) {
+export async function patchVergeConfig(payload: IVergeConfig) {
   return invoke<void>("patch_verge_config", { payload });
 }
 

src/services/delay.ts

@@ -56,7 +56,7 @@ class DelayManager {
   }
 
   /// 暂时修复provider的节点延迟排序的问题
-  getDelayFix(proxy: ApiType.ProxyItem, group: string) {
+  getDelayFix(proxy: IProxyItem, group: string) {
     if (!proxy.provider) return this.getDelay(proxy.name, group);
 
     if (proxy.history.length > 0) {

src/services/states.ts

@@ -10,7 +10,7 @@ export const atomClashPort = atom<number>({
   default: 0,
 });
 
-export const atomLogData = atom<ApiType.LogItem[]>({
+export const atomLogData = atom<ILogItem[]>({
   key: "atomLogData",
   default: [],
 });
@@ -50,10 +50,10 @@ export const atomConnectionSetting = atom<IConnectionSetting>({
 
       try {
         const value = localStorage.getItem(key);
-        const data = value == null ? { layout: "list" } : JSON.parse(value);
+        const data = value == null ? { layout: "table" } : JSON.parse(value);
         setSelf(data);
       } catch {
-        setSelf({ layout: "list" });
+        setSelf({ layout: "table" });
       }
 
       onSet((newValue) => {

src/services/types.d.ts

@@ -1,8 +1,7 @@
 /**
  * Some interface for clash api
  */
-declare namespace ApiType {
-  interface ConfigData {
+interface IConfigData {
   port: number;
   mode: string;
   ipv6: boolean;
@@ -15,15 +14,15 @@ declare namespace ApiType {
   "tproxy-port": number;
   "external-controller": string;
   secret: string;
-  }
+}
 
-  interface RuleItem {
+interface IRuleItem {
   type: string;
   payload: string;
   proxy: string;
-  }
+}
 
-  interface ProxyItem {
+interface IProxyItem {
   name: string;
   type: string;
   udp: boolean;
@@ -34,32 +33,32 @@ declare namespace ApiType {
   all?: string[];
   now?: string;
   provider?: string; // 记录是否来自provider
-  }
+}
 
-  type ProxyGroupItem = Omit<ProxyItem, "all"> & {
-    all: ProxyItem[];
-  };
+type IProxyGroupItem = Omit<IProxyItem, "all"> & {
+  all: IProxyItem[];
+};
 
-  interface ProviderItem {
+interface IProviderItem {
   name: string;
   type: string;
-    proxies: ProxyItem[];
+  proxies: IProxyItem[];
   updatedAt: string;
   vehicleType: string;
-  }
+}
 
-  interface TrafficItem {
+interface ITrafficItem {
   up: number;
   down: number;
-  }
+}
 
-  interface LogItem {
+interface ILogItem {
   type: string;
   time?: string;
   payload: string;
-  }
+}
 
-  interface ConnectionsItem {
+interface IConnectionsItem {
   id: string;
   metadata: {
     network: string;
@@ -80,31 +79,30 @@ declare namespace ApiType {
   rulePayload: string;
   curUpload?: number; // upload speed, calculate at runtime
   curDownload?: number; // download speed, calculate at runtime
-  }
+}
 
-  interface Connections {
+interface IConnections {
   downloadTotal: number;
   uploadTotal: number;
-    connections: ConnectionsItem[];
-  }
+  connections: IConnectionsItem[];
 }
 
 /**
  * Some interface for command
  */
-declare namespace CmdType {
-  type ProfileType = "local" | "remote" | "merge" | "script";
 
-  interface ClashInfo {
+type IProfileType = "local" | "remote" | "merge" | "script";
+
+interface IClashInfo {
   status: string;
   port?: string; // clash mixed port
   server?: string; // external-controller
   secret?: string;
-  }
+}
 
-  interface ProfileItem {
+interface IProfileItem {
   uid: string;
-    type?: ProfileType | string;
+  type?: IProfileType | string;
   name?: string;
   desc?: string;
   file?: string;
@@ -120,24 +118,24 @@ declare namespace CmdType {
     total: number;
     expire: number;
   };
-    option?: ProfileOption;
-  }
+  option?: IProfileOption;
+}
 
-  interface ProfileOption {
+interface IProfileOption {
   user_agent?: string;
   with_proxy?: boolean;
   self_proxy?: boolean;
   update_interval?: number;
-  }
+}
 
-  interface ProfilesConfig {
+interface IProfilesConfig {
   current?: string;
   chain?: string[];
   valid?: string[];
-    items?: ProfileItem[];
-  }
+  items?: IProfileItem[];
+}
 
-  interface VergeConfig {
+interface IVergeConfig {
   language?: string;
   clash_core?: string;
   theme_mode?: "light" | "dark" | "system";
@@ -167,26 +165,26 @@ declare namespace CmdType {
   };
   auto_close_connection?: boolean;
   default_latency_test?: string;
-  }
+}
 
-  type ClashConfigValue = any;
+type IClashConfigValue = any;
 
-  interface ProfileMerge {
+interface IProfileMerge {
   // clash config fields (default supports)
-    rules?: ClashConfigValue;
-    proxies?: ClashConfigValue;
-    "proxy-groups"?: ClashConfigValue;
-    "proxy-providers"?: ClashConfigValue;
-    "rule-providers"?: ClashConfigValue;
+  rules?: IClashConfigValue;
+  proxies?: IClashConfigValue;
+  "proxy-groups"?: IClashConfigValue;
+  "proxy-providers"?: IClashConfigValue;
+  "rule-providers"?: IClashConfigValue;
   // clash config fields (use flag)
-    tun?: ClashConfigValue;
-    dns?: ClashConfigValue;
-    hosts?: ClashConfigValue;
-    script?: ClashConfigValue;
-    profile?: ClashConfigValue;
-    payload?: ClashConfigValue;
-    "interface-name"?: ClashConfigValue;
-    "routing-mark"?: ClashConfigValue;
+  tun?: IClashConfigValue;
+  dns?: IClashConfigValue;
+  hosts?: IClashConfigValue;
+  script?: IClashConfigValue;
+  profile?: IClashConfigValue;
+  payload?: IClashConfigValue;
+  "interface-name"?: IClashConfigValue;
+  "routing-mark"?: IClashConfigValue;
   // functional fields
   use?: string[];
   "prepend-rules"?: any[];
@@ -209,10 +207,10 @@ declare namespace CmdType {
   "tproxy-port"?: any;
   "geodata-mode"?: any;
   "tcp-concurrent"?: any;
-  }
+}
 
-  // partial of the clash config
-  type ProfileData = Partial<{
+// partial of the clash config
+type IProfileData = Partial<{
   rules: any[];
   proxies: any[];
   "proxy-groups": any[];
@@ -220,24 +218,23 @@ declare namespace CmdType {
   "rule-providers": any[];
 
   [k: string]: any;
-  }>;
+}>;
 
-  interface ChainItem {
-    item: ProfileItem;
-    merge?: ProfileMerge;
+interface IChainItem {
+  item: IProfileItem;
+  merge?: IProfileMerge;
   script?: string;
-  }
+}
 
-  interface EnhancedPayload {
-    chain: ChainItem[];
+interface IEnhancedPayload {
+  chain: IChainItem[];
   valid: string[];
-    current: ProfileData;
+  current: IProfileData;
   callback: string;
-  }
+}
 
-  interface EnhancedResult {
-    data: ProfileData;
+interface IEnhancedResult {
+  data: IProfileData;
   status: string;
   error?: string;
-  }
 }