torrent-online 1.5.5 → 1.5.7

package/package.json

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

package/wtui.js

@@ -565,6 +565,7 @@ button:hover{background:#2a3c58}
 .fin .play{margin-left:6px;padding:0 8px;font-size:12px}
 .picks{margin:6px 0 2px}
 .picks button{font-size:12px;padding:3px 10px}
+body.drop{outline:3px dashed #3b82f6;outline-offset:-10px;background:rgba(59,130,246,.06)}
 .fin .play{margin-left:6px;padding:0 8px;font-size:12px}
 .picks{margin:6px 0 2px}
 .picks button{font-size:12px;padding:3px 10px}
@@ -575,7 +576,7 @@ video{width:100vw;height:100vh;background:#000;display:block;margin:0}
 </style></head><body>
 <header>🦀 <b>TorrentOnline</b></header>
 <div class=wrap>
-<div class=search><input id=q placeholder="Поиск: пацаны 4 сезон · breaking bad · magnet:…" autocomplete=off><button id=go>Искать</button><button id=mag>+ magnet</button><button id=tpath>+ .torrent файл</button></div>
+<div class=search><input id=q placeholder="Поиск: пацаны 4 сезон · breaking bad · magnet:…" autocomplete=off><button id=go>Искать</button><button id=mag>+ magnet</button><button id=tpath>+ .torrent файл</button><input type=file id=tt accept=".torrent,application/x-bittorrent" style=display:none></div>
 <div id=notes></div>
 <div id=results></div>
 <h3>Торренты</h3>
@@ -596,7 +597,18 @@ box.innerHTML=h;
 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('tpath').onclick=function(){var p=prompt('Путь к .torrent, напр. /Users/you/Downloads/torrent.torrent');if(p&&p.trim()){api('/api/add',{source:p.trim()}).then(function(){poll();toTorrents();});}};
+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>';
+fetch(BASE+'/api/add-file',{method:'POST',headers:{'content-type':'application/octet-stream'},body:f}).then(function(r){return r.json()}).then(function(d){nb.innerHTML=d.error?'<div class=note>⚠ '+esc(d.error)+'</div>':'';poll();toTorrents();}).catch(function(){nb.innerHTML='<div class=note>⚠ Ошибка загрузки</div>';});}
+document.addEventListener('dragover',function(e){e.preventDefault();document.body.classList.add('drop');});
+document.addEventListener('dragleave',function(e){if(e.target===document.body||e.relatedTarget===null)document.body.classList.remove('drop');});
+document.addEventListener('drop',function(e){e.preventDefault();document.body.classList.remove('drop');
+var fs=e.dataTransfer.files||[];
+for(var i=0;i<fs.length;i++){if(/\.torrent$/i.test(fs[i].name)){uploadFile(fs[i]);return;}}
+var t=(e.dataTransfer.getData('text/uri-list')||'')+(e.dataTransfer.getData('text/plain')||'');
+var mm=t.match(/magnet:\?[^\s,]+/);if(mm){api('/api/add',{source:'magnet:'+mm[0]}).then(function(){poll();toTorrents();});}
+});
 function render(list){var box=document.getElementById('torrents');
 if(!list.length){box.innerHTML='<div class=note>Пусто. Найди торрент и кликни по строке.</div>';return;}
 box.innerHTML=list.map(function(t){
@@ -641,6 +653,7 @@ function makeWebServer(client, st, opts, cacheDir, base) {
 
 async function webReq(req, res, client, st, opts, cacheDir, base) {
   const u = new URL(req.url, 'http://127.0.0.1');
+  const ensureSel = (e, i) => { const f = e?.t.files[i]; if (f && !e.sel.has(i)) { e.sel.add(i); try { f.select(); } catch {} } };
   let p = u.pathname;
   if (base) {
     if (p !== base && !p.startsWith(base + '/')) { res.statusCode = 404; res.end('not found'); return; }
@@ -658,6 +671,22 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
     const { items, notes } = await searchIndexers(q);
     return json(200, { items, notes });
   }
+  if (p === '/api/add-file' && req.method === 'POST') {
+    const chunks = [];
+    let size = 0;
+    await new Promise((resolve, reject) => {
+      req.on('data', c => { chunks.push(c); size += c.length; if (size > 5e6) { req.destroy(); reject(new Error('файл слишком большой')); } });
+      req.on('end', resolve);
+      req.on('error', reject);
+    });
+    const buf = Buffer.concat(chunks);
+    if (!buf.length) return json(400, { error: 'пустой файл' });
+    const id = st.nextId++;
+    st.pending.push(id);
+    try { client.add(buf, { path: cacheDir }); }
+    catch (e) { st.pending.pop(); return json(400, { error: String((e && e.message) || e) }); }
+    return json(200, { id });
+  }
   if (p === '/api/add' && req.method === 'POST') {
     const b = await readBody(req);
     const source = String(b.source || '');
@@ -724,6 +753,7 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
     const e = st.torrents.get(Number(mS[1]));
     const f = e?.t.files[Number(mS[2])];
     if (!f) { res.statusCode = 404; res.end('not found'); return; }
+    ensureSel(e, Number(mS[2]));
     return serveFile(req, res, f);
   }
   const mT = /^\/api\/tracks\/(\d+)\/(\d+)$/.exec(p);
@@ -731,6 +761,7 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
     const e = st.torrents.get(Number(mT[1]));
     const f = e?.t.files[Number(mT[2])];
     if (!f) return json(404, { error: 'нет файла' });
+    ensureSel(e, Number(mT[2]));
     const ffprobe = detectFFBin('ffprobe');
     if (!ffprobe) return json(200, { ffmpeg: false, tracks: [] });
     const url = 'http://127.0.0.1:' + st.port + base + '/s/' + mT[1] + '/' + mT[2];
@@ -746,13 +777,14 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
         else if (s.codec_type === 'subtitle') subs.push({ s: si++, lang, title, codec: s.codec_name });
       }
       return json(200, { ffmpeg: true, tracks, subs });
-    } catch (e2) { return json(200, { ffmpeg: true, tracks: [], subs: [], error: String((e2 && e2.message) || e2).slice(0, 160) }); }
+    } catch (e2) { return json(200, { ffmpeg: true, tracks: [], subs: [], retry: true }); }
   }
   const mR = /^\/remux\/(\d+)\/(\d+)$/.exec(p);
   if (mR) {
     const e = st.torrents.get(Number(mR[1]));
     const f = e?.t.files[Number(mR[2])];
     if (!f) { res.statusCode = 404; res.end('not found'); return; }
+    ensureSel(e, Number(mR[2]));
     const ffmpeg = detectFFBin('ffmpeg');
     if (!ffmpeg) { res.statusCode = 500; res.end('ffmpeg не найден'); return; }
     const a = u.searchParams.get('a') || '0';
@@ -774,6 +806,7 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
     const e = st.torrents.get(Number(mV[1]));
     const f = e?.t.files[Number(mV[2])];
     if (!f) { res.statusCode = 404; res.end('not found'); return; }
+    ensureSel(e, Number(mV[2]));
     res.setHeader('Content-Type', 'text/html; charset=utf-8');
     res.end('<!doctype html><meta charset=utf-8><title>' + esc(f.name) + '</title>' +
       '<style>body{margin:0;background:#000;color:#ddd;font:14px system-ui;display:flex;flex-direction:column;height:100vh;box-sizing:border-box}' +
@@ -784,7 +817,9 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
       '<video id=v controls autoplay src="' + base + '/s/' + mV[1] + '/' + mV[2] + '"></video>' +
       '<script>var B=' + JSON.stringify(base) + ',ID=' + mV[1] + ',I=' + mV[2] + ';' +
       'var v=document.getElementById("v"),aS=document.getElementById("a"),sS=document.getElementById("s"),n=document.getElementById("n");' +
-      'fetch(B+"/api/tracks/"+ID+"/"+I).then(function(r){return r.json()}).then(function(d){' +
+      'var tries=0;' +
+      'var load=function(){fetch(B+"/api/tracks/"+ID+"/"+I).then(function(r){return r.json()}).then(function(d){' +
+      'if(d.retry&&tries++<15){n.textContent="⏳ готовлю файл к стриму…";setTimeout(load,4000);return;}' +
       'if(d.error)n.textContent="⚠ "+d.error;' +
       'var A=d.tracks||[],S=d.subs||[];' +
       'if(!d.ffmpeg||A.length<2){return;}' +
@@ -794,7 +829,7 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
       'S.forEach(function(t){var o=document.createElement("option");o.value=t.s;o.textContent="💬 "+(t.lang&&t.lang!=="und"?t.lang:"субтитры "+(t.s+1))+(t.title?" — "+t.title:"");sS.appendChild(o)});sS.style.display=""}' +
       'var go=function(){var t=v.currentTime;v.src=B+"/remux/"+ID+"/"+I+"?a="+aS.value+(sS.value!==""?"&s="+sS.value:"");v.load();v.addEventListener("loadedmetadata",function once(){v.currentTime=t;v.removeEventListener("loadedmetadata",once)});v.play()};' +
       'aS.onchange=go;sS.onchange=go;go();' +
-      '}).catch(function(){})</script>');
+      '}).catch(function(){if(tries++<15)setTimeout(load,4000)})};load();</script>');
     return;
   }
   res.statusCode = 404; res.end('not found');
@@ -814,6 +849,7 @@ async function startWeb(opts, srcArg) {
     const dup = [...st.torrents.values()].find(e => e.t.infoHash === t.infoHash);
     if (dup) { try { t.destroy(); } catch {} return; }
     t.files.forEach(f => f.deselect()); // webtorrent по умолчанию выбирает все файлы
+    try { t.fileSelector = (tt, index, file) => (file._selections && file._selections.length ? 2 : 0); } catch {}
     const sel = new Set();
     const vids = t.files.map((f, i) => ({ f, i })).filter(x => VIDEO_EXT.has(path.extname(x.f.name).toLowerCase()));
     if (st.autoSelect) {