mirror of
https://gitee.com/xmz7891/ykxmz.git
synced 2026-10-18 14:50:45 +00:00
xmz7891
1d368979aa
== 用户要求 ==
"安卓那个逻辑也要改一下，就是你输入配对码后，进入一个页面，
页面有两个按钮，第一个按钮是远控，第二个按钮是静默更新被控端"
== 做成什么样 ==
新增 choicePanel，连接成功后先进这一页：
已连接「电脑名」
电脑端 2.1.5 → 可更新到 2.2.0
[ 远控 ] <- 第一个按钮
[ 静默更新被控端 ] <- 第二个按钮
按钮顺序按用户说的来（远控在前）。
页面顶上显示电脑名和**电脑端当前版本** —— 用户之前要求
"手表端连接那个电脑端也可以查看电脑端目前所处的版本"，
这里是最自然的展示位置（不弹框，只显示一行）。
为什么不让它直接进控制页：老版本的被控端可能缺功能或有 bug，
"先更新再远控"是更合理的顺序 —— 但不强制，给用户自己选。
== 一个刻意不改的地方 ==
自动切到中转服务器**恢复**时的 `showControlPanel()` **没动** ——
用户本来就在远控页，中途弹一层选择页会打断他。
测试里专门断言了这一点，免得以后有人"顺手统一一下"改坏。
== 顺手修的几个问题 ==
1. **忘了定义 lastDeviceName** —— 写选择页时凭直觉用了这个变量，
编译报"找不到符号"。补上字段并在连接回调里赋值。
（教训：写代码时要用的变量，先确认它存在。）
2. **泄漏闸门拦下我自己** —— 这两天写的一批服务器诊断/配置脚本里
硬编码了服务器 IP（26 处，5 个文件）。规则是 IP 不能进任何
被跟踪的文件。已全部改成占位符，真实值仍从
_build/.lightsail_host（已 gitignore）读。
3. **verify_all.ps1 删掉「锁屏时记 SKIP」的逻辑** ——
用户明确要求删。那个好意带来一个更糟的后果：锁屏时几关根本不跑，
回归"全绿"了但关键测试其实一跳而过。
**"因为环境不满足所以不测"比"测了发现失败"更危险。**
删掉之后果然暴露出 3 个 FAIL —— 屏幕解锁后重跑全部通过，
确认是环境问题而不是代码问题。
== 服务器这边（不在这份提交里，但同一天做的）==
* nginx 按用户要求重排：
IP(80) 任何路径 -> 404（没东西）
域名 / -> 官网；/zhongzhuanzhan -> 中转站设置
9100 -> 同样的内容（等 AWS 开防火墙）
* 删掉早年 Cloudflare Tunnel 的 systemd 残留
* **补上 ACME 挑战例外** —— 这是最要紧的一条：
80 端口原来把所有请求都 301 到 https，包括
/.well-known/acme-challenge/，**续期时会失败**。
而且它是延迟爆发的（最长 90 天后证书到期才暴露）。
* 清理 1Panel 安装包残留（223MB）
== 验证 ==
全量回归 21 关全部 PASS（零 FAIL，桌面可用状态）
Java 编译通过（android-34, --release 8）
623+ Python 文件语法通过
泄漏闸门通过
全部产物重建，Win7 兼容校验通过
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-2.2.0.zip"
|
||
SERVER_ZIP = ROOT / "dist" / "ykxmz-server-2.2.0.zip"
|
||
WATCH_APK = ROOT / "dist" / "ykxmz-watch-2.2.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-2.2.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())
|