nterminal 1.2.22 → 1.2.23

package/scripts/nterminalctl

@@ -480,6 +480,30 @@ wait_for_health() {
   return 1
 }
 
+restart_supervised_child() {
+  local monitor_pid="$1"
+  local old_pid="${2:-}"
+
+  if [[ -n "$old_pid" ]]; then
+    stop_supervised_child "$old_pid"
+  fi
+
+  local pid=""
+  local deadline=$((SECONDS + HEALTH_TIMEOUT_SECONDS))
+  while (( SECONDS <= deadline )); do
+    if ! is_running "$monitor_pid"; then
+      return 1
+    fi
+    pid="$(current_pid || true)"
+    if [[ -n "$pid" && "$pid" != "$old_pid" ]] && wait_for_health "$pid"; then
+      info "NTerminal restarted pid=$pid supervisor=$monitor_pid url=$(public_url) log=$LOG_PATH"
+      return 0
+    fi
+    sleep 0.25
+  done
+  return 1
+}
+
 port_owner_pid() {
   if command -v lsof >/dev/null 2>&1; then
     lsof -nP -iTCP:"$PORT" -sTCP:LISTEN -t 2>/dev/null | head -n 1
@@ -645,6 +669,20 @@ cmd_restart() {
     start_launchd
   else
     prepare_start
+    remove_stale_pid
+    remove_stale_monitor_pid
+    local monitor_pid
+    monitor_pid="$(current_monitor_pid || true)"
+    if [[ -n "$monitor_pid" ]]; then
+      local pid
+      pid="$(current_pid || true)"
+      if restart_supervised_child "$monitor_pid" "$pid"; then
+        return 0
+      fi
+      echo "NTerminal failed to restart under supervisor. Last log lines:" >&2
+      tail -n 40 "$LOG_PATH" >&2 || true
+      return 1
+    fi
     cmd_stop >/dev/null
     cmd_start
   fi