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

Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev2

Browse Source
This commit is contained in:
MichaelDvP
2023-07-02 22:10:45 +02:00
parent 3bd21d4486 da3e118444
commit 98b2a3a6e1
3 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
interface/src/api/endpoints.ts
View File

@@ -11,14 +11,14 @@ export const EVENT_SOURCE_ROOT = 'http://' + host + '/es/';
export const alovaInstance = createAlova({ export const alovaInstance = createAlova({
statesHook: ReactHook, statesHook: ReactHook,
// timeout: 3000, // timeout not used because of uploading firmware timeout: 2000, // timeout not used because of uploading firmware
// localCache: null, localCache: null,
localCache: { // localCache: {
GET: { // GET: {
mode: 'placeholder', // see https://alova.js.org/learning/response-cache/#cache-replaceholder-mode // mode: 'placeholder', // see https://alova.js.org/learning/response-cache/#cache-replaceholder-mode
expire: 2000 // expire: 2000
} // }
}, // },
requestAdapter: xhrRequestAdapter(), requestAdapter: xhrRequestAdapter(),
beforeRequest(method) { beforeRequest(method) {
if (localStorage.getItem(ACCESS_TOKEN)) { if (localStorage.getItem(ACCESS_TOKEN)) {

3
interface/src/api/system.ts
View File

@@ -1,7 +1,7 @@
import { alovaInstance, alovaInstanceGH } from './endpoints'; import { alovaInstance, alovaInstanceGH } from './endpoints';
import type { OTASettings, SystemStatus, LogSettings, Version } from 'types'; import type { OTASettings, SystemStatus, LogSettings, Version } from 'types';
// SystemStatus - also used to ping in Restart monitor // SystemStatus - also used to ping in Restart monitor for pinging
export const readSystemStatus = () => alovaInstance.Get<SystemStatus>('/rest/systemStatus'); export const readSystemStatus = () => alovaInstance.Get<SystemStatus>('/rest/systemStatus');
// commands // commands
@@ -45,6 +45,7 @@ export const uploadFile = (file: File) => {
const formData = new FormData(); const formData = new FormData();
formData.append('file', file); formData.append('file', file);
return alovaInstance.Post('/rest/uploadFile', formData, { return alovaInstance.Post('/rest/uploadFile', formData, {
timeout: 60000, // override timeout for uploading firmware - 1 minute
enableUpload: true enableUpload: true
}); });
}; };

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

@@ -1,5 +1,5 @@
import { useRetriableRequest } from '@alova/scene-react'; import { useRequest } from 'alova';
import { useState } from 'react'; import { useRef, useState, useEffect } 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,26 +7,34 @@ 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 = 3000;
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 } = useRequest(SystemApi.readSystemStatus, { force: true });
const timeoutAt = useRef(new Date().getTime() + RESTART_TIMEOUT);
// eslint-disable-next-line @typescript-eslint/unbound-method const poll = useRef(async () => {
const { onFail, onSuccess } = useRetriableRequest(SystemApi.readSystemStatus(), { try {
retry: 10, await send();
backoff: { document.location.href = '/';
delay: 1500 } catch (error) {
if (new Date().getTime() < timeoutAt.current) {
setTimeoutId(setTimeout(poll.current, POLL_INTERVAL));
} else {
setFailed(true);
}
} }
}); });
onFail(() => { useEffect(() => {
setFailed(true); void poll.current();
}); }, []);
onSuccess(() => { useEffect(() => () => timeoutId && clearTimeout(timeoutId), [timeoutId]);
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} />;
}; };