@opentiny/next-sdk 0.1.5 → 0.1.7

package/WebMcpClient.ts

@@ -1,6 +1,7 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js'
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
+import { WebSocketClientTransport } from '@modelcontextprotocol/sdk/client/websocket.js'
 import { z, ZodObject, ZodLiteral, ZodType } from 'zod'
 import {
   ElicitRequestSchema,
@@ -18,8 +19,9 @@ import {
   sseOptions,
   streamOptions,
   attemptConnection,
-  createStreamProxy,
   createSseProxy,
+  createStreamProxy,
+  createSocketProxy,
   AuthClientProvider
 } from '@opentiny/next'
 import type {
@@ -60,7 +62,7 @@ export interface ClientConnectOptions {
   token?: string
   sessionId?: string
   authProvider?: AuthClientProvider
-  type?: 'channel' | 'sse'
+  type?: 'channel' | 'sse' | 'stream' | 'socket'
   agent?: boolean
   onError?: (error: Error) => void
   onUnauthorized?: (connect: () => Promise<void>) => Promise<void>
@@ -126,7 +128,11 @@ export class WebMcpClient {
 
       const connectProxy = async () => {
         const { transport, sessionId } =
-          type === 'sse' ? await createSseProxy(proxyOptions) : await createStreamProxy(proxyOptions)
+          type === 'sse'
+            ? await createSseProxy(proxyOptions)
+            : type === 'socket'
+              ? await createSocketProxy(proxyOptions)
+              : await createStreamProxy(proxyOptions)
 
         transport.onerror = async (error: Error) => {
           onError?.(error)
@@ -169,6 +175,12 @@ export class WebMcpClient {
       }
     }
 
+    if (type === 'socket') {
+      transport = new WebSocketClientTransport(new URL(`${url}?sessionId=${sessionId}&token=${token}`))
+      transport.sessionId = sessionId
+      await this.client.connect(transport)
+    }
+
     if (typeof transport === 'undefined') {
       if (authProvider) {
         const createTransport = () => new StreamableHTTPClientTransport(endpoint, { authProvider })

package/agent/AgentModelProvider.ts

@@ -1,4 +1,4 @@
-import { streamText, stepCountIs, generateText } from 'ai'
+import { streamText, stepCountIs, generateText, StreamTextResult } from 'ai'
 import { experimental_createMCPClient as createMCPClient, experimental_MCPClientConfig as MCPClientConfig } from 'ai'
 import type { ToolSet } from 'ai'
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
@@ -36,6 +36,10 @@ export class AgentModelProvider {
 
   /** chat 时，自动更新 所有的tools 后的事件 */
   onUpdatedTools: (() => void) | undefined
+  /** 内部报错时，抛出错误事件 */
+  onError: ((msg: string, err?: any) => void) | undefined
+
+  messages: any[] = []
 
   constructor({ llmConfig, mcpServers, llm }: IAgentModelProviderOption) {
     // 1、保存 mcpServer
@@ -73,7 +77,10 @@ export class AgentModelProvider {
       }
 
       return await createMCPClient({ transport: transport as MCPClientConfig['transport'] })
-    } catch (error) {
+    } catch (error: unknown) {
+      if (this.onError) {
+        this.onError((error as Error)?.message || `Failed to create MCP client`, error)
+      }
       console.error(`Failed to create MCP client`, serverConfig, error)
       return null
     }
@@ -93,7 +100,11 @@ export class AgentModelProvider {
       this.mcpClients.map(async (client) => {
         try {
           return client ? await client?.tools?.() : null
-        } catch (error) {
+        } catch (error: unknown) {
+          if (this.onError) {
+            this.onError((error as Error)?.message || `Failed to query tools`, error)
+          }
+          console.error(`Failed to query tools`, error)
           return null
         }
       })
@@ -104,8 +115,13 @@ export class AgentModelProvider {
     await Promise.all(
       this.mcpClients.map(async (client) => {
         try {
-          client.close()
-        } catch (error) {}
+          await client.close()
+        } catch (error: unknown) {
+          if (this.onError) {
+            this.onError((error as Error)?.message || `Failed to close client`, error)
+          }
+          console.error(`Failed to close client`, error)
+        }
       })
     )
   }
@@ -122,7 +138,7 @@ export class AgentModelProvider {
   }
 
   async insertMcpServer(mcpServer: McpServerConfig) {
-    const find = this.mcpServers.find((item: any) => item.url === mcpServer.url)
+    const find = this.mcpServers.find((item: any) => 'url' in item && 'url' in mcpServer && item.url === mcpServer.url)
 
     if (!find) {
       this.mcpServers = [...this.mcpServers, mcpServer]
@@ -172,7 +188,7 @@ export class AgentModelProvider {
 
   async _chat(
     chatMethod: ChatMethodFn,
-    { model, maxSteps = 5, ...options }: Parameters<typeof generateText>[0] & { maxSteps?: number }
+    { model, maxSteps = 5, ...options }: Parameters<typeof generateText>[0] & { maxSteps?: number; message?: string }
   ): Promise<any> {
     if (!this.llm) {
       throw new Error('LLM is not initialized')
@@ -183,20 +199,33 @@ export class AgentModelProvider {
       this.onUpdatedTools?.()
     }
 
-    return chatMethod({
+    const chatOptions = {
       // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
       model: this.llm(model),
       stopWhen: stepCountIs(maxSteps),
       ...options,
       tools: this.tempMergeTools(options.tools) as ToolSet
+    }
+
+    if (options.message && !options.messages) {
+      this.messages.push({ role: 'user', content: options.message })
+      chatOptions.messages = [...this.messages]
+    }
+
+    const result = chatMethod(chatOptions)
+
+    ;(result as StreamTextResult<ToolSet, unknown>)?.response?.then((res: any) => {
+      this.messages.push(...res.messages)
     })
+
+    return result
   }
 
-  async chat(options: Parameters<typeof generateText>[0] & { maxSteps?: number }): Promise<any> {
+  async chat(options: Parameters<typeof generateText>[0] & { maxSteps?: number; message?: string }): Promise<any> {
     return this._chat(generateText, options)
   }
 
-  async chatStream(options: Parameters<typeof streamText>[0] & { maxSteps?: number }): Promise<any> {
+  async chatStream(options: Parameters<typeof streamText>[0] & { maxSteps?: number; message?: string }): Promise<any> {
     return this._chat(streamText, options as any)
   }
 }

package/agent/type.ts

@@ -14,7 +14,7 @@ export interface IAgentModelProviderLlmConfig {
 }
 
 /** Mcp Server的配置对象 */
-export type McpServerConfig = { type: 'streamableHttp' | 'sse'; url: string } & { transport: MCPTransport }
+export type McpServerConfig = { type: 'streamableHttp' | 'sse'; url: string } | { transport: MCPTransport }
 
 /** */
 export interface IAgentModelProviderOption {

package/dist/WebMcpClient.d.ts

@@ -18,7 +18,7 @@ export interface ClientConnectOptions {
     token?: string;
     sessionId?: string;
     authProvider?: AuthClientProvider;
-    type?: 'channel' | 'sse';
+    type?: 'channel' | 'sse' | 'stream' | 'socket';
     agent?: boolean;
     onError?: (error: Error) => void;
     onUnauthorized?: (connect: () => Promise<void>) => Promise<void>;

package/dist/WebMcpClient.js

@@ -10,8 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { WebSocketClientTransport } from '@modelcontextprotocol/sdk/client/websocket.js';
 import { ElicitRequestSchema, CallToolResultSchema, ListRootsRequestSchema, CreateMessageRequestSchema, LoggingMessageNotificationSchema, ToolListChangedNotificationSchema, ResourceUpdatedNotificationSchema, PromptListChangedNotificationSchema, ResourceListChangedNotificationSchema } from '@modelcontextprotocol/sdk/types.js';
-import { MessageChannelClientTransport, sseOptions, streamOptions, attemptConnection, createStreamProxy, createSseProxy } from '@opentiny/next';
+import { MessageChannelClientTransport, sseOptions, streamOptions, attemptConnection, createSseProxy, createStreamProxy, createSocketProxy } from '@opentiny/next';
 /**
  * An MCP client on top of a pluggable transport.
  * The client will automatically begin the initialization flow with the server when connect() is called.
@@ -56,7 +57,11 @@ export class WebMcpClient {
                 let reconnect = false;
                 let response;
                 const connectProxy = () => __awaiter(this, void 0, void 0, function* () {
-                    const { transport, sessionId } = type === 'sse' ? yield createSseProxy(proxyOptions) : yield createStreamProxy(proxyOptions);
+                    const { transport, sessionId } = type === 'sse'
+                        ? yield createSseProxy(proxyOptions)
+                        : type === 'socket'
+                            ? yield createSocketProxy(proxyOptions)
+                            : yield createStreamProxy(proxyOptions);
                     transport.onerror = (error) => __awaiter(this, void 0, void 0, function* () {
                         onError === null || onError === void 0 ? void 0 : onError(error);
                         if (error.message === 'Unauthorized' && !reconnect) {
@@ -93,6 +98,11 @@ export class WebMcpClient {
                     yield this.client.connect(transport);
                 }
             }
+            if (type === 'socket') {
+                transport = new WebSocketClientTransport(new URL(`${url}?sessionId=${sessionId}&token=${token}`));
+                transport.sessionId = sessionId;
+                yield this.client.connect(transport);
+            }
             if (typeof transport === 'undefined') {
                 if (authProvider) {
                     const createTransport = () => new StreamableHTTPClientTransport(endpoint, { authProvider });

package/dist/agent/AgentModelProvider.d.ts

@@ -28,6 +28,9 @@ export declare class AgentModelProvider {
     autoUpdateTools: boolean;
     /** chat 时，自动更新 所有的tools 后的事件 */
     onUpdatedTools: (() => void) | undefined;
+    /** 内部报错时，抛出错误事件 */
+    onError: ((msg: string, err?: any) => void) | undefined;
+    messages: any[];
     constructor({ llmConfig, mcpServers, llm }: IAgentModelProviderOption);
     /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 Null */
     private _createOneClient;
@@ -46,12 +49,15 @@ export declare class AgentModelProvider {
     tempMergeTools(extraTool?: {}): Record<string, any>;
     _chat(chatMethod: ChatMethodFn, { model, maxSteps, ...options }: Parameters<typeof generateText>[0] & {
         maxSteps?: number;
+        message?: string;
     }): Promise<any>;
     chat(options: Parameters<typeof generateText>[0] & {
         maxSteps?: number;
+        message?: string;
     }): Promise<any>;
     chatStream(options: Parameters<typeof streamText>[0] & {
         maxSteps?: number;
+        message?: string;
     }): Promise<any>;
 }
 export {};

package/dist/agent/AgentModelProvider.js

@@ -44,6 +44,7 @@ export class AgentModelProvider {
         this.ignoreToolnames = [];
         /** 在 chat 之前，自动更新 所有的tools */
         this.autoUpdateTools = true;
+        this.messages = [];
         // 1、保存 mcpServer
         this.mcpServers = mcpServers || [];
         // 2、保存 llm
@@ -82,6 +83,9 @@ export class AgentModelProvider {
                 return yield createMCPClient({ transport: transport });
             }
             catch (error) {
+                if (this.onError) {
+                    this.onError((error === null || error === void 0 ? void 0 : error.message) || `Failed to create MCP client`, error);
+                }
                 console.error(`Failed to create MCP client`, serverConfig, error);
                 return null;
             }
@@ -105,6 +109,10 @@ export class AgentModelProvider {
                     return client ? yield ((_a = client === null || client === void 0 ? void 0 : client.tools) === null || _a === void 0 ? void 0 : _a.call(client)) : null;
                 }
                 catch (error) {
+                    if (this.onError) {
+                        this.onError((error === null || error === void 0 ? void 0 : error.message) || `Failed to query tools`, error);
+                    }
+                    console.error(`Failed to query tools`, error);
                     return null;
                 }
             })));
@@ -115,9 +123,14 @@ export class AgentModelProvider {
         return __awaiter(this, void 0, void 0, function* () {
             yield Promise.all(this.mcpClients.map((client) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    client.close();
+                    yield client.close();
+                }
+                catch (error) {
+                    if (this.onError) {
+                        this.onError((error === null || error === void 0 ? void 0 : error.message) || `Failed to close client`, error);
+                    }
+                    console.error(`Failed to close client`, error);
                 }
-                catch (error) { }
             })));
         });
     }
@@ -137,7 +150,7 @@ export class AgentModelProvider {
     insertMcpServer(mcpServer) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const find = this.mcpServers.find((item) => item.url === mcpServer.url);
+            const find = this.mcpServers.find((item) => 'url' in item && 'url' in mcpServer && item.url === mcpServer.url);
             if (!find) {
                 this.mcpServers = [...this.mcpServers, mcpServer];
                 const client = yield this._createOneClient(mcpServer);
@@ -181,7 +194,7 @@ export class AgentModelProvider {
     }
     _chat(chatMethod, _a) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _b;
+            var _b, _c;
             var { model, maxSteps = 5 } = _a, options = __rest(_a, ["model", "maxSteps"]);
             if (!this.llm) {
                 throw new Error('LLM is not initialized');
@@ -190,9 +203,18 @@ export class AgentModelProvider {
                 yield this._createMpcTools();
                 (_b = this.onUpdatedTools) === null || _b === void 0 ? void 0 : _b.call(this);
             }
-            return chatMethod(Object.assign(Object.assign({ 
+            const chatOptions = Object.assign(Object.assign({ 
                 // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
-                model: this.llm(model), stopWhen: stepCountIs(maxSteps) }, options), { tools: this.tempMergeTools(options.tools) }));
+                model: this.llm(model), stopWhen: stepCountIs(maxSteps) }, options), { tools: this.tempMergeTools(options.tools) });
+            if (options.message && !options.messages) {
+                this.messages.push({ role: 'user', content: options.message });
+                chatOptions.messages = [...this.messages];
+            }
+            const result = chatMethod(chatOptions);
+            (_c = result === null || result === void 0 ? void 0 : result.response) === null || _c === void 0 ? void 0 : _c.then((res) => {
+                this.messages.push(...res.messages);
+            });
+            return result;
         });
     }
     chat(options) {

package/dist/agent/type.d.ts

@@ -15,7 +15,7 @@ export interface IAgentModelProviderLlmConfig {
 export type McpServerConfig = {
     type: 'streamableHttp' | 'sse';
     url: string;
-} & {
+} | {
     transport: MCPTransport;
 };
 /** */