dart-lang · annagrin · Jul 5, 2023 · Jun 26, 2023 · Jun 26, 2023 · Jun 27, 2023
diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
@@ -1,4 +1,6 @@
-## 19.0.2-wip
+## 20.0.0-wip
+
+- Allow clients to specify the `basePath` on `AssetReader`. - [#2160](https://github.com/dart-lang/webdev/pull/2160)
 
 ## 19.0.1
 

diff --git a/dwds/lib/src/handlers/dev_handler.dart b/dwds/lib/src/handlers/dev_handler.dart
@@ -23,7 +23,6 @@ import 'package:dwds/src/dwds_vm_client.dart';
 import 'package:dwds/src/events.dart';
 import 'package:dwds/src/handlers/injector.dart';
 import 'package:dwds/src/handlers/socket_connections.dart';
-import 'package:dwds/src/loaders/require.dart';
 import 'package:dwds/src/readers/asset_reader.dart';
 import 'package:dwds/src/servers/devtools.dart';
 import 'package:dwds/src/servers/extension_backend.dart';
@@ -196,7 +195,6 @@ class DevHandler {
       'localhost',
       webkitDebugger,
       executionContext,
-      basePathForServerUri(appTab.url),
       _assetReader,
       appConnection,
       _urlEncoder,
@@ -587,7 +585,6 @@ class DevHandler {
         _hostname,
         extensionDebugger,
         executionContext,
-        basePathForServerUri(tabUrl),
         _assetReader,
         connection,
         _urlEncoder,

diff --git a/dwds/lib/src/loaders/frontend_server_require.dart b/dwds/lib/src/loaders/frontend_server_require.dart
@@ -36,9 +36,8 @@ class FrontendServerRequireStrategyProvider {
     this._assetReader,
     this._packageUriMapper,
     this._digestsProvider,
-    this._basePath,
     this._appEntrypoint,
-  );
+  ) : _basePath = _assetReader.basePath;
 
   RequireStrategy get strategy => _requireStrategy;
 

diff --git a/dwds/lib/src/loaders/require.dart b/dwds/lib/src/loaders/require.dart
@@ -11,17 +11,6 @@ import 'package:dwds/src/services/expression_compiler.dart';
 import 'package:path/path.dart' as p;
 import 'package:shelf/shelf.dart';
 
-/// Find the path we are serving from the url.
-///
-/// Example:
-///   https://localhost/base/index.html => base
-///   https://localhost/base => base
-String basePathForServerUri(String url) {
-  final uri = Uri.parse(url);
-  var base = uri.path.endsWith('.html') ? p.dirname(uri.path) : uri.path;
-  return base = base.startsWith('/') ? base.substring(1) : base;
-}
-
 String removeJsExtension(String path) =>
     path.endsWith('.js') ? p.withoutExtension(path) : path;
 

diff --git a/dwds/lib/src/readers/asset_reader.dart b/dwds/lib/src/readers/asset_reader.dart
@@ -11,6 +11,18 @@ typedef UrlEncoder = Future<String> Function(String url);
 
 /// A reader for Dart sources and related source maps.
 abstract class AssetReader {
+  /// Base path of the application, for example, set up in the index file:
+  ///
+  /// ```
+  /// <html>
+  ///   <head>
+  ///     <base href="/abc/">
+  ///     <script src="main.dart.js"></script>
+  ///   </head>
+  /// </html>
+  /// ```
+  String get basePath;
+
   /// Returns the contents for a source map at the provided server path, or
   /// null if the resource does not exist.
   Future<String?> sourceMapContents(String serverPath);

diff --git a/dwds/lib/src/readers/frontend_server_asset_reader.dart b/dwds/lib/src/readers/frontend_server_asset_reader.dart
@@ -20,6 +20,7 @@ class FrontendServerAssetReader implements AssetReader {
   final File _jsonIncremental;
   final String _packageRoot;
   final Future<PackageConfig> _packageConfig;
+  final String _basePath;
 
   /// Map of Dart module server path to source map contents.
   final _mapContents = <String, String>{};
@@ -37,19 +38,25 @@ class FrontendServerAssetReader implements AssetReader {
   ///
   /// [_packageRoot] is the path to the directory that contains a
   /// `.dart_tool/package_config.json` file for the application.
-  FrontendServerAssetReader(
-    String outputPath,
-    this._packageRoot,
-  )   : _mapOriginal = File('$outputPath.map'),
+  FrontendServerAssetReader({
+    required String outputPath,
+    required String packageRoot,
+    String? basePath,
+  })  : _packageRoot = packageRoot,
+        _basePath = basePath ?? '',
+        _mapOriginal = File('$outputPath.map'),
         _mapIncremental = File('$outputPath.incremental.map'),
         _jsonOriginal = File('$outputPath.json'),
         _jsonIncremental = File('$outputPath.incremental.json'),
         _packageConfig = loadPackageConfig(
           File(
-            p.absolute(p.join(_packageRoot, '.dart_tool/package_config.json')),
+            p.absolute(p.join(packageRoot, '.dart_tool/package_config.json')),
           ),
         );
 
+  @override
+  String get basePath => _basePath;
+
   @override
   Future<String?> dartSourceContents(String serverPath) async {
     if (serverPath.endsWith('.dart')) {

diff --git a/dwds/lib/src/readers/proxy_server_asset_reader.dart b/dwds/lib/src/readers/proxy_server_asset_reader.dart
@@ -38,6 +38,9 @@ class ProxyServerAssetReader implements AssetReader {
     _handler = proxyHandler(url, client: _client);
   }
 
+  @override
+  String get basePath => '';
+
   @override
   Future<String?> dartSourceContents(String serverPath) =>
       _readResource(serverPath);

diff --git a/dwds/lib/src/services/debug_service.dart b/dwds/lib/src/services/debug_service.dart
@@ -220,7 +220,6 @@ class DebugService {
     String hostname,
     RemoteDebugger remoteDebugger,
     ExecutionContext executionContext,
-    String root,
     AssetReader assetReader,
     AppConnection appConnection,
     UrlEncoder? urlEncoder, {
@@ -230,6 +229,7 @@ class DebugService {
     bool useSse = false,
     ExpressionCompiler? expressionCompiler,
   }) async {
+    final root = assetReader.basePath;
     final chromeProxyService = await ChromeProxyService.create(
       remoteDebugger,
       root,

diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart
diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
-version: 19.0.2-wip
+version: 20.0.0-wip
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM
   service protocol.

diff --git a/dwds/test/evaluate_common.dart b/dwds/test/evaluate_common.dart
@@ -155,11 +155,15 @@ void testAll({
               scope: scope,
             );
 
-        getInstanceRef(frame, expr, {scope}) async => await evaluateInFrame(
-              frame,
-              expr,
-              scope: scope,
-            ) as InstanceRef;
+        getInstanceRef(frame, expr, {scope}) async {
+          final result = await evaluateInFrame(
+            frame,
+            expr,
+            scope: scope,
+          );
+          expect(result, isA<InstanceRef>());
+          return result as InstanceRef;
+        }
 
         getInstance(InstanceRef ref) async =>
             await context.service.getObject(isolateId, ref.id!) as Instance;
@@ -675,12 +679,15 @@ void testAll({
           libraryId,
           expr, {
           scope,
-        }) async =>
-            await evaluate(
-              libraryId,
-              expr,
-              scope: scope,
-            ) as InstanceRef;
+        }) async {
+          final result = await evaluate(
+            libraryId,
+            expr,
+            scope: scope,
+          );
+          expect(result, isA<InstanceRef>());
+          return result as InstanceRef;
+        }
 
         String getRootLibraryId() {
           expect(isolate.rootLib, isNotNull);

diff --git a/dwds/test/fixtures/context.dart b/dwds/test/fixtures/context.dart
@@ -211,6 +211,7 @@ class TestContext {
       Stream<BuildResults> buildResults;
       RequireStrategy requireStrategy;
       String basePath = '';
+      String filePathToServe = project.filePathToServe;
 
       _port = await findUnusedPort();
       switch (compilationMode) {
@@ -279,7 +280,12 @@ class TestContext {
           break;
         case CompilationMode.frontendServer:
           {
-            _logger.info('Index: ${project.filePathToServe}');
+            filePathToServe = webCompatiblePath([
+              project.directoryToServe,
+              project.filePathToServe,
+            ]);
+
+            _logger.info('Serving: $filePathToServe');
 
             final entry = p.toUri(
               p.join(project.webAssetsPath, project.dartEntryFileName),
@@ -311,7 +317,7 @@ class TestContext {
               fileSystem,
               hostname,
               assetServerPort,
-              p.join(project.directoryToServe, project.filePathToServe),
+              filePathToServe,
             );
 
             if (enableExpressionEvaluation) {
@@ -326,7 +332,6 @@ class TestContext {
               assetReader,
               packageUriMapper,
               () async => {},
-              basePath,
               project.dartEntryFilePackageUri,
             ).strategy;
 
@@ -393,8 +398,8 @@ class TestContext {
       );
 
       _appUrl = basePath.isEmpty
-          ? 'http://localhost:$port/${project.filePathToServe}'
-          : 'http://localhost:$port/$basePath/${project.filePathToServe}';
+          ? 'http://localhost:$port/$filePathToServe'
+          : 'http://localhost:$port/$basePath/$filePathToServe';
 
       if (launchChrome) {
         await _webDriver?.get(appUrl);

diff --git a/dwds/test/fixtures/fakes.dart b/dwds/test/fixtures/fakes.dart
@@ -393,6 +393,9 @@ class FakeAssetReader implements AssetReader {
         _dartSource = dartSource,
         _sourceMap = sourceMap;
 
+  @override
+  String get basePath => '';
+
   @override
   Future<String> dartSourceContents(String serverPath) {
     return _throwUnimplementedOrReturnContents(_dartSource);