1- import { APICallError , NoResponseBodyError } from '@ai-sdk/provider' ;
1+ import { APICallError , EmptyResponseBodyError } from '@ai-sdk/provider' ;
22import {
33 EventSourceParserStream ,
44 ParsedEvent ,
55} from 'eventsource-parser/stream' ;
66import { ZodSchema } from 'zod' ;
7+ import { extractResponseHeaders } from './extract-response-headers' ;
78import { ParseResult , parseJSON , safeParseJSON } from './parse-json' ;
89
910export type ResponseHandler < RETURN_TYPE > = ( options : {
1011 url : string ;
1112 requestBodyValues : unknown ;
1213 response : Response ;
13- } ) => PromiseLike < RETURN_TYPE > ;
14+ } ) => PromiseLike < {
15+ value : RETURN_TYPE ;
16+ responseHeaders ?: Record < string , string > ;
17+ } > ;
1418
1519export const createJsonErrorResponseHandler =
1620 < T > ( {
@@ -24,17 +28,22 @@ export const createJsonErrorResponseHandler =
2428 } ) : ResponseHandler < APICallError > =>
2529 async ( { response, url, requestBodyValues } ) => {
2630 const responseBody = await response . text ( ) ;
31+ const responseHeaders = extractResponseHeaders ( response ) ;
2732
2833 // Some providers return an empty response body for some errors:
2934 if ( responseBody . trim ( ) === '' ) {
30- return new APICallError ( {
31- message : response . statusText ,
32- url,
33- requestBodyValues,
34- statusCode : response . status ,
35- responseBody,
36- isRetryable : isRetryable ?.( response ) ,
37- } ) ;
35+ return {
36+ responseHeaders,
37+ value : new APICallError ( {
38+ message : response . statusText ,
39+ url,
40+ requestBodyValues,
41+ statusCode : response . status ,
42+ responseHeaders,
43+ responseBody,
44+ isRetryable : isRetryable ?.( response ) ,
45+ } ) ,
46+ } ;
3847 }
3948
4049 // resilient parsing in case the response is not JSON or does not match the schema:
@@ -44,24 +53,32 @@ export const createJsonErrorResponseHandler =
4453 schema : errorSchema ,
4554 } ) ;
4655
47- return new APICallError ( {
48- message : errorToMessage ( parsedError ) ,
49- url,
50- requestBodyValues,
51- statusCode : response . status ,
52- responseBody,
53- data : parsedError ,
54- isRetryable : isRetryable ?.( response , parsedError ) ,
55- } ) ;
56+ return {
57+ responseHeaders,
58+ value : new APICallError ( {
59+ message : errorToMessage ( parsedError ) ,
60+ url,
61+ requestBodyValues,
62+ statusCode : response . status ,
63+ responseHeaders,
64+ responseBody,
65+ data : parsedError ,
66+ isRetryable : isRetryable ?.( response , parsedError ) ,
67+ } ) ,
68+ } ;
5669 } catch ( parseError ) {
57- return new APICallError ( {
58- message : response . statusText ,
59- url,
60- requestBodyValues,
61- statusCode : response . status ,
62- responseBody,
63- isRetryable : isRetryable ?.( response ) ,
64- } ) ;
70+ return {
71+ responseHeaders,
72+ value : new APICallError ( {
73+ message : response . statusText ,
74+ url,
75+ requestBodyValues,
76+ statusCode : response . status ,
77+ responseHeaders,
78+ responseBody,
79+ isRetryable : isRetryable ?.( response ) ,
80+ } ) ,
81+ } ;
6582 }
6683 } ;
6784
@@ -70,30 +87,35 @@ export const createEventSourceResponseHandler =
7087 chunkSchema : ZodSchema < T > ,
7188 ) : ResponseHandler < ReadableStream < ParseResult < T > > > =>
7289 async ( { response } : { response : Response } ) => {
90+ const responseHeaders = extractResponseHeaders ( response ) ;
91+
7392 if ( response . body == null ) {
74- throw new NoResponseBodyError ( ) ;
93+ throw new EmptyResponseBodyError ( { } ) ;
7594 }
7695
77- return response . body
78- . pipeThrough ( new TextDecoderStream ( ) )
79- . pipeThrough ( new EventSourceParserStream ( ) )
80- . pipeThrough (
81- new TransformStream < ParsedEvent , ParseResult < T > > ( {
82- transform ( { data } , controller ) {
83- // ignore the 'DONE' event that e.g. OpenAI sends:
84- if ( data === '[DONE]' ) {
85- return ;
86- }
96+ return {
97+ responseHeaders,
98+ value : response . body
99+ . pipeThrough ( new TextDecoderStream ( ) )
100+ . pipeThrough ( new EventSourceParserStream ( ) )
101+ . pipeThrough (
102+ new TransformStream < ParsedEvent , ParseResult < T > > ( {
103+ transform ( { data } , controller ) {
104+ // ignore the 'DONE' event that e.g. OpenAI sends:
105+ if ( data === '[DONE]' ) {
106+ return ;
107+ }
87108
88- controller . enqueue (
89- safeParseJSON ( {
90- text : data ,
91- schema : chunkSchema ,
92- } ) ,
93- ) ;
94- } ,
95- } ) ,
96- ) ;
109+ controller . enqueue (
110+ safeParseJSON ( {
111+ text : data ,
112+ schema : chunkSchema ,
113+ } ) ,
114+ ) ;
115+ } ,
116+ } ) ,
117+ ) ,
118+ } ;
97119 } ;
98120
99121export const createJsonResponseHandler =
@@ -106,16 +128,22 @@ export const createJsonResponseHandler =
106128 schema : responseSchema ,
107129 } ) ;
108130
131+ const responseHeaders = extractResponseHeaders ( response ) ;
132+
109133 if ( ! parsedResult . success ) {
110134 throw new APICallError ( {
111135 message : 'Invalid JSON response' ,
112136 cause : parsedResult . error ,
113137 statusCode : response . status ,
138+ responseHeaders,
114139 responseBody,
115140 url,
116141 requestBodyValues,
117142 } ) ;
118143 }
119144
120- return parsedResult . value ;
145+ return {
146+ responseHeaders,
147+ value : parsedResult . value ,
148+ } ;
121149 } ;
0 commit comments