Skip to content

Commit 79a2351

Browse files
cloudwebrtccloudwebrtc
committed
fix: Correctly detect server injection frame for flutter web.
1 parent 26947e9 commit 79a2351

File tree

4 files changed

+50
-36
lines changed

4 files changed

+50
-36
lines changed

‎example/web/e2ee.worker.dart.js‎

Lines changed: 14 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/web/e2ee.worker.dart.js.deps‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/collection.dart
2-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/algorithms.dart
3-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/boollist.dart
4-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/canonicalized_map.dart
5-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/combined_wrappers/combined_iterable.dart
6-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/combined_wrappers/combined_iterator.dart
7-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/combined_wrappers/combined_list.dart
8-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/combined_wrappers/combined_map.dart
9-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/comparators.dart
10-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/empty_unmodifiable_set.dart
11-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/equality.dart
12-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/equality_map.dart
13-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/equality_set.dart
14-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/functions.dart
15-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/iterable_extensions.dart
16-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/iterable_zip.dart
17-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/list_extensions.dart
18-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/priority_queue.dart
19-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/queue_list.dart
20-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/union_set.dart
21-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/union_set_controller.dart
22-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/unmodifiable_wrappers.dart
23-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/utils.dart
24-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/collection-1.17.0/lib/src/wrappers.dart
25-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/js-0.6.5/lib/js.dart
26-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/meta-1.8.0/lib/meta.dart
27-
file:///Users/weiweiduan/.pub-cache/hosted/pub.flutter-io.cn/meta-1.8.0/lib/meta_meta.dart
28-
file:///Users/weiweiduan/Desktop/projects/flutter-webrtc/lib/src/web/rtc_transform_stream.dart
1+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/collection.dart
2+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/algorithms.dart
3+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/boollist.dart
4+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/canonicalized_map.dart
5+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/combined_wrappers/combined_iterable.dart
6+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/combined_wrappers/combined_iterator.dart
7+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/combined_wrappers/combined_list.dart
8+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/combined_wrappers/combined_map.dart
9+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/comparators.dart
10+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/empty_unmodifiable_set.dart
11+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/equality.dart
12+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/equality_map.dart
13+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/equality_set.dart
14+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/functions.dart
15+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/iterable_extensions.dart
16+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/iterable_zip.dart
17+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/list_extensions.dart
18+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/priority_queue.dart
19+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/queue_list.dart
20+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/union_set.dart
21+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/union_set_controller.dart
22+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/unmodifiable_wrappers.dart
23+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/utils.dart
24+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/src/wrappers.dart
25+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/flutter_webrtc-0.9.27/lib/src/web/rtc_transform_stream.dart
26+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/js-0.6.5/lib/js.dart
27+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/meta-1.8.0/lib/meta.dart
28+
file:///Users/weiweiduan/.pub-cache/hosted/pub.dev/meta-1.8.0/lib/meta_meta.dart
2929
file:///Users/weiweiduan/Desktop/projects/livekit/client-sdk-flutter/.dart_tool/package_config.json
3030
file:///Users/weiweiduan/Desktop/projects/livekit/client-sdk-flutter/web/crypto.dart
3131
file:///Users/weiweiduan/Desktop/projects/livekit/client-sdk-flutter/web/e2ee.cryptor.dart

‎example/web/e2ee.worker.dart.js.map‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/e2ee.cryptor.dart‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,10 +500,13 @@ class FrameCryptor {
500500

501501
if (keyOptions.uncryptedMagicBytes != null) {
502502
var magicBytes = keyOptions.uncryptedMagicBytes!;
503-
if (buffer.length >= magicBytes.length + 1) {
503+
if (buffer.length > magicBytes.length + 1) {
504504
var magicBytesBuffer = buffer.sublist(
505-
buffer.length - (magicBytes.length + 1), magicBytes.length);
505+
buffer.length - magicBytes.length - 1, buffer.length - 1);
506+
//print('magicBytesBuffer $magicBytesBuffer, magicBytes $magicBytes, ');
506507
if (magicBytesBuffer.toString() == magicBytes.toString()) {
508+
var frameType = buffer.sublist(buffer.length - 1)[0];
509+
print('skip uncrypted frame, type $frameType');
507510
var finalBuffer = BytesBuilder();
508511
finalBuffer.add(Uint8List.fromList(
509512
buffer.sublist(0, buffer.length - (magicBytes.length + 1))));

0 commit comments

Comments
 (0)