BlueGit

timfa filemanager

fix cache

timfa Tim Falken · pushed by timfa

Authored 2026-05-25 · 5 months ago

Hash
2618c4ac6b9c47fe4bd30b415580b31576ce3540
Parent
943484ae
2 files changed +128 −11
.github/technical-reference.md +1 −1
@@ -187,7 +187,7 @@
187 187 - clearVideoStreamClientCache(playlistUrl) - Best-effort cache cleanup helper that removes cached HLS entries for one stream session when preview playback is closed.
188 188
189 189 ## public/stream-cache-sw.js
190 - fetch handler - Caches successful GET responses for `/api/files/video-stream/*` and `/api/share/video-stream/*`; if the network returns non-OK or fails (for example after server segment pruning), serves the cached response when available.
190 - fetch handler - Caches successful segment/init GET responses for `/api/files/video-stream/*` and `/api/share/video-stream/*` (`.ts/.m4s/.mp4/.aac/.vtt`), intentionally skips `.m3u8` manifests to avoid stale-playlist seek regressions, warms full-body cache entries when playback uses byte-range requests, and can synthesize 206 partial responses from cached full segments so backward seeks keep working after server-side prune.
191 191 - configureVideoJsBuffering(videojs, opts) - Applies the long forward-buffer settings used for file playback when VHS exposes those knobs.
192 192 - ensureVideoPlaybackUi(player, durationSeconds) - Forces file streams into VOD UI mode, normalises the reported duration, stops live-tracker state, and hides the live badge when present.
193 193
@@ -187,7 +187,7 @@
187- clearVideoStreamClientCache(playlistUrl) - Best-effort cache cleanup helper that removes cached HLS entries for one stream session when preview playback is closed.
187- clearVideoStreamClientCache(playlistUrl) - Best-effort cache cleanup helper that removes cached HLS entries for one stream session when preview playback is closed.
188
188
189## public/stream-cache-sw.js
189## public/stream-cache-sw.js
190- fetch handler - Caches successful GET responses for `/api/files/video-stream/*` and `/api/share/video-stream/*`; if the network returns non-OK or fails (for example after server segment pruning), serves the cached response when available.
190- fetch handler - Caches successful segment/init GET responses for `/api/files/video-stream/*` and `/api/share/video-stream/*` (`.ts/.m4s/.mp4/.aac/.vtt`), intentionally skips `.m3u8` manifests to avoid stale-playlist seek regressions, warms full-body cache entries when playback uses byte-range requests, and can synthesize 206 partial responses from cached full segments so backward seeks keep working after server-side prune.
191- configureVideoJsBuffering(videojs, opts) - Applies the long forward-buffer settings used for file playback when VHS exposes those knobs.
191- configureVideoJsBuffering(videojs, opts) - Applies the long forward-buffer settings used for file playback when VHS exposes those knobs.
192- ensureVideoPlaybackUi(player, durationSeconds) - Forces file streams into VOD UI mode, normalises the reported duration, stops live-tracker state, and hides the live badge when present.
192- ensureVideoPlaybackUi(player, durationSeconds) - Forces file streams into VOD UI mode, normalises the reported duration, stops live-tracker state, and hides the live badge when present.
193
193
public/stream-cache-sw.js +127 −10
@@ -2,7 +2,7 @@
2 2
3 3 const VIDEO_STREAM_CACHE_NAME = 'filemanager-stream-cache-v1';
4 4
5 function isVideoStreamAssetRequest (request)
5 function isVideoStreamSegmentRequest (request)
6 6 {
7 7 if (!request || String(request.method || '').toUpperCase() !== 'GET') return false;
8 8
@@ -17,9 +17,84 @@ function isVideoStreamAssetRequest (request)
17 17
18 18 const pathname = String(url.pathname || '');
19 19 if (!pathname.startsWith('/api/')) return false;
20
21 return pathname.startsWith('/api/files/video-stream/')
20 const isStreamAsset = pathname.startsWith('/api/files/video-stream/')
22 21 || pathname.startsWith('/api/share/video-stream/');
22 if (!isStreamAsset) return false;
23
24 // Cache only immutable segment/init assets. Avoid caching playlists because
25 // stale manifests can break seek behaviour after the server prunes older entries.
26 if (/\.m3u8(?:$|\?)/i.test(pathname)) return false;
27 return /(?:\.ts|\.m4s|\.mp4|\.aac|\.vtt)(?:$|\?)/i.test(pathname);
28 }
29
30 function requestWithoutRange (request)
31 {
32 return new Request(request.url, {
33 method: 'GET',
34 credentials: request.credentials,
35 mode: request.mode,
36 redirect: request.redirect,
37 referrer: request.referrer,
38 referrerPolicy: request.referrerPolicy,
39 integrity: request.integrity,
40 cache: 'no-store',
41 });
42 }
43
44 function parseRangeHeader (rawHeader, size)
45 {
46 const header = String(rawHeader || '').trim().toLowerCase();
47 if (!header || !header.startsWith('bytes=')) return null;
48
49 const [startRaw, endRaw] = header.slice('bytes='.length).split('-', 2);
50 if (startRaw.includes(',') || (endRaw && endRaw.includes(','))) return null;
51
52 let start = startRaw === '' ? null : Number.parseInt(startRaw, 10);
53 let end = endRaw === '' ? null : Number.parseInt(endRaw, 10);
54
55 if (start === null && end === null) return null;
56 if (start !== null && (!Number.isInteger(start) || start < 0)) return null;
57 if (end !== null && (!Number.isInteger(end) || end < 0)) return null;
58
59 if (start === null)
60 {
61 const suffixLength = end;
62 if (!Number.isInteger(suffixLength) || suffixLength <= 0) return null;
63 start = Math.max(0, size - suffixLength);
64 end = size - 1;
65 } else if (end === null)
66 {
67 end = size - 1;
68 }
69
70 if (start >= size) return null;
71 if (end >= size) end = size - 1;
72 if (end < start) return null;
73
74 return { start, end };
75 }
76
77 async function buildRangeResponseFromCached (cachedResponse, rangeHeader)
78 {
79 if (!cachedResponse || !rangeHeader) return null;
80
81 const clone = cachedResponse.clone();
82 const bodyBuffer = await clone.arrayBuffer();
83 const totalBytes = bodyBuffer.byteLength;
84 const range = parseRangeHeader(rangeHeader, totalBytes);
85 if (!range) return null;
86
87 const slicedBody = bodyBuffer.slice(range.start, range.end + 1);
88 const headers = new Headers(cachedResponse.headers || {});
89 headers.set('content-range', `bytes ${range.start}-${range.end}/${totalBytes}`);
90 headers.set('content-length', String(range.end - range.start + 1));
91 headers.set('accept-ranges', 'bytes');
92
93 return new Response(slicedBody, {
94 status: 206,
95 statusText: 'Partial Content',
96 headers,
97 });
23 98 }
24 99
25 100 self.addEventListener('install', (event) =>
@@ -35,31 +110,73 @@ self.addEventListener('activate', (event) =>
35 110 self.addEventListener('fetch', (event) =>
36 111 {
37 112 const request = event.request;
38 if (!isVideoStreamAssetRequest(request)) return;
113 if (!isVideoStreamSegmentRequest(request)) return;
39 114
40 115 event.respondWith((async () =>
41 116 {
42 117 const cache = await caches.open(VIDEO_STREAM_CACHE_NAME);
43 const cached = await cache.match(request);
118 const rangeHeader = request.headers && typeof request.headers.get === 'function'
119 ? String(request.headers.get('range') || '').trim()
120 : '';
121 const isRangeRequest = !!rangeHeader;
122 const normalizedRequest = isRangeRequest ? requestWithoutRange(request) : request;
123 const cached = await cache.match(normalizedRequest);
44 124
45 125 try
46 126 {
47 127 const response = await fetch(request);
48 if (response && response.ok)
128 const hasContentRange = response && response.headers && typeof response.headers.get === 'function'
129 ? String(response.headers.get('content-range') || '').trim()
130 : '';
131
132 if (response && response.ok && !hasContentRange)
49 133 {
50 void cache.put(request, response.clone()).catch(() =>
134 void cache.put(normalizedRequest, response.clone()).catch(() =>
51 135 {
52 136 // Cache writes are best-effort.
53 137 });
54 138 return response;
55 139 }
56 140
57 if (cached) return cached;
141 if (response && (response.status === 206 || hasContentRange) && isRangeRequest)
142 {
143 // Warm a full-body cache entry in the background so rewinds can still
144 // use cached segments if the server later prunes old files.
145 void fetch(normalizedRequest).then((fullResponse) =>
146 {
147 if (!fullResponse || !fullResponse.ok) return;
148 return cache.put(normalizedRequest, fullResponse.clone());
149 }).catch(() =>
150 {
151 // Full-body warmup is best-effort only.
152 });
153 }
154
155 if (cached)
156 {
157 if (isRangeRequest)
158 {
159 const rangeResponse = await buildRangeResponseFromCached(cached, rangeHeader);
160 if (rangeResponse) return rangeResponse;
161 }
162 return cached;
163 }
58 164 return response;
59 165 } catch
60 166 {
61 if (cached) return cached;
62 throw new Error('Video stream request failed and no cached response was available.');
167 if (cached)
168 {
169 if (isRangeRequest)
170 {
171 const rangeResponse = await buildRangeResponseFromCached(cached, rangeHeader);
172 if (rangeResponse) return rangeResponse;
173 }
174 return cached;
175 }
176 return new Response(null, {
177 status: 504,
178 statusText: 'Gateway Timeout',
179 });
63 180 }
64 181 })());
65 182 });
@@ -2,7 +2,7 @@
2
2
3const VIDEO_STREAM_CACHE_NAME = 'filemanager-stream-cache-v1';
3const VIDEO_STREAM_CACHE_NAME = 'filemanager-stream-cache-v1';
4
4
5function isVideoStreamAssetRequest (request)
5function isVideoStreamSegmentRequest (request)
6{
6{
7 if (!request || String(request.method || '').toUpperCase() !== 'GET') return false;
7 if (!request || String(request.method || '').toUpperCase() !== 'GET') return false;
8
8
@@ -17,9 +17,84 @@ function isVideoStreamAssetRequest (request)
17
17
18 const pathname = String(url.pathname || '');
18 const pathname = String(url.pathname || '');
19 if (!pathname.startsWith('/api/')) return false;
19 if (!pathname.startsWith('/api/')) return false;
20
20 const isStreamAsset = pathname.startsWith('/api/files/video-stream/')
21 return pathname.startsWith('/api/files/video-stream/')
22 || pathname.startsWith('/api/share/video-stream/');
21 || pathname.startsWith('/api/share/video-stream/');
22 if (!isStreamAsset) return false;
23
24 // Cache only immutable segment/init assets. Avoid caching playlists because
25 // stale manifests can break seek behaviour after the server prunes older entries.
26 if (/\.m3u8(?:$|\?)/i.test(pathname)) return false;
27 return /(?:\.ts|\.m4s|\.mp4|\.aac|\.vtt)(?:$|\?)/i.test(pathname);
28}
29
30function requestWithoutRange (request)
31{
32 return new Request(request.url, {
33 method: 'GET',
34 credentials: request.credentials,
35 mode: request.mode,
36 redirect: request.redirect,
37 referrer: request.referrer,
38 referrerPolicy: request.referrerPolicy,
39 integrity: request.integrity,
40 cache: 'no-store',
41 });
42}
43
44function parseRangeHeader (rawHeader, size)
45{
46 const header = String(rawHeader || '').trim().toLowerCase();
47 if (!header || !header.startsWith('bytes=')) return null;
48
49 const [startRaw, endRaw] = header.slice('bytes='.length).split('-', 2);
50 if (startRaw.includes(',') || (endRaw && endRaw.includes(','))) return null;
51
52 let start = startRaw === '' ? null : Number.parseInt(startRaw, 10);
53 let end = endRaw === '' ? null : Number.parseInt(endRaw, 10);
54
55 if (start === null && end === null) return null;
56 if (start !== null && (!Number.isInteger(start) || start < 0)) return null;
57 if (end !== null && (!Number.isInteger(end) || end < 0)) return null;
58
59 if (start === null)
60 {
61 const suffixLength = end;
62 if (!Number.isInteger(suffixLength) || suffixLength <= 0) return null;
63 start = Math.max(0, size - suffixLength);
64 end = size - 1;
65 } else if (end === null)
66 {
67 end = size - 1;
68 }
69
70 if (start >= size) return null;
71 if (end >= size) end = size - 1;
72 if (end < start) return null;
73
74 return { start, end };
75}
76
77async function buildRangeResponseFromCached (cachedResponse, rangeHeader)
78{
79 if (!cachedResponse || !rangeHeader) return null;
80
81 const clone = cachedResponse.clone();
82 const bodyBuffer = await clone.arrayBuffer();
83 const totalBytes = bodyBuffer.byteLength;
84 const range = parseRangeHeader(rangeHeader, totalBytes);
85 if (!range) return null;
86
87 const slicedBody = bodyBuffer.slice(range.start, range.end + 1);
88 const headers = new Headers(cachedResponse.headers || {});
89 headers.set('content-range', `bytes ${range.start}-${range.end}/${totalBytes}`);
90 headers.set('content-length', String(range.end - range.start + 1));
91 headers.set('accept-ranges', 'bytes');
92
93 return new Response(slicedBody, {
94 status: 206,
95 statusText: 'Partial Content',
96 headers,
97 });
23}
98}
24
99
25self.addEventListener('install', (event) =>
100self.addEventListener('install', (event) =>
@@ -35,31 +110,73 @@ self.addEventListener('activate', (event) =>
35self.addEventListener('fetch', (event) =>
110self.addEventListener('fetch', (event) =>
36{
111{
37 const request = event.request;
112 const request = event.request;
38 if (!isVideoStreamAssetRequest(request)) return;
113 if (!isVideoStreamSegmentRequest(request)) return;
39
114
40 event.respondWith((async () =>
115 event.respondWith((async () =>
41 {
116 {
42 const cache = await caches.open(VIDEO_STREAM_CACHE_NAME);
117 const cache = await caches.open(VIDEO_STREAM_CACHE_NAME);
43 const cached = await cache.match(request);
118 const rangeHeader = request.headers && typeof request.headers.get === 'function'
119 ? String(request.headers.get('range') || '').trim()
120 : '';
121 const isRangeRequest = !!rangeHeader;
122 const normalizedRequest = isRangeRequest ? requestWithoutRange(request) : request;
123 const cached = await cache.match(normalizedRequest);
44
124
45 try
125 try
46 {
126 {
47 const response = await fetch(request);
127 const response = await fetch(request);
48 if (response && response.ok)
128 const hasContentRange = response && response.headers && typeof response.headers.get === 'function'
129 ? String(response.headers.get('content-range') || '').trim()
130 : '';
131
132 if (response && response.ok && !hasContentRange)
49 {
133 {
50 void cache.put(request, response.clone()).catch(() =>
134 void cache.put(normalizedRequest, response.clone()).catch(() =>
51 {
135 {
52 // Cache writes are best-effort.
136 // Cache writes are best-effort.
53 });
137 });
54 return response;
138 return response;
55 }
139 }
56
140
57 if (cached) return cached;
141 if (response && (response.status === 206 || hasContentRange) && isRangeRequest)
142 {
143 // Warm a full-body cache entry in the background so rewinds can still
144 // use cached segments if the server later prunes old files.
145 void fetch(normalizedRequest).then((fullResponse) =>
146 {
147 if (!fullResponse || !fullResponse.ok) return;
148 return cache.put(normalizedRequest, fullResponse.clone());
149 }).catch(() =>
150 {
151 // Full-body warmup is best-effort only.
152 });
153 }
154
155 if (cached)
156 {
157 if (isRangeRequest)
158 {
159 const rangeResponse = await buildRangeResponseFromCached(cached, rangeHeader);
160 if (rangeResponse) return rangeResponse;
161 }
162 return cached;
163 }
58 return response;
164 return response;
59 } catch
165 } catch
60 {
166 {
61 if (cached) return cached;
167 if (cached)
62 throw new Error('Video stream request failed and no cached response was available.');
168 {
169 if (isRangeRequest)
170 {
171 const rangeResponse = await buildRangeResponseFromCached(cached, rangeHeader);
172 if (rangeResponse) return rangeResponse;
173 }
174 return cached;
175 }
176 return new Response(null, {
177 status: 504,
178 statusText: 'Gateway Timeout',
179 });
63 }
180 }
64 })());
181 })());
65});
182});