Provide an app entrypoint to DWDS

dwds/lib/src/debugging/inspector.dart

@@ -136,6 +136,7 @@ class AppInspector implements AppInspectorInterface {
     String root,
     Debugger debugger,
     ExecutionContext executionContext,
+    LoadStrategy loadStrategy,
   ) async {
     final id = createId();
     final time = DateTime.now().millisecondsSinceEpoch;
@@ -175,7 +176,7 @@ class AppInspector implements AppInspectorInterface {
 
     debugger.updateInspector(inspector);
 
-    final libraryHelper = LibraryHelper(inspector);
+    final libraryHelper = LibraryHelper(inspector, loadStrategy);
     final classHelper = ClassHelper(inspector);
     final instanceHelper = InstanceHelper(inspector, debugger);
 

dwds/lib/src/debugging/libraries.dart

@@ -23,17 +23,25 @@ class LibraryHelper extends Domain {
 
   LibraryRef? _rootLib;
 
-  LibraryHelper(AppInspectorInterface appInspector) {
+  late final LoadStrategy _loadStrategy;
+
+  LibraryHelper(AppInspectorInterface appInspector, LoadStrategy loadStrategy) {
     inspector = appInspector;
+    _loadStrategy = loadStrategy;
   }
 
   Future<LibraryRef> get rootLib async {
     if (_rootLib != null) return _rootLib!;
     // TODO: read entrypoint from app metadata.
     // Issue: https://github.com/dart-lang/webdev/issues/1290
     final libraries = await libraryRefs;
-    _rootLib = libraries
-        .firstWhereOrNull((lib) => lib.name?.contains('org-dartlang') ?? false);
+    if (_loadStrategy.appEntrypoint != null) {
+      _rootLib = libraries.firstWhereOrNull(
+          (lib) => Uri.parse(lib.uri ?? '') == _loadStrategy.appEntrypoint);
+    }
+    _rootLib = _rootLib ??
+        libraries.firstWhereOrNull(
+            (lib) => lib.name?.contains('org-dartlang') ?? false);
     _rootLib = _rootLib ??
         libraries
             .firstWhereOrNull((lib) => lib.name?.contains('main') ?? false);

dwds/lib/src/handlers/dev_handler.dart

@@ -412,7 +412,10 @@ class DevHandler {
 
       // Reconnect to existing service.
       services.connectedInstanceId = message.instanceId;
-      await services.chromeProxyService.createIsolate(connection);
+      await services.chromeProxyService.createIsolate(
+        connection,
+        _loadStrategy,
+      );
     }
     _appConnectionByAppId[message.appId] = connection;
     _connectedApps.add(connection);
@@ -429,7 +432,10 @@ class DevHandler {
       AppConnection appConnection, SocketConnection sseConnection) async {
     await _servicesByAppId[appConnection.request.appId]
         ?.chromeProxyService
-        .createIsolate(appConnection);
+        .createIsolate(
+          appConnection,
+          _loadStrategy,
+        );
   }
 
   void _listen() {

dwds/lib/src/loaders/build_runner_require.dart

@@ -21,6 +21,7 @@ class BuildRunnerRequireStrategyProvider {
   final Handler _assetHandler;
   final ReloadConfiguration _configuration;
   final AssetReader _assetReader;
+  final Uri? _appEntrypoint;
 
   late final RequireStrategy _requireStrategy = RequireStrategy(
     _configuration,
@@ -32,10 +33,15 @@ class BuildRunnerRequireStrategyProvider {
     _serverPathForAppUri,
     _moduleInfoForProvider,
     _assetReader,
+    _appEntrypoint,
   );
 
   BuildRunnerRequireStrategyProvider(
-      this._assetHandler, this._configuration, this._assetReader);
+    this._assetHandler,
+    this._configuration,
+    this._assetReader,
+    this._appEntrypoint,
+  );
 
   RequireStrategy get strategy => _requireStrategy;
 

dwds/lib/src/loaders/frontend_server_require.dart

@@ -16,6 +16,7 @@ class FrontendServerRequireStrategyProvider {
   final PackageUriMapper _packageUriMapper;
   final Future<Map<String, String>> Function() _digestsProvider;
   final String _basePath;
+  final Uri? _appEntrypoint;
 
   late final RequireStrategy _requireStrategy = RequireStrategy(
     _configuration,
@@ -27,6 +28,7 @@ class FrontendServerRequireStrategyProvider {
     _serverPathForAppUri,
     _moduleInfoForProvider,
     _assetReader,
+    _appEntrypoint,
   );
 
   FrontendServerRequireStrategyProvider(
@@ -35,6 +37,7 @@ class FrontendServerRequireStrategyProvider {
     this._packageUriMapper,
     this._digestsProvider,
     this._basePath,
+    this._appEntrypoint,
   );
 
   RequireStrategy get strategy => _requireStrategy;

dwds/lib/src/loaders/legacy.dart

@@ -60,6 +60,8 @@ class LegacyStrategy extends LoadStrategy {
   /// an app URI.
   final String? Function(String appUri) _serverPathForAppUri;
 
+  final Uri? _appEntrypoint;
+
   LegacyStrategy(
     this.reloadConfiguration,
     this._moduleForServerPath,
@@ -68,6 +70,7 @@ class LegacyStrategy extends LoadStrategy {
     this._serverPathForAppUri,
     this._moduleInfoForProvider,
     AssetReader assetReader,
+    this._appEntrypoint,
   ) : super(assetReader);
 
   @override
@@ -117,4 +120,7 @@ class LegacyStrategy extends LoadStrategy {
 
   @override
   String? serverPathForAppUri(String appUri) => _serverPathForAppUri(appUri);
+
+  @override
+  Uri? get appEntrypoint => _appEntrypoint;
 }

dwds/lib/src/loaders/require.dart

@@ -132,6 +132,10 @@ class RequireStrategy extends LoadStrategy {
   final Future<Map<String, ModuleInfo>> Function(
       MetadataProvider metadataProvider) _moduleInfoForProvider;
 
+  @override
+  Uri? get appEntrypoint => _appEntrypoint;
+  final Uri? _appEntrypoint;
+
   RequireStrategy(
     this.reloadConfiguration,
     this._moduleProvider,
@@ -142,6 +146,7 @@ class RequireStrategy extends LoadStrategy {
     this._serverPathForAppUri,
     this._moduleInfoForProvider,
     AssetReader assetReader,
+    this._appEntrypoint,
   ) : super(assetReader);
 
   @override

dwds/lib/src/loaders/strategy.dart

@@ -48,6 +48,10 @@ abstract class LoadStrategy {
   /// The reload configuration for this strategy, e.g. liveReload.
   ReloadConfiguration get reloadConfiguration;
 
+  /// The URI for the app's entrypoint file, which is usually `main.dart`. It
+  /// should be a package URI, e.g. `package:myapp/main.dart`.
+  Uri? get appEntrypoint;
+
   /// Returns a snippet of JS code that initializes a `library` variable that
   /// has the actual library object in DDC for [libraryUri].
   ///

dwds/lib/src/services/chrome_proxy_service.dart

@@ -159,7 +159,10 @@ class ChromeProxyService implements VmServiceInterface {
       executionContext,
       expressionCompiler,
     );
-    safeUnawaited(service.createIsolate(appConnection));
+    safeUnawaited(service.createIsolate(
+      appConnection,
+      loadStrategy,
+    ));
     return service;
   }
 
@@ -229,7 +232,8 @@ class ChromeProxyService implements VmServiceInterface {
   /// Only one isolate at a time is supported, but they should be cleaned up
   /// with [destroyIsolate] and recreated with this method there is a hot
   /// restart or full page refresh.
-  Future<void> createIsolate(AppConnection appConnection) async {
+  Future<void> createIsolate(
+      AppConnection appConnection, LoadStrategy loadStrategy) async {
     // Inspector is null if the previous isolate is destroyed.
     if (_isIsolateRunning) {
       throw UnsupportedError(
@@ -248,14 +252,14 @@ class ChromeProxyService implements VmServiceInterface {
 
     debugger.notifyPausedAtStart();
     _inspector = await AppInspector.create(
-      appConnection,
-      remoteDebugger,
-      _assetReader,
-      _locations,
-      root,
-      debugger,
-      executionContext,
-    );
+        appConnection,
+        remoteDebugger,
+        _assetReader,
+        _locations,
+        root,
+        debugger,
+        executionContext,
+        loadStrategy);
     debugger.updateInspector(inspector);
 
     final compiler = _compiler;

dwds/test/chrome_proxy_service_test.dart

@@ -1942,7 +1942,8 @@ void main() {
                     event.isolate!.id != initialIsolateId),
               ])));
           service.destroyIsolate();
-          await service.createIsolate(context.appConnection);
+          await service.createIsolate(
+              context.appConnection, globalLoadStrategy);
           await eventsDone;
           expect((await service.getVM()).isolates!.first.id,
               isNot(initialIsolateId));

dwds/test/fixtures/context.dart

@@ -90,6 +90,13 @@ class TestContext {
         ),
       );
 
+  /// The package URI of the Dart entry file, e.g,
+  /// "org-dartlang-app:example/hello_world/main.dart":
+  Uri get _dartEntryFilePackageUri => Uri.parse('org-dartlang-app:///${p.join(
+        project.webAssetsPath,
+        project.dartEntryFileName,
+      )}');
+
   /// The URI for the package_config.json is located in:
   /// <project directory>/.dart_tool/package_config
   Uri get _packageConfigFile =>
@@ -284,6 +291,7 @@ class TestContext {
               assetHandler,
               reloadConfiguration,
               assetReader,
+              _dartEntryFilePackageUri,
             ).strategy;
 
             buildResults = daemonClient.buildResults;
@@ -328,14 +336,14 @@ class TestContext {
             basePath = webRunner.devFS.assetServer.basePath;
             assetReader = webRunner.devFS.assetServer;
             _assetHandler = webRunner.devFS.assetServer.handleRequest;
-
             requireStrategy = FrontendServerRequireStrategyProvider(
-                    reloadConfiguration,
-                    assetReader,
-                    packageUriMapper,
-                    () async => {},
-                    basePath)
-                .strategy;
+              reloadConfiguration,
+              assetReader,
+              packageUriMapper,
+              () async => {},
+              basePath,
+              _dartEntryFilePackageUri,
+            ).strategy;
 
             buildResults = const Stream<BuildResults>.empty();
           }

dwds/test/fixtures/fakes.dart

@@ -163,6 +163,7 @@ class FakeWebkitDebugger implements WebkitDebugger {
       (String _) => '',
       (MetadataProvider _) async => <String, ModuleInfo>{},
       FakeAssetReader(),
+      Uri.parse('package:fakeapp/main.dart'),
     );
   }
 
@@ -304,6 +305,9 @@ class FakeStrategy implements LoadStrategy {
   @override
   String get loadModuleSnippet => '';
 
+  @override
+  Uri? get appEntrypoint => Uri.parse('package:myapp/main.dart');
+
   @override
   ReloadConfiguration get reloadConfiguration => ReloadConfiguration.none;
 

dwds/test/inspector_test.dart

@@ -173,6 +173,10 @@ void main() {
       objectId = instance.objectId!;
     });
 
+    test('expect rootLib to be the main.dart file', () {
+      expect(inspector.isolate.rootLib?.uri, equals(url));
+    });
+
     test('invoke top-level private', () async {
       final remote = await inspector.invoke(bootstrapLibrary!.id!,
           '_libraryPrivateFunction', [dartIdFor(2), dartIdFor(3)]);

webdev/lib/src/serve/webdev_server.dart

@@ -125,8 +125,13 @@ class WebDevServer {
       );
 
       var loadStrategy = BuildRunnerRequireStrategyProvider(
-              assetHandler, options.configuration.reload, assetReader)
-          .strategy;
+        assetHandler,
+        options.configuration.reload,
+        assetReader,
+        // TODO(https://github.com/flutter/devtools/issues/5350): Figure out how
+        // to determine the app's entrypoint:
+        /* appEntrypoint */ null,
+      ).strategy;
       if (options.configuration.enableExpressionEvaluation) {
         ddcService = ExpressionCompilerService(
           options.configuration.hostname,