修复了一些已知的问题

Author: badafans

batch/CF优选IP-ANSI.bat

@@ -1,45 +1,44 @@
-chcp 936>nul
+chcp 936 > nul
 @echo off
 cd "%~dp0"
-color A
 setlocal enabledelayedexpansion
-set version=20220525
+set version=20220615
 
-:main
 cls
+:main
 title CF优选IP
-echo 1. IPV4优选&echo 2. IPV6优选&echo 3. 自定义IPV4段&echo 4. 单IP测速&echo 5. 清空缓存&echo 0. 退出&echo.
-set /p menu=请选择菜单:
+set /a menu=1
+echo 1. IPV4优选&echo 2. IPV6优选&echo 3. 单IP测速&echo 4. 清空缓存&echo 0. 退出&echo.
+set /p menu=请选择菜单(默认%menu%):
 if %menu%==0 exit
-if %menu%==1 title IPV4优选&set ips=ipv4&set /a selfmode=0&goto bettercloudflareip
-if %menu%==2 title IPV6优选&set ips=ipv6&set /a selfmode=0&goto bettercloudflareip
-if %menu%==3 title 自定义IPV4段&set ips=ipv4&set /a selfmode=1&set /p selfip=请输入C类自定义IPV4(格式 104.16.16):&goto bettercloudflareip
-if %menu%==4 title 单IP测速&call :singletest
-if %menu%==5 del ipv4.txt ipv6.txt data.txt ip.txt CR.txt CRLF.txt cut.txt speed.txt meta.txt>nul 2>&1&RD /S /Q rtt>nul 2>&1
+if %menu%==1 title IPV4优选&set ips=ipv4&goto bettercloudflareip
+if %menu%==2 title IPV6优选&set ips=ipv6&goto bettercloudflareip
+if %menu%==3 title 单IP测速&call :singletest&goto main
+if %menu%==4 del ipv4.txt ipv6.txt rtt.txt data.txt ip.txt CR.txt CRLF.txt cut.txt speed.txt meta.txt > nul 2>&1&RD /S /Q rtt > nul 2>&1&cls&echo 缓存已经清空&goto main
+cls
 goto main
 
 :singletest
+set /a port=443
 set /p ip=请输入需要测速的IP:
-curl --resolve service.baipiaocf.ml:443:!ip! https://service.baipiaocf.ml -o temp.txt -#
-for /f "tokens=2 delims==" %%i in ('findstr "domain=" temp.txt') do (
-set domain=%%i
-)
-for /f "delims=" %%i in ('findstr "file=" temp.txt') do (
-set file=%%i
-set file=!file:~5!
+set /p port=请输入需要测速的端口(默认%port%):
+echo 正在测速 !ip! 端口 !port!
+goto download
+:download
+for /f "tokens=1,2 delims=_" %%i in ('curl --resolve speed.cloudflare.com:!port!:!ip! "https://speed.cloudflare.com:!port!/__down?bytes=300000000" -o nul --connect-timeout 5 --max-time 15 -w %%{http_code}_%%{speed_download}') do (
+set /a status=%%i
+set /a speed_download=%%j
+if !status! EQU 503 (cls&echo Cloudflare Workers 超出资源限制&echo 正在重新请求 Workers 资源&echo 正在测速 !ip! 端口 !port!&goto download) else (set /a speed_download=speed_download/1024&cls&echo !ip! 平均速度 !speed_download! kB/s)
 )
-del temp.txt
-title  正在测速 !ip!
-curl --resolve !domain!:443:!ip! https://!domain!/!file! -o nul --connect-timeout 5 --max-time 15
 goto :eof
 
 :bettercloudflareip
-set /a tasknum=25
+set /a tasknum=10
 set /a bandwidth=1
 set /p bandwidth=请设置期望的带宽大小(默认最小%bandwidth%,单位 Mbps):
 set /p tasknum=请设置RTT测试进程数(默认%tasknum%,最大50):
 if %bandwidth% EQU 0 (set /a bandwidth=1)
-if %tasknum% EQU 0 (set /a tasknum=25&echo 进程数不能为0,自动设置为默认值)
+if %tasknum% EQU 0 (set /a tasknum=10&echo 进程数不能为0,自动设置为默认值)
 if %tasknum% GTR 50 (set /a tasknum=50&echo 超过最大进程限制,自动设置为最大值)
 set /a speed=bandwidth*128
 set /a startH=%time:~0,2%
@@ -49,15 +48,15 @@ call :start
 exit
 
 :start
-del data.txt ip.txt CR.txt CRLF.txt cut.txt speed.txt meta.txt>nul 2>&1
-RD /S /Q rtt>nul 2>&1
+del rtt.txt data.txt ip.txt CR.txt CRLF.txt cut.txt speed.txt meta.txt > nul 2>&1
+RD /S /Q rtt > nul 2>&1
 if exist "!ips!.txt" goto resolve
 if not exist "!ips!.txt" goto dnsresolve
 
 :dnsresolve
 echo DNS解析获取CF !ips! 节点
 echo 如果域名被污染,请手动创建 !ips!.txt 做解析
-curl --!ips! --retry 3 -s https://service.baipiaocf.ml/meta -o meta.txt
+curl --!ips! --retry 1 -s https://service.baipiaocf.ml/meta -o meta.txt --connect-timeout 2 --max-time 3
 if not exist "meta.txt" goto start
 for /f "tokens=2 delims==" %%i in ('findstr "asn=" meta.txt') do (
 	set asn=%%i
@@ -80,7 +79,7 @@ for /f "tokens=2 delims==" %%i in ('findstr "longitude=" meta.txt') do (
 for /f "tokens=2 delims==" %%i in ('findstr "latitude=" meta.txt') do (
 	set latitude=%%i
 )
-curl --!ips! --retry 3 https://service.baipiaocf.ml -o data.txt -#
+curl --!ips! --retry 1 https://service.baipiaocf.ml -o data.txt -# --connect-timeout 2 --max-time 3
 if not exist "data.txt" goto start
 goto checkupdate
 
@@ -90,7 +89,7 @@ set resolveip=%%i
 )
 echo 指向解析获取CF !ips! 节点
 echo 如果长时间无法获取CF !ips! 节点,重新运行程序并选择清空缓存
-curl --!ips! --resolve service.baipiaocf.ml:443:!resolveip! --retry 3 -s https://service.baipiaocf.ml/meta -o meta.txt
+curl --!ips! --resolve service.baipiaocf.ml:443:!resolveip! --retry 1 -s https://service.baipiaocf.ml/meta -o meta.txt --connect-timeout 2 --max-time 3
 if not exist "meta.txt" goto start
 for /f "tokens=2 delims==" %%i in ('findstr "asn=" meta.txt') do (
 	set asn=%%i
@@ -113,7 +112,7 @@ for /f "tokens=2 delims==" %%i in ('findstr "longitude=" meta.txt') do (
 for /f "tokens=2 delims==" %%i in ('findstr "latitude=" meta.txt') do (
 	set latitude=%%i
 )
-curl --!ips! --resolve service.baipiaocf.ml:443:!resolveip! --retry 3 https://service.baipiaocf.ml -o data.txt -#
+curl --!ips! --resolve service.baipiaocf.ml:443:!resolveip! --retry 1 https://service.baipiaocf.ml -o data.txt -# --connect-timeout 2 --max-time 3
 if not exist "data.txt" goto start
 goto checkupdate
 
@@ -130,100 +129,69 @@ set url=%%i
 )
 for /f "tokens=2 delims==" %%i in ('findstr "app=" data.txt') do (
 set app=%%i
-if !app! NEQ !version! (echo 发现新版本程序: !app!&echo 更新地址: !url!&title 更新后才可以使用&echo 按任意键退出程序&pause>nul&exit)
+if !app! NEQ !version! (echo 发现新版本程序: !app!&echo 更新地址: !url!&title 更新后才可以使用&echo 按任意键退出程序&pause > nul&exit)
 )
-if not exist "RTT.bat" echo 当前程序不完整&echo 请重新下载Release版本: !url! &pause>nul&exit
-if not exist "CR2CRLF.exe" echo 当前程序不完整&echo 请重新下载Release版本: !url! &pause>nul&exit
-if !selfmode!==0 (goto getip) else (set /a a=0&goto selfconfigip)
-
-:getip
+if not exist "RTT.bat" echo 当前程序不完整&echo 请重新下载Release版本: !url! &pause > nul&exit
+if not exist "CR2CRLF.exe" echo 当前程序不完整&echo 请重新下载Release版本: !url! &pause > nul&exit
 for /f "skip=4" %%i in (data.txt) do (
-echo %%i>>ip.txt
+echo %%i >> ip.txt
 )
 goto rtt
 
-:selfconfigip
-if !a!==256 (goto rtt) else (echo !selfip!.!a!>>ip.txt&set /a a=a+1&goto selfconfigip)
-
 :rtt
-del meta.txt data.txt
+del rtt.txt meta.txt data.txt
 mkdir rtt
 for /f "tokens=2 delims=:" %%i in ('find /c /v "" ip.txt') do (
 set /a ipnum=%%i
 )
-if !tasknum! GTR !ipnum! set /a iplist=1
-set /a doubletasknum=tasknum*2
-if !ipnum! LSS !doubletasknum! (set /a iplist=2) else (set /a iplist=ipnum/tasknum)
-set /a a=1
-set /a b=1
+if !tasknum! EQU 0 set /a tasknum=1
+if !ipnum! LSS !tasknum! set /a tasknum=ipnum
+set /a n=1
 for /f "delims=" %%i in (ip.txt) do (
-echo %%i>>rtt/!b!.txt
-if !a! EQU !iplist! (set /a a=1&set /a b=b+1) else (set /a a=a+1)
+echo %%i >> rtt/!n!.txt
+if !n! EQU !tasknum! (set /a n=1) else (set /a n=n+1)
 )
+set /a n=1
 del ip.txt
-if !a! NEQ 1 set /a a=1&set /a b=b+1
 title RTT测试中
 goto rtttest
 
 :rtttest
-if !a! NEQ !b! (start /b rtt.bat !a!>nul&set /a a=a+1&goto rtttest) else (goto rttstatus)
+start /b rtt.bat !n! > nul
+if !n! EQU !tasknum! (goto rttstatus) else (set /a n=n+1&goto rtttest)
 
 :rttstatus
-timeout /T 2 /NOBREAK>nul
 for /f "delims=" %%i in ('dir rtt /o:-s /b^| findstr txt^| find /c /v ""') do (
-set /a taskstatus=%%i
-if !taskstatus! NEQ 0 (echo %time:~0,8% 等待RTT测试结束,剩余进程数 !taskstatus!&goto rttstatus) else (echo %time:~0,8% RTT测试完成)
-)
-for /f "delims=" %%i in ('dir rtt /o:-s /b^| find /c /v ""') do (
 set /a status=%%i
-if !status! EQU 0 echo 当前所有IP都存在RTT丢包&goto start
-)
-copy rtt\*.log rtt\ip.txt>nul
-sort rtt/ip.txt /O ip.txt
-for /f "tokens=2 delims=:" %%i in ('find /c /v "" ip.txt') do (
-if %%i LSS 5 (echo 当前所有IP都存在RTT丢包&goto start)
-)
-set /a a=0
-for /f "tokens=2,3 delims= " %%i in (ip.txt) do (
-set /a a=a+1
-if !a!==1 echo 第1个IP %%j 往返延迟 %%i 毫秒
-)
-set /a a=0
-for /f "tokens=2,3 delims= " %%i in (ip.txt) do (
-set /a a=a+1
-if !a!==2 echo 第2个IP %%j 往返延迟 %%i 毫秒
+if !status! NEQ 0 (echo %time:~0,8% 等待RTT测试结束,剩余进程数 !status!&timeout /T 1 /NOBREAK > nul&goto rttstatus) else (echo %time:~0,8% RTT测试完成)
 )
-set /a a=0
-for /f "tokens=2,3 delims= " %%i in (ip.txt) do (
-set /a a=a+1
-if !a!==3 echo 第3个IP %%j 往返延迟 %%i 毫秒
+for /f "delims=" %%i in ('dir rtt /o:-s /b^| findstr log^| find /c /v ""') do (
+set /a status=%%i
+if !status! NEQ 0 (
+copy rtt\*.log rtt.txt>nul
+) else (
+echo 当前所有IP都存在RTT丢包
+goto start
 )
-set /a a=0
-for /f "tokens=2,3 delims= " %%i in (ip.txt) do (
-set /a a=a+1
-if !a!==4 echo 第4个IP %%j 往返延迟 %%i 毫秒
 )
-set /a a=0
-for /f "tokens=2,3 delims= " %%i in (ip.txt) do (
-set /a a=a+1
-if !a!==5 echo 第5个IP %%j 往返延迟 %%i 毫秒
+echo 待测速的IP地址
+for /f "tokens=1,2 delims= " %%i in ('sort rtt.txt') do (
+echo %%j 往返延迟 %%i 毫秒
 )
 title 启动测速
 set /a a=0
-for /f "tokens=2,3 delims= " %%i in (ip.txt) do (
-set /a a=a+1
-if !a! GTR 5 echo 没有满足速度要求的IP&goto start
-del CRLF.txt cut.txt speed.txt>nul 2>&1
+for /f "tokens=1,2 delims= " %%i in ('sort rtt.txt') do (
+del CRLF.txt cut.txt speed.txt > nul 2>&1
 set avgms=%%i
 set anycast=%%j
 echo 正在测试 !anycast!
-curl --resolve !domain!:443:!anycast! https://!domain!/!file! -o nul --connect-timeout 5 --max-time 10 > CR.txt 2>&1
+curl --resolve !domain!:443:!anycast! https://!domain!/!file! -o nul --connect-timeout 1 --max-time 10 > CR.txt 2>&1
 findstr "0:" CR.txt >> CRLF.txt
-CR2CRLF CRLF.txt>nul
+CR2CRLF CRLF.txt > nul
 for /f "delims=" %%i in (CRLF.txt) do (
 set s=%%i
 set s=!s:~73,5!
-echo !s%!>>cut.txt
+echo !s%! >> cut.txt
 )
 for /f "delims=" %%i in ('findstr /v "k M" cut.txt') do (
 set x=%%i
@@ -252,24 +220,41 @@ for /f "tokens=1,2" %%i in ('type "speed.txt"') do (
 if %%i GEQ !max! set /a max=%%i
 )
 echo !anycast! 峰值速度 !max! kB/s
-if !max! GEQ !speed! cls&goto end
+if !max! GEQ !speed! goto end
 )
+goto start
 
 :end
+echo !anycast!|clip
+echo !anycast! > !ips!.txt
+echo IP地址,往返延迟 > !ips!.csv
+for /f "tokens=1,2 delims= " %%i in ('sort rtt.txt') do (
+echo %%j,%%i ms >> !ips!.csv
+)
 set /a realbandwidth=max/128
 set /a stopH=%time:~0,2%
 if %time:~3,1% EQU 0 (set /a stopM=%time:~4,1%) else (set /a stopM=%time:~3,2%)
 if %time:~6,1% EQU 0 (set /a stopS=%time:~7,1%) else (set /a stopS=%time:~6,2%)
 set /a starttime=%startH%*3600+%startM%*60+%startS%
 set /a stoptime=%stopH%*3600+%stopM%*60+%stopS%
 if %starttime% GTR %stoptime% (set /a alltime=86400-%starttime%+%stoptime%) else (set /a alltime=%stoptime%-%starttime%)
-curl --!ips! --resolve service.baipiaocf.ml:443:!anycast! --retry 3 -s -X POST https://service.baipiaocf.ml -o data.txt
+echo 从服务器获取详细信息
+curl --!ips! --resolve service.baipiaocf.ml:443:!anycast! --retry 1 -s -X POST https://service.baipiaocf.ml -o data.txt --connect-timeout 2 --max-time 3
+cls
+if not exist "data.txt" (
+set publicip=获取超时
+set colo=获取超时
+) else (
 for /f "tokens=2 delims==" %%i in ('findstr "publicip=" data.txt') do (
 set publicip=%%i
 )
 for /f "tokens=2 delims==" %%i in ('findstr "colo=" data.txt') do (
 set colo=%%i
 )
+)
+del rtt.txt data.txt ip.txt CR.txt CRLF.txt cut.txt speed.txt meta.txt > nul 2>&1
+RD /S /Q rtt > nul 2>&1
+title 优选IP已经自动复制到剪贴板
 echo 优选IP !anycast!
 echo 公网IP !publicip!
 echo 自治域 AS!asn!
@@ -282,11 +267,10 @@ echo 
 echo 往返延迟 !avgms! 毫秒
 echo 数据中心 !colo!
 echo 总计用时 !alltime! 秒
-echo !anycast!>!ips!.txt
-echo !anycast!|clip
-del data.txt ip.txt CR.txt CRLF.txt cut.txt speed.txt meta.txt>nul 2>&1
-RD /S /Q rtt>nul 2>&1
-title 优选IP已经自动复制到剪贴板
+echo.
+echo 优选IP地址保存到 !ips!.txt
+echo 所有IP地址保存到 !ips!.csv
+echo.
 echo 按任意键关闭
-pause>nul
+pause > nul
 goto :eof