Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Desktop: Fixes #10740: Improve the reliability of fetching resources (#10826)

pull/10859/head
pedr 2024-08-05 15:36:54 -03:00 committed by GitHub
parent 60e347a782
commit a6cf0a3a81
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/lib/shim-init-node.ts
View File

@ -590,6 +590,7 @@ function shimInit(options: ShimInitOptions = null) {
cleanUpOnError(error);
});
const requestStart = new Date();
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
const request = http.request(requestOptions, (response: any) => {
@ -629,7 +630,10 @@ function shimInit(options: ShimInitOptions = null) {
});
request.on('timeout', () => {
request.destroy(new Error(`Request timed out. Timeout value: ${requestOptions.timeout}ms.`));
// We choose to not destroy the request when a timeout value is not specified to keep
// the behavior we had before the addition of this event handler.
if (!requestOptions.timeout) return;
request.destroy(new Error(`Request timed out. Timeout value: ${requestOptions.timeout}ms. Actual connection time: ${new Date().getTime() - requestStart.getTime()}ms`));
});
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied