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(native): accept cumulative Pion gate proof (#116)

AAAb72c5ce0f8b1
diff --git a/scripts/native-one-viewer-gate-core.ts b/scripts/native-one-viewer-gate-core.ts
index 3e38c2d9..7dd284fc 100644
--- a/scripts/native-one-viewer-gate-core.ts
+++ b/scripts/native-one-viewer-gate-core.ts
@@ -32,6 +32,14 @@ export interface CriticalSenderEvidence {
fatalEvents: number;
}
+export interface OneViewerMediaCounters {
+ viewerPackets: number;
+ viewerDecoded: number;
+ viewerRendered: number;
+ pionPackets: number;
+ pionBytes: number;
+}
+
export interface OneViewerIdentity {
socketOrdinal: number;
authGeneration: number;
@@ -96,6 +104,19 @@ export function hasNoCriticalSenderErrors(evidence: CriticalSenderEvidence): boo
return evidence.encoderErrors === 0 && evidence.fatalEvents === 0;
}
+export function hasOneViewerPionProof(
+ sameGeneration: boolean,
+ before: OneViewerMediaCounters,
+ current: OneViewerMediaCounters,
+): boolean {
+ const viewerAdvanced = current.viewerPackets > before.viewerPackets &&
+ current.viewerDecoded > before.viewerDecoded && current.viewerRendered > before.viewerRendered;
+ const pionAdvanced = current.pionPackets > before.pionPackets && current.pionBytes > before.pionBytes;
+ // Viewer growth proves the current window when the 2s Pion diagnostics snapshot has not advanced.
+ const pionAbsolute = current.pionPackets > 0 && current.pionBytes > 0;
+ return sameGeneration && viewerAdvanced && (pionAdvanced || pionAbsolute);
+}
+
export async function verifyFinalSenderEvidence<T extends CriticalSenderEvidence>(
sample: () => Promise<T>,
retain: (evidence: T) => CriticalSenderEvidence,
diff --git a/scripts/native-one-viewer-gate.ts b/scripts/native-one-viewer-gate.ts
index a931ea63..96f98e5b 100644
--- a/scripts/native-one-viewer-gate.ts
+++ b/scripts/native-one-viewer-gate.ts
@@ -26,6 +26,7 @@ import {
fetchJsonBefore,
finalizeGate,
hasNoCriticalSenderErrors,
+ hasOneViewerPionProof,
isExactGateProfile,
retainsFirstBridgeSend,
retainsOneViewerIdentity,
@@ -542,6 +543,16 @@ async function main(): Promise<void> {
viewer: await viewerSnapshot(cdp!, viewerPage, deadline),
sender: await senderSnapshot(cdp!, activeSenderPage, deadline),
}), ({ viewer, sender }) => {
+ const sameGeneration = retainsOneViewerIdentity(identity!, viewer.identity, senderIdentity(sender));
+ const pionOutbound = hasOneViewerPionProof(sameGeneration, {
+ viewerPackets: beforeViewer.packetsReceived, viewerDecoded: beforeViewer.framesDecoded,
+ viewerRendered: beforeViewer.renderedFrames, pionPackets: beforeSender.peers[0]?.packetsSent ?? 0,
+ pionBytes: beforeSender.peers[0]?.bytesSent ?? 0,
+ }, {
+ viewerPackets: viewer.packetsReceived, viewerDecoded: viewer.framesDecoded,
+ viewerRendered: viewer.renderedFrames, pionPackets: sender.peers[0]?.packetsSent ?? 0,
+ pionBytes: sender.peers[0]?.bytesSent ?? 0,
+ });
const checks = {
inboundPackets: viewer.packetsReceived > beforeViewer.packetsReceived,
inboundBytes: viewer.bytesReceived > beforeViewer.bytesReceived,
@@ -549,9 +560,8 @@ async function main(): Promise<void> {
videoReady: viewer.videoReadyState >= 2 && viewer.videoWidth > 0 && viewer.videoHeight > 0,
playbackClock: viewer.videoCurrentTime > beforeViewer.videoCurrentTime,
renderedFrames: viewer.renderedFrames > beforeViewer.renderedFrames,
- pionOutbound: (sender.peers[0]?.packetsSent ?? 0) > 0 &&
- (sender.peers[0]?.bytesSent ?? 0) > 0,
- sameGeneration: retainsOneViewerIdentity(identity!, viewer.identity, senderIdentity(sender)),
+ pionOutbound,
+ sameGeneration,
sameBridge: retainsExpectedBridge(sender, nativeWindow),
criticalErrors: sender.fatalEvents === 0 && sender.encoderErrors === 0,
...(nativeWindow ? {
@@ -572,7 +582,9 @@ async function main(): Promise<void> {
renderedDelta: viewer.renderedFrames - beforeViewer.renderedFrames,
audioPacketDelta: viewer.audioPacketsReceived - beforeViewer.audioPacketsReceived,
pionPacketDelta: (sender.peers[0]?.packetsSent ?? 0) - (beforeSender.peers[0]?.packetsSent ?? 0),
+ pionByteDelta: (sender.peers[0]?.bytesSent ?? 0) - (beforeSender.peers[0]?.bytesSent ?? 0),
pionPacketsSent: sender.peers[0]?.packetsSent ?? 0,
+ pionBytesSent: sender.peers[0]?.bytesSent ?? 0,
pcOrdinal: viewer.identity.pcOrdinal,
pionSlot: sender.peers[0]?.slot ?? -1,
pionEdgeGeneration: sender.peers[0]?.edgeGeneration ?? 0,
diff --git a/tests/native-one-viewer-gate-core.test.ts b/tests/native-one-viewer-gate-core.test.ts
index 21d7a567..e7bd3dd2 100644
--- a/tests/native-one-viewer-gate-core.test.ts
+++ b/tests/native-one-viewer-gate-core.test.ts
@@ -8,6 +8,7 @@ import {
fetchJsonBefore,
finalizeGate,
hasNoCriticalSenderErrors,
+ hasOneViewerPionProof,
isExactGateProfile,
retainsFirstBridgeSend,
retainsOneViewerIdentity,
@@ -135,6 +136,19 @@ describe("native one-viewer gate invariants", () => {
expect(captureOneViewerIdentity(viewer, { ...sender, slot: 0 })).toBeNull();
});
+ it("accepts fresh or same-generation cumulative Pion evidence only with Viewer growth", () => {
+ const before = { viewerPackets: 10, viewerDecoded: 10, viewerRendered: 10,
+ pionPackets: 20, pionBytes: 2_000 };
+ const advanced = { viewerPackets: 11, viewerDecoded: 11, viewerRendered: 11,
+ pionPackets: 21, pionBytes: 2_100 };
+ expect(hasOneViewerPionProof(true, before, advanced)).toBe(true);
+ expect(hasOneViewerPionProof(true, before, { ...advanced,
+ pionPackets: before.pionPackets, pionBytes: before.pionBytes })).toBe(true);
+ expect(hasOneViewerPionProof(true, before, { ...before,
+ pionPackets: advanced.pionPackets, pionBytes: advanced.pionBytes })).toBe(false);
+ expect(hasOneViewerPionProof(false, before, advanced)).toBe(false);
+ });
+
it("records only the current local bridge binary-send outcome", () => {
const successful = bridgeProbeContext();
const first = new successful.WebSocket("ws://127.0.0.1/media");