Skip to content

fix: Destroying execution environment streams should emit events #3074

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
FrederikBolding merged 4 commits into from
Aug 5, 2025
Merged

fix: Destroying execution environment streams should emit events #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06b355d
fix: Destroying execution environment streams should emit events
FrederikBolding Feb 6, 2025
81cb567
Try end
FrederikBolding Aug 5, 2025
dda727b
More tweaks
FrederikBolding Aug 5, 2025
87a111b
Add back destroyed check
FrederikBolding Aug 5, 2025
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
9 changes: 5 additions & 4 deletions packages/snaps-controllers/src/services/AbstractExecutionService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,9 @@ export abstract class AbstractExecutionService<WorkerType>

Object.values(job.streams).forEach((stream) => {
try {
!stream.destroyed && stream.destroy();
stream.removeAllListeners();
if (!stream.destroyed) {
stream.destroy();
}
} catch (error) {
logError('Error while destroying stream', error);
}
Expand Down Expand Up @@ -226,7 +227,7 @@ export abstract class AbstractExecutionService<WorkerType>
streams.command,
jsonRpcConnection.stream,
(error) => {
if (error) {
if (error && !error.message?.match('Premature close')) {
logError(`Command stream failure.`, error);
}
},
Expand Down Expand Up @@ -496,7 +497,7 @@ export function setupMultiplex(
): ObjectMultiplex {
const mux = new ObjectMultiplex();
pipeline(connectionStream, mux, connectionStream, (error) => {
if (error) {
if (error && !error.message?.match('Premature close')) {
logError(`"${streamName}" stream failure.`, error);
}
});
Expand Down
4 changes: 2 additions & 2 deletions packages/snaps-controllers/src/snaps/SnapController.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1661,7 +1661,7 @@ describe('SnapController', () => {
engine.push(middleware);
const providerStream = createEngineStream({ engine });
pipeline(stream, providerStream, stream, (error) => {
if (error) {
if (error && !error.message?.match('Premature close')) {
logError(`Provider stream failure.`, error);
}
});
Expand Down Expand Up @@ -1736,7 +1736,7 @@ describe('SnapController', () => {
engine.push(middleware);
const providerStream = createEngineStream({ engine });
pipeline(stream, providerStream, stream, (error) => {
if (error) {
if (error && !error.message?.match('Premature close')) {
logError(`Provider stream failure.`, error);
}
});
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-controllers/src/test-utils/execution-environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const getNodeEES = (
});
const providerStream = createEngineStream({ engine });
pipeline(stream, providerStream, stream, (error) => {
if (error) {
if (error && !error.message?.match('Premature close')) {
logError(`Provider stream failure.`, error);
}
});
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-controllers/src/test-utils/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const createService = <
});
const providerStream = createEngineStream({ engine });
pipeline(stream, providerStream, stream, (error) => {
if (error) {
if (error && !error.message?.match('Premature close')) {
logError(`Provider stream failure.`, error);
}
});
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ export class BaseSnapExecutor {

const multiplex = new ObjectMultiplex();
pipeline(this.rpcStream, multiplex, this.rpcStream, (error) => {
if (error) {
if (error && !error.message?.match('Premature close')) {
logError(`Provider stream failure.`, error);
}
});
Expand Down
4 changes: 2 additions & 2 deletions packages/snaps-simulation/src/simulation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,8 @@ export async function installSnap<

// Error function is difficult to test, so we ignore it.
/* istanbul ignore next 2 */
pipeline(stream, providerStream, stream, (error: unknown) => {
if (error) {
pipeline(stream, providerStream, stream, (error) => {
if (error && !error.message?.match('Premature close')) {
logError(`Provider stream failure.`, error);
}
});
Expand Down
Loading