Skip to content
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

Jump to bottom

Fix a race condition preventing embedded compiler to shutdown after a protocol error #2106

Merged
merged 3 commits into from
Oct 5, 2023
Merged

Fix a race condition preventing embedded compiler to shutdown after a protocol error #2106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6de7bc7
Fix a race condition preventing embedded compiler to shutdown after a…
ntkme Oct 4, 2023
f78288d
Add a CHANGELOG entry
nex3 Oct 4, 2023
024a054
Clarify changelog
nex3 Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
* Deprecate `Deprecation.calcInterp` since it was never actually emitted as a
deprecation.

### Embedded Sass

* Fix a rare race condition where the embedded compiler could freeze when a
protocol error was immediately followed by another request.

## 1.68.0

* Fix the source spans associated with the `abs-percent` deprecation.
Expand Down
14 changes: 12 additions & 2 deletions lib/src/embedded/dispatcher.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,17 @@ final class Dispatcher {
_send(OutboundMessage()..logEvent = event);

/// Sends [error] to the host.
void sendError(ProtocolError error) =>
///
/// This is used during compilation by other classes like host callable.
/// Therefore it must set _requestError = true to prevent sending a CompileFailure after
/// sending a ProtocolError.
void sendError(ProtocolError error) {
_sendError(error);
_requestError = true;
}

/// Sends [error] to the host.
void _sendError(ProtocolError error) =>
_send(OutboundMessage()..error = error);

InboundMessage_CanonicalizeResponse sendCanonicalizeRequest(
Expand Down Expand Up @@ -323,7 +333,7 @@ final class Dispatcher {
/// The [messageId] indicate the IDs of the message being responded to, if
/// available.
void _handleError(Object error, StackTrace stackTrace, {int? messageId}) {
sendError(handleError(error, stackTrace, messageId: messageId));
_sendError(handleError(error, stackTrace, messageId: messageId));
}

/// Sends [message] to the host with the given [wireId].
Expand Down