From 318da135b9c04cbd8759f5a5a2e33b88d6c8a6f9 Mon Sep 17 00:00:00 2001
From: nap0o <144927971+nap0o@users.noreply.github.com>
Date: Fri, 4 Oct 2024 11:35:44 -0400
Subject: [PATCH] =?UTF-8?q?improve:=20status-server=E4=B8=BB=E9=A2=98agent?=
 =?UTF-8?q?=E8=B4=A6=E5=8D=95=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=20(#425)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 支持价格和期限单独设置
2. 账单信息附加到group分组控制
3. 一些其他优化
---
 .../theme-server-status/home-group-false.html |  26 ++--
 .../theme-server-status/home-group-true.html  |  26 ++--
 .../template/theme-server-status/home.html    | 129 ++++++++++++++----
 3 files changed, 128 insertions(+), 53 deletions(-)

diff --git a/resource/template/theme-server-status/home-group-false.html b/resource/template/theme-server-status/home-group-false.html
index 6d86c7b..12ccf0e 100644
--- a/resource/template/theme-server-status/home-group-false.html
+++ b/resource/template/theme-server-status/home-group-false.html
@@ -6,7 +6,7 @@
         <th class="node-cell name center">{{tr "Name"}}</th>
         <th class="node-cell os center">{{tr "Platform"}}</th>
         <th class="node-cell location center">{{tr "Location"}}</th>
-        <th v-if="additional && Object.values(additional).filter(item => item.price).length > 0" class="node-cell price center">{{tr "Price"}}</th>
+        <th v-if="nodesNoTag.some(item => item.additional && item.additional.price && Object.keys(item.additional.price).length > 0)" class="node-cell price center">{{tr "Price"}}</th>
         <th class="node-cell uptime center">{{tr "Uptime"}}</th>
         <th class="node-cell load center">{{tr "Load"}}</th>
         <th class="node-cell network center">{{tr "NetSpeed"}}↓|↑</th>
@@ -14,7 +14,7 @@
         <th class="node-cell cpu center">{{tr "CpuUsed"}}</th>
         <th class="node-cell memory center">{{tr "MemUsed"}}</th>
         <th class="node-cell hdd center">{{tr "DiskUsed"}}</th>
-        <th v-if="additional && Object.values(additional).filter(item => item.remaining).length > 0" class="node-cell remaining center">{{tr "Remaining"}}</th>
+        <th v-if="nodesNoTag.some(item => item.additional && item.additional.remaining && Object.keys(item.additional.remaining).length > 0)" class="node-cell remaining center">{{tr "Remaining"}}</th>
     </tr>
     </thead>
     <tbody id="servers">
@@ -38,10 +38,10 @@
                 <i :class="'fi fi-' + node.location"></i>
                 <span class="node-cell-location-text text-uppercase">@#node.location#@</span>
             </td>
-            <td v-if="additional && Object.values(additional).filter(item => item.price).length > 0" class="node-cell price center">
-                <template v-if="additional[node.ID] && additional[node.ID].price">
-                    <span v-if="additional[node.ID].price.amount == 0" class="node-cell-price-text">Free</span>
-                    <span v-else class="node-cell-price-text">@#additional[node.ID].price.amount#@@#(additional[node.ID].price.cycle ? '/' + additional[node.ID].price.cycle : '')#@</span>
+            <td v-if="nodesNoTag.some(item => item.additional && item.additional.price && Object.keys(item.additional.price).length > 0)" class="node-cell price center">
+                <template v-if="node.additional && node.additional.price">
+                    <span v-if="node.additional.price.amount == 0" class="node-cell-price-text">Free</span>
+                    <span v-else class="node-cell-price-text">@#node.additional.price.amount#@@#(node.additional.price.cycle ? '/' + node.additional.price.cycle : '')#@</span>
                 </template>
             </td>
             <td style="text-align: center;" class="node-cell uptime">@#node.uptime#@</td>
@@ -67,16 +67,16 @@
                     </div>
                 </div>
             </td>
-            <td v-if="additional && Object.values(additional).filter(item => item.remaining).length > 0" class="node-cell remaining">
+            <td v-if="nodesNoTag.some(item => item.additional && item.additional.remaining && Object.keys(item.additional.remaining).length > 0)" class="node-cell remaining">
                 <div :class="['progress', node.online ? 'progress-online' : 'progress-offline']">
-                    <template v-if="additional[node.ID] && additional[node.ID].remaining.format">
-                        <div :style="additional[node.ID].remaining.format.style" :class="additional[node.ID].remaining.days == 'lifetime' ? '' : additional[node.ID].remaining.format.class"></div>
+                    <template v-if="node.additional && node.additional.remaining.format">
+                        <div :style="node.additional.remaining.format.style" :class="node.additional.remaining.days == 'lifetime' ? '' : node.additional.remaining.format.class"></div>
                         <div class="additional">
-                            <small v-if="additional[node.ID].remaining.days == 'lifetime'">{{tr "Lifetime"}}</small>
-                            <small v-else-if="additional[node.ID].remaining.days < 0">{{tr "Expired"}}</small>
+                            <small v-if="node.additional.remaining.days == 'lifetime'">{{tr "Lifetime"}}</small>
+                            <small v-else-if="node.additional.remaining.days < 0">{{tr "Expired"}}</small>
                             <small v-else>
-                                <span class="node-cell-remaining-days">@#additional[node.ID].remaining.days#@{{tr "Days"}}</span>
-                                <span class="node-cell-remaining-percent">@#additional[node.ID].remaining.percent#@%</span>
+                                <span class="node-cell-remaining-days">@#node.additional.remaining.days#@{{tr "Days"}}</span>
+                                <span class="node-cell-remaining-percent">@#node.additional.remaining.percent#@%</span>
                             </small>
                         </div>
                     </template>
diff --git a/resource/template/theme-server-status/home-group-true.html b/resource/template/theme-server-status/home-group-true.html
index 8fd51b9..2f9593e 100644
--- a/resource/template/theme-server-status/home-group-true.html
+++ b/resource/template/theme-server-status/home-group-true.html
@@ -9,7 +9,7 @@
         <th class="node-cell name center">{{tr "Name"}}</th>
         <th class="node-cell os center">{{tr "Platform"}}</th>
         <th class="node-cell location center">{{tr "Location"}}</th>
-        <th v-if="additional && Object.values(additional).filter(item => item.price).length > 0" class="node-cell price center">{{tr "Price"}}</th>
+        <th v-if="group.data.some(item => item.additional && item.additional.price && Object.keys(item.additional.price).length > 0)" class="node-cell price center">{{tr "Price"}}</th>
         <th class="node-cell uptime center">{{tr "Uptime"}}</th>
         <th class="node-cell load center">{{tr "Load"}}</th>
         <th class="node-cell network center">{{tr "NetSpeed"}}↓|↑</th>
@@ -17,7 +17,7 @@
         <th class="node-cell cpu center">{{tr "CpuUsed"}}</th>
         <th class="node-cell memory center">{{tr "MemUsed"}}</th>
         <th class="node-cell hdd center">{{tr "DiskUsed"}}</th>
-        <th v-if="additional && Object.values(additional).filter(item => item.remaining).length > 0" class="node-cell remaining center">{{tr "Remaining"}}</th>
+        <th v-if="group.data.some(item => item.additional && item.additional.remaining && Object.keys(item.additional.remaining).length > 0)" class="node-cell remaining center">{{tr "Remaining"}}</th>
     </tr>
     </thead>
     <tbody id="servers">
@@ -41,10 +41,10 @@
                 <i :class="'fi fi-' + node.location"></i>
                 <span class="node-cell-location-text text-uppercase">&nbsp;@#node.location#@</span>
             </td>
-            <td v-if="additional && Object.values(additional).filter(item => item.price).length > 0" class="node-cell price center">
-                <template v-if="additional[node.ID] && additional[node.ID].price">
-                    <span v-if="additional[node.ID].price.amount == 0" class="node-cell-price-text">Free</span>
-                    <span v-else class="node-cell-price-text">@#additional[node.ID].price.amount#@@#(additional[node.ID].price.cycle ? '/' + additional[node.ID].price.cycle : '')#@</span>
+            <td v-if="group.data.some(item => item.additional && item.additional.price && Object.keys(item.additional.price).length > 0)" class="node-cell price center">
+                <template v-if="node.additional && node.additional.price">
+                    <span v-if="node.additional.price.amount == 0" class="node-cell-price-text">Free</span>
+                    <span v-else class="node-cell-price-text">@#node.additional.price.amount#@@#(node.additional.price.cycle ? '/' + node.additional.price.cycle : '')#@</span>
                 </template>
             </td>
             <td style="text-align: center;" class="node-cell uptime">@#node.uptime#@</td>
@@ -70,16 +70,16 @@
                     </div>
                 </div>
             </td>
-            <td v-if="additional && Object.values(additional).filter(item => item.remaining).length > 0" class="node-cell remaining">
+            <td v-if="group.data.some(item => item.additional && item.additional.remaining && Object.keys(item.additional.remaining).length > 0)" class="node-cell remaining">
                 <div :class="['progress', node.online ? 'progress-online' : 'progress-offline']">
-                    <template v-if="additional[node.ID] && additional[node.ID].remaining.format">
-                        <div :style="additional[node.ID].remaining.format.style" :class="additional[node.ID].remaining.days == 'lifetime' ? '' : additional[node.ID].remaining.format.class"></div>
+                    <template v-if="node.additional && node.additional.remaining.format">
+                        <div :style="node.additional.remaining.format.style" :class="node.additional.remaining.days == 'lifetime' ? '' : node.additional.remaining.format.class"></div>
                         <div class="additional">
-                            <small v-if="additional[node.ID].remaining.days == 'lifetime'">{{tr "Lifetime"}}</small>
-                            <small v-else-if="additional[node.ID].remaining.days < 0">{{tr "Expired"}}</small>
+                            <small v-if="node.additional.remaining.days == 'lifetime'">{{tr "Lifetime"}}</small>
+                            <small v-else-if="node.additional.remaining.days < 0">{{tr "Expired"}}</small>
                             <small v-else>
-                                <span class="node-cell-remaining-days">@#additional[node.ID].remaining.days#@{{tr "Days"}}</span>
-                                <span class="node-cell-remaining-percent">@#additional[node.ID].remaining.percent#@%</span>
+                                <span class="node-cell-remaining-days">@#node.additional.remaining.days#@{{tr "Days"}}</span>
+                                <span class="node-cell-remaining-percent">@#node.additional.remaining.percent#@%</span>
                             </small>
                         </div>
                     </template>
diff --git a/resource/template/theme-server-status/home.html b/resource/template/theme-server-status/home.html
index d930594..30aa5fe 100644
--- a/resource/template/theme-server-status/home.html
+++ b/resource/template/theme-server-status/home.html
@@ -72,10 +72,25 @@
         mixins: [mixinsVue],
         created() {
             this.servers = JSON.parse('{{.Servers}}').servers;
+            this.additional = this.initAdditional(this.servers);
             if(this.showGroup) {
                 this.nodesTag = this.groupingData(this.handleNodes(this.servers),"Tag");
+                this.nodesTag.forEach(group => {
+                    group.data.forEach(item => {
+                        const additionalData = this.additional[item.ID];
+                        if (additionalData) {
+                            item.additional = additionalData; // 添加 additional 属性
+                        }
+                    });
+                });
             } else {
                 this.nodesNoTag = this.handleNodes(this.servers);
+                this.nodesNoTag.forEach(item => {
+                    const additionalData = this.additional[item.ID];
+                    if (additionalData) {
+                        item.additional = additionalData; // 添加 additional 属性
+                    }
+                });
             }
             this.initCountryMap().then(countryMap => {
                 this.countryMap = countryMap;
@@ -83,7 +98,6 @@
                 this.countryServer = this.initCountryServer();
                 this.countryMapChartData = this.initCountryMapChartData();
             });
-            this.additional = this.initAdditional(this.servers);
         },
         mounted() {
             // 初始化时建立WebSocket连接
@@ -103,18 +117,42 @@
             initAdditional(servers) {
                 let nodes = {};
                 servers?.forEach(server => {
-                    if(server.PublicNote) {
+                    if (server.PublicNote) {
+                        const remainingFormat = this.getRemainingFormat(server.live, server.PublicNote);
+                        const remainingDays = this.getRemainingDays(this.getNoteElementValue(server.PublicNote, "billingDataMod", "endDate"), server.PublicNote);
+                        const remainingPercent = this.getRemainingPercent(
+                            this.getNoteElementValue(server.PublicNote, "billingDataMod", "startDate"),
+                            this.getNoteElementValue(server.PublicNote, "billingDataMod", "endDate"),
+                            server.PublicNote
+                        );
+                        const priceAmount = this.getNoteElementValue(server.PublicNote, "billingDataMod", "amount");
+                        const priceCycle = this.getNoteElementValue(server.PublicNote, "billingDataMod", "cycle");
+
+                        // 初始化节点
                         nodes[server.ID] = {
-                            "remaining": {
-                                format: this.getRemainingFormat(server.live, server.PublicNote),
-                                days: this.getRemainingDays(this.getNoteElementValue(server.PublicNote, "billingDataMod", "endDate"),server.PublicNote),
-                                percent: this.toFixed2(100 - this.getRemainingPercent(this.getNoteElementValue(server.PublicNote, "billingDataMod", "startDate"), this.getNoteElementValue(server.PublicNote, "billingDataMod", "endDate"), server.PublicNote))
-                            },
-                            "price": {
-                                amount: this.getNoteElementValue(server.PublicNote, "billingDataMod", "amount"),
-                                cycle: this.getNoteElementValue(server.PublicNote, "billingDataMod", "cycle")
-                            }
+                            "remaining": {},
+                            "price": {}
                         };
+
+                        if (remainingFormat) {
+                            nodes[server.ID].remaining.format = remainingFormat;
+                        }
+
+                        if (remainingDays) {
+                            nodes[server.ID].remaining.days = remainingDays;
+                        }
+
+                        if (remainingPercent) {
+                            nodes[server.ID].remaining.percent = this.toFixed2(100 - remainingPercent);
+                        }
+
+                        if (priceAmount) {
+                            nodes[server.ID].price.amount = priceAmount;
+                        }
+
+                        if (priceCycle && priceAmount) {
+                            nodes[server.ID].price.cycle = priceCycle;
+                        }
                     }
                 });
                 return nodes;
@@ -416,8 +454,22 @@
                     }
                     if(this.showGroup) {
                         this.nodesTag = this.groupingData(this.handleNodes(data.servers),"Tag");
+                        this.nodesTag.forEach(group => {
+                            group.data.forEach(item => {
+                                const additionalData = this.additional[item.ID];
+                                if (additionalData) {
+                                    item.additional = additionalData; // 添加 additional 属性
+                                }
+                            });
+                        });
                     } else {
                         this.nodesNoTag = this.handleNodes(data.servers);
+                        this.nodesNoTag.forEach(item => {
+                            const additionalData = this.additional[item.ID];
+                            if (additionalData) {
+                                item.additional = additionalData; // 添加 additional 属性
+                            }
+                        });
                     }
                 }
                 this.ws.onclose = () => {
@@ -528,7 +580,7 @@
                         }
                     })
                     .catch(error => {
-                        console.error('Error fetching data:', error);
+                        console.log('Error fetching data:', error);
                     });
             },
             renderCharts(id, reload = false) {
@@ -807,7 +859,7 @@
 
                 // 如果 expiration 无效，返回 null 并记录日志
                 if (isNaN(expiration.getTime())) {
-                    console.error("getAutoRenewalEndDate: Invalid expiration format");
+                    console.log("getAutoRenewalEndDate: Invalid expiration format");
                 }
 
                 const result = {
@@ -924,7 +976,7 @@
 
                 // 检查 startDate 格式是否有效，若无效返回 null
                 if (isNaN(start.getTime())) {
-                    console.error("getAutoRenewalStartDate: Invalid startDate format");
+                    console.log("getAutoRenewalStartDate: Invalid startDate format");
                 }
 
                 // 如果 flag 为 0，直接返回开始日期
@@ -976,31 +1028,47 @@
                 if (!note) return null;
                 const startDate = this.getNoteElementValue(note, "billingDataMod", "startDate");
                 const endDate = this.getNoteElementValue(note, "billingDataMod", "endDate");
-                
+
                 // 检查 startDate 和 endDate 是否有效
                 if (!startDate || !endDate || typeof startDate !== 'string' || typeof endDate !== 'string') {
-                    console.error("getRemainingFormat: Invalid startDate or endDate in note");
                     return null; // 如果无效，返回 null 或其他错误处理逻辑
                 }
 
-                //处理特殊时间格式
+                // 处理特殊时间格式
                 if (startDate.includes('0000-00-00') || endDate.includes("0000-00-00")) {
                     return this.formatPercents(online, this.toFixed2(100));
-                } else {
-                    const percent = this.getRemainingPercent(startDate, endDate, note);
-                    return this.formatPercents(online, this.toFixed2(percent));                    
                 }
+
+                // 检查 startDate 和 endDate 是否为合法的Date
+                if (isNaN(new Date(startDate).getTime()) || isNaN(new Date(endDate).getTime())) {
+                    return {
+                        "class": "",
+                        "style": "width: 0%",
+                        "percent": "0"
+                    }
+                }
+
+                //处理特殊时间格式
+                const percent = this.getRemainingPercent(startDate, endDate, note);
+                return this.formatPercents(online, this.toFixed2(percent));                    
+                
             },
             getRemainingDays(endDate, note) {
                 // 检查 endDate 是否有效
                 if (!endDate || typeof endDate !== 'string') {
-                    console.error("getRemainingDays: Invalid endDate format");
                     return null;
                 }
 
                 // 处理特殊时间格式
-                if (endDate.includes("0000-00-00")) return "lifetime";
+                if (endDate.includes("0000-00-00")) {
+                    return "lifetime";
+                }
 
+                // 检查 startDate 和 endDate 是否为合法的Date
+                if (isNaN(new Date(endDate).getTime())) {
+                    return "NaN";
+                }
+                
                 // 获取当前时间，并调整时区
                 const currentTime = this.getAdjustTimezone(new Date(endDate), new Date());
 
@@ -1025,13 +1093,20 @@
             },
             getRemainingPercent(startDate, endDate, note) {
                 // 检查 startDate 和 endDate 是否为有效字符串并处理特殊格式
-                if (typeof startDate !== 'string' || typeof endDate !== 'string') {
-                    console.error("getRemainingPercent: Invalid startDate or endDate format");
+                if (!startDate || !endDate || typeof startDate !== 'string' || typeof endDate !== 'string') {
                     return null;
                 }
-                
-                if (startDate.includes("0000-00-00") || endDate.includes("0000-00-00")) return 100;
 
+                // 处理特殊时间格式
+                if (startDate.includes("0000-00-00") || endDate.includes("0000-00-00")) {
+                    return 100;
+                }
+
+                // 检查 startDate 和 endDate 是否为合法的Date
+                if (isNaN(new Date(startDate).getTime()) || isNaN(new Date(endDate).getTime())) {
+                    return "NaN";
+                }
+                
                 // 获取当前时间并调整时区
                 const now = this.getAdjustTimezone(new Date(endDate), new Date());
 
@@ -1056,7 +1131,7 @@
 
                 // 计算剩余百分比
                 if (now < start) {
-                    return 0;
+                    return 0.01; //避免当条件判断!percent被过滤
                 }
                 if (now >= end) {
                     return 100;