chore: use post-up for core start

Author: vernesong

luci-app-openclash/po/es/openclash.es.po

@@ -1796,8 +1796,8 @@ msgstr "Paso 3: modo de inicio rápido; omitiendo modificación del archivo."
 msgid "Step 4: Start Running The Clash Core..."
 msgstr "Paso 4: Iniciar el núcleo de Clash..."
 
-msgid "Step 5: Add Cron Rules, Start Daemons..."
-msgstr "Paso 5: Añadir tareas programadas e iniciar servicios..."
+msgid "Step 5: Add Cron Rules..."
+msgstr "Paso 5: Añadir tareas programadas..."
 
 msgid "Step 6: Core Status Checking and Firewall Rules Setting..."
 msgstr "Paso 6: Comprobar estado del núcleo y configurar reglas del firewall..."
@@ -2660,18 +2660,9 @@ msgstr "Google no China"
 msgid "In Fake-ip Mode, Even If This Option is Turned Off, Domain Type Connections Still Pass Through The Core For The Availability"
 msgstr "En modo Fake-IP, incluso desactivado, algunas conexiones de dominio seguirán pasando por el núcleo."
 
-msgid "TUN Interface Start Failed, Please Check The Dependence or Try to Restart Again!"
-msgstr "Fallo al iniciar la interfaz TUN; revisa dependencias o intenta reiniciar."
-
-msgid "TUN Interface Start Failed, Try to Restart Again..."
-msgstr "Inicio de TUN fallido; intentando reiniciar..."
-
 msgid "Core Start Failed, Please Check The Log Infos!"
 msgstr "Fallo al iniciar el núcleo. Revisa el registro de núcleo."
 
-msgid "Core Initial Configuration Timeout, Please Check The Log Infos!"
-msgstr "Tiempo de espera agotado en la configuración inicial del núcleo, ¡consulta la información del registro!"
-
 msgid "Forced Sniff Pure IP Connections"
 msgstr "Forzar sniffing de conexiones IP puras"
 

luci-app-openclash/po/zh-cn/openclash.zh-cn.po

@@ -1795,7 +1795,7 @@ msgid "Step 4: Start Running The Clash Core..."
 msgstr "第四步: 启动主程序..."
 
 msgid "Step 5: Add Cron Rules, Start Daemons..."
-msgstr "第五步: 添加计划任务,启动进程守护程序..."
+msgstr "第五步: 添加计划任务..."
 
 msgid "Step 6: Core Status Checking and Firewall Rules Setting..."
 msgstr "第六步: 内核状态检查及防火墙规则设置..."
@@ -2658,18 +2658,9 @@ msgstr "Google 非送中"
 msgid "In Fake-ip Mode, Even If This Option is Turned Off, Domain Type Connections Still Pass Through The Core For The Availability"
 msgstr "在 Fake-IP 模式时，即使关闭此选项，域名类型的连接可能仍将通过核心以保证可用性"
 
-msgid "TUN Interface Start Failed, Please Check The Dependence or Try to Restart Again!"
-msgstr "TUN 接口启动失败，请检查依赖情况或稍后重试！"
-
-msgid "TUN Interface Start Failed, Try to Restart Again..."
-msgstr "TUN 接口启动失败，尝试重启内核..."
-
 msgid "Core Start Failed, Please Check The Log Infos!"
 msgstr "内核启动失败，请查看《内核日志》排查失败原因！"
 
-msgid "Core Initial Configuration Timeout, Please Check The Log Infos!"
-msgstr "内核加载配置超时，请查看《内核日志》排查原因！"
-
 msgid "Forced Sniff Pure IP Connections"
 msgstr "强制探测（嗅探）所有纯 IP 的连接"
 

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

@@ -61,7 +61,6 @@ add_cron()
    config_foreach add_overwrite_cron "config_overwrite"
 
    crontab $CRON_FILE
-   start_watchdog
 }
 
 del_cron()
@@ -677,16 +676,10 @@ check_mod()
 
 check_core_status()
 {
-   TUN_WAIT=0
-   TUN_RESTART=1
-   CORE_WAIT=0
-   CORE_HTTP_CODE=0
-
-   while ( [ -z "$(pidof clash)" ] && [ "$CORE_WAIT" -le 10 ] )
-   do
-      sleep 1
-      let CORE_WAIT++
-   done
+   if [ -z "$(pidof clash)" ]; then
+      LOG_ERROR "Core Start Failed, Please Check The Log Infos!"
+      start_fail
+   fi
 
    if [ -n "$en_mode_tun" ] || [ "$ipv6_mode" -eq 2 ] || [ "$ipv6_mode" -eq 3 ]; then
       check_mod "tun"
@@ -697,66 +690,24 @@ check_core_status()
          ip_="ip -6"
       fi
 
-      #wait 300s most for core start
-      while ( [ -n "$(pidof clash)" ] && [ -z "$($ip_ route list |grep utun)" ] && [ "$TUN_WAIT" -le 300 ] )
+      $ip_ link set utun up
+
+      while ( [ -n "$(ip -6 rule show |grep 2022)" ] )
       do
-         $ip_ link set utun up
-         let TUN_WAIT++
-         sleep 1
+         ip -6 rule del oif utun table 2022
+         ip -6 route del default dev utun table 2022
       done
 
-      if [ -n "$(pidof clash)" ] && [ -z "$($ip_ route list |grep utun)" ] && [ "$TUN_WAIT" -gt 300 ]; then
-         while ( [ -n "$(pidof clash)" ] && [ -z "$($ip_ route list |grep utun)" ] && [ "$TUN_RESTART" -le 3 ] )
-         do
-            LOG_WARN "TUN Interface Start Failed, Try to Restart Again..."
-            start_run_core
-            let TUN_RESTART++
-            sleep 300
-         done
-         if [ -n "$(pidof clash)" ] && [ -z "$($ip_ route list |grep utun)" ] && [ "$TUN_RESTART" -gt 3 ]; then
-            LOG_ERROR "TUN Interface Start Failed, Please Check The Dependence or Try to Restart Again!"
-            LOG_ERROR "Core Initial Configuration Timeout, Please Check The Log Infos!"
-            start_fail
-         fi
+      if [ "$ipv6_mode" -eq 2 ] || [ "$ipv6_mode" -eq 3 ]; then
+         ip -6 route add default dev utun table "$PROXY_ROUTE_TABLE"
+         ip -6 rule add fwmark "$PROXY_FWMARK" table "$PROXY_ROUTE_TABLE" pref 1888
       fi
 
-      if [ -n "$(pidof clash)" ]; then
-         while ( [ -n "$(pidof clash)" ] && [ -n "$(ip -6 rule show |grep 2022)" ] && [ "$CORE_WAIT" -le 10 ] )
-         do
-            ip -6 rule del oif utun table 2022
-            ip -6 route del default dev utun table 2022
-            let CORE_WAIT++
-         done
-         if [ "$ipv6_mode" -eq 2 ] || [ "$ipv6_mode" -eq 3 ]; then
-            ip -6 route add default dev utun table "$PROXY_ROUTE_TABLE"
-            ip -6 rule add fwmark "$PROXY_FWMARK" table "$PROXY_ROUTE_TABLE" pref 1888
-         fi
-         if [ -n "$en_mode_tun" ]; then
-            ip route add default dev utun table "$PROXY_ROUTE_TABLE"
-            ip rule add fwmark "$PROXY_FWMARK" table "$PROXY_ROUTE_TABLE" pref 1888
-         fi
-      fi
-   else
-      reg4='^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'
-      while ( [ -n "$(pidof clash)" ] && [ "$CORE_HTTP_CODE" != "200" ] && [ "$TUN_WAIT" -le 300 ] && [ -n "$(echo ${lan_ip} | grep -Eo ${reg4})" ] )
-      do
-         CORE_HTTP_CODE=$(curl -m 5 -o /dev/null -s -w '%{http_code}' -H 'Content-Type: application/json' -H "Authorization: Bearer ${da_password}" -XGET http://${lan_ip}:${cn_port}/group)
-         let TUN_WAIT++
-         sleep 1
-      done
-      if [ -z "$(echo ${lan_ip} | grep -Eo ${reg4})" ]; then
-         LOG_ERROR "LAN IP Address Get Error, Please Check The LAN Interface Setting or Choose the Correct Interface in the Setting!"
-         start_fail
-      fi
-      if [ -n "$(pidof clash)" ] && [ "$CORE_HTTP_CODE" != "200" ]; then
-         LOG_ERROR "Core Initial Configuration Timeout, Please Check The Log Infos!"
-         start_fail
+      if [ -n "$en_mode_tun" ]; then
+         ip route add default dev utun table "$PROXY_ROUTE_TABLE"
+         ip rule add fwmark "$PROXY_FWMARK" table "$PROXY_ROUTE_TABLE" pref 1888
       fi
    fi
-   if [ -z "$(pidof clash)" ]; then
-      LOG_ERROR "Core Start Failed, Please Check The Log Infos!"
-      start_fail
-   fi
 
    # redirect dns setting after core started, prevent core dns lookup failure
    if [ "$1" == "start" ]; then
@@ -785,6 +736,7 @@ start_run_core()
    chown root:root "$CLASH"
    procd_open_instance "openclash"
    procd_set_param env SAFE_PATHS=/usr/share/openclash:/etc/ssl
+   procd_append_param env CLASH_POST_UP="/etc/init.d/openclash reload start"
    procd_set_param command /bin/sh -c "$CLASH -d $CLASH_CONFIG -f \"$CONFIG_FILE\" >> $LOG_FILE 2>&1"
    procd_set_param user "root"
    procd_set_param group "nogroup"
@@ -3740,6 +3692,12 @@ get_config()
       lan_ip=$(ip address show $lan_interface_name 2>/dev/null | grep -w "inet" 2>/dev/null | grep -Eo 'inet [0-9\.]+' | awk '{print $2}' | head -1 | tr -d '\n')
    fi
 
+   reg4='^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'
+   if [ -z "$(echo ${lan_ip} | grep -Eo ${reg4})" ]; then
+      LOG_ERROR "LAN IP Address Get Error, Please Check The LAN Interface Setting or Choose the Correct Interface in the Setting!"
+      start_fail
+   fi
+
    wan_ip4s=$(/usr/share/openclash/openclash_get_network.lua "wanip" 2>/dev/null)
    wan_ip6s=$(ifconfig | grep 'inet6 addr' | awk '{print $3}' 2>/dev/null)
    log_level=$(uci_get_config "log_level")
@@ -3906,11 +3864,10 @@ start_service()
       LOG_OUT "Step 4: Start Running The Clash Core..."
       start_run_core
 
-      LOG_OUT "Step 5: Add Cron Rules, Start Daemons..."
+      LOG_OUT "Step 5: Add Cron Rules..."
       add_cron
 
       LOG_OUT "Step 6: Core Status Checking and Firewall Rules Setting..."
-      check_core_status "start" &
 
       if [ "$ipv6_enable" -eq 0 ] && [ "$(uci -q get dhcp.lan.dhcpv6)" != "disabled" ] && [ -n "$(uci -q get dhcp.lan.dhcpv6)" ]; then
          LOG_WARN "Please Note That Network May Abnormal With IPv6's DHCP Server"
@@ -4013,6 +3970,13 @@ reload_service()
 {
    get_config
    MAX_RELOAD=10
+
+   if [ "$1" = "start" ]; then
+      check_core_status "start"
+      start_watchdog
+      return
+   fi
+
    if pidof clash >/dev/null && [ "$enable" == "1" ] && [ "$1" == "firewall" ]; then
       #sleep for avoiding system unready
       sleep 5
@@ -4038,13 +4002,13 @@ reload_service()
       LOG_OUT "【${CUR_RELOAD_NUM}/$MAX_RELOAD】Reload OpenClash Firewall Rules..."
       revert_firewall
       do_run_mode
-      check_core_status &
+      check_core_status
    fi
    if pidof clash >/dev/null && [ "$enable" == "1" ] && [ "$1" == "manual" ]; then
       LOG_OUT "Manually Reload Firewall Rules..."
       revert_firewall
       do_run_mode
-      check_core_status &
+      check_core_status
    fi
    if pidof clash >/dev/null && [ "$enable" == "1" ] && [ "$1" == "revert" ]; then
       revert_firewall

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

@@ -173,12 +173,6 @@ do
    stream_auto_select_openai=$(uci_get_config "stream_auto_select_openai" || echo 0)
    upnp_lease_file=$(uci -q get upnpd.config.upnp_lease_file)
 
-#wait for core start complete
-while ( [ -n "$(unify_ps_pids "/etc/init.d/openclash")" ] )
-do
-   sleep 1
-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
    uci -q set openclash.config.enable=0