[🛠️ Fix] Logical issues causing telemetryId cp failed

This commit is contained in:
Minoricew
2025-11-25 00:11:42 +08:00
parent 1b90932869
commit b27b1a6573
4 changed files with 31 additions and 8 deletions

View File

@@ -392,7 +392,9 @@ const renderNormalSettingsItem = (entry, formEl) => {
setDisableStatus(entryOperationArea, false); setDisableStatus(entryOperationArea, false);
} }
} else { } else {
setDisableStatus(entryOperationArea, true, "连接至 Aikari 以继续"); if (!entry.alwaysEnable) {
setDisableStatus(entryOperationArea, true, "连接至 Aikari 以继续");
}
} }
}; };
entryContainerEl.addEventListener("onAikariStatsUpdate", evtListener); entryContainerEl.addEventListener("onAikariStatsUpdate", evtListener);
@@ -411,7 +413,7 @@ const renderNormalSettingsItem = (entry, formEl) => {
? cls.remove("aura-settings-entry-hidden") ? cls.remove("aura-settings-entry-hidden")
: cls.add("aura-settings-entry-hidden"); : cls.add("aura-settings-entry-hidden");
if (entry.auraDisable) { if (entry.auraDisable && !entry.alwaysEnable) {
updateDisableStatus(entry); updateDisableStatus(entry);
} }
}; };

View File

@@ -79,17 +79,33 @@
} }
}; };
const startConnAikariProc = async (updatedAikariStats) => { const getAuthToken = async () => {
const authTokenRet = await registryManager.readRegKey( const authTokenRet = await registryManager.readRegKey(
AIKARI_RPC_CONFIG_REG_PATH, AIKARI_RPC_CONFIG_REG_PATH,
"authToken", "authToken",
true true
); );
if (authTokenRet.success) { return authTokenRet;
updatedAikariStats.authToken = authTokenRet.data; };
// @ts-expect-error
global.__HUGO_AURA__.aikariStats.authToken = authTokenRet.data; const startConnAikariProc = async (updatedAikariStats) => {
} else { 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"); sendRetryStatusToMain(false, "E_AUTH_TOKEN_GET_FAILED");
return; return;
} }

View File

@@ -187,10 +187,12 @@ const basicSettings = [
global.__HUGO_AURA_UI_REACTIVES__.subConfig.behaviourCtrl.telemetryId = global.__HUGO_AURA_UI_REACTIVES__.subConfig.behaviourCtrl.telemetryId =
fileContent; fileContent;
resolve("标识符: " + fileContent); resolve("标识符: " + fileContent);
return;
} }
global.__HUGO_AURA_UI_REACTIVES__.subConfig.behaviourCtrl.telemetryId = global.__HUGO_AURA_UI_REACTIVES__.subConfig.behaviourCtrl.telemetryId =
null; null;
resolve("未能获取标识符, Aikari 未安装或未初始化"); resolve("未能获取标识符, Aikari 未安装或未初始化");
return;
}, 1000); }, 1000);
}); });
return await getIdPromise; return await getIdPromise;

View File

@@ -5,11 +5,14 @@
<style> <style>
:root { :root {
opacity: 0; opacity: 0;
display: none;
pointer-events: none;
} }
</style> </style>
<script> <script>
let global = window; let global = window;
</script> </script>
<script src="../../../js/global.js"></script>
<script src="../../../js/aikariConnectionManager.js"></script> <script src="../../../js/aikariConnectionManager.js"></script>
</head> </head>
<body></body> <body></body>