Skip to content

fix: Await sendWebSocketMessage promise #3608

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
Aug 25, 2025
Merged

fix: Await sendWebSocketMessage promise #3608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94f9262
fix: Await sendWebSocketMessage promise
FrederikBolding Aug 25, 2025
9b0e8f3
Tweak mock functions
FrederikBolding Aug 25, 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
6 changes: 3 additions & 3 deletions packages/snaps-rpc-methods/src/permitted/sendWebSocketMessage.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe('snap_sendWebSocketMessage', () => {
it('throws if the origin does not have permission', async () => {
const { implementation } = sendWebSocketMessageHandler;

const sendWebSocketMessage = jest.fn();
const sendWebSocketMessage = jest.fn().mockResolvedValue(undefined);
const hasPermission = jest.fn().mockReturnValue(false);
const hooks = { hasPermission, sendWebSocketMessage };

Expand Down Expand Up @@ -63,7 +63,7 @@ describe('snap_sendWebSocketMessage', () => {
it('throws if invalid parameters are passed', async () => {
const { implementation } = sendWebSocketMessageHandler;

const sendWebSocketMessage = jest.fn();
const sendWebSocketMessage = jest.fn().mockResolvedValue(undefined);
const hasPermission = jest.fn().mockReturnValue(true);
const hooks = { hasPermission, sendWebSocketMessage };

Expand Down Expand Up @@ -103,7 +103,7 @@ describe('snap_sendWebSocketMessage', () => {
it('sends a WebSocket message and returns null', async () => {
const { implementation } = sendWebSocketMessageHandler;

const sendWebSocketMessage = jest.fn();
const sendWebSocketMessage = jest.fn().mockResolvedValue(undefined);
const hasPermission = jest.fn().mockReturnValue(true);
const hooks = { hasPermission, sendWebSocketMessage };

Expand Down
8 changes: 4 additions & 4 deletions packages/snaps-rpc-methods/src/permitted/sendWebSocketMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const hookNames: MethodHooksObject<SendWebSocketMessageMethodHooks> = {

export type SendWebSocketMessageMethodHooks = {
hasPermission: (permissionName: string) => boolean;
sendWebSocketMessage: (id: string, data: string | number[]) => void;
sendWebSocketMessage: (id: string, data: string | number[]) => Promise<void>;
};

const SendWebSocketMessageParametersStruct = object({
Expand Down Expand Up @@ -66,13 +66,13 @@ export const sendWebSocketMessageHandler: PermittedHandlerExport<
* @param hooks.sendWebSocketMessage - The function to send a WebSocket message.
* @returns Nothing.
*/
function sendWebSocketMessageImplementation(
async function sendWebSocketMessageImplementation(
req: JsonRpcRequest<SendWebSocketMessageParameters>,
res: PendingJsonRpcResponse<SendWebSocketMessageResult>,
_next: unknown,
end: JsonRpcEngineEndCallback,
{ hasPermission, sendWebSocketMessage }: SendWebSocketMessageMethodHooks,
): void {
): Promise<void> {
if (!hasPermission(SnapEndowments.NetworkAccess)) {
return end(providerErrors.unauthorized());
}
Expand All @@ -81,7 +81,7 @@ function sendWebSocketMessageImplementation(

try {
const { id, message } = getValidatedParams(params);
sendWebSocketMessage(id, message);
await sendWebSocketMessage(id, message);
res.result = null;
} catch (error) {
return end(error);
Expand Down
Loading