refactored classes to and interface names to be more clear

Author: jyameo

dwds/lib/src/dwds_vm_client.dart

@@ -39,7 +39,7 @@ enum _NamespacedServiceExtension {
 }
 
 /// Common interface for DWDS VM clients.
-abstract class IDwdsVmClient {
+abstract class DwdsVmClient {
   /// The VM service client.
   VmService get client;
 
@@ -52,7 +52,7 @@ final _chromeLogger = Logger('DwdsVmClient');
 
 // A client of the vm service that registers some custom extensions like
 // hotRestart.
-class DwdsVmClient implements IDwdsVmClient {
+class ChromeDwdsVmClient implements DwdsVmClient {
   @override
   final VmService client;
   final StreamController<Map<String, Object>> _requestController;
@@ -66,7 +66,11 @@ class DwdsVmClient implements IDwdsVmClient {
   /// Synchronizes hot restarts to avoid races.
   final _hotRestartQueue = AtomicQueue();
 
-  DwdsVmClient(this.client, this._requestController, this._responseController);
+  ChromeDwdsVmClient(
+    this.client,
+    this._requestController,
+    this._responseController,
+  );
 
   @override
   Future<void> close() =>
@@ -76,8 +80,8 @@ class DwdsVmClient implements IDwdsVmClient {
         await client.dispose();
       }();
 
-  static Future<DwdsVmClient> create(
-    DebugService debugService,
+  static Future<ChromeDwdsVmClient> create(
+    ChromeDebugService debugService,
     DwdsStats dwdsStats,
     Uri? ddsUri,
   ) async {
@@ -118,7 +122,7 @@ class DwdsVmClient implements IDwdsVmClient {
       clientCompleter.complete(client);
     }
 
-    final dwdsVmClient = DwdsVmClient(
+    final dwdsVmClient = ChromeDwdsVmClient(
       client,
       requestController,
       responseController,
@@ -176,7 +180,7 @@ class DwdsVmClient implements IDwdsVmClient {
   static void _setUpVmServerConnection({
     required ChromeProxyService chromeProxyService,
     required DwdsStats dwdsStats,
-    required DebugService debugService,
+    required ChromeDebugService debugService,
     required Stream<VmResponse> responseStream,
     required StreamSink<VmResponse> responseSink,
     required Stream<VmRequest> requestStream,
@@ -276,7 +280,7 @@ class DwdsVmClient implements IDwdsVmClient {
   static Future<void> _registerServiceExtensions({
     required VmService client,
     required ChromeProxyService chromeProxyService,
-    required DwdsVmClient dwdsVmClient,
+    required ChromeDwdsVmClient dwdsVmClient,
   }) async {
     client.registerServiceCallback(
       'hotRestart',
@@ -309,7 +313,7 @@ class DwdsVmClient implements IDwdsVmClient {
 final _webSocketLogger = Logger('WebSocketDwdsVmClient');
 
 /// WebSocket-based DWDS VM client.
-class WebSocketDwdsVmClient implements IDwdsVmClient {
+class WebSocketDwdsVmClient implements DwdsVmClient {
   @override
   final VmService client;
   final StreamController<VmRequest> _requestController;

dwds/lib/src/handlers/dev_handler.dart

@@ -59,7 +59,7 @@ class DevHandler {
   final AssetReader _assetReader;
   final String _hostname;
   final _connectedApps = StreamController<AppConnection>.broadcast();
-  final _servicesByAppId = <String, IAppDebugServices>{};
+  final _servicesByAppId = <String, AppDebugServices>{};
   final _appConnectionByAppId = <String, AppConnection>{};
   final Stream<BuildResult> buildResults;
   final Future<ChromeConnection> Function() _chromeConnection;
@@ -163,8 +163,8 @@ class DevHandler {
     return successfulSends;
   }
 
-  /// Starts a [DebugService] for local debugging.
-  Future<DebugService> _startLocalDebugService(
+  /// Starts a [ChromeDebugService] for local debugging.
+  Future<ChromeDebugService> _startLocalDebugService(
     ChromeConnection chromeConnection,
     AppConnection appConnection,
   ) async {
@@ -224,7 +224,7 @@ class DevHandler {
 
     final webkitDebugger = WebkitDebugger(WipDebugger(tabConnection));
 
-    return DebugService.start(
+    return ChromeDebugService.start(
       // We assume the user will connect to the debug service on the same
       // machine. This allows consumers of DWDS to provide a `hostname` for
       // debugging through the Dart Debug Extension without impacting the local
@@ -264,7 +264,7 @@ class DevHandler {
     );
   }
 
-  Future<IAppDebugServices> loadAppServices(AppConnection appConnection) async {
+  Future<AppDebugServices> loadAppServices(AppConnection appConnection) async {
     final appId = appConnection.request.appId;
     var appServices = _servicesByAppId[appId];
     if (appServices == null) {
@@ -281,7 +281,7 @@ class DevHandler {
   }
 
   /// Creates WebSocket-based app services for hot reload functionality.
-  Future<IAppDebugServices> _createWebSocketAppServices(
+  Future<AppDebugServices> _createWebSocketAppServices(
     AppConnection appConnection,
   ) async {
     final webSocketDebugService = await WebSocketDebugService.start(
@@ -296,7 +296,7 @@ class DevHandler {
   }
 
   /// Creates Chrome-based app services for full debugging capabilities.
-  Future<IAppDebugServices> _createChromeAppServices(
+  Future<AppDebugServices> _createChromeAppServices(
     AppConnection appConnection,
   ) async {
     final debugService = await _startLocalDebugService(
@@ -308,7 +308,7 @@ class DevHandler {
 
   /// Sets up cleanup handling for Chrome-based services.
   void _setupChromeServiceCleanup(
-    IAppDebugServices appServices,
+    AppDebugServices appServices,
     AppConnection appConnection,
   ) {
     final chromeProxy = appServices.proxyService;
@@ -468,7 +468,7 @@ class DevHandler {
       return;
     }
     final debuggerStart = DateTime.now();
-    IAppDebugServices appServices;
+    AppDebugServices appServices;
     try {
       appServices = await loadAppServices(appConnection);
     } catch (_) {
@@ -733,7 +733,7 @@ class DevHandler {
 
   /// Handles reconnection to existing services for web-socket mode.
   Future<void> _reconnectToService(
-    IAppDebugServices services,
+    AppDebugServices services,
     AppConnection? existingConnection,
     AppConnection newConnection,
     ConnectRequest message,
@@ -846,17 +846,21 @@ class DevHandler {
     );
   }
 
-  Future<IAppDebugServices> _createAppDebugServices(
-    DebugService debugService,
+  Future<AppDebugServices> _createAppDebugServices(
+    ChromeDebugService debugService,
   ) async {
     final dwdsStats = DwdsStats();
     Uri? ddsUri;
     if (_spawnDds) {
       final dds = await debugService.startDartDevelopmentService();
       ddsUri = dds.wsUri;
     }
-    final vmClient = await DwdsVmClient.create(debugService, dwdsStats, ddsUri);
-    final appDebugService = AppDebugServices(
+    final vmClient = await ChromeDwdsVmClient.create(
+      debugService,
+      dwdsStats,
+      ddsUri,
+    );
+    final appDebugService = ChromeAppDebugServices(
       debugService,
       vmClient,
       dwdsStats,
@@ -883,7 +887,7 @@ class DevHandler {
     return appDebugService;
   }
 
-  Future<IAppDebugServices> _createAppDebugServicesWebSocketMode(
+  Future<AppDebugServices> _createAppDebugServicesWebSocketMode(
     WebSocketDebugService webSocketDebugService,
     AppConnection appConnection,
   ) async {
@@ -918,7 +922,7 @@ class DevHandler {
     }
   }
 
-  /// Starts a [DebugService] for Dart Debug Extension.
+  /// Starts a [ChromeProxyService] for Dart Debug Extension.
   void _startExtensionDebugService(ExtensionDebugger extensionDebugger) {
     // Waits for a `DevToolsRequest` to be sent from the extension background
     // when the extension is clicked.
@@ -965,7 +969,7 @@ class DevHandler {
     final debuggerStart = DateTime.now();
     var appServices = _servicesByAppId[appId];
     if (appServices == null) {
-      final debugService = await DebugService.start(
+      final debugService = await ChromeDebugService.start(
         _hostname,
         extensionDebugger,
         executionContext,

dwds/lib/src/services/app_debug_services.dart

@@ -10,9 +10,9 @@ import 'package:dwds/src/services/debug_service.dart';
 import 'package:dwds/src/services/proxy_service.dart';
 
 /// Common interface for debug service containers.
-abstract class IAppDebugServices {
-  IDebugService get debugService;
-  IDwdsVmClient get dwdsVmClient;
+abstract class AppDebugServices {
+  DebugService get debugService;
+  DwdsVmClient get dwdsVmClient;
   DwdsStats? get dwdsStats;
   Uri? get ddsUri;
   String? get connectedInstanceId;
@@ -22,26 +22,26 @@ abstract class IAppDebugServices {
 }
 
 /// Chrome-based debug services container.
-class AppDebugServices implements IAppDebugServices {
-  final DebugService _debugService;
-  final DwdsVmClient _dwdsVmClient;
+class ChromeAppDebugServices implements AppDebugServices {
+  final ChromeDebugService _debugService;
+  final ChromeDwdsVmClient _dwdsVmClient;
   final DwdsStats _dwdsStats;
   final Uri? _ddsUri;
   Future<void>? _closed;
   String? _connectedInstanceId;
 
-  AppDebugServices(
+  ChromeAppDebugServices(
     this._debugService,
     this._dwdsVmClient,
     this._dwdsStats,
     this._ddsUri,
   );
 
   @override
-  DebugService get debugService => _debugService;
+  ChromeDebugService get debugService => _debugService;
 
   @override
-  IDwdsVmClient get dwdsVmClient => _dwdsVmClient;
+  DwdsVmClient get dwdsVmClient => _dwdsVmClient;
 
   @override
   DwdsStats get dwdsStats => _dwdsStats;
@@ -65,7 +65,7 @@ class AppDebugServices implements IAppDebugServices {
 }
 
 /// WebSocket-based implementation of app debug services.
-class WebSocketAppDebugServices implements IAppDebugServices {
+class WebSocketAppDebugServices implements AppDebugServices {
   final WebSocketDebugService _debugService;
   final WebSocketDwdsVmClient _dwdsVmClient;
   Future<void>? _closed;
@@ -77,7 +77,7 @@ class WebSocketAppDebugServices implements IAppDebugServices {
   WebSocketDebugService get debugService => _debugService;
 
   @override
-  IDwdsVmClient get dwdsVmClient => _dwdsVmClient;
+  DwdsVmClient get dwdsVmClient => _dwdsVmClient;
 
   @override
   String? get connectedInstanceId => _connectedInstanceId;

dwds/lib/src/services/chrome_proxy_service.dart

@@ -1548,7 +1548,7 @@ class ChromeProxyService extends ProxyService {
 
   @override
   Future<void> yieldControlToDDS(String uri) async {
-    final canYield = DebugService.yieldControlToDDS(uri);
+    final canYield = ChromeDebugService.yieldControlToDDS(uri);
 
     if (!canYield) {
       throw RPCError(

dwds/lib/src/services/debug_service.dart

@@ -128,7 +128,7 @@ Future<void> _handleSseConnections(
 }
 
 /// Common interface for debug services (Chrome or WebSocket based).
-abstract class IDebugService {
+abstract class DebugService {
   String get hostname;
   int get port;
   String get uri;
@@ -140,7 +140,7 @@ abstract class IDebugService {
 /// A Dart Web Debug Service.
 ///
 /// Creates a [ChromeProxyService] from an existing Chrome instance.
-class DebugService implements IDebugService {
+class ChromeDebugService implements DebugService {
   static String? _ddsUri;
 
   final VmServiceInterface chromeProxyService;
@@ -163,7 +163,7 @@ class DebugService implements IDebugService {
   /// All subsequent calls to [close] will return this future.
   Future<void>? _closed;
 
-  DebugService._(
+  ChromeDebugService._(
     this.chromeProxyService,
     this.hostname,
     this.port,
@@ -235,7 +235,7 @@ class DebugService implements IDebugService {
     return true;
   }
 
-  static Future<DebugService> start(
+  static Future<ChromeDebugService> start(
     String hostname,
     RemoteDebugger remoteDebugger,
     ExecutionContext executionContext,
@@ -305,7 +305,7 @@ class DebugService implements IDebugService {
       _logger.warning('Error serving requests', e);
       emitEvent(DwdsEvent.httpRequestException('DebugService', '$e:$s'));
     });
-    return DebugService._(
+    return ChromeDebugService._(
       chromeProxyService,
       server.address.host,
       server.port,
@@ -325,7 +325,7 @@ class DebugService implements IDebugService {
 typedef SendClientRequest = int Function(Object request);
 
 /// WebSocket-based debug service for web debugging.
-class WebSocketDebugService implements IDebugService {
+class WebSocketDebugService implements DebugService {
   @override
   final String hostname;
   @override