@opentiny/next-sdk 0.1.7 → 0.1.9

package/dist/remoter/createRemoter.d.ts

@@ -23,6 +23,8 @@ interface FloatingBlockOptions {
     sessionId: string;
     /** 菜单项配置 */
     menuItems?: MenuItemConfig[];
+    /** 遥控端页面地址，默认为： https://agent.opentiny.design/tiny-robot */
+    remoteUrl?: string;
 }
 declare class FloatingBlock {
     private options;

package/dist/remoter/createRemoter.js

@@ -8,6 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { QrCode } from './QrCode';
+const DEFAULT_REMOTE_URL = 'https://agent.opentiny.design/tiny-robot';
+const DEFAULT_QR_CODE_URL = 'https://ai.opentiny.design/next-remoter';
 const getDefaultMenuItems = (options) => {
     return [
         {
@@ -56,8 +58,8 @@ const getDefaultMenuItems = (options) => {
         {
             action: 'remote-url',
             show: true,
-            text: `${options.qrCodeUrl}`,
-            tip: options.qrCodeUrl,
+            text: `${options.remoteUrl}`,
+            tip: options.remoteUrl,
             showCopyIcon: true,
             icon: `<svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
@@ -77,7 +79,7 @@ class FloatingBlock {
         if (!options.sessionId) {
             throw new Error('sessionId is required');
         }
-        this.options = Object.assign({ qrCodeUrl: options.qrCodeUrl || 'https://ai.opentiny.design/next-remoter' }, options);
+        this.options = Object.assign(Object.assign({}, options), { qrCodeUrl: options.qrCodeUrl || DEFAULT_QR_CODE_URL, remoteUrl: options.remoteUrl || DEFAULT_REMOTE_URL });
         // 合并默认菜单项配置和用户配置
         this.menuItems = this.mergeMenuItems(options.menuItems);
         this.init();
@@ -113,7 +115,7 @@ class FloatingBlock {
         this.floatingBlock.className = 'tiny-remoter-floating-block';
         this.floatingBlock.innerHTML = `
       <div class="tiny-remoter-floating-block__icon">
-        <img style="display: block; width: 56px;" src="https://ai.opentiny.design/next-remoter/svgs/logo-next-no-bg-left.svg" alt="icon" />
+        <img style="display: block; width: 56px;" src="${DEFAULT_QR_CODE_URL}/svgs/logo-next-no-bg-left.svg" alt="icon" />
       </div>
     `;
         document.body.appendChild(this.floatingBlock);
@@ -224,7 +226,7 @@ class FloatingBlock {
         this.copyToClipboard(this.options.sessionId.slice(-6));
     }
     copyRemoteURL() {
-        this.copyToClipboard((this.options.qrCodeUrl || '') + this.sessionPrefix + this.options.sessionId);
+        this.copyToClipboard(this.options.remoteUrl + this.sessionPrefix + this.options.sessionId);
     }
     // 实现复制到剪贴板功能
     copyToClipboard(text) {

package/dist/webagent.dev.js

@@ -24644,7 +24644,6 @@ ${user}:`]
       this.mcpClients = [];
       this.mcpTools = [];
       this.ignoreToolnames = [];
-      this.autoUpdateTools = true;
       this.messages = [];
       this.mcpServers = mcpServers || [];
       if (llm) {
@@ -24673,7 +24672,9 @@ ${user}:`]
         } else {
           transport = serverConfig;
         }
-        return await createMCPClient({ transport });
+        const client = await createMCPClient({ transport });
+        client["__transport__"] = transport;
+        return client;
       } catch (error) {
         if (this.onError) {
           this.onError((error == null ? void 0 : error.message) || `Failed to create MCP client`, error);
@@ -24682,6 +24683,13 @@ ${user}:`]
         return null;
       }
     }
+    /** 关闭一个client */
+    async _closeOneClient(client) {
+      var _a16, _b8, _c, _d, _e;
+      await ((_b8 = (_a16 = client["__transport__"]) == null ? void 0 : _a16.terminateSession) == null ? void 0 : _b8.call(_a16));
+      await ((_d = (_c = client["__transport__"]) == null ? void 0 : _c.close) == null ? void 0 : _d.call(_c));
+      await ((_e = client == null ? void 0 : client.close) == null ? void 0 : _e.call(client));
+    }
     /** 创建 ai-sdk的 mcpClient, 失败则保存为null */
     async _createMpcClients() {
       this.mcpClients = await Promise.all(
@@ -24712,7 +24720,7 @@ ${user}:`]
       await Promise.all(
         this.mcpClients.map(async (client) => {
           try {
-            await client.close();
+            await this._closeOneClient(client);
           } catch (error) {
             if (this.onError) {
               this.onError((error == null ? void 0 : error.message) || `Failed to close client`, error);
@@ -24744,13 +24752,13 @@ ${user}:`]
       return false;
     }
     /** 通过引用，删除一个 mcpServers mcpClients  mcpTools ignoreToolnames  */
-    removeMcpServer(mcpServer) {
+    async removeMcpServer(mcpServer) {
       const index = this.mcpServers.findIndex((server) => server === mcpServer);
       this.mcpServers.splice(index, 1);
       const delClient = this.mcpClients[index];
       this.mcpClients.splice(index, 1);
       try {
-        delClient == null ? void 0 : delClient.close();
+        await this._closeOneClient(delClient);
       } catch (error) {
       }
       const delTool = this.mcpTools[index];
@@ -24762,7 +24770,7 @@ ${user}:`]
       }
     }
     /** 创建临时允许调用的tools集合 */
-    tempMergeTools(extraTool = {}) {
+    _tempMergeTools(extraTool = {}) {
       const toolsResult = this.mcpTools.reduce((acc, curr) => ({ ...acc, ...curr }), {});
       Object.assign(toolsResult, extraTool);
       this.ignoreToolnames.forEach((name16) => {
@@ -24775,16 +24783,14 @@ ${user}:`]
       if (!this.llm) {
         throw new Error("LLM is not initialized");
       }
-      if (this.autoUpdateTools) {
-        await this._createMpcTools();
-        (_a16 = this.onUpdatedTools) == null ? void 0 : _a16.call(this);
-      }
+      await this.initClientsAndTools();
+      (_a16 = this.onUpdatedTools) == null ? void 0 : _a16.call(this);
       const chatOptions = {
         // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
         model: this.llm(model),
         stopWhen: stepCountIs(maxSteps),
         ...options,
-        tools: this.tempMergeTools(options.tools)
+        tools: this._tempMergeTools(options.tools)
       };
       if (options.message && !options.messages) {
         this.messages.push({ role: "user", content: options.message });
@@ -26785,6 +26791,8 @@ ${user}:`]
       img.src = await this.toDataURL();
     }
   }
+  const DEFAULT_REMOTE_URL = "https://agent.opentiny.design/tiny-robot";
+  const DEFAULT_QR_CODE_URL = "https://ai.opentiny.design/next-remoter";
   const getDefaultMenuItems = (options) => {
     return [
       {
@@ -26833,8 +26841,8 @@ ${user}:`]
       {
         action: "remote-url",
         show: true,
-        text: `${options.qrCodeUrl}`,
-        tip: options.qrCodeUrl,
+        text: `${options.remoteUrl}`,
+        tip: options.remoteUrl,
         showCopyIcon: true,
         icon: `<svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
@@ -26850,8 +26858,9 @@ ${user}:`]
         throw new Error("sessionId is required");
       }
       this.options = {
-        qrCodeUrl: options.qrCodeUrl || "https://ai.opentiny.design/next-remoter",
-        ...options
+        ...options,
+        qrCodeUrl: options.qrCodeUrl || DEFAULT_QR_CODE_URL,
+        remoteUrl: options.remoteUrl || DEFAULT_REMOTE_URL
       };
       this.menuItems = this.mergeMenuItems(options.menuItems);
       this.init();
@@ -26895,7 +26904,7 @@ ${user}:`]
       this.floatingBlock.className = "tiny-remoter-floating-block";
       this.floatingBlock.innerHTML = `
       <div class="tiny-remoter-floating-block__icon">
-        <img style="display: block; width: 56px;" src="https://ai.opentiny.design/next-remoter/svgs/logo-next-no-bg-left.svg" alt="icon" />
+        <img style="display: block; width: 56px;" src="${DEFAULT_QR_CODE_URL}/svgs/logo-next-no-bg-left.svg" alt="icon" />
       </div>
     `;
       document.body.appendChild(this.floatingBlock);
@@ -26995,7 +27004,7 @@ ${user}:`]
       this.copyToClipboard(this.options.sessionId.slice(-6));
     }
     copyRemoteURL() {
-      this.copyToClipboard((this.options.qrCodeUrl || "") + this.sessionPrefix + this.options.sessionId);
+      this.copyToClipboard(this.options.remoteUrl + this.sessionPrefix + this.options.sessionId);
     }
     // 实现复制到剪贴板功能
     async copyToClipboard(text2) {

package/dist/webagent.es.dev.js

@@ -24250,7 +24250,6 @@ class AgentModelProvider {
     this.mcpClients = [];
     this.mcpTools = [];
     this.ignoreToolnames = [];
-    this.autoUpdateTools = true;
     this.messages = [];
     this.mcpServers = mcpServers || [];
     if (llm) {
@@ -24279,7 +24278,9 @@ class AgentModelProvider {
       } else {
         transport = serverConfig;
       }
-      return await createMCPClient({ transport });
+      const client = await createMCPClient({ transport });
+      client["__transport__"] = transport;
+      return client;
     } catch (error) {
       if (this.onError) {
         this.onError((error == null ? void 0 : error.message) || `Failed to create MCP client`, error);
@@ -24288,6 +24289,13 @@ class AgentModelProvider {
       return null;
     }
   }
+  /** 关闭一个client */
+  async _closeOneClient(client) {
+    var _a16, _b8, _c, _d, _e;
+    await ((_b8 = (_a16 = client["__transport__"]) == null ? void 0 : _a16.terminateSession) == null ? void 0 : _b8.call(_a16));
+    await ((_d = (_c = client["__transport__"]) == null ? void 0 : _c.close) == null ? void 0 : _d.call(_c));
+    await ((_e = client == null ? void 0 : client.close) == null ? void 0 : _e.call(client));
+  }
   /** 创建 ai-sdk的 mcpClient, 失败则保存为null */
   async _createMpcClients() {
     this.mcpClients = await Promise.all(
@@ -24318,7 +24326,7 @@ class AgentModelProvider {
     await Promise.all(
       this.mcpClients.map(async (client) => {
         try {
-          await client.close();
+          await this._closeOneClient(client);
         } catch (error) {
           if (this.onError) {
             this.onError((error == null ? void 0 : error.message) || `Failed to close client`, error);
@@ -24350,13 +24358,13 @@ class AgentModelProvider {
     return false;
   }
   /** 通过引用，删除一个 mcpServers mcpClients  mcpTools ignoreToolnames  */
-  removeMcpServer(mcpServer) {
+  async removeMcpServer(mcpServer) {
     const index = this.mcpServers.findIndex((server) => server === mcpServer);
     this.mcpServers.splice(index, 1);
     const delClient = this.mcpClients[index];
     this.mcpClients.splice(index, 1);
     try {
-      delClient == null ? void 0 : delClient.close();
+      await this._closeOneClient(delClient);
     } catch (error) {
     }
     const delTool = this.mcpTools[index];
@@ -24368,7 +24376,7 @@ class AgentModelProvider {
     }
   }
   /** 创建临时允许调用的tools集合 */
-  tempMergeTools(extraTool = {}) {
+  _tempMergeTools(extraTool = {}) {
     const toolsResult = this.mcpTools.reduce((acc, curr) => ({ ...acc, ...curr }), {});
     Object.assign(toolsResult, extraTool);
     this.ignoreToolnames.forEach((name16) => {
@@ -24381,16 +24389,14 @@ class AgentModelProvider {
     if (!this.llm) {
       throw new Error("LLM is not initialized");
     }
-    if (this.autoUpdateTools) {
-      await this._createMpcTools();
-      (_a16 = this.onUpdatedTools) == null ? void 0 : _a16.call(this);
-    }
+    await this.initClientsAndTools();
+    (_a16 = this.onUpdatedTools) == null ? void 0 : _a16.call(this);
     const chatOptions = {
       // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
       model: this.llm(model),
       stopWhen: stepCountIs(maxSteps),
       ...options,
-      tools: this.tempMergeTools(options.tools)
+      tools: this._tempMergeTools(options.tools)
     };
     if (options.message && !options.messages) {
       this.messages.push({ role: "user", content: options.message });
@@ -26391,6 +26397,8 @@ class QrCode {
     img.src = await this.toDataURL();
   }
 }
+const DEFAULT_REMOTE_URL = "https://agent.opentiny.design/tiny-robot";
+const DEFAULT_QR_CODE_URL = "https://ai.opentiny.design/next-remoter";
 const getDefaultMenuItems = (options) => {
   return [
     {
@@ -26439,8 +26447,8 @@ const getDefaultMenuItems = (options) => {
     {
       action: "remote-url",
       show: true,
-      text: `${options.qrCodeUrl}`,
-      tip: options.qrCodeUrl,
+      text: `${options.remoteUrl}`,
+      tip: options.remoteUrl,
       showCopyIcon: true,
       icon: `<svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
@@ -26456,8 +26464,9 @@ class FloatingBlock {
       throw new Error("sessionId is required");
     }
     this.options = {
-      qrCodeUrl: options.qrCodeUrl || "https://ai.opentiny.design/next-remoter",
-      ...options
+      ...options,
+      qrCodeUrl: options.qrCodeUrl || DEFAULT_QR_CODE_URL,
+      remoteUrl: options.remoteUrl || DEFAULT_REMOTE_URL
     };
     this.menuItems = this.mergeMenuItems(options.menuItems);
     this.init();
@@ -26501,7 +26510,7 @@ class FloatingBlock {
     this.floatingBlock.className = "tiny-remoter-floating-block";
     this.floatingBlock.innerHTML = `
       <div class="tiny-remoter-floating-block__icon">
-        <img style="display: block; width: 56px;" src="https://ai.opentiny.design/next-remoter/svgs/logo-next-no-bg-left.svg" alt="icon" />
+        <img style="display: block; width: 56px;" src="${DEFAULT_QR_CODE_URL}/svgs/logo-next-no-bg-left.svg" alt="icon" />
       </div>
     `;
     document.body.appendChild(this.floatingBlock);
@@ -26601,7 +26610,7 @@ class FloatingBlock {
     this.copyToClipboard(this.options.sessionId.slice(-6));
   }
   copyRemoteURL() {
-    this.copyToClipboard((this.options.qrCodeUrl || "") + this.sessionPrefix + this.options.sessionId);
+    this.copyToClipboard(this.options.remoteUrl + this.sessionPrefix + this.options.sessionId);
   }
   // 实现复制到剪贴板功能
   async copyToClipboard(text2) {