remove --start-paused flag by default and set useDwdsWebSocketConnect… (flutter#170612)

- Removed --start-paused flag by default and set
useDwdsWebSocketConnection in DWDS
- Updated logic for adding middleware and generating loadindicator
- Revert changes in flutter#170610

Related to dart-lang/webdev#2605.
Fixes dart-lang/sdk#60289. 

Sibling PR in DWDS: dart-lang/webdev#2629
This PR will need to be submitted before this one. The pubspec must be
updated with a new release of DWDS after the changes are submitted

Author: jyameo

packages/flutter_tools/lib/executable.dart

@@ -99,17 +99,6 @@ Future<void> main(List<String> args) async {
     userMessages: UserMessages(),
   );
 
-  // Silently add --start-paused if running with -d web-server and --web-experimental-hot-reload,
-  // and --start-paused is not already present. This is to support hot reload in web-server environment.
-  // TODO(yjessy): Remove this workaround once https://github.com/dart-lang/sdk/issues/60688 is resolved.
-
-  if (args.contains('-d') &&
-      args.contains('web-server') &&
-      args.contains('--web-experimental-hot-reload') &&
-      !args.contains('--start-paused')) {
-    args = List<String>.from(args)..add('--start-paused');
-  }
-
   await runner.run(
     args,
     () => generateCommands(verboseHelp: verboseHelp, verbose: verbose),

packages/flutter_tools/lib/src/isolated/devfs_web.dart

@@ -49,7 +49,7 @@ typedef DwdsLauncher =
       required Stream<BuildResult> buildResults,
       required ConnectionProvider chromeConnection,
       required ToolConfiguration toolConfiguration,
-      bool injectDebuggingSupportCode,
+      bool useDwdsWebSocketConnection,
     });
 
 // A minimal index for projects that do not yet support web. A meta tag is used
@@ -264,9 +264,11 @@ class WebAssetServer implements AssetReader {
     // TODO(markzipan): Make sure this default value aligns with that in the debugger options.
     bool ddcModuleSystem = false,
     bool canaryFeatures = false,
+    bool useDwdsWebSocketConnection = false,
     required FileSystem fileSystem,
     required Logger logger,
     required Platform platform,
+    bool shouldEnableMiddleware = false,
   }) async {
     // TODO(srujzs): Remove this assertion when the library bundle format is
     // supported without canary mode.
@@ -383,15 +385,6 @@ class WebAssetServer implements AssetReader {
     logging.Logger.root.level = logging.Level.ALL;
     logging.Logger.root.onRecord.listen((logging.LogRecord event) => log(logger, event));
 
-    // Retrieve connected web devices.
-    final List<Device>? devices = await globals.deviceManager?.getAllDevices();
-    final Set<String> connectedWebDeviceIds =
-        devices
-            ?.where((Device d) => d.platformType == PlatformType.web && d.isConnected)
-            .map((Device d) => d.id)
-            .toSet() ??
-        <String>{};
-
     // In debug builds, spin up DWDS and the full asset server.
     final Dwds dwds = await dwdsLauncher(
       assetReader: server,
@@ -442,15 +435,12 @@ class WebAssetServer implements AssetReader {
         ),
         appMetadata: AppMetadata(hostname: hostname),
       ),
-      // Inject the debugging support code if connected web devices are present,
-      // and user specified a device id that matches a connected web device.
-      // If the user did not specify a device id, we use chrome as the default.
-      injectDebuggingSupportCode:
-          connectedWebDeviceIds.isNotEmpty &&
-          connectedWebDeviceIds.contains(globals.deviceManager?.specifiedDeviceId ?? 'chrome'),
+      // Use DWDS WebSocket-based connection instead of Chrome-based connection for debugging
+      useDwdsWebSocketConnection: useDwdsWebSocketConnection,
     );
     shelf.Pipeline pipeline = const shelf.Pipeline();
-    if (enableDwds) {
+
+    if (shouldEnableMiddleware) {
       pipeline = pipeline.addMiddleware(middleware);
       pipeline = pipeline.addMiddleware(dwds.middleware);
     }
@@ -877,6 +867,7 @@ class WebDevFS implements DevFS {
     required this.isWasm,
     required this.useLocalCanvasKit,
     required this.rootDirectory,
+    this.useDwdsWebSocketConnection = false,
     required this.fileSystem,
     required this.logger,
     required this.platform,
@@ -912,6 +903,7 @@ class WebDevFS implements DevFS {
   final WebRendererMode webRenderer;
   final bool isWasm;
   final bool useLocalCanvasKit;
+  final bool useDwdsWebSocketConnection;
   final FileSystem fileSystem;
   final Logger logger;
   final Platform platform;
@@ -920,6 +912,10 @@ class WebDevFS implements DevFS {
 
   Dwds get dwds => webAssetServer.dwds;
 
+  /// Whether middleware should be enabled for this web development server.
+  /// Middleware is enabled when using Chrome device or DDC module system.
+  bool get shouldEnableMiddleware => chromiumLauncher != null || ddcModuleSystem;
+
   // A flag to indicate whether we have called `setAssetDirectory` on the target device.
   @override
   bool hasSetAssetDirectory = false;
@@ -1017,9 +1013,11 @@ class WebDevFS implements DevFS {
       testMode: testMode,
       ddcModuleSystem: ddcModuleSystem,
       canaryFeatures: canaryFeatures,
+      useDwdsWebSocketConnection: useDwdsWebSocketConnection,
       fileSystem: fileSystem,
       logger: logger,
       platform: platform,
+      shouldEnableMiddleware: shouldEnableMiddleware,
     );
     return baseUri!;
   }
@@ -1101,13 +1099,13 @@ class WebDevFS implements DevFS {
               entrypoint: entrypoint,
               ddcModuleLoaderUrl: 'ddc_module_loader.js',
               mapperUrl: 'stack_trace_mapper.js',
-              generateLoadingIndicator: enableDwds,
+              generateLoadingIndicator: shouldEnableMiddleware,
               isWindows: platform.isWindows,
             )
             : generateBootstrapScript(
               requireUrl: 'require.js',
               mapperUrl: 'stack_trace_mapper.js',
-              generateLoadingIndicator: enableDwds,
+              generateLoadingIndicator: shouldEnableMiddleware,
             ),
       );
       const String onLoadEndBootstrap = 'on_load_end_bootstrap.js';

packages/flutter_tools/lib/src/isolated/resident_web_runner.dart

@@ -303,6 +303,26 @@ Please provide a valid TCP port (an integer between 0 and 65535, inclusive).
                 ? WebExpressionCompiler(device!.generator!, fileSystem: _fileSystem)
                 : null;
 
+        // Retrieve connected web devices, excluding the web server device.
+        final List<Device>? devices = await globals.deviceManager?.getAllDevices();
+        final Set<String> nonWebServerConnectedDeviceIds =
+            devices
+                ?.where(
+                  (Device d) =>
+                      d.platformType == PlatformType.web &&
+                      d.isConnected &&
+                      d.id != WebServerDevice.kWebServerDeviceId,
+                )
+                .map((Device d) => d.id)
+                .toSet() ??
+            <String>{};
+
+        // Use Chrome-based connection only if we have a connected ChromiumDevice
+        // Otherwise, use DWDS WebSocket connection
+        final bool useDwdsWebSocketConnection =
+            !(_chromiumLauncher != null &&
+                nonWebServerConnectedDeviceIds.contains(device!.device!.id));
+
         device!.devFS = WebDevFS(
           hostname: debuggingOptions.hostname ?? 'localhost',
           port: await getPort(),
@@ -327,6 +347,7 @@ Please provide a valid TCP port (an integer between 0 and 65535, inclusive).
           isWasm: debuggingOptions.webUseWasm,
           useLocalCanvasKit: debuggingOptions.buildInfo.useLocalCanvasKit,
           rootDirectory: fileSystem.directory(projectRootPath),
+          useDwdsWebSocketConnection: useDwdsWebSocketConnection,
           fileSystem: fileSystem,
           logger: logger,
           platform: _platform,

packages/flutter_tools/lib/src/runner/flutter_command.dart

@@ -29,7 +29,6 @@ import '../project.dart';
 import '../reporting/reporting.dart';
 import '../reporting/unified_analytics.dart';
 import '../version.dart';
-import '../web/web_device.dart';
 import 'flutter_command_runner.dart';
 import 'target_devices.dart';
 
@@ -1334,11 +1333,7 @@ abstract class FlutterCommand extends Command<void> {
     // TODO(natebiggs): Delete this when new DDC module system is the default.
     final bool webEnableHotReload =
         argParser.options.containsKey(FlutterOptions.kWebExperimentalHotReload) &&
-        boolArg(FlutterOptions.kWebExperimentalHotReload) &&
-        // TODO(nshahan): Enable on web-server when the app is started correctly
-        // https://github.com/dart-lang/sdk/issues/60289.
-        (globals.deviceManager == null ||
-            globals.deviceManager!.specifiedDeviceId != WebServerDevice.kWebServerDeviceId);
+        boolArg(FlutterOptions.kWebExperimentalHotReload);
 
     String? codeSizeDirectory;
     if (argParser.options.containsKey(FlutterOptions.kAnalyzeSize) &&

packages/flutter_tools/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   archive: 3.6.1
   args: 2.7.0
   dds: 5.0.2
-  dwds: 24.3.10
+  dwds: 24.3.11
   code_builder: 4.10.1
   completion: 1.0.1
   coverage: 1.14.1
@@ -126,4 +126,4 @@ dev_dependencies:
 dartdoc:
   # Exclude this package from the hosted API docs.
   nodoc: true
-# PUBSPEC CHECKSUM: gpkldp
+# PUBSPEC CHECKSUM: 8r3ct9

packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart

@@ -370,28 +370,6 @@ void main() {
       },
     );
 
-    // TODO(nshahan): Delete when hot reload on web is always enabled
-    // https://github.com/flutter/flutter/issues/170685.
-    testUsingContext('web hot reload enabled by default', () async {
-      final DummyFlutterCommand dummyCommand =
-          DummyFlutterCommand()..usesWebOptions(verboseHelp: false);
-      final CommandRunner<void> runner = createTestCommandRunner(dummyCommand);
-      await runner.run(<String>['dummy']);
-      final BuildInfo buildInfo = await dummyCommand.getBuildInfo(forcedBuildMode: BuildMode.debug);
-      expect(buildInfo.webEnableHotReload, isTrue);
-    });
-
-    // TODO(nshahan): Delete when hot reload doesn't break on web-server
-    // https://github.com/dart-lang/sdk/issues/60289.
-    testUsingContext('web hot reload disabled when device is web-server', () async {
-      final DummyFlutterCommand dummyCommand =
-          DummyFlutterCommand()..usesWebOptions(verboseHelp: false);
-      final CommandRunner<void> runner = createTestCommandRunner(dummyCommand);
-      await runner.run(<String>['dummy', '-d', 'web-server']);
-      final BuildInfo buildInfo = await dummyCommand.getBuildInfo(forcedBuildMode: BuildMode.debug);
-      expect(buildInfo.webEnableHotReload, isFalse);
-    });
-
     group('signals tests', () {
       late FakeIoProcessSignal mockSignal;
       late ProcessSignal signalUnderTest;