diff --git a/dist/extractors/rapidcloud.js b/dist/extractors/rapidcloud.js index eb69c9d44..24f502a97 100644 --- a/dist/extractors/rapidcloud.js +++ b/dist/extractors/rapidcloud.js @@ -29,7 +29,7 @@ class RapidCloud extends models_1.VideoExtractor { }; let res = null; res = await this.client.get(`https://${videoUrl.hostname}/embed-2/ajax/e-1/getSources?id=${id}`, options); - let { data: { sources, tracks, intro, outro, encrypted }, } = res; + let { data: { sources, tracks, intro, encrypted }, } = res; let decryptKey = await (await this.client.get('https://raw.githubusercontent.com/theonlymo/keys/e1/key')).data; decryptKey = (0, utils_1.substringBefore)((0, utils_1.substringAfter)(decryptKey, '"blob-code blob-code-inner js-file-line">'), ''); if (!decryptKey) { @@ -89,8 +89,12 @@ class RapidCloud extends models_1.VideoExtractor { result.sources.push(...this.sources); } } - result.intro = (intro === null || intro === void 0 ? void 0 : intro.end) > 1 ? { start: intro.start, end: intro.end } : undefined; - result.outro = (outro === null || outro === void 0 ? void 0 : outro.end) > 1 ? { start: outro.start, end: outro.end } : undefined; + if ((intro === null || intro === void 0 ? void 0 : intro.end) > 1) { + result.intro = { + start: intro.start, + end: intro.end, + }; + } result.sources.push({ url: sources[0].file, isM3U8: sources[0].file.includes('.m3u8'), diff --git a/dist/extractors/rapidcloud.js.map b/dist/extractors/rapidcloud.js.map index 1238861a4..b973d6a65 100644 --- a/dist/extractors/rapidcloud.js.map +++ b/dist/extractors/rapidcloud.js.map @@ -1 +1 @@ -{"version":3,"file":"rapidcloud.js","sourceRoot":"","sources":["../../src/extractors/rapidcloud.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rapidcloud.js","sourceRoot":"","sources":["../../src/extractors/rapidcloud.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/extractors/rapidcloud.ts b/src/extractors/rapidcloud.ts index 5a82442f8..3495ce1c1 100644 --- a/src/extractors/rapidcloud.ts +++ b/src/extractors/rapidcloud.ts @@ -11,7 +11,7 @@ class RapidCloud extends VideoExtractor { private readonly host = 'https://rapid-cloud.co'; override extract = async (videoUrl: URL): Promise<{ sources: IVideo[] } & { subtitles: ISubtitle[] }> => { - const result: { sources: IVideo[]; subtitles: ISubtitle[]; intro?: Intro; outro?: Intro } = { + const result: { sources: IVideo[]; subtitles: ISubtitle[]; intro?: Intro } = { sources: [], subtitles: [], }; @@ -31,7 +31,7 @@ class RapidCloud extends VideoExtractor { ); let { - data: { sources, tracks, intro, outro, encrypted }, + data: { sources, tracks, intro, encrypted }, } = res; let decryptKey = await ( @@ -113,8 +113,12 @@ class RapidCloud extends VideoExtractor { } } - result.intro = intro?.end > 1 ? { start: intro.start, end: intro.end } : undefined; - result.outro = outro?.end > 1 ? { start: outro.start, end: outro.end } : undefined; + if (intro?.end > 1) { + result.intro = { + start: intro.start, + end: intro.end, + }; + } result.sources.push({ url: sources[0].file,