fix: invalidate queued cron revisions and enforce task process timeouts

shell/otask.sh

@@ -164,7 +164,7 @@ run_normal() {
   if [[ $isJsOrPythonFile == 'false' ]]; then
     clear_non_sh_env
   fi
-  $timeoutCmd $which_program $file_param "${script_params[@]}"
+  run_task_command $which_program $file_param "${script_params[@]}"
 }
 
 handle_env_split() {
@@ -203,7 +203,7 @@ run_concurrent() {
       export "${env_param}=${array[$i - 1]}"
       clear_non_sh_env
     fi
-    eval envParam="${env_param}" numParam="${i}" $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
+    eval envParam="${env_param}" numParam="${i}" run_task_command $which_program $file_param "${script_params[@]}" &>$single_log_path &
   done
 
   wait
@@ -243,7 +243,7 @@ run_designated() {
 
   enter_script_workdir
 
-  envParam="${env_param}" numParam="${num_param}" $timeoutCmd $which_program $file_param "${script_params[@]}"
+  envParam="${env_param}" numParam="${num_param}" run_task_command $which_program $file_param "${script_params[@]}"
 }
 
 ## 运行其他命令
@@ -299,7 +299,7 @@ run_else() {
   fi
 
   clear_non_sh_env
-  $timeoutCmd $which_program $file_param "$@"
+  run_task_command $which_program $file_param "$@"
 }
 
 check_file() {
@@ -336,10 +336,6 @@ check_nounset() {
 
 main() {
   if [[ $1 == *.js ]] || [[ $1 == *.mjs ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
-    if [[ $1 == *.sh ]]; then
-      timeoutCmd=""
-    fi
-
     case $# in
     1)
       run_normal "$1"

shell/task-timeout.sh

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+# Fork from the current Bash state: an external `bash -c` would lose private
+# before-hook variables, arrays and functions used by sourced Shell scripts.
+run_task_command() {
+  local timeout_seconds
+  if [[ -z ${command_timeout_time:-} ]]; then
+    "$@"
+    return $?
+  fi
+  timeout_seconds=$(awk -v value="$command_timeout_time" 'BEGIN {
+    if (value !~ /^([0-9]+([.][0-9]*)?|[.][0-9]+)([eE][+-]?[0-9]+)?[smhd]?$/) exit 1
+    unit = substr(value, length(value), 1)
+    factor = unit == "d" ? 86400 : unit == "h" ? 3600 : unit == "m" ? 60 : 1
+    printf "%.9f", (value + 0) * factor
+  }') || { printf 'Invalid task timeout: %s\n' "$command_timeout_time" >&2; return 125; }
+  if [[ $timeout_seconds == '0.000000000' ]]; then
+    "$@"
+    return $?
+  fi
+  (
+    timeout_dir=$(mktemp -d "${TMPDIR:-/tmp}/ql-task-timeout.XXXXXXXX") || exit 125
+    # Both children get private process groups. The timer and the wrapper must
+    # survive terminating the task, and descendants must not outlive a timeout.
+    set -m
+    ( set +m; "$@" ) <&0 &
+    timeout_worker=$!
+    (
+      set +m
+      : > "$timeout_dir/ready"
+      sleep "$timeout_seconds" || exit 125
+      : > "$timeout_dir/expired"
+      kill -TERM -- "-$timeout_worker" 2>/dev/null || :
+      sleep 0.5
+      kill -KILL -- "-$timeout_worker" 2>/dev/null || :
+    ) &
+    timeout_watcher=$!
+    set +m
+    trap 'kill -KILL -- "-$timeout_watcher" 2>/dev/null || :
+      if kill -TERM -- "-$timeout_worker" 2>/dev/null; then sleep 0.1; fi
+      kill -KILL -- "-$timeout_worker" 2>/dev/null || :
+      wait "$timeout_worker" 2>/dev/null || :
+      wait "$timeout_watcher" 2>/dev/null || :
+      rm -rf -- "$timeout_dir"' EXIT
+    trap 'exit 130' INT
+    trap 'exit 143' TERM
+    trap 'exit 129' HUP
+    trap 'exit 131' QUIT
+    # Do not clean up a timer whose process group has not initialized yet.
+    while [[ ! -f "$timeout_dir/ready" ]]; do
+      kill -0 "$timeout_watcher" 2>/dev/null || exit 125
+      sleep 0.001
+    done
+    wait "$timeout_worker"
+    timeout_code=$?
+    if [[ -f "$timeout_dir/expired" ]]; then
+      # Let the timer finish escalation even if the task leader exited first.
+      wait "$timeout_watcher" 2>/dev/null || :
+      exit 124
+    fi
+    exit "$timeout_code"
+  )
+}

shell/task.sh

@@ -3,6 +3,7 @@
 dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
+. $dir_shell/task-timeout.sh
 
 trap 'single_hanle SIGINT'  INT
 trap 'single_hanle SIGTERM' TERM
@@ -112,11 +113,6 @@ format_params() {
     mtime_format="%Y-%m-%d %H:%M:%S.%3N"
   fi
   timeoutCmd=""
-  if [[ $command_timeout_time ]]; then
-    if type timeout &>/dev/null; then
-      timeoutCmd="timeout --foreground -s 2 -k 10s $command_timeout_time "
-    fi
-  fi
   # params=$(echo "$@" | sed -E 's/([^ ])&([^ ])/\1\\\&\2/g')
 
   # 分割 task 内置参数和脚本参数