torrent-online 1.7.2 → 1.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "torrent-online",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "type": "module",
   "description": "Stream .torrent / magnet to VLC or browser — torrent streaming for macOS/Linux without a torrent client. Стрим торрентов в VLC или браузер.",
   "keywords": [

package/wtui.js

@@ -321,7 +321,7 @@ function btihKey(mag) { const m = /btih:([0-9a-fA-F]{40}|[0-9a-fA-F]{32})/.exec(
 
 
 async function searchTPB(q, host = '') {
-  const hosts = ['https://tpb.party', 'https://piratebay.live'];
+  const hosts = ['https://tpb.party', 'https://piratebay.live', 'https://tpbay.site', 'https://piratebay6.org', 'https://thepiratebay3.org'];
   let html = '', lastErr = new Error('TPB: нет ответа');
   for (const h of (host ? [host] : hosts)) {
     try {
@@ -349,12 +349,19 @@ async function searchTPB(q, host = '') {
 }
 
 async function searchRutor(q) {
-  const r = await fetch(`https://rutor.info/search/0/0/0/0/${encodeURIComponent(q)}/`, {
-    headers: { 'user-agent': UA },
-    signal: AbortSignal.timeout(9000),
-  });
-  if (!r.ok) throw new Error(`Rutor: HTTP ${r.status}`);
-  const html = await r.text();
+  const hosts = ['https://rutor.info', 'https://rutor.is', 'https://newrutor.info'];
+  let html = '', lastErr = new Error('Rutor: нет ответа');
+  for (const h of hosts) {
+    try {
+      const r = await fetch(`${h}/search/0/0/0/0/${encodeURIComponent(q)}/`, {
+        headers: { 'user-agent': UA },
+        signal: AbortSignal.timeout(9000),
+      });
+      if (r.ok) { html = await r.text(); lastErr = null; break; }
+      lastErr = new Error(`Rutor: HTTP ${r.status}`);
+    } catch (e) { lastErr = e; }
+  }
+  if (lastErr) throw lastErr;
   const out = [];
   for (const row of html.split('<tr class="gai">').slice(1, 26)) {
     const magRaw = /href="(magnet:[^"]+)"/.exec(row)?.[1];
@@ -586,17 +593,25 @@ video{width:100vw;height:100vh;background:#000;display:block;margin:0}
 var BASE="__BASE__";
 function esc(s){return String(s).replace(/[&<>"']/g,function(c){return {'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[c];});}
 function api(p,body){var o=body?{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify(body)}:undefined;return fetch(BASE+p,o).then(function(r){return r.json();});}
+function addTorrent(mag){
+var box=document.getElementById('torrents');
+var dn=(/dn=([^&]*)/.exec(mag)||[,''])[1];try{dn=decodeURIComponent(dn.replace(/\+/g,' '))}catch(e){}
+var ph=document.createElement('div');ph.className='card';
+ph.innerHTML='<div class=tname>⏳ '+esc(dn||'торрент')+'</div><div class=tmeta>добавляю в клиент…</div>';
+box.prepend(ph);
+api('/api/add',{source:mag}).then(function(d){if(d&&d.error){ph.innerHTML='<div class=tname>⚠ '+esc(d.error)+'</div>';}poll();toTorrents();}).catch(function(e){ph.innerHTML='<div class=tname>⚠ Ошибка /api/add: '+esc(e&&e.message||e)+'</div>';});
+}
 function doSearch(){var q=document.getElementById('q').value.trim();if(!q)return;var box=document.getElementById('results');box.innerHTML='<div class=note>Ищу…</div>';
 api('/api/search?q='+encodeURIComponent(q)).then(function(d){
 var h='';(d.notes||[]).forEach(function(n){h+='<div class=note>⚠ '+esc(n)+'</div>';});
 if(!d.items.length){box.innerHTML=h+'<div class=note>Ничего не найдено</div>';return;}
 h+=d.items.map(function(it){return '<div class=row data-mag="'+esc(it.mag)+'"><span class=tag>'+esc(it.src)+'</span><span class=rname>'+esc(it.name)+'</span>'+(it.size?'<span class=meta>'+esc(it.size)+'</span>':'')+(it.seeds?'<span class=meta>🌱 '+it.seeds+'</span>':'')+'</div>';}).join('');
 box.innerHTML=h;
-[].forEach.call(box.querySelectorAll('.row'),function(r){r.onclick=function(){api('/api/add',{source:r.getAttribute('data-mag')}).then(function(){poll();toTorrents();});};});
+[].forEach.call(box.querySelectorAll('.row'),function(r){r.onclick=function(){addTorrent(r.getAttribute('data-mag'));};});
 }).catch(function(){box.innerHTML='<div class=note>Ошибка поиска</div>';});}
 document.getElementById('go').onclick=doSearch;
 document.getElementById('q').addEventListener('keydown',function(e){if(e.key==='Enter')doSearch();});
-document.getElementById('mag').onclick=function(){var m=prompt('magnet:');if(m&&m.indexOf('magnet:')===0){api('/api/add',{source:m}).then(function(){poll();toTorrents();});}};
+document.getElementById('mag').onclick=function(){var m=prompt('magnet:');if(m&&m.indexOf('magnet:')===0){addTorrent(m);}};
 document.getElementById('tpath').onclick=function(){document.getElementById('tt').click();};
 document.getElementById('tt').onchange=function(){if(this.files&&this.files[0])uploadFile(this.files[0]);this.value='';};
 function uploadFile(f){var nb=document.getElementById('notes');nb.innerHTML='<div class=note>⏳ Загружаю '+esc(f.name)+'…</div>';