Skip to content

Started the backend of the Dart Debug Extension if the flag is enabled. #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 15, 2019
Merged

Started the backend of the Dart Debug Extension if the flag is enabled. #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0a5249
Started the backend of the Dart Debug Extension if the flag is enabled.
Jul 12, 2019
7c15cc0
Handled null flag.
Jul 12, 2019
aeb7ba5
Handled null, removed trailing comma.
Jul 15, 2019
1c22a04
Added trailing comma.
Jul 15, 2019
a9803f1
Formatted.
Jul 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions dwds/lib/dwds.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import 'src/handlers/asset_handler.dart';
import 'src/handlers/dev_handler.dart';
import 'src/handlers/injected_handler.dart';
import 'src/servers/devtools.dart';
import 'src/servers/extension_backend.dart';

export 'src/connections/app_connection.dart' show AppConnection;
export 'src/connections/debug_connection.dart' show DebugConnection;
Expand Down Expand Up @@ -56,7 +57,11 @@ class Dwds {
@required bool serveDevTools,
@required LogWriter logWriter,
@required bool verbose,
@optional bool enableDebugExtension,
}) async {
String extensionHostname;
int extensionPort;
enableDebugExtension ??= false;
var assetHandler = AssetHandler(
assetServerPort,
applicationTarget,
Expand All @@ -66,8 +71,14 @@ class Dwds {
var cascade = Cascade();
var pipeline = const Pipeline();

pipeline =
pipeline.addMiddleware(createInjectedHandler(reloadConfiguration));
if (enableDebugExtension) {
var extensionBackend = await ExtensionBackend.start();
extensionHostname = extensionBackend.hostname;
extensionPort = extensionBackend.port;
}

pipeline = pipeline.addMiddleware(createInjectedHandler(reloadConfiguration,
extensionHostname: extensionHostname, extensionPort: extensionPort));

DevTools devTools;
if (serveDevTools) {
Expand Down
5 changes: 2 additions & 3 deletions webdev/lib/src/serve/webdev_server.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ class WebDevServer {
}

static Future<WebDevServer> start(
ServerOptions options,
Stream<BuildResults> buildResults,
) async {
ServerOptions options, Stream<BuildResults> buildResults) async {
var pipeline = const Pipeline();

if (options.configuration.logRequests) {
Expand All @@ -87,6 +85,7 @@ class WebDevServer {
reloadConfiguration: options.configuration.reload,
serveDevTools: options.configuration.debug,
verbose: options.configuration.verbose,
enableDebugExtension: options.configuration.debugExtension,
);

var hostname = options.configuration.hostname;
Expand Down