diff --git a/common/src/androidTest/java/com/shilapi/xcertplay/web/BrowserPageRuntimeTest.kt b/common/src/androidTest/java/com/shilapi/xcertplay/web/BrowserPageRuntimeTest.kt index 93c1a2d7..534d51d4 100644 --- a/common/src/androidTest/java/com/shilapi/xcertplay/web/BrowserPageRuntimeTest.kt +++ b/common/src/androidTest/java/com/shilapi/xcertplay/web/BrowserPageRuntimeTest.kt @@ -53,7 +53,20 @@ class BrowserPageRuntimeTest { html.contains(owner.getString(UiR.string.web_connect_your_carplay_display)) ) assertFalse(html.contains("{{")) - assertTrue(html.contains("pattern=\"[0-9]{6}\"")) + val inputs = Regex("""]*>""").findAll(html).map { it.value }.toList() + val pinFields = inputs.filter { Regex("""\bid="code-digit-[0-9]+"""").containsMatchIn(it) } + assertEquals("$tag $path: six PIN fields", 6, pinFields.size) + for (digit in 1..6) { + val field = pinFields.single { it.contains("id=\"code-digit-$digit\"") } + assertTrue("$tag $path: digit $digit accepts one number", field.contains("pattern=\"[0-9]\"")) + assertTrue("$tag $path: digit $digit suppresses the system keyboard", field.contains("inputmode=\"none\"")) + assertTrue("$tag $path: digit $digit is readonly", Regex("""\sreadonly(?:\s|>)""").containsMatchIn(field)) + assertTrue("$tag $path: digit $digit opens the page keypad", field.contains("aria-controls=\"pairing-keypad\"")) + } + assertTrue("$tag $path: canonical pairing value", inputs.any { + it.contains("id=\"code\"") && it.contains("name=\"code\"") && it.contains("type=\"hidden\"") + }) + assertTrue("$tag $path: floating keypad", html.contains("id=\"pairing-keypad\"")) assertTrue(html.contains("")) assertTrue(html.contains("")) } diff --git a/common/src/main/assets/web/app.js b/common/src/main/assets/web/app.js index c26fea31..6d880276 100644 --- a/common/src/main/assets/web/app.js +++ b/common/src/main/assets/web/app.js @@ -42,6 +42,100 @@ export function pairingCodeFromUrl(search) { return /^[0-9]{6}$/.test(code) ? code : null; } +// Six visible digits share one canonical value for the existing pairing API. +export function createPairingCodeInput(inputs, value, { onChange = () => {}, onFocus = () => {}, onDismiss = () => {} } = {}) { + let active = 0, enabled = true; + const numbers = text => String(text || '').replace(/[^0-9]/g, ''); + const complete = () => inputs.every(input => /^[0-9]$/.test(input.value)); + const sync = () => { value.value = inputs.map(input => input.value).join(''); onChange(!enabled || complete()); }; + const focus = index => { active = index; inputs[index].focus({ preventScroll: true }); inputs[index].select?.(); }; + function fill(text, index = 0, advance = false) { + const digits = numbers(text).slice(0, 6); + if (digits.length === 6) index = 0; + for (let offset = 0; offset < digits.length && index + offset < inputs.length; offset++) { + inputs[index + offset].value = digits[offset]; + } + sync(); + if (advance && digits.length) focus(Math.min(5, index + digits.length)); + } + function digit(text) { if (enabled && /^[0-9]$/.test(text)) fill(text, active, true); } + function backspace() { + if (!enabled) return; + if (!inputs[active].value && active > 0) active--; + inputs[active].value = ''; sync(); focus(active); + } + inputs.forEach((input, index) => { + input.addEventListener('focus', () => { active = index; input.select?.(); onFocus(index); }); + input.addEventListener('click', () => onFocus(index)); + input.addEventListener('input', () => { + const text = numbers(input.value); + input.value = ''; + fill(text, index, true); + }); + input.addEventListener('paste', event => { + const text = numbers(event.clipboardData?.getData('text')); + event.preventDefault(); + if (text) fill(text, index, true); + }); + input.addEventListener('keydown', event => { + if (event.ctrlKey || event.metaKey || event.altKey) return; + active = index; + if (/^[0-9]$/.test(event.key)) { event.preventDefault(); digit(event.key); return; } + if (event.key === 'Backspace') { event.preventDefault(); backspace(); return; } + if (event.key === 'Delete') { event.preventDefault(); input.value = ''; sync(); return; } + if (event.key === 'Escape') { event.preventDefault(); onDismiss(); return; } + let next = index; + if (event.key === 'ArrowLeft') next = Math.max(0, index - 1); + else if (event.key === 'ArrowRight') next = Math.min(5, index + 1); + else if (event.key === 'Home') next = 0; + else if (event.key === 'End') next = 5; + else return; + event.preventDefault(); focus(next); + }); + }); + const set = text => { inputs.forEach(input => { input.value = ''; }); fill(text); }; + set(value.value); + return { set, digit, backspace, clear() { if (enabled) { set(''); focus(0); } }, + focus() { focus(Math.max(0, inputs.findIndex(input => !/^[0-9]$/.test(input.value)))); }, + get activeIndex() { return active; }, get complete() { return complete(); }, enabled(value) { + enabled = value; + inputs.forEach(input => { input.disabled = !enabled; input.required = enabled; }); + sync(); + } }; +} + +// Positions are in visual-viewport CSS coordinates, including pinch-zoom offsets. +export function placePairingKeypad(anchor, viewport, size) { + const margin = 12, gap = 8; + const left = viewport.left + margin, top = viewport.top + margin; + const right = viewport.left + viewport.width - margin, bottom = viewport.top + viewport.height - margin; + if (size.width > right - left || size.height > bottom - top || anchor.top < top || anchor.bottom > bottom) return null; + const x = Math.max(left, Math.min(anchor.left, right - size.width)); + const y = Math.max(top, Math.min(anchor.top, bottom - size.height)); + if (anchor.bottom + gap + size.height <= bottom) return { left: x, top: anchor.bottom + gap, placement: 'below' }; + if (anchor.top - gap - size.height >= top) return { left: x, top: anchor.top - gap - size.height, placement: 'above' }; + if (anchor.right + gap + size.width <= right) return { left: anchor.right + gap, top: y, placement: 'right' }; + if (anchor.left - gap - size.width >= left) return { left: anchor.left - gap - size.width, top: y, placement: 'left' }; + return null; +} + +// Browser-local measurements: committed images per rolling second and receive-to-decode time. +export function createImageDebugStats(now = () => performance.now()) { + let started = now(), frames = [], decodeMs = null, totalFrames = 0; + return { + reset() { started = now(); frames = []; decodeMs = null; totalFrames = 0; }, + frame(receivedAt) { + const at = now(); frames.push(at); totalFrames++; + if (frames.length > 240) frames.shift(); + decodeMs = Number.isFinite(receivedAt) ? Math.max(0, at - receivedAt) : null; + }, + sample() { + const at = now(); frames = frames.filter(frame => frame > at - 1000); + return { fps: at - started >= 1000 ? frames.length : null, decodeMs, totalFrames }; + }, + }; +} + // Source availability, a committed picture and input readiness are independent. // Silence is normal for a static screen; only an explicit gap starts this deadline. export function createPresentationController({ @@ -509,7 +603,7 @@ export function createRtcReceiver(createRenderer, { const caps = RTCRtpReceiver.getCapabilities('video'); return !caps || caps.codecs.some(c => c.mimeType.toLowerCase() === `video/${codec.toLowerCase()}`); }, - schedule = setTimeout, cancel = clearTimeout, now = () => Date.now(), + schedule = setTimeout, cancel = clearTimeout, now = () => performance.now(), } = {}) { let renderer = null, track = null, previousStats = null, renderStalledSince = null, lastRendered = 0; let codec = 'H264'; @@ -590,6 +684,7 @@ export function createRtcReceiver(createRenderer, { presentedFps: presented !== null && previous?.presented !== null && elapsed ? Math.max(0, presented - previous.presented) * 1000 / elapsed : null, renderedFps: rendered !== null && previous?.rendered !== null && elapsed ? Math.max(0, rendered - previous.rendered) * 1000 / elapsed : null, renderedFrames: rendered, + presentedFrames: presented, decodeMs: averageMs('totalDecodeTime', 'framesDecoded'), jitterBufferMs: averageMs('jitterBufferDelay', 'jitterBufferEmittedCount'), processingMs: averageMs('totalProcessingDelay', 'framesDecoded'), @@ -680,16 +775,130 @@ import { createBrowserMediaSession } from './browser-media-session.js'; if (typeof document !== 'undefined') { const $ = id => document.getElementById(id); + const pinDigits = Array.from({ length: 6 }, (_, index) => $(`code-digit-${index + 1}`)); + const keypad = $('pairing-keypad'); + keypad.hidden = true; + let keypadFrame = null, keypadNeedsReveal = false, suppressKeypadFocus = false; + const pairingCode = createPairingCodeInput(pinDigits, $('code'), { + onChange(valid) { + // Readonly fields suppress platform keyboards. Keep native form validation on + // the submit button, which cannot summon a platform keyboard when invalid. + $('connect').setCustomValidity?.(valid ? '' : t('web_pairing_code_incomplete')); + $('keypad-code').textContent = pinDigits.map(input => input.value || '·').join(' '); + if (valid && $('message').textContent === t('web_pairing_code_incomplete')) $('message').textContent = ''; + }, + onFocus(index) { if (!suppressKeypadFocus) openPinKeypad(index); }, + onDismiss: closePinKeypad, + }); + function clearPinKeypadSpace() { + $('keypad-scroll-space').hidden = true; + document.body?.classList.toggle('pin-keypad-open', false); + } + function closePinKeypad(keepScrollSpace = false) { + if (keypadFrame !== null) cancelAnimationFrame(keypadFrame); + keypadFrame = null; keypadNeedsReveal = false; + try { keypad.hidePopover?.(); } catch (_) {} + keypad.hidden = true; + if (!keepScrollSpace) clearPinKeypadSpace(); + pinDigits.forEach(input => { input.setAttribute('aria-expanded', 'false'); input.classList?.toggle('keypad-active', false); }); + } + function positionPinKeypad(reveal = false) { + if (keypad.hidden) return; + const visual = window.visualViewport; + const visible = { left: visual?.offsetLeft || 0, top: visual?.offsetTop || 0, + width: visual?.width || window.innerWidth, height: visual?.height || window.innerHeight }; + const content = $('main-content').getBoundingClientRect(); + const viewport = { left: Math.max(visible.left, content.left), top: Math.max(visible.top, content.top) }; + viewport.width = Math.min(visible.left + visible.width, content.right) - viewport.left; + viewport.height = Math.min(visible.top + visible.height, content.bottom) - viewport.top; + const anchor = $('pin-inputs'); + let rect = anchor.getBoundingClientRect(); + keypad.style.width = `${Math.max(1, Math.min(304, viewport.width - 24))}px`; + keypad.style.maxHeight = `${Math.max(1, viewport.height - 24)}px`; + const keyHeight = Math.max(28, Math.min(48, Math.floor((viewport.height - rect.height - 24 - 8 - 98) / 4))); + keypad.style.setProperty('--keypad-key-height', `${keyHeight}px`); + const size = keypad.getBoundingClientRect(); + let position = placePairingKeypad(rect, viewport, size); + if (!position) { + // Let users scroll away from the field without fighting their scroll gesture. + if (!reveal) { closePinKeypad(true); return; } + const spacer = $('keypad-scroll-space'); + spacer.style.height = `${size.height + rect.height + 32}px`; spacer.hidden = false; + $('main-content').scrollTop += rect.top - viewport.top - 12; + rect = anchor.getBoundingClientRect(); + position = placePairingKeypad(rect, viewport, size); + } + // Extremely short viewports retain a scrollable keypad and a visible copy of + // all six digits in its header, even when both full controls cannot fit. + position ||= { left: Math.max(viewport.left + 12, Math.min(rect.left, viewport.left + viewport.width - size.width - 12)), + top: viewport.top + viewport.height - size.height - 12, placement: 'compact' }; + keypad.style.left = `${position.left}px`; keypad.style.top = `${position.top}px`; + keypad.dataset.placement = position.placement; + } + function schedulePinKeypad(event) { + keypadNeedsReveal ||= event?.type === 'resize'; + if (keypad.hidden || keypadFrame !== null) return; + keypadFrame = requestAnimationFrame(() => { + keypadFrame = null; const reveal = keypadNeedsReveal; keypadNeedsReveal = false; positionPinKeypad(reveal); + }); + } + function openPinKeypad(index) { + if ($('code-entry').hidden || pinDigits[index].disabled) return; + pinDigits.forEach((input, slot) => { input.setAttribute('aria-expanded', 'true'); input.classList?.toggle('keypad-active', slot === index); }); + if (keypad.hidden) { + keypad.hidden = false; + document.body?.classList.toggle('pin-keypad-open', true); + try { keypad.showPopover?.(); } catch (_) {} + } + positionPinKeypad(true); + } + for (let digit = 0; digit <= 9; digit++) $('keypad-' + digit).addEventListener('click', () => pairingCode.digit(String(digit))); + $('keypad-delete').addEventListener('click', () => pairingCode.backspace()); + $('keypad-clear').addEventListener('click', () => pairingCode.clear()); + $('keypad-done').addEventListener('click', () => { + closePinKeypad(); suppressKeypadFocus = true; + pinDigits[pairingCode.activeIndex].focus({ preventScroll: true }); suppressKeypadFocus = false; + }); + keypad.addEventListener('pointerdown', event => { if (event.target.closest('button')) event.preventDefault(); }); + keypad.addEventListener('keydown', event => { + if (event.ctrlKey || event.metaKey || event.altKey) return; + if (/^[0-9]$/.test(event.key)) { event.preventDefault(); pairingCode.digit(event.key); } + else if (event.key === 'Backspace') { event.preventDefault(); pairingCode.backspace(); } + }); + document.addEventListener('pointerdown', event => { + if (!keypad.hidden && !keypad.contains(event.target) && !pinDigits.includes(event.target)) closePinKeypad(true); + }); + document.addEventListener('click', () => { if (keypad.hidden) clearPinKeypadSpace(); }); + document.addEventListener('keyup', () => { if (keypad.hidden) clearPinKeypadSpace(); }); + document.addEventListener('focusin', event => { + if (!keypad.hidden && !keypad.contains(event.target) && !pinDigits.includes(event.target)) closePinKeypad(true); + }); + document.addEventListener('keydown', event => { if (event.key === 'Escape' && !keypad.hidden) { event.preventDefault(); closePinKeypad(); } }); + $('main-content').addEventListener('scroll', schedulePinKeypad, { passive: true }); + window.addEventListener('resize', schedulePinKeypad); + for (const event of ['resize', 'scroll']) window.visualViewport?.addEventListener(event, schedulePinKeypad); + $('connect').addEventListener('invalid', event => { + event.preventDefault(); $('message').textContent = t('web_pairing_code_incomplete'); pairingCode.focus(); + }); const screen = $('screen'); const screens = [screen, $('screen-next'), $('screen-third')]; const heldFrame = $('held-frame'); let video = null; const canvas = $('video-canvas'); const display = $('display'); + const settingsDialog = $('settings-dialog'); const touchSurface = $('touch-surface'); // Read-only diagnostic snapshots; counters never include pairing credentials or video payloads. const rendererStats = { selectedMode: 'native', activeMode: 'waiting', renderedFps: null, renderedFrames: null, fallbackReason: null }; const performanceStats = { source: null, transport: null, receiver: null, image: null, presentation: rendererStats }; + const imageDebugStats = createImageDebugStats(); + let debugRevision = null; + const debugOption = $('settings-debug'); + try { debugOption.checked = window.localStorage.getItem('wheelplay.debugOverlay') === 'true'; } catch (_) {} + debugOption.addEventListener('change', () => { + try { window.localStorage.setItem('wheelplay.debugOverlay', String(debugOption.checked)); } catch (_) {} + renderDebug(); + }); const webpSupport = probeWebp(); Object.defineProperty(window, 'wheelplayStats', { configurable: true, get: () => JSON.parse(JSON.stringify(performanceStats)) }); let rtc = null, rtcRequested = false, rtcFps = null; @@ -700,13 +909,19 @@ if (typeof document !== 'undefined') { let launchPresentation = null; const locationOption = $('browser-location'); locationOption.checked = false; // Never inherit form restoration or grant consent through storage. + $('settings-browser-location').checked = false; const browserLocation = createBrowserLocation({ send: data => send(data), onState(enabled, message, key) { locationOption.checked = enabled; + $('settings-browser-location').checked = enabled; $('location-status').textContent = message; + $('settings-location-status').textContent = message; $('location-message').textContent = message; $('location-message').hidden = !message || ['web_location_ready', 'web_location_active'].includes(key); } }); locationOption.addEventListener('change', () => { void browserLocation.setEnabled(locationOption.checked); }); + $('settings-browser-location').addEventListener('change', () => { + void browserLocation.setEnabled($('settings-browser-location').checked); + }); const devicePreference = 'wheelplay.browserDevice'; let pairingToken = null, qrGeneration = 0, qrTimer = null, qrRequest = null; let viewportReportTimer = null, lastViewportSignature = ''; @@ -728,9 +943,15 @@ if (typeof document !== 'undefined') { for (const name of ['left', 'top', 'width', 'height', 'transform']) display.style.removeProperty(name); } } - ignoreZoomOption.addEventListener('change', () => { + function updateIgnoreZoom() { + $('settings-ignore-browser-zoom').checked = ignoreZoomOption.checked; try { window.localStorage.setItem(ignoreZoomPreference, String(ignoreZoomOption.checked)); } catch (_) {} release(); syncDisplayZoom(); scheduleViewportReport(); + } + ignoreZoomOption.addEventListener('change', updateIgnoreZoom); + $('settings-ignore-browser-zoom').addEventListener('change', () => { + ignoreZoomOption.checked = $('settings-ignore-browser-zoom').checked; + updateIgnoreZoom(); }); const presentation = createPresentationController({ onChange: renderPresentation }); const jpeg = createJpegPresenter(screens, { @@ -738,6 +959,8 @@ if (typeof document !== 'undefined') { if (meta.width && (meta.width !== frameWidth || meta.height !== frameHeight)) return false; if (!presentation.present(meta, frameWidth, frameHeight, 'jpeg', meta.revision)) return false; width = frameWidth; height = frameHeight; + imageDebugStats.frame(meta.receivedAt); + renderDebug(); clearHeldFrame(); return true; }, onError: meta => { @@ -806,10 +1029,12 @@ if (typeof document !== 'undefined') { } } catch (_) {} function showPairingReady(name = t("web_browser_paired")) { + closePinKeypad(); $('remembered-device').hidden = false; $('device-name').textContent = name; $('qr-pairing').hidden = true; $('pair-instructions').hidden = true; $('code-entry').hidden = true; $('code').required = false; $('code').disabled = true; + pairingCode.enabled(false); $('connect-label').textContent = t("web_start_display"); $('connect').disabled = false; $('status').textContent = t("web_paired_ready_to_start"); $('message').textContent = ''; @@ -818,6 +1043,7 @@ if (typeof document !== 'undefined') { $('remembered-device').hidden = true; $('qr-pairing').hidden = false; $('pair-instructions').hidden = false; $('code-entry').hidden = false; $('code').required = true; $('code').disabled = false; + pairingCode.enabled(true); $('connect-label').textContent = t("web_pair_start_display"); $('connect').disabled = false; } @@ -867,7 +1093,7 @@ if (typeof document !== 'undefined') { } } if (linkedCode) { - $('code').value = linkedCode; + pairingCode.set(linkedCode); try { const result = await pairApi('code', { code: linkedCode }); if (generation !== authGeneration) return; @@ -1012,11 +1238,25 @@ if (typeof document !== 'undefined') { ? { type: 'touch', contacts: [] } : { type: 'input', kind: 'release' }); } + function openSettings() { + if (display.hidden || settingsDialog.open) return; + release(); + $('settings-ignore-browser-zoom').checked = ignoreZoomOption.checked; + settingsDialog.showModal(); + presentation.refresh(); + } + $('settings-close').addEventListener('click', () => settingsDialog.close()); + settingsDialog.addEventListener('close', () => presentation.refresh()); + $('settings-fullscreen').addEventListener('click', toggleFullscreen); + $('settings-disconnect').addEventListener('click', () => disconnect()); function renderPresentation(value) { + if (debugRevision !== value.revision) { + debugRevision = value.revision; imageDebugStats.reset(); performanceStats.receiver = null; + } if (value.revision !== desktopRevision) { desktop.release(false); desktopRevision = value.revision; } - live = value.interactive; + live = value.interactive && !settingsDialog.open; for (const surface of [...screens, video, canvas, heldFrame].filter(Boolean)) surface.classList.toggle('stale', !value.visible); touchSurface.classList.toggle('stale', !live); $('waiting').hidden = value.visible; @@ -1032,6 +1272,41 @@ if (typeof document !== 'undefined') { t('web_video_input_unavailable', transport) : t('web_connected_waiting_for_iphone_video'); $('media-message').hidden = !value.visible || value.interactive; $('media-message').textContent = value.visible && !value.interactive ? $('status').textContent : ''; + renderDebug(); + } + function renderDebug() { + const enabled = debugOption.checked && !display.hidden; + $('debug-overlay').hidden = !enabled; + display.classList.toggle('debug-visible', enabled); + if (!enabled) return; + const current = presentation.current, showing = current.state === 'showing'; + const isRtc = current.frame?.transport === 'rtc'; + const receiver = showing && isRtc ? performanceStats.receiver : null; + const image = imageDebugStats.sample(); + const number = (value, suffix = '') => Number.isFinite(value) && value >= 0 ? `${value.toFixed(1)}${suffix}` : '—'; + $('debug-connection').textContent = $('status').textContent; + $('debug-endpoint').textContent = `${location.protocol === 'https:' ? 'WSS' : 'WS'} · ${location.host}`; + $('debug-video').textContent = current.frame + ? `${current.frame.width} × ${current.frame.height}${isRtc ? ` · WebRTC / ${rendererStats.activeMode}` : ''}` : '—'; + $('debug-format').textContent = current.frame + ? isRtc ? rtc?.codec === 'H265' ? 'HEVC' : rtc?.codec === 'H264' ? 'H.264' : '—' : current.frame.mime === 'image/webp' ? 'WebP' : 'JPEG' : '—'; + const presentedFps = launchMode === 'native' ? receiver?.presentedFps : receiver?.renderedFps; + $('debug-fps-summary').textContent = number(showing ? isRtc ? presentedFps : image.fps : null, ' fps'); + $('debug-fps-row').hidden = !isRtc; + $('debug-fps-label').textContent = t(isRtc ? 'web_debug_rtc_fps' : 'web_debug_image_fps'); + $('debug-fps').textContent = isRtc + ? `${number(receiver?.receivedFps)} / ${number(receiver?.decodedFps)} / ${number(launchMode === 'native' ? receiver?.presentedFps : receiver?.renderedFps)} fps` + : number(showing ? image.fps : null, ' fps'); + const totalFrames = isRtc ? launchMode === 'native' ? receiver?.presentedFrames : receiver?.renderedFrames : showing ? image.totalFrames : null; + $('debug-frames').textContent = Number.isSafeInteger(totalFrames) && totalFrames >= 0 ? String(totalFrames) : '—'; + $('debug-latency-label').textContent = t(isRtc ? 'web_debug_rtt' : 'web_debug_image_ack'); + $('debug-summary-latency').title = $('debug-latency-label').textContent; + const ack = performanceStats.image?.lastAckMs; + $('debug-latency').textContent = number(isRtc ? receiver?.rttMs : showing && ack > 0 ? ack : null, ' ms'); + $('debug-decode-label').textContent = t(isRtc ? 'web_debug_decode' : 'web_debug_image_decode'); + $('debug-decode').textContent = number(isRtc ? receiver?.decodeMs : showing ? image.decodeMs : null, ' ms'); + $('debug-buffer-row').hidden = !isRtc; + $('debug-buffer').textContent = number(receiver?.jitterBufferMs, ' ms'); } function clearHeldFrame() { heldFrame.hidden = true; heldFrame.width = heldFrame.height = 0; @@ -1053,13 +1328,14 @@ if (typeof document !== 'undefined') { if (rtc) rtc.close(); rtc = null; rtcRequested = false; rtcFps = null; video = null; performanceStats.source = performanceStats.transport = performanceStats.receiver = performanceStats.image = null; + imageDebugStats.reset(); rendererStats.activeMode = 'waiting'; } function exitLaunchFullscreen() { try { Promise.resolve(document.exitFullscreen()).catch(() => {}); } catch (_) {} } function prepareLaunchPresentation() { - const presentation = { immersive: $('fullscreen-on-start').checked, ownsFullscreen: false, cancelled: false }; + const presentation = { immersive: true, ownsFullscreen: false, cancelled: false }; launchPresentation = presentation; if (!presentation.immersive || document.fullscreenElement || !document.documentElement?.requestFullscreen) return; presentation.ownsFullscreen = true; @@ -1077,6 +1353,8 @@ if (typeof document !== 'undefined') { if (launchPresentation.ownsFullscreen && document.fullscreenElement) exitLaunchFullscreen(); } function disconnect(refreshQr = true) { + closePinKeypad(); + if (settingsDialog.open) settingsDialog.close(); stopQr(); authGeneration++; restoreLaunchPresentation(); @@ -1089,8 +1367,9 @@ if (typeof document !== 'undefined') { browserLocation.close(); $('topbar').hidden = false; $('pairing').hidden = false; $('display').hidden = true; syncDisplayZoom(); - $('disconnect').hidden = true; $('connect').disabled = false; + $('connect').disabled = false; $('status').textContent = t("web_disconnected"); + renderDebug(); if (refreshQr) initializePairing(); } function connect() { @@ -1139,6 +1418,7 @@ if (typeof document !== 'undefined') { onStop: reason => { if (socket !== ws) return; video = null; rtcFps = null; rendererStats.fallbackReason = reason; rendererStats.renderedFps = null; + performanceStats.receiver = null; presentation.invalidate('rtc'); }, onStats: (fps, metrics) => { @@ -1151,11 +1431,12 @@ if (typeof document !== 'undefined') { $('message').textContent = ''; $('phone-connect').disabled = false; $('phone-connect-message').textContent = t("web_keep_wheelplay_in_the_foreground_on_android_tap_connect"); - $('pairing').hidden = true; $('display').hidden = false; $('disconnect').hidden = false; - $('topbar').hidden = $('hide-toolbar').checked || Boolean(launchPresentation?.immersive); + $('pairing').hidden = true; $('display').hidden = false; + $('topbar').hidden = true; lastViewportSignature = ''; scheduleViewportReport(); $('status').textContent = t("web_connected_waiting_for_video"); + renderDebug(); send({ type: 'ping' }); clearInterval(heartbeat); heartbeat = setInterval(() => { @@ -1170,6 +1451,7 @@ if (typeof document !== 'undefined') { if (socket !== ws || ws.readyState !== WebSocket.OPEN) return; if (typeof event.data === 'string') { const data = JSON.parse(event.data); + if (data.type === 'open-settings') { openSettings(); return; } if (browserMedia.receive(data)) return; if (browserAudio.control(data)) return; if (data.type === 'rtc-offer' || data.type === 'rtc-stop') { @@ -1235,6 +1517,7 @@ if (typeof document !== 'undefined') { if (previousRevision !== presentation.current.revision) { rtc.close(); rtcRequested = false; } if (rtc?.active) { acknowledge(); return; } meta.revision = presentation.current.revision; + meta.receivedAt = performance.now(); const payload = packet ? packet.jpeg : event.data; jpeg.load(payload instanceof ArrayBuffer ? new Blob([payload], { type: packet?.mime || 'image/jpeg' }) : payload, meta, () => socket === ws && ws.readyState === WebSocket.OPEN && !rtc?.active && presentation.current.revision === meta.revision, @@ -1243,6 +1526,7 @@ if (typeof document !== 'undefined') { ws.onclose = () => { clearTimeout(connectTimer); if (socket !== ws) return; + if (settingsDialog.open) settingsDialog.close(); if (outbox) { outbox.close(); outbox = null; } cancelMove(); socket = null; pointers.clear(); desktop.release(false); pointerInput = false; keyboardInput = false; backButton = false; $('desktop-back').hidden = true; @@ -1257,6 +1541,7 @@ if (typeof document !== 'undefined') { } $('status').textContent = t("web_connection_interrupted_retrying"); $('stage').textContent = t("web_check_that_the_server_and_head_unit_are_still"); + renderDebug(); const generation = authGeneration; retry = setTimeout(async () => { if (deviceCredential) { @@ -1276,6 +1561,10 @@ if (typeof document !== 'undefined') { } $('connect-form').addEventListener('submit', event => { event.preventDefault(); + if (!pairingToken && !deviceCredential && !pairingCode.complete) { + $('message').textContent = t('web_pairing_code_incomplete'); pairingCode.focus(); return; + } + closePinKeypad(); launchMode = selectedMode; const generation = ++authGeneration; prepareLaunchPresentation(); @@ -1316,20 +1605,26 @@ if (typeof document !== 'undefined') { $('phone-connect').disabled = true; $('phone-connect-message').textContent = t("web_requesting_iphone_connection"); }); - $('disconnect').addEventListener('click', () => disconnect()); - $('fullscreen').addEventListener('click', async () => { + async function toggleFullscreen() { try { if (document.fullscreenElement) await document.exitFullscreen(); - else if (document.documentElement.requestFullscreen) await document.documentElement.requestFullscreen(); + else if (document.documentElement.requestFullscreen) { + const launch = launchPresentation; + await document.documentElement.requestFullscreen(); + if (launch && !launch.cancelled && launch === launchPresentation) launch.ownsFullscreen = true; + else if (launch?.cancelled && !launchPresentation?.immersive) exitLaunchFullscreen(); + } else $('status').textContent = t("web_this_browser_does_not_support_full_screen"); } catch (_) { $('status').textContent = t("web_use_the_browser_menu_to_toggle_full_screen"); } - }); + } + $('fullscreen').addEventListener('click', toggleFullscreen); document.addEventListener('fullscreenchange', () => { $('fullscreen').textContent = document.fullscreenElement ? t("web_exit_full_screen") : t("web_full_screen"); - if (!document.fullscreenElement && launchPresentation?.immersive) { - launchPresentation.immersive = false; - launchPresentation.ownsFullscreen = false; - $('topbar').hidden = false; + $('settings-fullscreen').textContent = $('fullscreen').textContent; + if (launchPresentation && !launchPresentation.cancelled) { + launchPresentation.immersive = Boolean(document.fullscreenElement); + if (!document.fullscreenElement) launchPresentation.ownsFullscreen = false; + $('topbar').hidden = paired && !display.hidden; } scheduleViewportReport(); }); @@ -1383,7 +1678,7 @@ if (typeof document !== 'undefined') { window.addEventListener('pageshow', event => { if (event.persisted) initializePairing(); }); const linkedCode = pairingCodeFromUrl(window.location?.search || ''); if (linkedCode) { - $('code').value = linkedCode; + pairingCode.set(linkedCode); // Keep the short-lived code out of copied URLs and browser history entries. window.history?.replaceState(null, '', `${window.location.pathname}${window.location.hash}`); } diff --git a/common/src/main/assets/web/index.html b/common/src/main/assets/web/index.html index 3e3c1846..bd153be8 100644 --- a/common/src/main/assets/web/index.html +++ b/common/src/main/assets/web/index.html @@ -10,14 +10,35 @@ -
WheelPlay
{{ui_waiting_for_connection}}
-
+
WheelPlay
{{ui_waiting_for_connection}}
+
{{web_local_network_head_unit_display}}

{{web_connect_your_carplay_display}}

-

{{web_for_the_first_connection_tap_scan_qr_code_to}}
{{web_then_scan_the_qr_code_below_and_allow_the}}

- - +
+
+ +
+
+

{{web_scan_to_connect_the_head_unit}}

+

{{web_for_the_first_connection_tap_scan_qr_code_to}} {{web_then_scan_the_qr_code_below_and_allow_the}}

+

{{web_generating_qr_code}}

+
+
{{web_six_digit_pairing_code_on_the_device}} +
+ + + + +
+ +
+ +
{{web_connect_the_device_and_head_unit_to_the_same}}
{{web_audio_and_microphone_use_android_by_default_enable_browser}}
+
+
+

{{ui_settings}}

+
{{web_video_renderer_title}}
@@ -27,13 +48,38 @@

{{web_connect_your_carplay_display}}

{{web_browser_microphone_requires_https}}

{{web_local_http_pages_cannot_request_microphone_permission_in_the}}

{{web_loading}}

- -

{{web_scan_to_connect_the_head_unit}}

{{web_generating_qr_code}}

-

{{web_you_can_also_enter_the_pairing_code}}

- -
{{web_connect_the_device_and_head_unit_to_the_same}}
{{web_audio_and_microphone_use_android_by_default_enable_browser}}
+
+
+
+
+ + diff --git a/common/src/main/assets/web/style.css b/common/src/main/assets/web/style.css index c17810e8..0a05823f 100644 --- a/common/src/main/assets/web/style.css +++ b/common/src/main/assets/web/style.css @@ -1,6 +1,54 @@ -:root{color-scheme:dark;font-family:"PingFang SC","Noto Sans CJK SC","Microsoft YaHei",sans-serif;color:#eef2ef;background:#11161a;font-synthesis:none}*{box-sizing:border-box}body{margin:0;height:100vh;height:100dvh;display:flex;flex-direction:column}button,input{font:inherit}button{min-height:52px;min-width:64px;border:1px solid #46514e;border-radius:8px;padding:0 20px;background:transparent;color:inherit;cursor:pointer}button:active{background:#354039}button:disabled{opacity:.5;cursor:wait}button:focus-visible,input:focus-visible,a:focus-visible{outline:3px solid #b4d9b1;outline-offset:4px}header{height:80px;flex-shrink:0;display:flex;align-items:center;gap:24px;padding:0 32px;border-bottom:1px solid #313b3a}.brand{text-decoration:none;color:inherit;font-size:24px;font-weight:650;letter-spacing:-1px}#status{color:#b5beb9;font-size:15px;flex:1}nav{display:flex;gap:12px}main{flex:1;min-height:0;position:relative;overflow:auto}#pairing{max-width:900px;padding:clamp(28px,6vh,80px) clamp(24px,6vw,100px);margin:auto}.eyebrow{color:#b4d9b1;font-size:14px;letter-spacing:2px}h1{font-size:clamp(32px,4vw,54px);line-height:1.2;font-weight:550;letter-spacing:-1.5px;margin:20px 0}p{color:#b5beb9;font-size:17px;line-height:1.7}form{margin-top:32px}label{display:block;margin-bottom:12px;font-size:14px}.form-row{display:flex;gap:12px;max-width:580px}input{min-width:0;flex:1;background:#1c2428;border:1px solid #46514e;border-radius:8px;padding:14px 18px;color:#eef2ef;font-size:22px;letter-spacing:3px}.primary{background:#b4d9b1;color:#17251b;border:0;min-width:170px;font-weight:600}.primary:active{background:#99be98}.primary .material-icon{width:24px;height:24px;fill:currentColor;vertical-align:middle;margin-left:12px}#message{color:#efbe90;min-height:28px;margin:12px 0}footer{border-top:1px solid #313b3a;padding-top:24px;margin-top:28px;color:#98a59f;font-size:14px;line-height:1.8}#display{height:100%;width:100%;position:relative;background:#0b0f12;overflow:hidden}#screen,#video{width:100%;height:100%;object-fit:contain;touch-action:none;user-select:none;-webkit-user-select:none;-webkit-touch-callout:none}#screen.stale,#video.stale{opacity:.2;pointer-events:none}#waiting{position:absolute;inset:0;display:flex;justify-content:center;align-items:center;flex-direction:column;padding:24px;text-align:center;pointer-events:none}#waiting strong{font-size:28px;font-weight:500}.hint{font-size:14px}[hidden]{display:none!important}@media(max-height:560px){header{height:64px;padding:0 20px}#pairing{padding:24px 32px}h1{font-size:32px;margin:12px 0}h1 br{display:none}form{margin-top:16px}footer{margin-top:16px;padding-top:12px}}@media(max-width:600px){header{padding:0 16px;gap:12px}.brand{font-size:20px}#status{font-size:13px}nav{gap:8px}nav button{padding:0 12px;min-width:52px}.form-row{flex-direction:column}.wide{display:none}h1{letter-spacing:-.5px}}@media(prefers-reduced-motion:no-preference){button{transition:background .15s ease}#screen,#video{transition:opacity .2s ease}} +:root{color-scheme:dark;font-family:"PingFang SC","Noto Sans CJK SC","Microsoft YaHei",sans-serif;color:#eef2ef;background:#11161a;font-synthesis:none}*{box-sizing:border-box}body{margin:0;height:100vh;height:100dvh;display:flex;flex-direction:column}button,input{font:inherit}button{min-height:52px;min-width:64px;border:1px solid #46514e;border-radius:8px;padding:0 20px;background:transparent;color:inherit;cursor:pointer}button:active{background:#354039}button:disabled{opacity:.5;cursor:wait}button:focus-visible,input:focus-visible,a:focus-visible{outline:3px solid #b4d9b1;outline-offset:4px}header{height:80px;flex-shrink:0;display:flex;align-items:center;gap:24px;padding:0 32px;border-bottom:1px solid #313b3a}.brand{text-decoration:none;color:inherit;font-size:24px;font-weight:650;letter-spacing:-1px}#status{color:#b5beb9;font-size:15px;flex:1}nav{display:flex;gap:12px}main{flex:1;min-height:0;position:relative;overflow:auto}#pairing{max-width:1240px;padding:40px;margin:auto}.eyebrow{color:#b4d9b1;font-size:14px;letter-spacing:2px}h1{font-size:clamp(32px,4vw,54px);line-height:1.2;font-weight:550;letter-spacing:-1.5px;margin:20px 0}p{color:#b5beb9;font-size:17px;line-height:1.7}form{margin-top:32px}label{display:block;margin-bottom:12px;font-size:14px}.form-row{display:flex;gap:12px;max-width:580px}input{min-width:0;flex:1;background:#1c2428;border:1px solid #46514e;border-radius:8px;padding:14px 18px;color:#eef2ef;font-size:22px;letter-spacing:3px}.primary{background:#b4d9b1;color:#17251b;border:0;min-width:170px;font-weight:600}.primary:active{background:#99be98}.primary .material-icon{width:24px;height:24px;fill:currentColor;vertical-align:middle;margin-left:12px}#message{color:#efbe90;min-height:28px;margin:12px 0}footer{border-top:1px solid #313b3a;padding-top:24px;margin-top:28px;color:#98a59f;font-size:14px;line-height:1.8}#display{height:100%;width:100%;position:relative;background:#0b0f12;overflow:hidden}#screen,#video{width:100%;height:100%;object-fit:contain;touch-action:none;user-select:none;-webkit-user-select:none;-webkit-touch-callout:none}#screen.stale,#video.stale{opacity:.2;pointer-events:none}#waiting{position:absolute;inset:0;display:flex;justify-content:center;align-items:center;flex-direction:column;padding:24px;text-align:center;pointer-events:none}#waiting strong{font-size:28px;font-weight:500}.hint{font-size:14px}[hidden]{display:none!important}@media(max-height:560px){header{height:64px;padding:0 20px}#pairing{padding:24px 32px}h1{font-size:32px;margin:12px 0}h1 br{display:none}form{margin-top:16px}footer{margin-top:16px;padding-top:12px}}@media(max-width:600px){header{padding:0 16px;gap:12px}.brand{font-size:20px}#status{font-size:13px}nav{gap:8px}nav button{padding:0 12px;min-width:52px}.form-row{flex-direction:column}.wide{display:none}h1{letter-spacing:-.5px}}@media(prefers-reduced-motion:no-preference){button{transition:background .15s ease}#screen,#video{transition:opacity .2s ease}} -.qr-pairing{display:flex;align-items:center;gap:24px;padding:24px;background:#1c2428;border-radius:24px;margin:24px 0}.qr-pairing img{width:240px;height:240px;max-width:100%;object-fit:contain;background:white;border-radius:8px;flex-shrink:0}.qr-pairing h2{font-size:21px;margin:0}.qr-pairing p{font-size:15px;margin:12px 0 20px}#pairing{max-width:1000px}@media(max-width:620px){.qr-pairing{flex-direction:column;align-items:flex-start;padding:20px}.qr-pairing img{align-self:center}} +/* Pairing and browser preferences share a responsive home. */ +#pairing h1{font-size:clamp(28px,3vw,38px);letter-spacing:-1px;margin:12px 0 32px} +.pairing-layout{display:grid;grid-template-columns:minmax(0,1fr);gap:36px} +.pairing-panel,.setup-panel{min-width:0} +.pairing-panel{width:100%;max-width:440px;margin:0 auto} +.qr-pairing{display:flex;flex-direction:column;align-items:center;text-align:center;margin:0} +.qr-image{display:grid;place-items:center;width:240px;height:240px;padding:8px;border:1px solid #313b3a;border-radius:16px;background:#1c2428;margin-bottom:24px} +.qr-pairing img{width:224px;height:224px;max-width:100%;object-fit:contain;background:white;border-radius:8px} +.qr-pairing h2{font-size:20px;font-weight:550;margin:0} +#pair-instructions{font-size:14px;line-height:1.7;margin:10px 0 0;max-width:360px} +#qr-status{font-size:13px;margin:12px 0;color:#b4d9b1} +#refresh-qr{min-height:44px;font-size:13px} +#connect-form{margin-top:28px} +#connect{width:100%;min-height:56px} +#code-entry{border:0;padding:24px 0 0;margin:0 0 20px;min-width:0;border-top:1px solid #313b3a} +#code-entry legend{padding:0;font-size:14px;color:#b5beb9} +.pin-inputs{display:grid;grid-template-columns:repeat(6,minmax(0,1fr));gap:8px;direction:ltr} +#code-entry .pin-digit{width:100%;min-width:0;height:58px;padding:0;text-align:center;font-size:28px;font-family:ui-monospace,SFMono-Regular,Consolas,monospace;letter-spacing:0;border-radius:10px;caret-color:#b4d9b1} +#code-entry .pin-digit:focus{border-color:#b4d9b1;outline:2px solid #b4d9b1;outline-offset:2px;background:#24352c} +.pairing-panel footer{font-size:12px;line-height:1.8;margin-top:20px;padding-top:20px} +#message:empty{display:none} +#remembered-device{margin:0 0 24px} +.setup-panel{border-top:1px solid #313b3a;padding-top:28px} +#setup-title{font-size:22px;font-weight:550;margin:0 0 12px} +.settings-list .launch-option{width:100%;margin:0;padding:18px 0;border-bottom:1px solid #313b3a;align-items:center;gap:24px} +.settings-list .launch-option span{flex:1;order:0} +.settings-list .launch-option input{order:1;margin:0;flex:0 0 44px;width:44px;height:26px;border-radius:20px;background:#303b3a;border:1px solid #46514e} +.settings-list .launch-option input::before{content:"";display:block;width:16px;height:16px;margin:4px;border-radius:50%;background:#b5beb9} +.settings-list .launch-option input:checked{background:#b4d9b1;border-color:#b4d9b1} +.settings-list .launch-option input:checked::before{transform:translateX(18px);background:#17251b} +.settings-list .launch-option strong{font-size:14px;font-weight:550} +.settings-list .launch-option small{font-size:12px;line-height:1.6} +.settings-list .renderer-options{margin:24px 0 0} +.settings-list .renderer-options legend{font-size:13px;color:#98a59f;margin-bottom:4px} +.settings-list .renderer-cards{display:flex;flex-direction:column;gap:0} +.settings-list .renderer-card{align-items:center;gap:20px;min-height:0;padding:14px 0;border:0;border-bottom:1px solid #313b3a;border-radius:0;background:transparent;box-shadow:none} +.settings-list .renderer-card input{order:1;margin:0 4px 0 auto;width:20px;height:20px} +.settings-list .renderer-card span{flex:1;order:0} +.settings-list .renderer-card strong{font-size:14px;font-weight:550} +.settings-list .renderer-card.selected strong{color:#b4d9b1} +.settings-list .renderer-card.selected{background:transparent;box-shadow:none;border:0;border-bottom:1px solid #313b3a} +.settings-list .renderer-card small{font-size:12px;margin-top:0} +.settings-list .renderer-card em{font-size:10px} +.settings-list .secure-setup{margin:0;padding:20px 0;border-radius:0;border-bottom:1px solid #313b3a;background:transparent;font-size:13px} +.settings-list .secure-setup p{font-size:12px} +#location-status:empty{display:none} +@media(min-width:960px){.pairing-layout{grid-template-columns:minmax(320px,.9fr) minmax(0,1.1fr);gap:56px}.pairing-panel{max-width:380px}.setup-panel{border-top:0;border-left:1px solid #313b3a;padding:0 0 0 40px}} +@media(max-width:959px){#pairing{max-width:620px;padding:28px 24px}#pairing h1{margin-bottom:24px}.setup-panel{padding-top:28px}.qr-image{width:224px;height:224px;margin-bottom:20px}.qr-pairing img{width:208px;height:208px}#connect-form{margin-top:24px}} +@media(max-width:380px){#pairing{padding:24px 16px}.pin-inputs{gap:6px}#code-entry .pin-digit{height:52px;font-size:24px}} #touch-surface{position:absolute;inset:0;touch-action:none;user-select:none;-webkit-user-select:none;z-index:1}#touch-surface.stale{pointer-events:none} #video-canvas{width:100%;height:100%;object-fit:contain;touch-action:none;user-select:none;-webkit-user-select:none;-webkit-touch-callout:none}#video-canvas.stale{opacity:.2;pointer-events:none} /* Keep a layout box for decoding without placing a native video surface on screen. */ @@ -10,7 +58,7 @@ #phone-connect{pointer-events:auto;position:relative;z-index:2}#phone-connect-message{max-width:560px} -#code-entry{margin-bottom:16px}#code-entry input{width:100%;max-width:360px}#remembered-device{margin-top:28px;padding:20px 24px;background:#1c2428;border:1px solid #46514e;border-radius:16px}#remembered-device strong{font-size:18px;color:#b4d9b1}#remembered-device p{margin:8px 0 0;font-size:15px} +#remembered-device{padding:20px 24px;background:#1c2428;border:1px solid #46514e;border-radius:16px}#remembered-device strong{font-size:18px;color:#b4d9b1}#remembered-device p{margin:8px 0 0;font-size:15px} #display.ignore-browser-zoom{position:fixed;transform-origin:0 0;z-index:3} #screen-next,#screen-third,#held-frame{width:100%;height:100%;object-fit:contain;touch-action:none;user-select:none;-webkit-user-select:none}#screen-next.stale,#screen-third.stale,#held-frame.stale{opacity:.2;pointer-events:none} @@ -23,3 +71,41 @@ /* Remains accessible in immersive display mode; absent for sources without Back. */ #desktop-back{position:absolute;left:12px;bottom:12px;z-index:2;opacity:.85} + +#settings-dialog{position:fixed;inset:0;margin:auto;width:min(560px,calc(100% - 32px));max-height:calc(100% - 32px);overflow:auto;padding:24px;border:1px solid #46514e;border-radius:20px;background:#1c2428;color:#eef2ef;box-shadow:0 24px 80px #0008} +#settings-dialog::backdrop{background:#0009} +.settings-heading{display:flex;align-items:center;justify-content:space-between;gap:20px} +.settings-heading h2{margin:0;font-size:24px;font-weight:550} +.settings-actions{display:flex;flex-wrap:wrap;gap:12px;margin-top:24px} +#settings-location-status:empty{display:none} + +/* Keep text opaque and readable even over a white video frame. Touches pass through. */ +#debug-overlay{position:absolute;top:12px;right:12px;top:max(12px,env(safe-area-inset-top));right:max(12px,env(safe-area-inset-right));z-index:3;width:min(360px,calc(100% - 24px));max-height:calc(100% - 24px);overflow:hidden;padding:14px 16px;border:1px solid #ffffff30;border-radius:12px;background:rgba(8,14,20,.86);color:#f3f7fa;box-shadow:0 4px 20px #0005;pointer-events:none;user-select:none;font-size:12px;line-height:1.5;font-variant-numeric:tabular-nums} +#debug-overlay h2{margin:0 0 10px;font-size:14px;font-weight:600;color:#fff} +#debug-overlay dl{display:grid;gap:6px;margin:0} +#debug-overlay dl div{display:grid;grid-template-columns:minmax(90px,auto) minmax(0,1fr);gap:12px;align-items:baseline} +#debug-overlay dt{color:#cbd5df} +#debug-overlay dd{margin:0;text-align:right;overflow-wrap:anywhere} +#debug-overlay p{margin:10px 0 0;padding-top:8px;border-top:1px solid #ffffff25;color:#cbd5df;font-size:11px;line-height:1.5} +#display.debug-visible #location-message{top:auto;bottom:16px;left:16px;right:auto} +@media(max-width:480px),(max-height:480px){#debug-overlay{padding:10px 12px;font-size:11px;width:min(320px,calc(100% - 24px))}#debug-overlay h2{font-size:12px;margin-bottom:6px}#debug-overlay dl{gap:4px}} + +.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0} +#debug-overlay .debug-summary{grid-template-columns:repeat(3,minmax(0,1fr));gap:12px;margin-bottom:10px;padding-bottom:12px;border-bottom:1px solid #ffffff25} +#debug-overlay .debug-summary>div{grid-template-columns:16px minmax(0,1fr);gap:6px;align-items:center} +#debug-overlay .debug-summary svg{display:block;width:16px;height:16px;fill:none;stroke:#b4d9b1;stroke-width:1.8;stroke-linecap:round;stroke-linejoin:round} +#debug-overlay .debug-summary dd{text-align:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font-size:13px;font-weight:600} +@media(max-width:480px),(max-height:480px){#debug-overlay .debug-summary{gap:8px;padding-bottom:10px}#debug-overlay .debug-summary>div{gap:4px}#debug-overlay .debug-summary dd{font-size:12px}} + +#code-entry .pin-digit.keypad-active{border-color:#b4d9b1;box-shadow:0 0 0 2px #b4d9b1;background:#24352c} +#pairing-keypad{position:fixed;inset:auto;margin:0;padding:12px;width:304px;max-width:calc(100% - 24px);overflow:auto;overscroll-behavior:contain;z-index:10;border:1px solid #58645e;border-radius:16px;background:#19221f;color:#eef2ef;box-shadow:0 12px 48px #0009;--keypad-key-height:48px} +.keypad-heading{display:flex;align-items:center;justify-content:space-between;gap:8px;min-height:40px;margin-bottom:10px} +#keypad-title{font-size:12px;font-weight:500;color:#b5beb9} +#keypad-code{font:18px/1.4 ui-monospace,SFMono-Regular,Consolas,monospace;white-space:nowrap;color:#b4d9b1} +#keypad-done{min-width:44px;min-height:40px;padding:0 8px;border:0;color:#b4d9b1;font-size:13px} +.keypad-keys{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:6px} +#pairing-keypad .keypad-keys button{min-width:0;height:var(--keypad-key-height);min-height:var(--keypad-key-height);padding:0 8px;border:1px solid #46514e;border-radius:8px;background:#25312c;font-size:22px;line-height:1;touch-action:manipulation;-webkit-tap-highlight-color:transparent} +#pairing-keypad .keypad-keys button:active{background:#b4d9b1;color:#17251b} +#pairing-keypad #keypad-clear{font-size:13px;background:transparent;color:#cbd5cf} +#keypad-delete svg{display:block;width:24px;height:24px;margin:auto;fill:none;stroke:currentColor;stroke-width:1.8;stroke-linecap:round;stroke-linejoin:round} +@media(max-height:480px){body.pin-keypad-open #topbar{display:none}} diff --git a/common/src/main/java/com/shilapi/xcertplay/web/BrowserStrings.kt b/common/src/main/java/com/shilapi/xcertplay/web/BrowserStrings.kt index 4f40763d..b59df082 100644 --- a/common/src/main/java/com/shilapi/xcertplay/web/BrowserStrings.kt +++ b/common/src/main/java/com/shilapi/xcertplay/web/BrowserStrings.kt @@ -9,6 +9,28 @@ import org.json.JSONObject internal object BrowserStrings { private val resources = mapOf( + "web_keypad_title" to UiR.string.web_keypad_title, + "web_keypad_done" to UiR.string.web_keypad_done, + "web_keypad_clear" to UiR.string.web_keypad_clear, + "web_keypad_delete" to UiR.string.web_keypad_delete, + "web_pairing_code_incomplete" to UiR.string.web_pairing_code_incomplete, + "web_debug_format" to UiR.string.web_debug_format, + "web_debug_image_decode" to UiR.string.web_debug_image_decode, + "web_debug_frames" to UiR.string.web_debug_frames, + "web_debug_title" to UiR.string.web_debug_title, + "web_debug_help" to UiR.string.web_debug_help, + "web_debug_connection" to UiR.string.web_debug_connection, + "web_debug_endpoint" to UiR.string.web_debug_endpoint, + "web_debug_video" to UiR.string.web_debug_video, + "web_debug_image_fps" to UiR.string.web_debug_image_fps, + "web_debug_rtc_fps" to UiR.string.web_debug_rtc_fps, + "web_debug_rtt" to UiR.string.web_debug_rtt, + "web_debug_image_ack" to UiR.string.web_debug_image_ack, + "web_debug_decode" to UiR.string.web_debug_decode, + "web_debug_buffer" to UiR.string.web_debug_buffer, + "web_debug_note" to UiR.string.web_debug_note, + "ui_settings" to UiR.string.ui_settings, + "ui_close" to UiR.string.ui_close, "web_location_title" to UiR.string.web_location_title, "web_location_help" to UiR.string.web_location_help, "web_location_https" to UiR.string.web_location_https, diff --git a/common/src/main/java/com/shilapi/xcertplay/web/LanWebServer.kt b/common/src/main/java/com/shilapi/xcertplay/web/LanWebServer.kt index 6256805a..3d628428 100644 --- a/common/src/main/java/com/shilapi/xcertplay/web/LanWebServer.kt +++ b/common/src/main/java/com/shilapi/xcertplay/web/LanWebServer.kt @@ -46,6 +46,10 @@ internal class LanWebServer( viewer?.frameAvailable() } + fun requestSettings() { + viewer?.requestSettings() + } + fun disconnectViewer() { viewer?.disconnect(context.getString(UiR.string.ui_device_removed)) } @@ -400,6 +404,11 @@ internal class LanWebServer( fun authorized() = token == null || pairing.authorized(token) + fun requestSettings() { + if (ended.get() || closing.get() || viewer !== this || !authorized()) return + reply(WebStreamSender.Control.SETTINGS, JSONObject().put("type", "open-settings").toString()) + } + @Volatile var lastSeen = SystemClock.elapsedRealtime() fun frameStalled(now: Long) = sender.frameStalled(now) diff --git a/common/src/main/java/com/shilapi/xcertplay/web/WebSession.kt b/common/src/main/java/com/shilapi/xcertplay/web/WebSession.kt index d2488f82..49eab91b 100644 --- a/common/src/main/java/com/shilapi/xcertplay/web/WebSession.kt +++ b/common/src/main/java/com/shilapi/xcertplay/web/WebSession.kt @@ -179,6 +179,11 @@ internal object WebSession { val hasViewer get() = server?.hasViewer == true || secureServer?.hasViewer == true + fun requestSettings() { + server?.requestSettings() + secureServer?.requestSettings() + } + val imageFormat: ImageFormat get() = if (server?.hasViewer == true) server?.imageFormat ?: ImageFormat.JPEG else secureServer?.imageFormat ?: ImageFormat.JPEG diff --git a/common/src/main/java/com/shilapi/xcertplay/web/WebStreamSender.kt b/common/src/main/java/com/shilapi/xcertplay/web/WebStreamSender.kt index 1199f913..ca6c1c9c 100644 --- a/common/src/main/java/com/shilapi/xcertplay/web/WebStreamSender.kt +++ b/common/src/main/java/com/shilapi/xcertplay/web/WebStreamSender.kt @@ -17,7 +17,7 @@ internal class WebStreamSender( private val versionedVideo: Boolean = false, private val imageProtocol: Int = if (versionedVideo) 2 else 1, ) : Closeable { - enum class Control { STATUS, PHONE_CONNECT, INPUT_UNAVAILABLE, BUSY, PONG, CLOSE, RTC, MIC_CONFIG, MIC_STOP, AUDIO_STOP, AUDIO_RESET, AUDIO_ROUTE, NOW_PLAYING, MEDIA_COMMAND_RESULT } + enum class Control { STATUS, PHONE_CONNECT, INPUT_UNAVAILABLE, BUSY, PONG, CLOSE, RTC, MIC_CONFIG, MIC_STOP, AUDIO_STOP, AUDIO_RESET, AUDIO_ROUTE, NOW_PLAYING, MEDIA_COMMAND_RESULT, SETTINGS } private data class Outgoing(val frame: WebSocketFrame, val afterSend: () -> Unit = {}) private val lock = Any() private val controls = linkedMapOf() diff --git a/common/src/main/java/moe/feng/wheelplay/CarPlayHostActivity.kt b/common/src/main/java/moe/feng/wheelplay/CarPlayHostActivity.kt index d00574ca..cdb7f59d 100644 --- a/common/src/main/java/moe/feng/wheelplay/CarPlayHostActivity.kt +++ b/common/src/main/java/moe/feng/wheelplay/CarPlayHostActivity.kt @@ -1023,6 +1023,7 @@ class CarPlayHostActivity : ComponentActivity() { savePairRecord = { record -> AirPlayPersistence.saveLockdownRecord(this, record) }, clearPairRecord = { AirPlayPersistence.clearLockdownRecord(this) }, locationProvider = locationProvider, + requestHostUi = WebSession::requestSettings, ) controller = next CarPlayBackgroundSession.store(next, renderer, size.width, size.height, this) { completion -> diff --git a/common/src/test/java/com/shilapi/xcertplay/web/LanWebServerTest.kt b/common/src/test/java/com/shilapi/xcertplay/web/LanWebServerTest.kt index 8bf4da4a..978909f9 100644 --- a/common/src/test/java/com/shilapi/xcertplay/web/LanWebServerTest.kt +++ b/common/src/test/java/com/shilapi/xcertplay/web/LanWebServerTest.kt @@ -21,6 +21,42 @@ import javax.net.ssl.HttpsURLConnection @RunWith(org.robolectric.RobolectricTestRunner::class) @org.robolectric.annotation.Config(qualifiers = "zh-rCN", sdk = [29]) class LanWebServerTest { + @Test fun settingsRequestUsesThePairedSocketWithoutReplayingOnReconnect() { + val context = org.robolectric.RuntimeEnvironment.getApplication() + val server = LanWebServer(context, "123456", port = 0) + server.start() + val port = server.listeningPort + val host = "127.0.0.1:$port" + val token = server.pairing.issueToken()!! + fun awaitViewer(expected: Boolean) { + val until = System.nanoTime() + TimeUnit.SECONDS.toNanos(2) + while (server.hasViewer != expected && System.nanoTime() < until) Thread.sleep(5) + assertEquals(expected, server.hasViewer) + } + try { + server.requestSettings() // No viewer: the event is not retained. + handshake("", "http://$host", token, host, port).use { client -> + assertTrue(readHeaders(client).startsWith("HTTP/1.1 101")) + awaitViewer(true) + server.requestSettings() + var type: String + do { type = org.json.JSONObject(frame(client).toString(Charsets.UTF_8)).getString("type") } + while (type != "open-settings") + } + awaitViewer(false) + handshake("", "http://$host", token, host, port).use { client -> + assertTrue(readHeaders(client).startsWith("HTTP/1.1 101")) + awaitViewer(true) + text(client, "{\"type\":\"ping\"}") + var type: String + do { + type = org.json.JSONObject(frame(client).toString(Charsets.UTF_8)).getString("type") + assertNotEquals("open-settings", type) + } while (type != "status") + } + } finally { server.stop() } + } + private fun startHttpsSession(context: android.content.Context) { // These tests exercise real TLS HTTP/WebSocket traffic, not async RSA startup latency. // The synchronous settings path returns only after the secure listener is bound. diff --git a/docs/PROJECTION_IMPLEMENTATION.md b/docs/PROJECTION_IMPLEMENTATION.md index 640302c0..34253f9c 100644 --- a/docs/PROJECTION_IMPLEMENTATION.md +++ b/docs/PROJECTION_IMPLEMENTATION.md @@ -12,6 +12,8 @@ Web 服务和浏览器配对不再依赖 MFi 身份。CarPlay 的连接入口仍执行原有认证检查,包括 USB 外部启动。 +浏览器手动配对使用六个明文只读输入框和页面内的浮动数字键盘,避免触发系统软键盘;实体数字键、退格、方向键和粘贴仍使用同一配对码控制器。完整性校验放在提交按钮上,防止只读字段跳过浏览器校验。浮层优先位于输入框下方,再尝试上方或侧边,按 visual viewport 的大小、偏移和缩放定位;短屏临时收起首页顶栏、压缩按键高度并按需补充滚动空间,让输入框和键盘同时可见;键盘关闭后恢复顶栏。极短视口下浮层自身可滚动,顶部始终显示当前六位内容。点击外部、按 Escape、收起、配对成功或启动显示时关闭;主动滚离输入框不会被浮层反复拉回。 + 在手机连接页面的「投影输入源」卡片选择「选择诊断输入源」: | 源 | 视频路径 | 交互 | @@ -22,6 +24,16 @@ Web 服务和浏览器配对不再依赖 MFi 身份。CarPlay 的连接入口仍 诊断源没有音频或麦克风能力,不申请相关资源。H.264 片段由 `scripts/generate-projection-fixture.py` 使用 ffmpeg/libx264 生成,320×180、15 fps、30 个访问单元,无第三方视频素材。Surface/framebuffer 尚无 WebRTC 重编码器,使用现有 JPEG/WebP 输出。切源会撤销浏览器控制租约并断开当前观看连接,需要重新连接;这是兼容没有会话版本字段的旧浏览器的明确行为。 +## CarPlay OEM 入口与浏览器设置 + +点击 CarPlay 应用列表中的 OEM「返回车机」入口时,`AirPlaySession` 将 `requestUI` 转为 `onHostUiRequested`。`CarPlayController` 只接受当前活动会话,通过持有的 `requestHostUi` 回调进入 `WebSession.requestSettings()`;HTTP / HTTPS 服务向当前已配对的浏览器发送一次 `{"type":"open-settings"}`,不缓存或在重连后重放,也不启动 Android 主屏。 + +前端使用原生模态 `dialog` 在页面中央显示设置,提供忽略浏览器缩放、浏览器定位、全屏和断开连接。弹窗复用既有偏好与定位授权逻辑,视频继续显示;打开时释放触控并暂停输入,关闭后按当前会话状态恢复。关闭按钮、Escape 和连接断开均可关闭弹窗。该链路由控制器测试、真实 WebSocket 测试和 Chromium 页面测试覆盖,OEM 点击本身仍需 iPhone / 车机实测。 + +首页不再提供隐藏顶栏和启动全屏选项。用户点击启动时,在手势内请求全屏,进入显示界面后始终移除顶栏占位,退出全屏也不恢复顶栏。通过 OEM 入口打开设置后,可退出或重新进入全屏、断开连接。自动重连不会覆盖用户退出全屏的选择;断开连接或配对失败会退出本次启动所进入的全屏,回到带顶栏的首页。 + +OEM 设置中的「调试信息」开关控制右上角悬浮窗口,默认关闭,偏好保存在当前浏览器。窗口使用 86% 不透明的深色背景和不透明浅色文字,允许触控穿透,不抢占输入。显示连接、服务地址、分辨率、传输方式、帧率和已呈现帧数。图像帧率按最近一秒的实际呈现次数计算,静止画面可为 0;WebRTC 分别显示接收、解码、呈现速率。图像确认耗时来自服务端最近一次 ACK(含浏览器解码),收帧至呈现耗时使用浏览器本地单调时钟;WebRTC 展示 getStats 的往返、解码和抖动缓冲耗时。这些是阶段指标,不代表端到端延迟。缺失指标显示「—」,断线和会话代次改变时清空旧接收数据。 + ## 接口和所有权 - `shared/.../projection/ProjectionSource.kt`:协议无关的描述、能力、可用性、触控快照、会话和 provider。核心接口不携带 Android Context、AAP protobuf 或 ICCOA SDK 对象。 diff --git a/scripts/test-media-presentation.mjs b/scripts/test-media-presentation.mjs index 5745cbe7..b9e55470 100644 --- a/scripts/test-media-presentation.mjs +++ b/scripts/test-media-presentation.mjs @@ -1,7 +1,7 @@ // Real Chromium + WebSocket + JPEG/WebP images. No phone or CarPlay hardware is simulated. import assert from 'node:assert/strict'; import http from 'node:http'; -import { readFile, mkdtemp, rm } from 'node:fs/promises'; +import { readFile, mkdtemp, rm, mkdir, writeFile } from 'node:fs/promises'; import { tmpdir } from 'node:os'; import { join } from 'node:path'; import { spawn, spawnSync } from 'node:child_process'; @@ -28,11 +28,16 @@ let media = { type: 'status', mediaProtocol: 3, sessionId: 7, videoEpoch: 1, wid sourceState: 'ready', inputReady: true, streaming: true, stage: 'Synthetic browser test' }; const server = http.createServer(async (req, res) => { res.setHeader('Content-Security-Policy', csp); + if (req.url.startsWith('/pair/qr?')) { + res.setHeader('Content-Type', 'image/svg+xml'); + res.end(await readFile(new URL('../test/fixtures/pairing-qr.svg', import.meta.url))); return; + } if (req.url === '/now-playing/artwork?id=test-cover') { res.setHeader('Content-Type', 'image/jpeg'); res.setHeader('Cache-Control', 'private, no-store'); res.end(images.jpeg[0]); return; } if (req.url.startsWith('/pair/')) { + if (req.url === '/pair/code') assert.equal(req.headers['x-pair-code'], '123456'); const result = req.url === '/pair/remember' ? { id: 'd'.repeat(32), secret: 's'.repeat(32), name: 'Test' } : req.url === '/pair/request' ? { id: 'qr', secret: 'poll', expiresIn: 120 } : req.url === '/pair/status' ? { state: 'pending' } : { token: 'session', name: 'Test' }; @@ -92,7 +97,7 @@ wss.on('connection', ws => { }); }); await new Promise(resolve => server.listen(0, '127.0.0.1', resolve)); -const browser = spawn(process.env.BROWSER_BIN || 'chromium', ['--headless', '--no-sandbox', '--disable-gpu', +const browser = spawn(process.env.BROWSER_BIN || 'chromium', [...(process.env.WHEELPLAY_BROWSER_HEADFUL === '1' ? [] : ['--headless']), '--no-sandbox', '--disable-gpu', '--disable-background-networking', '--no-first-run', '--remote-debugging-port=0', `--user-data-dir=${profile}`, 'about:blank'], { stdio: ['ignore', 'ignore', 'ignore'] }); let devtools; @@ -120,8 +125,8 @@ try { const command = (method, params = {}) => new Promise((resolve, reject) => { pending.set(++id, { resolve, reject }); devtools.send(JSON.stringify({ id, method, params })); }); - const evaluate = async expression => { - const result = await command('Runtime.evaluate', { expression, returnByValue: true, awaitPromise: true }); + const evaluate = async (expression, { userGesture = false } = {}) => { + const result = await command('Runtime.evaluate', { expression, returnByValue: true, awaitPromise: true, userGesture }); if (result.exceptionDetails) throw new Error(JSON.stringify(result.exceptionDetails)); return result.result.value; }; @@ -131,7 +136,10 @@ try { await pause(50); } const diagnostics = await evaluate(`({status:document.getElementById('status')?.textContent, - waiting:document.getElementById('waiting')?.hidden,exceptions:${JSON.stringify(errors)}})`); + waiting:document.getElementById('waiting')?.hidden,fullscreen:!!document.fullscreenElement, + fullscreenEnabled:document.fullscreenEnabled,topbarHidden:document.getElementById('topbar')?.hidden, + fullscreenTrace:window.fullscreenTrace, + exceptions:${JSON.stringify(errors)}})`); throw new Error(`Browser condition timed out: ${expression}\n${JSON.stringify(diagnostics)}`); }; const showing = `!!document.getElementById('waiting') && document.getElementById('waiting').hidden && !document.getElementById('touch-surface').classList.contains('stale')`; @@ -142,8 +150,109 @@ try { await command('Runtime.enable'); await command('Page.navigate', { url: `http://127.0.0.1:${server.address().port}/` }); await wait(`!!window.wheelplayStats && !!document.getElementById('connect') && !document.getElementById('connect').disabled`); - await evaluate(`document.getElementById('code').value='123456';document.getElementById('connect-form').requestSubmit()`); + await wait(`!document.getElementById('pair-qr').hidden && document.getElementById('pair-qr').naturalWidth > 0`); + assert.equal(await evaluate(`document.getElementById('hide-toolbar') === null && document.getElementById('fullscreen-on-start') === null`), true); + const screenshot = async name => { + if (!process.env.WHEELPLAY_BROWSER_REPORT_DIR) return; + await mkdir(process.env.WHEELPLAY_BROWSER_REPORT_DIR, { recursive: true }); + const { data } = await command('Page.captureScreenshot', { format: 'png' }); + await writeFile(join(process.env.WHEELPLAY_BROWSER_REPORT_DIR, name), Buffer.from(data, 'base64')); + }; + assert.equal(await evaluate(`document.getElementById('connect-form').checkValidity()`), false, 'Incomplete PIN cannot submit'); + await evaluate(` + const digit=document.getElementById('code-digit-3'); + digit.dispatchEvent(new ClipboardEvent('paste', {clipboardData:(()=>{const data=new DataTransfer();data.setData('text','123456');return data})(),cancelable:true}));`); + assert.equal(await evaluate(`document.getElementById('code').value`), '123456'); + assert.equal(await evaluate(`document.activeElement.id`), 'code-digit-6'); + assert.equal(await evaluate(`document.getElementById('connect-form').checkValidity()`), true); + await evaluate(` + window.fullscreenTrace=[]; + const originalFullscreen=Element.prototype.requestFullscreen; + Element.prototype.requestFullscreen=function(...args){ + const entry={active:navigator.userActivation.isActive,focused:document.hasFocus()};fullscreenTrace.push(entry); + const result=originalFullscreen.apply(this,args); + result.then(()=>{entry.resolved=true},error=>{entry.error=error.message});return result; + }; + document.addEventListener('fullscreenchange',()=>fullscreenTrace.push({event:!!document.fullscreenElement})); + document.addEventListener('fullscreenerror',()=>fullscreenTrace.push({event:'error'}));`); + await command('Page.bringToFront'); + const startButton = await evaluate(`(() => { + const button=document.getElementById('connect');button.scrollIntoView({block:'center'}); + const rect=button.getBoundingClientRect();return {x:rect.left+rect.width/2,y:rect.top+rect.height/2}; + })()`); + await command('Input.dispatchMouseEvent', { type: 'mousePressed', ...startButton, button: 'left', clickCount: 1 }); + await command('Input.dispatchMouseEvent', { type: 'mouseReleased', ...startButton, button: 'left', clickCount: 1 }); await wait(showing); + await wait(`document.getElementById('topbar').hidden`); + assert.equal(await evaluate(`document.getElementById('debug-overlay').hidden`), true); + assert.equal(await evaluate(`fullscreenTrace[0]?.active`), true, 'Default fullscreen is requested in the launch gesture'); + for (let attempt = 0; attempt < 40 && !await evaluate(`!!document.fullscreenElement`); attempt++) await pause(50); + const nativeFullscreenEntered = await evaluate(`!!document.fullscreenElement`); + // The OEM signal opens a modal above the stream, including immersive/zoomed layouts. + await touch('pointerdown'); + viewer.send(JSON.stringify({ type: 'open-settings' })); + await wait(`document.getElementById('settings-dialog').open`); + await touch('pointerup'); + const centeredSettings = await evaluate(`(() => { + const dialog=document.getElementById('settings-dialog'), rect=dialog.getBoundingClientRect(); + return { x:Math.abs(rect.left+rect.width/2-innerWidth/2), y:Math.abs(rect.top+rect.height/2-innerHeight/2), + modal:dialog.matches(':modal'), focus:dialog.contains(document.activeElement) }; + })()`); + assert.ok(centeredSettings.x < 2 && centeredSettings.y < 2, 'Settings must be centered in the viewport'); + assert.equal(centeredSettings.modal, true); + assert.equal(centeredSettings.focus, true); + viewer.send(JSON.stringify({ type: 'open-settings' })); status(); + await pause(100); + const settingsInputCount = touches.length + desktopInputs.length; + await touch('pointerdown'); await touch('pointerup'); await pause(100); + assert.equal(touches.length + desktopInputs.length, settingsInputCount, 'Dialog backdrop cannot forward input'); + assert.equal(await evaluate(`document.getElementById('waiting').hidden`), true, 'Modal preserves video'); + await evaluate(`document.getElementById('settings-debug').click()`); + assert.equal(await evaluate(`document.getElementById('debug-overlay').hidden`), false); + if (nativeFullscreenEntered) { + await evaluate(`document.getElementById('settings-fullscreen').click()`, { userGesture: true }); + await wait(`!document.fullscreenElement && document.getElementById('topbar').hidden`); + assert.equal(await evaluate(`document.getElementById('settings-dialog').open`), true, 'OEM settings remain available after leaving fullscreen'); + await evaluate(`document.getElementById('settings-fullscreen').click()`, { userGesture: true }); + await wait(`!!document.fullscreenElement && document.getElementById('topbar').hidden`); + await evaluate(`document.getElementById('settings-fullscreen').click()`, { userGesture: true }); + await wait(`!document.fullscreenElement && document.getElementById('topbar').hidden`); + } else { + assert.equal(await evaluate(`document.getElementById('settings-fullscreen').textContent`), messages.web_full_screen); + } + await command('Input.dispatchKeyEvent', { type: 'keyDown', key: 'Escape', code: 'Escape', windowsVirtualKeyCode: 27 }); + await command('Input.dispatchKeyEvent', { type: 'keyUp', key: 'Escape', code: 'Escape', windowsVirtualKeyCode: 27 }); + await wait(`!document.getElementById('settings-dialog').open && (${showing})`); + assert.equal(await evaluate(`document.getElementById('topbar').hidden`), true, 'The display never restores the homepage toolbar'); + const debugGeometry = await evaluate(`(() => { + const panel=document.getElementById('debug-overlay'), rect=panel.getBoundingClientRect(), display=document.getElementById('display').getBoundingClientRect(); + const style=getComputedStyle(panel); + return {top:rect.top-display.top,right:display.right-rect.right,pointerEvents:style.pointerEvents, + foreground:style.color,background:style.backgroundColor,opacity:style.opacity, + target:document.elementFromPoint(rect.left+40,rect.top+60)?.id,x:rect.left+40,y:rect.top+60}; + })()`); + assert.ok(debugGeometry.top >= 8 && debugGeometry.top <= 24 && debugGeometry.right >= 8 && debugGeometry.right <= 24); + assert.equal(debugGeometry.pointerEvents, 'none'); + assert.equal(debugGeometry.target, 'touch-surface'); + assert.equal(debugGeometry.opacity, '1', 'Text remains opaque'); + const foreground = debugGeometry.foreground.match(/[\d.]+/g).map(Number); + const background = debugGeometry.background.match(/[\d.]+/g).map(Number); + assert.ok(background[3] >= .8 && background[3] < 1, 'Background is translucent with enough contrast'); + const luminance = rgb => rgb.slice(0, 3).map(v => v / 255).map(v => v <= .04045 ? v / 12.92 : ((v + .055) / 1.055) ** 2.4) + .reduce((sum, v, index) => sum + v * [.2126, .7152, .0722][index], 0); + const brightestBackdrop = background.slice(0, 3).map(v => v * background[3] + 255 * (1 - background[3])); + assert.ok((luminance(foreground) + .05) / (luminance(brightestBackdrop) + .05) >= 4.5, 'Debug text stays readable over white video'); + const debugTouches = touches.length; + await command('Input.dispatchTouchEvent', {type:'touchStart',touchPoints:[{x:debugGeometry.x,y:debugGeometry.y,id:1}]}); + await command('Input.dispatchTouchEvent', {type:'touchEnd',touchPoints:[]}); + for (let attempt = 0; touches.length < debugTouches + 2 && attempt < 100; attempt++) await pause(10); + assert.equal(touches.length, debugTouches + 2, 'Debug overlay passes touches to the video'); + await wait(`document.getElementById('debug-decode').textContent.includes('ms')`); + await screenshot('display-debug.png'); + viewer.send(JSON.stringify({type:'open-settings'})); + await wait(`document.getElementById('settings-dialog').open`); + await evaluate(`document.getElementById('settings-debug').click();document.getElementById('settings-close').click()`); + assert.equal(await evaluate(`document.getElementById('debug-overlay').hidden`), true); await evaluate(` window.mediaHandlers = {}; const originalActionHandler = MediaSession.prototype.setActionHandler; @@ -244,14 +353,16 @@ try { await wait(`document.getElementById('status').textContent.includes('JPEG')`); assert.equal(jpegFallbacks, 1, 'A WebP decode failure must request JPEG and recover'); assert.equal(await evaluate('overlayFlashes'), 0, 'A failed WebP must preserve the last displayed picture'); + const releasesBeforeGap = desktopInputs.filter(input => input.kind === 'release').length; await touch('pointerdown'); paused = true; status({ sourceState: 'recovering', streaming: false, inputReady: false }); await wait(`!document.getElementById('media-message').hidden`); - for (let attempt = 0; touches.at(-1)?.contacts.length !== 0 && attempt < 100; attempt++) await pause(10); - assert.deepEqual(touches.at(-1).contacts, []); + for (let attempt = 0; desktopInputs.filter(input => input.kind === 'release').length === releasesBeforeGap && attempt < 100; attempt++) await pause(10); + assert.equal(desktopInputs.at(-1).kind, 'release', 'Versioned input releases the touch lease on a gap'); await touch('pointerup'); const count = touches.length; await touch('pointerdown'); await pause(50); assert.equal(touches.length, count, 'Gap must block new touch'); + await touch('pointerup'); await pause(2100); assert.equal(await evaluate(`document.getElementById('waiting').hidden`), false, 'Deadline expires without status'); assert.equal(viewer.readyState, WebSocket.OPEN); @@ -261,9 +372,10 @@ try { assert.equal(await evaluate(showing), true, 'Cancelled deadline must not hide recovered picture'); status({ pointerInput: true, keyboardInput: true, maxTouchContacts: 1 }); await pause(100); + const beforeDesktopDrag = desktopInputs.length; await command('Input.dispatchMouseEvent', { type: 'mousePressed', x: 100, y: 100, button: 'left', buttons: 1, clickCount: 1 }); - await pause(100); - assert.equal(desktopInputs.at(-1).buttons, 1); + for (let attempt = 0; !desktopInputs.slice(beforeDesktopDrag).some(input => input.kind === 'pointer' && input.buttons === 1) && attempt < 100; attempt++) await pause(10); + assert.ok(desktopInputs.slice(beforeDesktopDrag).some(input => input.kind === 'pointer' && input.buttons === 1), 'Mouse press arrives even if a keepalive follows it'); status({ videoEpoch: 2 }); await wait(`document.getElementById('touch-surface').classList.contains('stale')`); frame(1); await pause(100); @@ -290,9 +402,91 @@ try { assert.equal(mediaCommands.length, 2, 'Retired system controls cannot reach the replacement socket'); assert.equal(await evaluate(`document.getElementById('waiting').hidden`), false, 'Reconnect must wait for its own frame'); frame(); await wait(showing); + // Capture the home layout after returning from the display session. + await evaluate(`document.getElementById('settings-disconnect').click();localStorage.clear()`); + await command('Page.navigate', { url: `http://127.0.0.1:${server.address().port}/` }); + await wait(`!document.getElementById('pair-qr')?.hidden && document.getElementById('pair-qr')?.naturalWidth > 0`); + const homeGeometry = `(() => { + const left=document.querySelector('.pairing-panel').getBoundingClientRect(), right=document.querySelector('.setup-panel').getBoundingClientRect(); + return {left:left.x,right:right.x,leftBottom:left.bottom,rightTop:right.top,overflow:document.querySelector('main').scrollWidth>innerWidth}; + })()`; + await command('Emulation.setDeviceMetricsOverride', { width: 1360, height: 1000, deviceScaleFactor: 1, mobile: false }); + let home = await evaluate(homeGeometry); + assert.ok(home.right > home.left + 300, 'Wide home separates pairing and settings into two columns'); + assert.equal(home.overflow, false); + await screenshot('home-wide.png'); + await command('Emulation.setDeviceMetricsOverride', { width: 390, height: 844, deviceScaleFactor: 1, mobile: false }); + home = await evaluate(homeGeometry); + assert.ok(home.rightTop >= home.leftBottom, 'Narrow home places settings below pairing'); + assert.equal(home.overflow, false); + await screenshot('home-mobile.png'); + const keypadGeometry = `(() => { + const panel=document.getElementById('pairing-keypad'), anchor=document.getElementById('pin-inputs'), visual=visualViewport; + return {hidden:panel.hidden,panel:panel.getBoundingClientRect().toJSON(),anchor:anchor.getBoundingClientRect().toJSON(),content:document.getElementById('main-content').getBoundingClientRect().toJSON(), + viewport:{left:visual?.offsetLeft||0,top:visual?.offsetTop||0,width:visual?.width||innerWidth,height:visual?.height||innerHeight}, + placement:panel.dataset.placement,readonly:[...anchor.querySelectorAll('input')].every(input=>input.readOnly&&input.inputMode==='none')}; + })()`; + const tapKey = async id => { + const point=await evaluate(`(()=>{const r=document.getElementById('${id}').getBoundingClientRect();return{x:r.left+r.width/2,y:r.top+r.height/2}})()`); + await command('Input.dispatchTouchEvent',{type:'touchStart',touchPoints:[{...point,id:1}]}); + await command('Input.dispatchTouchEvent',{type:'touchEnd',touchPoints:[]}); + await pause(30); + }; + for (const [width,height,name] of [[1360,1000,'wide'],[390,844,'mobile'],[800,360,'landscape'],[320,320,'short']]) { + await evaluate(`document.getElementById('keypad-done').click()`); + await command('Emulation.setDeviceMetricsOverride',{width,height,deviceScaleFactor:1,mobile:false}); + await evaluate(`{document.getElementById('main-content').scrollTop=0;const field=document.getElementById('code-digit-1');field.focus({preventScroll:true});field.click()}`); + await wait(`!document.getElementById('pairing-keypad').hidden`); + await pause(80); + const geometry=await evaluate(keypadGeometry), {panel,anchor,viewport}=geometry; + assert.equal(geometry.hidden,false,`${name}: keypad remains open after bringing the field into view`); + assert.equal(geometry.readonly,true,'PIN fields cannot summon the system keyboard'); + assert.ok(panel.left>=viewport.left+10&&panel.top>=viewport.top+10&&panel.right<=viewport.left+viewport.width-10&&panel.bottom<=viewport.top+viewport.height-10,`${name}: keypad fits the visual viewport`); + assert.ok(panel.right<=anchor.left||panel.left>=anchor.right||panel.bottom<=anchor.top||panel.top>=anchor.bottom,`${name}: keypad does not cover the six-digit input`); + assert.ok(anchor.top>=Math.max(viewport.top,geometry.content.top)+10&&anchor.bottom<=Math.min(viewport.top+viewport.height,geometry.content.bottom)-10,`${name}: input remains visible below the header`); + await tapKey('keypad-clear'); + for (const digit of '012') await tapKey('keypad-'+digit); + assert.equal(await evaluate(`document.getElementById('code').value`),'012'); + assert.equal(await evaluate(`document.getElementById('keypad-code').textContent`),'0 1 2 · · ·'); + await screenshot('keypad-'+name+'.png'); + if (name === 'wide') { + await command('Browser.grantPermissions',{origin:`http://127.0.0.1:${server.address().port}`,permissions:['clipboardReadWrite','clipboardSanitizedWrite']}); + await evaluate(`navigator.clipboard.writeText('098765')`,{userGesture:true}); + await evaluate(`document.getElementById('code-digit-1').focus({preventScroll:true})`); + await command('Input.dispatchKeyEvent',{type:'keyDown',key:'v',code:'KeyV',modifiers:2,windowsVirtualKeyCode:86}); + await command('Input.dispatchKeyEvent',{type:'keyUp',key:'v',code:'KeyV',modifiers:2,windowsVirtualKeyCode:86}); + await wait(`document.getElementById('code').value==='098765'`); + await tapKey('keypad-clear'); + for (const digit of '012') await tapKey('keypad-'+digit); + } + for (const digit of '345') await tapKey('keypad-'+digit); + assert.equal(await evaluate(`document.getElementById('code').value`),'012345'); + assert.equal(await evaluate(`document.getElementById('connect-form').checkValidity()`),true); + await tapKey('keypad-delete'); + assert.equal(await evaluate(`document.getElementById('code').value`),'01234'); + await tapKey('keypad-done'); + assert.equal(await evaluate(`document.getElementById('pairing-keypad').hidden`),true); + } + await command('Emulation.setPageScaleFactor',{pageScaleFactor:1.5}); + await evaluate(`document.getElementById('code-digit-1').click()`); + await pause(100); + const zoomKeypad=await evaluate(keypadGeometry); + assert.equal(zoomKeypad.hidden,false); + assert.ok(zoomKeypad.panel.left>=zoomKeypad.viewport.left&&zoomKeypad.panel.right<=zoomKeypad.viewport.left+zoomKeypad.viewport.width); + assert.ok(zoomKeypad.panel.top>=zoomKeypad.viewport.top&&zoomKeypad.panel.bottom<=zoomKeypad.viewport.top+zoomKeypad.viewport.height); + await evaluate(`document.getElementById('setup-title').dispatchEvent(new PointerEvent('pointerdown',{bubbles:true}));document.getElementById('setup-title').click()`); + assert.equal(await evaluate(`document.getElementById('pairing-keypad').hidden`),true,'Outside tap dismisses the keypad'); + await command('Emulation.setPageScaleFactor',{pageScaleFactor:1}); + await command('Emulation.clearDeviceMetricsOverride'); assert.deepEqual(errors, []); console.log(JSON.stringify({ passed: true, connections, imageAcks: acks, webpProbes, jpegFallbacks, - checks: ['five-touch source', 'read-only source', 'WebP capability probe', 'WebP touch with zoom compensation', 'JPEG fallback after corrupt WebP', 'two-image pipeline with exact ACKs', + nativeFullscreenEntered, + blockedChecks: nativeFullscreenEntered ? [] : ['Native fullscreen did not enter in this browser environment; OEM fullscreen transitions were not exercised.'], + checks: ['responsive home columns and stacking', 'six-digit PIN validation and paste', 'floating keypad on wide, narrow, short and zoomed viewports', + 'trusted keypad touches, deletion, leading zeroes and outside dismissal', 'default fullscreen request and hidden toolbar', + ...(nativeFullscreenEntered ? ['OEM native fullscreen toggle'] : []), + 'OEM debug toggle, top-right position, contrast over white video and touch passthrough', + 'OEM settings centered modal, focus, input isolation and Escape', 'five-touch source', 'read-only source', 'WebP capability probe', 'WebP touch with zoom compensation', 'JPEG fallback after corrupt WebP', 'two-image pipeline with exact ACKs', 'decode without overlay flashes', 'gap releases touch', 'deadline without status', 'cancelled deadline', 'same-size rebuild', 'cancelled mouse drag cannot cross video epochs', 'old frame rejection', 'rotation', 'real socket reconnect', 'native browser Media Session metadata and cover', 'media action roundtrip', 'desktop right drag, scroll and versioned keyboard', 'desktop blur releases modifiers', 'phone-authoritative pause', 'capability-gated seek and final drag position', 'media cleanup and retired callback isolation'] }, null, 2)); diff --git a/shared/src/main/java/com/shilapi/xcertplay/orchestration/CarPlayController.kt b/shared/src/main/java/com/shilapi/xcertplay/orchestration/CarPlayController.kt index b3e9ba93..3f269a7f 100644 --- a/shared/src/main/java/com/shilapi/xcertplay/orchestration/CarPlayController.kt +++ b/shared/src/main/java/com/shilapi/xcertplay/orchestration/CarPlayController.kt @@ -164,6 +164,7 @@ class CarPlayController( private val savePairRecord: (LockdownPairRecord) -> Unit = {}, private val clearPairRecord: () -> Unit = {}, private val locationProvider: Iap2LocationProvider? = null, + private val requestHostUi: () -> Unit = {}, ) : Closeable, CarPlayMediaSource { init { require(!config.locationReportingEnabled || locationProvider != null) { @@ -299,16 +300,11 @@ class CarPlayController( uiListener?.onDeviceInfo(session, info) } - // The user tapped the car icon in CarPlay: show the head unit's own menu, like its Home button. - // The session keeps running in the background, so returning to WheelPlay resumes CarPlay. override fun onHostUiRequested(session: AirPlaySession) { - debugLog("CarPlay requested the car UI; opening the head-unit home screen") - runCatching { - appContext.startActivity( - Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), - ) - }.onFailure { debugLog("Car home screen could not open: ${it.javaClass.simpleName}") } + if (closed || activeSession !== session) return + debugLog("CarPlay requested the host settings UI") + // The service retains this callback even when the Activity UI detaches. + requestHostUi() uiListener?.onHostUiRequested(session) } diff --git a/shared/src/main/res/values-zh-rCN/strings.xml b/shared/src/main/res/values-zh-rCN/strings.xml index c6a7eee3..084f0c33 100644 --- a/shared/src/main/res/values-zh-rCN/strings.xml +++ b/shared/src/main/res/values-zh-rCN/strings.xml @@ -316,11 +316,11 @@ 启动显示 已配对 · 等待启动 配对并启动显示 - 已配对。选择上方选项后,点击「启动显示」。 + 已配对。确认设置后,点击「启动显示」。 本次配对成功,但未能记住设备。下次可能需要重新配对;可检查浏览器存储或 App 中的设备数量。 本次配对成功。浏览器无法保存设备,下次仍需配对。 正在恢复配对… - 已自动恢复配对。选择上方选项后,点击「启动显示」。 + 已自动恢复配对。确认设置后,点击「启动显示」。 设备记忆已失效或已被移除,请重新配对。 已记住的浏览器 等待恢复配对 @@ -373,7 +373,7 @@ 局域网 · 车机显示端 连接 CarPlay 车机屏幕 首次连接时,在服务端 App 点击「扫描二维码配对」, - 扫描下方二维码并允许连接。 + 扫描此二维码并允许连接。 连接后隐藏顶部栏 让 CarPlay 画面占满整个页面;刷新页面可返回连接界面。 启动后隐藏顶栏并全屏 @@ -385,7 +385,7 @@ 正在读取… 下载本地证书 打开 HTTPS 页面 - 已恢复配对。选择上方选项后,点击「启动显示」。 + 已恢复配对。确认设置后,点击「启动显示」。 车机配对二维码 扫码连接车机 刷新二维码 @@ -564,6 +564,26 @@ 正在连接输入源… 输入源已就绪 正在释放输入源资源… + 调试信息 + 在右上角显示连接、帧率和延迟指标。 + 连接状态 + 服务地址 + 画面 + 图像呈现帧率 + 帧率 · 接收 / 解码 / 呈现 + WebRTC 往返延迟 + 图像确认耗时 · 含解码 + 浏览器解码耗时 + 抖动缓冲耗时 + 延迟为各阶段测量值。— 表示暂不可用。 + 已呈现帧数 + 图像收帧至呈现 + 画面格式 + 数字键盘 + 收起 + 清空 + 删除上一位 + 请完整输入六位配对码。 裁剪车厂图标 正方形 · 1024 × 1024 缩放 diff --git a/shared/src/main/res/values-zh-rTW/strings.xml b/shared/src/main/res/values-zh-rTW/strings.xml index 2d4cb134..d557355f 100644 --- a/shared/src/main/res/values-zh-rTW/strings.xml +++ b/shared/src/main/res/values-zh-rTW/strings.xml @@ -316,11 +316,11 @@ 啟動顯示 已配對 · 等待啟動 配對並啟動顯示 - 已配對。選擇上方選項後,點選「啟動顯示」。 + 已配對。確認設定後,點選「啟動顯示」。 本次配對成功,但未能記住裝置。下次可能需要重新配對;可檢查瀏覽器儲存或 App 中的裝置數量。 本次配對成功。瀏覽器無法儲存裝置,下次仍需配對。 正在恢復配對… - 已自動恢復配對。選擇上方選項後,點選「啟動顯示」。 + 已自動恢復配對。確認設定後,點選「啟動顯示」。 裝置記憶已失效或已被移除,請重新配對。 已記住的瀏覽器 等待恢復配對 @@ -373,7 +373,7 @@ 區域網 · 車機顯示端 連線 CarPlay 車機螢幕 首次連線時,在伺服器端 App 點選「掃描二維碼配對」, - 掃描下方二維碼並允許連線。 + 掃描此二維碼並允許連線。 連線後隱藏頂部欄 讓 CarPlay 畫面佔滿整個頁面;重新整理頁面可返回連線介面。 啟動後隱藏頂欄並全螢幕 @@ -385,7 +385,7 @@ 正在讀取… 下載本機憑證 開啟 HTTPS 頁面 - 已恢復配對。選擇上方選項後,點選「啟動顯示」。 + 已恢復配對。確認設定後,點選「啟動顯示」。 車機配對二維碼 掃碼連線車機 重新整理二維碼 @@ -564,6 +564,26 @@ 正在連線至輸入源… 輸入源已就緒 正在釋放輸入源資源… + 偵錯資訊 + 在右上角顯示連線、影格率與延遲指標。 + 連線狀態 + 伺服器位址 + 畫面 + 影像呈現影格率 + 影格率 · 接收 / 解碼 / 呈現 + WebRTC 往返延遲 + 影像確認耗時 · 含解碼 + 瀏覽器解碼耗時 + 抖動緩衝耗時 + 延遲為各階段測量值。— 表示暫不可用。 + 已呈現影格數 + 影像收幀至呈現 + 畫面格式 + 數字鍵盤 + 收起 + 清空 + 刪除上一位 + 請完整輸入六位配對碼。 裁切車廠圖示 正方形 · 1024 × 1024 縮放 diff --git a/shared/src/main/res/values/strings.xml b/shared/src/main/res/values/strings.xml index 07c0766a..a2f40bd0 100644 --- a/shared/src/main/res/values/strings.xml +++ b/shared/src/main/res/values/strings.xml @@ -316,11 +316,11 @@ Start display Paired · Ready to start Pair & start display - Paired. Choose the options above, then tap Start display. + Paired. Review the settings, then tap Start display. Paired for this session, but the device could not be remembered. You may need to pair again next time. Check browser storage or the device count in the app. Paired for this session. This browser cannot remember the device, so you will need to pair again next time. Restoring pairing… - Pairing restored automatically. Choose the options above, then tap Start display. + Pairing restored automatically. Review the settings, then tap Start display. Remembered device expired or removed. Pair again. Remembered browser Waiting to restore pairing @@ -373,7 +373,7 @@ Local network · Head-unit display Connect your CarPlay display For the first connection, tap Scan QR code to pair in the server app, - then scan the QR code below and allow the connection. + then scan this QR code and allow the connection. Hide top bar after connecting Let CarPlay fill the page. Refresh to return to the connection screen. Hide top bar & enter full screen on start @@ -385,7 +385,7 @@ Loading… Download local certificate Open HTTPS page - Pairing restored. Choose the options above, then tap Start display. + Pairing restored. Review the settings, then tap Start display. Head-unit pairing QR code Scan to connect the head unit Refresh QR code @@ -564,6 +564,26 @@ Connecting to source… Source ready Releasing source resources… + Debug information + Show connection, frame rate and timing measurements in the upper-right corner. + Connection + Server + Video + Presented frame rate + FPS · receive / decode / present + WebRTC round-trip time + Image ACK · includes decode + Browser decode time + Jitter buffer time + Timing values measure individual stages. — indicates unavailable data. + Presented frames + Image receive-to-present time + Video format + Number pad + Done + Clear + Delete last digit + Enter all six digits of the pairing code. Crop car icon Square · 1024 × 1024 Zoom diff --git a/shared/src/test/java/com/shilapi/xcertplay/network/CarPlayAirPlayPortTest.kt b/shared/src/test/java/com/shilapi/xcertplay/network/CarPlayAirPlayPortTest.kt index e3a68ef6..8b47a634 100644 --- a/shared/src/test/java/com/shilapi/xcertplay/network/CarPlayAirPlayPortTest.kt +++ b/shared/src/test/java/com/shilapi/xcertplay/network/CarPlayAirPlayPortTest.kt @@ -17,6 +17,7 @@ import com.shilapi.xcertplay.transport.Iap2WirelessCarPlayEndpoint import com.shilapi.xcertplay.transport.Iap2WirelessControlClient import com.shilapi.xcertplay.transport.Iap2WirelessSecurity import java.io.IOException +import java.net.BindException import java.net.InetAddress import java.net.InetSocketAddress import java.net.ServerSocket @@ -80,8 +81,7 @@ class CarPlayAirPlayPortTest { service.detach() assertTrue(server.isClosed) assertReleased(service) - ServerSocket().use { replacement -> - replacement.bind(InetSocketAddress(loopback, port)) + bindReleasedPort(port).use { replacement -> assertEquals(port, replacement.localPort) } } @@ -121,6 +121,10 @@ class CarPlayAirPlayPortTest { service.detach() assertTrue(first.isClosed) + // A closed Java socket can retain its native descriptor until the blocked + // accept call unwinds. Establish availability before testing port preference. + // This reservation never accepts, so its close has no pending reader. + bindReleasedPort(preferredPort).close() assertStarted(service, attach(service, preferredPort)) assertEquals(preferredPort, listenerSocket(service).localPort) } @@ -182,8 +186,7 @@ class CarPlayAirPlayPortTest { service.detach() assertTrue(firstServer.isClosed) - ServerSocket().use { occupied -> - occupied.bind(InetSocketAddress(loopback, firstPort)) + bindReleasedPort(firstPort).use { occupied -> val replacement = assertStarted(service, attach(service, firstPort)) assertNotEquals(firstPort, replacement.port) assertEquals(firstPort, first.port) @@ -197,6 +200,25 @@ class CarPlayAirPlayPortTest { try { check(lifecycle.get()) } finally { lifecycle.destroy() } } + /** Wait for kernel release and retain the successful binding for the caller. */ + private fun bindReleasedPort(port: Int): ServerSocket { + val deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(5) + var lastFailure: BindException? = null + do { + val socket = ServerSocket() + try { + socket.bind(InetSocketAddress(loopback, port)) + return socket + } catch (error: Exception) { + socket.close() + if (error !is BindException) throw error + lastFailure = error + } + Thread.sleep(10) + } while (System.nanoTime() < deadline) + throw AssertionError("Detached AirPlay port $port did not become bindable within 5s", lastFailure) + } + private fun attach( service: CarPlayVpnService, port: Int, diff --git a/shared/src/test/java/com/shilapi/xcertplay/orchestration/CarPlayHostUiTest.kt b/shared/src/test/java/com/shilapi/xcertplay/orchestration/CarPlayHostUiTest.kt new file mode 100644 index 00000000..95dc844a --- /dev/null +++ b/shared/src/test/java/com/shilapi/xcertplay/orchestration/CarPlayHostUiTest.kt @@ -0,0 +1,48 @@ +package com.shilapi.xcertplay.orchestration + +import com.shilapi.xcertplay.airplay.* +import com.shilapi.xcertplay.transport.Iap2IdentificationConfig +import java.net.Socket +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class CarPlayHostUiTest { + @Test fun activeOemRequestReachesServiceCallbackWithoutAnActivityListener() { + val config = AirPlayConfig("test", "00:00:00:00:00:01", "00:00:00:00:00:02", + "1", AirPlayDisplayConfig(800, 480)) + val identity = AirPlayIdentity(ByteArray(32), ByteArray(32), "test") + val listener = object : AirPlaySessionListener {} + var requests = 0 + val controller = CarPlayController(RuntimeEnvironment.getApplication(), + CarPlayRuntimeConfig(mfiTarget = MfiTarget.LOCAL, + identification = Iap2IdentificationConfig("test", "test", "test", "1", "1", "1", 3)), + config, identity, PairingStore(), listener, object : AirPlayMediaHandler {}, {}, + requestHostUi = { requests++ }) + val session = AirPlaySession(Socket(), config, identity, PairingStore(), null, + listener, object : AirPlayMediaHandler {}) + val events = ReflectionHelpers.getField(controller, "sessionListener") + try { + events.onHostUiRequested(session) + assertEquals(0, requests) + events.onSessionActive(session) + ReflectionHelpers.setField(controller, "uiListener", null) + events.onHostUiRequested(session) + assertEquals(1, requests) + events.onSessionEnded(session) + events.onHostUiRequested(session) + assertEquals(1, requests) + assertNull(org.robolectric.Shadows.shadowOf(RuntimeEnvironment.getApplication()).nextStartedActivity) + } finally { + controller.close() + assertTrue(controller.awaitClosed(3_000)) + session.close() + } + } +} diff --git a/test/debug-stats.test.js b/test/debug-stats.test.js new file mode 100644 index 00000000..38411445 --- /dev/null +++ b/test/debug-stats.test.js @@ -0,0 +1,19 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { createImageDebugStats } from '../common/src/main/assets/web/app.js'; + +test('image stats count committed frames in a rolling second and measure browser decode separately', () => { + let now = 0; + const stats = createImageDebugStats(() => now); + assert.deepEqual(stats.sample(), { fps: null, decodeMs: null, totalFrames: 0 }); + now = 100; stats.frame(92); + now = 500; stats.frame(480); + now = 1000; + assert.deepEqual(stats.sample(), { fps: 2, decodeMs: 20, totalFrames: 2 }); + now = 1100; + assert.equal(stats.sample().fps, 1); + now = 1600; + assert.equal(stats.sample().fps, 0, 'A static image has zero new committed frames'); + stats.reset(); + assert.deepEqual(stats.sample(), { fps: null, decodeMs: null, totalFrames: 0 }); +}); diff --git a/test/fixtures/pairing-qr.svg b/test/fixtures/pairing-qr.svg new file mode 100644 index 00000000..1abbc6e3 --- /dev/null +++ b/test/fixtures/pairing-qr.svg @@ -0,0 +1 @@ +Generated with ZXing 3.5.3. Browser test fixture, not a live pairing challenge. diff --git a/test/pairing-code.test.js b/test/pairing-code.test.js new file mode 100644 index 00000000..070fc445 --- /dev/null +++ b/test/pairing-code.test.js @@ -0,0 +1,102 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { createPairingCodeInput, placePairingKeypad } from '../common/src/main/assets/web/app.js'; + +function fixture() { + let focused = -1; + const inputs = Array.from({ length: 6 }, (_, index) => ({ + value: '', handlers: {}, focus() { focused = index; }, select() {}, + addEventListener(type, handler) { this.handlers[type] = handler; }, + })); + const value = { value: '' }, control = createPairingCodeInput(inputs, value); + const input = (index, text) => { inputs[index].value = text; inputs[index].handlers.input(); }; + const key = (index, key) => inputs[index].handlers.keydown({ key, preventDefault() {} }); + const paste = (index, text) => inputs[index].handlers.paste({ clipboardData: { getData: () => text }, preventDefault() {} }); + return { inputs, value, control, input, key, paste, focused: () => focused }; +} + +test('PIN fields preserve leading zeroes, filter non-digits and advance focus', () => { + const f = fixture(); + f.input(0, '0'); assert.equal(f.focused(), 1); + f.input(1, 'x'); assert.equal(f.inputs[1].value, ''); + for (let i = 1; i < 6; i++) f.input(i, String(i)); + assert.equal(f.value.value, '012345'); + assert.equal(f.focused(), 5); +}); + +test('paste and autofill distribute a full code from any field and partial paste replaces in place', () => { + const f = fixture(); + f.paste(3, '01 23-45'); + assert.equal(f.value.value, '012345'); + assert.deepEqual(f.inputs.map(input => input.value), ['0', '1', '2', '3', '4', '5']); + f.paste(2, '98'); assert.equal(f.value.value, '019845'); + f.input(0, '654321'); assert.equal(f.value.value, '654321'); +}); + +test('backspace and keyboard navigation support correction without submitting', () => { + const f = fixture(); f.control.set('012345'); + f.input(3, ''); f.key(3, 'Backspace'); + assert.equal(f.inputs[2].value, ''); assert.equal(f.focused(), 2); + f.key(2, 'ArrowLeft'); assert.equal(f.focused(), 1); + f.key(1, 'ArrowRight'); assert.equal(f.focused(), 2); + f.key(2, 'Home'); assert.equal(f.focused(), 0); + f.key(0, 'End'); assert.equal(f.focused(), 5); +}); + +test('remembered pairing disables hidden required inputs and link prefill replaces every digit', () => { + const f = fixture(); f.control.set('012345'); f.control.set('987'); + assert.deepEqual(f.inputs.map(input => input.value), ['9', '8', '7', '', '', '']); + f.control.enabled(false); + assert.ok(f.inputs.every(input => input.disabled && !input.required)); + f.control.enabled(true); + assert.ok(f.inputs.every(input => !input.disabled && input.required)); +}); + +test('virtual digits, backspace and clear share the same six-digit value and validation', () => { + const f = fixture(); + for (const digit of '012345') f.control.digit(digit); + assert.equal(f.value.value, '012345'); assert.equal(f.control.complete, true); + f.control.backspace(); + assert.equal(f.value.value, '01234'); assert.equal(f.control.complete, false); + assert.equal(f.focused(), 5); + f.control.backspace(); assert.equal(f.value.value, '0123'); assert.equal(f.focused(), 4); + f.control.clear(); assert.equal(f.value.value, ''); assert.equal(f.focused(), 0); + f.control.enabled(false); f.control.digit('9'); + assert.equal(f.value.value, ''); +}); + +test('hardware digits and Delete work without making the fields editable', () => { + const f = fixture(); + for (let i = 0; i < 6; i++) f.key(i, String(i)); + assert.equal(f.value.value, '012345'); + f.key(2, 'Delete'); assert.equal(f.inputs[2].value, ''); + f.key(2, '9'); assert.equal(f.value.value, '019345'); +}); + +test('keypad chooses an unobstructed side and stays inside the visible viewport', () => { + const viewport = { left: 0, top: 0, width: 800, height: 360 }, size = { width: 304, height: 264 }; + const cases = [ + [{ left: 40, right: 340, top: 100, bottom: 158 }, viewport, size, 'right'], + [{ left: 450, right: 750, top: 100, bottom: 158 }, viewport, size, 'left'], + [{ left: 40, right: 340, top: 100, bottom: 158 }, { ...viewport, height: 1000 }, size, 'below'], + [{ left: 40, right: 340, top: 700, bottom: 758 }, { ...viewport, height: 1000 }, size, 'above'], + [{ left: 135, right: 485, top: 112, bottom: 170 }, { left: 120, top: 90, width: 390, height: 300 }, { width: 304, height: 200 }, 'below'], + ]; + for (const [anchor, view, panel, expected] of cases) { + const position = placePairingKeypad(anchor, view, panel); + assert.equal(position.placement, expected); + assert.ok(position.left >= view.left + 12 && position.top >= view.top + 12); + assert.ok(position.left + panel.width <= view.left + view.width - 12); + assert.ok(position.top + panel.height <= view.top + view.height - 12); + assert.ok(position.left >= anchor.right || position.left + panel.width <= anchor.left || + position.top >= anchor.bottom || position.top + panel.height <= anchor.top); + } +}); + +test('keypad requests scrolling when the anchor is clipped or no full-size placement fits', () => { + const view = { left: 0, top: 0, width: 320, height: 320 }; + assert.equal(placePairingKeypad({ left: 12, right: 308, top: 280, bottom: 338 }, view, { width: 296, height: 230 }), null); + assert.equal(placePairingKeypad({ left: 12, right: 308, top: 130, bottom: 188 }, view, { width: 296, height: 270 }), null); + assert.deepEqual(placePairingKeypad({ left: 12, right: 308, top: 12, bottom: 70 }, view, { width: 296, height: 230 }), + { left: 12, top: 78, placement: 'below' }); +}); diff --git a/test/pairing.test.js b/test/pairing.test.js index 518a4c4d..62207a83 100644 --- a/test/pairing.test.js +++ b/test/pairing.test.js @@ -34,7 +34,7 @@ function fixture({ status = () => ok({ state: 'pending' }), stored = null, resum setItem(key, value) { if (storageDisabled) throw new Error('denied'); preferences.set(key, value); }, removeItem(key) { preferences.delete(key); }, }, - }, location: { host: 'server:8080', href }, URL, Date, WebSocket: Socket, + }, location: { host: 'server:8080', href }, URL, Date, performance: { now: () => 0 }, WebSocket: Socket, setTimeout(fn, delay) { const id = ++nextTimer; timers.set(id, { fn, delay }); return id; }, clearTimeout(id) { timers.delete(id); }, clearInterval() {}, fetch: async (url, options) => { @@ -63,11 +63,10 @@ test('QR approval remembers the browser and waits for the explicit launch button assert.equal(f.element('code').required, false); assert.equal(f.element('connect-label').textContent, '启动显示'); assert.deepEqual(JSON.parse(f.preferences.get('wheelplay.browserDevice')), savedDevice); - f.element('hide-toolbar').checked = true; f.element('renderer-video-canvas').checked = true; + f.element('renderer-video-canvas').checked = true; f.submit(); await flush(); assert.equal(f.sockets.length, 1); assert.equal(f.sockets[0].url, 'ws://server:8080/stream?token=resumed-token&media=2&images=3&nowPlaying=1'); - assert.equal(f.element('hide-toolbar').checked, true); assert.equal(f.element('renderer-video-canvas').checked, true); assert.equal(f.requests.some(r => r.url.endsWith('/cancel')), false); }); diff --git a/test/stream-client.test.js b/test/stream-client.test.js index 33b2c53d..2a70772f 100644 --- a/test/stream-client.test.js +++ b/test/stream-client.test.js @@ -9,11 +9,12 @@ const source = ['text.js', 'desktop-input.js', 'browser-audio.js', 'browser-loca .map(name => readFileSync(new URL(`../common/src/main/assets/web/${name}`, import.meta.url), 'utf8') .replace(/^import .*;$/gm, '').replaceAll('export function', 'function')).join('\n'); function fixture({ storedCanvas = null, storedMode = null, processorAvailable = true, storedIgnoreZoom = null, storageDisabled = false, canvasAvailable = true, supportsWebp = false, - geometry = null, visual = null, mediaSession = null, locationBrowser = null, + geometry = null, visual = null, mediaSession = null, locationBrowser = null, storedDebug = null, rtcStats = null, fullscreen = 'supported', codeDenied = false, resume = () => ({ token: 'session-token', name: 'Chrome' }) } = {}) { const elements = new Map(), timers = new Map(), raf = new Map(), sockets = [], peers = [], draws = []; const preferences = new Map(storedCanvas === null ? [] : [['wheelplay.canvasVideo', storedCanvas]]); if (storedIgnoreZoom !== null) preferences.set('wheelplay.ignoreBrowserZoom', storedIgnoreZoom); + if (storedDebug !== null) preferences.set('wheelplay.debugOverlay', storedDebug); const videoCallbacks = new Map(), createdVideos = [], processors = []; if (storedMode !== null) preferences.set('wheelplay.videoRenderer', storedMode); const documentEvents = {}, fullscreenCalls = []; @@ -36,6 +37,10 @@ function fixture({ storedCanvas = null, storedMode = null, processorAvailable = remove() { this.hidden = true; this.removed = true; }, insertBefore(child) { child.removed = false; }, removeAttribute() {}, setAttribute() {}, setPointerCapture() {}, focus() {}, + open: false, modalCalls: 0, + showModal() { this.open = true; this.modalCalls++; }, + close() { this.open = false; this.handlers.close?.(); }, + click() { return this.handlers.click?.(); }, getBoundingClientRect() { if (id !== 'display' || !classes.has('ignore-browser-zoom')) return mainRect; const scale = Number(this.style.transform.match(/scale\((.*)\)/)[1]); @@ -52,7 +57,7 @@ function fixture({ storedCanvas = null, storedMode = null, processorAvailable = close() { this.readyState = 3; this.onclose(); } } class Peer { - constructor() { this.iceGatheringState = 'complete'; this.localDescription = { sdp: 'answer' }; peers.push(this); } + constructor() { this.iceGatheringState = 'complete'; this.localDescription = { sdp: 'answer' }; if (rtcStats) this.getStats = rtcStats; peers.push(this); } async setRemoteDescription() {} async createAnswer() { return { type: 'answer', sdp: 'a=setup:active\r\n' }; } async setLocalDescription() {} @@ -161,24 +166,132 @@ test('the overlay forwards a complete drag independently of the native video ele assert.deepEqual(ws.sent.filter(m => m.type === 'touch').map(m => m.contacts[0].down), [true, true, false]); }); -test('the optional top bar is hidden only after connecting and restored on disconnect', async () => { +test('OEM settings releases touch, blocks input across status updates, and restores it on close', async () => { + const f = fixture(), ws = await f.connect(); f.frame(ws); + f.pointer('pointerdown', 100, 'touch-surface'); + const open = () => ws.onmessage({ data: JSON.stringify({ type: 'open-settings' }) }); + open(); + const dialog = f.element('settings-dialog'); + assert.equal(dialog.open, true); + assert.equal(ws.sent.at(-1).contacts.length, 0); + open(); assert.equal(dialog.modalCalls, 1); + ws.onmessage({ data: JSON.stringify({ type: 'status', width: 1280, height: 720, streaming: true }) }); + const count = ws.sent.length; + f.pointer('pointerdown', 200, 'touch-surface'); + assert.equal(ws.sent.length, count); + assert.equal(f.element('waiting').hidden, true, 'Video remains visible under the dialog'); + f.element('settings-close').click(); + assert.equal(dialog.open, false); + f.pointer('pointerdown', 200, 'touch-surface'); + assert.equal(ws.sent.at(-1).contacts[0].down, true); + open(); ws.close(); + assert.equal(dialog.open, false, 'Connection loss dismisses settings'); +}); + +test('settings options share browser preferences and can disconnect an immersive session', async () => { + const f = fixture({ storedIgnoreZoom: 'true' }); + const ws = await f.connect(); + ws.onmessage({ data: JSON.stringify({ type: 'open-settings' }) }); + assert.equal(f.element('settings-ignore-browser-zoom').checked, true); + assert.equal(f.element('settings-fullscreen').textContent, messages.web_exit_full_screen); + f.element('settings-ignore-browser-zoom').checked = false; + f.element('settings-ignore-browser-zoom').handlers.change(); + assert.equal(f.element('ignore-browser-zoom').checked, false); + assert.equal(f.preferences.get('wheelplay.ignoreBrowserZoom'), 'false'); + await f.element('settings-fullscreen').click(); + assert.equal(f.document.fullscreenElement, null); + assert.equal(f.element('topbar').hidden, true); + assert.equal(f.element('settings-dialog').open, true); + assert.equal(f.element('settings-fullscreen').textContent, messages.web_full_screen); + await f.element('settings-fullscreen').click(); + assert.equal(f.document.fullscreenElement, f.document.documentElement); + assert.equal(f.element('topbar').hidden, true); + assert.equal(f.element('settings-fullscreen').textContent, messages.web_exit_full_screen); + f.element('settings-disconnect').click(); + assert.equal(f.document.fullscreenElement, null, 'Settings-entered fullscreen is released on disconnect'); + assert.equal(f.element('settings-dialog').open, false); + assert.equal(f.element('pairing').hidden, false); + assert.equal(ws.readyState, 3); + ws.onmessage({ data: JSON.stringify({ type: 'open-settings' }) }); + assert.equal(f.element('settings-dialog').open, false, 'Retired sockets cannot reopen settings'); +}); + +test('the homepage toolbar stays hidden in the display, even after fullscreen exit', async () => { const f = fixture(); - f.element('hide-toolbar').checked = true; const ws = await f.connect(); assert.equal(f.element('topbar').hidden, true); - f.element('disconnect').handlers.click(); + f.element('settings-disconnect').handlers.click(); assert.equal(f.element('topbar').hidden, false); }); -test('normal launch leaves fullscreen and the top bar unchanged', async () => { - const f = fixture(); await f.connect(); - assert.deepEqual(f.fullscreenCalls, []); - assert.equal(f.document.fullscreenElement, null); +test('OEM debug toggle shows live image telemetry and clears stale values across source epochs and disconnect', async () => { + const f = fixture(), ws = await f.connect(); f.frame(ws); + assert.equal(f.element('debug-overlay').hidden, true); + ws.onmessage({ data: JSON.stringify({ type: 'open-settings' }) }); + f.element('settings-debug').checked = true; f.element('settings-debug').handlers.change(); + assert.equal(f.preferences.get('wheelplay.debugOverlay'), 'true'); + f.element('settings-close').click(); + assert.equal(f.element('debug-overlay').hidden, false); + assert.equal(f.element('debug-frames').textContent, '1'); + assert.equal(f.element('debug-decode').textContent, '0.0 ms'); + assert.equal(f.element('debug-latency').textContent, '—'); + assert.equal(f.element('debug-video').textContent, '1280 × 720'); + assert.equal(f.element('debug-format').textContent, 'JPEG'); + assert.equal(f.element('debug-endpoint').textContent, 'WS · server:8080'); + ws.onmessage({ data: JSON.stringify({ type: 'status', width: 1280, height: 720, streaming: true, + performance: { image: { lastAckMs: 18 } } }) }); + assert.equal(f.element('debug-latency').textContent, '18.0 ms'); + f.advance(1000); + ws.onmessage({ data: JSON.stringify({ type: 'status', width: 1280, height: 720, streaming: true }) }); + assert.equal(f.element('debug-fps').textContent, '0.0 fps'); + ws.onmessage({ data: JSON.stringify({ type: 'status', sessionId: 7, videoEpoch: 2, + width: 1280, height: 720, sourceState: 'ready', inputReady: true }) }); + assert.equal(f.element('debug-fps').textContent, '—'); + assert.equal(f.element('debug-frames').textContent, '—'); + assert.equal(f.element('debug-decode').textContent, '—'); + f.element('settings-disconnect').click(); + assert.equal(f.element('debug-overlay').hidden, true); assert.equal(f.element('topbar').hidden, false); }); -test('immersive launch requests fullscreen in the submit gesture and hides the bar after connecting', async () => { - const f = fixture(); f.element('fullscreen-on-start').checked = true; +test('debug preference restores on a later load and works without browser storage', async () => { + const restored = fixture({ storedDebug: 'true' }); await restored.connect(); + assert.equal(restored.element('settings-debug').checked, true); + assert.equal(restored.element('debug-overlay').hidden, false); + const f = fixture({ storageDisabled: true }), ws = await f.connect(); + f.element('settings-debug').checked = true; + f.element('settings-debug').handlers.change(); + assert.equal(f.element('debug-overlay').hidden, false); + ws.close(); + assert.match(f.element('debug-connection').textContent, /重试/); + assert.equal(f.element('debug-decode').textContent, '—'); + f.element('settings-debug').checked = false; f.element('settings-debug').handlers.change(); + assert.equal(f.element('debug-overlay').hidden, true); +}); + +test('WebRTC debug separates receive, decode and presentation rates from RTT and buffer time', async () => { + let sample = 0; + const f = fixture({ storedDebug: 'true', rtcStats: async () => { + sample++; + return new Map([['video', { type: 'inbound-rtp', kind: 'video', framesReceived: sample * 10, + framesDecoded: sample * 10, totalDecodeTime: sample * .02, + jitterBufferDelay: sample * .01, jitterBufferEmittedCount: sample * 10 }], + ['pair', { type: 'candidate-pair', state: 'succeeded', nominated: true, currentRoundTripTime: .015 }]]); + } }); + const ws = await f.connect(); await f.offer(ws); + f.advance(1000); await new Promise(resolve => setImmediate(resolve)); + f.advance(1000); await new Promise(resolve => setImmediate(resolve)); + assert.equal(f.element('debug-fps').textContent, '10.0 / 10.0 / 0.0 fps'); + assert.equal(f.element('debug-fps-summary').textContent, '0.0 fps'); + assert.equal(f.element('debug-format').textContent, 'H.264'); + assert.equal(f.element('debug-latency').textContent, '15.0 ms'); + assert.equal(f.element('debug-decode').textContent, '2.0 ms'); + assert.equal(f.element('debug-buffer').textContent, '1.0 ms'); + assert.equal(f.element('debug-buffer-row').hidden, false); +}); + +test('default launch requests fullscreen in the submit gesture and hides the bar after connecting', async () => { + const f = fixture(); const connecting = f.connect(); assert.deepEqual(f.fullscreenCalls, ['request']); assert.equal(f.sockets.length, 0, 'Fullscreen must be requested before asynchronous pairing finishes'); @@ -187,13 +300,13 @@ test('immersive launch requests fullscreen in the submit gesture and hides the b assert.equal(f.document.fullscreenElement, f.document.documentElement); assert.equal(f.element('topbar').hidden, true); await f.document.exitFullscreen(); - assert.equal(f.element('topbar').hidden, false); - assert.equal(f.element('display').hidden, false, 'Leaving fullscreen keeps the stream connected'); + assert.equal(f.element('topbar').hidden, true); + assert.equal(f.element('display').hidden, false, 'Leaving fullscreen keeps the stream connected without a toolbar'); }); test('disconnect exits launch-owned fullscreen and restores the pairing interface', async () => { - const f = fixture(); f.element('fullscreen-on-start').checked = true; - await f.connect(); f.element('disconnect').handlers.click(); + const f = fixture(); + await f.connect(); f.element('settings-disconnect').handlers.click(); assert.deepEqual(f.fullscreenCalls, ['request', 'exit']); assert.equal(f.document.fullscreenElement, null); assert.equal(f.element('topbar').hidden, false); @@ -202,19 +315,19 @@ test('disconnect exits launch-owned fullscreen and restores the pairing interfac test('unavailable or rejected fullscreen falls back to hiding the bar without preventing launch', async () => { for (const fullscreen of ['unsupported', 'denied']) { - const f = fixture({ fullscreen }); f.element('fullscreen-on-start').checked = true; + const f = fixture({ fullscreen }); await f.connect(); assert.equal(f.document.fullscreenElement, null); assert.equal(f.element('topbar').hidden, true); assert.equal(f.element('display').hidden, false); - f.element('disconnect').handlers.click(); + f.element('settings-disconnect').handlers.click(); assert.equal(f.element('topbar').hidden, false); assert.equal(f.fullscreenCalls.includes('exit'), false); } }); test('pairing failure exits launch-owned fullscreen without hiding the pairing interface', async () => { - const f = fixture({ codeDenied: true }); f.element('fullscreen-on-start').checked = true; + const f = fixture({ codeDenied: true }); f.element('connect-form').handlers.submit({ preventDefault() {} }); await new Promise(resolve => setImmediate(resolve)); assert.equal(f.sockets.length, 0); @@ -228,8 +341,7 @@ test('pairing failure exits launch-owned fullscreen without hiding the pairing i test('a fullscreen request that completes after disconnect is released', async () => { let complete; const f = fixture({ fullscreen: enter => new Promise(resolve => { complete = () => { enter(); resolve(); }; }) }); - f.element('fullscreen-on-start').checked = true; - await f.connect(); f.element('disconnect').handlers.click(); + await f.connect(); f.element('settings-disconnect').handlers.click(); complete(); await new Promise(resolve => setImmediate(resolve)); assert.deepEqual(f.fullscreenCalls, ['request', 'exit']); assert.equal(f.document.fullscreenElement, null); @@ -238,12 +350,23 @@ test('a fullscreen request that completes after disconnect is released', async ( test('disconnect leaves fullscreen that was already active before launch intact', async () => { const f = fixture(); f.document.fullscreenElement = f.document.documentElement; - f.element('fullscreen-on-start').checked = true; - await f.connect(); f.element('disconnect').handlers.click(); + await f.connect(); f.element('settings-disconnect').handlers.click(); assert.deepEqual(f.fullscreenCalls, []); assert.equal(f.document.fullscreenElement, f.document.documentElement); }); +test('automatic reconnect preserves the decision to leave fullscreen through OEM settings', async () => { + const f = fixture(), ws = await f.connect(); + ws.onmessage({ data: JSON.stringify({ type: 'open-settings' }) }); + await f.element('settings-fullscreen').click(); + ws.close(); + await [...f.timers.values()].find(t => t.delay === 1000).fn(); + const replacement = f.sockets.at(-1); replacement.readyState = 1; replacement.onopen(); + assert.equal(f.document.fullscreenElement, null); + assert.equal(f.element('topbar').hidden, true); + assert.deepEqual(f.fullscreenCalls, ['request', 'exit']); +}); + test('actual image onload retries ACK and preserves down/up during browser congestion', async () => { const f = fixture(), ws = await f.connect(); ws.bufferedAmount = 8192; @@ -818,7 +941,7 @@ test('an automatic retry keeps the launch mode until the user starts a new displ assert.equal(f.stats().presentation.selectedMode, 'track-canvas'); await f.offer(replacement); await f.decoded(); assert.equal(f.createdVideos.length, 0); - f.element('disconnect').handlers.click(); + f.element('settings-disconnect').handlers.click(); const next = await f.connect(); await f.offer(next); assert.equal(f.stats().presentation.selectedMode, 'native'); assert.equal(f.createdVideos.length, 1); @@ -893,11 +1016,22 @@ test('browser GPS option forwards through the authenticated stream and stops on option.checked = true; option.handlers.change(); await new Promise(resolve => setImmediate(resolve)); assert.equal(option.checked, true); assert.equal(deliver, undefined); const ws = await f.connect(); await new Promise(resolve => setImmediate(resolve)); + ws.onmessage({ data: JSON.stringify({ type: 'open-settings' }) }); + assert.equal(f.element('settings-browser-location').checked, true); deliver({ timestamp: Date.now(), coords: { latitude: 25, longitude: 121, accuracy: 5 } }); const packet = ws.sent.find(m => m.type === 'location'); assert.equal(packet.latitude, 25); assert.equal(packet.longitude, 121); assert.ok(ws.sent.findIndex(m => m.type === 'location-start') < ws.sent.indexOf(packet)); - ws.close(); assert.equal(clears, 1); + f.element('settings-browser-location').checked = false; + f.element('settings-browser-location').handlers.change(); + assert.equal(option.checked, false); + assert.equal(ws.sent.at(-1).type, 'location-stop'); + f.element('settings-browser-location').checked = true; + f.element('settings-browser-location').handlers.change(); + await new Promise(resolve => setImmediate(resolve)); + assert.equal(option.checked, true); + ws.close(); assert.equal(clears, 2); + assert.equal(f.element('settings-browser-location').checked, true, 'Page consent is retained for reconnect'); const count = ws.sent.length; deliver({ timestamp: Date.now(), coords: { latitude: 26, longitude: 121, accuracy: 5 } }); assert.equal(ws.sent.length, count);