From b27b1a65738eed104dda25ab1151be73d848bf94 Mon Sep 17 00:00:00 2001
From: Minoricew <154642983+Minoricew@users.noreply.github.com>
Date: Tue, 25 Nov 2025 00:11:42 +0800
Subject: [PATCH] =?UTF-8?q?[=F0=9F=9B=A0=EF=B8=8F=20Fix]=20Logical=20issue?=
 =?UTF-8?q?s=20causing=20telemetryId=20cp=20failed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/aura/ui/composables/settingsRenderer.js   |  6 ++--
 src/aura/ui/js/aikariConnectionManager.js     | 28 +++++++++++++++----
 .../behaviourCtrl/settings/basic.js           |  2 ++
 .../pages/windows/auraWsKeepAlive/index.html  |  3 ++
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/aura/ui/composables/settingsRenderer.js b/src/aura/ui/composables/settingsRenderer.js
index a5863b8..5721cb4 100755
--- a/src/aura/ui/composables/settingsRenderer.js
+++ b/src/aura/ui/composables/settingsRenderer.js
@@ -392,7 +392,9 @@ const renderNormalSettingsItem = (entry, formEl) => {
           setDisableStatus(entryOperationArea, false);
         }
       } else {
-        setDisableStatus(entryOperationArea, true, "连接至 Aikari 以继续");
+        if (!entry.alwaysEnable) {
+          setDisableStatus(entryOperationArea, true, "连接至 Aikari 以继续");
+        }
       }
     };
     entryContainerEl.addEventListener("onAikariStatsUpdate", evtListener);
@@ -411,7 +413,7 @@ const renderNormalSettingsItem = (entry, formEl) => {
         ? cls.remove("aura-settings-entry-hidden")
         : cls.add("aura-settings-entry-hidden");
 
-      if (entry.auraDisable) {
+      if (entry.auraDisable && !entry.alwaysEnable) {
         updateDisableStatus(entry);
       }
     };
diff --git a/src/aura/ui/js/aikariConnectionManager.js b/src/aura/ui/js/aikariConnectionManager.js
index c982238..7f7fe7e 100644
--- a/src/aura/ui/js/aikariConnectionManager.js
+++ b/src/aura/ui/js/aikariConnectionManager.js
@@ -79,17 +79,33 @@
     }
   };
 
-  const startConnAikariProc = async (updatedAikariStats) => {
+  const getAuthToken = async () => {
     const authTokenRet = await registryManager.readRegKey(
       AIKARI_RPC_CONFIG_REG_PATH,
       "authToken",
       true
     );
-    if (authTokenRet.success) {
-      updatedAikariStats.authToken = authTokenRet.data;
-      // @ts-expect-error
-      global.__HUGO_AURA__.aikariStats.authToken = authTokenRet.data;
-    } else {
+    return authTokenRet;
+  };
+
+  const startConnAikariProc = async (updatedAikariStats) => {
+    let authTokenTries = 0;
+    let GET_AUTH_TOKEN_MAX_TRIES = 3;
+    let getAuthTokenSuccess = false;
+    while (authTokenTries < GET_AUTH_TOKEN_MAX_TRIES) {
+      const authTokenRet = await getAuthToken();
+      if (authTokenRet.success) {
+        updatedAikariStats.authToken = authTokenRet.data;
+        // @ts-expect-error
+        global.__HUGO_AURA__.aikariStats.authToken = authTokenRet.data;
+        getAuthTokenSuccess = true;
+        break;
+      } else {
+        await window.__HUGO_AURA_GLOBAL__.utils.sleep(1000);
+        authTokenTries += 1;
+      }
+    }
+    if (!getAuthTokenSuccess) {
       sendRetryStatusToMain(false, "E_AUTH_TOKEN_GET_FAILED");
       return;
     }
diff --git a/src/aura/ui/pages/configSubPages/behaviourCtrl/settings/basic.js b/src/aura/ui/pages/configSubPages/behaviourCtrl/settings/basic.js
index 4c8326a..98d2cff 100755
--- a/src/aura/ui/pages/configSubPages/behaviourCtrl/settings/basic.js
+++ b/src/aura/ui/pages/configSubPages/behaviourCtrl/settings/basic.js
@@ -187,10 +187,12 @@ const basicSettings = [
                 global.__HUGO_AURA_UI_REACTIVES__.subConfig.behaviourCtrl.telemetryId =
                   fileContent;
                 resolve("标识符: " + fileContent);
+                return;
               }
               global.__HUGO_AURA_UI_REACTIVES__.subConfig.behaviourCtrl.telemetryId =
                 null;
               resolve("未能获取标识符, Aikari 未安装或未初始化");
+              return;
             }, 1000);
           });
           return await getIdPromise;
diff --git a/src/aura/ui/pages/windows/auraWsKeepAlive/index.html b/src/aura/ui/pages/windows/auraWsKeepAlive/index.html
index aa262ed..dd90313 100644
--- a/src/aura/ui/pages/windows/auraWsKeepAlive/index.html
+++ b/src/aura/ui/pages/windows/auraWsKeepAlive/index.html
@@ -5,11 +5,14 @@
     <style>
       :root {
         opacity: 0;
+        display: none;
+        pointer-events: none;
       }
     </style>
     <script>
       let global = window;
     </script>
+    <script src="../../../js/global.js"></script>
     <script src="../../../js/aikariConnectionManager.js"></script>
   </head>
   <body></body>