Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion client/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,20 @@ class GanacheWorkerProvider implements Eip1193Provider {
public request(request: Request): Promise<any> {
return new Promise((res, rej) => {
const channel = new MessageChannel();
channel.port1.onmessage = (evt) => res(evt.data);
channel.port1.onmessage = (evt) => {
const data: unknown = evt.data;
if (!data || typeof data !== "object") {
return rej();
}

if ("result" in data) {
return res(data.result);
} else if ("error" in data) {
return rej(data.error);
} else {
return rej();
}
};
channel.port1.onmessageerror = (evt) => rej(evt.data);
this.worker.postMessage(request, [channel.port2]);
});
Expand Down
8 changes: 7 additions & 1 deletion client/src/worker_chain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@ function onMessage(ganache: EthereumProvider, evt: MessageEvent): void {
// message data conforms to the JSON RPC spec.
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
.request(evt.data)
.then((response) => reply.postMessage(response))
.then((result) => reply.postMessage({ result }))
.catch((error) => {
console.error("Uncaught (in ganache worker thread)", error);
reply.postMessage({
error: {
message: String(error),
code: -32000,
},
});
});
}

Expand Down