etkr4k/bedolaga-cabinet
1
0
Fork 0
mirror of https://github.com/chillpadclub/bedolaga-cabinet.git synced 2026-07-30 02:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: update remnawave API types for v2.7.0

Browse Source 
- ServerInfo: remove cpu_physical_cores, memory_available
- NodeInfo: replace cpu_count/cpu_model/total_ram with versions/system,
  xray_uptime changed to number, users_online now required
- NodeStatus: same field updates, remove dead uptime field
- Extract formatUptime to shared utils/format.ts
- Update AdminRemnawave and AdminDashboard components
This commit is contained in:
Fringg
2026-03-28 22:32:22 +03:00
parent 59e65283e1
commit a34a34204c
5 changed files with 56 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/pages/AdminRemnawave.tsx
View File

@@ -10,6 +10,7 @@ import {
AutoSyncStatus,
} from '../api/adminRemnawave';
import { usePlatform } from '../platform/hooks/usePlatform';
import { formatUptime } from '../utils/format';
import {
ServerIcon,
ChartIcon,
@@ -43,16 +44,6 @@ const formatBytes = (bytes: number): string => {
return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
};
const formatUptime = (seconds: number): string => {
const days = Math.floor(seconds / 86400);
const hours = Math.floor((seconds % 86400) / 3600);
const minutes = Math.floor((seconds % 3600) / 60);
if (days > 0) return `${days}d ${hours}h`;
if (hours > 0) return `${hours}h ${minutes}m`;
return `${minutes}m`;
};
const getCountryFlag = (code: string | null | undefined): string => {
if (!code) return '🌍';
const codeMap: Record<string, string> = {
@@ -175,11 +166,12 @@ function NodeCard({ node, onAction, isLoading }: NodeCardProps) {
{t('admin.remnawave.nodes.trafficUsed', 'used')}
</span>
)}
{node.xray_uptime && (
{node.xray_uptime > 0 && (
<span>
{t('admin.remnawave.nodes.uptimeLabel', 'Uptime')}: {node.xray_uptime}
{t('admin.remnawave.nodes.uptimeLabel', 'Uptime')}: {formatUptime(node.xray_uptime)}
</span>
)}
{node.versions?.xray && <span>Xray {node.versions.xray}</span>}
</div>
</div>
@@ -355,15 +347,9 @@ function OverviewTab({ stats, isLoading, onRefresh }: OverviewTabProps) {
);
}
// Use (total - available) instead of raw "used" to exclude disk cache/buffers
// This matches what htop/free show as actual application memory usage
const memoryActualUsed =
stats.server_info.memory_available > 0
? stats.server_info.memory_total - stats.server_info.memory_available
: stats.server_info.memory_used;
const memoryUsedPercent =
stats.server_info.memory_total > 0
? Math.round((memoryActualUsed / stats.server_info.memory_total) * 100)
? Math.round((stats.server_info.memory_used / stats.server_info.memory_total) * 100)
: 0;
return (
@@ -437,14 +423,14 @@ function OverviewTab({ stats, isLoading, onRefresh }: OverviewTabProps) {
<div className="grid grid-cols-2 gap-3 lg:grid-cols-3">
<StatCard
label={t('admin.remnawave.overview.cpu', 'CPU Cores')}
value={`${stats.server_info.cpu_cores} (${stats.server_info.cpu_physical_cores} physical)`}
value={stats.server_info.cpu_cores}
icon={<span className="text-lg">⚡</span>}
color="accent"
/>
<StatCard
label={t('admin.remnawave.overview.memory', 'Memory')}
value={`${memoryUsedPercent}%`}
subValue={`${formatBytes(memoryActualUsed)} / ${formatBytes(stats.server_info.memory_total)}`}
subValue={`${formatBytes(stats.server_info.memory_used)} / ${formatBytes(stats.server_info.memory_total)}`}
icon={<span className="text-lg">💾</span>}
color={memoryUsedPercent > 80 ? 'red' : memoryUsedPercent > 60 ? 'orange' : 'green'}
/>