hacker07/NeoTachyon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix(updates,migration): skip sing-box reload when config unchanged (#54) and guard test service restart

Browse Source
This commit is contained in:
Dushnilin
2026-09-15 06:35:35 +03:00
parent 79710e84a8
commit bc0928c277
4 changed files with 178 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/import_settings.sh
+11 -3
View File
@@ -58,12 +58,16 @@ tachyon.youtube.proxy_config_type=url
tachyon.youtube.proxy_string=vless://user@1.2.3.4:443?security=tls#node1
EOF_STATE
OUTPUT="$(TACHYON_LIB="$TACHYON_LIB" \
export TACHYON_SKIP_RESTART="1"
OUTPUT="$(env \
TACHYON_LIB="$TACHYON_LIB" \
TACHYON_CONFIG_FILE="$MOCK_ETC/config/tachyon" \
TACHYON_CONFIG_DIR="$MOCK_ETC/config" \
TACHYON_UCI_STATE_FILE="$WORK_DIR/test_import.state" \
TACHYON_UCI_LOG_FILE="$WORK_DIR/test_import.log" \
TACHYON_INTERNAL_CONFIG_TRIGGER_GUARD="$WORK_DIR/internal-config-change" \
TACHYON_SKIP_RESTART="1" \
ucode -L "$TACHYON_LIB" "$MIGRATION" import-settings "$MOCK_ETC/config/forkop")"
echo "$OUTPUT" | grep -Fq 'SUCCESS: Settings successfully imported' ||
@@ -73,24 +77,28 @@ echo "$OUTPUT" | grep -Fq 'Legacy Forkop / Podkop' ||
fail "import_settings must recognize legacy format"
# 3. Test auto-scan in mock directory
SCAN_OUTPUT="$(TACHYON_LIB="$TACHYON_LIB" \
SCAN_OUTPUT="$(env \
TACHYON_LIB="$TACHYON_LIB" \
TACHYON_CONFIG_FILE="$MOCK_ETC/config/tachyon" \
TACHYON_CONFIG_DIR="$MOCK_ETC/config" \
TACHYON_UCI_STATE_FILE="$WORK_DIR/test_import.state" \
TACHYON_UCI_LOG_FILE="$WORK_DIR/test_import.log" \
TACHYON_INTERNAL_CONFIG_TRIGGER_GUARD="$WORK_DIR/internal-config-change" \
TACHYON_SKIP_RESTART="1" \
ucode -L "$TACHYON_LIB" "$MIGRATION" import-settings)"
echo "$SCAN_OUTPUT" | grep -Fq 'SUCCESS: Settings successfully imported' ||
fail "import_settings auto-scan must import legacy file"
# 4. Test non-existent file path error handling
ERR_OUTPUT="$(TACHYON_LIB="$TACHYON_LIB" \
ERR_OUTPUT="$(env \
TACHYON_LIB="$TACHYON_LIB" \
TACHYON_CONFIG_FILE="$MOCK_ETC/config/tachyon" \
TACHYON_CONFIG_DIR="$MOCK_ETC/config" \
TACHYON_UCI_STATE_FILE="$WORK_DIR/test_import.state" \
TACHYON_UCI_LOG_FILE="$WORK_DIR/test_import.log" \
TACHYON_INTERNAL_CONFIG_TRIGGER_GUARD="$WORK_DIR/internal-config-change" \
TACHYON_SKIP_RESTART="1" \
ucode -L "$TACHYON_LIB" "$MIGRATION" import-settings "$WORK_DIR/nonexistent.conf" 2>&1 || true)"
echo "$ERR_OUTPUT" | grep -Fq 'does not exist' ||
fail "import_settings must handle missing file with error"
tests/list_update_reload_guard.sh
+145
View File
@@ -0,0 +1,145 @@
#!/usr/bin/env bash
set -eo pipefail
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
UPDATES_UC="$ROOT_DIR/tachyon/files/usr/lib/components/updates.uc"
REAL_LIB="$ROOT_DIR/tachyon/files/usr/lib"
WORK_DIR="$(mktemp -d)"
cleanup() {
rm -rf "$WORK_DIR"
}
trap cleanup EXIT
fail() {
printf 'FAIL: %s\n' "$1" >&2
exit 1
}
write_stub() {
local path="$1"
local body="$2"
mkdir -p "$(dirname "$path")"
printf '%s\n' "$body" >"$path"
}
stub_header='#!/usr/bin/env ucode
let fs = require("fs");
function as_string(value) {
return value == null ? "" : "" + value;
}
function record(line) {
let path = getenv("FAKE_CALL_LOG") || "";
if (path != "") {
let f = fs.open(path, "a");
if (f) {
f.write(as_string(line) + "\n");
f.close();
}
}
}
'
FAKE_LIB="$WORK_DIR/lib"
write_stub "$FAKE_LIB/service/state.uc" "$stub_header"'
let mode = as_string(ARGV[0]);
record("service/state:" + mode);
if (mode == "sing-box-service-runtime-pid") {
print("4567\n");
exit(0);
}
if (mode == "reload-sing-box-runtime" ||
mode == "write-current-reload-state-clean")
exit(0);
exit(64);
'
write_stub "$FAKE_LIB/singbox/runtime.uc" "$stub_header"'
let mode = as_string(ARGV[0]);
record("singbox/runtime:" + mode);
if (mode == "init-config") {
let mutate = getenv("MUTATE_CONFIG_ON_INIT") || "0";
let config_path = getenv("FAKE_SINGBOX_CONFIG_PATH") || "";
if (mutate == "1" && config_path != "") {
let f = fs.open(config_path, "w");
if (f) {
f.write("{\"version\": 2}\n");
f.close();
}
}
exit(0);
}
exit(64);
'
write_stub "$FAKE_LIB/singbox/priority.uc" "$stub_header"'
let mode = as_string(ARGV[0]);
record("singbox/priority:" + mode);
if (mode == "stop-runtime" || mode == "start-runtime")
exit(0);
exit(64);
'
write_stub "$FAKE_LIB/singbox/dns_failover.uc" "$stub_header"'
let mode = as_string(ARGV[0]);
record("singbox/dns_failover:" + mode);
if (mode == "stop-runtime" || mode == "start-runtime")
exit(0);
exit(64);
'
CONFIG_PATH="$WORK_DIR/config.json"
echo '{"version": 1}' > "$CONFIG_PATH"
cat > "$WORK_DIR/uci.state" <<EOF
tachyon.settings=settings
tachyon.settings.config_path=$CONFIG_PATH
EOF
run_reload() {
local mutate="$1"
local log="$2"
: >"$log"
env \
TACHYON_LIB="$FAKE_LIB" \
TACHYON_RUNTIME_STATE_DIR="$WORK_DIR/run" \
TACHYON_RELOAD_STATE_FILE="$WORK_DIR/run/reload-state" \
TACHYON_RULE_CONDITION_CACHE_DIR="$WORK_DIR/run/rule-condition-cache" \
TACHYON_UCI_STATE_FILE="$WORK_DIR/uci.state" \
FAKE_CALL_LOG="$log" \
FAKE_SINGBOX_CONFIG_PATH="$CONFIG_PATH" \
MUTATE_CONFIG_ON_INIT="$mutate" \
ucode -L "$REAL_LIB" "$UPDATES_UC" reload-singbox-after-list-update
}
# Test 1: Unchanged config must NOT trigger sing-box reload or stop failover/priority (Issue #54)
UNCHANGED_LOG="$WORK_DIR/unchanged.log"
echo '{"version": 1}' > "$CONFIG_PATH"
run_reload "0" "$UNCHANGED_LOG"
if grep -Eq 'reload-sing-box-runtime|priority:stop-runtime|dns_failover:stop-runtime' "$UNCHANGED_LOG"; then
fail "reload_singbox_after_list_update must NOT reload sing-box when config is unchanged"
fi
# Test 2: Changed config MUST trigger reload and stop/start priority & failover
CHANGED_LOG="$WORK_DIR/changed.log"
echo '{"version": 1}' > "$CONFIG_PATH"
run_reload "1" "$CHANGED_LOG"
grep -Fq 'service/state:reload-sing-box-runtime' "$CHANGED_LOG" ||
fail "reload_singbox_after_list_update must reload sing-box when config has changed"
grep -Fq 'singbox/priority:stop-runtime' "$CHANGED_LOG" ||
fail "reload_singbox_after_list_update must stop priority on reload"
grep -Fq 'singbox/dns_failover:stop-runtime' "$CHANGED_LOG" ||
fail "reload_singbox_after_list_update must stop dns_failover on reload"
grep -Fq 'service/state:write-current-reload-state-clean' "$CHANGED_LOG" ||
fail "reload_singbox_after_list_update must write clean reload state"
printf 'list_update_reload_guard tests passed\n'