Simplify retry mechanism to get system version (#10198)
This commit is contained in:
parent
52b400c793
commit
6a2cc1e91e
1 changed files with 5 additions and 11 deletions
|
@ -540,36 +540,30 @@ const initKernel = (workspace, port, lang) => {
|
|||
});
|
||||
}
|
||||
|
||||
let gotVersion = false;
|
||||
let apiData;
|
||||
let count = 0;
|
||||
writeLog("checking kernel version");
|
||||
while (!gotVersion && count < 15) {
|
||||
while (true) {
|
||||
try {
|
||||
const apiResult = await net.fetch(getServer() + "/api/system/version");
|
||||
apiData = await apiResult.json();
|
||||
gotVersion = true;
|
||||
bootWindow.setResizable(false);
|
||||
bootWindow.loadURL(getServer() + "/appearance/boot/index.html");
|
||||
bootWindow.show();
|
||||
break;
|
||||
} catch (e) {
|
||||
writeLog("get kernel version failed: " + e.message);
|
||||
await sleep(200);
|
||||
} finally {
|
||||
count++;
|
||||
if (14 < count) {
|
||||
if (14 < ++count) {
|
||||
writeLog("get kernel ver failed");
|
||||
showErrorWindow("⚠️ 获取内核服务端口失败 Failed to get kernel serve port", "<div>获取内核服务端口失败,请确保程序拥有网络权限并不受防火墙和杀毒软件阻止。</div><div>Failed to get kernel serve port, please make sure the program has network permissions and is not blocked by firewalls and antivirus software.</div>");
|
||||
bootWindow.destroy();
|
||||
resolve(false);
|
||||
return;
|
||||
}
|
||||
await sleep(200);
|
||||
}
|
||||
}
|
||||
|
||||
if (!gotVersion) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (0 === apiData.code) {
|
||||
writeLog("got kernel version [" + apiData.data + "]");
|
||||
if (!isDevEnv && apiData.data !== appVer) {
|
||||
|
|
Loading…
Add table
Reference in a new issue