mirror of
https://gitee.com/xmz7891/ykxmz.git
synced 2026-10-18 13:40:45 +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,185 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""真正解析一遍生成的 JS,确认没有跨行字符串。
|
||||
|
||||
上次的"复核"是简单的数引号,不准。
|
||||
这次写个正经的扫描器:按字符走,处理转义、注释、模板串。
|
||||
|
||||
顺便:如果有 node,直接用 node --check 验证语法(最权威)。
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
import urllib.error
|
||||
import urllib.request
|
||||
import http.cookiejar
|
||||
import urllib.parse
|
||||
import json
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
UA = {"User-Agent": "LanRemote/1.4.0"}
|
||||
PORT = 8099
|
||||
BASE = f"http://127.0.0.1:{PORT}"
|
||||
|
||||
|
||||
def scan_js_literals(script: str) -> list:
|
||||
"""扫出跨行的字符串字面量,返回 [(行号, 片段)]。"""
|
||||
problems = []
|
||||
i = 0
|
||||
n = len(script)
|
||||
line = 1
|
||||
while i < n:
|
||||
ch = script[i]
|
||||
if ch == "\n":
|
||||
line += 1
|
||||
i += 1
|
||||
continue
|
||||
# 行注释
|
||||
if ch == "/" and i + 1 < n and script[i + 1] == "/":
|
||||
while i < n and script[i] != "\n":
|
||||
i += 1
|
||||
continue
|
||||
# 块注释
|
||||
if ch == "/" and i + 1 < n and script[i + 1] == "*":
|
||||
i += 2
|
||||
while i + 1 < n and not (script[i] == "*" and script[i + 1] == "/"):
|
||||
if script[i] == "\n":
|
||||
line += 1
|
||||
i += 1
|
||||
i += 2
|
||||
continue
|
||||
# 字符串
|
||||
if ch in ("'", '"', "`"):
|
||||
quote = ch
|
||||
start_line = line
|
||||
start_i = i
|
||||
i += 1
|
||||
closed = False
|
||||
while i < n:
|
||||
c = script[i]
|
||||
if c == "\\":
|
||||
i += 2
|
||||
continue
|
||||
if c == "\n":
|
||||
if quote == "`":
|
||||
line += 1
|
||||
i += 1
|
||||
continue
|
||||
break
|
||||
if c == quote:
|
||||
closed = True
|
||||
i += 1
|
||||
break
|
||||
i += 1
|
||||
if not closed:
|
||||
snippet = script[start_i:start_i + 60].replace("\n", "\\n")
|
||||
problems.append((start_line, snippet))
|
||||
continue
|
||||
i += 1
|
||||
return problems
|
||||
|
||||
|
||||
def main() -> int:
|
||||
work = Path(tempfile.mkdtemp(prefix="jscheck_"))
|
||||
relay = None
|
||||
try:
|
||||
data = work / "d"
|
||||
data.mkdir(parents=True, exist_ok=True)
|
||||
env = dict(os.environ)
|
||||
env.update({"RELAY_PORT": str(PORT), "RELAY_BIND": "127.0.0.1",
|
||||
"RELAY_DATA": str(data),
|
||||
"PYTHONIOENCODING": "utf-8", "PYTHONUNBUFFERED": "1"})
|
||||
relay = subprocess.Popen(
|
||||
[sys.executable, "-u", str(ROOT / "relay" / "relay.py")], env=env,
|
||||
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||||
for _ in range(40):
|
||||
time.sleep(0.5)
|
||||
try:
|
||||
urllib.request.urlopen(
|
||||
urllib.request.Request(BASE + "/v1/health", headers=UA),
|
||||
timeout=2)
|
||||
break
|
||||
except Exception: # noqa: BLE001
|
||||
continue
|
||||
|
||||
body = json.dumps({"deviceId": "pc-js", "code": "333444",
|
||||
"name": "测试电脑", "version": "1.4.0"}).encode()
|
||||
urllib.request.urlopen(urllib.request.Request(
|
||||
BASE + "/v1/agent/register", data=body, method="POST",
|
||||
headers={**UA, "Content-Type": "application/json"}), timeout=10
|
||||
).read()
|
||||
|
||||
jar = http.cookiejar.CookieJar()
|
||||
opener = urllib.request.build_opener(
|
||||
urllib.request.HTTPCookieProcessor(jar))
|
||||
form = urllib.parse.urlencode({"password": "120830"}).encode()
|
||||
req = urllib.request.Request(BASE + "/admin/login", data=form,
|
||||
method="POST", headers=UA)
|
||||
req.add_header("Content-Type", "application/x-www-form-urlencoded")
|
||||
try:
|
||||
opener.open(req, timeout=10).read()
|
||||
except urllib.error.HTTPError:
|
||||
pass
|
||||
|
||||
html = opener.open(urllib.request.Request(BASE + "/", headers=UA),
|
||||
timeout=10).read().decode("utf-8")
|
||||
|
||||
start = html.find("<script>")
|
||||
end = html.find("</script>", start)
|
||||
if start < 0:
|
||||
print(" [FAIL] 页面里没有 script")
|
||||
return 1
|
||||
script = html[start + len("<script>"):end]
|
||||
print(f" JS 长度 {len(script)} 字符,{len(script.splitlines())} 行")
|
||||
|
||||
bad = scan_js_literals(script)
|
||||
if bad:
|
||||
print(f" [FAIL] 有 {len(bad)} 处跨行字符串字面量:")
|
||||
for line, snippet in bad:
|
||||
print(f" 第 {line} 行: {snippet}")
|
||||
else:
|
||||
print(" ✓ 没有跨行字符串字面量")
|
||||
|
||||
# 有 node 的话用它做权威校验
|
||||
node = shutil.which("node")
|
||||
if node:
|
||||
jsfile = work / "check.js"
|
||||
jsfile.write_text(script, encoding="utf-8")
|
||||
proc = subprocess.run([node, "--check", str(jsfile)],
|
||||
capture_output=True, text=True,
|
||||
encoding="utf-8", errors="replace")
|
||||
if proc.returncode == 0:
|
||||
print(" ✓ node --check 语法通过")
|
||||
else:
|
||||
print(f" [FAIL] node --check 报错:{proc.stderr[:300]}")
|
||||
bad.append((-1, "node"))
|
||||
else:
|
||||
print(" (本机没有 node,跳过 --check)")
|
||||
|
||||
print()
|
||||
if bad:
|
||||
print(" 结论:JS 有语法错误 —— 按钮点了没反应就是这个原因")
|
||||
return 1
|
||||
print(" 结论:JS 合法,删除按钮能正常工作")
|
||||
return 0
|
||||
finally:
|
||||
if relay is not None:
|
||||
try:
|
||||
relay.terminate()
|
||||
relay.wait(timeout=8)
|
||||
except Exception: # noqa: BLE001
|
||||
try:
|
||||
relay.kill()
|
||||
except Exception: # noqa: BLE001
|
||||
pass
|
||||
time.sleep(0.5)
|
||||
shutil.rmtree(work, ignore_errors=True)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
Reference in New Issue
Block a user