@@ -1504,20 +1551,14 @@ export default function UserPage() {
setUserForm((prev) => ({ ...prev, pwd: e.target.value }))
}
/>
-
{
- const value = Math.min(
- Math.max(Number(e.target.value) || 0, 1),
- 99999,
- );
-
- setUserForm((prev) => ({ ...prev, flow: value }));
+ label="流量限制"
+ unit={userFlowUnit}
+ value={userFlowInput}
+ onChange={(value, unit) => {
+ setUserFlowInput(value);
+ setUserFlowUnit(unit);
}}
/>
限制:
- {formatFlow(userTunnel.flow, "gb")}
+ {formatFlowLimit(
+ userTunnel.flow,
+ userTunnel.flowMiB,
+ )}
@@ -2083,21 +2127,14 @@ export default function UserPage() {
{editTunnelForm && (
<>
- {
- const value = Math.min(
- Math.max(Number(e.target.value) || 0, 1),
- 99999,
- );
-
- setEditTunnelForm((prev) =>
- prev ? { ...prev, flow: value } : null,
- );
+ {
+ setTunnelFlowInput(value);
+ setTunnelFlowUnit(unit);
}}
/>
diff --git a/vite-frontend/src/types/index.ts b/vite-frontend/src/types/index.ts
index 3e07e15..d359274 100644
--- a/vite-frontend/src/types/index.ts
+++ b/vite-frontend/src/types/index.ts
@@ -12,6 +12,7 @@ export interface User {
pwd?: string;
status: number; // 1-正常, 0-禁用
flow: number; // 流量限制(GB)
+ flowMiB?: number; // 精确流量限制(MiB)，0 表示沿用旧版 GB 字段
num: number; // 转发数量
expTime?: number; // 过期时间戳
flowResetTime?: number; // 流量重置日期(1-31号)
@@ -56,6 +57,7 @@ export interface UserTunnel {
tunnelName: string;
status: number; // 1-正常, 0-禁用
flow: number; // 流量限制(GB)
+ flowMiB?: number;
num: number; // 转发数量
expTime: number; // 过期时间戳
flowResetTime: number;
diff --git a/vite-frontend/src/utils/traffic.ts b/vite-frontend/src/utils/traffic.ts
new file mode 100644
index 0000000..2f13c1f
--- /dev/null
+++ b/vite-frontend/src/utils/traffic.ts
@@ -0,0 +1,72 @@
+export type TrafficUnit = "MB" | "GB" | "TB" | "PB";
+
+export const MIB = 1024 * 1024;
+export const GIB = 1024 * MIB;
+
+export const TRAFFIC_UNIT_MIB: Record = {
+ MB: 1,
+ GB: 1024,
+ TB: 1024 ** 2,
+ PB: 1024 ** 3,
+};
+
+const BYTE_UNITS = ["B", "KB", "MB", "GB", "TB", "PB"];
+
+export function formatTraffic(bytes: number): string {
+ if (!Number.isFinite(bytes) || bytes <= 0) return "0 B";
+
+ let value = bytes;
+ let unit = 0;
+
+ while (value >= 1024 && unit < BYTE_UNITS.length - 1) {
+ value /= 1024;
+ unit++;
+ }
+
+ return `${unit === 0 ? Math.floor(value) : value.toFixed(2)} ${BYTE_UNITS[unit]}`;
+}
+
+export function flowLimitMiB(flowGB: number, flowMiB?: number): number {
+ return flowMiB && flowMiB > 0 ? flowMiB : flowGB * 1024;
+}
+
+export function flowLimitBytes(flowGB: number, flowMiB?: number): number {
+ return flowLimitMiB(flowGB, flowMiB) * MIB;
+}
+
+export function formatFlowLimit(flowGB: number, flowMiB?: number): string {
+ if (flowGB === 99999 && !flowMiB) return "无限制";
+
+ return formatTraffic(flowLimitBytes(flowGB, flowMiB));
+}
+
+export function preferredTrafficUnit(mib: number): TrafficUnit {
+ if (mib <= 0) return "GB";
+ if (mib > 0 && mib % TRAFFIC_UNIT_MIB.PB === 0) return "PB";
+ if (mib > 0 && mib % TRAFFIC_UNIT_MIB.TB === 0) return "TB";
+ if (mib > 0 && mib % TRAFFIC_UNIT_MIB.GB === 0) return "GB";
+
+ return "MB";
+}
+
+export function parseTrafficInput(
+ value: string,
+ unit: TrafficUnit,
+): number | null {
+ const amount = Number(value);
+ const mib = amount * TRAFFIC_UNIT_MIB[unit];
+
+ if (
+ !value.trim() ||
+ !Number.isFinite(amount) ||
+ amount <= 0 ||
+ !Number.isSafeInteger(mib)
+ ) {
+ return null;
+ }
+
+ // Backend stores bytes as int64. Keep the converted value within that range.
+ if (mib > 8_796_093_022_207) return null;
+
+ return mib;
+}