chore: update format (#889)

Author: hiroshihorie

analysis_options.yaml

@@ -23,10 +23,10 @@ analyzer:
 
   # Exclude protobuf files
   exclude:
-    - '**/*.pb.dart'
-    - '**/*.pbenum.dart'
-    - '**/*.pbjson.dart'
-    - '**/*.pbserver.dart'
+    - "**/*.pb.dart"
+    - "**/*.pbenum.dart"
+    - "**/*.pbjson.dart"
+    - "**/*.pbserver.dart"
     # - 'web/*.dart'
 
 linter:
@@ -35,7 +35,12 @@ linter:
     prefer_single_quotes: true
     prefer_final_locals: true
     unnecessary_brace_in_string_interps: false
+    avoid_print: true
 
     # Enforce this for correct async logic
     unawaited_futures: true
     discarded_futures: true
+
+formatter:
+  page_width: 120
+  trailing_commas: preserve

lib/livekit_client.dart

@@ -41,8 +41,7 @@ export 'src/track/local/local.dart';
 export 'src/track/local/video.dart';
 export 'src/track/options.dart';
 export 'src/track/processor.dart';
-export 'src/track/processor_native.dart'
-    if (dart.library.js_interop) 'src/track/processor_web.dart';
+export 'src/track/processor_native.dart' if (dart.library.js_interop) 'src/track/processor_web.dart';
 export 'src/track/remote/audio.dart';
 export 'src/track/remote/remote.dart';
 export 'src/track/remote/video.dart';

lib/livekit_client_web.dart

@@ -23,8 +23,7 @@ import 'package:flutter_web_plugins/flutter_web_plugins.dart';
 // package as the core of your plugin.
 
 // ignore: unused_import
-import 'package:web/web.dart' as web
-    show document, HTMLScriptElement; // import_sorter: keep
+import 'package:web/web.dart' as web show document, HTMLScriptElement; // import_sorter: keep
 
 /// A web implementation of the Livekit plugin.
 class LiveKitWebPlugin {

lib/src/core/engine.dart

@@ -66,8 +66,7 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
       return true;
     }
     _connectivityResult = await Connectivity().checkConnectivity();
-    return _connectivityResult.isNotEmpty &&
-        !_connectivityResult.contains(ConnectivityResult.none);
+    return _connectivityResult.isNotEmpty && !_connectivityResult.contains(ConnectivityResult.none);
   }
 
   @internal
@@ -98,15 +97,12 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
     if (!kIsWeb && !lkPlatformIsTest()) {
       _connectivityResult = await Connectivity().checkConnectivity();
       await _connectivitySubscription?.cancel();
-      _connectivitySubscription = Connectivity()
-          .onConnectivityChanged
-          .listen((List<ConnectivityResult> result) {
+      _connectivitySubscription = Connectivity().onConnectivityChanged.listen((List<ConnectivityResult> result) {
         if (_connectivityResult != result) {
           if (result.contains(ConnectivityResult.none)) {
             logger.warning('lost connectivity');
           } else {
-            logger.info(
-                'Connectivity changed, ${_connectivityResult} => ${result}');
+            logger.info('Connectivity changed, ${_connectivityResult} => ${result}');
           }
           events.emit(SignalConnectivityChangedEvent(
             oldState: _connectivityResult,
@@ -118,8 +114,7 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
 
       if (_connectivityResult.contains(ConnectivityResult.none)) {
         logger.warning('no internet connection');
-        throw ConnectException('no internet connection',
-            reason: ConnectionErrorReason.InternalError, statusCode: 503);
+        throw ConnectException('no internet connection', reason: ConnectionErrorReason.InternalError, statusCode: 503);
       }
     }
 
@@ -188,18 +183,15 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
           finalError = error;
         }
       } finally {
-        events.emit(SignalDisconnectedEvent(
-            reason: DisconnectReason.signalingConnectionFailure));
+        events.emit(SignalDisconnectedEvent(reason: DisconnectReason.signalingConnectionFailure));
         throw finalError;
       }
     }
   }
 
   Future<void> sendLeave() async {
     _sendRequest(lk_rtc.SignalRequest(
-        leave: lk_rtc.LeaveRequest(
-            canReconnect: false,
-            reason: lk_models.DisconnectReason.CLIENT_INITIATED)));
+        leave: lk_rtc.LeaveRequest(canReconnect: false, reason: lk_models.DisconnectReason.CLIENT_INITIATED)));
   }
 
   // resets internal state to a re-usable state
@@ -222,16 +214,13 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
       return;
     }
 
-    if (connectionState == ConnectionState.reconnecting &&
-        req._canQueue() &&
-        enqueueIfReconnecting) {
+    if (connectionState == ConnectionState.reconnecting && req._canQueue() && enqueueIfReconnecting) {
       _queue.add(req);
       return;
     }
 
     if (connectionState != ConnectionState.connected) {
-      logger
-          .warning('[$objectId] Could not send message, socket not connected');
+      logger.warning('[$objectId] Could not send message, socket not connected');
       return;
     }
 
@@ -247,8 +236,7 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
         if (msg.join.pingTimeout > 0) {
           _pingTimeoutDuration = Duration(seconds: msg.join.pingTimeout);
           _pingIntervalDuration = Duration(seconds: msg.join.pingInterval);
-          logger.info(
-              'ping config timeout: ${msg.join.pingTimeout}, interval: ${msg.join.pingInterval} ');
+          logger.info('ping config timeout: ${msg.join.pingTimeout}, interval: ${msg.join.pingInterval} ');
           _startPingInterval();
         }
         participantSid = msg.join.participant.sid;
@@ -267,8 +255,7 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
         ));
         break;
       case lk_rtc.SignalResponse_Message.update:
-        events.emit(SignalParticipantUpdateEvent(
-            participants: msg.update.participants));
+        events.emit(SignalParticipantUpdateEvent(participants: msg.update.participants));
         break;
       case lk_rtc.SignalResponse_Message.trackPublished:
         events.emit(SignalLocalTrackPublishedEvent(
@@ -287,8 +274,7 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
         ));
         break;
       case lk_rtc.SignalResponse_Message.speakersChanged:
-        events.emit(
-            SignalSpeakersChangedEvent(speakers: msg.speakersChanged.speakers));
+        events.emit(SignalSpeakersChangedEvent(speakers: msg.speakersChanged.speakers));
         break;
       case lk_rtc.SignalResponse_Message.roomUpdate:
         events.emit(SignalRoomUpdateEvent(room: msg.roomUpdate.room));
@@ -360,8 +346,7 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
   }
 
   void _sendPing() {
-    _sendRequest(lk_rtc.SignalRequest()
-      ..ping = Int64(DateTime.timestamp().millisecondsSinceEpoch));
+    _sendRequest(lk_rtc.SignalRequest()..ping = Int64(DateTime.timestamp().millisecondsSinceEpoch));
   }
 
   void _startPingInterval() {
@@ -373,8 +358,7 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
       return;
     }
 
-    _pingIntervalTimer ??=
-        Timer.periodic(_pingIntervalDuration!, (_) => _sendPing());
+    _pingIntervalTimer ??= Timer.periodic(_pingIntervalDuration!, (_) => _sendPing());
   }
 
   void _clearPingInterval() {
@@ -403,21 +387,17 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
 
 extension SignalClientRequests on SignalClient {
   @internal
-  void sendOffer(rtc.RTCSessionDescription offer) =>
-      _sendRequest(lk_rtc.SignalRequest(
+  void sendOffer(rtc.RTCSessionDescription offer) => _sendRequest(lk_rtc.SignalRequest(
         offer: offer.toPBType(),
       ));
 
   @internal
-  void sendAnswer(rtc.RTCSessionDescription answer) =>
-      _sendRequest(lk_rtc.SignalRequest(
+  void sendAnswer(rtc.RTCSessionDescription answer) => _sendRequest(lk_rtc.SignalRequest(
         answer: answer.toPBType(),
       ));
 
   @internal
-  void sendIceCandidate(
-          rtc.RTCIceCandidate candidate, lk_rtc.SignalTarget target) =>
-      _sendRequest(
+  void sendIceCandidate(rtc.RTCIceCandidate candidate, lk_rtc.SignalTarget target) => _sendRequest(
         lk_rtc.SignalRequest(
           trickle: lk_rtc.TrickleRequest(
             candidateInit: candidate.toJson(),
@@ -427,35 +407,30 @@ extension SignalClientRequests on SignalClient {
       );
 
   @internal
-  void sendMuteTrack(String trackSid, bool muted) =>
-      _sendRequest(lk_rtc.SignalRequest(
+  void sendMuteTrack(String trackSid, bool muted) => _sendRequest(lk_rtc.SignalRequest(
         mute: lk_rtc.MuteTrackRequest(
           sid: trackSid,
           muted: muted,
         ),
       ));
 
   @internal
-  void sendAddTrack(lk_rtc.AddTrackRequest req) =>
-      _sendRequest(lk_rtc.SignalRequest(
+  void sendAddTrack(lk_rtc.AddTrackRequest req) => _sendRequest(lk_rtc.SignalRequest(
         addTrack: req,
       ));
 
   @internal
-  void sendUpdateLocalMetadata(lk_rtc.UpdateParticipantMetadata metadata) =>
-      _sendRequest(lk_rtc.SignalRequest(
+  void sendUpdateLocalMetadata(lk_rtc.UpdateParticipantMetadata metadata) => _sendRequest(lk_rtc.SignalRequest(
         updateMetadata: metadata,
       ));
 
   @internal
-  void sendUpdateTrackSettings(lk_rtc.UpdateTrackSettings settings) =>
-      _sendRequest(lk_rtc.SignalRequest(
+  void sendUpdateTrackSettings(lk_rtc.UpdateTrackSettings settings) => _sendRequest(lk_rtc.SignalRequest(
         trackSetting: settings,
       ));
 
   @internal
-  void sendUpdateSubscription(lk_rtc.UpdateSubscription subscription) =>
-      _sendRequest(lk_rtc.SignalRequest(
+  void sendUpdateSubscription(lk_rtc.UpdateSubscription subscription) => _sendRequest(lk_rtc.SignalRequest(
         subscription: subscription,
       ));
 
@@ -508,9 +483,7 @@ extension SignalClientRequests on SignalClient {
           nodeFailure: nodeFailure,
           migration: migration,
           serverLeave: serverLeave,
-          switchCandidateProtocol: (switchCandidate != null && switchCandidate)
-              ? lk_rtc.CandidateProtocol.TCP
-              : null,
+          switchCandidateProtocol: (switchCandidate != null && switchCandidate) ? lk_rtc.CandidateProtocol.TCP : null,
         ),
       ));
 }

lib/src/core/room.dart

@@ -27,8 +27,7 @@ import '../support/platform.dart';
 import '../types/other.dart';
 import '../utils.dart';
 
-const ddExtensionURI =
-    'https://aomediacodec.github.io/av1-rtp-spec/#dependency-descriptor-rtp-header-extension';
+const ddExtensionURI = 'https://aomediacodec.github.io/av1-rtp-spec/#dependency-descriptor-rtp-header-extension';
 
 /* The svc codec (av1/vp9) would use a very low bitrate at the begining and
 increase slowly by the bandwidth estimator until it reach the target bitrate. The
@@ -52,8 +51,7 @@ class TrackBitrateInfo {
 }
 
 typedef TransportOnOffer = void Function(rtc.RTCSessionDescription offer);
-typedef PeerConnectionCreate = Future<rtc.RTCPeerConnection> Function(
-    Map<String, dynamic> configuration,
+typedef PeerConnectionCreate = Future<rtc.RTCPeerConnection> Function(Map<String, dynamic> configuration,
     [Map<String, dynamic> constraints]);
 
 /// a wrapper around PeerConnection
@@ -103,8 +101,7 @@ class Transport extends Disposable {
   }
 
   static Future<Transport> create(PeerConnectionCreate peerConnectionCreate,
-      {RTCConfiguration? rtcConfig,
-      required ConnectOptions connectOptions}) async {
+      {RTCConfiguration? rtcConfig, required ConnectOptions connectOptions}) async {
     rtcConfig ??= const RTCConfiguration();
     logger.fine('[PCTransport] creating ${rtcConfig.toMap()}');
     final pc = await peerConnectionCreate(rtcConfig.toMap());
@@ -126,8 +123,7 @@ class Transport extends Disposable {
     try {
       await pc.setRemoteDescription(sd);
     } catch (e) {
-      logger
-          .warning('[$objectId] setRemoteDescription() failed with error: $e');
+      logger.warning('[$objectId] setRemoteDescription() failed with error: $e');
     }
 
     for (final candidate in _pendingCandidates) {
@@ -159,8 +155,7 @@ class Transport extends Disposable {
       restartingIce = true;
     }
 
-    if (await pc.getSignalingState() ==
-        rtc.RTCSignalingState.RTCSignalingStateHaveLocalOffer) {
+    if (await pc.getSignalingState() == rtc.RTCSignalingState.RTCSignalingStateHaveLocalOffer) {
       // we're waiting for the peer to accept our offer, so we'll just wait
       // the only exception to this is when ICE restart is needed
       final currentSD = await getRemoteDescription();
@@ -185,14 +180,11 @@ class Transport extends Disposable {
     final sdpParsed = sdp_transform.parse(offer.sdp ?? '');
     sdpParsed['media']?.forEach((media) {
       if (media['type'] == 'video') {
-        ensureVideoDDExtensionForSVC(media, media['type'], media['port'],
-            media['protocol'], media['payloads']);
+        ensureVideoDDExtensionForSVC(media, media['type'], media['port'], media['protocol'], media['payloads']);
 
         // mung sdp for codec bitrate setting that can't apply by sendEncoding
         for (var trackbr in _bitrateTrackers) {
-          if (media['msid'] == null ||
-              trackbr.cid == null ||
-              !(media['msid'] as String).contains(trackbr.cid!)) {
+          if (media['msid'] == null || trackbr.cid == null || !(media['msid'] as String).contains(trackbr.cid!)) {
             continue;
           }
 
@@ -211,10 +203,8 @@ class Transport extends Disposable {
 
           for (var fmtp in media['fmtp']) {
             if (fmtp['payload'] == codecPayload) {
-              if (!(fmtp['config'] as String)
-                  .contains('x-google-start-bitrate')) {
-                fmtp['config'] +=
-                    ';x-google-start-bitrate=${(trackbr.maxbr * startBitrateForSVC).toInt()}';
+              if (!(fmtp['config'] as String).contains('x-google-start-bitrate')) {
+                fmtp['config'] += ';x-google-start-bitrate=${(trackbr.maxbr * startBitrateForSVC).toInt()}';
               }
               break;
             }
@@ -225,8 +215,7 @@ class Transport extends Disposable {
     });
 
     try {
-      await setMungedSDP(
-          sd: offer, munged: sdp_transform.write(sdpParsed, null));
+      await setMungedSDP(sd: offer, munged: sdp_transform.write(sdpParsed, null));
     } catch (e) {
       throw NegotiationError(e.toString());
     }
@@ -308,10 +297,7 @@ class Transport extends Disposable {
     return ddFound;
   }
 
-  Future<void> setMungedSDP(
-      {required rtc.RTCSessionDescription sd,
-      String? munged,
-      bool? remote}) async {
+  Future<void> setMungedSDP({required rtc.RTCSessionDescription sd, String? munged, bool? remote}) async {
     if (munged != null) {
       final originalSdp = sd.sdp;
       sd.sdp = munged;
@@ -325,8 +311,7 @@ class Transport extends Disposable {
         }
         return;
       } catch (e) {
-        logger.warning(
-            'not able to set ${sd.type}, falling back to unmodified sdp error: $e, sdp: $munged ');
+        logger.warning('not able to set ${sd.type}, falling back to unmodified sdp error: $e, sdp: $munged ');
         sd.sdp = originalSdp;
       }
     }