1+ import { errorMessage } from "@/util/error"
2+
13type Definition = {
24 [ method : string ] : ( input : any ) => any
35}
46
57export function listen ( rpc : Definition ) {
68 onmessage = async ( evt ) => {
79 const parsed = JSON . parse ( evt . data )
8- if ( parsed . type === "rpc.request" ) {
9- const result = await rpc [ parsed . method ] ( parsed . input )
10- postMessage ( JSON . stringify ( { type : "rpc.result" , result, id : parsed . id } ) )
11- }
10+ if ( parsed . type !== "rpc.request" ) return
11+ // A request that throws must still be answered, or its caller waits forever.
12+ const reply = await Promise . resolve ( )
13+ . then ( ( ) => rpc [ parsed . method ] ( parsed . input ) )
14+ . then ( ( result ) => JSON . stringify ( { type : "rpc.result" , result, id : parsed . id } ) )
15+ . catch ( ( error ) => JSON . stringify ( { type : "rpc.result" , error : failureMessage ( error ) , id : parsed . id } ) )
16+ postMessage ( reply )
1217 }
1318}
1419
20+ // Some failures keep their text on the cause: a taken --port rejects with an empty ServeError.
21+ function failureMessage ( error : unknown ) : string {
22+ if ( error instanceof Error && ! error . message && error . cause ) return failureMessage ( error . cause )
23+ return errorMessage ( error )
24+ }
25+
1526export function emit ( event : string , data : unknown ) {
1627 postMessage ( JSON . stringify ( { type : "rpc.event" , event, data } ) )
1728}
@@ -20,17 +31,17 @@ export function client<T extends Definition>(target: {
2031 postMessage : ( data : string ) => void | null
2132 onmessage : ( ( this : Worker , ev : MessageEvent < any > ) => any ) | null
2233} ) {
23- const pending = new Map < number , ( result : any ) => void > ( )
34+ const pending = new Map < number , { resolve : ( result : any ) => void ; reject : ( error : Error ) => void } > ( )
2435 const listeners = new Map < string , Set < ( data : any ) => void > > ( )
2536 let id = 0
2637 target . onmessage = async ( evt ) => {
2738 const parsed = JSON . parse ( evt . data )
2839 if ( parsed . type === "rpc.result" ) {
29- const resolve = pending . get ( parsed . id )
30- if ( resolve ) {
31- resolve ( parsed . result )
32- pending . delete ( parsed . id )
33- }
40+ const request = pending . get ( parsed . id )
41+ if ( ! request ) return
42+ pending . delete ( parsed . id )
43+ if ( typeof parsed . error === "string" ) return request . reject ( new Error ( parsed . error ) )
44+ return request . resolve ( parsed . result )
3445 }
3546 if ( parsed . type === "rpc.event" ) {
3647 const handlers = listeners . get ( parsed . event )
@@ -44,8 +55,8 @@ export function client<T extends Definition>(target: {
4455 return {
4556 call < Method extends keyof T > ( method : Method , input : Parameters < T [ Method ] > [ 0 ] ) : Promise < ReturnType < T [ Method ] > > {
4657 const requestId = id ++
47- return new Promise ( ( resolve ) => {
48- pending . set ( requestId , resolve )
58+ return new Promise ( ( resolve , reject ) => {
59+ pending . set ( requestId , { resolve, reject } )
4960 target . postMessage ( JSON . stringify ( { type : "rpc.request" , method, input, id : requestId } ) )
5061 } )
5162 } ,
0 commit comments