Merge pull request #39 from td-famedly/td/logs

missing fault tolerance, better worker reports and a increased timeout for worker tasks
flutter-webrtc · Jun 3, 2024 · ea029c2 · ea029c2
2 parents ab0438d + 6571ab3
commit ea029c2
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 23 deletions.
diff --git a/lib/src/e2ee.worker/e2ee.cryptor.dart b/lib/src/e2ee.worker/e2ee.cryptor.dart
@@ -5,9 +5,9 @@ import 'dart:js_util' as jsutil;
 import 'dart:math';
 import 'dart:typed_data';
 
-import 'package:dart_webrtc/src/rtc_transform_stream.dart';
 import 'package:web/web.dart' as web;
 
+import 'package:dart_webrtc/src/rtc_transform_stream.dart';
 import 'crypto.dart' as crypto;
 import 'e2ee.keyhandler.dart';
 import 'e2ee.logger.dart';

diff --git a/lib/src/e2ee.worker/e2ee.worker.dart b/lib/src/e2ee.worker/e2ee.worker.dart
@@ -4,10 +4,10 @@ import 'dart:js_util' as js_util;
 import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
-import 'package:dart_webrtc/src/rtc_transform_stream.dart';
 import 'package:logging/logging.dart';
 import 'package:web/web.dart' as web;
 
+import 'package:dart_webrtc/src/rtc_transform_stream.dart';
 import 'e2ee.cryptor.dart';
 import 'e2ee.keyhandler.dart';
 import 'e2ee.logger.dart';

diff --git a/lib/src/factory_impl.dart b/lib/src/factory_impl.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+
 import 'package:js/js.dart';
 import 'package:js/js_util.dart';
 import 'package:web/web.dart' as web;

diff --git a/lib/src/frame_cryptor_impl.dart b/lib/src/frame_cryptor_impl.dart
@@ -6,11 +6,12 @@ import 'dart:js_util' as jsutil;
 import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
-import 'package:dart_webrtc/src/event.dart';
 import 'package:js/js_util.dart';
 import 'package:web/web.dart' as web;
 import 'package:webrtc_interface/webrtc_interface.dart';
 
+import 'package:dart_webrtc/src/e2ee.worker/e2ee.logger.dart';
+import 'package:dart_webrtc/src/event.dart';
 import 'rtc_rtp_receiver_impl.dart';
 import 'rtc_rtp_sender_impl.dart';
 import 'rtc_transform_stream.dart';
@@ -191,6 +192,7 @@ class KeyProviderImpl implements KeyProvider {
           'sharedKey': options.sharedKey,
           'ratchetSalt': base64Encode(options.ratchetSalt),
           'ratchetWindowSize': options.ratchetWindowSize,
+          'failureTolerance': options.failureTolerance,
           if (options.uncryptedMagicBytes != null)
             'uncryptedMagicBytes': base64Encode(options.uncryptedMagicBytes!),
           'keyRingSize': options.keyRingSize,
@@ -201,8 +203,11 @@ class KeyProviderImpl implements KeyProvider {
     ]);
 
     await events.waitFor<WorkerResponse>(
-        filter: (event) => event.msgId == msgId,
-        duration: Duration(seconds: 5));
+        filter: (event) {
+          logger.fine('waiting for init on msg: $msgId');
+          return event.msgId == msgId;
+        },
+        duration: Duration(seconds: 15));
   }
 
   @override
@@ -217,8 +222,11 @@ class KeyProviderImpl implements KeyProvider {
     ]);
 
     await events.waitFor<WorkerResponse>(
-        filter: (event) => event.msgId == msgId,
-        duration: Duration(seconds: 5));
+        filter: (event) {
+          logger.fine('waiting for dispose on msg: $msgId');
+          return event.msgId == msgId;
+        },
+        duration: Duration(seconds: 15));
 
     _keys.clear();
   }
@@ -241,8 +249,12 @@ class KeyProviderImpl implements KeyProvider {
     ]);
 
     await events.waitFor<WorkerResponse>(
-        filter: (event) => event.msgId == msgId,
-        duration: Duration(seconds: 5));
+      filter: (event) {
+        logger.fine('waiting for setKey on msg: $msgId');
+        return event.msgId == msgId;
+      },
+      duration: Duration(minutes: 15),
+    );
 
     _keys[participantId] ??= [];
     if (_keys[participantId]!.length <= index) {
@@ -268,8 +280,11 @@ class KeyProviderImpl implements KeyProvider {
     ]);
 
     var res = await events.waitFor<WorkerResponse>(
-        filter: (event) => event.msgId == msgId,
-        duration: Duration(seconds: 5));
+        filter: (event) {
+          logger.fine('waiting for ratchetKey on msg: $msgId');
+          return event.msgId == msgId;
+        },
+        duration: Duration(seconds: 15));
 
     return base64Decode(res.data['newKey']);
   }
@@ -289,8 +304,11 @@ class KeyProviderImpl implements KeyProvider {
     ]);
 
     var res = await events.waitFor<WorkerResponse>(
-        filter: (event) => event.msgId == msgId,
-        duration: Duration(seconds: 5));
+        filter: (event) {
+          logger.fine('waiting for exportKey on msg: $msgId');
+          return event.msgId == msgId;
+        },
+        duration: Duration(seconds: 15));
 
     return base64Decode(res.data['exportedKey']);
   }
@@ -308,8 +326,11 @@ class KeyProviderImpl implements KeyProvider {
     ]);
 
     var res = await events.waitFor<WorkerResponse>(
-        filter: (event) => event.msgId == msgId,
-        duration: Duration(seconds: 5));
+        filter: (event) {
+          logger.fine('waiting for exportSharedKey on msg: $msgId');
+          return event.msgId == msgId;
+        },
+        duration: Duration(seconds: 15));
 
     return base64Decode(res.data['exportedKey']);
   }
@@ -326,8 +347,11 @@ class KeyProviderImpl implements KeyProvider {
       })
     ]);
     var res = await events.waitFor<WorkerResponse>(
-        filter: (event) => event.msgId == msgId,
-        duration: Duration(seconds: 5));
+        filter: (event) {
+          logger.fine('waiting for ratchetSharedKey on msg: $msgId');
+          return event.msgId == msgId;
+        },
+        duration: Duration(seconds: 15));
 
     return base64Decode(res.data['newKey']);
   }
@@ -346,8 +370,11 @@ class KeyProviderImpl implements KeyProvider {
     ]);
 
     await events.waitFor<WorkerResponse>(
-        filter: (event) => event.msgId == msgId,
-        duration: Duration(seconds: 5));
+        filter: (event) {
+          logger.fine('waiting for setSharedKey on msg: $msgId');
+          return event.msgId == msgId;
+        },
+        duration: Duration(seconds: 15));
   }
 
   @override
@@ -363,8 +390,11 @@ class KeyProviderImpl implements KeyProvider {
     ]);
 
     await events.waitFor<WorkerResponse>(
-        filter: (event) => event.msgId == msgId,
-        duration: Duration(seconds: 5));
+        filter: (event) {
+          logger.fine('waiting for setSifTrailer on msg: $msgId');
+          return event.msgId == msgId;
+        },
+        duration: Duration(seconds: 15));
   }
 }
 

diff --git a/lib/src/media_recorder_impl.dart b/lib/src/media_recorder_impl.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:js' as js;
 import 'dart:js_interop';
+
 import 'package:web/web.dart' as web;
 import 'package:webrtc_interface/webrtc_interface.dart';
 

diff --git a/lib/src/media_stream_impl.dart b/lib/src/media_stream_impl.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:js_interop';
+
 import 'package:web/web.dart' as web;
 import 'package:webrtc_interface/webrtc_interface.dart';
 

diff --git a/lib/src/mediadevices_impl.dart b/lib/src/mediadevices_impl.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:js' as js;
 import 'dart:js_interop';
 import 'dart:js_util' as jsutil;
+
 import 'package:web/web.dart' as web;
 import 'package:webrtc_interface/webrtc_interface.dart';
 

diff --git a/lib/src/rtc_data_channel_impl.dart b/lib/src/rtc_data_channel_impl.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:js_interop';
+
 import 'package:js/js_util.dart' as jsutil;
 import 'package:web/web.dart' as web;
 import 'package:webrtc_interface/webrtc_interface.dart';

diff --git a/lib/src/rtc_peerconnection_impl.dart b/lib/src/rtc_peerconnection_impl.dart
@@ -4,11 +4,11 @@ import 'dart:js_interop';
 import 'dart:js_interop_unsafe';
 import 'dart:js_util' as jsutil;
 
-import 'package:dart_webrtc/dart_webrtc.dart';
 import 'package:js/js_util.dart';
 import 'package:platform_detect/platform_detect.dart';
 import 'package:web/web.dart' as web;
 
+import 'package:dart_webrtc/dart_webrtc.dart';
 import 'media_stream_track_impl.dart';
 import 'rtc_data_channel_impl.dart';
 import 'rtc_dtmf_sender_impl.dart';

diff --git a/lib/src/rtc_rtp_capailities_imp.dart b/lib/src/rtc_rtp_capailities_imp.dart
@@ -1,4 +1,5 @@
 import 'dart:js_util' as jsutil;
+
 import 'package:webrtc_interface/webrtc_interface.dart';
 
 class RTCRtpCapabilitiesWeb {

diff --git a/lib/src/rtc_rtp_parameters_impl.dart b/lib/src/rtc_rtp_parameters_impl.dart
@@ -1,4 +1,5 @@
 import 'dart:js_util' as jsutil;
+
 import 'package:webrtc_interface/webrtc_interface.dart';
 
 class RTCRtpParametersWeb {

diff --git a/lib/src/rtc_rtp_receiver_impl.dart b/lib/src/rtc_rtp_receiver_impl.dart
@@ -1,4 +1,5 @@
 import 'dart:js_util' as jsutil;
+
 import 'package:web/web.dart' as web;
 import 'package:webrtc_interface/webrtc_interface.dart';
 

diff --git a/lib/src/rtc_rtp_sender_impl.dart b/lib/src/rtc_rtp_sender_impl.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:js_util' as jsutil;
 
-import 'package:dart_webrtc/src/media_stream_impl.dart';
 import 'package:web/web.dart' as web;
 import 'package:webrtc_interface/webrtc_interface.dart';
 
+import 'package:dart_webrtc/src/media_stream_impl.dart';
 import 'media_stream_track_impl.dart';
 import 'rtc_dtmf_sender_impl.dart';
 import 'rtc_rtp_parameters_impl.dart';

diff --git a/lib/src/rtc_transform_stream.dart b/lib/src/rtc_transform_stream.dart
@@ -1,5 +1,6 @@
 import 'dart:js_util' as js_util;
 import 'dart:typed_data';
+
 import 'package:js/js.dart';
 import 'package:web/web.dart';
 

diff --git a/lib/src/rtc_video_element.dart b/lib/src/rtc_video_element.dart
@@ -1,5 +1,7 @@
 import 'dart:js_interop';
+
 import 'package:web/web.dart' as web;
+
 import '../dart_webrtc.dart';
 
 class RTCVideoElement {