[ DDS ] Refactor DDS entrypoint to allow for overriding behavior in google3

This moves the CLI logic into lib/src/dds_cli_entrypoint.dart so it can
be invoked by a custom google3 entrypoint (bin/dds.dart can't be
imported using a package: URI).

Since google3 will be able to perform some custom configuration of DDS,
google3 related logic (e.g., `BazelUriConverter`) is also removed. This
is technically a breaking change, but should be safe as this
functionality isn't currently being used.

Change-Id: I54d8a9927ff2df70e013ca5c8bc1d510b0b95f02
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/371520
Reviewed-by: Derek Xu <[email protected]>
Commit-Queue: Derek Xu <[email protected]>
Auto-Submit: Ben Konyi <[email protected]>

Author: bkonyi

pkg/dds/bin/dds.dart

@@ -2,147 +2,11 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:dds/dds.dart';
-import 'package:dds/src/arg_parser.dart';
-import 'package:dds/src/bazel_uri_converter.dart';
-
-import 'package:path/path.dart' as path;
-
-Uri _getDevToolsAssetPath() {
-  final dartDir = File(Platform.resolvedExecutable).parent.path;
-  final fullSdk = dartDir.endsWith('bin');
-  return Uri.file(
-    fullSdk
-        ? path.absolute(
-            dartDir,
-            'resources',
-            'devtools',
-          )
-        : path.absolute(
-            dartDir,
-            'devtools',
-          ),
-  );
-}
+import 'package:dds/src/dds_cli_entrypoint.dart';
 
 Future<void> main(List<String> args) async {
-  final argParser = DartDevelopmentServiceOptions.createArgParser(
-    includeHelp: true,
-  );
-  final argResults = argParser.parse(args);
-  if (args.isEmpty || argResults.wasParsed('help')) {
-    print('''
-Starts a Dart Development Service (DDS) instance.
-
-Usage:
-${argParser.usage}
-    ''');
-    return;
-  }
-
-  // This URI is provided by the VM service directly so don't bother doing a
-  // lookup.
-  final remoteVmServiceUri = Uri.parse(
-    argResults[DartDevelopmentServiceOptions.vmServiceUriOption],
-  );
-
-  // Resolve the address which is potentially provided by the user.
-  late InternetAddress address;
-  final bindAddress =
-      argResults[DartDevelopmentServiceOptions.bindAddressOption];
-  try {
-    final addresses = await InternetAddress.lookup(bindAddress);
-    // Prefer IPv4 addresses.
-    for (int i = 0; i < addresses.length; i++) {
-      address = addresses[i];
-      if (address.type == InternetAddressType.IPv4) break;
-    }
-  } on SocketException catch (e, st) {
-    writeErrorResponse('Invalid bind address: $bindAddress', st);
-    return;
-  }
-
-  final portString = argResults[DartDevelopmentServiceOptions.bindPortOption];
-  int port;
-  try {
-    port = int.parse(portString);
-  } on FormatException catch (e, st) {
-    writeErrorResponse('Invalid port: $portString', st);
-    return;
-  }
-  final serviceUri = Uri(
-    scheme: 'http',
-    host: address.address,
-    port: port,
-  );
-  final disableServiceAuthCodes =
-      argResults[DartDevelopmentServiceOptions.disableServiceAuthCodesFlag];
-
-  final serveDevTools =
-      argResults[DartDevelopmentServiceOptions.serveDevToolsFlag];
-  final devToolsServerAddressStr =
-      argResults[DartDevelopmentServiceOptions.devToolsServerAddressOption];
-  Uri? devToolsBuildDirectory;
-  final devToolsServerAddress = devToolsServerAddressStr == null
-      ? null
-      : Uri.parse(devToolsServerAddressStr);
-  if (serveDevTools) {
-    devToolsBuildDirectory = _getDevToolsAssetPath();
-  }
-  final enableServicePortFallback =
-      argResults[DartDevelopmentServiceOptions.enableServicePortFallbackFlag];
-  final cachedUserTags =
-      argResults[DartDevelopmentServiceOptions.cachedUserTagsOption];
-  final google3WorkspaceRoot =
-      argResults[DartDevelopmentServiceOptions.google3WorkspaceRootOption];
-
-  try {
-    final dds = await DartDevelopmentService.startDartDevelopmentService(
-      remoteVmServiceUri,
-      serviceUri: serviceUri,
-      enableAuthCodes: !disableServiceAuthCodes,
-      ipv6: address.type == InternetAddressType.IPv6,
-      devToolsConfiguration: serveDevTools && devToolsBuildDirectory != null
-          ? DevToolsConfiguration(
-              enable: serveDevTools,
-              customBuildDirectoryPath: devToolsBuildDirectory,
-              devToolsServerAddress: devToolsServerAddress,
-            )
-          : null,
-      enableServicePortFallback: enableServicePortFallback,
-      cachedUserTags: cachedUserTags,
-      uriConverter: google3WorkspaceRoot != null
-          ? BazelUriConverter(google3WorkspaceRoot).uriToPath
-          : null,
-    );
-    final dtdInfo = dds.hostedDartToolingDaemon;
-    stderr.write(json.encode({
-      'state': 'started',
-      'ddsUri': dds.uri.toString(),
-      if (dds.devToolsUri != null) 'devToolsUri': dds.devToolsUri.toString(),
-      if (dtdInfo != null)
-        'dtd': {
-          'uri': dtdInfo.uri,
-        },
-    }));
-    stderr.close();
-  } catch (e, st) {
-    writeErrorResponse(e, st);
-  } finally {
-    // Always close stderr to notify tooling that DDS has finished writing
-    // launch details.
-    await stderr.close();
-  }
-}
-
-void writeErrorResponse(Object e, StackTrace st) {
-  stderr.write(json.encode({
-    'state': 'error',
-    'error': '$e',
-    'stacktrace': '$st',
-    if (e is DartDevelopmentServiceException) 'ddsExceptionDetails': e.toJson(),
-  }));
+  // This level of indirection is only here so DDS can be configured for
+  // google3 specific functionality as it's not possible to import files under
+  // a package's bin directory to wrap the entrypoint.
+  await runDartDevelopmentServiceFromCLI(args);
 }

pkg/dds/lib/src/arg_parser.dart

@@ -16,7 +16,6 @@ abstract class DartDevelopmentServiceOptions {
   static const enableServicePortFallbackFlag = 'enable-service-port-fallback';
   static const cachedUserTagsOption = 'cached-user-tags';
   static const devToolsServerAddressOption = 'devtools-server-address';
-  static const google3WorkspaceRootOption = 'google3-workspace-root';
 
   static ArgParser createArgParser({
     int? usageLineLength,
@@ -78,12 +77,6 @@ abstract class DartDevelopmentServiceOptions {
         help: 'A set of UserTag names used to determine which CPU samples are '
             'cached by DDS.',
         defaultsTo: <String>[],
-      )
-      ..addOption(
-        google3WorkspaceRootOption,
-        help: 'Sets the Google3 workspace root used for google3:// URI '
-            'resolution.',
-        hide: !verbose,
       );
     if (includeHelp) {
       argParser.addFlag('help', negatable: false);