@@ -871,6 +871,10 @@ describe("RequestyHandler", () => {
871871 message : "The Requesty request was aborted" ,
872872 } )
873873 expect ( chunks ) . toContainEqual ( { type : "text" , text : "first" } )
874+ // The provider must forward its own per-request signal, not the caller's signal:
875+ // the per-request controller isolates this request from the external signal.
876+ expect ( requestSignal ) . toBeInstanceOf ( AbortSignal )
877+ expect ( requestSignal ) . not . toBe ( controller . signal )
874878 } )
875879 it ( "rejects with AbortError when the stream ends normally after a mid-stream abort (swallowed AbortError)" , async ( ) => {
876880 const handler = new RequestyHandler ( mockOptions )
@@ -1030,6 +1034,30 @@ describe("RequestyHandler", () => {
10301034 removeSpy . mockRestore ( )
10311035 } )
10321036
1037+ it ( "removes the external abort listener when the stream fails without an abort" , async ( ) => {
1038+ const handler = new RequestyHandler ( mockOptions )
1039+ const controller = new AbortController ( )
1040+ const addSpy = vi . spyOn ( controller . signal , "addEventListener" )
1041+ const removeSpy = vi . spyOn ( controller . signal , "removeEventListener" )
1042+ mockCreate . mockImplementationOnce ( async ( ) => {
1043+ throw new Error ( "boom" )
1044+ } )
1045+
1046+ const metadata = makeCreateMessageMetadata ( { abortSignal : controller . signal } )
1047+ const generator = handler . createMessage ( "sys" , [ { role : "user" , content : "hi" } ] , metadata )
1048+
1049+ await expect ( collectStream ( generator ) ) . rejects . toThrow ( "boom" )
1050+
1051+ // The failure path must clean up just like the success path: the exact registered
1052+ // listener is removed even when the request rejects without any abort firing.
1053+ expect ( addSpy ) . toHaveBeenCalledTimes ( 1 )
1054+ const registeredListener = addSpy . mock . calls [ 0 ] ?. [ 1 ] as EventListener | undefined
1055+ expect ( typeof registeredListener ) . toBe ( "function" )
1056+ expect ( removeSpy ) . toHaveBeenCalledWith ( "abort" , registeredListener )
1057+ addSpy . mockRestore ( )
1058+ removeSpy . mockRestore ( )
1059+ } )
1060+
10331061 it ( "rethrows non-abort stream errors from createMessage" , async ( ) => {
10341062 const handler = new RequestyHandler ( mockOptions )
10351063 mockCreate . mockImplementationOnce ( async ( ) => {
0 commit comments