feat(chatbot): export type (#210)

Author: carolin913

server/data.js

@@ -311,8 +311,8 @@ function handleStructuredData(chunk: SSEChunkData): AIMessageContent {
 const mockModels = {
   endpoint: 'http://localhost:3000/sse/normal',
   stream: true,
-  onComplete: () => {
-    console.log('onComplete');
+  onComplete: (isAborted) => {
+    console.log('onComplete', isAborted);
   },
   onError: (err) => {
     console.log('onError', err);

src/chatbot/_example/basic.tsx

@@ -10,7 +10,7 @@ import type { AIMessageContent, ChatMessagesData, SSEChunkData } from '../core/t
 // 天气扩展类型定义
 declare module '../core/type' {
   interface AIContentTypeOverrides {
-    weather: BaseContent<
+    weather: ChatBaseContent<
       'weather',
       {
         temp: number;

src/chatbot/_example/demo.tsx

@@ -11,6 +11,8 @@ export default class SSEClient {
 
   private buffer = '';
 
+  private isClosed = false;
+
   constructor(
     private url: string,
     private handlers: {
@@ -47,7 +49,6 @@ export default class SSEClient {
         this.handleError(response);
         return;
       }
-
       this.reader = response.body.pipeThrough(new TextDecoderStream()).getReader();
       // 直接开始读取流数据
       await this.readStream();
@@ -56,21 +57,31 @@ export default class SSEClient {
     }
   }
 
-  close() {
-    this.reader?.cancel().catch(() => {});
-    this.controller?.abort();
-    this.reader = null;
-    this.controller = null;
+  async close() {
+    if (this.isClosed) return;
+    this.isClosed = true;
+    // 先取消reader读取
+    if (this.reader) {
+      await this.reader.cancel().catch((err) => {
+        this.handlers.onError?.(err);
+      });
+      this.reader = null;
+    }
+
+    // 最后中止控制器
+    if (this.controller && !this.controller.signal.aborted) {
+      this.controller.abort();
+      this.controller = null;
+    }
   }
 
   private async readStream() {
     try {
-      while (true) {
+      while (!this.isClosed) {
         // eslint-disable-next-line no-await-in-loop
         const { done, value } = await this.reader!.read();
         if (done) {
-          const isAborted = this.reader === null;
-          this.handlers.onComplete?.(isAborted);
+          this.handlers.onComplete?.(this.isClosed);
           return;
         }
 

src/chatbot/core/server/sseClient.ts

@@ -14,19 +14,19 @@ export type ContentType =
 export type AttachmentType = 'image' | 'video' | 'audio' | 'pdf' | 'doc' | 'ppt' | 'txt';
 
 // 基础类型
-export interface BaseContent<T extends string, TData> {
+export interface ChatBaseContent<T extends string, TData> {
   type: T;
   data: TData;
   status?: MessageStatus | ((currentStatus: MessageStatus | undefined) => MessageStatus);
   id?: string;
 }
 
 // 内容类型
-export type TextContent = BaseContent<'text', string>;
+export type TextContent = ChatBaseContent<'text', string>;
 
-export type MarkdownContent = BaseContent<'markdown', string>;
+export type MarkdownContent = ChatBaseContent<'markdown', string>;
 
-export type ImageContent = BaseContent<
+export type ImageContent = ChatBaseContent<
   'image',
   {
     name?: string;
@@ -47,7 +47,7 @@ export type ReferenceItem = {
   site?: string;
   date?: string;
 };
-export type SearchContent = BaseContent<
+export type SearchContent = ChatBaseContent<
   'search',
   {
     title?: string;
@@ -59,7 +59,7 @@ export type SuggestionItem = {
   title: string;
   prompt?: string;
 };
-export type SuggestionContent = BaseContent<'suggestion', SuggestionItem[]>;
+export type SuggestionContent = ChatBaseContent<'suggestion', SuggestionItem[]>;
 
 // 附件消息
 export type AttachmentItem = {
@@ -72,10 +72,10 @@ export type AttachmentItem = {
   height?: number;
   metadata?: Record<string, any>;
 };
-export type AttachmentContent = BaseContent<'attachment', AttachmentItem[]>;
+export type AttachmentContent = ChatBaseContent<'attachment', AttachmentItem[]>;
 
 // 思考过程
-export type ThinkingContent = BaseContent<
+export type ThinkingContent = ChatBaseContent<
   'thinking',
   {
     text?: string;
@@ -195,12 +195,12 @@ export interface ChatState {
   model: ModelServiceState;
 }
 
-export type AIContentHandler<T extends BaseContent<any, any>> = (chunk: T, existing?: T) => T;
+export type AIContentHandler<T extends ChatBaseContent<any, any>> = (chunk: T, existing?: T) => T;
 
 export interface ContentTypeDefinition<T extends string = string, D = any> {
   type: T;
-  handler?: AIContentHandler<BaseContent<T, D>>;
-  renderer?: ContentRenderer<BaseContent<T, D>>;
+  handler?: AIContentHandler<ChatBaseContent<T, D>>;
+  renderer?: ContentRenderer<ChatBaseContent<T, D>>;
 }
 
-export type ContentRenderer<T extends BaseContent<any, any>> = (content: T) => unknown;
+export type ContentRenderer<T extends ChatBaseContent<any, any>> = (content: T) => unknown;

src/chatbot/core/type.ts

@@ -1,16 +1,15 @@
 import './style/index.js';
 
-import reactifyWebComponent from 'omi-reactify';
-
 import _Chat from './chat';
-import { TdChatProps } from './type';
 
 export const Chat = _Chat;
 
 export * from './core';
 export * from './type';
 
 // 为方便如影测试，暂时从这里导出react组件
-const ChatBot = reactifyWebComponent<TdChatProps>('t-chatbot');
-export { ChatBot };
+// import reactifyWebComponent from 'omi-reactify';
+// import { TdChatProps } from './type';
+// const ChatBot = reactifyWebComponent<TdChatProps>('t-chatbot');
+// export { ChatBot };
 export default Chat;