andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 00:39:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

optimize restart using alova lib

Browse Source
This commit is contained in:
proddy
2023-06-21 23:15:38 +02:00
parent 0e52deae7b
commit 2b24f2585f
3 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
interface/package.json
View File

@@ -20,6 +20,7 @@
}, },
"dependencies": { "dependencies": {
"@alova/adapter-xhr": "^1.0.0", "@alova/adapter-xhr": "^1.0.0",
"@alova/scene-react": "^1.1.0",
"@emotion/react": "^11.11.1", "@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0", "@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.11.16", "@mui/icons-material": "^5.11.16",

39
interface/src/framework/system/RestartMonitor.tsx
View File

@@ -1,5 +1,5 @@
import { useRequest } from 'alova'; import { useRetriableRequest } from '@alova/scene-react';
import { useRef, useState, useEffect } from 'react'; import { useState } from 'react';
import type { FC } from 'react'; import type { FC } from 'react';
import * as SystemApi from 'api/system'; import * as SystemApi from 'api/system';
@@ -7,39 +7,26 @@ import { FormLoader } from 'components';
import { useI18nContext } from 'i18n/i18n-react'; import { useI18nContext } from 'i18n/i18n-react';
const RESTART_TIMEOUT = 2 * 60 * 1000;
const POLL_INTERVAL = 5000;
const RestartMonitor: FC = () => { const RestartMonitor: FC = () => {
const [failed, setFailed] = useState<boolean>(false); const [failed, setFailed] = useState<boolean>(false);
const [timeoutId, setTimeoutId] = useState<NodeJS.Timeout>();
const { LL } = useI18nContext(); const { LL } = useI18nContext();
const { send: readSystemStatus } = useRequest(SystemApi.readSystemStatus(), { // eslint-disable-next-line @typescript-eslint/unbound-method
force: true, const { onFail, onSuccess } = useRetriableRequest(SystemApi.readSystemStatus(), {
immediate: false retry: 10,
}); backoff: {
delay: 1500
const timeoutAt = useRef(new Date().getTime() + RESTART_TIMEOUT);
const poll = useRef(async () => {
try {
await readSystemStatus();
document.location.href = '/fileUpdated';
} catch (error) {
if (new Date().getTime() < timeoutAt.current) {
setTimeoutId(setTimeout(poll.current, POLL_INTERVAL));
} else {
setFailed(true);
}
} }
}); });
useEffect(() => { onFail(() => {
void poll.current(); setFailed(true);
}, []); });
useEffect(() => () => timeoutId && clearTimeout(timeoutId), [timeoutId]); onSuccess(() => {
document.location.href = '/fileUpdated';
});
return <FormLoader message={LL.APPLICATION_RESTARTING() + '...'} errorMessage={failed ? 'Timed out' : undefined} />; return <FormLoader message={LL.APPLICATION_RESTARTING() + '...'} errorMessage={failed ? 'Timed out' : undefined} />;
}; };

8
interface/yarn.lock
View File

@@ -12,6 +12,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@alova/scene-react@npm:^1.1.0":
version: 1.1.0
resolution: "@alova/scene-react@npm:1.1.0"
checksum: e1b956a5ea1f0b93f7e60896bb43aa124106e7b527dbdcd77cf200975b2b403240a91c050a43d43c083941f91f106d50ceb91dc0ef0a97feabd91a3945568b43
languageName: node
linkType: hard
"@ampproject/remapping@npm:^2.2.0": "@ampproject/remapping@npm:^2.2.0":
version: 2.2.0 version: 2.2.0
resolution: "@ampproject/remapping@npm:2.2.0" resolution: "@ampproject/remapping@npm:2.2.0"
@@ -1530,6 +1537,7 @@ __metadata:
resolution: "EMS-ESP@workspace:." resolution: "EMS-ESP@workspace:."
dependencies: dependencies:
"@alova/adapter-xhr": ^1.0.0 "@alova/adapter-xhr": ^1.0.0
"@alova/scene-react": ^1.1.0
"@emotion/react": ^11.11.1 "@emotion/react": ^11.11.1
"@emotion/styled": ^11.11.0 "@emotion/styled": ^11.11.0
"@mui/icons-material": ^5.11.16 "@mui/icons-material": ^5.11.16