fix: 区分核心和 watchdog 运行状态

luci-app-openclash/root/etc/init.d/openclash

@@ -3595,7 +3595,7 @@ start_service()
    enable=$(uci_get_config "enable")
    [ "$enable" != "1" ] && LOG_WARN "OpenClash Now Disabled, Need Start From Luci Page, Exit..." && SLOG_CLEAN && exit 0
 
-   if procd_running "openclash" >/dev/null; then
+   if procd_running "openclash" "openclash" >/dev/null; then
       LOG_TIP "OpenClash Already Running, Exit..."
       exit 0
    fi

luci-app-openclash/root/usr/share/openclash/openclash_watchdog.sh

@@ -208,7 +208,7 @@ do
 done >/dev/null 2>&1
 
 #check the clash service status
-if ! ubus call service list '{"name":"openclash"}' 2>/dev/null | jsonfilter -e '@.openclash.instances.*.running' | grep -q 'true'; then
+if ! ubus call service list '{"name":"openclash"}' 2>/dev/null | jsonfilter -e '@.openclash.instances.openclash.running' | grep -q 'true'; then
    uci -q set openclash.config.enable=0
    uci -q commit openclash
    /etc/init.d/openclash stop >/dev/null 2>&1

tests/openclash_core_instance_state_test.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+INIT_SCRIPT="$REPO_ROOT/luci-app-openclash/root/etc/init.d/openclash"
+WATCHDOG="$REPO_ROOT/luci-app-openclash/root/usr/share/openclash/openclash_watchdog.sh"
+
+if sed -n '/start_service()/,/OpenClash Start Running/p' "$INIT_SCRIPT" | grep -F 'if procd_running "openclash" >/dev/null; then' >/dev/null 2>&1; then
+  echo "start_service still treats any openclash instance as the core process" >&2
+  exit 1
+fi
+
+if ! sed -n '/start_service()/,/OpenClash Start Running/p' "$INIT_SCRIPT" | grep -F 'procd_running "openclash" "openclash"' >/dev/null 2>&1; then
+  echo "start_service does not check the openclash core instance explicitly" >&2
+  exit 1
+fi
+
+if grep -F '@.openclash.instances.*.running' "$WATCHDOG" >/dev/null 2>&1; then
+  echo "watchdog still treats any openclash instance as the core process" >&2
+  exit 1
+fi
+
+if ! grep -F '@.openclash.instances.openclash.running' "$WATCHDOG" >/dev/null 2>&1; then
+  echo "watchdog does not check the openclash core instance explicitly" >&2
+  exit 1
+fi
+
+echo "openclash_core_instance_state_test.sh: PASS"