From 740efea00638f9989c38fa821b7059364d11530c Mon Sep 17 00:00:00 2001 From: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun, 15 May 2022 23:58:35 +0900 Subject: [PATCH] fix checks --- lib/src/core/transport.dart | 4 ++-- lib/src/managers/event.dart | 10 +++++----- lib/src/support/disposable.dart | 4 ++-- lib/src/support/websocket/web.dart | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/src/core/transport.dart b/lib/src/core/transport.dart index 30f73cb..2459bd7 100644 --- a/lib/src/core/transport.dart +++ b/lib/src/core/transport.dart @@ -62,8 +62,8 @@ class Transport extends Disposable { [RTCConfiguration? rtcConfig]) async { rtcConfig ??= const RTCConfiguration(); logger.fine('[PCTransport] creating ${rtcConfig.toMap()}'); - final _ = await peerConnectionCreate(rtcConfig.toMap()); - return Transport._(_); + final pc = await peerConnectionCreate(rtcConfig.toMap()); + return Transport._(pc); } late final negotiate = Utils.createDebounceFunc( diff --git a/lib/src/managers/event.dart b/lib/src/managers/event.dart index 2586107..de26168 100644 --- a/lib/src/managers/event.dart +++ b/lib/src/managers/event.dart @@ -120,17 +120,17 @@ abstract class EventsListenable extends Disposable { // listens to all events, guaranteed to be cancelled on dispose CancelListenFunc listen(FutureOr Function(T) onEvent) { // - FutureOr Function(T) _func = onEvent; + FutureOr Function(T) func = onEvent; if (synchronized) { // ensure `onEvent` will trigger one by one (waits for previous `onEvent` to complete) - _func = (event) async { + func = (event) async { await _syncLock.synchronized(() async { await onEvent(event); }); }; } - final listener = emitter.streamCtrl.stream.listen(_func); + final listener = emitter.streamCtrl.stream.listen(func); _listeners.add(listener); // make a cancel func to cancel listening and remove from list in 1 call @@ -165,7 +165,7 @@ abstract class EventsListenable extends Disposable { }) async { final completer = Completer(); - final _cancelFunc = on( + final cancelFunc = on( (event) { if (!completer.isCompleted) { completer.complete(event); @@ -183,7 +183,7 @@ abstract class EventsListenable extends Disposable { // do not catch exceptions and pass it up } finally { // always clean-up listener - await _cancelFunc.call(); + await cancelFunc.call(); } } } diff --git a/lib/src/support/disposable.dart b/lib/src/support/disposable.dart index 09743b5..dcb0545 100644 --- a/lib/src/support/disposable.dart +++ b/lib/src/support/disposable.dart @@ -25,8 +25,8 @@ mixin _Disposer { logger.finer( '[$objectId] running ${_disposeFuncs.length} dispose funcs...'); // call dispose funcs in reverse order - for (final _func in _disposeFuncs.reversed) { - await _func(); + for (final disposeFunc in _disposeFuncs.reversed) { + await disposeFunc(); } _disposeFuncs.clear(); logger.finer('[$objectId] dispose complete.'); diff --git a/lib/src/support/websocket/web.dart b/lib/src/support/websocket/web.dart index 33aa2a6..7ac694e 100644 --- a/lib/src/support/websocket/web.dart +++ b/lib/src/support/websocket/web.dart @@ -30,8 +30,8 @@ class LiveKitWebSocketWeb extends LiveKitWebSocket { logger.warning('$objectId already disposed, ignoring received data.'); return; } - dynamic _data = _.data is ByteBuffer ? _.data.asUint8List() : _.data; - options?.onData?.call(_data); + dynamic data = _.data is ByteBuffer ? _.data.asUint8List() : _.data; + options?.onData?.call(data); }); _closeSubscription = _ws.onClose.listen((_) async { await _messageSubscription.cancel();