From 3724bfb3aeae47a62bfa1dc6b5ae71762c3558ad Mon Sep 17 00:00:00 2001 From: Diyor Khanazarov <55789435+Diyor331@users.noreply.github.com> Date: Tue, 7 Oct 2025 17:00:17 +0500 Subject: [PATCH] fix: remove comments --- lib/src/channels/base_channel.dart | 3 --- lib/src/client/laravel_echo_socket_client.dart | 17 +++++++---------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/src/channels/base_channel.dart b/lib/src/channels/base_channel.dart index 9d018d2..97c2d56 100644 --- a/lib/src/channels/base_channel.dart +++ b/lib/src/channels/base_channel.dart @@ -10,10 +10,8 @@ abstract class BaseChannel implements SocketChannel { @override final String name; - /// Публичный сокет (раньше было _socket — private для другого файла). io.Socket? socket; - /// Провайдер заголовков для auth в subscribe/unsubscribe. final AuthHeadersProvider? _authProvider; final Map> _handlers = {}; @@ -22,7 +20,6 @@ abstract class BaseChannel implements SocketChannel { void bind(io.Socket newSocket) { socket = newSocket; - // перевесить агрегаторы после реконнекта for (final entry in _aggregators.entries) { final user = entry.key; final bound = _boundEventName[user] ?? normalizeEvent(user); diff --git a/lib/src/client/laravel_echo_socket_client.dart b/lib/src/client/laravel_echo_socket_client.dart index 64e3064..c27dbee 100644 --- a/lib/src/client/laravel_echo_socket_client.dart +++ b/lib/src/client/laravel_echo_socket_client.dart @@ -14,7 +14,7 @@ enum _ChannelType { public, private, presence } class LaravelEchoSocketClient { LaravelEchoSocketClient(SocketConfig config) : _config = config.copyWith() { - _auth = _config.authHeadersProvider ?? bearerProvider(_config.token); // дефолтный Bearer + _auth = _config.authHeadersProvider ?? bearerProvider(_config.token); } SocketConfig _config; @@ -69,26 +69,25 @@ class LaravelEchoSocketClient { } Future disconnect({bool force = false}) async { - for (final ch in _channels.values) { - await ch.unsubscribe(); + for (final channel in _channels.values) { + await channel.unsubscribe(); } _channels.clear(); - final s = _socket; + final socket = _socket; _socket = null; - if (s != null) { - s + if (socket != null) { + socket ..off('connect') ..off('disconnect') ..off('connect_error') ..off('error') ..off('reconnect_attempt') ..disconnect(); - if (force) s.dispose(); + if (force) socket.dispose(); } } - /// Мягкое обновление токена: меняем провайдер и переподключаемся. void updateAuthToken(String token) { _config = _config.copyWith(token: token); _auth = _config.authHeadersProvider ?? bearerProvider(token); @@ -118,8 +117,6 @@ class LaravelEchoSocketClient { ch?.unsubscribe(); } - // ---- helpers ---- - BaseChannel _getOrCreate(String name, _ChannelType type) { final full = _fullName(name, type);