Skip to content

Commit 40b0be1

Browse files
committed
tidy log format.
1 parent 340ee2f commit 40b0be1

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

lib/src/e2ee.worker/e2ee.cryptor.dart

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ class FrameCryptor {
430430
.toDart as JSArrayBuffer;
431431

432432
logger.finer(
433-
'encodeFunction, buffer: ${srcFrame.buffer.length}, cipherText: ${cipherText.toDart.asUint8List().length}');
433+
'encodeFunction: encrypted buffer: ${srcFrame.buffer.length}, cipherText: ${cipherText.toDart.asUint8List().length}');
434434
var finalBuffer = BytesBuilder();
435435

436436
finalBuffer
@@ -440,8 +440,6 @@ class FrameCryptor {
440440
finalBuffer.add(frameTrailer.buffer.asUint8List());
441441

442442
enqueueFrame(frameObj, controller, finalBuffer);
443-
logger.finer(
444-
'encodeFunction: ssrc ${srcFrame.ssrc} buffer length ${srcFrame.buffer.length}, encrypted: ${finalBuffer.length}, headerLength $headerLength cipherText ${cipherText.toDart.asUint8List().length} iv ${iv.length} frameTrailer ${frameTrailer.buffer.asUint8List().length}');
445443

446444
if (lastError != CryptorError.kOk) {
447445
lastError = CryptorError.kOk;
@@ -457,7 +455,7 @@ class FrameCryptor {
457455
}
458456

459457
logger.finer(
460-
'encrypto kind $kind,codec $codec headerLength: $headerLength, timestamp: ${srcFrame.timestamp}, ssrc: ${srcFrame.ssrc}, data length: ${srcFrame.buffer.length}, encrypted length: ${finalBuffer.toBytes().length}, iv $iv');
458+
'encodeFunction[CryptorError.kOk]: frame enqueued kind $kind,codec $codec headerLength: $headerLength, timestamp: ${srcFrame.timestamp}, ssrc: ${srcFrame.ssrc}, data length: ${srcFrame.buffer.length}, encrypted length: ${finalBuffer.toBytes().length}, iv $iv');
461459
} catch (e) {
462460
logger.warning('encodeFunction encrypt: e ${e.toString()}');
463461
if (lastError != CryptorError.kEncryptError) {
@@ -482,7 +480,7 @@ class FrameCryptor {
482480
var srcFrame = readFrameInfo(frameObj);
483481
var ratchetCount = 0;
484482

485-
logger.fine('decodeFunction: frame ${srcFrame.buffer.length}');
483+
logger.fine('decodeFunction: frame lenght ${srcFrame.buffer.length}');
486484

487485
ByteBuffer? decrypted;
488486
KeySet? initialKeySet;
@@ -512,17 +510,18 @@ class FrameCryptor {
512510
if (sifGuard.isSifAllowed()) {
513511
var frameType =
514512
srcFrame.buffer.sublist(srcFrame.buffer.length - 1)[0];
515-
logger.finer('skip uncrypted frame, type $frameType');
513+
logger
514+
.finer('ecodeFunction: skip uncrypted frame, type $frameType');
516515
var finalBuffer = BytesBuilder();
517516
finalBuffer.add(Uint8List.fromList(srcFrame.buffer
518517
.sublist(0, srcFrame.buffer.length - (magicBytes.length + 1))));
519518
enqueueFrame(frameObj, controller, finalBuffer);
520-
logger.fine('enqueing silent frame');
519+
logger.fine('ecodeFunction: enqueing silent frame');
521520
controller.enqueue(frameObj);
522521
} else {
523-
logger.finer('SIF limit reached, dropping frame');
522+
logger.finer('ecodeFunction: SIF limit reached, dropping frame');
524523
}
525-
logger.finer('enqueing silent frame');
524+
logger.finer('ecodeFunction: enqueing silent frame');
526525
controller.enqueue(frameObj);
527526
return;
528527
} else {
@@ -547,9 +546,6 @@ class FrameCryptor {
547546
logger.finer(
548547
'decodeFunction: start decrypting frame headerLength $headerLength ${srcFrame.buffer.length} frameTrailer $frameTrailer, ivLength $ivLength, keyIndex $keyIndex, iv $iv');
549548

550-
logger.finer(
551-
'decodeFunction: ssrc ${srcFrame.ssrc} buffer length ${srcFrame.buffer.length}, encrypted: ${srcFrame.buffer.length}, headerLength $headerLength cipherText ${srcFrame.buffer.sublist(headerLength, srcFrame.buffer.length - ivLength - 2).length} iv ${iv.length} frameTrailer ${frameTrailer.buffer.asUint8List().length}');
552-
553549
/// missingKey flow:
554550
/// tries to decrypt once, fails, tries to ratchet once and decrypt again,
555551
/// fails (does not save ratcheted key), bumps _decryptionFailureCount,
@@ -591,15 +587,16 @@ class FrameCryptor {
591587
.toDart) as JSArrayBuffer)
592588
.toDart;
593589
logger.finer(
594-
'decodeFunction: decryptFrameInternal: decrypted: ${decrypted!.asUint8List().length}');
590+
'decodeFunction::decryptFrameInternal: decrypted: ${decrypted!.asUint8List().length}');
595591

596592
if (decrypted == null) {
597593
throw Exception('[decryptFrameInternal] could not decrypt');
598594
}
599595
logger.finer(
600-
'decryptFrameInternal: decrypted: ${decrypted!.asUint8List().length}');
596+
'decodeFunction::decryptFrameInternal: decrypted: ${decrypted!.asUint8List().length}');
601597
if (currentkeySet != initialKeySet) {
602-
logger.fine('ratchetKey: decryption ok, newState: kKeyRatcheted');
598+
logger.fine(
599+
'decodeFunction::decryptFrameInternal: ratchetKey: decryption ok, newState: kKeyRatcheted');
603600
await keyHandler.setKeySetFromMaterial(
604601
currentkeySet, initialKeyIndex);
605602
}
@@ -608,9 +605,9 @@ class FrameCryptor {
608605
lastError != CryptorError.kKeyRatcheted &&
609606
ratchetCount > 0) {
610607
logger.finer(
611-
'KeyRatcheted: ssrc ${srcFrame.ssrc} timestamp ${srcFrame.timestamp} ratchetCount $ratchetCount participantId: $participantIdentity');
608+
'decodeFunction::decryptFrameInternal: KeyRatcheted: ssrc ${srcFrame.ssrc} timestamp ${srcFrame.timestamp} ratchetCount $ratchetCount participantId: $participantIdentity');
612609
logger.finer(
613-
'ratchetKey: lastError != CryptorError.kKeyRatcheted, reset state to kKeyRatcheted');
610+
'decodeFunction::decryptFrameInternal: ratchetKey: lastError != CryptorError.kKeyRatcheted, reset state to kKeyRatcheted');
614611

615612
lastError = CryptorError.kKeyRatcheted;
616613
postMessage({
@@ -661,7 +658,7 @@ class FrameCryptor {
661658
keyHandler.decryptionSuccess();
662659

663660
logger.finer(
664-
'decodeFunction: buffer length ${srcFrame.buffer.length}, decrypted: ${decrypted!.asUint8List().length}');
661+
'decodeFunction: decryption success, buffer length ${srcFrame.buffer.length}, decrypted: ${decrypted!.asUint8List().length}');
665662

666663
var finalBuffer = BytesBuilder();
667664

@@ -684,7 +681,7 @@ class FrameCryptor {
684681
}
685682

686683
logger.fine(
687-
'decrypt kind $kind, headerLength: $headerLength, timestamp: ${srcFrame.timestamp}, ssrc: ${srcFrame.ssrc}, data length: ${srcFrame.buffer.length}, decrypted length: ${finalBuffer.toBytes().length}, keyindex $keyIndex iv $iv');
684+
'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');
688685
} catch (e) {
689686
if (lastError != CryptorError.kDecryptError) {
690687
lastError = CryptorError.kDecryptError;

0 commit comments

Comments
 (0)