fix(portable): 微信扫码重定向/Telegram botToken/Windows 启动端口 (v2.1.11)
- 微信扫码卡死: config-server 跟随 IDC scaned_but_redirect 把后续轮询切到 redirect_host,刷新二维码时重置 pollBaseUrl(扫码后不再卡住等不到 confirmed)。新增测试。 - Telegram 渠道改用 botToken(顶层 telegram 只认 botToken,旧 token 别名被静默忽略 → 连不上)。 - Windows-Start: 先起 config-server 再探测 gateway 端口,从 runtime.json 读实际 configServerPort 并按该端口开 Config Center / 传给 wait-gateway(18788 被占也能开)。 - wait-gateway.bat: 用 ping 代替 timeout /t(避开 PATH 上 GNU coreutils timeout 冲突),接受 CONFIG_PORT 参数。 - Windows-Menu: IF 块内 echo 的 () 转义为 ^(^),修 v2.1.10 闪退回归。 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -4,11 +4,13 @@ REM Slow USB drives can need tens of seconds before the gateway listens.
|
||||
REM
|
||||
REM Windows-Start opens Config Center immediately, so the ready path only
|
||||
REM exits quietly. On timeout, reopen Config Center as a recovery hint.
|
||||
REM Usage (called in background by Windows-Start.bat): wait-gateway.bat PORT
|
||||
REM Usage (called in background by Windows-Start.bat): wait-gateway.bat PORT CONFIG_PORT
|
||||
REM Polls every 2 seconds, up to about 5 minutes.
|
||||
|
||||
set "PORT=%~1"
|
||||
if "%PORT%"=="" set "PORT=18789"
|
||||
set "CONFIG_PORT=%~2"
|
||||
if "%CONFIG_PORT%"=="" set "CONFIG_PORT=18788"
|
||||
|
||||
set /a TRIES=0
|
||||
:wait_loop
|
||||
@@ -16,12 +18,15 @@ netstat -an | findstr ":%PORT% " | findstr "LISTENING" >nul 2>&1
|
||||
if %errorlevel%==0 goto :ready
|
||||
set /a TRIES+=1
|
||||
if %TRIES% geq 150 goto :timeout
|
||||
timeout /t 2 /nobreak >nul
|
||||
REM Use ping (not "timeout /t") for the ~2s delay: if a GNU coreutils "timeout"
|
||||
REM is on PATH (Git/MSYS bin), it rejects "/t" and this poll becomes a busy-loop.
|
||||
REM ping for the delay is PATH-robust and matches Windows-Start.bat's wait loop.
|
||||
ping -n 3 127.0.0.1 >nul 2>&1
|
||||
goto :wait_loop
|
||||
|
||||
:ready
|
||||
exit /b 0
|
||||
|
||||
:timeout
|
||||
start "" http://127.0.0.1:18788/
|
||||
start "" http://127.0.0.1:%CONFIG_PORT%/
|
||||
exit /b 1
|
||||
|
||||
Reference in New Issue
Block a user