Skip to content

fix: sif frame enqueing with e2ee #918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2025
Merged

fix: sif frame enqueing with e2ee #918

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions web/e2ee.frame_cryptor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,11 @@ class FrameCryptor {
);
}

void enqueueFrame(JSObject frameObj, web.TransformStreamDefaultController controller, BytesBuilder buffer) {
void enqueueFrame(
JSObject frameObj,
web.TransformStreamDefaultController controller,
BytesBuilder buffer,
) {
final jsBuffer = buffer.toBytes().buffer.toJS;
// No need for runtime type checks; set the JS 'data' property for both audio/video frames.
frameObj.setProperty('data'.toJS, jsBuffer);
Expand Down Expand Up @@ -385,7 +389,7 @@ class FrameCryptor {
final srcFrame = readFrameInfo(frameObj);
var ratchetCount = 0;

logger.fine('decodeFunction: frame lenght ${srcFrame.buffer.length}');
logger.fine('decodeFunction: frame length ${srcFrame.buffer.length}');

ByteBuffer? decrypted;
KeySet? initialKeySet;
Expand All @@ -396,9 +400,8 @@ class FrameCryptor {
srcFrame.buffer.isEmpty) {
sifGuard.recordUserFrame();
if (keyOptions.discardFrameWhenCryptorNotReady) return;
logger.fine('enqueing empty frame');
logger.fine('enqueing empty dtx frame');
controller.enqueue(frameObj);
logger.finer('enqueing silent frame');
return;
}

Expand All @@ -412,20 +415,18 @@ class FrameCryptor {
sifGuard.recordSif();
if (sifGuard.isSifAllowed()) {
final frameType = srcFrame.buffer.sublist(srcFrame.buffer.length - 1)[0];
logger.finer('encodeFunction: skip unencrypted frame, type $frameType');
logger.finer('decodeFunction: skip unencrypted frame, type $frameType');
final finalBuffer = BytesBuilder();
finalBuffer
.add(Uint8List.fromList(srcFrame.buffer.sublist(0, srcFrame.buffer.length - (magicBytes.length + 1))));
logger.fine('encodeFunction: enqueing silent frame');
logger.fine('decodeFunction: enqueing silent frame src: ${srcFrame.buffer}');
enqueueFrame(frameObj, controller, finalBuffer);
logger.fine('ecodeFunction: enqueing silent frame');
controller.enqueue(frameObj);
logger.fine('decodeFunction: enqueing done');
return;
} else {
logger.finer('ecodeFunction: SIF limit reached, dropping frame');
logger.warning('decodeFunction: SIF limit reached, dropping frame');
return;
}
logger.finer('ecodeFunction: enqueing silent frame');
controller.enqueue(frameObj);
return;
} else {
sifGuard.recordUserFrame();
}
Expand Down Expand Up @@ -567,7 +568,8 @@ class FrameCryptor {

logger.fine(
'decodeFunction[CryptorError.kOk]: decryption success kind $kind, headerLength: $headerLength, timestamp: ${srcFrame.timestamp}, ssrc: ${srcFrame.ssrc}, data length: ${srcFrame.buffer.length}, decrypted length: ${finalBuffer.toBytes().length}, keyindex $keyIndex iv $iv');
} catch (e) {
} catch (e, s) {
logger.warning('decodeFunction[CryptorError.kDecryptError]: $e, $s');
if (lastError != CryptorError.kDecryptError) {
lastError = CryptorError.kDecryptError;
postMessage({
Expand Down