myxelium/Bridge-Multi
1
0
Fork 0
mirror of https://github.com/Myxelium/Bridge-Multi.git synced 2026-07-07 18:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved status code error message

Browse Source
This commit is contained in:
Geomitron
2021-02-02 11:11:33 -05:00
parent 0fc42db387
commit 7cda6162b7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/electron/ipc/download/FileDownloader.ts
View File

@@ -30,7 +30,7 @@ export type FileDownloader = APIFileDownloader | SlowFileDownloader
const downloadErrors = { const downloadErrors = {
timeout: (type: string) => { return { header: 'Timeout', body: `The download server could not be reached. (type=${type})` } }, timeout: (type: string) => { return { header: 'Timeout', body: `The download server could not be reached. (type=${type})` } },
connectionError: (err: Error) => { return { header: 'Connection Error', body: `${err.name}: ${err.message}` } }, connectionError: (err: Error) => { return { header: 'Connection Error', body: `${err.name}: ${err.message}` } },
responseError: (statusCode: number) => { return { header: 'Connection failed', body: `Server returned status code: ${statusCode}` } }, responseError: (statusCode: string) => { return { header: 'Connection failed', body: `Server returned status code: ${statusCode}` } },
htmlError: () => { return { header: 'Invalid response', body: 'Download server returned HTML instead of a file.' } }, htmlError: () => { return { header: 'Invalid response', body: 'Download server returned HTML instead of a file.' } },
linkError: (url: string) => { return { header: 'Invalid link', body: `The download link is not formatted correctly: ${url}` } } linkError: (url: string) => { return { header: 'Invalid link', body: `The download link is not formatted correctly: ${url}` } }
} }
@@ -116,7 +116,11 @@ class APIFileDownloader {
this.startDownloadStream() this.startDownloadStream()
} else { } else {
console.log(JSON.stringify(err)) console.log(JSON.stringify(err))
this.failDownload(downloadErrors.responseError(err ? (err.code ?? 'unknown') : 'unknown')) if (err?.code && err?.response?.statusText) {
this.failDownload(downloadErrors.responseError(`${err.code} (${err.response.statusText})`))
} else {
this.failDownload(downloadErrors.responseError(err?.code ?? 'unknown'))
}
} }
} }
})) }))