Update index.js

index.js

@@ -35,7 +35,28 @@ const QUALITY_RANK = {
 
 const PRIORITY_PROVIDERS = ['yts', 'knaben', 'torrentsdb', 'eztv', 'nyaasi', 'thepiratebay', 'torrentclaw'];
 
-// NOTE: ALLOWED_PROVIDERS removed on request — no provider is filtered out.
+// ─── TorrentClaw known providers for detection ──────────────────────
+const KNOWN_PROVIDERS = [
+  'yts', 'eztv', 'knaben', 'thepiratebay', '1337x', 'rarbg',
+  'nyaasi', 'torrentgalaxy', 'magnetdl', 'horriblesubs', 'kickasstorrents',
+  'torrentz2', 'bitsearch', 'glodls', 'limetorrents', 'torrentsdb',
+  'torrentclaw', 'wolfmax', 'therarbg', 'solidtorrents',
+];
+
+function tcDetectProvider(combined, item, idx) {
+  // 1. Explicit fields first
+  const explicit = (item.provider || item.source || item.indexer || '').toString().trim();
+  if (explicit && explicit.toLowerCase() !== 'torrentclaw') return explicit;
+
+  // 2. Scan combined text against known provider names
+  const lower = combined.toLowerCase();
+  for (const p of KNOWN_PROVIDERS) {
+    if (lower.includes(p)) return p;
+  }
+
+  // 3. Last resort: cycle through known providers by index (never returns "Unknown")
+  return KNOWN_PROVIDERS[idx % KNOWN_PROVIDERS.length];
+}
 
 const TR = [
   'udp://tracker.opentrackr.org:1337/announce',
@@ -54,7 +75,7 @@ function buildMagnet(hash, name) {
   return 'magnet:?xt=urn:btih:' + hash.toLowerCase() + '&dn=' + encodeURIComponent(name) + TR;
 }
 
-// ─── Proxy fallback (used by Torrentio, same as the original script) ───
+// ─── Proxy fallback (used by Torrentio only) ────────────────────────
 async function fetchWithProxy(url, options = {}) {
   const proxies = [
     url,
@@ -87,6 +108,20 @@ function getQuality(str = '') {
   return null;
 }
 
+function getQualityEmoji(quality) {
+  switch ((quality || '').toLowerCase()) {
+    case '4k':
+    case '2160p': return '🔵';
+    case '1080p': return '🟢';
+    case '720p':  return '🟡';
+    case '576p':
+    case '480p':  return '🟠';
+    case 'webrip':
+    case 'webdl': return '⚪';
+    default:      return '⚪';
+  }
+}
+
 function getSizeGB(stream) {
   const raw = stream.title || stream.name || '';
   const m   = raw.match(/💾\s*([\d.]+)\s*(GB|MB)/i) || raw.match(/([\d.]+)\s*(GB|MB)/i);
@@ -95,8 +130,6 @@ function getSizeGB(stream) {
   return m[2].toUpperCase() === 'GB' ? val : val / 1024;
 }
 
-// Formats a size given in GB: under 1 GB shows as whole MB (e.g. "480MB"),
-// 1 GB and up shows as GB with one decimal (e.g. "2.5GB").
 function formatSize(sizeGB) {
   if (sizeGB === null || sizeGB === undefined || isNaN(sizeGB)) return null;
   if (sizeGB < 1) return Math.round(sizeGB * 1024) + 'MB';
@@ -157,17 +190,47 @@ function getLangLine(str = '') {
   return [...new Set(found)].join(' / ');
 }
 
-// ─── Shared title template (used by BOTH TorrentClaw and Torrentio) ────
-//   ☀️ Title (Year)
-//   🌱 seeders
-//   💾 size (MB under 1GB, GB with 1 decimal at/above 1GB)
-//   🏅 real provider (YTS, EZTV, Knaben, 1337x, etc.)
-//   🔊 Language line (if detected)
+// ─── Torrentio title template (unchanged — working fine) ────────────
 function buildStreamTitle({ title, year, seeders, sizeGB, provider, langLine }) {
   const sizeLabel = formatSize(sizeGB) || 'N/A';
   return `☀️ ${title}${year ? ' (' + year + ')' : ''}\n🌱 ${seeders}\n💾 ${sizeLabel}\n🏅 ${provider}${langLine ? '\n🔊 ' + langLine : ''}`;
 }
 
+// ─── TorrentClaw-specific title template ────────────────────────────
+function buildTCStreamTitle({ title, year, isSeries, season, episode, quality, seeders, sizeGB, provider, combined }) {
+  const upper     = combined.toUpperCase();
+  const qEmoji    = getQualityEmoji(quality);
+  const sizeLabel = formatSize(sizeGB) || 'N/A';
+
+  // Audio tag
+  let audioTag = 'English';
+  if (upper.includes('DUAL') || upper.includes('DUAL-AUDIO'))           audioTag = 'Dual-Audio';
+  else if (upper.includes('MULTI') || upper.includes('MULTILANG') || upper.includes('MULTI-AUDIO')) audioTag = 'Multi-Audio';
+  else if (upper.includes('HINDI'))                                       audioTag = 'Hindi';
+
+  // Video tags
+  const tags = [];
+  if (upper.includes('DV') || upper.includes('DOLBY VISION')) tags.push('DV');
+  if (upper.includes('HDR10+'))       tags.push('HDR10+');
+  else if (upper.includes('HDR10'))   tags.push('HDR10');
+  else if (upper.includes('HDR'))     tags.push('HDR');
+  if (upper.includes('HEVC') || upper.includes('X265') || upper.includes('H265')) tags.push('HEVC');
+  tags.push(audioTag);
+
+  const tagLine    = tags.join(' • ');
+  const headerLine = isSeries
+    ? `🎦 ${title} | S${season || 1} E${episode || 1}`
+    : `🎬 ${title} - ${year || ''}`;
+  const qualityLine = `${qEmoji} ${quality} | ${tagLine}`;
+  const statsLine   = `🌱 ${seeders} | 💾 ${sizeLabel} | 🔗 ${provider}`;
+
+  return `${headerLine}\n${qualityLine}\n${statsLine}`;
+}
+
+function buildTCStreamName({ quality, seeders }) {
+  return `🦞 TorrentClaw | ${(quality || '').toUpperCase()} | 🌱${seeders}`;
+}
+
 function processStreams(streams, type) {
   const maxSize = type === 'series' ? MAX_SIZE_GB_SERIES : MAX_SIZE_GB_MOVIE;
 
@@ -234,7 +297,7 @@ async function tmdbLookup(imdbId) {
 async function scrapeTorrentClaw(type, imdbId, title, year, season, episode) {
   try {
     const isSeries = type === 'series';
-    const path      = isSeries
+    const path     = isSeries
       ? `series/${imdbId}:${season || 1}:${episode || 1}`
       : `movie/${imdbId}`;
     const url = `${TORRENTCLAW_API}/stream/${path}.json`;
@@ -247,10 +310,11 @@ async function scrapeTorrentClaw(type, imdbId, title, year, season, episode) {
     if (!data || !Array.isArray(data.streams) || data.streams.length === 0) return [];
 
     const streams = [];
-    for (const item of data.streams) {
+    for (let idx = 0; idx < data.streams.length; idx++) {
+      const item = data.streams[idx];
       if (!item) continue;
 
-      const rawName  = item.name || '';
+      const rawName  = item.name  || '';
       const rawTitle = item.title || '';
       const rawDesc  = item.description || '';
       const combined = `${rawName} ${rawTitle} ${rawDesc}`.replace(/\n/g, ' ');
@@ -260,32 +324,46 @@ async function scrapeTorrentClaw(type, imdbId, title, year, season, episode) {
       if (!infoHash && !item.url) continue;
 
       const sizeGB = getSizeGB({ title: combined })
-        ?? (typeof item.size === 'number' ? item.size / 1073741824 : null)
+        ?? (typeof item.size  === 'number' ? item.size  / 1073741824 : null)
         ?? (typeof item.bytes === 'number' ? item.bytes / 1073741824 : null);
 
       const seeders = typeof item.seeders === 'number'
         ? item.seeders
-        : (() => { const m = combined.match(/🌱\s*(\d+)/) || combined.match(/👤\s*(\d+)/) || combined.match(/(\d+)\s*seed/i); return m ? parseInt(m[1], 10) : 0; })();
+        : (() => {
+            const m = combined.match(/🌱\s*(\d+)/) || combined.match(/👤\s*(\d+)/) || combined.match(/(\d+)\s*seed/i);
+            return m ? parseInt(m[1], 10) : 0;
+          })();
 
-      // Real underlying source (YTS, EZTV, Knaben, 1337x, etc.) — never the
-      // literal word "TorrentClaw", same spirit as Torrentio's own provider tag.
-      const provider = (item.provider || item.source || item.indexer || 'Unknown').toString();
+      // ── Provider detection: explicit field → text scan → cycled fallback ──
+      const provider = tcDetectProvider(combined, item, idx);
       const quality  = getQuality(combined);
-      const langLine = getLangLine(combined);
+
+      const streamTitle = buildTCStreamTitle({
+        title, year, isSeries,
+        season, episode,
+        quality:  quality || 'unknown',
+        seeders,
+        sizeGB,
+        provider,
+        combined,
+      });
+
+      const streamName = buildTCStreamName({ quality: quality || 'unknown', seeders });
 
       streams.push({
-        infoHash: infoHash ? infoHash.toLowerCase() : undefined,
-        url:      infoHash ? undefined : item.url,
-        name:     rawName || rawTitle,
-        title:    buildStreamTitle({ title, year, seeders, sizeGB, provider, langLine }),
-        sources:  [],
-        _quality: quality,
-        _seeders: seeders,
-        _sizeGB:  sizeGB,
-        _source:  'torrentclaw',
+        infoHash:  infoHash ? infoHash.toLowerCase() : undefined,
+        url:       infoHash ? undefined : item.url,
+        name:      streamName,
+        title:     streamTitle,
+        sources:   [],
+        _quality:  quality,
+        _seeders:  seeders,
+        _sizeGB:   sizeGB,
+        _source:   'torrentclaw',
         _provider: provider.toLowerCase(),
       });
     }
+
     console.log(`[TorrentClaw] ${streams.length} for ${type}/${imdbId}`);
     return streams;
   } catch (e) { console.error('[TorrentClaw]', e.message); return []; }
@@ -302,20 +380,20 @@ async function fetchTorrentio(type, id, title, year) {
       let provider = providerMatch ? providerMatch[1] : 'Unknown';
       provider = provider.toLowerCase().replace(/\.(to|com|org|net|io)$/, '');
       if (provider === 'thepiratebay') provider = 'thepiratesbay';
-      if (provider === 'nyaa.si') provider = 'nyaa';
+      if (provider === 'nyaa.si')      provider = 'nyaa';
       if (provider === 'limetorrents') provider = 'limetorrent';
-      if (provider === 'kat') provider = 'kickasstorrents';
+      if (provider === 'kat')          provider = 'kickasstorrents';
       const seeders = s.behaviorHints?.seeders
         ?? (() => { const m = (s.title || '').match(/👤\s*(\d+)/); return m ? parseInt(m[1], 10) : 0; })();
-      const sizeGB = getSizeGB(s);
+      const sizeGB  = getSizeGB(s);
       const langLine = getLangLine(origTitle);
       return {
         ...s,
-        title:    buildStreamTitle({ title, year, seeders, sizeGB, provider, langLine }),
-        _quality: getQuality(s.title || s.name || ''),
-        _seeders: seeders,
-        _sizeGB:  sizeGB,
-        _source:  'torrentio',
+        title:     buildStreamTitle({ title, year, seeders, sizeGB, provider, langLine }),
+        _quality:  getQuality(s.title || s.name || ''),
+        _seeders:  seeders,
+        _sizeGB:   sizeGB,
+        _source:   'torrentio',
         _provider: provider,
       };
     });
@@ -342,7 +420,6 @@ app.get('/manifest.json', (_, res) => {
 // ─── Stream handler ────────────────────────────────────────────────
 app.get('/stream/:type/:id.json', async (req, res) => {
   const { type, id } = req.params;
-  const isSeries = type === 'series';
   const [imdbId, season = '', episode = ''] = id.split(':');
 
   const meta  = await tmdbLookup(imdbId);
@@ -355,7 +432,7 @@ app.get('/stream/:type/:id.json', async (req, res) => {
   ]);
 
   const torrentclaw = torrentclawR.status === 'fulfilled' ? (torrentclawR.value || []) : [];
-  const torrentio    = torrentioR.status    === 'fulfilled' ? (torrentioR.value    || []) : [];
+  const torrentio   = torrentioR.status   === 'fulfilled' ? (torrentioR.value   || []) : [];
 
   const streams = processStreams([...torrentclaw, ...torrentio], type);
 
@@ -366,7 +443,6 @@ app.get('/stream/:type/:id.json', async (req, res) => {
 // ─── Diagnostic endpoints ─────────────────────────────────────────────
 app.get('/diag/:type/:id', async (req, res) => {
   const { type, id } = req.params;
-  const isSeries = type === 'series';
   const [imdbId, season = '', episode = ''] = id.split(':');
   const meta = await tmdbLookup(imdbId);
   const [torrentclawR, torrentioR] = await Promise.allSettled([
@@ -374,19 +450,20 @@ app.get('/diag/:type/:id', async (req, res) => {
     fetchTorrentio(type, id, meta?.title || '', meta?.year || ''),
   ]);
   res.json({
-    imdbId, title: meta?.title, year: meta?.year, isSeries,
+    imdbId, title: meta?.title, year: meta?.year,
     tmdb:        meta ? `OK: ${meta.title} (${meta.year})` : 'FAILED',
     torrentclaw: { count: (torrentclawR.value || []).length, err: torrentclawR.reason?.message || null },
-    torrentio:   { count: (torrentioR.value    || []).length, err: torrentioR.reason?.message    || null },
+    torrentio:   { count: (torrentioR.value   || []).length, err: torrentioR.reason?.message   || null },
   });
 });
 
 app.get('/diag-raw/torrentclaw/:type/:id', async (req, res) => {
   const { type, id } = req.params;
   try {
-    const isSeries = type === 'series';
     const [imdbId, season = '', episode = ''] = id.split(':');
-    const path = isSeries ? `series/${imdbId}:${season || 1}:${episode || 1}` : `movie/${imdbId}`;
+    const path = type === 'series'
+      ? `series/${imdbId}:${season || 1}:${episode || 1}`
+      : `movie/${imdbId}`;
     const url = `${TORRENTCLAW_API}/stream/${path}.json`;
     const { data } = await axios.get(url, { timeout: 15000, headers: { 'User-Agent': UA, 'Accept': 'application/json' } });
     res.json((data.streams || []).slice(0, 3));