mirror of
https://gitee.com/xmz7891/ykxmz.git
synced 2026-10-19 10:40:44 +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,72 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""把手表的中转地址真正接进连接流程。
|
||||
|
||||
逻辑:
|
||||
配了中转地址 -> connectViaRelay(跨网络)
|
||||
没配 -> connect(host, port)(局域网,原来那套)
|
||||
|
||||
中转要走公网 + 好几次 HTTP 往返,超时给到 40 秒;局域网仍然 9 秒。
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
MAIN = Path(r"C:\Users\shu\Desktop\deepseekagent\LanRemote\android\src"
|
||||
r"\com\lanremote\watch\MainActivity.java")
|
||||
|
||||
OLD = ''' try {
|
||||
Map<String, Object> reply = client.connect(host, port, code, token,
|
||||
MainActivity.this, 9000);
|
||||
ok = Json.bool(reply, "ok", false);
|
||||
if (ok) {
|
||||
newToken = Json.str(reply, "token", token == null ? "" : token);
|
||||
serverName = Json.str(reply, "serverName", host);
|
||||
} else {
|
||||
error = Json.str(reply, "error", "连接被拒绝");
|
||||
}
|
||||
} catch (final IOException e) {
|
||||
error = describeNetworkError(e, host);
|
||||
}'''
|
||||
|
||||
NEW = ''' try {
|
||||
final String relay = relayUrl();
|
||||
Map<String, Object> reply;
|
||||
if (!relay.isEmpty()) {
|
||||
// 跨网络:电脑和手表都在 NAT 后面,直连不可能,
|
||||
// 两边各自连出去、由中转按配对码对接。
|
||||
// 走公网要几个 HTTP 往返,超时给宽一点。
|
||||
appendLog("经中转连接:" + relay);
|
||||
reply = client.connectViaRelay(relay, code, token,
|
||||
MainActivity.this, 40000);
|
||||
} else {
|
||||
reply = client.connect(host, port, code, token,
|
||||
MainActivity.this, 9000);
|
||||
}
|
||||
ok = Json.bool(reply, "ok", false);
|
||||
if (ok) {
|
||||
newToken = Json.str(reply, "token", token == null ? "" : token);
|
||||
serverName = Json.str(reply, "serverName", host);
|
||||
} else {
|
||||
error = Json.str(reply, "error", "连接被拒绝");
|
||||
}
|
||||
} catch (final IOException e) {
|
||||
error = describeNetworkError(e, host);
|
||||
}'''
|
||||
|
||||
|
||||
def main() -> int:
|
||||
text = MAIN.read_text(encoding="utf-8")
|
||||
if "connectViaRelay(relay" in text:
|
||||
print(" 已经接过")
|
||||
return 0
|
||||
if OLD not in text:
|
||||
print(" [失败] 锚点没找到")
|
||||
return 1
|
||||
MAIN.write_text(text.replace(OLD, NEW, 1), encoding="utf-8")
|
||||
print(" 中转地址已接进连接流程(配了走中转,没配走局域网)")
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
Reference in New Issue
Block a user