Skip to content

Commit 2916203

Browse files
committed
fix(ping): 输出去掉 TCP/端口等探测提示
用户可见结果只保留延迟/丢包等核心信息,不再展示 TCP:443、端口号等内部探测细节。
1 parent d4441c9 commit 2916203

1 file changed

Lines changed: 10 additions & 20 deletions

File tree

‎src/plugin/ping.ts‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ async function pingDataCenters(): Promise<string[]> {
610610
const tcp = await tcpingProbe(ip, [443, 80], 2, 3000);
611611
if (tcp) {
612612
results.push(
613-
`🌐 <b>DC${dc} (${dcLocation}):</b> <code>${tcp.avg}ms</code> <i>TCP:${tcp.port}</i>`
613+
`🌐 <b>DC${dc} (${dcLocation}):</b> <code>${tcp.avg}ms</code>`
614614
);
615615
continue;
616616
}
@@ -627,7 +627,7 @@ async function pingDataCenters(): Promise<string[]> {
627627
pingTime = String(Math.round(parseFloat(timeMatch[1])));
628628
}
629629
results.push(
630-
`🌐 <b>DC${dc} (${dcLocation}):</b> <code>${pingTime}ms</code> <i>ICMP</i>`
630+
`🌐 <b>DC${dc} (${dcLocation}):</b> <code>${pingTime}ms</code>`
631631
);
632632
} catch (error) {
633633
results.push(`🌐 <b>DC${dc} (${dcLocation}):</b> <code>超时</code>`);
@@ -663,7 +663,7 @@ function parseTarget(input: string): {
663663

664664
class PingPlugin extends Plugin {
665665

666-
description: string = `🏓 网络延迟测试工具\n\n• ${mainPrefix}ping - Telegram API延迟\n• ${mainPrefix}ping &lt;IP/域名&gt; - TCP 优先(fallback ICMP)\n• ${mainPrefix}ping dc1-dc5 - 数据中心延迟\n• ${mainPrefix}ping all - 所有数据中心延迟`;
666+
description: string = `🏓 网络延迟测试工具\n\n• ${mainPrefix}ping - Telegram API延迟\n• ${mainPrefix}ping &lt;IP/域名&gt; - 目标延迟测试\n• ${mainPrefix}ping dc1-dc5 - 数据中心延迟\n• ${mainPrefix}ping all - 所有数据中心延迟`;
667667
cmdHandlers: Record<string, (msg: Api.Message) => Promise<void>> = {
668668
ping: async (msg) => {
669669
const client = await getGlobalClient();
@@ -728,7 +728,7 @@ class PingPlugin extends Plugin {
728728
// 帮助信息
729729
if (target === "help" || target === "h") {
730730
await msg.edit({
731-
text: `🏓 <b>Ping工具使用说明</b>\n\n<b>基础用法:</b>\n• <code>${mainPrefix}ping</code> - Telegram延迟测试\n• <code>${mainPrefix}ping all</code> - 所有数据中心延迟\n\n<b>网络测试:</b>\n• <code>${mainPrefix}ping 8.8.8.8</code> - IP地址ping\n• <code>${mainPrefix}ping google.com</code> - 域名ping\n• <code>${mainPrefix}ping dc1</code> - 指定数据中心\n\n<b>数据中心:</b>\n• DC1-DC5: 分别对应不同地区服务器\n\n💡 <i>TCP(443/80) 优先(走 config/PM2 代理),系统 ping 仅作 fallback</i>`,
731+
text: `🏓 <b>Ping工具使用说明</b>\n\n<b>基础用法:</b>\n• <code>${mainPrefix}ping</code> - Telegram延迟测试\n• <code>${mainPrefix}ping all</code> - 所有数据中心延迟\n\n<b>网络测试:</b>\n• <code>${mainPrefix}ping 8.8.8.8</code> - IP地址ping\n• <code>${mainPrefix}ping google.com</code> - 域名ping\n• <code>${mainPrefix}ping dc1</code> - 指定数据中心\n\n<b>数据中心:</b>\n• DC1-DC5: 分别对应不同地区服务器\n\n💡 <i>支持 IP / 域名 / dc1-dc5;可走 config/PM2 代理</i>`,
732732
parseMode: "html",
733733
});
734734
return;
@@ -762,7 +762,7 @@ class PingPlugin extends Plugin {
762762
? " via proxy"
763763
: "";
764764
results.push(
765-
`🏓 <b>TCP Ping:</b> <code>${avgText}ms</code> (port ${tcpProbe.port}, 丢包: ${tcpProbe.loss}%, best ${tcpProbe.best}ms${proxyHint})`
765+
`🏓 <b>延迟:</b> <code>${avgText}ms</code> (丢包: ${tcpProbe.loss}%${proxyHint})`
766766
);
767767
} else {
768768
try {
@@ -771,40 +771,30 @@ class PingPlugin extends Plugin {
771771
const avgText =
772772
pingResult.avg === 0 ? "<1" : pingResult.avg.toString();
773773
results.push(
774-
`🏓 <b>ICMP Ping:</b> <code>${avgText}ms</code> (TCP 不可用, 丢包: ${pingResult.loss}%)`
774+
`🏓 <b>延迟:</b> <code>${avgText}ms</code> (丢包: ${pingResult.loss}%)`
775775
);
776776
} else {
777777
const httpResult = await httpPing(testTarget, false);
778778
if (httpResult > 0) {
779779
results.push(
780-
`🏓 <b>HTTP Ping:</b> <code>${httpResult}ms</code> (TCP/ICMP 不可用)`
780+
`🏓 <b>延迟:</b> <code>${httpResult}ms</code>`
781781
);
782782
} else {
783-
results.push(`🏓 <b>连通性:</b> <code>TCP/ICMP/HTTP 均不可用</code>`);
783+
results.push(`🏓 <b>连通性:</b> <code>不可达</code>`);
784784
}
785785
}
786786
} catch (_error: any) {
787787
const httpResult = await httpPing(testTarget, false);
788788
if (httpResult > 0) {
789789
results.push(
790-
`🏓 <b>HTTP Ping:</b> <code>${httpResult}ms</code> (TCP/ICMP 受限)`
790+
`🏓 <b>延迟:</b> <code>${httpResult}ms</code>`
791791
);
792792
} else {
793-
results.push(`🏓 <b>网络测试:</b> <code>TCP/ICMP/HTTP 均不可用</code>`);
793+
results.push(`🏓 <b>网络测试:</b> <code>不可达</code>`);
794794
}
795795
}
796796
}
797797

798-
// 补充端口明细
799-
const tcp80 = await tcpPing(testTarget, 80, 5000);
800-
const tcp443 = await tcpPing(testTarget, 443, 5000);
801-
if (tcp80 >= 0) {
802-
results.push(`🌐 <b>TCP:80:</b> <code>${tcp80}ms</code>`);
803-
}
804-
if (tcp443 >= 0) {
805-
results.push(`🔒 <b>TCP:443:</b> <code>${tcp443}ms</code>`);
806-
}
807-
808798
// HTTPS 应用层
809799
const httpsResult = await httpPing(testTarget, true);
810800
if (httpsResult > 0) {

0 commit comments

Comments
 (0)