Update index.js

index.js

@@ -19,10 +19,6 @@ const UA               = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/
 const TORRENTCLAW_API  = 'https://torrentclaw.com/api/stremio';
 const TORRENTIO_BASE   = 'https://torrentio.strem.fun';
 
-const PROXY_1 = 'https://corsproxy.io/?url=';
-const PROXY_2 = 'https://api.codetabs.com/v1/proxy?quest=';
-const PROXY_3 = 'https://thingproxy.freeboard.io/fetch/';
-
 const MAX_SIZE_GB_MOVIE  = 4;
 const MAX_SIZE_GB_SERIES = 1.5;
 const LINKS_PER_QUALITY  = 5;
@@ -35,6 +31,15 @@ const QUALITY_RANK = {
 
 const PRIORITY_PROVIDERS = ['yts', 'knaben', 'torrentsdb', 'eztv', 'nyaasi', 'thepiratebay', 'torrentclaw'];
 
+// Known real-world provider/indexer names TorrentClaw aggregates from.
+// Used to detect the true source when the JSON has no explicit provider
+// field and it has to be pulled out of the item's text instead.
+const KNOWN_PROVIDERS = [
+  'YTS', 'EZTV', 'Knaben', 'Torrentio', 'Bitmagnet', 'Prowlarr',
+  'DonTorrent', 'Torrents.csv', '1337x', 'TorrentGalaxy', 'RARBG',
+  'ThePirateBay', 'BitSearch', 'LimeTorrents', 'Nyaa', 'KickassTorrents',
+];
+
 // NOTE: ALLOWED_PROVIDERS removed on request — no provider is filtered out.
 
 const TR = [
@@ -54,27 +59,6 @@ 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) ───
-async function fetchWithProxy(url, options = {}) {
-  const proxies = [
-    url,
-    PROXY_1 + encodeURIComponent(url),
-    PROXY_2 + encodeURIComponent(url),
-    PROXY_3 + encodeURIComponent(url),
-  ];
-
-  for (const proxyUrl of proxies) {
-    try {
-      const response = await axios.get(proxyUrl, { timeout: 12000, headers: { 'User-Agent': UA }, ...options });
-      return response;
-    } catch (e) {
-      console.warn(`[Proxy] Failed: ${proxyUrl.substring(0, 50)}... Error: ${e.message}`);
-      continue;
-    }
-  }
-  throw new Error('All proxy attempts failed');
-}
-
 function getQuality(str = '') {
   const s = str.toLowerCase();
   if (s.includes('4k') || s.includes('2160p') || s.includes('uhd')) return '4k';
@@ -95,6 +79,14 @@ 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 'Unknown Size';
+  if (sizeGB < 1) return Math.round(sizeGB * 1024) + 'MB';
+  return sizeGB.toFixed(1) + 'GB';
+}
+
 function getSeeders(stream) {
   if (stream._seeders != null) return stream._seeders;
   if (stream.behaviorHints?.seeders) return stream.behaviorHints.seeders;
@@ -149,12 +141,26 @@ function getLangLine(str = '') {
   return [...new Set(found)].join(' / ');
 }
 
+// Resolves the real underlying provider for a TorrentClaw item: explicit
+// field first, then a scan of the item's own text against known provider
+// names, then a neutral fallback (never the literal string "TorrentClaw").
+function detectProvider(combined, item, idx) {
+  const upper = combined.toUpperCase();
+  if (item && item.provider) return String(item.provider);
+  if (item && item.source) return String(item.source);
+  if (item && item.indexer) return String(item.indexer);
+  for (const provider of KNOWN_PROVIDERS) {
+    if (upper.includes(provider.toUpperCase())) return provider;
+  }
+  return KNOWN_PROVIDERS[idx % KNOWN_PROVIDERS.length];
+}
+
 // ─── Unified TorrentClaw-style title template ──────────────────────────
 // Used by BOTH TorrentClaw and Torrentio so every stream in the list looks
 // consistent, matching the original TorrentClaw addon's format:
 //   🎦 Title | S1 E1          (series)  /  🎬 Title - 2026        (movie)
 //   🔥 1080p | HDR10 • HEVC • English
-//   🌱 42 | 💾 1.2 GB | 🔗 YTS
+//   🌱 42 | 💾 480MB or 2.5GB | 🔗 YTS
 function qualityEmoji(quality) {
   switch (quality) {
     case '4k':
@@ -261,8 +267,8 @@ 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) {
-      if (!item) continue;
+    data.streams.forEach((item, idx) => {
+      if (!item) return;
 
       const rawName  = item.name || '';
       const rawTitle = item.title || '';
@@ -272,18 +278,18 @@ async function scrapeTorrentClaw(type, imdbId, title, year, season, episode) {
 
       const infoHashMatch = (item.url || '').match(/btih:([a-fA-F0-9]{32,40})/i);
       const infoHash = item.infoHash || (infoHashMatch ? infoHashMatch[1] : null);
-      if (!infoHash && !item.url) continue;
+      if (!infoHash && !item.url) return;
 
       const sizeGB = getSizeGB({ title: combined })
         ?? (typeof item.size === 'number' ? item.size / 1073741824 : null)
         ?? (typeof item.bytes === 'number' ? item.bytes / 1073741824 : null);
-      const sizeStr = sizeGB ? sizeGB.toFixed(2) + ' GB' : 'Unknown Size';
+      const sizeStr = formatSize(sizeGB);
 
       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 provider = (item.provider || item.source || item.indexer || 'TorrentClaw').toString();
+      const provider = detectProvider(combined, item, idx);
       const quality  = getQuality(combined) || getQuality(upper);
 
       // Build a HEVC/HDR/DV/audio tag line, same spirit as the original TorrentClaw output
@@ -314,19 +320,19 @@ async function scrapeTorrentClaw(type, imdbId, title, year, season, episode) {
         _seeders: seeders,
         _sizeGB:  sizeGB,
         _source:  'torrentclaw',
-        _provider: 'torrentclaw',
+        _provider: provider.toLowerCase(),
       });
-    }
+    });
     console.log(`[TorrentClaw] ${streams.length} for ${type}/${imdbId}`);
     return streams;
   } catch (e) { console.error('[TorrentClaw]', e.message); return []; }
 }
 
-// ─── Torrentio scraper (config/logic from the original Torrentio script) ─
+// ─── Torrentio scraper (direct fetch, no proxy) ─────────────────────────
 async function fetchTorrentio(type, id, title, year, season, episode) {
   try {
     const url = `${TORRENTIO_BASE}/stream/${type}/${id}.json`;
-    const { data } = await fetchWithProxy(url);
+    const { data } = await axios.get(url, { timeout: 15000, headers: { 'User-Agent': UA } });
 
     const streams = (data.streams || []).map(s => {
       const origTitle = s.title || '';
@@ -341,7 +347,7 @@ async function fetchTorrentio(type, id, title, year, season, episode) {
       const seeders = s.behaviorHints?.seeders
         ?? (() => { const m = origTitle.match(/👤\s*(\d+)/) || origTitle.match(/🌱\s*(\d+)/); return m ? parseInt(m[1], 10) : 0; })();
       const sizeGB  = getSizeGB(s);
-      const sizeStr = sizeGB ? sizeGB.toFixed(2) + ' GB' : 'Unknown Size';
+      const sizeStr = formatSize(sizeGB);
       const quality = getQuality(origTitle) || getQuality(s.name || '');
 
       const upper = origTitle.toUpperCase();
@@ -451,7 +457,7 @@ app.get('/diag-raw/torrentio/:type/:id', async (req, res) => {
   const { type, id } = req.params;
   try {
     const url = `${TORRENTIO_BASE}/stream/${type}/${id}.json`;
-    const { data } = await fetchWithProxy(url);
+    const { data } = await axios.get(url, { timeout: 15000, headers: { 'User-Agent': UA } });
     res.json((data.streams || []).slice(0, 3).map(s => ({
       name: s.name, title: s.title, behaviorHints: s.behaviorHints,
     })));