DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't fail when hot restarting web-server and there are no connected clients (#174600)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/173971
This commit is contained in:
Mouad Debbar 2025-08-28 15:47:03 -04:00 committed by GitHub
parent e3d120bea0
commit 2edf7786fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter_tools/lib/src/isolated/resident_web_runner.dart
View File

@ -486,6 +486,12 @@ class ResidentWebRunner extends ResidentRunner {
}
}
if (_connectionResult == null) {
status.stop();
_logger.printStatus('Recompile complete. No client connected..');
return OperationResult.ok;
}
// Both will be null when not assigned.
Duration? reloadDuration;
Duration? reassembleDuration;

52
packages/flutter_tools/test/general.shard/resident_web_runner_test.dart
View File

@ -12,6 +12,7 @@ import 'package:flutter_tools/src/application_package.dart';
import 'package:flutter_tools/src/asset.dart';
import 'package:flutter_tools/src/base/dds.dart';
import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/base/platform.dart';
import 'package:flutter_tools/src/base/terminal.dart';
@ -970,7 +971,7 @@ name: my_app
expect(debugConnectionInfo, isNotNull);
final OperationResult result = await residentWebRunner.restart();
expect(logger.statusText, contains('Reloaded application in'));
expect(logger.statusText, contains('Recompile complete. No client connected.'));
expect(result.code, 0);
},
overrides: <Type, Generator>{
@ -1142,6 +1143,47 @@ name: my_app
},
);
testUsingContext(
'Does not fail hot restart when not attached',
() async {
final logger = BufferLogger.test();
final ResidentRunner residentWebRunner = setUpResidentRunner(
flutterDevice,
logger: logger,
systemClock: SystemClock.fixed(DateTime(2001)),
);
fakeVmServiceHost = FakeVmServiceHost(
requests: <VmServiceExpectation>[
...kAttachExpectations,
const FakeVmServiceRequest(method: 'hotRestart'),
],
);
flutterDevice.device = WebServerDevice(logger: logger);
webDevFS.report = UpdateFSReport(success: true);
final appStartedCompleter = Completer<void>();
unawaited(residentWebRunner.run(appStartedCompleter: appStartedCompleter));
await appStartedCompleter.future;
late final OperationResult result;
await expectReturnsNormallyLater(() async {
result = await residentWebRunner.restart(fullRestart: true);
}());
expect(result.code, 0);
expect(result.isOk, isTrue);
expect(logger.statusText, contains('Recompile complete. No client connected.'));
},
overrides: <Type, Generator>{
Analytics: () => fakeAnalytics,
FileSystem: () => fileSystem,
ProcessManager: () => processManager,
Pub: ThrowingPub.new,
},
);
testUsingContext(
'web resident runner is debuggable',
() {
@ -2054,6 +2096,8 @@ class FakeResidentCompiler extends Fake implements ResidentCompiler {
class FakeWebDevFS extends Fake implements WebDevFS {
Object? exception;
final resultCompleter = Completer<ConnectionResult?>();
ConnectionResult? result;
late UpdateFSReport report;
@ -2112,7 +2156,11 @@ class FakeWebDevFS extends Fake implements WebDevFS {
// ignore: only_throw_errors, exception is either Error or Exception here.
throw exception!;
}
return result;
// Automatically complete the future if a non-null result has been set.
if (result != null) {
resultCompleter.complete(result);
}
return resultCompleter.future;
}
}