Skip to content

armgit / Piik

Public Imported from GitHub
0

Free, open-source screen sharing for private live streams with friends. Watch together in a browser or self-host Piik. 免费开源的私密屏幕共享,支持游戏直播、一起看电影与自部署。

fix(web): show peer-relayed viewer evidence [skip ci]

AAA85a02b24549a
diff --git a/docs/project-memory.md b/docs/project-memory.md
index 9cc71c70..8b8b4548 100644
--- a/docs/project-memory.md
+++ b/docs/project-memory.md
@@ -43,14 +43,15 @@ Last updated: 2026-08-21
## Current Implementation
- The repository is one npm package using Node.js 24, React, TypeScript, Vite, native WebRTC, `ws`, Zod, Vitest, and separate coturn.
-- Production is exact `20cb1bdb2be3c7c254508623fa2bcfbd9a6d61c2`, release `/opt/screener/releases/20cb1bdb2be3`, with deployed Web wire `screener-v3`; rollback is `/opt/screener/releases/7dd38fc39ce8`.
+- Production: exact `3d75e7b886350852d08027eb2d3c460f36a791e4`, release `3d75e7b88635`, Web wire `screener-v4`; rollback `20cb1bdb2be3`.
- Web keeps one SFU stream, clears unavailable video, exposes evidence-backed routes/transports and paused preview, and drops signals to a grace-retained offline current-edge target. Routing is automatic; entry/nickname UI is live; Native remains source-only.
- Web relay is cap2 with one upstream; child3 rejects and no UA/visibility split exists.
+- Source candidate: validated relay Viewer evidence reaches opted-in Web Host rosters; direct proof stays local-edge-only. Not deployed.
- Four services are active/running at `NRestarts=0`; local/public health are 200. SQLite v3 has five rooms, SHA-256 `aef724ae52c4107be8ec8791e72f8dcaa11b0ec849fb432d022e2cfb9cfe0974`, owner/mode `screener:screener`/0600.
- Production keeps ordinary ICE STUN-only, SFU roots <=2, selected-edge UDP TTL 120, and one pending/answered `peer-selected` attempt per room excluding Host ingress. This rollout ran no browser/media/SFU/TURN/performance canary; earlier exact-`16f6eab` evidence proves active Host ingress only.
- Production requires independent `SITE_ACCESS_PASSWORD`: its stateless cookie authorizes creation/Host and code-only Viewer attempts; private grants stay direct, while public/private code entry needs site access alone/plus room password. Env/endpoint/cookie/nginx naming migrated atomically; failures remain neutral; there are no accounts/JWT/session rows. Local `gate:access-privacy` proves fragment isolation, site/grant transport-log absence, and raw room-password SQLite absence; room-password WebSocket/log ingress and live/headful evidence remain open.
- Production uses nginx, Node.js 24.19.0, coturn 4.17.2, and LiveKit 1.13.5 on UDP 7882 (TCP fallback off). Ordinary peer ICE receives no TURN; the selected-edge tuple is configured only for the current controller edge, with no credential pre-advertised to ordinary peers. Coturn retains the old authenticated-relay ports. Services are healthy with zero restarts.
-- ADR-0005 rejects `PEER_ASSISTED_ROOM_IDS`; `PEER_ASSISTED_MEDIA=true` enables every room and ordinary peers stay STUN-only. Initial or active Host ingress may consume one bound relay-only grant; ready/abort clears it and failure restores peer baseline. Stale room-ID config fails startup. This atomic source candidate moves Web and source-only Native from deployed v3 to the single `screener-v4` authentication wire; Native does not subscribe to Web presence.
+- ADR-0005 rejects `PEER_ASSISTED_ROOM_IDS`; `PEER_ASSISTED_MEDIA=true` enables every room and ordinary peers stay STUN-only. Initial or active Host ingress may consume one bound relay-only grant; ready/abort clears it and failure restores peer baseline. Stale room-ID config fails startup. Web and source-only Native use the single deployed `screener-v4` authentication wire; Native does not subscribe to Web presence.
- Defaults are balanced with automatic codec; clarity/fluid and H.264/VP8 remain explicit. Codec is locked during a share. Web SFU uses LiveKit 2.22.0 `q,h`; SFU/UDP and selected-TURN work; BWE, Host A+B and production remain open.
- Chrome 151 five-Viewer 720p30 cap2 evidence: Host/relay fanout two; both relay children +80 decoded frames/~1.1 MB; every Viewer decoded; clean stop. Functional only; resource and heterogeneous-network behavior remain open.
diff --git a/docs/status.md b/docs/status.md
index f7683c3b..95c3167a 100644
--- a/docs/status.md
+++ b/docs/status.md
@@ -4,7 +4,7 @@ Last updated: 2026-08-21
## Phase
-Production is exact `20cb1bdb2be3c7c254508623fa2bcfbd9a6d61c2` at `https://share.bonfire.icu`, release `20cb1bdb2be3`, wire `screener-v3`; rollback is release `7dd38fc39ce8`. SQLite v3/five rooms keeps SHA-256 `aef724ae52c4107be8ec8791e72f8dcaa11b0ec849fb432d022e2cfb9cfe0974`, owner/mode `screener:screener`/0600. Four services and local/public health are green.
+Production is exact `3d75e7b886350852d08027eb2d3c460f36a791e4` at `https://share.bonfire.icu`, release `3d75e7b88635`, wire `screener-v4`; rollback is release `20cb1bdb2be3`. SQLite v3/five rooms keeps SHA-256 `aef724ae52c4107be8ec8791e72f8dcaa11b0ec849fb432d022e2cfb9cfe0974`, owner/mode `screener:screener`/0600. Four services and local/public health are green.
Ordinary ICE is STUN-only; limits are SFU roots <=2, one `peer-selected` attempt excluding Host ingress, and selected UDP TTL 120. No browser/media/SFU/TURN/performance canary ran; exact-`16f6eab` Host-ingress proof is separate.
Stable SFU, route/transport truth, preview notice, entry/nickname UI and Web relay cap2 are live. Native is source-only. The controlled production A/B uses browser/LiveKit codec defaults; explicit codec controls are source-complete.
@@ -14,9 +14,9 @@ Parallel flagship work; use minimum relevant checks and rollback proof. Target-d
## Current Snapshot
-- Capture precedes rooms; source/quality changes and AV pause preserve peers. Defaults are balanced and automatic codec; clarity/fluid plus H.264/VP8 stay explicit, with codec locked during a share. Browser degradation and Host SFU A+B remain open; pause notice is source-only.
-- Deployed `screener-v3` admits private fragment grants directly; code-only Viewers need site access, and private rooms additionally need their password. Credentials remain unstored. This atomic source candidate moves Web and source-only Native authentication together to `screener-v4` for Web-only presence fields.
-- Source UI has nickname editing and room entry. Status/details stay neutral before proof. An undeployed SFU-roster candidate carries session-bound first-media truth in presence and clears it on track/route/session loss; P2P/SFU/TURN labels require evidence. Browser proof is open.
+- Capture precedes rooms; source/quality changes and AV pause preserve peers. Defaults are balanced and automatic codec; clarity/fluid plus H.264/VP8 stay explicit, with codec locked during a share. Browser degradation and Host SFU A+B remain open.
+- Deployed `screener-v4` admits private fragment grants directly; code-only Viewers need site access, and private rooms additionally need their password. Credentials remain unstored. Web presence fields remain opt-in and Native does not subscribe to them.
+- Deployed UI has nickname editing, room entry, Viewer roster, duplicate-only ID suffixes, pause notice, and session-bound SFU first-media truth that clears on track/route/session loss. P2P/SFU/TURN labels require evidence. A source candidate gives an opted-in Web Host guarded evidence for relayed Viewers without Host-local transport claims or false parent-edge proof.
- Native v4 is source-only (memory rooms, 300s reclaim); it does not subscribe to Web presence, follows authenticated direct-child assignments up to two, and fails unsupported SFU/selected ingress boundedly.
- Production is roots/Web relay <=2; every Viewer has one upstream and rejects child3. One-root healthy-SFU MBB is deployed but media-unverified; capacity `0 -> 1`, multi-root and browser gates remain open. Room `1` is historical; HTTPS/WSS is TLS/TCP.
- After an answer, a generation-bound 15s initial-connect deadline enters ICE restart; success/replacement/disposal cancels it. It is deployed but not mobile-verified.
diff --git a/src/client/media/viewer-quality-evidence.ts b/src/client/media/viewer-quality-evidence.ts
index 14cf9eb0..009d8ecc 100644
--- a/src/client/media/viewer-quality-evidence.ts
+++ b/src/client/media/viewer-quality-evidence.ts
@@ -219,6 +219,26 @@ export function qualityEvidenceMatchesSnapshot(
);
}
+export function classifyHostViewerQualityEvidence(
+ evidence: ViewerQualityEvidence,
+ hostPeerId: string | null,
+ routeRevision: number,
+ directSnapshot: PeerSnapshot | null,
+): "direct" | "peer-relayed" | null {
+ if (
+ hostPeerId === null ||
+ evidence.guard.routeRevision !== routeRevision
+ ) {
+ return null;
+ }
+ if (evidence.parentPeerId !== hostPeerId) {
+ return "peer-relayed";
+ }
+ return qualityEvidenceMatchesSnapshot(evidence, directSnapshot)
+ ? "direct"
+ : null;
+}
+
export function metricsFromQualityEvidence(
evidence: ViewerQualityEvidence,
): ConnectionMetrics {
diff --git a/src/client/pages/HostPage.tsx b/src/client/pages/HostPage.tsx
index 1d606cc2..5cc0200c 100644
--- a/src/client/pages/HostPage.tsx
+++ b/src/client/pages/HostPage.tsx
@@ -88,7 +88,10 @@ import {
ParentEdgeQualityEvidenceReporter,
} from "../media/parent-edge-quality-evidence";
import { SfuStandbyPrewarmer } from "../media/sfu-standby-prewarmer";
-import { metricsFromQualityEvidence } from "../media/viewer-quality-evidence";
+import {
+ classifyHostViewerQualityEvidence,
+ metricsFromQualityEvidence,
+} from "../media/viewer-quality-evidence";
import type {
PeerSnapshot,
SignalConnectionState,
@@ -536,19 +539,27 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {
function acceptViewerQualityEvidence(evidence: ViewerQualityEvidence): void {
const peer = peersRef.current.get(evidence.viewerPeerId);
+ const directSnapshot = peer?.getSnapshot() ?? null;
+ const evidenceSource = classifyHostViewerQualityEvidence(
+ evidence,
+ hostPeerIdRef.current,
+ activeRouteRevisionRef.current,
+ directSnapshot,
+ );
if (
- !peer ||
- peer.connectionId !== evidence.guard.connectionId ||
- evidence.guard.routeRevision !== activeRouteRevisionRef.current
+ !evidenceSource ||
+ (evidenceSource === "peer-relayed" && !peerAssistedRef.current)
) {
return;
}
- const parentEvidence = parentEdgeQualityEvidenceReporterRef.current.offer(
- evidence,
- peer.getSnapshot(),
- );
- if (peerAssistedRef.current && parentEvidence) {
- signalRef.current?.send(parentEvidence);
+ if (evidenceSource === "direct") {
+ const parentEvidence = parentEdgeQualityEvidenceReporterRef.current.offer(
+ evidence,
+ directSnapshot,
+ );
+ if (peerAssistedRef.current && parentEvidence) {
+ signalRef.current?.send(parentEvidence);
+ }
}
const next = new Map(viewerQualityEvidenceRef.current);
next.set(evidence.viewerPeerId, evidence);
diff --git a/src/server/signaling.ts b/src/server/signaling.ts
index 539ae5cb..1c0ad4be 100644
--- a/src/server/signaling.ts
+++ b/src/server/signaling.ts
@@ -1031,6 +1031,13 @@ export class SignalingServer {
if (!viewerState || viewerState.authenticated !== source) {
return;
}
+ const connectedViewer = this.options.roomStore.getConnectedViewer(
+ source.roomId,
+ source.peerId,
+ );
+ if (connectedViewer?.sessionId !== viewerState.sessionId) {
+ return;
+ }
const connectionId = this.connectionIdsByViewer.get(
viewerConnectionKey(source.roomId, source.peerId),
@@ -1118,6 +1125,23 @@ export class SignalingServer {
evidence: forwarded,
});
}
+
+ const host = this.options.roomStore.getConnectedHost(source.roomId);
+ if (!host || host.sessionId === parent.sessionId) {
+ return;
+ }
+ const hostSocket = this.socketsBySessionId.get(host.sessionId);
+ const hostState = hostSocket
+ ? this.socketStates.get(hostSocket)?.authenticated
+ : undefined;
+ if (
+ hostState?.role === "host" &&
+ hostState.roomId === source.roomId &&
+ hostState.peerId === host.peerId &&
+ hostState.viewerPresence
+ ) {
+ this.sendEncodedToSession(host.sessionId, encoded);
+ }
}
private handleParentEdgeQualityEvidence(
diff --git a/tests/server-signal.test.ts b/tests/server-signal.test.ts
index 342ea269..7881e09f 100644
--- a/tests/server-signal.test.ts
+++ b/tests/server-signal.test.ts
@@ -2686,14 +2686,27 @@ describe("WebSocket signaling", () => {
});
});
- it("derives peer-assisted C routing from the active assignment", async () => {
- const harness = await startHarness({ peerAssistedMedia: true });
+ it("forwards peer-assisted C to the active parent and opted-in Host", async () => {
+ let now = 50_000;
+ const harness = await startHarness({
+ peerAssistedMedia: true,
+ now: () => now,
+ });
const host = await openClient(harness.webSocketUrl);
const hostAuth = peerAssisted(
- await authenticate(host, harness.room, "host", "peer-quality-host"),
+ await authenticate(
+ host,
+ harness.room,
+ "host",
+ "peer-quality-host",
+ 1,
+ undefined,
+ { viewerPresence: true },
+ ),
);
host.inbox.ignore("route-update");
host.inbox.ignore("media-assignment");
+ host.inbox.ignore("viewer-presence");
const viewer = await openClient(harness.webSocketUrl);
const viewerAuth = peerAssisted(
await authenticate(
@@ -2813,7 +2826,8 @@ describe("WebSocket signaling", () => {
),
),
);
- expect(await viewer.inbox.next("viewer-quality-evidence")).toMatchObject({
+ const relayedEvidence = await viewer.inbox.next("viewer-quality-evidence");
+ expect(relayedEvidence).toMatchObject({
viewerPeerId: relayChildAuth.peerId,
parentPeerId: viewerAuth.peerId,
guard: {
@@ -2821,6 +2835,31 @@ describe("WebSocket signaling", () => {
routeRevision: relayChildAuth.routeRevision,
},
});
+ expect(await host.inbox.next("viewer-quality-evidence")).toEqual(
+ relayedEvidence,
+ );
+
+ const replaced = harness.roomStore.connectParticipant({
+ roomId: harness.room.roomId,
+ role: "viewer",
+ ...(harness.room.viewerGrant
+ ? { viewerGrant: harness.room.viewerGrant }
+ : {}),
+ clientId: "peer-quality-relay-child",
+ sessionId: "peer-quality-relay-child-replacement-session",
+ });
+ expect(replaced.peerId).toBe(relayChildAuth.peerId);
+ now += 2_000;
+ relayChild.socket.send(
+ JSON.stringify(
+ viewerQualityEvidence(
+ "relay_child_quality_connection",
+ relayChildAuth.routeRevision,
+ 1,
+ ),
+ ),
+ );
+ await viewer.inbox.expectNone(30);
await host.inbox.expectNone(30);
});
diff --git a/tests/viewer-quality-evidence.test.ts b/tests/viewer-quality-evidence.test.ts
index 808224c9..f4b48ded 100644
--- a/tests/viewer-quality-evidence.test.ts
+++ b/tests/viewer-quality-evidence.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
import type { ClientMessage, ServerMessage } from "../src/shared/protocol.ts";
import {
+ classifyHostViewerQualityEvidence,
metricsFromQualityEvidence,
qualityEvidenceMatchesSnapshot,
qualityEvidenceWindowFromMetrics,
@@ -234,6 +235,38 @@ describe("viewer quality evidence", () => {
connectionId: "connection_replaced_12345678",
}),
).toBe(false);
+ expect(
+ classifyHostViewerQualityEvidence(
+ evidence,
+ evidence.parentPeerId,
+ evidence.guard.routeRevision,
+ current,
+ ),
+ ).toBe("direct");
+ expect(
+ classifyHostViewerQualityEvidence(
+ evidence,
+ evidence.parentPeerId,
+ evidence.guard.routeRevision,
+ { ...current, connectionId: "connection_replaced_12345678" },
+ ),
+ ).toBeNull();
+ expect(
+ classifyHostViewerQualityEvidence(
+ { ...evidence, parentPeerId: "viewer_relay_12345678" },
+ evidence.parentPeerId,
+ evidence.guard.routeRevision,
+ null,
+ ),
+ ).toBe("peer-relayed");
+ expect(
+ classifyHostViewerQualityEvidence(
+ evidence,
+ evidence.parentPeerId,
+ evidence.guard.routeRevision + 1,
+ current,
+ ),
+ ).toBeNull();
expect(metricsFromQualityEvidence(evidence)).toMatchObject({
sampleWindowMs: 2_000,
frameWidth: 1_920,