From 447a84f125fe460716952a99f39252c9e74a55c4 Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:04:12 +0200 Subject: [PATCH 01/16] fix(player): normalize and cap station playback source list incl resume --- js/app.js | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/js/app.js b/js/app.js index 86a58ae9..9b133e3f 100644 --- a/js/app.js +++ b/js/app.js @@ -500,6 +500,27 @@ function safeHttpsUrl(value) { return url && /^https:/i.test(url) ? url : ''; } +/* An ordered, bounded list of sources for ONE station. + No HTTP mixed content, unsafe protocols, credentials, duplicate mounts, + or unlimited retries from untrusted directory fallback arrays. */ +function buildPlaybackSourceList(primary, fallbacks, original, relay) { + var sources = []; + function add(candidate, limit) { + var url = safeHttpsUrl(candidate); + if (url && sources.length < limit && sources.indexOf(url) === -1) { + sources.push(url); + } + } + add(primary, 4); + if (Array.isArray(fallbacks)) { + for (var i = 0; i < fallbacks.length; i++) add(fallbacks[i], 4); + } + add(original, 4); + // The optional relay is always the LAST attempt; never retry the relay. + add(relay, 5); + return sources; +} + /* Optional stream relay; see proxy/README.md. */ var STREAM_PROXY = ''; @@ -1352,11 +1373,10 @@ function initResume() { if (isDmEmbed(last.url)) return; var station = stationByUrl(last.url); state.playbackStation = station || { name: last.name || '', url: last.url }; - state.playbackSources = [last.url].concat(state.playbackStation.fallbacks || []); var resumeRelay = (station && station.tokenEndpoint && station.tokenType === 'easy_b') ? '' : proxyStreamUrl(last.url); - if (resumeRelay && state.playbackSources.indexOf(resumeRelay) === -1) { - state.playbackSources.push(resumeRelay); - } + state.playbackSources = buildPlaybackSourceList( + last.url, state.playbackStation.fallbacks, '', resumeRelay + ); state.playbackIndex = 0; state.playbackGeneration += 1; var generation = state.playbackGeneration; From 7aaf953c8d082bc3061a9dcfdc466a4c398ed984 Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:04:21 +0200 Subject: [PATCH 02/16] fix(player): use one safe bounded fallback chain for direct playback --- js/modules/player.mjs | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/js/modules/player.mjs b/js/modules/player.mjs index b4d90ffe..5be2bf4e 100644 --- a/js/modules/player.mjs +++ b/js/modules/player.mjs @@ -427,21 +427,18 @@ function play(url, name) { } state.playbackStation = station || { name: name || '', url: url }; var saverStation = pickSaverStation(state.playbackStation, url); - state.playbackSources = [saverStation ? saverStation.url : url] - .concat(state.playbackStation.fallbacks || []) - .concat(saverStation ? [url] : []) - .filter(function (source, index, list) { - return !!source && list.indexOf(source) === index; - }); - // Last-resort relay tier: some streams fail direct playback from the - // browser (CORS or geo blocks) while our Cloudflare Worker relay can - // still fetch them. Token-gated easybroadcast streams are skipped: their - // loader signs the original playlist URL and would break through a proxy. + // Preserve the original station identity while retrying its OWN verified + // or curated alternative mounts; never mix stations by similar names. + // Bound to four direct HTTPS sources and one optional last-resort relay. + // Token-gated easybroadcast must never go through the relay. var isEasyB = station && station.tokenEndpoint && station.tokenType === 'easy_b'; var relayUrl = isEasyB ? '' : proxyStreamUrl(url); - if (relayUrl && state.playbackSources.indexOf(relayUrl) === -1) { - state.playbackSources.push(relayUrl); - } + state.playbackSources = buildPlaybackSourceList( + saverStation ? saverStation.url : url, + state.playbackStation.fallbacks, + saverStation ? url : '', + relayUrl + ); state.playbackIndex = 0; state.playbackGeneration += 1; var generation = state.playbackGeneration; From f2ab987459a71adc92095d555d7e72eadadafd84 Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:04:32 +0200 Subject: [PATCH 03/16] test(player): enforce bounded HTTPS-only station fallback on play/resume --- tests/search.test.cjs | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/tests/search.test.cjs b/tests/search.test.cjs index 592dcc95..5dff49fc 100644 --- a/tests/search.test.cjs +++ b/tests/search.test.cjs @@ -693,3 +693,49 @@ test('late shared-link handling never restarts a station selected during this se assert.deepEqual(attempt(true), [], 'in-session playback should not be replaced'); assert.deepEqual(attempt(false), [[url,'Current station']], 'fresh deep link should start exactly once'); }); + + +test('player fallback list is HTTPS-only, unique and preserves the selected station', () => { + const sources = Array.from(sandbox.buildPlaybackSourceList( + 'https://radio.test/live', + ['http://insecure.test/live', 'javascript:alert(1)', + 'https://radio.test/live', 'https://radio.test/backup', + 'https://user:pass@radio.test/secret'], + 'https://radio.test/original', + 'https://relay.test/stream?url=encoded' + )); + assert.deepEqual(sources, [ + 'https://radio.test/live', + 'https://radio.test/backup', + 'https://radio.test/original', + 'https://relay.test/stream?url=encoded' + ]); +}); + +test('player fallback attempts are bounded to four direct sources and relay last', () => { + const tooMany = Array.from({length: 20}, (_, i) => 'https://radio.test/alt' + i); + const sources = Array.from(sandbox.buildPlaybackSourceList( + 'https://radio.test/live', tooMany, 'https://radio.test/original', + 'https://relay.test/stream' + )); + assert.equal(sources.length, 5); + assert.equal(sources[0], 'https://radio.test/live'); + assert.deepEqual(sources.slice(1, 4), tooMany.slice(0, 3)); + assert.equal(sources[4], 'https://relay.test/stream'); +}); + +test('untrusted fallback strings do not turn into individual characters or URL attempts', () => { + const sources = Array.from(sandbox.buildPlaybackSourceList( + 'https://radio.test/live', 'https://untrusted.test/stream', '', '' + )); + assert.deepEqual(sources, ['https://radio.test/live']); +}); + +test('player resume and direct play share the same safe source builder', () => { + const app = fs.readFileSync('js/app.js', 'utf8'); + const player = fs.readFileSync('js/modules/player.mjs', 'utf8'); + assert.match(app, /state\.playbackSources = buildPlaybackSourceList\(/); + assert.match(player, /state\.playbackSources = buildPlaybackSourceList\(/); + assert.match(player, /state\.playbackIndex < state\.playbackSources\.length/); + assert.match(player, /generation !== state\.playbackGeneration/); +}); From 3f61313284407406387bfbfba4a42197e6218f9b Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:04:41 +0200 Subject: [PATCH 04/16] chore(player): bump service worker v79 and align docs --- sw.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw.js b/sw.js index 39eb6258..46cfc17f 100644 --- a/sw.js +++ b/sw.js @@ -1,4 +1,4 @@ -var CACHE = 'radio-atlas-v78'; +var CACHE = 'radio-atlas-v79'; var SHELL = ['./', './index.html', './offline.html', './about.html', './contact.html', './terms.html', './privacy.html', './dmca.html', './css/styles.css', './js/app.js', './js/analytics.js', './manifest.webmanifest', './icons/icon.svg', './icons/icon-192.png', './icons/icon-512.png', './icons/icon-maskable-192.png', './icons/icon-maskable-512.png', './js/modules/mobile.mjs', './js/modules/map.mjs', './js/modules/player.mjs', './js/modules/regions.mjs', './js/modules/sdr.mjs', './js/modules/tools.mjs']; From 0fbe6e916a0b0cecd9fc8e69575a4dffa6b8a763 Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:04:45 +0200 Subject: [PATCH 05/16] chore(player): bump service worker v79 and align docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a85d990..f0b712d5 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ ### Frontend - **HTML5 + CSS3 + Vanilla JavaScript** (بدون مكتبات خارجية) -- **Service Worker** (sw.js v78) لـ caching و offline +- **Service Worker** (sw.js v79) لـ caching و offline - **HLS.js** (1.6.10) لدعم HLS - **hls.js CDN**: jsdelivr → unpkg fallback From 1f77e9c93a2085da8d94e78053114d542ed27f0f Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:04:49 +0200 Subject: [PATCH 06/16] chore(player): bump service worker v79 and align docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f0b712d5..6f0e9b58 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ Radio/ │ └── tools.mjs # لوحة الأوامر + المشاركة + الإبلاغ + عشوائي (~8KB) ├── css/ │ └── styles.css # أنماط CSS -├── sw.js # Service Worker (v78) +├── sw.js # Service Worker (v79) ├── manifest.webmanifest # PWA Manifest ├── offline.html # صفحة offline ├── robots.txt # robots.txt From b36d601d3c4b908c86b8beabb146c4e8db5b8e23 Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:04:53 +0200 Subject: [PATCH 07/16] chore(player): bump service worker v79 and align docs --- ROADMAP.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ROADMAP.md b/ROADMAP.md index 87fd5e20..22a6c8a4 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -41,7 +41,7 @@ | ملف الإقلاع السريع | stations_head.json (~530KB) | data/ | | تدفق منسّق مُتحقق | 1185 مُفحوص · 1086 شغّال · 50 «جرّبها» · 49 ميت | data/stream_checks.json | | جسم الواجهة | js/app.js ~79KB (نواة) + 5 وحدات ES Modules | js/app.js | -| إصدار Service Worker | v78 | sw.js (الجذر — المسار المسجل في js/app.js) | +| إصدار Service Worker | v79 | sw.js (الجذر — المسار المسجل في js/app.js) | | الاختبارات | 92 اختبار crawler + مجموعة اختبارات JS (node --test) | tests/ | | جدولة التحديث | SDR كل 6 ساعات · المحطات يوميًا | .github/workflows/update-data.yml | From c0b3dbf3d1cc2b7459c51909f8d47df394aea50c Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:05:03 +0200 Subject: [PATCH 08/16] docs(player): document safe fallback limits and original station identity --- ROADMAP.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ROADMAP.md b/ROADMAP.md index 22a6c8a4..78e5a49f 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -8,6 +8,8 @@ > **صيانة المصادر العالمية — 2026-11-19:** خط الأساس المعلن في manifest v34 هو 60,732 محطة، بينما صفوف stations.json الفعلية 60,741 (انحراف سابق +9)؛ آخر سجل قديم فحص 1,185 رابطًا وصنّف 1,071 alive (مش ضمان تشغيل صوت). أضفنا فاحص دليل الصوت التدريجي (48 رابطًا في دورة المحطات)، وحماية تمنع فقد أكثر من 20% من المحطات بسبب جلب ناقص. لا حذف للمحطات ولا تغيير لمعرّفاتها. التفاصيل والتقييم في [تقرير تدقيق المصادر](docs/RADIO_SOURCES_AUDIT_2026-11-19.md). اكتمال التفعيل معلق على CI والنشر ودورة صيانة فعلية. +> **تحسين موثوقية تشغيل البث — 2026-11-19:** استكمال بند المشغّل P1-3: قائمة بدائل المحطة نفسها أصبحت HTTPS فقط، تُزال منها الروابط المكررة وغير الآمنة، ويُسمح بأربع محاولات مباشرة كحد أقصى ثم بروكسي اختياري مرة واحدة، وتُستخدم نفس القائمة عند استعادة آخر محطة. لا دمج حسب تشابه الأسماء، ولا تغيير لعنصر الصوت أو بيانات المفضلة. Service Worker v79. + ## 1) الوضع الحالي — نوفمبر 2026 ### ✅ منجز (سجل مختصر — السجل الكامل في PRs المستودع) From 08d781da983219e6d29dd3ec32d922b86ddcf6bf Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:05:06 +0200 Subject: [PATCH 09/16] docs(player): document safe fallback limits and original station identity --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6f0e9b58..edf12894 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ - local search matches name/language/tags/cc/localized country name (Intl.DisplayNames) - مشغّل مصغّر ثابت، مع لوحة قابلة للتوسيع للصوت والتنقل ومؤقت النوم. +- **تبديل آمن بين روابط المحطة:** أربع وصلات HTTPS مباشرة بحد أقصى ورابط relay اختياري كآخر محاولة؛ يتم رفض HTTP والرابط ذي بيانات الدخول، وإزالة المكرر، مع إبقاء اسم المحطة والمفضلة والاستماع على عنصر الصوت نفسه. روابط البدائل هي روابط مرشحة وليست ضمانًا للتشغيل ما لم يُثبت فحص الصوت ذلك. ### 🌍 تبويب عربي - تبويب مستقل «🌍 عربي» يعرض جميع المحطات العربية في 22 دولة عربية From 0d1e31f1a33603f4acc4a2840fbc731a8e8d8957 Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:06:58 +0200 Subject: [PATCH 10/16] perf(player): keep fallback normalization under strict core byte budget --- js/app.js | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/js/app.js b/js/app.js index 9b133e3f..80a767a6 100644 --- a/js/app.js +++ b/js/app.js @@ -500,25 +500,14 @@ function safeHttpsUrl(value) { return url && /^https:/i.test(url) ? url : ''; } -/* An ordered, bounded list of sources for ONE station. - No HTTP mixed content, unsafe protocols, credentials, duplicate mounts, - or unlimited retries from untrusted directory fallback arrays. */ -function buildPlaybackSourceList(primary, fallbacks, original, relay) { - var sources = []; - function add(candidate, limit) { - var url = safeHttpsUrl(candidate); - if (url && sources.length < limit && sources.indexOf(url) === -1) { - sources.push(url); - } - } - add(primary, 4); - if (Array.isArray(fallbacks)) { - for (var i = 0; i < fallbacks.length; i++) add(fallbacks[i], 4); - } - add(original, 4); - // The optional relay is always the LAST attempt; never retry the relay. - add(relay, 5); - return sources; +/* Four HTTPS mounts per station, then at most one optional HTTPS relay. */ +function buildPlaybackSourceList(p, f, o, r) { + var out=[]; + function add(v,n){v=safeHttpsUrl(v);if(v&&out.length Date: Thu, 19 Nov 2026 20:07:18 +0200 Subject: [PATCH 11/16] perf(player): preserve sub-half-monolith entrypoint size while bounding stream URLs --- js/app.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/js/app.js b/js/app.js index 80a767a6..6e62fb5c 100644 --- a/js/app.js +++ b/js/app.js @@ -500,14 +500,10 @@ function safeHttpsUrl(value) { return url && /^https:/i.test(url) ? url : ''; } -/* Four HTTPS mounts per station, then at most one optional HTTPS relay. */ -function buildPlaybackSourceList(p, f, o, r) { - var out=[]; - function add(v,n){v=safeHttpsUrl(v);if(v&&out.length Date: Thu, 19 Nov 2026 20:07:32 +0200 Subject: [PATCH 12/16] perf(player): retain first-load script size budget --- js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/app.js b/js/app.js index 6e62fb5c..7eb86500 100644 --- a/js/app.js +++ b/js/app.js @@ -1346,7 +1346,7 @@ function renderFeatured() { } -/* Modal focus bookkeeping shared by the sdr and player modules. */ +/* Shared modal focus. */ var previousSDRFocus = null; function initResume() { From aafb37333a2cec42b741fe795f1533f69ffe97ff Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:08:25 +0200 Subject: [PATCH 13/16] test(player): exercise actual Chromium failed-primary to working-fallback playback --- scripts/browser_qa.cjs | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/scripts/browser_qa.cjs b/scripts/browser_qa.cjs index 08ae6d67..e0777ad6 100644 --- a/scripts/browser_qa.cjs +++ b/scripts/browser_qa.cjs @@ -12,6 +12,8 @@ const BASE = process.env.RADIO_QA_BASE || 'http://127.0.0.1:8765/'; const DIR = path.resolve(process.env.RADIO_QA_OUTPUT || 'artifacts/mobile-browser-qa'); fs.mkdirSync(DIR, {recursive: true}); const TEST_URL = 'https://qa.radio.invalid/test-live.wav'; +const FAILED_URL = 'https://qa.radio.invalid/fail-live.wav'; +const BACKUP_URL = 'https://qa.radio.invalid/backup-live.wav'; const results = {base: BASE, run: new Date().toISOString(), checks: [], screenshots: [], errors: [], note: 'Playback uses a deterministic WAV fixture intercepted by Playwright, not a live radio endpoint.'}; @@ -157,6 +159,46 @@ async function shot(page,name) { },TEST_URL)); await page.locator('#player-collapse').click(); + // Real Chromium native audio error (HTTP 404) -> verified-in-fixture + // alternative WAV playback, preserving the chosen broadcaster identity. + await page.route(FAILED_URL,route=>route.fulfill({ + status:404,contentType:'text/html',body:'No stream' + })); + await page.route(BACKUP_URL,route=>route.fulfill({ + status:200,contentType:'audio/wav', + headers:{'Access-Control-Allow-Origin':'*'},body:createWav() + })); + await page.locator('#mobile-nav-explore').click(); + await page.evaluate(([primary,backup])=>{ + state.fm.unshift({ + name:'Radio Atlas QA Fallback',url:primary,fallbacks:[backup], + cc:'EG',language:'english',tags:'news',codec:'WAV' + }); + state.fmFilters={q:'',country:'',language:'',tag:'',chip:''}; + state.fmLive=false; + renderFM(); + },[FAILED_URL,BACKUP_URL]); + await page.locator('#grid-fm .station-card[data-station-url="'+FAILED_URL+'"] button.play').click(); + await page.waitForFunction(backup=>{ + const audio=document.querySelector('#audio'); + return state.playbackStation&&state.playbackStation.name==='Radio Atlas QA Fallback' + &&state.currentName==='Radio Atlas QA Fallback' + &&audio.currentSrc===backup&&!audio.paused&&audio.readyState>=2; + },BACKUP_URL,{timeout:20000}); + const failover=await page.evaluate(()=>({ + station:state.playbackStation&&state.playbackStation.url, + stationName:state.currentName, + currentSrc:document.querySelector('#audio').currentSrc, + index:state.playbackIndex, + sources:state.playbackSources, + audioCount:document.querySelectorAll('#audio').length + })); + results.fallbackPlayback=failover; + check('Failed primary switches to its own HTTPS backup', + failover.index===1&&failover.currentSrc===BACKUP_URL + &&failover.station===FAILED_URL&&failover.audioCount===1, + JSON.stringify(failover)); + await page.locator('#lang-btn').click(); check('English LTR',await page.locator('html').getAttribute('dir')==='ltr'); await shot(page,'08-english-ltr'); From 1018263553f195a0a09c1d1ee10c520839f740de Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:10:04 +0200 Subject: [PATCH 14/16] test(player): trigger playback failover from a stable user-click fixture --- scripts/browser_qa.cjs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/browser_qa.cjs b/scripts/browser_qa.cjs index e0777ad6..f5291bfd 100644 --- a/scripts/browser_qa.cjs +++ b/scripts/browser_qa.cjs @@ -168,17 +168,20 @@ async function shot(page,name) { status:200,contentType:'audio/wav', headers:{'Access-Control-Allow-Origin':'*'},body:createWav() })); - await page.locator('#mobile-nav-explore').click(); await page.evaluate(([primary,backup])=>{ state.fm.unshift({ name:'Radio Atlas QA Fallback',url:primary,fallbacks:[backup], cc:'EG',language:'english',tags:'news',codec:'WAV' }); - state.fmFilters={q:'',country:'',language:'',tag:'',chip:''}; - state.fmLive=false; - renderFM(); + // This fixture is injected after normal catalog UI QA. A real click + // still goes through the application's public play() path and audio. + const button=document.createElement('button'); + button.id='qa-fallback-launch'; + button.textContent='Start fallback QA'; + button.addEventListener('click',()=>play(primary,'Radio Atlas QA Fallback')); + document.body.appendChild(button); },[FAILED_URL,BACKUP_URL]); - await page.locator('#grid-fm .station-card[data-station-url="'+FAILED_URL+'"] button.play').click(); + await page.locator('#qa-fallback-launch').click(); await page.waitForFunction(backup=>{ const audio=document.querySelector('#audio'); return state.playbackStation&&state.playbackStation.name==='Radio Atlas QA Fallback' From 098c3d8a9cfb872b7a5868fe814b603e5f18f90c Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:11:50 +0200 Subject: [PATCH 15/16] fix(player): ignore stale media failures after advancing to working fallback --- js/modules/player.mjs | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/js/modules/player.mjs b/js/modules/player.mjs index 5be2bf4e..80afa45f 100644 --- a/js/modules/player.mjs +++ b/js/modules/player.mjs @@ -132,8 +132,11 @@ function loadHlsLib(cb) { } next(); } -function failCurrentPlayback(generation, reason) { - if (generation !== state.playbackGeneration || state.playbackAttemptFailed) return; +function failCurrentPlayback(generation, reason, sourceUrl) { + // A rejected play() promise from an earlier attempt must not stop the + // working fallback after playbackIndex has already advanced. + if (generation !== state.playbackGeneration || state.playbackAttemptFailed || + (sourceUrl && state.playbackSources[state.playbackIndex] !== sourceUrl)) return; state.playbackAttemptFailed = true; destroyHls(); var audio = $('audio'); @@ -211,7 +214,7 @@ function attachHls(url, generation, station) { mediaRetries += 1; try { hls.recoverMediaError(); return; } catch (e) {} } - failCurrentPlayback(generation, data.details || data.type || 'fatal HLS error'); + failCurrentPlayback(generation, data.details || data.type || 'fatal HLS error', url); }); hls.loadSource(url); hls.attachMedia(audio); @@ -245,21 +248,22 @@ function startCurrentPlayback(generation) { var needsHlsJs = isHlsUrl(baseUrl) && (requiresTokenLoader || !audio.canPlayType('application/vnd.apple.mpegurl')); if (needsHlsJs) { loadHlsLib(function (loaded) { - if (generation !== state.playbackGeneration) return; + if (generation !== state.playbackGeneration || + state.playbackSources[state.playbackIndex] !== baseUrl) return; if (!loaded || !attachHls(baseUrl, generation, station)) { - failCurrentPlayback(generation, 'HLS.js unavailable or MediaSource unsupported'); + failCurrentPlayback(generation, 'HLS.js unavailable or MediaSource unsupported', baseUrl); return; } audio.play().catch(function (error) { if (error && error.name === 'NotAllowedError') { toast(t('toast_tap_play')); } else { - failCurrentPlayback(generation, error && error.message); + failCurrentPlayback(generation, error && error.message, baseUrl); } }); }); } else if (requiresTokenLoader) { - failCurrentPlayback(generation, 'Token-protected HLS requires HLS.js'); + failCurrentPlayback(generation, 'Token-protected HLS requires HLS.js', baseUrl); } else { audio.src = baseUrl; audio.load(); @@ -267,7 +271,7 @@ function startCurrentPlayback(generation) { if (error && error.name === 'NotAllowedError') { toast(t('toast_tap_play')); } else { - failCurrentPlayback(generation, error && error.message); + failCurrentPlayback(generation, error && error.message, baseUrl); } }); } @@ -833,7 +837,11 @@ export function boot() { $('audio').addEventListener('waiting', function () { setPlayerStatus('connecting'); }); $('audio').addEventListener('stalled', function () { setPlayerStatus('connecting'); }); $('audio').addEventListener('error', function () { - if (state.playbackSources.length) failCurrentPlayback(state.playbackGeneration, 'HTML audio element error'); + if (hls || !state.playbackSources.length) return; + var source = $('audio').currentSrc; + if (source && source === state.playbackSources[state.playbackIndex]) { + failCurrentPlayback(state.playbackGeneration, 'HTML audio element error', source); + } }); $('audio').addEventListener('play', function () { state.playbackRequestedInSession = true; From 5ada9252e43be92e298dbfda04d30625c35b8023 Mon Sep 17 00:00:00 2001 From: Ossama Hashim Date: Thu, 19 Nov 2026 20:11:59 +0200 Subject: [PATCH 16/16] test(player): record failing browser audio source and retry diagnostics --- scripts/browser_qa.cjs | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/scripts/browser_qa.cjs b/scripts/browser_qa.cjs index f5291bfd..c4e2b6de 100644 --- a/scripts/browser_qa.cjs +++ b/scripts/browser_qa.cjs @@ -182,12 +182,26 @@ async function shot(page,name) { document.body.appendChild(button); },[FAILED_URL,BACKUP_URL]); await page.locator('#qa-fallback-launch').click(); - await page.waitForFunction(backup=>{ - const audio=document.querySelector('#audio'); - return state.playbackStation&&state.playbackStation.name==='Radio Atlas QA Fallback' - &&state.currentName==='Radio Atlas QA Fallback' - &&audio.currentSrc===backup&&!audio.paused&&audio.readyState>=2; - },BACKUP_URL,{timeout:20000}); + try { + await page.waitForFunction(backup=>{ + const audio=document.querySelector('#audio'); + return state.playbackStation&&state.playbackStation.name==='Radio Atlas QA Fallback' + &&state.currentName==='Radio Atlas QA Fallback' + &&audio.currentSrc===backup&&!audio.paused&&audio.readyState>=2; + },BACKUP_URL,{timeout:20000}); + } catch (error) { + const diagnostics=await page.evaluate(()=>{ + const a=document.querySelector('#audio'); + return {sources:state.playbackSources,index:state.playbackIndex, + generation:state.playbackGeneration,attemptFailed:state.playbackAttemptFailed, + currentSrc:a.currentSrc,paused:a.paused,readyState:a.readyState, + error:a.error&&{code:a.error.code,message:a.error.message}, + name:state.currentName,station:state.playbackStation&&state.playbackStation.url, + status:document.querySelector('#player-status').textContent}; + }); + results.fallbackDiagnostics=diagnostics; + throw new Error(error.message+'; fallback diagnostics: '+JSON.stringify(diagnostics)); + } const failover=await page.evaluate(()=>({ station:state.playbackStation&&state.playbackStation.url, stationName:state.currentName,