Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Correctly handle youtube-dl request errors

Chocobozzz7aac24485cdf
diff --git a/server/core/helpers/youtube-dl/youtube-dl-wrapper.ts b/server/core/helpers/youtube-dl/youtube-dl-wrapper.ts
index 9ac43533b4..71d4d0f0e2 100644
--- a/server/core/helpers/youtube-dl/youtube-dl-wrapper.ts
+++ b/server/core/helpers/youtube-dl/youtube-dl-wrapper.ts
@@ -24,7 +24,13 @@ export const YoutubeDlImportErrorCode = {
export type YoutubeDlImportErrorCodeType = typeof YoutubeDlImportErrorCode[keyof typeof YoutubeDlImportErrorCode]
export class YoutubeDlImportError extends Error {
- static fromError (err: Error, code: YoutubeDlImportErrorCodeType, message?: string) {
+ static fromError (options: {
+ err: Error
+ code: YoutubeDlImportErrorCodeType
+ message?: string
+ }) {
+ const { err, code, message } = options
+
const ytDlErr = new this({ message: message ?? err.message, code })
ytDlErr.cause = err
@@ -94,30 +100,38 @@ export class YoutubeDLWrapper {
const youtubeDL = await YoutubeDLCLI.safeGet()
- const info = await youtubeDL.getInfo({
- url: this.url,
- format: YoutubeDLCLI.getYoutubeDLVideoFormat(this.enabledResolutions, this.useBestFormat),
- additionalYoutubeDLArgs: youtubeDLArgs,
- processOptions
- })
-
- if (!info) {
- throw new YoutubeDlImportError({
- message: t(`Cannot fetch information from import for URL {targetUrl}`, userLanguage, { targetUrl: this.url }),
- code: YoutubeDlImportErrorCode.FETCH_ERROR
+ try {
+ const info = await youtubeDL.getInfo({
+ url: this.url,
+ format: YoutubeDLCLI.getYoutubeDLVideoFormat(this.enabledResolutions, this.useBestFormat),
+ additionalYoutubeDLArgs: youtubeDLArgs,
+ processOptions
})
- }
- if (info.is_live === true || [ 'is_live', 'post_live', 'is_upcoming' ].includes(info.live_status)) {
- throw new YoutubeDlImportError({
- message: t('Cannot download a live streaming for URL {targetUrl}', userLanguage, { targetUrl: this.url }),
- code: YoutubeDlImportErrorCode.IS_LIVE
- })
- }
+ if (!info) {
+ throw new YoutubeDlImportError({
+ message: t(`Cannot fetch information from import for URL {targetUrl}`, userLanguage, { targetUrl: this.url }),
+ code: YoutubeDlImportErrorCode.FETCH_ERROR
+ })
+ }
+
+ if (info.is_live === true || [ 'is_live', 'post_live', 'is_upcoming' ].includes(info.live_status)) {
+ throw new YoutubeDlImportError({
+ message: t('Cannot download a live streaming for URL {targetUrl}', userLanguage, { targetUrl: this.url }),
+ code: YoutubeDlImportErrorCode.IS_LIVE
+ })
+ }
- const infoBuilder = new YoutubeDLInfoBuilder(info)
+ const infoBuilder = new YoutubeDLInfoBuilder(info)
- return infoBuilder.getInfo()
+ return infoBuilder.getInfo()
+ } catch (err) {
+ throw YoutubeDlImportError.fromError({
+ err,
+ message: t(`Cannot get info from {targetUrl}`, userLanguage, { targetUrl: this.url }),
+ code: YoutubeDlImportErrorCode.FETCH_ERROR
+ })
+ }
}
async getInfoForListImport (options: {