mirror of
https://gitee.com/xmz7891/ykxmz.git
synced 2026-10-18 16:00:43 +00:00
版本号 1.7.1 -> 1.8.0(8 个文件,13 处)。
写了个 bump_180.py 统一处理 —— 版本号散落在
Python / Java manifest / PowerShell / Inno Setup / 测试里,
手动改必漏;而且 .ps1 必须保留 UTF-8 BOM。
==================== 一、隧道稳定性(用户撞上 1033/502/530)====================
1) 4G 链路会**静默断开 TCP 连接**(不发 FIN/RST,双方都以为还活着),
Linux 默认要 2 小时才发现 -> 改成 keepalive 30 秒 + 每 10 秒探测。
实测 60 秒内发现并重连。
2) 隧道连接数 2 -> 4。只剩 1 条连接时跨机房回源会失败
(实测可用率 0/12,提到 4 条后 12/12)。
3) 掉电重启后恢复慢:原来开机 2 分 10 秒公网才可用。
根因是 systemd-networkd-wait-online 等一个不归它管的网络
(wlan0 是 NetworkManager 管的),干等 2 分钟超时失败,
把 network-online.target 一起拖住。
mask 掉它之后:启动 17.3 秒,掉电重启 24 秒公网可用。
4) 看门狗两次翻车都是我造成的,都修了:
a) 我先加了"确认故障立刻重启",但隧道重建 4 条连接要 30~60 秒,
MIN_RESTART_GAP=45 导致**还没建齐就被下一次重启打断**,
死循环,每 50 秒重启一次 -> 加 150 秒宽限期
b) 宽限期又带来"链路持续差时什么都不做"的问题
-> 增加"本次重启后建齐过吗"的判断:
建齐过又垮 = 真故障,立刻重启
从没建齐 = 还在努力,继续等
5) 顺手修:看门狗状态文件里的变量在函数定义前被引用,
set -u 下报 "BUILT: 未绑定的变量"。
==================== 二、中转管理后台重做 ====================
原来的管理页是几百行内联在 relay.py 的 f-string 里,
改一处样式要在一堆转义花括号里翻。拆成独立模块 relay/admin.py。
新设计(对齐官网那套白色简洁):
吸顶顶栏 -> 公网地址(最大权重,这是用户最需要复制的)
-> 四个数字卡 -> 设备表 -> 工具卡(体检 + 下载)
空状态给图标+引导文案;窄屏表格自动变卡片。
relay.py 从 2089 行缩到 1500 行左右。
修了三个我自己引入的 bug:
a) 响应头类型写错,浏览器把整页 HTML 当纯文本显示
(用户看到的是"一屏源码")。教训:200 不等于页面能看,
当时只验了状态码和字节数。
b) 顶栏用了固定 height:62px,装不下"标题+副标题+版本信息"两行,
内容被顶出容器 -> 标题看不见、徽章压在字上。
c) do_HEAD 没处理 /download/ 路径,HEAD 一个 APK 返回
Content-Length: 0 + text/plain,下载器会误判成空文件。
同时发现 _head_info 里对 bytes 调 .encode() —— 加 _as_bytes() 兜住。
==================== 三、其它 ====================
* 设备记录只增不减:实测一天攒 75 条僵尸,/v1/health 从几 KB 涨到 20KB。
加 DEVICE_TTL(6 小时)自动清,占用的配对码一起释放
(管理页曾显示"配对码占用 131"但一台设备都没有)。
* HEAD 请求支持(原来一律 501)。
* 官网新增产品展示:手表界面预览(颜色/布局与真实手表一致)、
电脑端真实截图、两种连接方式对比图。
* 加了一份 docs/免费托管方案.md(含一个纠错:上一版推荐的
ClawCloud Run 已在 2026-05-11 关停)。
==================== 验收 ====================
全量回归 33 个阶段全部通过
安装包完整周期 20/20(静默装入 7 秒、卸载 0.6 秒、无残留)
网页响应头 12/12
公网可用率 26/30 = 86%(底层 4G 丢包 30%,是这个上限)
发布产物 安装包 14.37MB / 服务端 0.20MB / 手表 0.19MB
260 lines
10 KiB
Python
260 lines
10 KiB
Python
# -*- coding: utf-8 -*-
|
||
"""验证三件套压缩包:解压出来实际跑一遍。
|
||
|
||
不只是看有没有文件 —— 要确认包里的东西**真的能用**:
|
||
1. 解压
|
||
2. 服务器端的 relay.py 能起、健康检查通过
|
||
3. 被控端的 EXE 能起、能连上包里那个中转
|
||
4. Java 手表端经这个中转连上被控端并执行命令
|
||
5. 清理
|
||
"""
|
||
from __future__ import annotations
|
||
|
||
import json
|
||
import os
|
||
import shutil
|
||
import subprocess
|
||
import sys
|
||
import tempfile
|
||
import time
|
||
import urllib.request
|
||
import zipfile
|
||
from pathlib import Path
|
||
|
||
ROOT = Path(__file__).resolve().parent.parent
|
||
# 三端分开出(用户要求):
|
||
# 被控端 -> 一个 zip
|
||
# 服务器端 -> 一个 zip
|
||
# 控制端 -> 直接给 APK(不打 zip)
|
||
AGENT_ZIP = ROOT / "dist" / "ykxmz-agent-1.8.0.zip"
|
||
SERVER_ZIP = ROOT / "dist" / "ykxmz-server-1.8.0.zip"
|
||
WATCH_APK = ROOT / "dist" / "ykxmz-watch-1.8.0.apk"
|
||
TOOLCHAIN = Path(r"C:\Users\shu\Desktop\deepseekagent\starklink\toolchain")
|
||
JAVAC = TOOLCHAIN / "jdk17" / "bin" / "javac.exe"
|
||
JAVA = TOOLCHAIN / "jdk17" / "bin" / "java.exe"
|
||
RELAY_PORT = 8095
|
||
AGENT_PORT = 8895
|
||
PAIR_CODE = "778899"
|
||
|
||
passed = 0
|
||
failed = 0
|
||
|
||
|
||
def check(name, ok, detail=""):
|
||
global passed, failed
|
||
if ok:
|
||
passed += 1
|
||
print(" [PASS] " + name)
|
||
else:
|
||
failed += 1
|
||
print(" [FAIL] " + name + " " + str(detail))
|
||
|
||
|
||
def main() -> int:
|
||
# 1) 三个产物都要在
|
||
for label, path in (("被控端包", AGENT_ZIP), ("服务器端包", SERVER_ZIP),
|
||
("控制端 APK", WATCH_APK)):
|
||
if not path.is_file():
|
||
print(f" 找不到{label}: {path}")
|
||
return 1
|
||
|
||
work = Path(tempfile.mkdtemp(prefix="verify_pkg_"))
|
||
relay_proc = agent_proc = None
|
||
try:
|
||
# ---------------- 1. 解压两个 zip ----------------
|
||
print("一、解压(两个 zip)")
|
||
with zipfile.ZipFile(AGENT_ZIP) as archive:
|
||
archive.extractall(work)
|
||
with zipfile.ZipFile(SERVER_ZIP) as archive:
|
||
archive.extractall(work)
|
||
|
||
# 两个包各自带一层版本目录
|
||
agent_dir = work / AGENT_ZIP.stem
|
||
relay_dir = work / SERVER_ZIP.stem
|
||
check("被控端目录存在", agent_dir.is_dir(), agent_dir)
|
||
check("服务器端目录存在", relay_dir.is_dir(), relay_dir)
|
||
|
||
exe = agent_dir / "ykxmz.exe"
|
||
relay_py = relay_dir / "relay.py"
|
||
install_sh = relay_dir / "install.sh"
|
||
apk = WATCH_APK
|
||
check("被控端 EXE 在", exe.is_file())
|
||
check("服务器端 relay.py 在", relay_py.is_file())
|
||
check("服务器端 install.sh 在", install_sh.is_file())
|
||
check("服务器端带了网络调优脚本", (relay_dir / "net-tune.sh").is_file())
|
||
check("服务器端带了看门狗", (relay_dir / "watchdog.sh").is_file())
|
||
check("控制端 APK 在(直接在 dist 里)", apk.is_file(), apk)
|
||
|
||
# 说明文档要有 BOM(否则记事本会认成 GBK 乱码)
|
||
for label, path in (("被控端", agent_dir / "README-agent.txt"),
|
||
("服务器端", relay_dir / "README-server.txt"),
|
||
("控制端(旁边那份)",
|
||
ROOT / "dist" / "ykxmz-watch-1.8.0-说明.txt")):
|
||
raw = path.read_bytes() if path.is_file() else b""
|
||
check(f"{label}说明有 UTF-8 BOM",
|
||
raw[:3] == b"\xef\xbb\xbf", raw[:3])
|
||
|
||
# 三份正式文档:两个包里都要有
|
||
for label, base in (("被控端包", agent_dir), ("服务器端包", relay_dir)):
|
||
for doc in ("LICENSE.txt", "BEFORE-INSTALL.txt",
|
||
"AFTER-INSTALL.txt"):
|
||
check(f"{label}带了 {doc}", (base / doc).is_file())
|
||
|
||
# 被控端目录里不该有 data / 说明残留
|
||
check("没有把 data 目录打进去",
|
||
not (agent_dir / "data").exists())
|
||
check("带了三个工具脚本",
|
||
all((agent_dir / n).is_file()
|
||
for n in ("wlzj.bat", "xffhq.bat", "fxfhq.bat")),
|
||
[n for n in ("wlzj.bat", "xffhq.bat", "fxfhq.bat")
|
||
if not (agent_dir / n).is_file()])
|
||
|
||
# ---------------- 2. 起包里的中转 ----------------
|
||
print()
|
||
print("二、用包里的 relay.py 起中转")
|
||
relay_data = work / "relaydata"
|
||
relay_data.mkdir(parents=True, exist_ok=True)
|
||
env = dict(os.environ)
|
||
env.update({
|
||
"RELAY_PORT": str(RELAY_PORT), "RELAY_BIND": "127.0.0.1",
|
||
"RELAY_DATA": str(relay_data), "RELAY_POLL": "8",
|
||
"PYTHONIOENCODING": "utf-8", "PYTHONUNBUFFERED": "1",
|
||
})
|
||
relay_proc = subprocess.Popen(
|
||
[sys.executable, "-u", str(relay_py)], env=env,
|
||
stdout=open(work / "relay.log", "wb"),
|
||
stderr=subprocess.STDOUT)
|
||
base = f"http://127.0.0.1:{RELAY_PORT}"
|
||
up = False
|
||
for _ in range(40):
|
||
time.sleep(0.5)
|
||
try:
|
||
with urllib.request.urlopen(base + "/v1/health",
|
||
timeout=2) as r:
|
||
if r.status == 200:
|
||
up = True
|
||
break
|
||
except Exception: # noqa: BLE001
|
||
continue
|
||
check("包里的中转能起", up)
|
||
if not up:
|
||
print((work / "relay.log").read_text(encoding="utf-8",
|
||
errors="replace")[-800:])
|
||
return 1
|
||
|
||
# ---------------- 3. 起包里的被控端 ----------------
|
||
print()
|
||
print("三、用包里的 EXE 起被控端,让它连这个中转")
|
||
data_dir = agent_dir / "data"
|
||
data_dir.mkdir(parents=True, exist_ok=True)
|
||
sys.path.insert(0, str(ROOT / "windows"))
|
||
from lanremote.config import Store
|
||
store = Store(data_dir)
|
||
store.set_pairing_code(PAIR_CODE)
|
||
store.set("setup_done", True)
|
||
store.set("allow_new_pairing", True)
|
||
store.set("close_pair_after_first", False)
|
||
store.set("server_name", "包里测试电脑")
|
||
store.set("relay_url", base)
|
||
store.set("port", AGENT_PORT)
|
||
|
||
agent_proc = subprocess.Popen(
|
||
[str(exe), "--silent", "--port", str(AGENT_PORT)],
|
||
cwd=str(agent_dir),
|
||
stdout=open(work / "agent.log", "wb"),
|
||
stderr=subprocess.STDOUT)
|
||
online = False
|
||
info = {}
|
||
for _ in range(60):
|
||
time.sleep(1.0)
|
||
try:
|
||
with urllib.request.urlopen(base + "/v1/health",
|
||
timeout=3) as r:
|
||
snap = json.loads(r.read())
|
||
for item in snap.get("devices", []):
|
||
if item.get("online"):
|
||
info = item
|
||
online = True
|
||
break
|
||
except Exception: # noqa: BLE001
|
||
continue
|
||
if online:
|
||
break
|
||
check("包里的 EXE 连上了包里的中转", online, str(info)[:150])
|
||
if not online:
|
||
print((work / "agent.log").read_text(encoding="utf-8",
|
||
errors="replace")[-1000:])
|
||
return 1
|
||
check("配对码对得上", info.get("code") == PAIR_CODE, info.get("code"))
|
||
check("设备名对得上", info.get("name") == "包里测试电脑",
|
||
info.get("name"))
|
||
|
||
# ---------------- 4. Java 手表端 ----------------
|
||
print()
|
||
print("四、Java 手表端经这个中转连被控端")
|
||
classes = work / "classes"
|
||
classes.mkdir(parents=True, exist_ok=True)
|
||
sources = [ROOT / "android" / "src" / "com" / "lanremote" / "watch" / n
|
||
for n in ("Json.java", "B64.java", "Transport.java",
|
||
"RelayTransport.java", "TlsCompat.java",
|
||
"RemoteClient.java",
|
||
"DiscoveryCore.java")]
|
||
sources.append(ROOT / "_tests" / "java" / "JavaRelayTest.java")
|
||
comp = subprocess.run(
|
||
[str(JAVAC), "--release", "8", "-encoding", "UTF-8",
|
||
"-d", str(classes)] + [str(s) for s in sources],
|
||
capture_output=True, text=True, encoding="utf-8", errors="replace")
|
||
check("Java 编译通过", comp.returncode == 0, comp.stderr[:200])
|
||
if comp.returncode != 0:
|
||
return 1
|
||
|
||
# 这条链路实测只有 ~75% 可用(丢包 40%,边缘还在美西),
|
||
# 而这里串行发多个请求,任何一个被丢就整体失败 —— 会假失败。
|
||
# 测试要验证的是**产品逻辑**,链路可靠性有专门的可用率测量盯着。
|
||
# 所以重试 3 次,任一次全过就算过。
|
||
result = None
|
||
tail = ""
|
||
for attempt in range(3):
|
||
result = subprocess.run(
|
||
[str(JAVA), "-Dfile.encoding=UTF-8", "-cp", str(classes),
|
||
"JavaRelayTest", base, PAIR_CODE],
|
||
capture_output=True, text=True, encoding="utf-8",
|
||
errors="replace")
|
||
tail = (result.stdout.strip().splitlines()[-1]
|
||
if result.stdout.strip() else "")
|
||
if result.returncode == 0 and "失败 0 项" in tail:
|
||
if attempt:
|
||
print(f" (第 {attempt + 1} 次才通过 —— "
|
||
f"链路抖动,不是产品问题)")
|
||
break
|
||
if attempt < 2:
|
||
time.sleep(2.0)
|
||
check("Java 手表端经中转全部通过",
|
||
result is not None and result.returncode == 0
|
||
and "失败 0 项" in tail, tail)
|
||
for line in result.stdout.splitlines():
|
||
if "[FAIL]" in line:
|
||
print(" " + line.strip())
|
||
|
||
print()
|
||
print("=" * 66)
|
||
print(f"通过 {passed} 项,失败 {failed} 项")
|
||
return 0 if failed == 0 else 1
|
||
finally:
|
||
for process in (agent_proc, relay_proc):
|
||
if process is not None:
|
||
try:
|
||
process.terminate()
|
||
process.wait(timeout=8)
|
||
except Exception: # noqa: BLE001
|
||
try:
|
||
process.kill()
|
||
except Exception: # noqa: BLE001
|
||
pass
|
||
time.sleep(1)
|
||
shutil.rmtree(work, ignore_errors=True)
|
||
|
||
|
||
if __name__ == "__main__":
|
||
sys.exit(main())
|