Skip to content

Commit ddbb398

Browse files
cloudwebrtccloudwebrtc
committed
tidy.
1 parent 7274696 commit ddbb398

File tree

6 files changed

+34
-36
lines changed

6 files changed

+34
-36
lines changed

‎lib/src/data_packet_cryptor_impl.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class DataPacketCryptorImpl implements DataPacketCryptor {
1818
final KeyProviderImpl keyProvider;
1919
final Algorithm algorithm;
2020
web.Worker get worker => keyProvider.worker;
21-
final String _dataCyrptorId = randomString(24);
21+
final String _dataCryptorId = randomString(24);
2222
EventsEmitter<WorkerResponse> get events => keyProvider.events;
2323

2424
@override
@@ -30,10 +30,10 @@ class DataPacketCryptorImpl implements DataPacketCryptor {
3030
var msgId = randomString(12);
3131
worker.postMessage(
3232
{
33-
'msgType': 'dataCyrptorEncrypt',
33+
'msgType': 'dataCryptorEncrypt',
3434
'msgId': msgId,
3535
'keyProviderId': keyProvider.id,
36-
'dataCyrptorId': _dataCyrptorId,
36+
'dataCryptorId': _dataCryptorId,
3737
'participantId': participantId,
3838
'keyIndex': keyIndex,
3939
'data': data,
@@ -65,10 +65,10 @@ class DataPacketCryptorImpl implements DataPacketCryptor {
6565
var msgId = randomString(12);
6666
worker.postMessage(
6767
{
68-
'msgType': 'dataCyrptorDecrypt',
68+
'msgType': 'dataCryptorDecrypt',
6969
'msgId': msgId,
7070
'keyProviderId': keyProvider.id,
71-
'dataCyrptorId': _dataCyrptorId,
71+
'dataCryptorId': _dataCryptorId,
7272
'participantId': participantId,
7373
'keyIndex': encryptedPacket.keyIndex,
7474
'data': encryptedPacket.data,
@@ -94,9 +94,9 @@ class DataPacketCryptorImpl implements DataPacketCryptor {
9494
var msgId = randomString(12);
9595
worker.postMessage(
9696
{
97-
'msgType': 'dataCyrptorDispose',
97+
'msgType': 'dataCryptorDispose',
9898
'msgId': msgId,
99-
'dataCyrptorId': _dataCyrptorId
99+
'dataCryptorId': _dataCryptorId
100100
}.jsify(),
101101
);
102102

‎lib/src/e2ee.worker/e2ee.data_packet_cryptor.dart‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
import 'dart:async';
22
import 'dart:js_interop';
3-
import 'dart:js_interop_unsafe';
43
import 'dart:math';
54
import 'dart:typed_data';
65

7-
// ignore: deprecated_member_use
8-
import 'package:dart_webrtc/src/e2ee.worker/e2ee.frame_cryptor.dart'
9-
show IV_LENGTH;
10-
import 'package:js/js.dart';
116
import 'package:web/web.dart' as web;
7+
128
import 'e2ee.keyhandler.dart';
139
import 'e2ee.logger.dart';
1410

@@ -62,15 +58,15 @@ class E2EEDataPacketCryptor {
6258
sendCount_ = Random.secure().nextInt(0xffff);
6359
}
6460

65-
var sendCount = sendCount_ ?? 0;
61+
var sendCount = sendCount_;
6662
final randomBytes =
6763
Random.secure().nextInt(max(0, 0xffffffff)).toUnsigned(32);
6864

6965
iv.setUint32(0, randomBytes);
7066
iv.setUint32(4, timestamp);
7167
iv.setUint32(8, timestamp - (sendCount % 0xffff));
7268

73-
sendCount = sendCount + 1;
69+
sendCount_ = sendCount + 1;
7470

7571
return iv.buffer.asUint8List();
7672
}

‎lib/src/e2ee.worker/e2ee.frame_cryptor.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import 'e2ee.keyhandler.dart';
1111
import 'e2ee.logger.dart';
1212
import 'e2ee.sfi_guard.dart';
1313

14-
const IV_LENGTH = 12;
15-
1614
const kNaluTypeMask = 0x1f;
1715

1816
/// Coded slice of a non-IDR picture

‎lib/src/e2ee.worker/e2ee.keyhandler.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import 'e2ee.logger.dart';
99
import 'e2ee.utils.dart';
1010

1111
const KEYRING_SIZE = 16;
12+
const IV_LENGTH = 12;
1213

1314
class KeyOptions {
1415
KeyOptions({

‎lib/src/e2ee.worker/e2ee.worker.dart‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -469,18 +469,19 @@ void main() async {
469469
}.jsify());
470470
}
471471
}
472-
case 'dataCyrptorEncrypt':
472+
break;
473+
case 'dataCryptorEncrypt':
473474
{
474475
var participantId = msg['participantId'] as String;
475476
var data = msg['data'] as Uint8List;
476477
var keyIndex = msg['keyIndex'] as int;
477-
var dataCryptorId = msg['dataCyrptorId'] as String;
478+
var dataCryptorId = msg['dataCryptorId'] as String;
478479
var algorithmStr = msg['algorithm'] as String;
479480
var algorithm =
480481
Algorithm.values.firstWhereOrNull((a) => a.name == algorithmStr);
481482
if (algorithm == null) {
482483
self.postMessage({
483-
'type': 'dataCyrptorEncrypt',
484+
'type': 'dataCryptorEncrypt',
484485
'error': 'algorithm not found',
485486
'msgId': msgId,
486487
'msgType': 'response',
@@ -494,7 +495,7 @@ void main() async {
494495
if (keyProvider == null) {
495496
logger.warning('KeyProvider not found for $keyProviderId');
496497
self.postMessage({
497-
'type': 'dataCyrptorEncrypt',
498+
'type': 'dataCryptorEncrypt',
498499
'error': 'KeyProvider not found',
499500
'msgId': msgId,
500501
'msgType': 'response',
@@ -507,7 +508,7 @@ void main() async {
507508
var encryptedPacket =
508509
await cryptor.encrypt(cryptor.keyHandler, data);
509510
self.postMessage({
510-
'type': 'dataCyrptorEncrypt',
511+
'type': 'dataCryptorEncrypt',
511512
'participantId': participantId,
512513
'dataCryptorId': dataCryptorId,
513514
'data': encryptedPacket!.data,
@@ -519,27 +520,27 @@ void main() async {
519520
} catch (e) {
520521
logger.warning('Error encrypting data: $e');
521522
self.postMessage({
522-
'type': 'dataCyrptorEncrypt',
523+
'type': 'dataCryptorEncrypt',
523524
'error': e.toString(),
524525
'msgId': msgId,
525526
'msgType': 'response',
526527
}.jsify());
527-
break;
528528
}
529529
}
530-
case 'dataCyrptorDecrypt':
530+
break;
531+
case 'dataCryptorDecrypt':
531532
{
532533
var participantId = msg['participantId'] as String;
533534
var data = msg['data'] as Uint8List;
534535
var iv = msg['iv'] as Uint8List;
535536
var keyIndex = msg['keyIndex'] as int;
536-
var dataCryptorId = msg['dataCyrptorId'] as String;
537+
var dataCryptorId = msg['dataCryptorId'] as String;
537538
var algorithmStr = msg['algorithm'] as String;
538539
var algorithm =
539540
Algorithm.values.firstWhereOrNull((a) => a.name == algorithmStr);
540541
if (algorithm == null) {
541542
self.postMessage({
542-
'type': 'dataCyrptorDecrypt',
543+
'type': 'dataCryptorDecrypt',
543544
'error': 'algorithm not found',
544545
'msgId': msgId,
545546
'msgType': 'response',
@@ -553,7 +554,7 @@ void main() async {
553554
if (keyProvider == null) {
554555
logger.warning('KeyProvider not found for $keyProviderId');
555556
self.postMessage({
556-
'type': 'dataCyrptorDecrypt',
557+
'type': 'dataCryptorDecrypt',
557558
'error': 'KeyProvider not found',
558559
'msgId': msgId,
559560
'msgType': 'response',
@@ -571,7 +572,7 @@ void main() async {
571572
iv: iv,
572573
));
573574
self.postMessage({
574-
'type': 'dataCyrptorDecrypt',
575+
'type': 'dataCryptorDecrypt',
575576
'participantId': participantId,
576577
'dataCryptorId': dataCryptorId,
577578
'data': decryptedData,
@@ -581,16 +582,15 @@ void main() async {
581582
} catch (e) {
582583
logger.warning('Error decrypting data: $e');
583584
self.postMessage({
584-
'type': 'dataCyrptorDecrypt',
585+
'type': 'dataCryptorDecrypt',
585586
'error': e.toString(),
586587
'msgId': msgId,
587588
'msgType': 'response',
588589
}.jsify());
589-
break;
590590
}
591-
break;
592591
}
593-
case 'dataCyrptorDispose':
592+
break;
593+
case 'dataCryptorDispose':
594594
{
595595
var dataCryptorId = msg['dataCryptorId'] as String;
596596
logger.config('Dispose for dataCryptorId $dataCryptorId');

‎web/main.dart‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,18 +245,21 @@ void loopBackTest() async {
245245

246246
final dataPacketCryptor =
247247
await dataPacketCryptorFactory.createDataPacketCryptor(
248-
algorithm: Algorithm.kAesGcm, keyProvider: keyProviderForSender!);
248+
algorithm: Algorithm.kAesGcm, keyProvider: keyProviderForSender);
249249

250250
var data = Uint8List.fromList('Hello world!'.codeUnits);
251+
print('plain string: ${String.fromCharCodes(data)}');
251252
print('plain data: $data');
252253
var encryptedPacket = await dataPacketCryptor.encrypt(
253254
participantId: participantId, keyIndex: 0, data: data);
254255
print(
255-
'encrypted data: ${encryptedPacket?.data}, keyIndex: ${encryptedPacket?.keyIndex}, iv: ${encryptedPacket?.iv}');
256+
'encrypted data: ${encryptedPacket.data}, keyIndex: ${encryptedPacket.keyIndex}, iv: ${encryptedPacket.iv}');
256257
var decryptedData = await dataPacketCryptor.decrypt(
257-
participantId: participantId, encryptedPacket: encryptedPacket!);
258+
participantId: participantId, encryptedPacket: encryptedPacket);
258259
print('decrypted data: $decryptedData');
259-
print('decrypted string: ${String.fromCharCodes(decryptedData!)}');
260+
print('decrypted string: ${String.fromCharCodes(decryptedData)}');
261+
262+
await dataPacketCryptor.dispose();
260263

261264
/*
262265
var key1 =

0 commit comments

Comments
 (0)