Support lazily created SDK configurations.

dwds/lib/dwds.dart

@@ -24,7 +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';
+import 'src/utilities/sdk_configuration.dart';
 
 export 'src/connections/app_connection.dart' show AppConnection;
 export 'src/connections/debug_connection.dart' show DebugConnection;
@@ -50,6 +50,8 @@ export 'src/services/expression_compiler.dart'
     show ExpressionCompilationResult, ExpressionCompiler, ModuleInfo;
 export 'src/services/expression_compiler_service.dart'
     show ExpressionCompilerService;
+export 'src/utilities/sdk_configuration.dart'
+    show SdkConfiguration, SdkConfigurationProvider;
 
 typedef ConnectionProvider = Future<ChromeConnection> Function();
 typedef UrlEncoder = Future<String> Function(String url);
@@ -115,8 +117,7 @@ class Dwds {
     bool enableDevtoolsLaunch,
     DevtoolsLauncher devtoolsLauncher,
     bool launchDevToolsInNewWindow,
-    Uri sdkDir,
-    Uri librariesPath,
+    SdkConfigurationProvider sdkConfigurationProvider,
     bool emitDebugEvents,
   }) async {
     hostname ??= 'localhost';
@@ -131,7 +132,7 @@ class Dwds {
     globalLoadStrategy = loadStrategy;
     emitDebugEvents ??= true;
 
-    await DartUri.initialize(sdkDir: sdkDir, librariesPath: librariesPath);
+    sdkConfigurationProvider ??= DefaultSdkConfigurationProvider();
 
     DevTools devTools;
     Future<String> extensionUri;
@@ -188,6 +189,7 @@ class Dwds {
       injected,
       spawnDds,
       launchDevToolsInNewWindow,
+      sdkConfigurationProvider,
     );
 
     return Dwds._(

dwds/lib/src/debugging/inspector.dart

@@ -17,6 +17,7 @@ import '../readers/asset_reader.dart';
 import '../utilities/conversions.dart';
 import '../utilities/dart_uri.dart';
 import '../utilities/domain.dart';
+import '../utilities/sdk_configuration.dart';
 import '../utilities/shared.dart';
 import 'classes.dart';
 import 'debugger.dart';
@@ -64,6 +65,7 @@ class AppInspector extends Domain {
 
   /// The root URI from which the application is served.
   final String _root;
+  final SdkConfiguration _sdkConfiguration;
 
   AppInspector._(
     this.appConnection,
@@ -77,6 +79,7 @@ class AppInspector extends Domain {
     this._locations,
     this._root,
     this._executionContext,
+    this._sdkConfiguration,
   )   : isolateRef = _toIsolateRef(isolate),
         super.forInspector();
 
@@ -91,6 +94,7 @@ class AppInspector extends Domain {
 
     var scripts = await scriptRefs;
 
+    await DartUri.initialize(_sdkConfiguration);
     await DartUri.recordAbsoluteUris(libraries.map((lib) => lib.uri));
     await DartUri.recordAbsoluteUris(scripts.map((script) => script.uri));
 
@@ -112,6 +116,7 @@ class AppInspector extends Domain {
     String root,
     Debugger debugger,
     ExecutionContext executionContext,
+    SdkConfiguration sdkConfiguration,
   ) async {
     var id = createId();
     var time = DateTime.now().millisecondsSinceEpoch;
@@ -156,6 +161,7 @@ class AppInspector extends Domain {
       locations,
       root,
       executionContext,
+      sdkConfiguration,
     );
     await appInspector._initialize();
     return appInspector;

dwds/lib/src/handlers/dev_handler.dart

@@ -66,6 +66,7 @@ class DevHandler {
   final bool _launchDevToolsInNewWindow;
   final ExpressionCompiler _expressionCompiler;
   final DwdsInjector _injected;
+  final SdkConfigurationProvider _sdkConfigurationProvider;
 
   /// Null until [close] is called.
   ///
@@ -75,21 +76,23 @@ class DevHandler {
   Stream<AppConnection> get connectedApps => _connectedApps.stream;
 
   DevHandler(
-      this._chromeConnection,
-      this.buildResults,
-      this._devTools,
-      this._assetReader,
-      this._loadStrategy,
-      this._hostname,
-      this._extensionBackend,
-      this._urlEncoder,
-      this._useSseForDebugProxy,
-      this._useSseForInjectedClient,
-      this._serveDevTools,
-      this._expressionCompiler,
-      this._injected,
-      this._spawnDds,
-      this._launchDevToolsInNewWindow) {
+    this._chromeConnection,
+    this.buildResults,
+    this._devTools,
+    this._assetReader,
+    this._loadStrategy,
+    this._hostname,
+    this._extensionBackend,
+    this._urlEncoder,
+    this._useSseForDebugProxy,
+    this._useSseForInjectedClient,
+    this._serveDevTools,
+    this._expressionCompiler,
+    this._injected,
+    this._spawnDds,
+    this._launchDevToolsInNewWindow,
+    this._sdkConfigurationProvider,
+  ) {
     _subs.add(buildResults.listen(_emitBuildResults));
     _listen();
     if (_extensionBackend != null) {
@@ -210,6 +213,7 @@ class DevHandler {
       useSse: false,
       expressionCompiler: _expressionCompiler,
       spawnDds: _spawnDds,
+      sdkConfigurationProvider: _sdkConfigurationProvider,
     );
   }
 
@@ -499,6 +503,7 @@ class DevHandler {
           useSse: _useSseForDebugProxy,
           expressionCompiler: _expressionCompiler,
           spawnDds: _spawnDds,
+          sdkConfigurationProvider: _sdkConfigurationProvider,
         );
         var appServices = await _createAppDebugServices(
           devToolsRequest.appId,

dwds/lib/src/services/chrome_proxy_service.dart

@@ -94,6 +94,8 @@ class ChromeProxyService implements VmServiceInterface {
   final ExpressionCompiler _compiler;
   ExpressionEvaluator _expressionEvaluator;
 
+  final SdkConfigurationProvider _sdkConfigurationProvider;
+
   bool terminatingIsolates = false;
 
   ChromeProxyService._(
@@ -106,6 +108,7 @@ class ChromeProxyService implements VmServiceInterface {
     this._skipLists,
     this.executionContext,
     this._compiler,
+    this._sdkConfigurationProvider,
   ) {
     var debugger = Debugger.create(
       remoteDebugger,
@@ -126,6 +129,7 @@ class ChromeProxyService implements VmServiceInterface {
     AppConnection appConnection,
     ExecutionContext executionContext,
     ExpressionCompiler expressionCompiler,
+    SdkConfigurationProvider sdkConfigurationProvider,
   ) async {
     final vm = VM(
       name: 'ChromeDebugProxy',
@@ -155,6 +159,7 @@ class ChromeProxyService implements VmServiceInterface {
       skipLists,
       executionContext,
       expressionCompiler,
+      sdkConfigurationProvider,
     );
     unawaited(service.createIsolate(appConnection));
     return service;
@@ -211,6 +216,7 @@ class ChromeProxyService implements VmServiceInterface {
     // Issue: https://github.com/dart-lang/webdev/issues/1282
     var debugger = await _debugger;
     await _initializeEntrypoint(appConnection.request.entrypointPath);
+    var sdkConfiguration = await _sdkConfigurationProvider.configuration;
 
     debugger.notifyPausedAtStart();
     _inspector = await AppInspector.initialize(
@@ -221,6 +227,7 @@ class ChromeProxyService implements VmServiceInterface {
       uri,
       debugger,
       executionContext,
+      sdkConfiguration,
     );
 
     _expressionEvaluator = _compiler == null
@@ -1035,6 +1042,10 @@ ${globalLoadStrategy.loadModuleSnippet}("dart_sdk").developer.invokeExtension(
           String isolateId, String breakpointId, bool enable) =>
       throw UnimplementedError();
 
+  @override
+  Future<Success> streamCpuSamplesWithUserTag(List<String> userTags) =>
+      throw UnimplementedError();
+
   /// Prevent DWDS from blocking Dart SDK rolls if changes in package:vm_service
   /// are unimplemented in DWDS.
   @override

dwds/lib/src/services/debug_service.dart

@@ -203,28 +203,32 @@ class DebugService {
   }
 
   static Future<DebugService> start(
-      String hostname,
-      RemoteDebugger remoteDebugger,
-      ExecutionContext executionContext,
-      String tabUrl,
-      AssetReader assetReader,
-      LoadStrategy loadStrategy,
-      AppConnection appConnection,
-      UrlEncoder urlEncoder,
-      {void Function(Map<String, dynamic>) onRequest,
-      void Function(Map<String, dynamic>) onResponse,
-      bool spawnDds = true,
-      bool useSse,
-      ExpressionCompiler expressionCompiler}) async {
+    String hostname,
+    RemoteDebugger remoteDebugger,
+    ExecutionContext executionContext,
+    String tabUrl,
+    AssetReader assetReader,
+    LoadStrategy loadStrategy,
+    AppConnection appConnection,
+    UrlEncoder urlEncoder, {
+    void Function(Map<String, dynamic>) onRequest,
+    void Function(Map<String, dynamic>) onResponse,
+    bool spawnDds = true,
+    bool useSse,
+    ExpressionCompiler expressionCompiler,
+    SdkConfigurationProvider sdkConfigurationProvider,
+  }) async {
     useSse ??= false;
     var chromeProxyService = await ChromeProxyService.create(
-        remoteDebugger,
-        tabUrl,
-        assetReader,
-        loadStrategy,
-        appConnection,
-        executionContext,
-        expressionCompiler);
+      remoteDebugger,
+      tabUrl,
+      assetReader,
+      loadStrategy,
+      appConnection,
+      executionContext,
+      expressionCompiler,
+      sdkConfigurationProvider,
+    );
     var authToken = _makeAuthToken();
     var serviceExtensionRegistry = ServiceExtensionRegistry();
     Handler handler;