Dockery/Homarr
1
0
Fork 0
mirror of https://github.com/ajnart/homarr.git synced 2026-03-04 19:30:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: health monitoring hotfix (#1970)

Browse Source 
* fix cpu temp when not available, fix hover dropdown, resize progress rings.

* fix spelling
This commit is contained in:
Yossi Hillali
2024-03-18 23:53:06 +02:00
committed by GitHub
parent 5875b1b264
commit ef70e9317d
6 changed files with 77 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/server/api/routers/openmediavault.ts
View File

@@ -76,51 +76,67 @@ export const openmediavaultRouter = createTRPCRouter({
input
);
const cookies = authResponse.headers['set-cookie'] || [];
sessionId = cookies
.find(
(cookie: any) =>
cookie.includes('X-OPENMEDIAVAULT-SESSIONID') ||
cookie.includes('OPENMEDIAVAULT-SESSIONID')
)
?.split(';')[0];
loginToken = cookies
.find(
(cookie: any) =>
cookie.includes('X-OPENMEDIAVAULT-LOGIN') || cookie.includes('OPENMEDIAVAULT-LOGIN')
)
?.split(';')[0];
if (authResponse.data.response.sessionid) {
sessionId = authResponse.data.response.sessionid;
} else {
const cookies = authResponse.headers['set-cookie'] || [];
sessionId = cookies
.find((cookie: any) => cookie.includes('X-OPENMEDIAVAULT-SESSIONID'))
?.split(';')[0];
loginToken = cookies
.find((cookie: any) => cookie.includes('X-OPENMEDIAVAULT-LOGIN'))
?.split(';')[0];
}
}
const [systemInfoResponse, fileSystemResponse, cpuTempResponse] = await Promise.all([
const responses = await Promise.allSettled([
makeOpenMediaVaultRPCCall(
'system',
'getInformation',
{},
{ Cookie: `${loginToken};${sessionId}` },
loginToken
? { Cookie: `${loginToken};${sessionId}` }
: { 'X-OPENMEDIAVAULT-SESSIONID': sessionId as string },
input
),
makeOpenMediaVaultRPCCall(
'filesystemmgmt',
'enumerateMountedFilesystems',
{ includeroot: true },
{ Cookie: `${loginToken};${sessionId}` },
loginToken
? { Cookie: `${loginToken};${sessionId}` }
: { 'X-OPENMEDIAVAULT-SESSIONID': sessionId as string },
input
),
makeOpenMediaVaultRPCCall(
'cputemp',
'get',
{},
{ Cookie: `${loginToken};${sessionId}` },
loginToken
? { Cookie: `${loginToken};${sessionId}` }
: { 'X-OPENMEDIAVAULT-SESSIONID': sessionId as string },
input
),
]);
const systemInfoResponse =
responses[0].status === 'fulfilled' && responses[0].value
? responses[0].value.data?.response
: null;
const fileSystemResponse =
responses[1].status === 'fulfilled' && responses[1].value
? responses[1].value.data?.response
: null;
const cpuTempResponse =
responses[2].status === 'fulfilled' && responses[2].value
? responses[2].value.data?.response
: null;
return {
authenticated: authResponse ? authResponse.data.response.authenticated : true,
systemInfo: systemInfoResponse?.data.response,
fileSystem: fileSystemResponse?.data.response,
cpuTemp: cpuTempResponse?.data.response,
systemInfo: systemInfoResponse,
fileSystem: fileSystemResponse,
cpuTemp: cpuTempResponse,
};
}),
});