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

fix: respect certificates for app ping (#2198)

Browse Source
This commit is contained in:
Manuel
2025-01-30 23:12:45 +01:00
committed by GitHub
parent 77746278a3
commit d4154d259f
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/ping/package.json
View File

@@ -22,8 +22,10 @@
},
"prettier": "@homarr/prettier-config",
"dependencies": {
"@homarr/certificates": "workspace:^0.1.0",
"@homarr/common": "workspace:^0.1.0",
"@homarr/log": "workspace:^0.1.0"
"@homarr/log": "workspace:^0.1.0",
"pretty-print-error": "^1.1.2"
},
"devDependencies": {
"@homarr/eslint-config": "workspace:^0.2.0",

29
packages/ping/src/index.ts
View File

@@ -1,13 +1,34 @@
import { extractErrorMessage, fetchWithTimeout } from "@homarr/common";
import { formatError } from "pretty-print-error";
import type { fetch } from "undici";
import { fetchWithTrustedCertificatesAsync } from "@homarr/certificates/server";
import { logger } from "@homarr/log";
export const sendPingRequestAsync = async (url: string) => {
try {
return await fetchWithTimeout(url).then((response) => ({ statusCode: response.status }));
return await fetchWithTimeoutAndCertificates(url).then((response) => ({ statusCode: response.status }));
} catch (error) {
logger.error("packages/ping/src/index.ts:", error);
logger.error("packages/ping/src/index.ts:", formatError(error));
return {
error: extractErrorMessage(error),
error: formatError(error),
};
}
};
/**
* Same as fetch, but with a timeout of 10 seconds.
* Also respects certificates.
* https://stackoverflow.com/questions/46946380/fetch-api-request-timeout
* @param param0 fetch arguments
* @returns fetch response
*/
export const fetchWithTimeoutAndCertificates = (...[url, requestInit]: Parameters<typeof fetch>) => {
const controller = new AbortController();
// 10 seconds timeout:
const timeoutId = setTimeout(() => controller.abort(), 10000);
return fetchWithTrustedCertificatesAsync(url, { signal: controller.signal, ...requestInit }).finally(() => {
clearTimeout(timeoutId);
});
};

6
pnpm-lock.yaml generated
View File

@@ -1469,12 +1469,18 @@ importers:
packages/ping:
dependencies:
'@homarr/certificates':
specifier: workspace:^0.1.0
version: link:../certificates
'@homarr/common':
specifier: workspace:^0.1.0
version: link:../common
'@homarr/log':
specifier: workspace:^0.1.0
version: link:../log
pretty-print-error:
specifier: ^1.1.2
version: 1.1.2(patch_hash=4arrfgbz7em6s4gqywse7esg4u)
devDependencies:
'@homarr/eslint-config':
specifier: workspace:^0.2.0