torrent-online 1.7.0 → 1.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "torrent-online",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "type": "module",
   "description": "Stream .torrent / magnet to VLC or browser — torrent streaming for macOS/Linux without a torrent client. Стрим торрентов в VLC или браузер.",
   "keywords": [
@@ -40,6 +40,7 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^7.0.0",
+    "hls.js": "^1.5.17",
     "webtorrent": "^3.0.21"
   },
   "engines": {

package/wtui.js

@@ -669,6 +669,15 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
     res.end(WEB_HTML.replace('__BASE__', base));
     return;
   }
+  if (p === '/hls.min.js') {
+    try {
+      const b = fs.readFileSync(require.resolve('hls.js/dist/hls.min.js'));
+      res.setHeader('Content-Type', 'application/javascript; charset=utf-8');
+      res.setHeader('Cache-Control', 'no-store');
+      res.end(b);
+    } catch { res.statusCode = 404; res.end('no hls.js'); }
+    return;
+  }
   if (p === '/api/search') {
     const q = u.searchParams.get('q') || '';
     const { items, notes } = await searchIndexers(q);
@@ -858,7 +867,8 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
     const dir = path.join(HLS_ROOT, key);
     const hit0 = hlsProcs.get(key); if (hit0) hit0.touched = Date.now();
     const hit1 = hlsProcs.get(key + '-vtt'); if (hit1) hit1.touched = Date.now();
-    const need = !hlsProcs.has(key) || Math.abs((hlsProcs.get(key).start || 0) - t) > 3;
+    const isSeg = /^seg-\d+\.ts$/.test(name);
+    const need = !isSeg && (!hlsProcs.has(key) || Math.abs((hlsProcs.get(key).start || 0) - t) > 3);
     if (need) {
       for (const [k, h] of hlsProcs) if (k.startsWith(key) || k.startsWith(mH[1] + '-' + mH[2] + '-')) { try { h.proc.kill('SIGKILL'); } catch {} hlsProcs.delete(k); }
       await fsp.rm(dir, { recursive: true, force: true });
@@ -913,10 +923,12 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
     }
     let segs = [];
     try { segs = fs.readdirSync(dir).filter(x => /^seg-\d+\.ts$/.test(x)).sort((x, y) => (+x.slice(4)) - (+y.slice(4))); } catch {}
+    segs = segs.slice(0, -1); // последний сегмент ещё пишется
     const durs = segs.map(() => 4);
     const maxD = 6;
     let pl = '#EXTM3U\n#EXT-X-VERSION:3\n#EXT-X-TARGETDURATION:' + maxD + '\n#EXT-X-PLAYLIST-TYPE:EVENT\n#EXT-X-MEDIA-SEQUENCE:0\n';
-    for (let i = 0; i < segs.length; i++) pl += '#EXTINF:' + durs[i].toFixed(3) + ',\n' + segs[i] + '\n';
+    const qs = '?a=' + encodeURIComponent(a) + (si >= 0 ? '&si=' + si : '&si=') + '&t=' + t;
+    for (let i = 0; i < segs.length; i++) pl += '#EXTINF:' + durs[i].toFixed(3) + ',\n' + segs[i] + qs + '\n';
     res.setHeader('Content-Type', 'application/vnd.apple.mpegurl');
     res.setHeader('Cache-Control', 'no-store');
     res.end(pl);
@@ -939,7 +951,7 @@ video{flex:1;width:100%;min-height:0;background:#000}
 <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 playsinline></video>
 <div id=ov>▶</div>
-<script src="https://cdn.jsdelivr.net/npm/hls.js@1.5.17/dist/hls.min.js"></script>
+<script src="${base}/hls.min.js"></script>
 <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"),ov=document.getElementById("ov");