@chat-lab/ui 0.1.0-beta.35 → 0.1.0-beta.37

package/dist/packages/core/dist/index.cjs

@@ -1065,7 +1065,7 @@ var Compiler = class {
         afterSwitch: new AsyncSeriesWaterfallHook()
       },
       error: {
-        occurred: new SyncWaterfallHook()
+        occurred: new SyncHook()
       },
       ui: {
         renderSlot: new SyncWaterfallHook()
@@ -1206,7 +1206,9 @@ var AdkPlugin = class extends ChatkitPlugin {
       const headers = requestOptions.headers || {};
       const thread = ctx.thread;
       if (!requestOptions.api || !headers.Authorization) {
-        ctx.onError?.(new Error("ADK\u914D\u7F6E\u7F3A\u5931\uFF1Aapi \u6216 Authorization \u4E3A\u7A7A"));
+        this.chatController?.onError?.(
+          new Error("ADK\u914D\u7F6E\u7F3A\u5931\uFF1Aapi \u6216 Authorization \u4E3A\u7A7A")
+        );
         ctx.shouldSend = false;
         return ctx;
       }
@@ -1228,23 +1230,31 @@ var AdkPlugin = class extends ChatkitPlugin {
           });
           if (!res.ok) {
             const text = await res.text();
-            ctx.onError?.(new Error(text));
+            this.chatController?.onError?.(
+              new Error(
+                `ADK \u63D2\u4EF6\u521D\u59CB\u5316\u4F1A\u8BDD\u5931\u8D25\uFF0C\u72B6\u6001\u7801\uFF1A${res.status}\uFF0C\u9519\u8BEF\u4FE1\u606F\uFF1A${text}`
+              )
+            );
             ctx.shouldSend = false;
             return ctx;
           }
         } catch (error) {
           console.error("Error initializing ADK session:", error);
-          ctx.onError?.(error);
+          this.chatController?.onError?.(
+            new Error(`ADK \u63D2\u4EF6\u521D\u59CB\u5316\u4F1A\u8BDD\u5931\u8D25\uFF0C\u9519\u8BEF\u4FE1\u606F\uFF1A${error.message}`)
+          );
           ctx.shouldSend = false;
           return ctx;
         }
+        const xSessionId = res.headers.get("x-session-id");
         const data = await res.json();
         this.chatController?.updateThread(ctx.thread.id, {
           metadata: {
             ...ctx.thread.metadata,
             ["sessionInited"]: true,
             ["isInitingSession"]: false,
-            sessionId: data.id
+            sessionId: data.id,
+            ["x-session-id"]: xSessionId
           }
         });
         ctx.dynamicParams = {
@@ -1255,6 +1265,10 @@ var AdkPlugin = class extends ChatkitPlugin {
         };
         ctx.extraRequestOptions = {
           ...ctx.extraRequestOptions,
+          headers: {
+            ...requestOptions.headers,
+            ["x-session-id"]: xSessionId
+          },
           api: `${requestOptions.api}/run_sse`
         };
         return ctx;
@@ -1265,8 +1279,13 @@ var AdkPlugin = class extends ChatkitPlugin {
         userId: this.options.userId,
         appName: this.options.appName
       };
+      debugger;
       ctx.extraRequestOptions = {
         ...ctx.extraRequestOptions,
+        headers: {
+          ...requestOptions.headers,
+          ["x-session-id"]: thread.metadata?.["x-session-id"]
+        },
         api: `${requestOptions.api}/run_sse`
       };
       return ctx;
@@ -1284,12 +1303,15 @@ var AdkPlugin = class extends ChatkitPlugin {
       });
       if (getFetchResponse.ok) {
         const data = await getFetchResponse.json();
+        const xSessionId = getFetchResponse.headers.get("x-session-id");
+        debugger;
         this.chatController?.updateThread(threadId, {
           metadata: {
             ...thread.metadata,
             ["sessionInited"]: true,
             sessionId: data.id,
-            ["isInitingSession"]: false
+            ["isInitingSession"]: false,
+            ["x-session-id"]: xSessionId
           },
           // messages: data?.events?.map(
           //   (chunk: {
@@ -1341,17 +1363,19 @@ var AdkPlugin = class extends ChatkitPlugin {
       });
       if (postFetchResponse.ok) {
         const data = await postFetchResponse.json();
+        const xSessionId = postFetchResponse.headers.get("x-session-id");
         this.chatController?.updateThread(threadId, {
           metadata: {
             ...thread.metadata,
             ["sessionInited"]: true,
+            ["x-session-id"]: xSessionId,
             sessionId: data.id,
             ["isInitingSession"]: false
           },
           messages: []
         });
       } else {
-        this.chatController.pluginManager.hooks.error.occurred.call(
+        this.chatController?.onError?.(
           new Error(
             `ADK \u63D2\u4EF6\u521D\u59CB\u5316\u4F1A\u8BDD\u5931\u8D25\uFF0C\u72B6\u6001\u7801\uFF1A${postFetchResponse.status}`
           )
@@ -1382,7 +1406,8 @@ var AdkPlugin = class extends ChatkitPlugin {
               ...thread.metadata,
               ["sessionInited"]: true,
               sessionId: data.id,
-              ["isInitingSession"]: false
+              ["isInitingSession"]: false,
+              ["x-session-id"]: res.headers.get("x-session-id")
             }
             // messages: data.events.map((chunk:{id:string}) =>
             //   this.adkProtocol.parseChunk({
@@ -1406,6 +1431,9 @@ var AdkPlugin = class extends ChatkitPlugin {
       this.runtimeMap.removeByValue(thread.id);
       return thread;
     });
+    compiler.hooks.error.occurred.tap("adk-plugin", (error) => {
+      this.chatController?.onError?.(error);
+    });
   }
 };
 async function fetchChatCompletion({
@@ -1504,6 +1532,7 @@ var ChatController = class {
     this.requestOptions = options.requestOptions;
     this.protocolOptions = options.protocolOptions;
     this.store = options.storeManager || storeActions;
+    this.onError = options.onError;
   }
   setStore(store) {
     this.store = store;
@@ -1676,8 +1705,7 @@ var ChatController = class {
       onError,
       dynamicParams: {},
       extraRequestOptions: {},
-      shouldSend: true,
-      controller: this
+      shouldSend: true
     };
     try {
       hookContext = await this.pluginManager.hooks.message.beforeSend.callAsync(
@@ -1685,30 +1713,7 @@ var ChatController = class {
       );
     } catch (e) {
     }
-    if (this.requestOptions.beforeRequest && hookContext.shouldSend) {
-      try {
-        const legacyResult = await this.requestOptions.beforeRequest({
-          requestOptions: hookContext.requestOptions,
-          userMessage: hookContext.userMessage,
-          contextMessages: hookContext.contextMessages,
-          thread: hookContext.thread,
-          onError: hookContext.onError
-        });
-        if (legacyResult === false) {
-          hookContext.shouldSend = false;
-        } else if (legacyResult) {
-          hookContext.dynamicParams = {
-            ...hookContext.dynamicParams,
-            ...legacyResult.dynamicParams
-          };
-          hookContext.extraRequestOptions = {
-            ...hookContext.extraRequestOptions,
-            ...legacyResult.requestOptions
-          };
-        }
-      } catch (e) {
-      }
-    }
+    debugger;
     if (hookContext.shouldSend === false) {
       this.store.setLoading(threadId, false, false);
       return;