@@ -474,48 +474,53 @@ export async function streamChat(
474474 done = true ;
475475 break ;
476476 }
477+ /* parse 单独包:下面的裸 catch 只容「半个 JSON」,业务错误(上游
478+ * 错误 chunk)若也在同一 try 里抛会被它吞掉,修复变 no-op */
479+ type Delta = { reasoning_content ?: unknown ; content ?: unknown ; tool_calls ?: unknown } ;
480+ let chunk : { error ?: unknown ; choices ?: { finish_reason ?: unknown ; delta ?: Delta } [ ] } ;
477481 try {
478- const chunk = JSON . parse ( payload ) ;
479- /* OpenAI 形态的流式错误 chunk(上游模板/引擎错误经网关转成 {"error":{message,type}}):
480- * 不在此抛出的话,它会因没有 choices 被当成空 chunk 静默吞掉,观感又是「空流」 */
481- const errObj = ( chunk as { error ?: unknown } ) . error ;
482- if ( errObj ) {
483- const msg = typeof errObj === 'object' && errObj !== null && 'message' in errObj
484- ? String ( ( errObj as { message ?: unknown } ) . message )
485- : String ( errObj ) ;
486- throw new Error ( tStatic ( 'api.upstreamStreamError' , { msg } ) ) ;
487- }
488- const choice = chunk . choices ?. [ 0 ] ?? { } ;
489- if ( typeof choice . finish_reason === 'string' && choice . finish_reason ) finishReason = choice . finish_reason ;
490- const delta = choice . delta ?? { } ;
491- const reasoning = typeof delta . reasoning_content === 'string' ? delta . reasoning_content : '' ;
492- const content = typeof delta . content === 'string' ? delta . content : '' ;
493- /* 标准通道分片拼装(缺 index 的退化流一律当第 0 个调用) */
494- if ( Array . isArray ( delta . tool_calls ) ) {
495- for ( const tc of delta . tool_calls as {
496- index ?: number ;
497- id ?: unknown ;
498- function ?: { name ?: unknown ; arguments ?: unknown } ;
499- } [ ] ) {
500- const idx = typeof tc . index === 'number' ? tc . index : 0 ;
501- const slot = stdCalls . get ( idx ) ?? { id : '' , name : '' , args : '' } ;
502- if ( typeof tc . id === 'string' && tc . id ) slot . id = tc . id ;
503- if ( typeof tc . function ?. name === 'string' && tc . function . name ) slot . name = tc . function . name ;
504- if ( typeof tc . function ?. arguments === 'string' ) slot . args += tc . function . arguments ;
505- stdCalls . set ( idx , slot ) ;
506- }
507- }
508- const parts = splitter . feed ( reasoning , content ) ;
509- const tOut = toolSplitter . feed ( parts . content ) ;
510- if ( parts . reasoning || tOut . content ) {
511- onDelta ( { content : tOut . content , reasoning : parts . reasoning } ) ;
512- }
513- if ( tOut . toolCalls ?. length ) {
514- toolCalls . push ( ...tOut . toolCalls ) ;
515- onDelta ( { content : '' , reasoning : '' , toolCalls : tOut . toolCalls } ) ;
516- }
482+ chunk = JSON . parse ( payload ) ;
517483 } catch {
518484 /* 半个 JSON 事件留在下一轮处理;非 JSON 的心跳行直接跳过 */
485+ continue ;
486+ }
487+ /* OpenAI 形态的流式错误 chunk(上游模板/引擎错误经网关转成 {"error":{message,type}}):
488+ * 不在此抛出的话,它会因没有 choices 被当成空 chunk 静默吞掉,观感又是「空流」 */
489+ const errObj = chunk . error ;
490+ if ( errObj ) {
491+ const msg = typeof errObj === 'object' && errObj !== null && 'message' in errObj
492+ ? String ( ( errObj as { message ?: unknown } ) . message )
493+ : String ( errObj ) ;
494+ throw new Error ( tStatic ( 'api.upstreamStreamError' , { msg } ) ) ;
495+ }
496+ const choice : { finish_reason ?: unknown ; delta ?: Delta } = chunk . choices ?. [ 0 ] ?? { } ;
497+ if ( typeof choice . finish_reason === 'string' && choice . finish_reason ) finishReason = choice . finish_reason ;
498+ const delta : Delta = choice . delta ?? { } ;
499+ const reasoning = typeof delta . reasoning_content === 'string' ? delta . reasoning_content : '' ;
500+ const content = typeof delta . content === 'string' ? delta . content : '' ;
501+ /* 标准通道分片拼装(缺 index 的退化流一律当第 0 个调用) */
502+ if ( Array . isArray ( delta . tool_calls ) ) {
503+ for ( const tc of delta . tool_calls as {
504+ index ?: number ;
505+ id ?: unknown ;
506+ function ?: { name ?: unknown ; arguments ?: unknown } ;
507+ } [ ] ) {
508+ const idx = typeof tc . index === 'number' ? tc . index : 0 ;
509+ const slot = stdCalls . get ( idx ) ?? { id : '' , name : '' , args : '' } ;
510+ if ( typeof tc . id === 'string' && tc . id ) slot . id = tc . id ;
511+ if ( typeof tc . function ?. name === 'string' && tc . function . name ) slot . name = tc . function . name ;
512+ if ( typeof tc . function ?. arguments === 'string' ) slot . args += tc . function . arguments ;
513+ stdCalls . set ( idx , slot ) ;
514+ }
515+ }
516+ const parts = splitter . feed ( reasoning , content ) ;
517+ const tOut = toolSplitter . feed ( parts . content ) ;
518+ if ( parts . reasoning || tOut . content ) {
519+ onDelta ( { content : tOut . content , reasoning : parts . reasoning } ) ;
520+ }
521+ if ( tOut . toolCalls ?. length ) {
522+ toolCalls . push ( ...tOut . toolCalls ) ;
523+ onDelta ( { content : '' , reasoning : '' , toolCalls : tOut . toolCalls } ) ;
519524 }
520525 }
521526 }
0 commit comments