torrent-online 1.5.6 → 1.5.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "torrent-online",
-  "version": "1.5.6",
+  "version": "1.5.8",
   "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){
@@ -659,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 || '');
@@ -762,11 +790,13 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
     const a = u.searchParams.get('a') || '0';
     const sb = u.searchParams.get('s');
     const url = 'http://127.0.0.1:' + st.port + base + '/s/' + mR[1] + '/' + mR[2];
-    const args = ['-hide_banner', '-loglevel', 'error', '-i', url, '-map', '0:v:0', '-map', '0:a:' + a, '-c:v', 'copy', '-c:a', 'aac', '-b:a', '192k', '-max_muxing_queue_size', '9999'];
+    const args = ['-hide_banner', '-loglevel', 'error', '-rw_timeout', '30000000', '-reconnect', '1', '-reconnect_streamed', '1', '-reconnect_delay_max', '5', '-i', url, '-map', '0:v:0', '-map', '0:a:' + a, '-c:v', 'copy', '-c:a', 'aac', '-b:a', '192k', '-max_muxing_queue_size', '9999'];
     if (sb !== null && sb !== '') args.push('-map', '0:s:' + sb, '-c:s', 'mov_text');
     args.push('-f', 'mp4', '-movflags', 'frag_keyframe+empty_moov+default_base_moof', '-');
     res.setHeader('Content-Type', 'video/mp4');
-    const proc = spawn(ffmpeg, args, { stdio: ['ignore', 'pipe', 'ignore'] });
+    const proc = spawn(ffmpeg, args, { stdio: ['ignore', 'pipe', 'pipe'] });
+    let ffErr = 0;
+    proc.stderr.on('data', d => { if (ffErr < 3) { console.error('ffm:', String(d).trim().slice(0, 200)); ffErr++; } });
     proc.stdout.pipe(res);
     proc.on('error', () => { try { res.end(); } catch {} });
     req.on('close', () => { try { proc.kill('SIGKILL'); } catch {} });
@@ -786,7 +816,7 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
       'select{background:#1b1b1f;color:#ddd;border:1px solid #333;border-radius:6px;padding:4px;max-width:340px}' +
       'video{flex:1;width:100%;min-height:0;background:#000}</style>' +
       '<div class=bar><b>' + esc(f.name) + '</b><select id=a style=display:none></select><select id=s style=display:none></select><span id=n></span></div>' +
-      '<video id=v controls autoplay src="' + base + '/s/' + mV[1] + '/' + mV[2] + '"></video>' +
+      '<video id=v controls autoplay muted playsinline 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");' +
       'var tries=0;' +
@@ -799,8 +829,10 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
       'aS.value=A[0].a;aS.style.display="";' +
       'if(S.length){var o0=document.createElement("option");o0.value="";o0.textContent="без субтитров";sS.appendChild(o0);' +
       '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()};' +
+      '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().catch(function(){})};' +
       'aS.onchange=go;sS.onchange=go;go();' +
+      'v.addEventListener("playing",function(){n.textContent=""});v.addEventListener("volumechange",function(){if(!v.muted)n.title="звук включён"});' +
+      'setInterval(function(){fetch(B+"/api/status").then(function(r){return r.json()}).then(function(l){var t=l.find(function(x){return x.id===ID});if(t&&v.readyState<2)n.textContent="⏬ "+t.speed+" · пиры "+t.peers+(t.progress>0?" · "+t.progress+"%":"")}).catch(function(){})},2000);' +
       '}).catch(function(){if(tries++<15)setTimeout(load,4000)})};load();</script>');
     return;
   }