@serifpersia/dango 3.4.3 → 3.4.5

package/server/dist/hono/music.js

@@ -1,292 +1,48 @@
-import { AppCache } from '../utils/cache.utils.js';
 import logger from '../logger.js';
-import { getInnertube, getAuthedInnertube, refreshAuthedInnertube, isParserVariantError, } from '../lib/ytmusic.js';
-const musicCache = new AppCache({ ttlSeconds: 3600, maxKeys: 5000 });
-const NAME_SUFFIXES = [
-    /\s*(- topic)$/i,
-    /\s*vevo$/i,
-    /\s*[(|[]official(.*?)[)|\]]/i,
-    /\s*[(|[]((lyrics?|visualizer|audio)\s*(video)?)[)|\]]/i,
-    /\s*[(|[](performance video)[)|\]]/i,
-    /\s*[(|[](clip official)[)|\]]/i,
-    /\s*[(|[](video version)[)|\]]/i,
-    /\s*[(|[](HD|HQ)\s*?(?:audio)?[)|\]]$/i,
-    /\s*[(|[](live)[)|\]]$/i,
-    /\s*[(|[]4K\s*?(?:upgrade)?[)|\]]$/i,
-];
-export function cleanupMusicName(name) {
-    if (!name)
-        return name;
-    let out = name;
-    for (const re of NAME_SUFFIXES)
-        out = out.replace(re, '');
-    return out.trim();
-}
-function toTrack(node) {
-    const n = node;
-    const id = n['video_id'] || n['videoId'] || n['id'] || '';
-    if (!id || typeof id !== 'string')
-        return null;
-    const titleObj = n['title'];
-    const title = typeof titleObj === 'string' ? titleObj : (titleObj?.text ?? 'Unknown title');
-    const artistsRaw = n['artists'] ?? n['authors'] ?? n['subtitle'];
-    let artists = '';
-    if (Array.isArray(artistsRaw)) {
-        artists = artistsRaw
-            .map((a) => {
-            const item = a;
-            return item.name || item.text || item.title || '';
-        })
-            .filter(Boolean)
-            .join(', ');
-    }
-    else if (typeof artistsRaw === 'string') {
-        artists = artistsRaw;
-    }
-    else if (artistsRaw && typeof artistsRaw === 'object') {
-        artists = artistsRaw.text ?? '';
-    }
-    const thumbsRaw = (n['thumbnails'] ?? n['thumbnail']);
-    const thumbnails = Array.isArray(thumbsRaw)
-        ? thumbsRaw
-        : Array.isArray(thumbsRaw?.thumbnails)
-            ? thumbsRaw.thumbnails
-            : [];
-    const albumText = textOf(n['album']);
-    const durationText = textOf(n['duration']);
-    return {
-        id,
-        title: cleanupMusicName(String(title)),
-        artists: cleanupMusicName(artists),
-        album: albumText ? cleanupMusicName(albumText) : undefined,
-        duration: durationText || undefined,
-        thumbnails,
-    };
-}
-function textOf(value) {
-    if (!value)
-        return '';
-    if (typeof value === 'string')
-        return value;
-    const obj = value;
-    if (typeof obj.text === 'string')
-        return obj.text;
-    if (Array.isArray(obj.runs))
-        return obj.runs.map((r) => r.text || '').join('');
-    return '';
+import { parseUmpResponse } from '../lib/ump.js';
+import { mintPoToken, resetPoTokens } from '../lib/potoken.js';
+import { getInnertube, getAuthedInnertube, getMusicCookie, refreshAuthedInnertube, } from '../lib/ytmusic.js';
+const UPSTREAM_UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:156.0) Gecko/20100101 Firefox/156.0';
+const audioCache = new Map();
+const AUDIO_CACHE_MS = 5 * 60 * 1000;
+const FIRST_CHUNK = 16384;
+const AUDIO_CHUNK = 262144;
+const UMP_CVER = '1.20260920.16.00';
+const audioTotalCache = new Map();
+const umpSessions = new Map();
+function randomCpn() {
+    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    let out = '';
+    for (let i = 0; i < 16; i++)
+        out += chars[Math.floor(Math.random() * chars.length)];
+    return out;
 }
-function thumbsOf(value) {
-    if (!value)
-        return [];
-    if (Array.isArray(value)) {
-        return value
-            .filter((t) => t && typeof t.url === 'string')
-            .map((t) => ({ url: t.url, width: t.width, height: t.height }));
+function getUmpSession(videoId) {
+    let session = umpSessions.get(videoId);
+    if (!session) {
+        session = { cpn: randomCpn(), rn: 0, carry: null };
+        umpSessions.set(videoId, session);
     }
-    const obj = value;
-    if (Array.isArray(obj.thumbnails))
-        return thumbsOf(obj.thumbnails);
-    return [];
-}
-function nodeType(node) {
-    const n = node;
-    if (typeof n?.type === 'string')
-        return n.type;
-    return n?.constructor?.name ?? '';
+    return session;
 }
-function upnextToTrack(node, trustLike = false) {
-    const kind = nodeType(node);
-    if (kind === 'AutomixPreviewVideo')
-        return null;
-    const n = node;
-    const video = kind === 'PlaylistPanelVideoWrapper'
-        ? (n['primary'] ?? null)
-        : n;
-    if (!video || typeof video !== 'object')
-        return null;
-    const id = video['video_id'];
-    if (typeof id !== 'string' || !id)
-        return null;
-    const artistsRaw = video['artists'];
-    let artists = '';
-    if (Array.isArray(artistsRaw)) {
-        artists = artistsRaw
-            .map((a) => a?.name || '')
-            .filter(Boolean)
-            .join(', ');
-    }
-    if (!artists && typeof video['author'] === 'string')
-        artists = video['author'];
-    const albumRaw = video['album'];
-    const durationRaw = video['duration'];
-    const durationText = typeof durationRaw === 'string' ? durationRaw : (durationRaw?.text ?? '');
-    let liked = null;
-    if (trustLike) {
-        for (const menu of [video['menu'], node['menu']]) {
-            let found = null;
-            for (const entry of asMenuItems(menu)) {
-                if (nodeType(entry) !== 'ToggleMenuServiceItem')
-                    continue;
-                const icon = entry['icon_type'];
-                if (icon !== 'FAVORITE' && icon !== 'UNFAVORITE')
-                    continue;
-                found = icon === 'UNFAVORITE';
-                break;
-            }
-            if (found !== null) {
-                liked = found;
-                break;
-            }
-        }
-    }
-    return {
-        id,
-        title: cleanupMusicName(textOf(video['title']) || 'Unknown title'),
-        artists: cleanupMusicName(artists || 'Unknown artist'),
-        album: albumRaw?.name ? cleanupMusicName(albumRaw.name) : undefined,
-        duration: durationText || undefined,
-        thumbnails: thumbsOf(video['thumbnail'] ?? video['thumbnails']),
-        ...(liked !== null ? { liked } : {}),
+function boundWindow(clientRange, videoId) {
+    const total = audioTotalCache.get(videoId);
+    const clamp = (start, end) => {
+        if (total !== undefined)
+            end = Math.min(end, total - 1);
+        return [start, Math.max(end, start)];
     };
+    const m = /^bytes=(\d+)-(\d*)$/.exec((clientRange ?? '').trim());
+    if (m && m[2] !== '') {
+        const s = Number(m[1]);
+        const e = Number(m[2]);
+        if (e - s + 1 <= AUDIO_CHUNK)
+            return [s, e];
+        return clamp(s, s + AUDIO_CHUNK - 1);
+    }
+    const start = m ? Number(m[1]) : 0;
+    return clamp(start, start + (start === 0 ? FIRST_CHUNK : AUDIO_CHUNK) - 1);
 }
-function parseUpnext(panel, trustLike) {
-    const tracks = [];
-    const contents = panel.contents ?? [];
-    for (const item of contents) {
-        const track = upnextToTrack(item, trustLike);
-        if (track)
-            tracks.push(track);
-        if (tracks.length >= 50)
-            break;
-    }
-    const playlistId = panel.playlist_id ?? null;
-    return { tracks, playlistId };
-}
-function asMenuItems(menu) {
-    if (!menu || typeof menu !== 'object')
-        return [];
-    const items = menu.items;
-    return Array.isArray(items) ? items : [];
-}
-function findLikeToggle(item, videoId) {
-    const result = { like: null, unlike: null };
-    const kind = nodeType(item);
-    const n = item;
-    const video = kind === 'PlaylistPanelVideoWrapper'
-        ? (n['primary'] ?? null)
-        : n;
-    if (!video || video['video_id'] !== videoId)
-        return result;
-    const menus = [video['menu'], n['menu']];
-    for (const menu of menus) {
-        for (const entry of asMenuItems(menu)) {
-            if (nodeType(entry) !== 'ToggleMenuServiceItem')
-                continue;
-            const icon = entry['icon_type'];
-            if (icon !== 'FAVORITE' && icon !== 'UNFAVORITE')
-                continue;
-            for (const key of ['default_endpoint', 'toggled_endpoint']) {
-                const ep = entry[key];
-                if (typeof ep?.call !== 'function')
-                    continue;
-                const status = ep.payload?.status;
-                if (status === 'LIKE' && !result.like)
-                    result.like = ep;
-                else if (status === 'INDIFFERENT' && !result.unlike)
-                    result.unlike = ep;
-            }
-            if (result.like && result.unlike)
-                return result;
-        }
-    }
-    return result;
-}
-async function fetchPlaylistTracks(yt, id, cap = 500) {
-    const tracks = [];
-    let page = (await yt.music.getPlaylist(id));
-    for (let fetches = 0; fetches < 6; fetches++) {
-        for (const item of (page.items ?? page.contents ?? []).slice(0, cap - tracks.length)) {
-            const track = toTrack(item);
-            if (track)
-                tracks.push(track);
-            if (tracks.length >= cap)
-                break;
-        }
-        if (tracks.length >= cap)
-            break;
-        if (!page.has_continuation || typeof page.getContinuation !== 'function')
-            break;
-        try {
-            page = (await page.getContinuation());
-        }
-        catch (err) {
-            logger.warn({ err }, '[music] playlist continuation failed');
-            break;
-        }
-    }
-    return tracks;
-}
-async function readLibrary(yt) {
-    let lib;
-    try {
-        lib = (await yt.music.getLibrary());
-    }
-    catch (err) {
-        if (!isParserVariantError(err))
-            throw err;
-        logger.warn('[music] library landing hit a layout variant, falling back to Liked playlist');
-        try {
-            const tracks = await fetchPlaylistTracks(yt, 'LM');
-            return { tracks, playlists: [] };
-        }
-        catch (fallbackErr) {
-            logger.warn({ err: fallbackErr }, '[music] liked playlist fallback failed');
-            return { tracks: [], playlists: [] };
-        }
-    }
-    const gridItems = [];
-    for (const section of lib.contents ?? []) {
-        const items = section.items ?? section.contents ?? [];
-        gridItems.push(...items);
-    }
-    const playlists = [];
-    const seen = new Set();
-    for (const item of gridItems) {
-        const n = item;
-        const id = (typeof n['playlist_id'] === 'string' && n['playlist_id']) ||
-            (typeof n['playlistId'] === 'string' && n['playlistId']) ||
-            (typeof n['id'] === 'string' && n['id']) ||
-            '';
-        const title = textOf(n['title']);
-        const subtitle = textOf(n['subtitle']);
-        if (!id || !title || seen.has(id))
-            continue;
-        if (!/playlist|mix/i.test(subtitle) && title !== 'Liked Music')
-            continue;
-        seen.add(id);
-        playlists.push({
-            id,
-            title,
-            subtitle: subtitle || undefined,
-            thumbnails: thumbsOf(n['thumbnails'] ?? n['thumbnail']),
-        });
-    }
-    const tracks = [];
-    const liked = playlists.find((p) => p.title === 'Liked Music');
-    if (liked) {
-        try {
-            tracks.push(...(await fetchPlaylistTracks(yt, liked.id)));
-        }
-        catch (err) {
-            logger.warn({ err }, '[music] liked playlist fetch failed');
-        }
-    }
-    logger.info(`[music] library parsed tracks=${tracks.length} playlists=${playlists.length} gridItems=${gridItems.length}`);
-    return { tracks, playlists };
-}
-const UPSTREAM_UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36';
-const audioCache = new Map();
-const AUDIO_CACHE_MS = 5 * 60 * 1000;
 async function decipherWith(yt, videoId) {
     const info = await yt.music.getInfo(videoId);
     const streaming = info.streaming_data;
@@ -334,7 +90,6 @@ async function decipherAudio(videoId) {
     }
     return decipherWith(await getInnertube(), videoId);
 }
-const PASSTHROUGH_HEADERS = ['content-type', 'content-length', 'content-range', 'accept-ranges'];
 export function registerMusic(app) {
     app.get('/api/music/stream', async (c) => {
         const videoId = String(c.req.query('videoId') || c.req.query('id') || '').trim();
@@ -353,61 +108,96 @@ export function registerMusic(app) {
         const videoId = String(c.req.query('videoId') || c.req.query('id') || '').trim();
         if (!videoId)
             return c.json({ error: 'videoId is required' }, 400);
+        const signal = c.req.raw.signal.aborted
+            ? c.req.raw.signal
+            : AbortSignal.any([c.req.raw.signal, AbortSignal.timeout(30000)]);
         try {
-            let entry;
-            try {
-                entry = await decipherAudio(videoId);
-            }
-            catch {
-                return c.json({ error: 'No stream available' }, 502);
-            }
-            const signal = c.req.raw.signal.aborted
-                ? c.req.raw.signal
-                : AbortSignal.any([c.req.raw.signal, AbortSignal.timeout(30000)]);
-            if (c.req.raw.signal.aborted)
-                return new Response(null, { status: 499 });
-            let upstream;
-            try {
-                upstream = await fetch(entry.url, {
-                    headers: {
-                        'User-Agent': UPSTREAM_UA,
-                        Referer: 'https://music.youtube.com/',
-                        Origin: 'https://music.youtube.com/',
-                        Range: c.req.header('range') ?? 'bytes=0-',
-                    },
-                    signal,
-                });
-            }
-            catch (err) {
-                if (c.req.raw.signal.aborted)
-                    return new Response(null, { status: 499 });
-                logger.error({ err }, '[music] audio upstream failed');
-                return c.json({ error: 'Upstream error' }, 502);
-            }
-            if (upstream.status !== 200 && upstream.status !== 206) {
+            for (let attempt = 0; attempt < 3; attempt++) {
+                if (attempt === 1)
+                    umpSessions.delete(videoId);
+                if (attempt === 2) {
+                    audioCache.delete(videoId);
+                    umpSessions.delete(videoId);
+                    resetPoTokens(videoId);
+                }
+                let entry;
                 try {
-                    await upstream.body?.cancel();
+                    entry = await decipherAudio(videoId);
                 }
                 catch {
-                    // ignore
+                    return c.json({ error: 'No stream available' }, 502);
                 }
-                audioCache.delete(videoId);
-                return c.json({ error: 'Upstream error' }, 502);
-            }
-            const headers = new Headers();
-            for (const name of PASSTHROUGH_HEADERS) {
-                const value = upstream.headers.get(name);
-                if (value)
-                    headers.set(name === 'content-type' ? 'Content-Type' : name, value);
-            }
-            if (!headers.get('Content-Type'))
+                const clen = /[?&]clen=(\d+)/.exec(entry.url)?.[1];
+                if (clen && !audioTotalCache.has(videoId))
+                    audioTotalCache.set(videoId, Number(clen));
+                const [rangeStart, rangeEnd] = boundWindow(c.req.header('range') ?? null, videoId);
+                const session = getUmpSession(videoId);
+                let pot = '';
+                try {
+                    pot = await mintPoToken(videoId);
+                }
+                catch (err) {
+                    logger.warn({ err }, '[music] PoToken mint failed, trying without attestation');
+                }
+                const upstreamUrl = `${entry.url}&cpn=${session.cpn}&cver=${UMP_CVER}` +
+                    `&range=${rangeStart}-${rangeEnd}&rn=${session.rn}&rbuf=0` +
+                    (pot ? `&pot=${encodeURIComponent(pot)}` : '') +
+                    `&ump=1&srfvp=1`;
+                session.rn += 1;
+                let raw;
+                try {
+                    const cookie = getMusicCookie();
+                    const upstream = await fetch(upstreamUrl, {
+                        method: 'POST',
+                        headers: {
+                            'User-Agent': UPSTREAM_UA,
+                            Referer: 'https://music.youtube.com/',
+                            Origin: 'https://music.youtube.com/',
+                            ...(cookie ? { Cookie: cookie } : {}),
+                        },
+                        body: 'x\x00',
+                        signal,
+                    });
+                    if (upstream.status !== 200) {
+                        try {
+                            await upstream.body?.cancel();
+                        }
+                        catch {
+                            // ignore
+                        }
+                        continue;
+                    }
+                    raw = Buffer.from(await upstream.arrayBuffer());
+                }
+                catch (err) {
+                    if (c.req.raw.signal.aborted)
+                        return new Response(null, { status: 499 });
+                    logger.error({ err }, '[music] audio upstream failed');
+                    continue;
+                }
+                const parsed = parseUmpResponse(raw, session.carry);
+                session.carry = parsed.carry;
+                if (parsed.status === 3) {
+                    logger.warn({ videoId }, '[music] stream protection blocked, refreshing token');
+                    resetPoTokens(videoId);
+                    umpSessions.delete(videoId);
+                    continue;
+                }
+                if (parsed.media.length === 0)
+                    continue;
+                const total = audioTotalCache.get(videoId);
+                const headers = new Headers();
                 headers.set('Content-Type', entry.mimeType || 'audio/webm');
-            headers.set('Accept-Ranges', 'bytes');
-            headers.set('Access-Control-Allow-Origin', '*');
-            if (!upstream.body) {
-                return c.json({ error: 'Upstream error' }, 502);
+                headers.set('Content-Length', String(parsed.media.length));
+                if (total) {
+                    headers.set('Content-Range', `bytes ${rangeStart}-${rangeStart + parsed.media.length - 1}/${total}`);
+                }
+                headers.set('Accept-Ranges', 'bytes');
+                headers.set('Access-Control-Allow-Origin', '*');
+                return new Response(parsed.media, { status: 206, headers });
             }
-            return new Response(upstream.body, { status: upstream.status, headers });
+            logger.warn({ videoId }, '[music] audio upstream gave no media after retries');
+            return c.json({ error: 'Upstream error' }, 502);
         }
         catch (err) {
             if (c.req.raw.signal.aborted)

package/server/dist/hono/proxy.js

@@ -6,7 +6,7 @@ import fs from 'fs';
 import logger from '../logger.js';
 import { buildCfClearanceCookie, sanitizeCfClearance } from '../utils/cookie.utils.js';
 import { isSafeExternalUrl } from '../utils/security.utils.js';
-import { fetchWithRetry } from '../utils/http.utils.js';
+import { fetchWithRetry, linkAbort, setProxyHeaders } from '../utils/http.utils.js';
 import { MEGAPLAY_ORIGIN, isNexabloomMasterUrl, signNexabloomMasterUrl, } from '../utils/megaplay.utils.js';
 const proxyCache = new AppCache({ ttlSeconds: 30, maxKeys: 500 });
 function assTimeToVtt(value) {
@@ -299,9 +299,6 @@ function placeholderSvg() {
     return null;
 }
 const PROXY_UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:126.0) Gecko/20100101 Firefox/126.0';
-function linkAbort(signal, abort) {
-    signal.addEventListener('abort', () => abort.abort(), { once: true });
-}
 export function registerProxy(app) {
     app.get('/api/proxy', async (c) => {
         const url = c.req.query('url');
@@ -463,16 +460,7 @@ export function registerProxy(app) {
                     const isVtt = urlStr.endsWith('.vtt') || urlStr.includes('.vtt?');
                     const outHeaders = new Headers();
                     outHeaders.set('Content-Type', isVtt ? 'text/vtt; charset=utf-8' : ct || 'application/octet-stream');
-                    const cl = resp.headers['content-length'];
-                    if (cl)
-                        outHeaders.set('Content-Length', cl);
-                    const cr = resp.headers['content-range'];
-                    if (cr)
-                        outHeaders.set('Content-Range', cr);
-                    const ar = resp.headers['accept-ranges'];
-                    if (ar)
-                        outHeaders.set('Accept-Ranges', ar);
-                    outHeaders.set('Access-Control-Allow-Origin', '*');
+                    setProxyHeaders(outHeaders, (name) => resp.headers[name]);
                     return new Response(resp.body, {
                         status: resp.statusCode,
                         headers: outHeaders,
@@ -516,16 +504,7 @@ export function registerProxy(app) {
                     const ct = upstream.headers.get('content-type');
                     const outHeaders = new Headers();
                     outHeaders.set('Content-Type', isVtt ? 'text/vtt; charset=utf-8' : ct || 'application/octet-stream');
-                    const cl = upstream.headers.get('content-length');
-                    if (cl)
-                        outHeaders.set('Content-Length', cl);
-                    const cr = upstream.headers.get('content-range');
-                    if (cr)
-                        outHeaders.set('Content-Range', cr);
-                    const ar = upstream.headers.get('accept-ranges');
-                    if (ar)
-                        outHeaders.set('Accept-Ranges', ar);
-                    outHeaders.set('Access-Control-Allow-Origin', '*');
+                    setProxyHeaders(outHeaders, (name) => upstream.headers.get(name));
                     if (!upstream.body) {
                         return c.text('Upstream error', 502);
                     }

package/server/dist/hono/tv.js

@@ -1,34 +1,7 @@
 import logger from '../logger.js';
-import { parseJsonBody } from '../utils/http.utils.js';
-import { getTmdbKey, TMDB_BASE, TMDB_IMAGE } from '../lib/tmdb.js';
+import { linkAbort, setProxyHeaders } from '../utils/http.utils.js';
 import { URL } from 'url';
 import { isSafeExternalUrl } from '../utils/security.utils.js';
-async function resolveTvMeta(mediaType, numericTmdbId, partial) {
-    const meta = { ...partial };
-    if (meta.title && meta.imdbId && meta.year)
-        return meta;
-    try {
-        const tmdbKey = await getTmdbKey();
-        if (tmdbKey) {
-            const tmdbRes = await fetch(`${TMDB_BASE}/${mediaType}/${numericTmdbId}?api_key=${tmdbKey}&append_to_response=external_ids`, { headers: { 'User-Agent': 'Mozilla/5.0' }, signal: AbortSignal.timeout(4000) });
-            if (tmdbRes.ok) {
-                const d = await parseJsonBody(tmdbRes);
-                if (!meta.title)
-                    meta.title = d.title || d.name || '';
-                if (!meta.year)
-                    meta.year = (d.release_date || d.first_air_date || '').split('-')[0] || '';
-                if (!meta.imdbId)
-                    meta.imdbId = d.external_ids?.imdb_id || d.imdb_id || '';
-                if (mediaType === 'tv' && d.number_of_seasons)
-                    meta.totalSeasons = String(d.number_of_seasons);
-            }
-        }
-    }
-    catch {
-        // ignore
-    }
-    return meta;
-}
 function proxiedMediaUrl(targetUrl, refererStr) {
     return `/api/tv/stream-proxy?url=${encodeURIComponent(targetUrl)}&referer=${encodeURIComponent(refererStr)}`;
 }
@@ -59,20 +32,6 @@ export function isPlaylistBody(body) {
             .trimStart()
             .startsWith('#EXTM3U'));
 }
-function toSearchResult(item, type) {
-    return {
-        id: item.id,
-        title: item.title || item.name || '',
-        year: (item.release_date || item.first_air_date || '').split('-')[0],
-        type,
-        image: item.poster_path ? `${TMDB_IMAGE}/w500${item.poster_path}` : '',
-        backdrop: item.backdrop_path ? `${TMDB_IMAGE}/w780${item.backdrop_path}` : '',
-        overview: item.overview || '',
-        vote_average: item.vote_average || 0,
-        adult: item.adult === true,
-        genre_ids: item.genre_ids || [],
-    };
-}
 export function registerTv(app, getApiCache, getTvProvider) {
     app.get('/api/tv/embed/:provider/:type/:tmdbId', async (c) => {
         const provider = c.req.param('provider');
@@ -117,10 +76,7 @@ export function registerTv(app, getApiCache, getTvProvider) {
         }
         const abort = new AbortController();
         const timeout = setTimeout(() => abort.abort(), 30000);
-        c.req.raw.signal.addEventListener('abort', () => {
-            clearTimeout(timeout);
-            abort.abort();
-        }, { once: true });
+        linkAbort(c.req.raw.signal, abort);
         try {
             const headers = {
                 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
@@ -137,18 +93,9 @@ export function registerTv(app, getApiCache, getTvProvider) {
                 return c.text('Upstream error', (status || 502));
             }
             const contentType = fetchResp.headers.get('content-type') || 'application/octet-stream';
-            const contentLength = fetchResp.headers.get('content-length');
-            const contentRange = fetchResp.headers.get('content-range');
-            const acceptRanges = fetchResp.headers.get('accept-ranges');
             const outHeaders = new Headers();
             outHeaders.set('Content-Type', contentType);
-            if (contentLength)
-                outHeaders.set('Content-Length', contentLength);
-            if (contentRange)
-                outHeaders.set('Content-Range', contentRange);
-            if (acceptRanges)
-                outHeaders.set('Accept-Ranges', acceptRanges);
-            outHeaders.set('Access-Control-Allow-Origin', '*');
+            setProxyHeaders(outHeaders, (name) => fetchResp.headers.get(name));
             outHeaders.set('Connection', 'keep-alive');
             if (urlStr.includes('.m3u8') || /mpegurl|m3u8/i.test(contentType)) {
                 const body = await fetchResp.text();

package/server/dist/lib/mal.js

@@ -603,9 +603,10 @@ export async function enrichCardTitles(store, items) {
 export async function malSearchMedia(store, options = {}, enrichTitles = true) {
     const { query, page = 1, format, status, season, seasonYear, genre, genre_in, genre_not_in, averageScore_greater, episodes_greater, isAdult, sort, } = options;
     const params = new URLSearchParams();
-    const hasQuery = !!query?.trim();
-    if (hasQuery)
-        params.set('q', query.trim());
+    const trimmedQuery = query?.trim();
+    const hasQuery = !!trimmedQuery;
+    if (trimmedQuery)
+        params.set('q', trimmedQuery);
     params.set('cat', 'anime');
     if (page > 1)
         params.set('show', String((page - 1) * 50));