Implement lookupResolvedPackageUris and lookupPackageUris

dwds/CHANGELOG.md

@@ -1,7 +1,15 @@
-## 11.5.2-dev
+## 12.0.0-dev
 
+- Implement `lookupResolvedPackageUris` and `lookupPackageUris` vm service API.
+- Update `vm_service` version to `^7.5.0`.
+- Make `ExpressionCompilerService` infer location of `libraries.json` from
+  `sdkDir` parameter.
 - Show an alert in the Dart Debug Extension for a multi-app scenario.
 
+**Breaking changes:**
+
+- Add `sdkDir` argument to `Dwds.start` to help file resolution for sdk uris.
+
 ## 11.5.1
 
 - Update SDK contraint to `>=2.15.0 <3.0.0`.

dwds/lib/dwds.dart

@@ -24,6 +24,7 @@ import 'src/readers/asset_reader.dart';
 import 'src/servers/devtools.dart';
 import 'src/servers/extension_backend.dart';
 import 'src/services/expression_compiler.dart';
+import 'src/utilities/dart_uri.dart';
 
 export 'src/connections/app_connection.dart' show AppConnection;
 export 'src/connections/debug_connection.dart' show DebugConnection;
@@ -111,6 +112,7 @@ class Dwds {
     bool spawnDds,
     bool enableDevtoolsLaunch,
     DevtoolsLauncher devtoolsLauncher,
+    Uri sdkDir,
   }) async {
     hostname ??= 'localhost';
     enableDebugging ??= true;
@@ -122,6 +124,8 @@ class Dwds {
     spawnDds ??= true;
     globalLoadStrategy = loadStrategy;
 
+    await DartUri.initialize(sdkDir: sdkDir);
+
     DevTools devTools;
     Future<String> extensionUri;
     ExtensionBackend extensionBackend;

dwds/lib/src/debugging/inspector.dart

@@ -87,11 +87,11 @@ class AppInspector extends Domain {
   Future<void> _initialize() async {
     var libraries = await libraryHelper.libraryRefs;
     isolate.rootLib = await libraryHelper.rootLib;
-
     isolate.libraries.addAll(libraries);
-    await DartUri.recordAbsoluteUris(libraries.map((lib) => lib.uri));
 
     var scripts = await scriptRefs;
+
+    await DartUri.recordAbsoluteUris(libraries.map((lib) => lib.uri));
     await DartUri.recordAbsoluteUris(scripts.map((script) => script.uri));
 
     isolate.extensionRPCs.addAll(await _getExtensionRpcs());

dwds/lib/src/services/chrome_proxy_service.dart

@@ -655,6 +655,19 @@ ${globalLoadStrategy.loadModuleSnippet}("dart_sdk").developer.invokeExtension(
     return (await _debugger).pause();
   }
 
+  @override
+  Future<UriList> lookupResolvedPackageUris(
+      String isolateId, List<String> uris) async {
+    await isInitialized;
+    return UriList(uris: uris.map(DartUri.toResolvedUri).toList());
+  }
+
+  @override
+  Future<UriList> lookupPackageUris(String isolateId, List<String> uris) async {
+    await isInitialized;
+    return UriList(uris: uris.map(DartUri.toPackageUri).toList());
+  }
+
   @override
   Future<Success> registerService(String service, String alias) async {
     return _rpcNotSupportedFuture('registerService');
@@ -1037,19 +1050,6 @@ ${globalLoadStrategy.loadModuleSnippet}("dart_sdk").developer.invokeExtension(
           String isolateId, String breakpointId, bool enable) =>
       throw UnimplementedError();
 
-  @override
-  Future<UriList> lookupPackageUris(String isolateId, List<String> uris) {
-    // TODO(https://github.com/dart-lang/webdev/issues/1446): implement.
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<UriList> lookupResolvedPackageUris(
-      String isolateId, List<String> uris) {
-    // TODO(https://github.com/dart-lang/webdev/issues/1446): implement.
-    throw UnimplementedError();
-  }
-
   /// Prevent DWDS from blocking Dart SDK rolls if changes in package:vm_service
   /// are unimplemented in DWDS.
   @override

dwds/lib/src/services/expression_compiler_service.dart

@@ -235,10 +235,8 @@ class _Compiler {
 /// Uses [_address] and [_port] to communicate and [_assetHandler] to
 /// redirect asset requests to the asset server.
 ///
-/// [_sdkRoot] is the path to the directory containing the sdk summary files,
-/// [_workerPath] is the path to the DDC worker snapshot,
-/// [_librariesPath] is the path to libraries definitions file
-/// libraries.json.
+/// [_sdkDir] is the path to the SDK installation directory.
+/// [_workerPath] is the path to the DDC worker snapshot.
 ///
 /// Users need to stop the service by calling [stop].
 class ExpressionCompilerService implements ExpressionCompiler {
@@ -248,15 +246,13 @@ class ExpressionCompilerService implements ExpressionCompiler {
   final Handler _assetHandler;
   final bool _verbose;
 
-  final String _sdkRoot;
-  final String _librariesPath;
+  final String _sdkDir;
   final String _workerPath;
 
   ExpressionCompilerService(
       this._address, this._port, this._assetHandler, this._verbose,
-      {String sdkRoot, String librariesPath, String workerPath})
-      : _sdkRoot = sdkRoot,
-        _librariesPath = librariesPath,
+      {String sdkDir, String workerPath})
+      : _sdkDir = sdkDir,
         _workerPath = workerPath;
 
   @override
@@ -277,16 +273,14 @@ class ExpressionCompilerService implements ExpressionCompiler {
     if (_compiler.isCompleted) return;
     soundNullSafety ??= false;
 
-    final executable = Platform.resolvedExecutable;
-    final binDir = p.dirname(executable);
-    final sdkDir = p.dirname(binDir);
+    final binDir = p.dirname(Platform.resolvedExecutable);
+    var sdkDir = _sdkDir ?? p.dirname(binDir);
 
-    var sdkRoot = _sdkRoot ?? p.join(sdkDir, 'lib', '_internal');
+    var sdkSummaryRoot = p.join(sdkDir, 'lib', '_internal');
     var sdkSummaryPath = soundNullSafety
-        ? p.join(sdkRoot, 'ddc_outline_sound.dill')
-        : p.join(sdkRoot, 'ddc_sdk.dill');
-    var librariesPath =
-        _librariesPath ?? p.join(sdkDir, 'lib', 'libraries.json');
+        ? p.join(sdkSummaryRoot, 'ddc_outline_sound.dill')
+        : p.join(sdkSummaryRoot, 'ddc_sdk.dill');
+    var librariesPath = p.join(sdkDir, 'lib', 'libraries.json');
     var workerPath =
         _workerPath ?? p.join(binDir, 'snapshots', 'dartdevc.dart.snapshot');