Починил обновление Xray на разных дисках. Сделал нормальную диагностику падения Xray на FakeDNS. Добавил раннее предупреждение в валидацию Xray-конфига. Прогнал точечную проверку изменений.

Author: loop-uh

xray_fluent/app_controller.py

@@ -868,7 +868,16 @@ def validate_singbox_json_text(self, text: str) -> tuple[bool, str]:
         return self.validate_json_text(text)
 
     def validate_xray_json_text(self, text: str) -> tuple[bool, str]:
-        return self.validate_json_text(text)
+        ok, message = self.validate_json_text(text)
+        if not ok:
+            return False, message
+        if "fakedns" in text.lower():
+            return (
+                True,
+                "JSON корректен. Внимание: в конфиге есть FakeDNS; некоторые версии Xray-core могут падать на старте. "
+                "Если запуск завершается с panic, отключите FakeDNS или обновите Xray core.",
+            )
+        return True, message
 
     def apply_singbox_config_text(self, text: str) -> tuple[bool, Path | None, str]:
         ok, message = self.validate_json_text(text)

xray_fluent/ui/main_window.py

@@ -650,7 +650,10 @@ def _save_core_config(self, core: str, text: str) -> None:
         self._show_status("success", f"Сохранено: {path.name}")
 
     def _validate_core_config(self, core: str, text: str) -> None:
-        ok, message = self.controller.validate_json_text(text)
+        if core == "singbox":
+            ok, message = self.controller.validate_singbox_json_text(text)
+        else:
+            ok, message = self.controller.validate_xray_json_text(text)
         self.configs_page.set_status(core, "success" if ok else "error", message)
         if ok:
             self._show_status("success", "JSON корректен")

xray_fluent/xray_core_updater.py

@@ -265,40 +265,42 @@ def _install_zip_archive(archive_path: Path, target_xray_path: Path) -> None:
 
         backup_dir = temp_dir / "_install_backup"
         backup_dir.mkdir(parents=True, exist_ok=True)
-        staged_targets: list[tuple[Path, Path, Path | None]] = []
-
-        temp_target = target_xray_path.with_suffix(".exe.new")
-        shutil.copy2(new_xray, temp_target)
-        backup_copy: Path | None = None
-        if target_xray_path.exists():
-            backup_copy = backup_dir / target_xray_path.name
-            shutil.copy2(target_xray_path, backup_copy)
-        staged_targets.append((target_xray_path, temp_target, backup_copy))
-
-        for optional_name in ("geoip.dat", "geosite.dat", "wintun.dll"):
-            src = _find_file(temp_dir, optional_name)
-            if src:
-                dest = target_dir / optional_name
-                staged = temp_dir / f"{optional_name}.new"
-                shutil.copy2(src, staged)
-                backup_copy = None
-                if dest.exists():
-                    backup_copy = backup_dir / optional_name
-                    shutil.copy2(dest, backup_copy)
-                staged_targets.append((dest, staged, backup_copy))
-
-        replaced_targets: list[tuple[Path, Path | None]] = []
-        try:
-            for dest, staged, backup_copy in staged_targets:
-                staged.replace(dest)
-                replaced_targets.append((dest, backup_copy))
-        except Exception:
-            for dest, backup_copy in reversed(replaced_targets):
-                if backup_copy is not None:
-                    shutil.copy2(backup_copy, dest)
-                elif dest.exists():
-                    dest.unlink()
-            raise
+        with tempfile.TemporaryDirectory(prefix=".xray_install_", dir=target_dir) as stage_dir_str:
+            stage_dir = Path(stage_dir_str)
+            staged_targets: list[tuple[Path, Path, Path | None]] = []
+
+            staged_xray = stage_dir / target_xray_path.name
+            shutil.copy2(new_xray, staged_xray)
+            backup_copy: Path | None = None
+            if target_xray_path.exists():
+                backup_copy = backup_dir / target_xray_path.name
+                shutil.copy2(target_xray_path, backup_copy)
+            staged_targets.append((target_xray_path, staged_xray, backup_copy))
+
+            for optional_name in ("geoip.dat", "geosite.dat", "wintun.dll"):
+                src = _find_file(temp_dir, optional_name)
+                if src:
+                    dest = target_dir / optional_name
+                    staged = stage_dir / optional_name
+                    shutil.copy2(src, staged)
+                    backup_copy = None
+                    if dest.exists():
+                        backup_copy = backup_dir / optional_name
+                        shutil.copy2(dest, backup_copy)
+                    staged_targets.append((dest, staged, backup_copy))
+
+            replaced_targets: list[tuple[Path, Path | None]] = []
+            try:
+                for dest, staged, backup_copy in staged_targets:
+                    staged.replace(dest)
+                    replaced_targets.append((dest, backup_copy))
+            except Exception:
+                for dest, backup_copy in reversed(replaced_targets):
+                    if backup_copy is not None:
+                        shutil.copy2(backup_copy, dest)
+                    elif dest.exists():
+                        dest.unlink()
+                raise
 
         original_xray = staged_targets[0][2]
         if original_xray is not None:

xray_fluent/xray_manager.py

@@ -363,7 +363,10 @@ def _unexpected_exit_message(
         startup: bool,
     ) -> str:
         stage = "во время запуска" if startup else "неожиданно"
-        detail = self._last_output_lines[-1].strip() if self._last_output_lines else ""
+        diagnostic = self._diagnose_output_failure(stage)
+        if diagnostic:
+            return diagnostic
+        detail = self._best_output_detail()
         if detail:
             return f"Xray завершился {stage}: {detail}"
         if exit_code is None:
@@ -377,6 +380,38 @@ def _report_startup_failure(self, message: str) -> None:
         self._startup_failure_reported = True
         self.error.emit(message)
 
+    def _best_output_detail(self) -> str:
+        if not self._last_output_lines:
+            return ""
+        preferred_markers = ("panic:", "[xray-error]", "error", "failed", "invalid", "not found")
+        for line in reversed(self._last_output_lines):
+            clean = line.strip()
+            lower = clean.lower()
+            if any(marker in lower for marker in preferred_markers):
+                return clean
+        for line in reversed(self._last_output_lines):
+            clean = line.strip()
+            lower = clean.lower()
+            if not clean:
+                continue
+            if clean.startswith("github.com/") or lower.startswith("goroutine ") or lower.startswith("[signal"):
+                continue
+            return clean
+        return self._last_output_lines[-1].strip()
+
+    def _diagnose_output_failure(self, stage: str) -> str | None:
+        if not self._last_output_lines:
+            return None
+        joined = "\n".join(self._last_output_lines).lower()
+        if "fakednspostprocessingstage" not in joined and "fakedns" not in joined:
+            return None
+        if "panic:" not in joined and "nil pointer dereference" not in joined:
+            return None
+        return (
+            f"Xray завершился {stage}: текущий Xray core упал на секции FakeDNS в конфиге. "
+            "Отключите FakeDNS в Xray JSON, сбросьте конфиг на шаблон по умолчанию или обновите Xray core."
+        )
+
 
 def get_xray_version(xray_path: str) -> str | None:
     exe = resolve_configured_path(