torrent-online 1.7.0 → 1.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/wtui.js +5 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "torrent-online",
|
|
3
|
-
"version": "1.7.
|
|
3
|
+
"version": "1.7.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Stream .torrent / magnet to VLC or browser — torrent streaming for macOS/Linux without a torrent client. Стрим торрентов в VLC или браузер.",
|
|
6
6
|
"keywords": [
|
package/wtui.js
CHANGED
|
@@ -858,7 +858,8 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
|
|
|
858
858
|
const dir = path.join(HLS_ROOT, key);
|
|
859
859
|
const hit0 = hlsProcs.get(key); if (hit0) hit0.touched = Date.now();
|
|
860
860
|
const hit1 = hlsProcs.get(key + '-vtt'); if (hit1) hit1.touched = Date.now();
|
|
861
|
-
const
|
|
861
|
+
const isSeg = /^seg-\d+\.ts$/.test(name);
|
|
862
|
+
const need = !isSeg && (!hlsProcs.has(key) || Math.abs((hlsProcs.get(key).start || 0) - t) > 3);
|
|
862
863
|
if (need) {
|
|
863
864
|
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); }
|
|
864
865
|
await fsp.rm(dir, { recursive: true, force: true });
|
|
@@ -913,10 +914,12 @@ async function webReq(req, res, client, st, opts, cacheDir, base) {
|
|
|
913
914
|
}
|
|
914
915
|
let segs = [];
|
|
915
916
|
try { segs = fs.readdirSync(dir).filter(x => /^seg-\d+\.ts$/.test(x)).sort((x, y) => (+x.slice(4)) - (+y.slice(4))); } catch {}
|
|
917
|
+
segs = segs.slice(0, -1); // последний сегмент ещё пишется
|
|
916
918
|
const durs = segs.map(() => 4);
|
|
917
919
|
const maxD = 6;
|
|
918
920
|
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';
|
|
919
|
-
|
|
921
|
+
const qs = '?a=' + encodeURIComponent(a) + (si >= 0 ? '&si=' + si : '&si=') + '&t=' + t;
|
|
922
|
+
for (let i = 0; i < segs.length; i++) pl += '#EXTINF:' + durs[i].toFixed(3) + ',\n' + segs[i] + qs + '\n';
|
|
920
923
|
res.setHeader('Content-Type', 'application/vnd.apple.mpegurl');
|
|
921
924
|
res.setHeader('Cache-Control', 'no-store');
|
|
922
925
|
res.end(pl);
|