@serifpersia/dango 3.4.4 → 3.4.6

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) {
@@ -82,6 +82,50 @@ function assToVtt(body) {
         return null;
     return `WEBVTT\n\n${cues.join('\n\n')}\n`;
 }
+const SUB_WRAP_AT = 50;
+function splitBalancedCueLine(line) {
+    const words = line.split(/\s+/).filter((w) => w.length > 0);
+    if (words.length < 2)
+        return [line];
+    const total = words.join(' ').length;
+    if (total <= SUB_WRAP_AT)
+        return [line];
+    const target = total / 2;
+    let acc = words[0]?.length ?? 0;
+    let best = 1;
+    let bestDiff = Math.abs(acc - target);
+    for (let i = 1; i < words.length; i++) {
+        acc += 1 + (words[i]?.length ?? 0);
+        const diff = Math.abs(acc - target);
+        if (diff < bestDiff) {
+            bestDiff = diff;
+            best = i + 1;
+        }
+    }
+    if (best <= 0 || best >= words.length)
+        return [line];
+    return [words.slice(0, best).join(' '), words.slice(best).join(' ')];
+}
+function rewrapVttCues(vtt) {
+    const blocks = vtt.replace(/\r\n/g, '\n').split(/\n\n+/);
+    return blocks
+        .map((block, idx) => {
+        if (idx === 0 && /^\s*WEBVTT/i.test(block))
+            return block;
+        const lines = block.split('\n');
+        const tIdx = lines.findIndex((l) => l.includes('-->'));
+        if (tIdx < 0)
+            return block;
+        const payload = lines.slice(tIdx + 1).filter((l) => l.trim() !== '');
+        if (payload.length !== 1)
+            return block;
+        const split = splitBalancedCueLine((payload[0] ?? '').trim());
+        if (split.length < 2)
+            return block;
+        return [...lines.slice(0, tIdx + 1), ...split].join('\n');
+    })
+        .join('\n\n');
+}
 const KWIK_DOMAINS = new Set(['kwik.cx', 'kwik.si', 'kwik.pro']);
 const ANIMEPAHE_URL = 'https://animepahe.pw/';
 const VAULT_CDN_HOSTS = new Set(['uwucdn.top', 'owocdn.top']);
@@ -159,6 +203,20 @@ function nexabloomFallbackUrls(urlStr) {
     }
     return urls;
 }
+async function fetchNexabloomFallback(urlStr, signal, attempt, isOk) {
+    let last = null;
+    for (const candidate of nexabloomFallbackUrls(urlStr)) {
+        if (signal.aborted)
+            break;
+        const r = await attempt(candidate).catch(() => null);
+        if (!r)
+            continue;
+        if (isOk(r))
+            return r;
+        last = r;
+    }
+    return last;
+}
 function isGotScrapingHost(urlStr) {
     try {
         const host = new URL(urlStr).hostname.toLowerCase();
@@ -299,9 +357,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');
@@ -377,24 +432,15 @@ export function registerProxy(app) {
                     headers.set('Access-Control-Allow-Origin', '*');
                     return new Response(cached, { headers });
                 }
-                const resp = await (async () => {
-                    let last = null;
-                    for (const candidate of nexabloomFallbackUrls(urlStr)) {
-                        const attempt = await gotScraping({
-                            url: isNexabloomMasterUrl(candidate) ? signNexabloomMasterUrl(candidate) : candidate,
-                            method: 'GET',
-                            headers,
-                            responseType: 'text',
-                            timeout: { request: 30000 },
-                            followRedirect: true,
-                            throwHttpErrors: false,
-                        });
-                        last = attempt;
-                        if (attempt.statusCode === 200 || attempt.statusCode === 206)
-                            return attempt;
-                    }
-                    return last;
-                })();
+                const resp = await fetchNexabloomFallback(urlStr, abort.signal, (candidate) => gotScraping({
+                    url: isNexabloomMasterUrl(candidate) ? signNexabloomMasterUrl(candidate) : candidate,
+                    method: 'GET',
+                    headers,
+                    responseType: 'text',
+                    timeout: { request: 30000 },
+                    followRedirect: true,
+                    throwHttpErrors: false,
+                }), (attempt) => attempt.statusCode === 200 || attempt.statusCode === 206);
                 if (!resp || (resp.statusCode !== 200 && resp.statusCode !== 206)) {
                     return c.text('Upstream error', (resp?.statusCode || 502));
                 }
@@ -441,21 +487,15 @@ export function registerProxy(app) {
                 if (isGotScrapingHost(urlStr)) {
                     if (range)
                         headers['Range'] = range;
-                    let resp = null;
-                    for (const candidate of nexabloomFallbackUrls(urlStr)) {
-                        const attempt = await gotScraping({
-                            url: candidate,
-                            method: 'GET',
-                            headers,
-                            responseType: 'buffer',
-                            timeout: { request: 30000 },
-                            followRedirect: true,
-                            throwHttpErrors: false,
-                        });
-                        resp = attempt;
-                        if (attempt.statusCode === 200 || attempt.statusCode === 206)
-                            break;
-                    }
+                    const resp = await fetchNexabloomFallback(urlStr, abort.signal, (candidate) => gotScraping({
+                        url: candidate,
+                        method: 'GET',
+                        headers,
+                        responseType: 'buffer',
+                        timeout: { request: 30000 },
+                        followRedirect: true,
+                        throwHttpErrors: false,
+                    }), (attempt) => attempt.statusCode === 200 || attempt.statusCode === 206);
                     if (!resp || (resp.statusCode !== 200 && resp.statusCode !== 206)) {
                         return c.text('Upstream error', (resp?.statusCode || 502));
                     }
@@ -463,31 +503,16 @@ 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,
                     });
                 }
                 else {
-                    let upstream = null;
-                    for (const candidate of nexabloomFallbackUrls(urlStr)) {
-                        if (abort.signal.aborted)
-                            break;
-                        try {
-                            const attempt = await fetchWithRetry(candidate, { method: 'GET', headers }, { retries: 3, timeoutMs: 30000, signal: abort.signal });
-                            upstream = attempt;
-                            if (attempt.status === 200 || attempt.status === 206)
-                                break;
+                    const upstream = await fetchNexabloomFallback(urlStr, abort.signal, async (candidate) => {
+                        const attempt = await fetchWithRetry(candidate, { method: 'GET', headers }, { retries: 3, timeoutMs: 30000, signal: abort.signal });
+                        if (attempt.status !== 200 && attempt.status !== 206) {
                             try {
                                 await attempt.body?.cancel();
                             }
@@ -495,10 +520,8 @@ export function registerProxy(app) {
                                 // ignore
                             }
                         }
-                        catch {
-                            // ignore
-                        }
-                    }
+                        return attempt;
+                    }, (attempt) => attempt.status === 200 || attempt.status === 206);
                     if (!upstream) {
                         return c.text('Upstream error', 502);
                     }
@@ -516,16 +539,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);
                     }
@@ -670,6 +684,12 @@ export function registerProxy(app) {
             headers.set('Cache-Control', cacheControl);
             return headers;
         };
+        const subtitleError = (text) => {
+            const headers = new Headers();
+            headers.set('Access-Control-Allow-Origin', '*');
+            headers.set('Cache-Control', 'no-store');
+            return new Response(text, { status: 502, headers });
+        };
         try {
             const headers = buildHeaders();
             let result = await fetchText(subUrl, 1);
@@ -681,10 +701,7 @@ export function registerProxy(app) {
                     return new Response(null, { status: 499 });
             }
             if (!result || !result.body) {
-                const headers = new Headers();
-                headers.set('Access-Control-Allow-Origin', '*');
-                headers.set('Cache-Control', 'no-store');
-                return new Response('Subtitle upstream error', { status: 502, headers });
+                return subtitleError('Subtitle upstream error');
             }
             const body = result.body;
             const baseForSegments = innerRawUrl || subUrl;
@@ -730,32 +747,30 @@ export function registerProxy(app) {
                     }
                 }
                 if (parts.length === 0) {
-                    const headers = new Headers();
-                    headers.set('Access-Control-Allow-Origin', '*');
-                    headers.set('Cache-Control', 'no-store');
-                    return new Response('Subtitle playlist empty', { status: 502, headers });
+                    return subtitleError('Subtitle playlist empty');
                 }
-                return new Response(`WEBVTT\n\n${parts.join('\n\n')}\n`, {
+                return new Response(rewrapVttCues(`WEBVTT\n\n${parts.join('\n\n')}\n`), {
                     headers: vttHeaders('public, max-age=86400'),
                 });
             }
             if (/^\s*WEBVTT/i.test(body)) {
-                return new Response(body, { headers: vttHeaders('public, max-age=86400') });
+                return new Response(rewrapVttCues(body), {
+                    headers: vttHeaders('public, max-age=86400'),
+                });
             }
             const vttFromAss = assToVtt(body);
             if (vttFromAss) {
-                return new Response(vttFromAss, { headers: vttHeaders('public, max-age=86400') });
+                return new Response(rewrapVttCues(vttFromAss), {
+                    headers: vttHeaders('public, max-age=86400'),
+                });
             }
-            return new Response(`WEBVTT\n\n${body.replace(/\r\n/g, '\n').replace(/(\d{2}:\d{2}:\d{2}),(\d{3})/g, '$1.$2')}`, { headers: vttHeaders('public, max-age=86400') });
+            return new Response(rewrapVttCues(`WEBVTT\n\n${body.replace(/\r\n/g, '\n').replace(/(\d{2}:\d{2}:\d{2}),(\d{3})/g, '$1.$2')}`), { headers: vttHeaders('public, max-age=86400') });
         }
         catch {
             if (abort.signal.aborted)
                 return new Response(null, { status: 499 });
             logger.warn({ url: subUrl }, '[subtitle-proxy] failed');
-            const headers = new Headers();
-            headers.set('Access-Control-Allow-Origin', '*');
-            headers.set('Cache-Control', 'no-store');
-            return new Response('Subtitle upstream error', { status: 502, headers });
+            return subtitleError('Subtitle upstream error');
         }
     });
     app.get('/api/image-proxy', async (c) => {
@@ -779,12 +794,7 @@ export function registerProxy(app) {
         try {
             if (targetUrl.includes('animepahe')) {
                 refererValue = 'https://animepahe.pw/';
-                const rawCookie = cookie || '';
-                let sanitized = rawCookie.trim();
-                sanitized = sanitized.replace(/^cf_clearance/i, '');
-                sanitized = sanitized.replace(/^[:=]\s*/, '');
-                sanitized = sanitized.replace(/["']/g, '').trim();
-                headers['Cookie'] = `cf_clearance=${sanitized}`;
+                headers['Cookie'] = `cf_clearance=${sanitizeCfClearance(cookie)}`;
             }
             else if (targetUrl.includes('anilist.co')) {
                 refererValue = 'https://anilist.co/';
@@ -800,13 +810,9 @@ export function registerProxy(app) {
             }
             else if (targetUrl.includes('weeabo0.xyz')) {
                 refererValue = 'https://japaneseasmr.com/';
-                const rawCookie = cookie || '';
-                let sanitized = rawCookie.trim();
-                sanitized = sanitized.replace(/^cf_clearance/i, '');
-                sanitized = sanitized.replace(/^[:=]\s*/, '');
-                sanitized = sanitized.replace(/["']/g, '').trim();
-                if (sanitized)
-                    headers['Cookie'] = `cf_clearance=${sanitized}`;
+                const jasmrCookieHeader = buildCfClearanceCookie(cookie);
+                if (jasmrCookieHeader)
+                    headers['Cookie'] = jasmrCookieHeader;
                 const uaParam = ua || '';
                 if (uaParam)
                     headers['User-Agent'] = uaParam;

package/server/dist/hono/tv.js

@@ -1,38 +1,11 @@
 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)}`;
 }
-export function rewriteTvPlaylist(body, baseUrl, refererStr) {
+function rewriteTvPlaylist(body, baseUrl, refererStr) {
     return body
         .split('\n')
         .map((line) => {
@@ -50,7 +23,7 @@ export function rewriteTvPlaylist(body, baseUrl, refererStr) {
     })
         .join('\n');
 }
-export function isPlaylistBody(body) {
+function isPlaylistBody(body) {
     return (body.length >= 7 &&
         body
             .subarray(0, 32)
@@ -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();