Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 13 additions & 8 deletions dwds/lib/dwds.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,23 @@ class Dwds {
}

static Future<Dwds> start({
@required String hostname,
@required int applicationPort,
@required int assetServerPort,
@required String applicationTarget,
@required ReloadConfiguration reloadConfiguration,
@required Stream<BuildResult> buildResults,
@required ConnectionProvider chromeConnection,
@required bool serveDevTools,
@required LogWriter logWriter,
@required bool verbose,
@optional bool enableDebugExtension,
String hostname,
ReloadConfiguration reloadConfiguration,
bool serveDevTools,
LogWriter logWriter,
bool verbose,
bool enableDebugExtension,
}) async {
String extensionHostname;
int extensionPort;
hostname ??= 'localhost';
reloadConfiguration ??= ReloadConfiguration.none;
serveDevTools ??= false;
logWriter ??= (level, message) => print(message);
verbose ??= false;
enableDebugExtension ??= false;
var assetHandler = AssetHandler(
assetServerPort,
Expand All @@ -71,6 +74,8 @@ class Dwds {
var cascade = Cascade();
var pipeline = const Pipeline();

String extensionHostname;
int extensionPort;
if (enableDebugExtension) {
var extensionBackend = await ExtensionBackend.start();
extensionHostname = extensionBackend.hostname;
Expand Down
3 changes: 0 additions & 3 deletions dwds/test/fixtures/context.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,9 @@ class TestContext {
var connection = ChromeConnection('localhost', debugPort);

testServer = await TestServer.start(
'localhost',
port,
daemonPort(workingDirectory),
pathToServe,
ReloadConfiguration.none,
false,
daemonClient.buildResults,
() async => connection,
);
Expand Down
8 changes: 1 addition & 7 deletions dwds/test/fixtures/server.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,9 @@ class TestServer {
}

static Future<TestServer> start(
String hostname,
int port,
int assetServerPort,
String target,
ReloadConfiguration reload,
bool startDevTools,
Stream<BuildResults> buildResults,
Future<ChromeConnection> Function() chromeConnection,
) async {
Expand All @@ -56,19 +53,16 @@ class TestServer {
results.results.firstWhere((result) => result.target == target));

var dwds = await Dwds.start(
hostname: hostname,
applicationPort: port,
applicationTarget: target,
assetServerPort: assetServerPort,
buildResults: filteredBuildResults,
chromeConnection: chromeConnection,
logWriter: (level, message) => printOnFailure(message),
reloadConfiguration: reload,
serveDevTools: startDevTools,
verbose: true,
);

var server = await HttpMultiServer.bind(hostname, port);
var server = await HttpMultiServer.bind('localhost', port);
shelf_io.serveRequests(server, pipeline.addHandler(dwds.handler));
return TestServer._(
target,
Expand Down