mirror of
https://gitee.com/xmz7891/ykxmz.git
synced 2026-10-18 13:40:45 +00:00
ykxmz 1.5.0:修复手表端 TLS 证书校验 + MTU 修复网络稳定性
被控端 - 修复 MTU 问题:夹 MSS + 路径 MTU 探测(公网可用率 48% -> 100%) - 复用 HTTP 连接(免掉每次新建 TLS 的 30% 握手失败) - 每分钟回头找局域网,自动切回快 400 倍的路径 - 画面心跳帧:静止时省流量,客户端仍知道流是活的 - 锁屏时给出可操作的提示 手表端 - 内置 GTS Root R4 / GlobalSign Root CA,修 SSLHandshakeException - 连接错误翻译成人话(证书/时间/解析/超时分别提示) - 经中转连上后用服务器报的地址刷新已配对记录 - 新增局域网连接页面、服务器延迟检测 服务器端 - 支持 chunked 请求体(修每 16 秒一次的连接错乱与大面积 502) - 网络调优脚本 net-tune.sh(开机自动应用) - 管理页:批量删除、网络体检、下载区 - 隧道改 HTTP/2 + 双连接 文档 - 许可协议 / 安装前必读 / 安装后须知(作者:小麦子)
This commit is contained in:
@@ -0,0 +1,93 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""手表端:被新连接顶掉时就老实断开,不要抢回来。
|
||||
|
||||
配合中转的 409 + replaced=true。
|
||||
区分两种情况:
|
||||
401 / 403 -> 会话过期(中转重启等)-> 自动重连
|
||||
409 + replaced -> 被另一台手表接管 -> 断开并提示,不再抢
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
RELAY = Path(r"C:\Users\shu\Desktop\deepseekagent\LanRemote\android\src"
|
||||
r"\com\lanremote\watch\RelayTransport.java")
|
||||
|
||||
OLD = ''' HttpResult result = request("/v1/client/poll", new byte[0], true,
|
||||
POLL_TIMEOUT_MS);
|
||||
if (result.code == 401 || result.code == 403) {
|
||||
// 会话没了(中转重启 / 被踢),重新接入
|
||||
online = false;
|
||||
lastError = "会话已失效,正在重新接入";
|
||||
if (!reattach()) {
|
||||
sleep(backoff);
|
||||
backoff = Math.min(RETRY_MAX_MS, backoff * 2);
|
||||
continue;
|
||||
}
|
||||
backoff = RETRY_MIN_MS;
|
||||
continue;
|
||||
}'''
|
||||
|
||||
NEW = ''' HttpResult result = request("/v1/client/poll", new byte[0], true,
|
||||
POLL_TIMEOUT_MS);
|
||||
if (result.code == 409) {
|
||||
// 被另一台手表接管了。这里**必须断开**,不能重连 ——
|
||||
// 否则两台手表会互相把对方顶掉,永远握不上手。
|
||||
online = false;
|
||||
lastError = "已被另一台手表接管";
|
||||
replaced = true;
|
||||
closed = true;
|
||||
return;
|
||||
}
|
||||
if (result.code == 401 || result.code == 403) {
|
||||
// 会话过期(中转重启等)—— 这种可以自动重连
|
||||
online = false;
|
||||
lastError = "会话已失效,正在重新接入";
|
||||
if (!reattach()) {
|
||||
sleep(backoff);
|
||||
backoff = Math.min(RETRY_MAX_MS, backoff * 2);
|
||||
continue;
|
||||
}
|
||||
backoff = RETRY_MIN_MS;
|
||||
continue;
|
||||
}'''
|
||||
|
||||
OLD_FIELD = ''' private volatile boolean closed;'''
|
||||
|
||||
NEW_FIELD = ''' private volatile boolean closed;
|
||||
/** 是否被另一台手表顶替(这种情况下不该重连) */
|
||||
private volatile boolean replaced;'''
|
||||
|
||||
OLD_GETTER = ''' public boolean isOnline() {
|
||||
return online && !closed;
|
||||
}'''
|
||||
|
||||
NEW_GETTER = ''' public boolean isOnline() {
|
||||
return online && !closed;
|
||||
}
|
||||
|
||||
/** 是不是被另一台手表接管了。界面据此提示"已被接管"而不是"连接失败"。 */
|
||||
public boolean isReplaced() {
|
||||
return replaced;
|
||||
}'''
|
||||
|
||||
|
||||
def main() -> int:
|
||||
text = RELAY.read_text(encoding="utf-8")
|
||||
ok = True
|
||||
for old, new, tag in ((OLD_FIELD, NEW_FIELD, "加 replaced 字段"),
|
||||
(OLD_GETTER, NEW_GETTER, "加 isReplaced()"),
|
||||
(OLD, NEW, "409 时断开不重连")):
|
||||
if old not in text:
|
||||
print(f" [失败] {tag} —— 锚点没找到")
|
||||
ok = False
|
||||
continue
|
||||
text = text.replace(old, new, 1)
|
||||
print(f" {tag}")
|
||||
RELAY.write_text(text, encoding="utf-8")
|
||||
return 0 if ok else 1
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
Reference in New Issue
Block a user