mirror of
https://gitee.com/xmz7891/ykxmz.git
synced 2026-10-18 17:10:43 +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,108 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""修 Json.java 的深度计数 bug —— 它让"功能页永远连不上"。
|
||||
|
||||
我加 MAX_DEPTH 时只在 readObject/readArray 里做了 depth++,
|
||||
**没有对应的 depth--**。于是 depth 单调递增:
|
||||
一个回复里只要累计解析过 65 个对象(不是嵌套深度,是总数!)就抛
|
||||
"JSON 嵌套太深"。
|
||||
|
||||
而 RemoteClient.readLoop 里对解析失败是 `continue`(静默丢弃),
|
||||
所以客户端等不到回复,一路超时到报"连不上电脑"。
|
||||
|
||||
受影响的面:
|
||||
feature_list 152 个功能对象 -> 永远超时(用户报的"功能页连不上")
|
||||
proc_list 200 个进程对象 -> 超时
|
||||
audio_list 音乐目录多文件 -> 超时
|
||||
voice_list / ping / info -> 对象少,正常
|
||||
|
||||
修法:把真正的解析逻辑拆成 inner 方法,用 try/finally 保证进出配对。
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
JSON = Path(r"C:\Users\shu\Desktop\deepseekagent\LanRemote\android\src"
|
||||
r"\com\lanremote\watch\Json.java")
|
||||
|
||||
|
||||
def main() -> int:
|
||||
text = JSON.read_text(encoding="utf-8")
|
||||
|
||||
# ---- readObject:拆成 wrapper + inner ----
|
||||
old_obj = " private Map<String, Object> readObject() {"
|
||||
new_obj = ''' private Map<String, Object> readObject() {
|
||||
if (depth >= MAX_DEPTH) {
|
||||
throw new IllegalArgumentException("JSON 嵌套太深");
|
||||
}
|
||||
depth++;
|
||||
try {
|
||||
return readObjectInner();
|
||||
} finally {
|
||||
// 必须配对减去!只加不减会让计数器单调递增,
|
||||
// 于是"回复里有 65 个对象"就被误判成嵌套太深,
|
||||
// 而调用方会静默丢弃这条回复 -> 表现为"连不上电脑"。
|
||||
depth--;
|
||||
}
|
||||
}
|
||||
|
||||
private Map<String, Object> readObjectInner() {'''
|
||||
if old_obj not in text:
|
||||
print(" [失败] 找不到 readObject")
|
||||
return 1
|
||||
text = text.replace(old_obj, new_obj, 1)
|
||||
print(" readObject: 已拆成 wrapper + inner")
|
||||
|
||||
# readObjectInner 里那个 depth++ 要去掉(已经挪到 wrapper)
|
||||
marker = " pos++; // '{'\n depth++;\n"
|
||||
if marker in text:
|
||||
text = text.replace(marker,
|
||||
" pos++; // '{'\n", 1)
|
||||
print(" readObjectInner: 去掉多余的 depth++")
|
||||
|
||||
# ---- readArray 同样处理 ----
|
||||
old_arr = " private List<Object> readArray() {"
|
||||
new_arr = ''' private List<Object> readArray() {
|
||||
if (depth >= MAX_DEPTH) {
|
||||
throw new IllegalArgumentException("JSON 嵌套太深");
|
||||
}
|
||||
depth++;
|
||||
try {
|
||||
return readArrayInner();
|
||||
} finally {
|
||||
depth--;
|
||||
}
|
||||
}
|
||||
|
||||
private List<Object> readArrayInner() {'''
|
||||
if old_arr not in text:
|
||||
print(" [失败] 找不到 readArray")
|
||||
return 1
|
||||
text = text.replace(old_arr, new_arr, 1)
|
||||
print(" readArray: 已拆成 wrapper + inner")
|
||||
|
||||
marker2 = " pos++; // '['\n depth++;\n"
|
||||
if marker2 in text:
|
||||
text = text.replace(marker2,
|
||||
" pos++; // '['\n", 1)
|
||||
print(" readArrayInner: 去掉多余的 depth++")
|
||||
|
||||
# ---- readValue 里那个检查可以保留(wrapper 里已经查得更严)----
|
||||
JSON.write_text(text, encoding="utf-8")
|
||||
|
||||
# 检查有没有残留的裸 depth++
|
||||
lines = text.splitlines()
|
||||
stray = [i + 1 for i, l in enumerate(lines)
|
||||
if l.strip() == "depth++;" and "try {" not in lines[i - 1]]
|
||||
print(f" 残留的裸 depth++: {stray if stray else '无'}")
|
||||
|
||||
print()
|
||||
count_inc = text.count("depth++;")
|
||||
count_dec = text.count("depth--;")
|
||||
print(f" depth++ 出现 {count_inc} 次,depth-- 出现 {count_dec} 次")
|
||||
print(f" {'配对正确' if count_inc == count_dec else '!! 不配对,还有问题'}")
|
||||
return 0 if count_inc == count_dec else 1
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
Reference in New Issue
Block a user