Skip to content

fix: Show different error message for cancelled requests when Snap is stopped #3518

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 2 commits into from
Jul 1, 2025
Merged

fix: Show different error message for cancelled requests when Snap is stopped #3518

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8c0082
fix: Show different error message for cancelled requests when Snap is…
FrederikBolding Jul 1, 2025
fc55b9d
Tweak error message
FrederikBolding Jul 1, 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
2 changes: 1 addition & 1 deletion 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 @@ -1947,7 +1947,7 @@ describe('SnapController', () => {
expect(results[0].status).toBe('fulfilled');
expect(results[1].status).toBe('rejected');
expect((results[1] as PromiseRejectedResult).reason.message).toBe(
`${snap.id} failed to respond to the request in time.`,
`${snap.id} has been stopped and the request was cancelled.`,
);

snapController.destroy();
Expand Down
8 changes: 7 additions & 1 deletion packages/snaps-controllers/src/snaps/SnapController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3642,7 +3642,13 @@ export class SnapController extends BaseController<
const result = await withTimeout(handleRpcRequestPromise, timer);

if (result === hasTimedOut) {
throw new Error(`${snapId} failed to respond to the request in time.`);
const stopping =
runtime.stopPromise !== null || !this.isRunning(snapId);
throw new Error(
stopping
? `${snapId} has been stopped and the request was cancelled.`
: `${snapId} failed to respond to the request in time.`,
);
}

await this.#assertSnapRpcResponse(snapId, handlerType, result);
Expand Down
Loading