Free, open-source screen sharing for private live streams with friends. Watch together in a browser or self-host Piik. 免费开源的私密屏幕共享,支持游戏直播、一起看电影与自部署。
fix(recovery): fence media recovery to current authority (#284)
AAAd87f6730b7b9
diff --git a/src/client/pages/HostPage.tsx b/src/client/pages/HostPage.tsxindex 5e5a5f7b..433109d8 100644--- a/src/client/pages/HostPage.tsx+++ b/src/client/pages/HostPage.tsx@@ -501,7 +501,7 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {isCurrentGeneration(generation) &&hostSfuRouteRef.current === route) {- reconcilePeerAssistedChildren(childPeerIds, generation);+ reconcileHostChildren(childPeerIds, generation);}},send: (message) =>@@ -1051,6 +1051,10 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {});}+ function hostChildIsAssigned(peerId: string): boolean {+ return activeHostChildPeerIdsRef.current.includes(peerId);+ }+function discardPreparedHostChild(): void {const provisional = hostProvisionalChildRef.current;hostProvisionalChildRef.current = null;@@ -1117,7 +1121,6 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {assignment: HostRouteAssignment,): void {const activeChildPeerIds = activeHostChildPeerIdsRef.current;- const childPeerIds = [...new Set(assignment.childPeerIds)];const provisional = hostProvisionalChildRef.current;const activation = provisional?.activate({revision,@@ -1134,7 +1137,6 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {} else {discardPreparedHostChild();}- activeHostChildPeerIdsRef.current = childPeerIds;}async function startPeer(@@ -1142,7 +1144,7 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {generation: number,attempt = 0,): Promise<void> {- if (!isCurrentGeneration(generation)) {+ if (!isCurrentGeneration(generation) || !hostChildIsAssigned(peerId)) {return;}// Preserve healthy media across control reconnects, but replace a stalled@@ -1169,7 +1171,11 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {qualitySettingsRef.current,{sendSignal: (targetPeerId, payload) =>- isCurrentGeneration(generation) && signalRef.current === signal+ targetPeerId === peerId &&+ isCurrentGeneration(generation) &&+ hostChildIsAssigned(peerId) &&+ peersRef.current.get(peerId) === peer &&+ signalRef.current === signal? signal.send({ type: "signal", targetPeerId, payload }): false,onUpdate: (snapshot) => {@@ -1198,17 +1204,22 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {}removePeer(peerId);- if (!isCurrentGeneration(generation) || attempt >= 1) {+ if (peerAssistedRef.current || attempt >= 1) {return;}window.setTimeout(() => {if (isCurrentGeneration(generation) &&+ !peerAssistedRef.current &&+ hostChildIsAssigned(peerId) &&!peersRef.current.has(peerId)) {void startPeer(peerId, generation, attempt + 1).catch((error: unknown) => {- if (isCurrentGeneration(generation)) {+ if (+ isCurrentGeneration(generation) &&+ hostChildIsAssigned(peerId)+ ) {setNotice(readableError(error, "connection"));}},@@ -1223,6 +1234,9 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {rebuild: boolean,generation: number,): Promise<void> {+ if (!hostChildIsAssigned(peerId)) {+ return;+ }const peer = peersRef.current.get(peerId);if (rebuild) {if (peer && peer.connectionId !== connectionId) {@@ -1254,13 +1268,16 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {await startPeer(peerId, generation);}- function reconcilePeerAssistedChildren(+ function reconcileHostChildren(childPeerIds: string[],generation: number,): void {+ activeHostChildPeerIdsRef.current = [+ ...new Set(childPeerIds),+ ].slice(0, endpointMediaCopyCapacityRef.current);reconcileBoundedMediaChildren(peersRef.current.keys(),- childPeerIds,+ activeHostChildPeerIdsRef.current,endpointMediaCopyCapacityRef.current,removePeer,(peerId) => {@@ -1319,9 +1336,6 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {const currentQualitySettings =pendingQualitySettings ?? message.qualitySettings;activeRouteRevisionRef.current = message.routeRevision;- activeHostChildPeerIdsRef.current = [- ...message.routeAssignment.childPeerIds,- ];peerAssistedRef.current = true;if (reauthenticated) {commitQuality(currentQualitySettings);@@ -1355,15 +1369,9 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {return;}activeRouteRevisionRef.current = 0;- activeHostChildPeerIdsRef.current = [];peerAssistedRef.current = false;clearHostSfuRoute();- const currentViewerIds = new Set(message.viewerPeerIds);- for (const peerId of peersRef.current.keys()) {- if (!currentViewerIds.has(peerId)) {- removePeer(peerId);- }- }+ reconcileHostChildren(message.viewerPeerIds, generation);return;}if (message.type === "viewer-presence") {@@ -1428,13 +1436,10 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {}return;}- if (message.type === "media-assignment") {+ if (message.type === "media-assignment") {if (peerAssistedRef.current && !hostSfuRouteRef.current) {discardPreparedHostChild();- activeHostChildPeerIdsRef.current = [- ...message.mediaAssignment.childPeerIds,- ];- reconcilePeerAssistedChildren(+ reconcileHostChildren(message.mediaAssignment.childPeerIds,generation,);@@ -1445,16 +1450,20 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {if (peerAssistedRef.current) {return;}- void startPeer(message.peerId, generation).catch((error: unknown) => {- if (isCurrentGeneration(generation)) {- setNotice(readableError(error, "connection"));- }- });+ reconcileHostChildren(+ [...activeHostChildPeerIdsRef.current, message.peerId],+ generation,+ );return;}if (message.type === "peer-waiting") {if (!peerAssistedRef.current) {- removePeer(message.peerId);+ reconcileHostChildren(+ activeHostChildPeerIdsRef.current.filter(+ (peerId) => peerId !== message.peerId,+ ),+ generation,+ );}return;}@@ -1462,7 +1471,12 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {if (peerAssistedRef.current) {return;}- removePeer(message.peerId);+ reconcileHostChildren(+ activeHostChildPeerIdsRef.current.filter(+ (peerId) => peerId !== message.peerId,+ ),+ generation,+ );return;}if (message.type === "signal") {diff --git a/src/server/hybrid-media-router.ts b/src/server/hybrid-media-router.tsindex 5c7a8f03..bb19e4c1 100644--- a/src/server/hybrid-media-router.ts+++ b/src/server/hybrid-media-router.ts@@ -702,10 +702,33 @@ export class HybridMediaRouter {if (room.sfuRefreshesInFlight.has(key)) return;room.sfuRefreshesInFlight.add(key);void this.sendFreshSfuConfig(participant)- .catch(() => undefined)+ .catch(() => this.failCurrentSfuRoute(participant, revision)).finally(() => room.sfuRefreshesInFlight.delete(key));}+ private failCurrentSfuRoute(+ participant: AuthenticatedRouteParticipant,+ revision: number,+ ): void {+ const room = this.rooms.get(participant.roomId);+ const snapshot = room?.controller?.snapshot();+ if (!room || !snapshot || snapshot.revision !== revision) return;+ const edge = snapshot.upstreamByViewer.get(participant.peerId);+ const connectionId =+ participant.peerId === room.hostPeerId+ ? snapshot.hostPublication?.connectionId+ : edge?.kind === "sfu"+ ? edge.connectionId+ : undefined;+ if (!connectionId) return;+ this.handleRouteFailed(participant, {+ type: "route-failed",+ revision,+ phase: "active",+ connectionId,+ });+ }+disconnectParticipant(roomId: string, peerId: string, sessionId: string): void {const room = this.rooms.get(roomId);if (!room?.controller?.disconnectSession(peerId, sessionId)) return;diff --git a/tests/hybrid-media-router.test.ts b/tests/hybrid-media-router.test.tsindex 48ac5f44..0448f3d9 100644--- a/tests/hybrid-media-router.test.ts+++ b/tests/hybrid-media-router.test.ts@@ -109,6 +109,7 @@ function harness(: undefined;const roomControl = withSfu ? new FakeSfuRoomControl() : undefined;const onActiveRouteChanged = vi.fn();+ let nextTokenIssueError: Error | null = null;const router = new HybridMediaRouter({roomStore: store,endpointMediaCopyCapacity,@@ -121,6 +122,11 @@ function harness(...(prepareTimeoutMs ? { prepareTimeoutMs } : {}),tokenIssuer: {async issueToken({ peerId }) {+ if (nextTokenIssueError) {+ const error = nextTokenIssueError;+ nextTokenIssueError = null;+ throw error;+ }return `token-${peerId}`;},},@@ -150,6 +156,9 @@ function harness(admission,roomControl,onActiveRouteChanged,+ failNextTokenIssue() {+ nextTokenIssueError = new Error("token issue failed");+ },router,};}@@ -984,6 +993,30 @@ describe("HybridMediaRouter v9 runtime", () => {}});+ it("fails the exact active SFU route when fresh configuration cannot be issued", async () => {+ const { store, sent, router, failNextTokenIssue } = harness(1, true);+ try {+ const room = await store.createRoom();+ const { first } = await establishSfuRoom(store, sent, router, room);+ const active = router.resolveActiveViewerMediaEdge(+ room.roomId,+ first.peerId,+ )!;+ expect(active.upstream).toEqual({ kind: "sfu" });++ failNextTokenIssue();+ router.refreshSfu(first, active.revision);++ await vi.waitFor(() =>+ expect(+ router.resolveActiveViewerMediaEdge(room.roomId, first.peerId),+ ).not.toEqual(active),+ );+ } finally {+ await router.close();+ }+ });+