mirror of
https://gitee.com/xmz7891/ykxmz.git
synced 2026-10-19 15:20: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:
xmz7891
@@ -0,0 +1,148 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""修"已配对电脑地址过时" + 版本号升级到 1.5.0。
|
||||
|
||||
问题（用户截图）：
|
||||
已配对的电脑显示 DESKTOP-RN5I625 192.168.2.64:8765
|
||||
但电脑现在的局域网地址早就变了。
|
||||
经中转连上时，服务器**已经报回了当前地址**（lanIps + port），
|
||||
但代码没拿它更新已配对记录，于是列表里一直是旧地址。
|
||||
|
||||
改法：
|
||||
经中转成功连上之后，用服务器报的 lanIps[0] + port 更新已配对记录；
|
||||
服务器没报（比如老版本）就保持原样。
|
||||
这样"点一下直连"用的永远是刷新过的地址。
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import re
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(r"C:\Users\shu\Desktop\deepseekagent\LanRemote")
|
||||
MAIN = (ROOT / "android" / "src" / "com" / "lanremote" / "watch"
|
||||
/ "MainActivity.java")
|
||||
|
||||
# ---------- 1. 经中转连上后刷新已配对地址 ----------
|
||||
|
||||
OLD = ''' if (success) {
|
||||
store.setLastEndpoint(host, port);
|
||||
if (finalToken != null && !finalToken.isEmpty()) {
|
||||
store.saveDevice(key, finalName == null ? host : finalName,
|
||||
host, port, finalToken);
|
||||
refreshDeviceList();
|
||||
}'''
|
||||
|
||||
NEW = ''' if (success) {
|
||||
store.setLastEndpoint(host, port);
|
||||
if (finalToken != null && !finalToken.isEmpty()) {
|
||||
// 经中转连上时，服务器会报回电脑当前的局域网地址。
|
||||
// 用它更新已配对记录 —— 不然列表里一直显示旧 IP
|
||||
// （用户截图里就是 192.168.2.64，早就变了），
|
||||
// 点"直连"必然失败。
|
||||
String savedHost = host;
|
||||
int savedPort = port;
|
||||
if (finalFromRelay) {
|
||||
String freshIp = pickAnyLanIp(
|
||||
client.relayLanIps());
|
||||
int freshPort = client.relayLanPort();
|
||||
if (freshIp != null && freshPort > 0) {
|
||||
savedHost = freshIp;
|
||||
savedPort = freshPort;
|
||||
appendLog("已更新电脑地址为 " + freshIp
|
||||
+ ":" + freshPort);
|
||||
}
|
||||
}
|
||||
store.saveDevice(key,
|
||||
finalName == null ? host : finalName,
|
||||
savedHost, savedPort, finalToken);
|
||||
refreshDeviceList();
|
||||
}'''
|
||||
|
||||
# 需要一个 finalFromRelay 变量
|
||||
FLAG_OLD = ''' final boolean finalLanDirect = usedLan && ok;'''
|
||||
FLAG_NEW = ''' final boolean finalLanDirect = usedLan && ok;
|
||||
// 这次是不是走中转连上的（决定要不要用服务器报的地址刷新记录）
|
||||
final boolean finalFromRelay = !relayUrl().isEmpty() && ok;'''
|
||||
|
||||
# 加 pickAnyLanIp 辅助方法
|
||||
HELPER_ANCHOR = ''' private String pickSameSubnet(java.util.List<String> deviceIps) {'''
|
||||
HELPER_NEW = ''' /** 从电脑报来的 IP 里挑一个能用的（不限网段）。 */
|
||||
private String pickAnyLanIp(java.util.List<String> deviceIps) {
|
||||
if (deviceIps == null) {
|
||||
return null;
|
||||
}
|
||||
for (String ip : deviceIps) {
|
||||
if (ip != null && !ip.trim().isEmpty()) {
|
||||
return ip.trim();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private String pickSameSubnet(java.util.List<String> deviceIps) {'''
|
||||
|
||||
# ---------- 2. 版本号 1.4.0 -> 1.5.0 ----------
|
||||
|
||||
VERSION_FILES = [
|
||||
ROOT / "android" / "AndroidManifest.xml",
|
||||
ROOT / "windows" / "version_info.txt",
|
||||
ROOT / "windows" / "lanremote" / "version.py",
|
||||
ROOT / "relay" / "relay.py",
|
||||
ROOT / "_build" / "package_remote.py",
|
||||
ROOT / "android" / "res" / "values" / "strings.xml",
|
||||
]
|
||||
|
||||
|
||||
def bump_versions() -> int:
|
||||
changed = 0
|
||||
for path in VERSION_FILES:
|
||||
if not path.is_file():
|
||||
continue
|
||||
text = path.read_text(encoding="utf-8")
|
||||
if "1.4.0" not in text and "1.4.1" not in text:
|
||||
continue
|
||||
new = text.replace("1.4.0", "1.5.0").replace("1.4.1", "1.5.0")
|
||||
if new != text:
|
||||
path.write_text(new, encoding="utf-8", newline="\n")
|
||||
print(f" {path.relative_to(ROOT)}: 1.4.0 -> 1.5.0")
|
||||
changed += 1
|
||||
# 手表端 UA
|
||||
for path in (ROOT / "android" / "src").rglob("*.java"):
|
||||
text = path.read_text(encoding="utf-8")
|
||||
if "LanRemote-Watch/1.4" in text:
|
||||
path.write_text(text.replace("LanRemote-Watch/1.4",
|
||||
"LanRemote-Watch/1.5"),
|
||||
encoding="utf-8", newline="\n")
|
||||
print(f" {path.name}: UA 1.4 -> 1.5")
|
||||
changed += 1
|
||||
return changed
|
||||
|
||||
|
||||
def main() -> int:
|
||||
ok = True
|
||||
text = MAIN.read_text(encoding="utf-8")
|
||||
|
||||
if "finalFromRelay" in text:
|
||||
print(" 地址刷新逻辑已经加过")
|
||||
else:
|
||||
for old, new, label in ((OLD, NEW, "刷新已配对地址"),
|
||||
(FLAG_OLD, FLAG_NEW, "加 finalFromRelay 标记"),
|
||||
(HELPER_ANCHOR, HELPER_NEW, "加 pickAnyLanIp")):
|
||||
if old in text:
|
||||
text = text.replace(old, new, 1)
|
||||
print(f" {label}")
|
||||
else:
|
||||
print(f" [失败] {label} —— 锚点没找到")
|
||||
ok = False
|
||||
MAIN.write_text(text, encoding="utf-8", newline="\n")
|
||||
|
||||
print()
|
||||
print(" 版本号升级：")
|
||||
n = bump_versions()
|
||||
print(f" 共改了 {n} 个文件")
|
||||
|
||||
return 0 if ok else 1
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
Reference in New Issue
Block a user