From 2cc6e56bd15f0820aa2f2b266ef8dcaf75a93cd2 Mon Sep 17 00:00:00 2001 From: laxandrea Date: Tue, 19 Aug 2025 15:29:49 +0200 Subject: [PATCH] remove token from hls url - following PR #4263 --- server/objects/Stream.js | 2 +- server/utils/generators/hlsPlaylistGenerator.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/objects/Stream.js b/server/objects/Stream.js index 813ecf146..d9bdd583c 100644 --- a/server/objects/Stream.js +++ b/server/objects/Stream.js @@ -146,7 +146,7 @@ class Stream extends EventEmitter { async generatePlaylist() { await fs.ensureDir(this.streamPath) - await hlsPlaylistGenerator(this.playlistPath, 'output', this.totalDuration, this.segmentLength, this.hlsSegmentType, this.userToken) + await hlsPlaylistGenerator(this.playlistPath, 'output', this.totalDuration, this.segmentLength, this.hlsSegmentType) return this.clientPlaylistUri } diff --git a/server/utils/generators/hlsPlaylistGenerator.js b/server/utils/generators/hlsPlaylistGenerator.js index 58c1d69ae..369c1456d 100644 --- a/server/utils/generators/hlsPlaylistGenerator.js +++ b/server/utils/generators/hlsPlaylistGenerator.js @@ -1,6 +1,6 @@ const fs = require('../../libs/fsExtra') -function getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType, token) { +function getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType) { var ext = hlsSegmentType === 'fmp4' ? 'm4s' : 'ts' var lines = [ @@ -18,18 +18,18 @@ function getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType, to var lastSegment = duration - (numSegments * segmentLength) for (let i = 0; i < numSegments; i++) { lines.push(`#EXTINF:6,`) - lines.push(`${segmentName}-${i}.${ext}?token=${token}`) + lines.push(`${segmentName}-${i}.${ext}`) } if (lastSegment > 0) { lines.push(`#EXTINF:${lastSegment},`) - lines.push(`${segmentName}-${numSegments}.${ext}?token=${token}`) + lines.push(`${segmentName}-${numSegments}.${ext}`) } lines.push('#EXT-X-ENDLIST') return lines.join('\n') } -function generatePlaylist(outputPath, segmentName, duration, segmentLength, hlsSegmentType, token) { - var playlistStr = getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType, token) +function generatePlaylist(outputPath, segmentName, duration, segmentLength, hlsSegmentType) { + var playlistStr = getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType) return fs.writeFile(outputPath, playlistStr) } module.exports = generatePlaylist \ No newline at end of file