fix(core): 修复网络模块子线程未及时销毁导致的程序崩溃

app/core/config.py

@@ -572,7 +572,7 @@ class MaaPlanConfig(LQConfig):
 
 class AppConfig(GlobalConfig):
 
-    VERSION = "4.3.9.2"
+    VERSION = "4.3.9.0"
 
     gameid_refreshed = Signal()
     PASSWORD_refreshed = Signal()

app/core/network.py

@@ -27,6 +27,7 @@ v4.3
 
 from loguru import logger
 from PySide6.QtCore import QObject, QThread, QEventLoop
+import re
 import time
 import requests
 from pathlib import Path
@@ -42,6 +43,10 @@ class NetworkThread(QThread):
     def __init__(self, mode: str, url: str, path: Path = None) -> None:
         super().__init__()
 
+        self.setObjectName(
+            f"NetworkThread-{mode}-{re.sub(r'(&cdk=)[^&]+(&)', r'\1******\2', url)}"
+        )
+
         self.mode = mode
         self.url = url
         self.path = path
@@ -125,13 +130,22 @@ class _Network(QObject):
     def get_result(self, network_thread: NetworkThread) -> dict:
         """获取网络请求结果"""
 
-        self.task_queue.remove(network_thread)
-
-        return {
+        result = {
             "status_code": network_thread.status_code,
             "response_json": network_thread.response_json,
-            "error_message": network_thread.error_message,
+            "error_message": (
+                re.sub(r"(&cdk=)[^&]+(&)", r"\1******\2", network_thread.error_message)
+                if network_thread.error_message
+                else None
+            ),
         }
 
+        network_thread.quit()
+        network_thread.wait()
+        self.task_queue.remove(network_thread)
+        network_thread.deleteLater()
+
+        return result
+
 
 Network = _Network()

app/core/sound_player.py

@@ -41,27 +41,26 @@ class _SoundPlayer(QObject):
 
         self.sounds_path = Config.app_path / "resources/sounds"
 
-    def play(self, sound_name: str, parent: QObject = None):
+    def play(self, sound_name: str):
 
         if not Config.get(Config.voice_Enabled):
             return
 
         if (self.sounds_path / f"both/{sound_name}.wav").exists():
 
-            self.play_voice(self.sounds_path / f"both/{sound_name}.wav", parent)
+            self.play_voice(self.sounds_path / f"both/{sound_name}.wav")
 
         elif (
             self.sounds_path / Config.get(Config.voice_Type) / f"{sound_name}.wav"
         ).exists():
 
             self.play_voice(
-                self.sounds_path / Config.get(Config.voice_Type) / f"{sound_name}.wav",
-                parent,
+                self.sounds_path / Config.get(Config.voice_Type) / f"{sound_name}.wav"
             )
 
-    def play_voice(self, sound_path: Path, parent: QObject):
+    def play_voice(self, sound_path: Path):
 
-        effect = QSoundEffect(self if parent is None else parent)
+        effect = QSoundEffect(self)
         effect.setVolume(1)
         effect.setSource(QUrl.fromLocalFile(sound_path))
         effect.play()

app/core/task_manager.py

@@ -45,6 +45,7 @@ class Task(QThread):
 
     check_maa_version = Signal(str)
     push_info_bar = Signal(str, str, str, int)
+    play_sound = Signal(str)
     question = Signal(str, str)
     question_response = Signal(bool)
     update_user_info = Signal(str, dict)
@@ -60,6 +61,8 @@ class Task(QThread):
     ):
         super(Task, self).__init__()
 
+        self.setObjectName(f"Task-{mode}-{name}")
+
         self.mode = mode
         self.name = name
         self.info = info
@@ -83,6 +86,7 @@ class Task(QThread):
             )
             self.task.check_maa_version.connect(self.check_maa_version.emit)
             self.task.push_info_bar.connect(self.push_info_bar.emit)
+            self.task.play_sound.connect(self.play_sound.emit)
             self.task.accomplish.connect(lambda: self.accomplish.emit([]))
 
             self.task.run()
@@ -142,6 +146,7 @@ class Task(QThread):
                     self.question_response.disconnect()
                     self.question_response.connect(self.task.question_response.emit)
                     self.task.push_info_bar.connect(self.push_info_bar.emit)
+                    self.task.play_sound.connect(self.play_sound.emit)
                     self.task.create_user_list.connect(self.create_user_list.emit)
                     self.task.update_user_list.connect(self.update_user_list.emit)
                     self.task.update_log_text.connect(self.update_log_text.emit)
@@ -201,6 +206,7 @@ class _TaskManager(QObject):
             lambda title, content: self.push_dialog(name, title, content)
         )
         self.task_dict[name].push_info_bar.connect(MainInfoBar.push_info_bar)
+        self.task_dict[name].play_sound.connect(SoundPlayer.play)
         self.task_dict[name].update_user_info.connect(Config.change_user_info)
         self.task_dict[name].accomplish.connect(
             lambda logs: self.remove_task(mode, name, logs)