Remove built_value dependency from ConnectRequest

dwds/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 26.2.4-wip
 
-- Remove `package:built_value` dependency from `HotReloadRequest`, `HotReloadResponse`, `HotRestartRequest`, `HotRestartResponse`, `ServiceExtensionRequest`, and `ServiceExtensionResponse`; switch to standard Dart JSON serialization.
+- Remove `package:built_value` dependency from `ConnectRequest`, `HotReloadRequest`, `HotReloadResponse`, `HotRestartRequest`, `HotRestartResponse`, `ServiceExtensionRequest`, and `ServiceExtensionResponse`; switch to standard Dart JSON serialization.
 
 ## 26.2.3
 

dwds/lib/data/connect_request.dart

@@ -2,28 +2,34 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:built_value/built_value.dart';
-import 'package:built_value/serializer.dart';
-
-part 'connect_request.g.dart';
-
 /// A request to open DevTools.
-abstract class ConnectRequest
-    implements Built<ConnectRequest, ConnectRequestBuilder> {
-  static Serializer<ConnectRequest> get serializer =>
-      _$connectRequestSerializer;
-
-  factory ConnectRequest([Function(ConnectRequestBuilder) updates]) =
-      _$ConnectRequest;
-
-  ConnectRequest._();
-
+class ConnectRequest {
   /// Identifies a given application, across tabs/windows.
-  String get appId;
+  final String appId;
 
   /// Identifies a given instance of an application, unique per tab/window.
-  String get instanceId;
+  final String instanceId;
 
   /// The entrypoint for the Dart application.
-  String get entrypointPath;
+  final String entrypointPath;
+
+  ConnectRequest({
+    required this.appId,
+    required this.instanceId,
+    required this.entrypointPath,
+  });
+
+  Map<String, dynamic> toJson() => {
+    'appId': appId,
+    'instanceId': instanceId,
+    'entrypointPath': entrypointPath,
+  };
+
+  factory ConnectRequest.fromJson(Map<String, dynamic> json) {
+    return ConnectRequest(
+      appId: json['appId'] as String,
+      instanceId: json['instanceId'] as String,
+      entrypointPath: json['entrypointPath'] as String,
+    );
+  }
 }

dwds/lib/data/serializers.dart

@@ -6,7 +6,6 @@ import 'package:built_collection/built_collection.dart';
 import 'package:built_value/serializer.dart';
 
 import 'build_result.dart';
-import 'connect_request.dart';
 import 'debug_event.dart';
 import 'debug_info.dart';
 import 'devtools_request.dart';
@@ -23,7 +22,6 @@ part 'serializers.g.dart';
   BatchedEvents,
   BatchedDebugEvents,
   BuildResult,
-  ConnectRequest,
   DebugEvent,
   DebugInfo,
   DevToolsRequest,

dwds/lib/src/handlers/dev_handler.dart

@@ -145,7 +145,9 @@ class DevHandler {
   /// For plain Dart types (converted away from built_value), emit the
   /// wire format `[TypeName, json]`. Built_value types use `serializers`.
   Object? _serializeMessage(Object request) {
-    if (request is HotReloadRequest) {
+    if (request is ConnectRequest) {
+      return ['ConnectRequest', request.toJson()];
+    } else if (request is HotReloadRequest) {
       return ['HotReloadRequest', request.toJson()];
     } else if (request is HotRestartRequest) {
       return ['HotRestartRequest', request.toJson()];
@@ -166,6 +168,8 @@ class DevHandler {
       final jsonData = decoded[1] as Map<String, dynamic>;
 
       switch (typeName) {
+        case 'ConnectRequest':
+          return ConnectRequest.fromJson(jsonData);
         case 'HotReloadResponse':
           return HotReloadResponse.fromJson(jsonData);
         case 'HotRestartResponse':