Merge branch 'dev' into dev2

2025-12-09 17:29:50 +03:00 · 2023-12-12 14:41:31 +01:00
parent 72f4d00cb3 d78d4aed9d
commit 29a3e79804
32 changed files with 3623 additions and 858 deletions
--- a/interface/package.json
+++ b/interface/package.json
@@ -12,7 +12,7 @@
    "preview": "vite preview",
    "build-hosted": "typesafe-i18n --no-watch && vite build --mode hosted",
    "preview-standalone": "typesafe-i18n --no-watch && vite build && concurrently -c \"auto\" \"npm:mock-api\" \"vite preview\"",
-    "mock-api": "node --watch ../mock-api ../mock-api/server.js",
+    "mock-api": "bun --watch ../mock-api/server.ts",
    "standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"npm:mock-api\" \"vite\"",
    "typesafe-i18n": "typesafe-i18n --no-watch",
    "webUI": "node progmem-generator.js",
@@ -21,7 +21,7 @@
  },
  "dependencies": {
    "@alova/adapter-xhr": "^1.0.1",
-    "@babel/core": "^7.23.5",
+    "@babel/core": "^7.23.6",
    "@emotion/react": "^11.11.1",
    "@emotion/styled": "^11.11.0",
    "@mui/icons-material": "^5.14.19",
@@ -67,8 +67,8 @@
    "eslint-plugin-react": "^7.33.2",
    "eslint-plugin-react-hooks": "^4.6.0",
    "preact": "^10.19.3",
-    "prettier": "^3.1.0",
-    "rollup-plugin-visualizer": "^5.10.0",
+    "prettier": "^3.1.1",
+    "rollup-plugin-visualizer": "^5.11.0",
    "terser": "^5.26.0",
    "vite": "^5.0.7",
    "vite-plugin-imagemin": "^0.6.1",
--- a/interface/src/components/routing/useRouterTab.ts
+++ b/interface/src/components/routing/useRouterTab.ts
@@ -1,12 +1,12 @@
-import { useMatch, useResolvedPath } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';

 export const useRouterTab = () => {
-  // const loc = useLocation().pathname;
-  // const routerTab = loc.substring(0, loc.lastIndexOf('/')) ? loc : false;
+  const loc = useLocation().pathname;
+  const routerTab = loc.substring(0, loc.lastIndexOf('/')) ? loc : false;

-  const routerTabPath = useResolvedPath(':tab');
-  const routerTabPathMatch = useMatch(routerTabPath.pathname);
-  const routerTab = routerTabPathMatch?.params?.tab || false;
+  // const routerTabPath = useResolvedPath(':tab');
+  // const routerTabPathMatch = useMatch(routerTabPath.pathname);
+  // const routerTab = routerTabPathMatch?.params?.tab || false;

  return { routerTab } as const;
 };
--- a/interface/src/framework/ap/AccessPoint.tsx
+++ b/interface/src/framework/ap/AccessPoint.tsx
@@ -22,8 +22,12 @@ const AccessPoint: FC = () => {
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="status" label={LL.STATUS_OF(LL.ACCESS_POINT(1))} />
-        <Tab value="settings" label={LL.SETTINGS_OF(LL.ACCESS_POINT(1))} disabled={!authenticatedContext.me.admin} />
+        <Tab value="/ap/status" label={LL.STATUS_OF(LL.ACCESS_POINT(1))} />
+        <Tab
+          value="/ap/settings"
+          label={LL.SETTINGS_OF(LL.ACCESS_POINT(1))}
+          disabled={!authenticatedContext.me.admin}
+        />
      </RouterTabs>
      <Routes>
        <Route path="status" element={<APStatusForm />} />
@@ -36,7 +40,7 @@ const AccessPoint: FC = () => {
            </RequireAdmin>
          }
        />
-        <Route path="/*" element={<Navigate replace to="status" />} />
+        <Route path="*" element={<Navigate replace to="/ap/status" />} />
      </Routes>
    </>
  );
--- a/interface/src/framework/mqtt/Mqtt.tsx
+++ b/interface/src/framework/mqtt/Mqtt.tsx
@@ -21,8 +21,8 @@ const Mqtt: FC = () => {
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="status" label={LL.STATUS_OF('MQTT')} />
-        <Tab value="settings" label={LL.SETTINGS_OF('MQTT')} disabled={!authenticatedContext.me.admin} />
+        <Tab value="/mqtt/status" label={LL.STATUS_OF('MQTT')} />
+        <Tab value="/mqtt/settings" label={LL.SETTINGS_OF('MQTT')} disabled={!authenticatedContext.me.admin} />
      </RouterTabs>
      <Routes>
        <Route path="status" element={<MqttStatusForm />} />
@@ -34,7 +34,7 @@ const Mqtt: FC = () => {
            </RequireAdmin>
          }
        />
-        <Route path="/*" element={<Navigate replace to="status" />} />
+        <Route path="*" element={<Navigate replace to="/mqtt/status" />} />
      </Routes>
    </>
  );
--- a/interface/src/framework/network/NetworkConnection.tsx
+++ b/interface/src/framework/network/NetworkConnection.tsx
@@ -44,9 +44,13 @@ const NetworkConnection: FC = () => {
      }}
    >
      <RouterTabs value={routerTab}>
-        <Tab value="status" label={LL.STATUS_OF(LL.NETWORK(1))} />
-        <Tab value="scan" label={LL.NETWORK_SCAN()} disabled={!authenticatedContext.me.admin} />
-        <Tab value="settings" label={LL.SETTINGS_OF(LL.NETWORK(1))} disabled={!authenticatedContext.me.admin} />
+        <Tab value="/network/status" label={LL.STATUS_OF(LL.NETWORK(1))} />
+        <Tab value="/network/scan" label={LL.NETWORK_SCAN()} disabled={!authenticatedContext.me.admin} />
+        <Tab
+          value="/network/settings"
+          label={LL.SETTINGS_OF(LL.NETWORK(1))}
+          disabled={!authenticatedContext.me.admin}
+        />
      </RouterTabs>
      <Routes>
        <Route path="status" element={<NetworkStatusForm />} />
@@ -66,7 +70,7 @@ const NetworkConnection: FC = () => {
            </RequireAdmin>
          }
        />
-        <Route path="/*" element={<Navigate replace to="status" />} />
+        <Route path="*" element={<Navigate replace to="/network/status" />} />
      </Routes>
    </WiFiConnectionContext.Provider>
  );
--- a/interface/src/framework/ntp/NetworkTime.tsx
+++ b/interface/src/framework/ntp/NetworkTime.tsx
@@ -20,8 +20,8 @@ const NetworkTime: FC = () => {
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="status" label={LL.STATUS_OF('NTP')} />
-        <Tab value="settings" label={LL.SETTINGS_OF('NTP')} disabled={!authenticatedContext.me.admin} />
+        <Tab value="/ntp/status" label={LL.STATUS_OF('NTP')} />
+        <Tab value="/ntp/settings" label={LL.SETTINGS_OF('NTP')} disabled={!authenticatedContext.me.admin} />
      </RouterTabs>
      <Routes>
        <Route path="status" element={<NTPStatusForm />} />
@@ -33,7 +33,7 @@ const NetworkTime: FC = () => {
            </RequireAdmin>
          }
        />
-        <Route path="/*" element={<Navigate replace to="status" />} />
+        <Route path="*" element={<Navigate replace to="/ntp/status" />} />
      </Routes>
    </>
  );
--- a/interface/src/framework/security/Security.tsx
+++ b/interface/src/framework/security/Security.tsx
@@ -17,13 +17,13 @@ const Security: FC = () => {
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="users" label={LL.MANAGE_USERS()} />
-        <Tab value="settings" label={LL.SETTINGS_OF(LL.SECURITY(1))} />
+        <Tab value="/security/users" label={LL.MANAGE_USERS()} />
+        <Tab value="/security/settings" label={LL.SETTINGS_OF(LL.SECURITY(1))} />
      </RouterTabs>
      <Routes>
        <Route path="users" element={<ManageUsersForm />} />
        <Route path="settings" element={<SecuritySettingsForm />} />
-        <Route path="/*" element={<Navigate replace to="users" />} />
+        <Route path="*" element={<Navigate replace to="/security/users" />} />
      </Routes>
    </>
  );
--- a/interface/src/framework/system/System.tsx
+++ b/interface/src/framework/system/System.tsx
@@ -23,10 +23,10 @@ const System: FC = () => {
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="status" label={LL.STATUS_OF(LL.SYSTEM(1))} />
-        <Tab value="log" label={LL.LOG_OF(LL.SYSTEM(2))} />
-        <Tab value="ota" label={LL.SETTINGS_OF('OTA')} disabled={!me.admin} />
-        <Tab value="upload" label={LL.UPLOAD_DOWNLOAD()} disabled={!me.admin} />
+        <Tab value="/system/status" label={LL.STATUS_OF(LL.SYSTEM(1))} />
+        <Tab value="/system/log" label={LL.LOG_OF(LL.SYSTEM(2))} />
+        <Tab value="/system/ota" label={LL.SETTINGS_OF('OTA')} disabled={!me.admin} />
+        <Tab value="/system/upload" label={LL.UPLOAD_DOWNLOAD()} disabled={!me.admin} />
      </RouterTabs>
      <Routes>
        <Route path="status" element={<SystemStatusForm />} />
@@ -47,7 +47,7 @@ const System: FC = () => {
            </RequireAdmin>
          }
        />
-        <Route path="/*" element={<Navigate replace to="status" />} />
+        <Route path="*" element={<Navigate replace to="/system/status" />} />
      </Routes>
    </>
  );
--- a/interface/src/framework/system/UploadFileForm.tsx
+++ b/interface/src/framework/system/UploadFileForm.tsx
@@ -28,7 +28,7 @@ const UploadFileForm: FC = () => {
  const { send: getSchedule, onSuccess: onSuccessGetSchedule } = useRequest(EMSESP.getSchedule(), {
    immediate: false
  });
-  const { send: getInfo, onSuccess: onSuccessGetInfo } = useRequest((data) => EMSESP.API(data), {
+  const { send: getAPI, onSuccess: onGetAPI } = useRequest((data) => EMSESP.API(data), {
    immediate: false
  });

@@ -71,26 +71,26 @@ const UploadFileForm: FC = () => {
        type: 'text/plain'
      })
    );
-    anchor.download = 'emsesp_' + endpoint + '.json';
+    anchor.download = 'emsesp_' + endpoint;
    anchor.click();
    URL.revokeObjectURL(anchor.href);
    toast.info(LL.DOWNLOAD_SUCCESSFUL());
  };

  onSuccessGetSettings((event) => {
-    saveFile(event.data, 'settings');
+    saveFile(event.data, 'settings.json');
  });
  onSuccessgetCustomizations((event) => {
-    saveFile(event.data, 'customizations');
+    saveFile(event.data, 'customizations.json');
  });
  onSuccessGetEntities((event) => {
-    saveFile(event.data, 'entities');
+    saveFile(event.data, 'entities.json');
  });
  onSuccessGetSchedule((event) => {
-    saveFile(event.data, 'schedule');
+    saveFile(event.data, 'schedule.json');
  });
-  onSuccessGetInfo((event) => {
-    saveFile(event.data, 'info');
+  onGetAPI((event) => {
+    saveFile(event.data, event.sendArgs[0].device + '_' + event.sendArgs[0].entity + '.txt');
  });

  const downloadSettings = async () => {
@@ -112,13 +112,17 @@ const UploadFileForm: FC = () => {
  };

  const downloadSchedule = async () => {
-    await getSchedule().catch((error) => {
-      toast.error(error.message);
-    });
+    await getSchedule()
+      .catch((error) => {
+        toast.error(error.message);
+      })
+      .finally(() => {
+        toast.info(LL.DOWNLOAD_SUCCESSFUL());
+      });
  };

-  const downloadInfo = async () => {
-    await getInfo({ device: 'system', entity: 'info', id: 0 }).catch((error) => {
+  const callAPI = async (device: string, entity: string) => {
+    await getAPI({ device, entity, id: 0 }).catch((error) => {
      toast.error(error.message);
    });
  };
@@ -143,8 +147,34 @@ const UploadFileForm: FC = () => {
      <SingleUpload onDrop={startUpload} onCancel={cancelUpload} isUploading={isUploading} progress={progress} />
      {!isUploading && (
        <>
-          <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
-            {LL.DOWNLOAD(0)}
+          <Typography sx={{ pt: 4, pb: 2 }} variant="h6" color="primary">
+            {LL.DOWNLOAD(0)}&nbsp;{LL.SUPPORT_INFORMATION()}
+          </Typography>
+          <Box color="warning.main">
+            <Typography mb={1} variant="body2">
+              {LL.HELP_INFORMATION_4()}
+            </Typography>
+          </Box>
+          <Button
+            startIcon={<DownloadIcon />}
+            variant="outlined"
+            color="primary"
+            onClick={() => callAPI('system', 'info')}
+          >
+            {LL.SUPPORT_INFORMATION()}
+          </Button>
+          <Button
+            sx={{ ml: 2 }}
+            startIcon={<DownloadIcon />}
+            variant="outlined"
+            color="primary"
+            onClick={() => callAPI('system', 'allvalues')}
+          >
+            All Values
+          </Button>
+
+          <Typography sx={{ pt: 4, pb: 2 }} variant="h6" color="primary">
+            {LL.DOWNLOAD(0)}&nbsp;{LL.SETTINGS()}
          </Typography>
          <Box color="warning.main">
            <Typography mb={1} variant="body2">
@@ -179,14 +209,6 @@ const UploadFileForm: FC = () => {
          <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={downloadSchedule}>
            {LL.SCHEDULE(0)}
          </Button>
-          <Box color="warning.main">
-            <Typography mt={2} mb={1} variant="body2">
-              {LL.DOWNLOAD(0)}&nbsp;{LL.SUPPORT_INFORMATION()}
-            </Typography>
-          </Box>
-          <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={downloadInfo}>
-            {LL.SUPPORT_INFORMATION()}
-          </Button>
        </>
      )}
    </>
--- a/interface/src/i18n/en/index.ts
+++ b/interface/src/i18n/en/index.ts
@@ -169,7 +169,7 @@ const en: Translation = {
  HELP_INFORMATION_1: 'Visit the online wiki to get instructions on how to configure EMS-ESP',
  HELP_INFORMATION_2: 'For live community chat join our Discord server',
  HELP_INFORMATION_3: 'To request a feature or report a bug',
-  HELP_INFORMATION_4: 'remember to download and attach your system information for a faster response when reporting an issue',
+  HELP_INFORMATION_4: 'remember to download and attach your support information for a faster response when reporting an issue',
  HELP_INFORMATION_5: 'EMS-ESP is a free and open-source project. Please support its future development by giving it a star on Github!',
  UPLOAD: 'Upload',
  DOWNLOAD: '{{D|d|d}}ownload',
--- a/interface/src/project/Dashboard.tsx
+++ b/interface/src/project/Dashboard.tsx
@@ -20,15 +20,15 @@ const Dashboard: FC = () => {
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="devices" label={LL.DEVICES()} />
-        <Tab value="sensors" label={LL.SENSORS()} />
-        <Tab value="status" label="Status" />
+        <Tab value="/dashboard/devices" label={LL.DEVICES()} />
+        <Tab value="/dashboard/sensors" label={LL.SENSORS()} />
+        <Tab value="/dashboard/status" label="Status" />
      </RouterTabs>
      <Routes>
        <Route path="devices" element={<DashboardDevices />} />
        <Route path="sensors" element={<DashboardSensors />} />
        <Route path="status" element={<DashboardStatus />} />
-        <Route path="/*" element={<Navigate replace to="devices" />} />
+        <Route path="*" element={<Navigate replace to="/dashboard/devices" />} />
      </Routes>
    </>
  );
--- a/interface/src/project/Help.tsx
+++ b/interface/src/project/Help.tsx
@@ -1,17 +1,42 @@
 import CommentIcon from '@mui/icons-material/CommentTwoTone';
 import EastIcon from '@mui/icons-material/East';
+import DownloadIcon from '@mui/icons-material/GetApp';
 import GitHubIcon from '@mui/icons-material/GitHub';
 import MenuBookIcon from '@mui/icons-material/MenuBookTwoTone';
-import { Box, List, ListItem, ListItemAvatar, ListItemText, Link, Typography } from '@mui/material';
+import { Box, List, ListItem, ListItemAvatar, ListItemText, Link, Typography, Button } from '@mui/material';
+import { useRequest } from 'alova';
+import { toast } from 'react-toastify';
 import type { FC } from 'react';
 import { SectionContent, useLayoutTitle } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
+import * as EMSESP from 'project/api';

 const Help: FC = () => {
  const { LL } = useI18nContext();
  useLayoutTitle(LL.HELP_OF(''));

-  const uploadURL = window.location.origin + '/system/upload';
+  const { send: getAPI, onSuccess: onGetAPI } = useRequest((data) => EMSESP.API(data), {
+    immediate: false
+  });
+
+  onGetAPI((event) => {
+    const anchor = document.createElement('a');
+    anchor.href = URL.createObjectURL(
+      new Blob([JSON.stringify(event.data, null, 2)], {
+        type: 'text/plain'
+      })
+    );
+    anchor.download = 'emsesp_' + event.sendArgs[0].device + '_' + event.sendArgs[0].entity + '.txt';
+    anchor.click();
+    URL.revokeObjectURL(anchor.href);
+    toast.info(LL.DOWNLOAD_SUCCESSFUL());
+  });
+
+  const callAPI = async (device: string, entity: string) => {
+    await getAPI({ device, entity, id: 0 }).catch((error) => {
+      toast.error(error.message);
+    });
+  };

  return (
    <SectionContent title={LL.SUPPORT_INFORMATION()} titleGutter>
@@ -55,15 +80,28 @@ const Help: FC = () => {
              {LL.CLICK_HERE()}
            </Link>
            <br />
-            <i>({LL.HELP_INFORMATION_4()}</i>&nbsp;
-            <Link href={uploadURL} color="primary">
-              {LL.UPLOAD()}
-            </Link>
-            )
          </ListItemText>
        </ListItem>
      </List>

+      <Box color="warning.main">
+        <Typography mb={1} variant="body2">
+          {LL.HELP_INFORMATION_4()}
+        </Typography>
+      </Box>
+      <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={() => callAPI('system', 'info')}>
+        {LL.SUPPORT_INFORMATION()}
+      </Button>
+      <Button
+        sx={{ ml: 2 }}
+        startIcon={<DownloadIcon />}
+        variant="outlined"
+        color="primary"
+        onClick={() => callAPI('system', 'allvalues')}
+      >
+        All Values
+      </Button>
+
      <Box border={1} p={1} mt={4} color="orange">
        <Typography align="center" variant="subtitle1" color="orange">
          <b>{LL.HELP_INFORMATION_5()}</b>
--- a/interface/src/project/Settings.tsx
+++ b/interface/src/project/Settings.tsx
@@ -18,17 +18,17 @@ const Settings: FC = () => {
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="application" label={LL.APPLICATION_SETTINGS()} />
-        <Tab value="customization" label={LL.CUSTOMIZATIONS()} />
-        <Tab value="scheduler" label={LL.SCHEDULER()} />
-        <Tab value="customentities" label={LL.CUSTOM_ENTITIES(0)} />
+        <Tab value="/settings/application" label={LL.APPLICATION_SETTINGS()} />
+        <Tab value="/settings/customization" label={LL.CUSTOMIZATIONS()} />
+        <Tab value="/settings/scheduler" label={LL.SCHEDULER()} />
+        <Tab value="/settings/customentities" label={LL.CUSTOM_ENTITIES(0)} />
      </RouterTabs>
      <Routes>
        <Route path="application" element={<SettingsApplication />} />
        <Route path="customization" element={<SettingsCustomization />} />
        <Route path="scheduler" element={<SettingsScheduler />} />
        <Route path="customentities" element={<SettingsEntities />} />
-        <Route path="/*" element={<Navigate replace to="application" />} />
+        <Route path="*" element={<Navigate replace to="/settings/application" />} />
      </Routes>
    </>
  );
--- a/interface/src/project/api.ts
+++ b/interface/src/project/api.ts
@@ -19,7 +19,8 @@ import { alovaInstance } from 'api/endpoints';
 export const readCoreData = () => alovaInstance.Get<CoreData>(`/rest/coreData`);
 export const readDeviceData = (id: number) =>
  alovaInstance.Get<DeviceData>('/rest/deviceData', {
-    params: { id },
+    // alovaInstance.Get<DeviceData>(`/rest/deviceData/${id}`, {
+    params: { id }, // TODO remove later
    responseType: 'arraybuffer' // uses msgpack
  });
 export const writeDeviceValue = (data: any) => alovaInstance.Post('/rest/writeDeviceValue', data);
@@ -53,8 +54,9 @@ export const getSchedule = () => alovaInstance.Get('/rest/getSchedule');

 // SettingsCustomization
 export const readDeviceEntities = (id: number) =>
-  alovaInstance.Get<DeviceEntity[]>('/rest/deviceEntities', {
-    params: { id },
+  // alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities/${id}`, {
+  alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities`, {
+    params: { id }, // TODO remove later
    responseType: 'arraybuffer',
    transformData(data: any) {
      return data.map((de: DeviceEntity) => ({ ...de, o_m: de.m, o_cn: de.cn, o_mi: de.mi, o_ma: de.ma }));
--- a/interface/yarn.lock
+++ b/interface/yarn.lock
@@ -56,6 +56,13 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/compat-data@npm:^7.23.5":
+  version: 7.23.5
+  resolution: "@babel/compat-data@npm:7.23.5"
+  checksum: 088f14f646ecbddd5ef89f120a60a1b3389a50a9705d44603dca77662707d0175a5e0e0da3943c3298f1907a4ab871468656fbbf74bb7842cd8b0686b2c19736
+  languageName: node
+  linkType: hard
+
 "@babel/core@npm:^7.22.1":
  version: 7.23.2
  resolution: "@babel/core@npm:7.23.2"
@@ -79,26 +86,26 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/core@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/core@npm:7.23.5"
+"@babel/core@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/core@npm:7.23.6"
  dependencies:
    "@ampproject/remapping": "npm:^2.2.0"
    "@babel/code-frame": "npm:^7.23.5"
-    "@babel/generator": "npm:^7.23.5"
-    "@babel/helper-compilation-targets": "npm:^7.22.15"
+    "@babel/generator": "npm:^7.23.6"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
    "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helpers": "npm:^7.23.5"
-    "@babel/parser": "npm:^7.23.5"
+    "@babel/helpers": "npm:^7.23.6"
+    "@babel/parser": "npm:^7.23.6"
    "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.5"
-    "@babel/types": "npm:^7.23.5"
+    "@babel/traverse": "npm:^7.23.6"
+    "@babel/types": "npm:^7.23.6"
    convert-source-map: "npm:^2.0.0"
    debug: "npm:^4.1.0"
    gensync: "npm:^1.0.0-beta.2"
    json5: "npm:^2.2.3"
    semver: "npm:^6.3.1"
-  checksum: f24265172610dbffe0e315b6a8e8f87cf87d2643c8915196adcddd81c66a8eaeb1b36fea851e2308961636a180089a5f10becaa340d5b707d5f64e2e5ffb2bc8
+  checksum: a72ba71d2f557d09ff58a5f0846344b9cea9dfcbd7418729a3a74d5b0f37a5ca024942fef4d19f248de751928a1be3d5cb0488746dd8896009dd55b974bb552e
  languageName: node
  linkType: hard

@@ -114,15 +121,15 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/generator@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/generator@npm:7.23.5"
+"@babel/generator@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/generator@npm:7.23.6"
  dependencies:
-    "@babel/types": "npm:^7.23.5"
+    "@babel/types": "npm:^7.23.6"
    "@jridgewell/gen-mapping": "npm:^0.3.2"
    "@jridgewell/trace-mapping": "npm:^0.3.17"
    jsesc: "npm:^2.5.1"
-  checksum: 094af79c2e8fdb0cfd06b42ff6a39a8a95639bc987cace44f52ed5c46127f5469eb20ab5f4c8991fc00fa9c1445a1977cde8e44289d6be29ddbb315fb0fc1b45
+  checksum: 864090d5122c0aa3074471fd7b79d8a880c1468480cbd28925020a3dcc7eb6e98bedcdb38983df299c12b44b166e30915b8085a7bc126e68fa7e2aadc7bd1ac5
  languageName: node
  linkType: hard

@@ -148,6 +155,19 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/helper-compilation-targets@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/helper-compilation-targets@npm:7.23.6"
+  dependencies:
+    "@babel/compat-data": "npm:^7.23.5"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    browserslist: "npm:^4.22.2"
+    lru-cache: "npm:^5.1.1"
+    semver: "npm:^6.3.1"
+  checksum: 05595cd73087ddcd81b82d2f3297aac0c0422858dfdded43d304786cf680ec33e846e2317e6992d2c964ee61d93945cbf1fa8ec80b55aee5bfb159227fb02cb9
+  languageName: node
+  linkType: hard
+
 "@babel/helper-environment-visitor@npm:^7.22.20":
  version: 7.22.20
  resolution: "@babel/helper-environment-visitor@npm:7.22.20"
@@ -266,6 +286,13 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/helper-validator-option@npm:^7.23.5":
+  version: 7.23.5
+  resolution: "@babel/helper-validator-option@npm:7.23.5"
+  checksum: 537cde2330a8aede223552510e8a13e9c1c8798afee3757995a7d4acae564124fe2bf7e7c3d90d62d3657434a74340a274b3b3b1c6f17e9a2be1f48af29cb09e
+  languageName: node
+  linkType: hard
+
 "@babel/helpers@npm:^7.23.2":
  version: 7.23.2
  resolution: "@babel/helpers@npm:7.23.2"
@@ -277,14 +304,14 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/helpers@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/helpers@npm:7.23.5"
+"@babel/helpers@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/helpers@npm:7.23.6"
  dependencies:
    "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.5"
-    "@babel/types": "npm:^7.23.5"
-  checksum: 84a813db55e03b5f47cef1210eb22751dae5dc3605bf62ff9acd4c248d857f94cb43dc7299e0edcec9312b31088f0d77f881282df2957e65a322b5412801cc24
+    "@babel/traverse": "npm:^7.23.6"
+    "@babel/types": "npm:^7.23.6"
+  checksum: 2a85fd2bcbc15a6c94dbe7b9e94d8920f9de76d164179d6895fee89c4339079d9e3e56f572bf19b5e7d1e6f1997d7fbaeaa686b47d35136852631dfd09e85c2f
  languageName: node
  linkType: hard

@@ -319,12 +346,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/parser@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/parser@npm:7.23.5"
+"@babel/parser@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/parser@npm:7.23.6"
  bin:
    parser: ./bin/babel-parser.js
-  checksum: 828c250ace0c58f9dc311fd13ad3da34e86ed27a5c6b4183ce9d85be250e78eeb71a13f6d51a368c46f8cbe51106c726bfbb158bf46a89db3a168a0002d3050a
+  checksum: 6be3a63d3c9d07b035b5a79c022327cb7e16cbd530140ecb731f19a650c794c315a72c699a22413ebeafaff14aa8f53435111898d59e01a393d741b85629fa7d
  languageName: node
  linkType: hard

@@ -412,21 +439,21 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/traverse@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/traverse@npm:7.23.5"
+"@babel/traverse@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/traverse@npm:7.23.6"
  dependencies:
    "@babel/code-frame": "npm:^7.23.5"
-    "@babel/generator": "npm:^7.23.5"
+    "@babel/generator": "npm:^7.23.6"
    "@babel/helper-environment-visitor": "npm:^7.22.20"
    "@babel/helper-function-name": "npm:^7.23.0"
    "@babel/helper-hoist-variables": "npm:^7.22.5"
    "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.23.5"
-    "@babel/types": "npm:^7.23.5"
-    debug: "npm:^4.1.0"
+    "@babel/parser": "npm:^7.23.6"
+    "@babel/types": "npm:^7.23.6"
+    debug: "npm:^4.3.1"
    globals: "npm:^11.1.0"
-  checksum: 281cae2765caad88c7af6214eab3647db0e9cadc7ffcd3fd924f09fbb9bd09d97d6fb210794b7545c317ce417a30016636530043a455ba6922349e39c1ba622a
+  checksum: ee4434a3ce792ee8956b64d76843caa1dda4779bb621ed9f951dd3551965bf1f292f097011c9730ecbc0b57f02434b1fa5a771610a2ef570726b0df0fc3332d9
  languageName: node
  linkType: hard

@@ -441,14 +468,14 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/types@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/types@npm:7.23.5"
+"@babel/types@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/types@npm:7.23.6"
  dependencies:
    "@babel/helper-string-parser": "npm:^7.23.4"
    "@babel/helper-validator-identifier": "npm:^7.22.20"
    to-fast-properties: "npm:^2.0.0"
-  checksum: a623a4e7f396f1903659099da25bfa059694a49f42820f6b5288347f1646f0b37fb7cc550ba45644e9067149368ef34ccb1bd4a4251ec59b83b3f7765088f363
+  checksum: 07e70bb94d30b0231396b5e9a7726e6d9227a0a62e0a6830c0bd3232f33b024092e3d5a7d1b096a65bbf2bb43a9ab4c721bf618e115bfbb87b454fa060f88cbf
  languageName: node
  linkType: hard

@@ -1783,7 +1810,7 @@ __metadata:
  resolution: "EMS-ESP@workspace:."
  dependencies:
    "@alova/adapter-xhr": "npm:^1.0.1"
-    "@babel/core": "npm:^7.23.5"
+    "@babel/core": "npm:^7.23.6"
    "@emotion/react": "npm:^11.11.1"
    "@emotion/styled": "npm:^11.11.0"
    "@mui/icons-material": "npm:^5.14.19"
@@ -1818,14 +1845,14 @@ __metadata:
    lodash-es: "npm:^4.17.21"
    mime-types: "npm:^2.1.35"
    preact: "npm:^10.19.3"
-    prettier: "npm:^3.1.0"
+    prettier: "npm:^3.1.1"
    react: "npm:latest"
    react-dom: "npm:latest"
    react-dropzone: "npm:^14.2.3"
    react-icons: "npm:^4.12.0"
    react-router-dom: "npm:^6.20.1"
    react-toastify: "npm:^9.1.3"
-    rollup-plugin-visualizer: "npm:^5.10.0"
+    rollup-plugin-visualizer: "npm:^5.11.0"
    sockette: "npm:^2.0.6"
    terser: "npm:^5.26.0"
    typesafe-i18n: "npm:^5.26.2"
@@ -2332,6 +2359,20 @@ __metadata:
  languageName: node
  linkType: hard

+"browserslist@npm:^4.22.2":
+  version: 4.22.2
+  resolution: "browserslist@npm:4.22.2"
+  dependencies:
+    caniuse-lite: "npm:^1.0.30001565"
+    electron-to-chromium: "npm:^1.4.601"
+    node-releases: "npm:^2.0.14"
+    update-browserslist-db: "npm:^1.0.13"
+  bin:
+    browserslist: cli.js
+  checksum: e3590793db7f66ad3a50817e7b7f195ce61e029bd7187200244db664bfbe0ac832f784e4f6b9c958aef8ea4abe001ae7880b7522682df521f4bc0a5b67660b5e
+  languageName: node
+  linkType: hard
+
 "buffer-alloc-unsafe@npm:^1.1.0":
  version: 1.1.0
  resolution: "buffer-alloc-unsafe@npm:1.1.0"
@@ -2466,6 +2507,13 @@ __metadata:
  languageName: node
  linkType: hard

+"caniuse-lite@npm:^1.0.30001565":
+  version: 1.0.30001568
+  resolution: "caniuse-lite@npm:1.0.30001568"
+  checksum: 27aa9697e8fccf61702962a3cc48ec2355940e94872e4f0dab108d8a88adb0250e5b96572bef08b90a67a8183d1c704448b2fc69d600d7b6405b3f74dc5dbcb6
+  languageName: node
+  linkType: hard
+
 "caw@npm:^2.0.0, caw@npm:^2.0.1":
  version: 2.0.1
  resolution: "caw@npm:2.0.1"
@@ -2841,7 +2889,7 @@ __metadata:
  languageName: node
  linkType: hard

-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
  version: 4.3.4
  resolution: "debug@npm:4.3.4"
  dependencies:
@@ -3162,6 +3210,13 @@ __metadata:
  languageName: node
  linkType: hard

+"electron-to-chromium@npm:^1.4.601":
+  version: 1.4.609
+  resolution: "electron-to-chromium@npm:1.4.609"
+  checksum: 0ec022c34a254eaa3b595b05f2c0f027f713e8c3c986e42920f8a958385ef5b8a3ea97735109edf4394600db7a9d2dd8ab096b0d1839d4452708f0ad88488943
+  languageName: node
+  linkType: hard
+
 "emoji-regex@npm:^8.0.0":
  version: 8.0.0
  resolution: "emoji-regex@npm:8.0.0"
@@ -6311,6 +6366,13 @@ __metadata:
  languageName: node
  linkType: hard

+"node-releases@npm:^2.0.14":
+  version: 2.0.14
+  resolution: "node-releases@npm:2.0.14"
+  checksum: 0f7607ec7db5ef1dc616899a5f24ae90c869b6a54c2d4f36ff6d84a282ab9343c7ff3ca3670fe4669171bb1e8a9b3e286e1ef1c131f09a83d70554f855d54f24
+  languageName: node
+  linkType: hard
+
 "nopt@npm:^6.0.0":
  version: 6.0.0
  resolution: "nopt@npm:6.0.0"
@@ -6934,12 +6996,12 @@ __metadata:
  languageName: node
  linkType: hard

-"prettier@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "prettier@npm:3.1.0"
+"prettier@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "prettier@npm:3.1.1"
  bin:
    prettier: bin/prettier.cjs
-  checksum: e95e8f93c6b9aea2ac1e86bebe329bee90c8c50d9a23d1f593eba8d7f39b33b3641eb28785001505b6723c47895a5322ad12a2fb855b289cb7bae450ffc34425
+  checksum: 26a249f321b97d26c04483f1bf2eeb22e082a76f4222a2c922bebdc60111691aad4ec3979610e83942e0b956058ec361d9e9c81c185172264eb6db9aa678082b
  languageName: node
  linkType: hard

@@ -7374,9 +7436,9 @@ __metadata:
  languageName: node
  linkType: hard

-"rollup-plugin-visualizer@npm:^5.10.0":
-  version: 5.10.0
-  resolution: "rollup-plugin-visualizer@npm:5.10.0"
+"rollup-plugin-visualizer@npm:^5.11.0":
+  version: 5.11.0
+  resolution: "rollup-plugin-visualizer@npm:5.11.0"
  dependencies:
    open: "npm:^8.4.0"
    picomatch: "npm:^2.3.1"
@@ -7389,7 +7451,7 @@ __metadata:
      optional: true
  bin:
    rollup-plugin-visualizer: dist/bin/cli.js
-  checksum: aa4ef8d2aae064b50a50168094db1337762d91bd0cd06206cfbc96a97adca45b7036dc1871eab7e70878111eeedb8164fe267f5cc56cd9eb4225ed71c8966aa6
+  checksum: 947238aa22706a47a4d3e8ce616855f0e5cb969ed9f61b9a268eaede0a86f461ecb38e27b4e6bf00f4b5e3f63677667f65e0d4af89a659a5160f74add1f192bb
  languageName: node
  linkType: hard