update 2026-11-17 20:42:22

This commit is contained in:
action committed 2026-11-17 20:42:22 +08:00
1 parent 2d85db1d3b
commit 4cc6f67a93
12 files changed
+251 -23

No files matched your search

+9 -5
View File
@@ -2,24 +2,28 @@
set -euo pipefail
cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
export PYTHONDONTWRITEBYTECODE=1
case "${1:-unit}" in
unit)
for script in scripts/*.sh tests/sdk/*.sh; do
bash -n "$script"
done
node --test tests/*.test.js
python3 -m unittest discover -s tests -p 'test_*.py' -v
printf '\n%s\n' '运行前端回归测试...'
node --test --test-reporter=./tests/reporter.cjs tests/*.test.js
printf '\n%s\n' '运行服务与 DNS 回归测试...'
python3 tests/run-python.py --label '服务与 DNS ' discover tests
;;
browser)
python3 tests/browser/test_verbose_checkbox.py
python3 tests/run-python.py --label '详细日志开关的默认值, 保存, 失败恢复和只读状态' command python3 tests/browser/test_verbose_checkbox.py
;;
sdk)
# 使用 SDK 构建出的工具, 避免维护额外的编译器和 apk 副本.
if [[ -n "${SDK_DIR:-}" ]]; then
export PATH="$SDK_DIR/staging_dir/hostpkg/bin:$SDK_DIR/staging_dir/host/bin:$PATH"
fi
python3 tests/sdk/test_split_packages.py
bash tests/sdk/test_apk_rename.sh
python3 tests/run-python.py --label 'SDK 分包, 翻译编译, 下载失败处理及产物收集' command python3 tests/sdk/test_split_packages.py
python3 tests/run-python.py --label 'APK 包名迁移, 重装及升级时保留用户配置' command bash tests/sdk/test_apk_rename.sh
;;
*)
echo "Usage: bash scripts/test.sh [unit|browser|sdk]" >&2
@@ -0,0 +1,38 @@
{
"DnsmasqUpstreamTests": {
"test_round_trip_preserves_servers_and_custom_options": "模式往返切换保留原有上游与自定义选项",
"test_absent_options_stay_absent": "未配置的选项在恢复后仍保持未配置",
"test_explicit_empty_and_noresolv_one_preserved": "保留显式空值和 noresolv 设置",
"test_repeated_start_and_port_change_do_not_replace_snapshot": "重复启动与端口变更不覆盖原始快照",
"test_domain_rules_kept_but_catch_all_removed": "保留域名专用规则并移除全局匹配规则",
"test_legacy_endpoint_removed_in_any_position_without_prefix_match": "精确移除旧上游地址且不误匹配相似前缀",
"test_legacy_upgrade_does_not_save_old_plugin_endpoint": "旧版升级不会将插件旧地址保存为原始上游",
"test_snapshot_commit_failure_does_not_change_dns": "快照提交失败时不修改 DNS",
"test_restore_restart_failure_keeps_snapshot_for_retry": "恢复时重启失败仍保留快照供重试",
"test_mode_switch_and_disable_through_redirect_dispatcher": "重定向调度器正确处理模式切换与停用",
"test_dispatcher_preserves_preexisting_matching_endpoint": "保留启用插件前已存在的相同上游地址",
"test_overlapping_starts_keep_original_snapshot": "并发启动仍保留原始配置快照"
},
"ServiceLifecycleTests": {
"test_upstream_to_exchange_releases_both_ports_before_start": "切换到端口交换模式前释放双方端口",
"test_exchange_to_upstream_releases_53_before_dnsmasq": "切回上游模式时先释放 53 端口再启动 dnsmasq",
"test_stopping_exchange_does_not_schedule_another_start": "停止端口交换模式不会再次安排启动",
"test_failed_stop_does_not_modify_ports": "停止服务失败时不修改端口",
"test_failed_dnsmasq_restart_does_not_launch_core": "dnsmasq 重启失败时不启动核心",
"test_crashed_core_is_started_with_prepared_ports": "核心崩溃后使用已准备的端口重新启动",
"test_retry_after_committed_port_but_failed_handoff": "端口已提交但交接失败后能够重试",
"test_config_watcher_queues_reload_only_after_dnsmasq_handoff": "配置监视器在 dnsmasq 交接完成后才安排重载",
"test_repeated_round_trips_keep_ports_and_original_upstreams": "反复切换后端口与原始上游保持正确"
},
"ProcessHandoffTests": {
"test_stop_wait_start_does_not_reuse_a_live_jail": "等待旧进程退出后才重新创建隔离实例",
"test_failed_jail_stop_does_not_register_a_replacement": "隔离实例停止失败时不注册替代实例",
"test_actual_dns_socket_handoff": "真实 DNS 套接字能够完成端口交接",
"test_stop_core_deletes_crashed_instance_without_pid": "清理没有 PID 的已崩溃核心实例"
},
"UpdateLockTests": {
"test_normal_and_force_contenders_preserve_owner_state": "普通及强制更新竞争不会破坏当前持锁者状态",
"test_killed_owner_does_not_leave_lock_held": "持锁进程被终止后锁能正常释放",
"test_failure_sets_error_and_releases_lock": "更新失败时记录错误并释放锁"
}
}
+1 -1
View File
@@ -125,7 +125,7 @@ async function runLogTests(rpcSource, viewSource) {
const test = require('node:test');
test('runtime log transport, bounded reads and clear/poll race', { timeout: 5000 }, async () => {
test('运行日志传输, 有界读取与清空和轮询的竞争处理', { timeout: 5000 }, async () => {
const fs = require('fs');
const path = require('path');
const root = path.resolve(__dirname, '..');
@@ -0,0 +1,27 @@
const { spec } = require('node:test/reporters');
const { Readable } = require('node:stream');
const { stripVTControlCharacters } = require('node:util');
function row(symbol, milliseconds, description) {
const duration = Number(milliseconds).toFixed(2) + 'ms';
return symbol + ' ' + duration.padStart(12) + ' ' + description;
}
module.exports = async function* (source) {
const totals = {};
for await (const chunk of Readable.from(source).pipe(new spec())) {
yield chunk.toString().split('\n').map(line => {
const plain = stripVTControlCharacters(line);
const result = plain.match(/^\s*([✔✖﹣]) (.*?) \((\d+(?:\.\d+)?)ms\)(.*)$/);
if (result) return row(result[1] === '✖' ? '✘' : result[1], result[3], result[2] + result[4]);
const total = plain.match(/^ℹ (tests|suites|pass|fail|cancelled|skipped|todo|duration_ms) (\d+(?:\.\d+)?)$/);
if (!total) return line;
totals[total[1]] = Number(total[2]);
if (total[1] !== 'duration_ms') return null;
const extras = [['cancelled', '取消'], ['skipped', '跳过'], ['todo', '待完成']]
.filter(([key]) => totals[key]).map(([key, label]) => ', ' + label + ' ' + totals[key] + ' 项').join('');
return row(totals.fail || totals.cancelled ? '✘' : '✔', totals.duration_ms,
'前端测试完成: 共 ' + totals.tests + ' 项, 通过 ' + totals.pass + ' 项, 失败 ' + totals.fail + ' 项' + extras);
}).filter(line => line !== null).join('\n');
}
};
+125
View File
@@ -0,0 +1,125 @@
import argparse
import importlib.util
import json
import subprocess
from pathlib import Path
import sys
import time
import unittest
DESCRIPTIONS = json.loads(Path(__file__).with_name('descriptions.zh-CN.json').read_text())
def row(symbol, seconds, description):
duration = f'{seconds:.2f}s'
return f'{symbol} {duration:>12} {description}'
class ReportStream:
def __init__(self, stream):
self.stream = stream
def write(self, text):
return self.stream.write(text)
def writeln(self, text=''):
self.stream.write(text + '\n')
self.stream.flush()
def __getattr__(self, name):
return getattr(self.stream, name)
class ChineseResult(unittest.TextTestResult):
def startTest(self, test):
super().startTest(test)
self.started = time.perf_counter()
self.before = (len(self.failures) + len(self.errors) + len(self.unexpectedSuccesses),
len(self.skipped), len(self.expectedFailures))
def stopTest(self, test):
failed = len(self.failures) + len(self.errors) + len(self.unexpectedSuccesses) > self.before[0]
skipped = len(self.skipped) > self.before[1]
expected = len(self.expectedFailures) > self.before[2]
suffix = ' [跳过]' if skipped else ' [预期失败]' if expected else ''
self.stream.writeln(row('✘' if failed else '﹣' if skipped else '✔',
time.perf_counter() - self.started, self.getDescription(test) + suffix))
super().stopTest(test)
def getDescription(self, test):
original = getattr(test, 'test_case', test)
name = getattr(original, '_testMethodName', '')
description = (DESCRIPTIONS.get(type(original).__name__, {}).get(name)
or test.shortDescription() or str(test))
# 失败的子用例保留参数, 便于定位具体的标签或校验值.
parameters = getattr(test, 'params', None)
if parameters:
description += f' {dict(parameters)!r}'
return description
def run_suite(suite, label):
result = ChineseResult(ReportStream(sys.stdout), descriptions=True, verbosity=0)
started = time.perf_counter()
result.startTestRun()
try:
suite.run(result)
finally:
result.stopTestRun()
# 保留 unittest 收集的完整失败详情, 自定义报告不改变测试退出状态.
result.printErrors()
summary = (f'{label}测试完成: 共 {result.testsRun} 项, '
f'失败 {len(result.failures)} 项, 错误 {len(result.errors)} 项')
for name, entries in [('跳过', result.skipped), ('预期失败', result.expectedFailures),
('非预期通过', result.unexpectedSuccesses)]:
if entries:
summary += f', {name} {len(entries)} 项'
result.stream.writeln(row('✔' if result.wasSuccessful() else '✘', time.perf_counter() - started, summary))
return 0 if result.wasSuccessful() else 1
def main():
parser = argparse.ArgumentParser(description='以统一格式输出回归测试结果')
parser.add_argument('--label', default='Python')
commands = parser.add_subparsers(dest='mode', required=True)
discovery = commands.add_parser('discover')
discovery.add_argument('directory')
discovery.add_argument('--pattern', default='test_*.py')
file = commands.add_parser('file')
file.add_argument('path')
file.add_argument('arguments', nargs=argparse.REMAINDER)
command = commands.add_parser('command')
command.add_argument('arguments', nargs=argparse.REMAINDER)
args = parser.parse_args()
if args.mode == 'command':
if not args.arguments:
parser.error('缺少要运行的命令')
started = time.perf_counter()
# 独立浏览器和 SDK 脚本沿用原入口, 成功时收起内部日志, 失败时完整输出.
try:
result = subprocess.run(args.arguments, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
except OSError as error:
print(row('✘', time.perf_counter() - started, args.label), flush=True)
print(str(error), flush=True)
return 1
print(row('✔' if result.returncode == 0 else '✘', time.perf_counter() - started, args.label), flush=True)
if result.returncode != 0:
print(result.stdout, end='', flush=True)
return 0 if result.returncode == 0 else 1
if args.mode == 'discover':
suite = unittest.defaultTestLoader.discover(str(Path(args.directory).resolve()), pattern=args.pattern)
else:
path = Path(args.path).resolve()
# 有些测试会在导入时读取二进制路径, 保持直接运行脚本时的参数与导入目录.
sys.path.insert(0, str(path.parent))
sys.argv = [str(path), *args.arguments]
spec = importlib.util.spec_from_file_location(path.stem, path)
module = importlib.util.module_from_spec(spec)
sys.modules[path.stem] = module
spec.loader.exec_module(module)
suite = unittest.defaultTestLoader.loadTestsFromModule(module)
return run_suite(suite, args.label)
if __name__ == '__main__':
sys.exit(main())
+1 -1
View File
@@ -29,7 +29,7 @@ function harness() {
return { page: module.render(), nodes, polls, redirect: () => nodes[2].textContent };
}
const flush = async () => { for (let i = 0; i < 8; i++) await Promise.resolve(); };
test('mode switching, timeout recovery and stale RPC replies', { timeout: 5000 }, async t => {
test('模式切换, 超时恢复与过期 RPC 响应处理', { timeout: 5000 }, async t => {
const realNow = Date.now;
Date.now = () => now;
t.after(() => { Date.now = realNow; });
@@ -877,8 +877,11 @@ set_tproxy_sysctl() {
# Disable IPv4 rp_filter for TPROXY compatibility.
sysctl -w net.ipv4.conf.all.rp_filter=0 >/dev/null 2>&1
sysctl -w net.ipv4.conf.default.rp_filter=0 >/dev/null 2>&1
# Tailscale may enable mark-based source validation, which conflicts with TPROXY routing.
sysctl -w net.ipv4.conf.all.src_valid_mark=0 >/dev/null 2>&1
sysctl -w net.ipv4.conf.default.src_valid_mark=0 >/dev/null 2>&1
local f
for f in /proc/sys/net/ipv4/conf/*/rp_filter; do
for f in /proc/sys/net/ipv4/conf/*/rp_filter /proc/sys/net/ipv4/conf/*/src_valid_mark; do
echo 0 > "$f" 2>/dev/null
done
}
@@ -942,8 +942,11 @@ set_tproxy_sysctl() {
# Disable IPv4 rp_filter for TPROXY compatibility.
sysctl -w net.ipv4.conf.all.rp_filter=0 >/dev/null 2>&1
sysctl -w net.ipv4.conf.default.rp_filter=0 >/dev/null 2>&1
# Tailscale may enable mark-based source validation, which conflicts with TPROXY routing.
sysctl -w net.ipv4.conf.all.src_valid_mark=0 >/dev/null 2>&1
sysctl -w net.ipv4.conf.default.src_valid_mark=0 >/dev/null 2>&1
local f
for f in /proc/sys/net/ipv4/conf/*/rp_filter; do
for f in /proc/sys/net/ipv4/conf/*/rp_filter /proc/sys/net/ipv4/conf/*/src_valid_mark; do
echo 0 > "$f" 2>/dev/null
done
}
@@ -648,8 +648,22 @@ update_wan_sets() {
) 9>"${LOCK_PATH}/${CONFIG}_update_wan_sets.lock"
}
set_tproxy_sysctl() {
# Disable IPv4 rp_filter for TPROXY compatibility.
sysctl -w net.ipv4.conf.all.rp_filter=0 >/dev/null 2>&1
sysctl -w net.ipv4.conf.default.rp_filter=0 >/dev/null 2>&1
# Tailscale may enable mark-based source validation, which conflicts with TPROXY routing.
sysctl -w net.ipv4.conf.all.src_valid_mark=0 >/dev/null 2>&1
sysctl -w net.ipv4.conf.default.src_valid_mark=0 >/dev/null 2>&1
local f
for f in /proc/sys/net/ipv4/conf/*/rp_filter /proc/sys/net/ipv4/conf/*/src_valid_mark; do
echo 0 > "$f" 2>/dev/null
done
}
add_firewall_rule() {
log_i18n 0 "Starting to load %s firewall rules..." "iptables"
set_tproxy_sysctl
ipset -! create $IPSET_LOCAL nethash maxelem 1048576
ipset -! create $IPSET_DIRECT nethash maxelem 1048576
@@ -685,11 +685,25 @@ update_wan_sets() {
) 9>"${LOCK_PATH}/${CONFIG}_update_wan_sets.lock"
}
set_tproxy_sysctl() {
# Disable IPv4 rp_filter for TPROXY compatibility.
sysctl -w net.ipv4.conf.all.rp_filter=0 >/dev/null 2>&1
sysctl -w net.ipv4.conf.default.rp_filter=0 >/dev/null 2>&1
# Tailscale may enable mark-based source validation, which conflicts with TPROXY routing.
sysctl -w net.ipv4.conf.all.src_valid_mark=0 >/dev/null 2>&1
sysctl -w net.ipv4.conf.default.src_valid_mark=0 >/dev/null 2>&1
local f
for f in /proc/sys/net/ipv4/conf/*/rp_filter /proc/sys/net/ipv4/conf/*/src_valid_mark; do
echo 0 > "$f" 2>/dev/null
done
}
add_firewall_rule() {
log_i18n 0 "Starting to load %s firewall rules..." "nftables"
gen_nft_tables
add_script_mwan3
mwan3_start
set_tproxy_sysctl
gen_nftset $NFTSET_LOCAL ipv4_addr 0 "-1"
gen_nftset $NFTSET_DIRECT ipv4_addr 0 "-1"
+1 -1
View File
@@ -4,7 +4,7 @@ LUCI_TITLE:=luci-app-ssr-plus
LUCI_PKGARCH:=all
PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=198
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \
+13 -13
View File
@@ -3,7 +3,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=npc
PKG_VERSION:=0.35.2
PKG_VERSION:=null
PKG_RELEASE:=1
PKG_LICENSE:=Apache-2.0
PKG_MAINTAINER:=Duan <duan@d-jy.net>
@@ -57,18 +57,18 @@ PKG_SOURCE_URL:=$(NPS_URL)/releases/download/v$(PKG_VERSION)/
# === NPC_HASH_TABLE_START ===
NPC_HASHES:= \
amd64=ea4ed903ef2f7019dc7f737c5837d1c45f9da207d4e61b632e621cfdfe0b702e \
386=555a4433af3ad660b78fa435a45283c432554176daf61e410644b8aa1508a330 \
arm64=66ca39843df62b8da4e0a015fc97dbef5e7ed68ec53cc2c8f3476c8deffa51f4 \
arm_v7=8b2cbc327de744cf328701d6503a10ce33f6a68fe94efd7611182f01d8c4ec23 \
arm_v6=ca063ac7f58168b050796e4d5a951e803271cb97279c25a5ce4605b8c6d4ef98 \
arm_v5=7a94b033eff9b6bb100575a45a8825a13dd04cae1a96cf30c942d2c0e8436268 \
mips_softfloat=e0e1218eaa31b75124ce400be2db3965a73ba5ec0f2f7f5fb4d1355ef207833d \
mipsle_softfloat=cd84405e4e5260f28eff8fa0e35cf344a773c2ab2f54d3d1b14ac103a118e413 \
mips64=85869ed334b624570ff4f702c690db1ee651271a207854fd1c19e87600873d1f \
mips64le=8ed8ff8020550c8bdb9bc101716f53691b422f4a5318f97ec5efdf5bada3fccc \
loong64=e98f6705187440e96fb6711bcfec2f1dc3c47f8f1e4b1902963b5603eecbaff6 \
riscv64=daef08a752ea98ae493e3da44df982ab71e2f495be429a7c1ca648e5a8da9480
amd64=0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 \
386=0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 \
arm64=0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 \
arm_v7=0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 \
arm_v6=0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 \
arm_v5=0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 \
mips_softfloat=0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 \
mipsle_softfloat=0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 \
mips64=0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 \
mips64le=0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 \
loong64=0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 \
riscv64=0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5
# === NPC_HASH_TABLE_END ===
PKG_HASH:=$(strip $(foreach pair,$(NPC_HASHES), $(if $(findstring $(NPC_ARCH),$(pair)),$(word 2, $(subst =, ,$(pair))))))