Merge branch 'main' into cloudflare

README.md

@@ -5,7 +5,9 @@
 </div>
 
 > [!CAUTION]
-> 与哪吒监控 V1 暂不兼容，请保持在 V0 版本。
+> 此为 V0 兼容版本，V1 版本 issue 也可提出
+> 
+> 有关 V1 版本 pr 可移步 https://github.com/hamster1963/nezha-dash-react
 
 ### 部署
 

app/(main)/ClientComponents/ServerDetailClient.tsx

@@ -191,7 +191,19 @@ export default function ServerDetailClient({
             <section className="flex flex-col items-start gap-0.5">
               <p className="text-xs text-muted-foreground">{t("CPU")}</p>
               {data?.host.CPU ? (
-                <div className="text-xs"> {data?.host.CPU}</div>
+                <div className="text-xs"> {data?.host.CPU.join(", ")}</div>
+              ) : (
+                <div className="text-xs">Unknown</div>
+              )}
+            </section>
+          </CardContent>
+        </Card>
+        <Card className="rounded-[10px] bg-transparent border-none shadow-none">
+          <CardContent className="px-1.5 py-1">
+            <section className="flex flex-col items-start gap-0.5">
+              <p className="text-xs text-muted-foreground">{"GPU"}</p>
+              {data?.host.GPU ? (
+                <div className="text-xs"> {data?.host.GPU.join(", ")}</div>
               ) : (
                 <div className="text-xs">Unknown</div>
               )}

app/types/nezha-api.ts

@@ -35,7 +35,7 @@ export interface NezhaAPIHost {
   BootTime: number;
   CountryCode: string;
   Version: string;
-  GPU: null;
+  GPU: string[];
 }
 
 export interface NezhaAPIStatus {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nezha-dash",
-  "version": "1.6.2-fix",
+  "version": "1.6.3",
   "private": true,
   "scripts": {
     "dev": "next dev -p 3040",
@@ -26,7 +26,7 @@
     "@types/d3-geo": "^3.1.0",
     "@types/luxon": "^3.4.2",
     "@typescript-eslint/eslint-plugin": "^8.16.0",
-    "caniuse-lite": "^1.0.30001684",
+    "caniuse-lite": "^1.0.30001685",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "country-flag-icons": "^1.5.13",