publish 2.0.0-alpha.4

webdev/CHANGELOG.md

@@ -1,6 +1,8 @@
-## 2.0.0-dev
+## 2.0.0-alpha.4
 
+- Fix hot restart so it works for all build_web_compilers versions.
 - Fix an NPE is the reload logic.
+- Shutdown the daemon process when the corresponding application is closed.
 
 ## 2.0.0-alpha.3
 

webdev/lib/src/daemon/app_domain.dart

@@ -8,9 +8,9 @@ import 'dart:io';
 
 import 'package:build_daemon/data/build_status.dart';
 import 'package:dwds/service.dart';
+import 'package:pedantic/pedantic.dart';
 import 'package:vm_service_lib/vm_service_lib.dart';
 
-import '../serve/chrome.dart';
 import '../serve/debugger/app_debug_services.dart';
 import '../serve/server_manager.dart';
 import 'daemon.dart';
@@ -70,6 +70,18 @@ class AppDomain extends Domain {
       _appDebugServices = await devHandler.loadAppServices(
           connection.request.appId, connection.request.instanceId);
       _appId = connection.request.appId;
+      unawaited(_appDebugServices
+          .debugService.chromeProxyService.tabConnection.onClose.first
+          .then((_) {
+        sendEvent('app.log', {
+          'appId': _appId,
+          'log': 'Lost connection to device.',
+        });
+        sendEvent('app.stop', {
+          'appId': _appId,
+        });
+        daemon.shutdown();
+      }));
       sendEvent('app.start', {
         'appId': _appId,
         'directory': Directory.current.path,
@@ -152,9 +164,9 @@ class AppDomain extends Domain {
       'finished': true,
       'progressId': 'hot.restart',
     });
-    sendEvent('daemon.logMessage', {
-      'level': 'info',
-      'message': 'Restarted application in ${stopwatch.elapsedMilliseconds}ms'
+    sendEvent('app.log', {
+      'appId': _appId,
+      'log': 'Restarted application in ${stopwatch.elapsedMilliseconds}ms'
     });
     return {
       'code': response.type == 'Success' ? 0 : 1,
@@ -165,8 +177,8 @@ class AppDomain extends Domain {
   Future<bool> _stop(Map<String, dynamic> args) async {
     var appId = getStringArg(args, 'appId', required: true);
     if (_appId != appId) throw ArgumentError.value(appId, 'appId', 'Not found');
-    var chrome = await Chrome.connectedInstance;
-    await chrome.close();
+    await _appDebugServices.debugService.chromeProxyService.tabConnection
+        .close();
     return true;
   }
 

webdev/pubspec.yaml

@@ -1,5 +1,5 @@
 name: webdev
-version: 2.0.0-dev
+version: 2.0.0-alpha.4
 author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/dart-lang/webdev
 description: >-

webdev/test/daemon/app_domain_test.dart

@@ -111,6 +111,21 @@ void main() {
             ])));
         await exitWebdev(webdev);
       });
+
+      test('.stop', () async {
+        var webdev =
+            await runWebDev(['daemon'], workingDirectory: exampleDirectory);
+        var appId = await _getAppId(webdev);
+        var stopCall = '[{"method":"app.stop","id":0,'
+            '"params" : { "appId" : "$appId"}}]';
+        webdev.stdin.add(utf8.encode('$stopCall\n'));
+        await expectLater(
+            webdev.stdout,
+            emitsThrough(startsWith(
+                '[{"event":"app.stop","params":{"appId":"$appId"}}')));
+        // This should cause webdev to exit.
+        expect(await webdev.exitCode, equals(0));
+      });
     });
   }, tags: ['webdriver']);
 }