mirror of
https://github.com/tapframe/NuvioStreaming.git
synced 2026-03-11 09:35:42 +00:00
Update trailerService.ts
This commit is contained in:
CK
GitHub
parent
83d19f466c
commit
23984bdfa6
1 changed files with 15 additions and 149 deletions
|
|
@ -14,18 +14,6 @@ interface CacheEntry {
|
|||
}
|
||||
|
||||
export class TrailerService {
|
||||
// ---- Remote server (fallback only) ----
|
||||
private static readonly ENV_LOCAL_BASE =
|
||||
process.env.EXPO_PUBLIC_TRAILER_LOCAL_BASE || 'http://46.62.173.157:3001';
|
||||
private static readonly ENV_LOCAL_TRAILER_PATH =
|
||||
process.env.EXPO_PUBLIC_TRAILER_LOCAL_TRAILER_PATH || '/trailer';
|
||||
private static readonly ENV_LOCAL_SEARCH_PATH =
|
||||
process.env.EXPO_PUBLIC_TRAILER_LOCAL_SEARCH_PATH || '/search-trailer';
|
||||
|
||||
private static readonly LOCAL_SERVER_URL = `${TrailerService.ENV_LOCAL_BASE}${TrailerService.ENV_LOCAL_TRAILER_PATH}`;
|
||||
private static readonly AUTO_SEARCH_URL = `${TrailerService.ENV_LOCAL_BASE}${TrailerService.ENV_LOCAL_SEARCH_PATH}`;
|
||||
private static readonly SERVER_TIMEOUT = 20000;
|
||||
|
||||
// YouTube CDN URLs expire ~6h; cache for 5h
|
||||
private static readonly CACHE_TTL_MS = 5 * 60 * 60 * 1000;
|
||||
private static urlCache = new Map<string, CacheEntry>();
|
||||
|
|
@ -36,7 +24,7 @@ export class TrailerService {
|
|||
|
||||
/**
|
||||
* Get a playable stream URL from a raw YouTube video ID (e.g. from TMDB).
|
||||
* Tries on-device extraction first, falls back to remote server.
|
||||
* Uses on-device extraction only.
|
||||
*/
|
||||
static async getTrailerFromVideoId(
|
||||
youtubeVideoId: string,
|
||||
|
|
@ -53,30 +41,19 @@ export class TrailerService {
|
|||
return cached;
|
||||
}
|
||||
|
||||
// 1. On-device extraction via Innertube
|
||||
try {
|
||||
const platform = Platform.OS === 'android' ? 'android' : 'ios';
|
||||
const url = await YouTubeExtractor.getBestStreamUrl(youtubeVideoId, platform);
|
||||
if (url) {
|
||||
logger.info('TrailerService', `On-device extraction succeeded for ${youtubeVideoId}`);
|
||||
logger.info('TrailerService', `Extraction succeeded for ${youtubeVideoId}`);
|
||||
this.setCache(youtubeVideoId, url);
|
||||
return url;
|
||||
}
|
||||
logger.warn('TrailerService', `On-device extraction returned null for ${youtubeVideoId}`);
|
||||
logger.warn('TrailerService', `Extraction returned null for ${youtubeVideoId}`);
|
||||
} catch (err) {
|
||||
logger.warn('TrailerService', `On-device extraction threw for ${youtubeVideoId}:`, err);
|
||||
logger.warn('TrailerService', `Extraction threw for ${youtubeVideoId}:`, err);
|
||||
}
|
||||
|
||||
// 2. Server fallback
|
||||
logger.info('TrailerService', `Falling back to server for ${youtubeVideoId}`);
|
||||
const youtubeUrl = `https://www.youtube.com/watch?v=${youtubeVideoId}`;
|
||||
const serverUrl = await this.fetchFromServer(youtubeUrl, title, year?.toString());
|
||||
if (serverUrl) {
|
||||
this.setCache(youtubeVideoId, serverUrl);
|
||||
return serverUrl;
|
||||
}
|
||||
|
||||
logger.warn('TrailerService', `Both on-device and server failed for ${youtubeVideoId}`);
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
@ -94,8 +71,7 @@ export class TrailerService {
|
|||
const videoId = YouTubeExtractor.parseVideoId(youtubeUrl);
|
||||
if (!videoId) {
|
||||
logger.warn('TrailerService', `Could not parse video ID from: ${youtubeUrl}`);
|
||||
// No video ID — try server directly with the raw URL
|
||||
return this.fetchFromServer(youtubeUrl, title, year);
|
||||
return null;
|
||||
}
|
||||
|
||||
return this.getTrailerFromVideoId(
|
||||
|
|
@ -107,43 +83,24 @@ export class TrailerService {
|
|||
|
||||
/**
|
||||
* Called by AppleTVHero and HeroSection which only have title/year/tmdbId.
|
||||
* No YouTube video ID available — goes straight to server search.
|
||||
* Without a YouTube video ID there is nothing to extract — returns null.
|
||||
* Callers should ensure they pass a video ID via getTrailerFromVideoId instead.
|
||||
*/
|
||||
static async getTrailerUrl(
|
||||
title: string,
|
||||
year: number,
|
||||
tmdbId?: string,
|
||||
type?: 'movie' | 'tv'
|
||||
_tmdbId?: string,
|
||||
_type?: 'movie' | 'tv'
|
||||
): Promise<string | null> {
|
||||
logger.warn(
|
||||
'TrailerService',
|
||||
`getTrailerUrl called for "${title}" — no YouTube video ID, using server search`
|
||||
);
|
||||
|
||||
const cacheKey = `search:${title}:${year}:${tmdbId ?? ''}`;
|
||||
const cached = this.getCached(cacheKey);
|
||||
if (cached) return cached;
|
||||
|
||||
const serverResult = await this.getTrailerFromServer(title, year, tmdbId, type);
|
||||
if (serverResult) {
|
||||
this.setCache(cacheKey, serverResult);
|
||||
}
|
||||
return serverResult;
|
||||
logger.warn('TrailerService', `getTrailerUrl called for "${title}" but no YouTube video ID available — cannot extract`);
|
||||
return null;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Unchanged public helpers (API compatibility)
|
||||
// Public helpers (API compatibility)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
static getBestFormatUrl(url: string): string {
|
||||
if (url.includes('formats=')) {
|
||||
if (url.includes('M3U')) {
|
||||
return `${url.split('?')[0]}?formats=M3U+none,M3U+appleHlsEncryption`;
|
||||
}
|
||||
if (url.includes('MPEG4')) {
|
||||
return `${url.split('?')[0]}?formats=MPEG4`;
|
||||
}
|
||||
}
|
||||
return url;
|
||||
}
|
||||
|
||||
|
|
@ -154,92 +111,21 @@ export class TrailerService {
|
|||
static async getTrailerData(title: string, year: number): Promise<TrailerData | null> {
|
||||
const url = await this.getTrailerUrl(title, year);
|
||||
if (!url) return null;
|
||||
return { url: this.getBestFormatUrl(url), title, year };
|
||||
return { url, title, year };
|
||||
}
|
||||
|
||||
static setUseLocalServer(_useLocal: boolean): void {
|
||||
logger.info('TrailerService', 'setUseLocalServer: server used as fallback only');
|
||||
}
|
||||
static setUseLocalServer(_useLocal: boolean): void {}
|
||||
|
||||
static getServerStatus(): { usingLocal: boolean; localUrl: string } {
|
||||
return { usingLocal: true, localUrl: this.LOCAL_SERVER_URL };
|
||||
return { usingLocal: false, localUrl: '' };
|
||||
}
|
||||
|
||||
static async testServers(): Promise<{
|
||||
localServer: { status: 'online' | 'offline'; responseTime?: number };
|
||||
}> {
|
||||
try {
|
||||
const t = Date.now();
|
||||
const r = await fetch(`${this.AUTO_SEARCH_URL}?title=test&year=2023`, {
|
||||
signal: AbortSignal.timeout(5000),
|
||||
});
|
||||
if (r.ok || r.status === 404) {
|
||||
return { localServer: { status: 'online', responseTime: Date.now() - t } };
|
||||
}
|
||||
} catch { /* offline */ }
|
||||
return { localServer: { status: 'offline' } };
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Private — server requests
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
private static async getTrailerFromServer(
|
||||
title: string,
|
||||
year: number,
|
||||
tmdbId?: string,
|
||||
type?: 'movie' | 'tv'
|
||||
): Promise<string | null> {
|
||||
const params = new URLSearchParams({ title, year: year.toString() });
|
||||
if (tmdbId) {
|
||||
params.append('tmdbId', tmdbId);
|
||||
params.append('type', type ?? 'movie');
|
||||
}
|
||||
return this.doServerFetch(`${this.AUTO_SEARCH_URL}?${params}`);
|
||||
}
|
||||
|
||||
private static async fetchFromServer(
|
||||
youtubeUrl: string,
|
||||
title?: string,
|
||||
year?: string
|
||||
): Promise<string | null> {
|
||||
const params = new URLSearchParams({ youtube_url: youtubeUrl });
|
||||
if (title) params.append('title', title);
|
||||
if (year) params.append('year', year);
|
||||
return this.doServerFetch(`${this.LOCAL_SERVER_URL}?${params}`);
|
||||
}
|
||||
|
||||
private static async doServerFetch(url: string): Promise<string | null> {
|
||||
const controller = new AbortController();
|
||||
const timer = setTimeout(() => controller.abort(), this.SERVER_TIMEOUT);
|
||||
try {
|
||||
const res = await fetch(url, {
|
||||
headers: { Accept: 'application/json', 'User-Agent': 'Nuvio/1.0' },
|
||||
signal: controller.signal,
|
||||
});
|
||||
clearTimeout(timer);
|
||||
if (!res.ok) {
|
||||
logger.warn('TrailerService', `Server ${res.status} for ${url}`);
|
||||
return null;
|
||||
}
|
||||
const data = await res.json();
|
||||
if (!data.url || !this.isValidTrailerUrl(data.url)) {
|
||||
logger.warn('TrailerService', `Server returned invalid URL: ${data.url}`);
|
||||
return null;
|
||||
}
|
||||
logger.info('TrailerService', `Server fallback succeeded: ${String(data.url).substring(0, 80)}`);
|
||||
return data.url as string;
|
||||
} catch (err) {
|
||||
clearTimeout(timer);
|
||||
if (err instanceof Error && err.name === 'AbortError') {
|
||||
logger.warn('TrailerService', `Server timed out: ${url}`);
|
||||
} else {
|
||||
logger.warn('TrailerService', `Server fetch error:`, err);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Private — cache
|
||||
// ---------------------------------------------------------------------------
|
||||
|
|
@ -261,26 +147,6 @@ export class TrailerService {
|
|||
if (oldest) this.urlCache.delete(oldest);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Private — URL validation
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
private static isValidTrailerUrl(url: string): boolean {
|
||||
try {
|
||||
const u = new URL(url);
|
||||
if (!['http:', 'https:'].includes(u.protocol)) return false;
|
||||
const host = u.hostname.toLowerCase();
|
||||
return (
|
||||
['theplatform.com', 'youtube.com', 'youtu.be', 'vimeo.com',
|
||||
'dailymotion.com', 'twitch.tv', 'amazonaws.com',
|
||||
'cloudfront.net', 'googlevideo.com'].some(d => host.includes(d)) ||
|
||||
/\.(mp4|m3u8|mpd|webm|mov)(\?|$)/i.test(u.pathname)
|
||||
);
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default TrailerService;
|
||||
|
|
|
|||
Loading…
Reference in a new issue