Free, open-source screen sharing for private live streams with friends. Watch together in a browser or self-host Piik. 免费开源的私密屏幕共享,支持游戏直播、一起看电影与自部署。
chore: merge feat/simple-entry-diagnostics into feat/clarity-quality-controls
AAAfb19e59c2714
diff --cc scripts/peer-assisted-benchmark.tsindex 0d647190,7f5094ef..c2208127--- a/scripts/peer-assisted-benchmark.ts+++ b/scripts/peer-assisted-benchmark.ts@@@ -1319,137 -1302,6 +1319,151 @@@ async function samplePages};}+function peerConnectionFingerprint(pages: PageObservation[]): string {+ return pages+ .map((page) =>+ [+ page.label,+ ...page.connections.map(+ (connection) =>+ `${connection.index}:${connection.connectionId ?? "?"}`,+ ),+ ].join("|"),+ )+ .sort()+ .join("\n");+}++async function applyQualityPreference(+ cdp: CdpConnection,+ hostPage: PageHandle,+ label: "平衡" | "清晰优先",+ signal: AbortSignal,+): Promise<void> {+ const serializedLabel = JSON.stringify(label);+ await evaluate(+ cdp,+ hostPage,+ `(() => {+ const details = document.querySelector('.advanced-quality');+ if (!(details instanceof HTMLDetailsElement)) return false;+ details.open = true;+ const button = Array.from(document.querySelectorAll('.quality-priority button'))+ .find((item) => item.textContent?.trim() === ${serializedLabel});+ if (!(button instanceof HTMLButtonElement)) return false;+ button.click();+ return true;+ })()`,+ );+ await waitForPage(+ cdp,+ hostPage,+ `Array.from(document.querySelectorAll('.quality-priority button.is-selected')).some((item) => item.textContent?.trim() === ${serializedLabel})`,+ 5_000,+ `${label} advanced quality selection`,+ signal,+ );+ await evaluate(+ cdp,+ hostPage,+ `(() => {+ const button = Array.from(document.querySelectorAll('.advanced-quality-grid > button'))+ .find((item) => item.textContent?.includes('应用视频设置'));+ if (!(button instanceof HTMLButtonElement)) return false;+ button.click();+ return true;+ })()`,+ );+}++async function runQualityControlSmoke(+ cdp: CdpConnection,+ pages: PageHandle[],+ initialSettings: QualitySettings,+ signal: AbortSignal,+): Promise<{+ peerConnectionsStable: boolean;+}> {+ const hostPage = pages[0];+ if (!hostPage) {+ throw new Error("Quality control smoke requires a host page");+ }+ const baseline = await Promise.all(pages.map((page) => quickSnapshot(cdp, page)));+ const baselineFingerprint = peerConnectionFingerprint(baseline);+ const balanced = {+ ...initialSettings,+ degradationPreference: "balanced",+ } as const satisfies QualitySettings;++ const waitForSettings = async (settings: QualitySettings): Promise<void> => {+ const serializedSettings = JSON.stringify(JSON.stringify(settings));+ await Promise.all(+ pages.map((page) =>+ waitForPage(+ cdp,+ page,+ `JSON.stringify(globalThis.__SCREENER_BENCHMARK__.snapshot().qualitySettings) === ${serializedSettings}`,+ 10_000,+ `${settings.degradationPreference} quality propagation`,+ signal,+ ),+ ),+ );+ };+ const sendingLabels = new Set(+ baseline+ .filter((page) => page.assignment.childPeerIds.length > 0)+ .map((page) => page.label),+ );+ const sendingPages = pages.filter((page) => sendingLabels.has(page.label));++ await Promise.all(++ sendingPages.map((page) =>++ evaluate(++ cdp,++ page,++ `(() => {++ const toggle = document.querySelector('.connection-details-toggle input');++ if (!(toggle instanceof HTMLInputElement)) return false;++ if (!toggle.checked) toggle.click();++ return true;++ })()`,++ ),++ ),++ );+ const waitForReadback = async (label: "平衡" | "清晰"): Promise<void> => {+ const expected = JSON.stringify(`${label} / ${label}`);+ await Promise.all(+ sendingPages.map((page) =>+ waitForPage(+ cdp,+ page,+ `Array.from(document.querySelectorAll('.metric')).some((metric) =>+ metric.querySelector('dt')?.textContent?.trim() === '请求 / 应用优先级' &&+ metric.querySelector('dd')?.textContent?.trim() === ${expected}+ )`,+ 10_000,+ `${label} sender parameter readback`,+ signal,+ ),+ ),+ );+ };++ await applyQualityPreference(cdp, hostPage, "平衡", signal);+ await waitForSettings(balanced);+ await waitForReadback("平衡");+ await applyQualityPreference(cdp, hostPage, "清晰优先", signal);+ await waitForSettings(initialSettings);+ await waitForReadback("清晰");++ const final = await Promise.all(pages.map((page) => quickSnapshot(cdp, page)));++ return {+ peerConnectionsStable:+ peerConnectionFingerprint(final) === baselineFingerprint,+ };+}+function totalDecodedFrames(page: PageObservation): number {return page.connections.reduce((total, connection) => total + (connection.receiveTotals?.framesTotal ?? 0),diff --cc src/client/components/connection-details.tsindex 00000000,dd51696f..507c07e8mode 000000,100644..100644--- a/src/client/components/connection-details.ts+++ b/src/client/components/connection-details.ts@@@ -1,0 -1,22 +1,12 @@@+ import type { PeerSnapshot } from "../types";+-const QUALITY_LIMITATION_LABELS: Record<string, string> = {- bandwidth: "带宽受限",- cpu: "编码性能受限",- other: "其他编码限制",-};-+ export function qualityLimitationSummary(+ snapshots: readonly PeerSnapshot[],+ ): string | null {- const reasons = new Set<string>();+ for (const snapshot of snapshots) {- const reason = snapshot.metrics.qualityLimitationReason;- if (reason && reason !== "none") {- reasons.add(QUALITY_LIMITATION_LABELS[reason] ?? reason);++ if (snapshot.qualityWarning) {++ return snapshot.qualityWarning;+ }+ }- return reasons.size > 0- ? `发送画质受限:${Array.from(reasons).join("、")}`- : null;++ return null;+ }diff --cc src/client/pages/HostPage.tsxindex e667e74f,607f5153..9f6e44e5--- a/src/client/pages/HostPage.tsx+++ b/src/client/pages/HostPage.tsx@@@ -163,10 -156,10 +166,14 @@@ export function HostPage({ onAuthorizat() => Array.from(peerSnapshots.values()),[peerSnapshots],);+ const selectedQualityProfileId = useMemo(+ () => matchingQualityProfileId(qualitySettings),+ [qualitySettings],+ );+ const qualityLimitation = useMemo(+ () => qualityLimitationSummary(viewers),+ [viewers],+ );useEffect(() => {if (videoRef.current) {@@@ -1128,168 -1161,35 +1184,155 @@@</div>)}+ <ConnectionDetailsToggle+ checked={showConnectionDetails}+ onChange={setShowConnectionDetails}+ />+<div className="setup-controls">- <fieldset className="control-group">- <legend>画质</legend>- <div className="segmented-control">- {(Object.keys(QUALITY_PROFILES) as QualityProfileId[]).map(- (id) => (- <button- key={id}- type="button"- className={qualityId === id ? "is-selected" : undefined}- aria-pressed={qualityId === id}- disabled={- phase === "starting" ||- switchingSource ||- changingQuality+ <div className="quality-controls">+ <fieldset className="control-group">+ <legend>推荐画质</legend>+ <div className="segmented-control">+ {(Object.keys(QUALITY_PROFILES) as QualityProfileId[]).map(+ (id) => (+ <button+ key={id}+ type="button"+ className={+ selectedQualityProfileId === id+ ? "is-selected"+ : undefined+ }+ aria-pressed={selectedQualityProfileId === id}+ disabled={+ phase === "starting" ||+ switchingSource ||+ changingQuality+ }+ onClick={() => void changeQuality(QUALITY_PROFILES[id])}+ >+ {QUALITY_PROFILE_LABELS[id]}+ </button>+ ),+ )}+ </div>+ </fieldset>++ <details className="advanced-quality">+ <summary>高级视频设置</summary>+ <div className="advanced-quality-grid">+ <label>+ <span>分辨率上限</span>+ <select+ value={advancedQuality.resolution}+ disabled={changingQuality}+ onChange={(event) =>+ setAdvancedQuality((current) => ({+ ...current,+ resolution: event.target+ .value as QualitySettings["resolution"],+ }))}- onClick={() => void changeQuality(id)}>- {QUALITY_PROFILES[id].label}- </button>- ),- )}- </div>- </fieldset>+ {Object.entries(QUALITY_RESOLUTIONS).map(+ ([resolution, option]) => (+ <option key={resolution} value={resolution}>+ {option.label}+ </option>+ ),+ )}+ </select>+ </label>+ <label>+ <span>帧率上限</span>+ <div className="range-control">+ <input+ type="range"+ min="15"+ max="60"+ step="5"+ value={advancedQuality.maxFramerate}+ disabled={changingQuality}+ onChange={(event) =>+ setAdvancedQuality((current) => ({+ ...current,+ maxFramerate: Number(event.target.value),+ }))+ }+ />+ <output>{advancedQuality.maxFramerate} fps</output>+ </div>+ </label>+ <label>+ <span>视频码率上限</span>+ <div className="range-control">+ <input+ type="range"+ min="2000000"+ max="12000000"+ step="500000"+ value={advancedQuality.maxBitrate}+ disabled={changingQuality}+ onChange={(event) =>+ setAdvancedQuality((current) => ({+ ...current,+ maxBitrate: Number(event.target.value),+ }))+ }+ />+ <output>+ {(advancedQuality.maxBitrate / 1_000_000).toFixed(1)} Mbps+ </output>+ </div>+ </label>+ <fieldset className="control-group quality-priority">+ <legend>质量优先级</legend>+ <div className="segmented-control">+ {(+ Object.keys(+ DEGRADATION_PREFERENCE_LABELS,+ ) as DegradationPreference[]+ ).map((preference) => (+ <button+ key={preference}+ type="button"+ className={+ advancedQuality.degradationPreference === preference+ ? "is-selected"+ : undefined+ }+ aria-pressed={+ advancedQuality.degradationPreference === preference+ }+ disabled={changingQuality}+ onClick={() =>+ setAdvancedQuality((current) => ({+ ...current,+ degradationPreference: preference,+ }))+ }+ >+ {DEGRADATION_PREFERENCE_LABELS[preference]}+ </button>+ ))}+ </div>+ </fieldset>+ <button+ className="button button-secondary"+ type="button"+ disabled={+ phase === "starting" ||+ switchingSource ||+ changingQuality+ }+ onClick={() => void changeQuality(advancedQuality)}+ >+ {changingQuality ? "正在应用" : "应用视频设置"}+ </button>+ </div>+ </details>+ </div>-- {phase !== "live" && (- <button- className="button button-primary start-button"- type="button"- disabled={phase === "starting"}- onClick={() => void startSharing()}- >- <MonitorUp size={18} aria-hidden="true" />- {phase === "starting" ? "正在启动" : "开始分享"}- </button>- )}- {phase !== "live" && (- <a className="join-room-link" href="/join">- <Hash size={15} aria-hidden="true" />- 输入房间码观看- </a>- )}</div>{room && (<div className="invite-bar">@@@ -1331,17 -1231,14 +1374,18 @@@<h3>朋友 {index + 1}</h3><PeerStatusBadge state={viewer.connectionState} /></div>- <PathBadge path={viewer.metrics.path} />+ {showConnectionDetails && (+ <PathBadge path={viewer.metrics.path} />+ )}</div>- <StatsGrid- metrics={viewer.metrics}- direction="send"- senderParameters={viewer.senderParameters}- />- {viewer.error && <p className="inline-error">{viewer.error}</p>}- {viewer.qualityWarning && (- <p className="inline-warning">{viewer.qualityWarning}</p>+ {showConnectionDetails && (- <StatsGrid metrics={viewer.metrics} direction="send" />++ <StatsGrid++ metrics={viewer.metrics}++ direction="send"++ senderParameters={viewer.senderParameters}++ />)}+ {viewer.error && <p className="inline-error">{viewer.error}</p>}</article>))}{viewers.length === 0 && (diff --cc src/client/pages/ViewerPage.tsxindex 74f09533,3b03c947..121f139e--- a/src/client/pages/ViewerPage.tsx+++ b/src/client/pages/ViewerPage.tsx@@@ -735,20 -773,10 +766,14 @@@ export function ViewerPage({ roomId, on<StatsGrid metrics={peerSnapshot.metrics} direction="receive" /></section>)}- {relaySnapshot && (+ {showConnectionDetails && relaySnapshot && (<section className="viewer-stats" aria-labelledby="relay-stats-heading"><h2 id="relay-stats-heading">转发数据</h2>- <StatsGrid metrics={relaySnapshot.metrics} direction="send" />+ <StatsGrid+ metrics={relaySnapshot.metrics}+ direction="send"+ senderParameters={relaySnapshot.senderParameters}+ />- {relaySnapshot.error && (- <p className="inline-error">{relaySnapshot.error}</p>- )}- {relaySnapshot.qualityWarning && (- <p className="inline-warning">{relaySnapshot.qualityWarning}</p>- )}</section>)}</main>diff --cc src/client/styles.cssindex 22c095c9,c7c3fca5..9ec7048b--- a/src/client/styles.css+++ b/src/client/styles.css@@@ -296,97 -358,20 +360,95 @@@ h3margin-top: 22px;}+.quality-controls {+ min-width: 0;+}++.advanced-quality {+ margin-top: 10px;+ border-top: 1px solid var(--border);+}++.advanced-quality summary {+ width: fit-content;+ padding-top: 10px;+ color: var(--muted);+ font-size: 13px;+ cursor: pointer;+}++.advanced-quality summary:hover {+ color: var(--text);+}++.advanced-quality-grid {+ display: grid;+ grid-template-columns: repeat(2, minmax(0, 1fr));+ gap: 14px 18px;+ align-items: end;+ padding-top: 14px;+}++.advanced-quality-grid > label > span {+ display: block;+ margin-bottom: 7px;+ color: var(--muted);+ font-size: 12px;+ font-weight: 600;+}++.advanced-quality-grid select {+ width: 100%;+ height: 40px;+ padding: 0 10px;+ border: 1px solid var(--border);+ border-radius: 6px;+ color: var(--text);+ background: var(--surface);+}++.range-control {+ display: grid;+ grid-template-columns: minmax(0, 1fr) 92px;+ min-height: 40px;+ gap: 10px;+ align-items: center;+}++.range-control input {+ width: 100%;+ accent-color: var(--green);+}++.range-control output {+ color: var(--text);+ font-size: 12px;+ font-variant-numeric: tabular-nums;+ text-align: right;+}++.quality-priority {+ grid-column: 1 / -1;+}++.advanced-quality-grid > .button {+ justify-self: start;+}+- .join-room-link {+ .connection-details-toggle {display: inline-flex;- grid-column: 1 / -1;- width: fit-content;- gap: 7px;+ min-height: 44px;+ max-width: 100%;+ gap: 9px;align-items: center;+ margin-top: 8px;+ padding: 0 2px;color: var(--muted);font-size: 13px;- text-decoration: none;+ cursor: pointer;}- .join-room-link:hover {+ .connection-details-toggle:hover {color: var(--text);}@@@ -817,22 -803,6 +880,13 @@@flex-wrap: wrap;}- .setup-controls {- grid-template-columns: minmax(0, 1fr) auto;- }-+ .advanced-quality-grid {+ grid-template-columns: 1fr;+ }++ .quality-priority {+ grid-column: auto;+ }-- .start-button {- grid-column: auto;- }-.viewer-stats .stats-grid {grid-template-columns: repeat(4, minmax(0, 1fr));}diff --cc tests/connection-details.test.tsindex 00000000,586a4436..260f5ddbmode 000000,100644..100644--- a/tests/connection-details.test.ts+++ b/tests/connection-details.test.ts@@@ -1,0 -1,29 +1,29 @@@+ import { describe, expect, it } from "vitest";++ import { qualityLimitationSummary } from "../src/client/components/connection-details.ts";+ import { EMPTY_METRICS, type PeerSnapshot } from "../src/client/types.ts";+-function snapshot(reason: string | null): PeerSnapshot {++function snapshot(qualityWarning: string | null): PeerSnapshot {+ return {+ peerId: "viewer-1",+ connectionId: "connection-1",+ connectionState: "connected",+ iceConnectionState: "connected",- metrics: { ...EMPTY_METRICS, qualityLimitationReason: reason },++ metrics: { ...EMPTY_METRICS, qualityLimitationReason: "bandwidth" },+ error: null,++ qualityWarning,+ };+ }++ describe("progressive connection details", () => {- it("keeps active quality limitations available outside the details panel", () => {++ it("keeps one debounced quality warning outside the details panel", () => {+ expect(+ qualityLimitationSummary([- snapshot("none"),- snapshot("bandwidth"),- snapshot("cpu"),- snapshot("bandwidth"),++ snapshot(null),++ snapshot("持续受带宽限制,浏览器正在降低画面质量"),++ snapshot("持续受编码性能限制,浏览器正在降低画面质量"),+ ]),- ).toBe("发送画质受限:带宽受限、编码性能受限");++ ).toBe("持续受带宽限制,浏览器正在降低画面质量");+ expect(qualityLimitationSummary([snapshot(null)])).toBeNull();+ });+ });