@chat-lab/ui 0.1.0-beta.36 → 0.1.0-beta.38

package/dist/packages/core/dist/index.js

@@ -1239,20 +1239,20 @@ var AdkPlugin = class extends ChatkitPlugin {
         } catch (error) {
           console.error("Error initializing ADK session:", error);
           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${error.message}`
-            )
+            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 = {
@@ -1263,6 +1263,10 @@ var AdkPlugin = class extends ChatkitPlugin {
         };
         ctx.extraRequestOptions = {
           ...ctx.extraRequestOptions,
+          headers: {
+            ...requestOptions.headers,
+            ["x-session-id"]: xSessionId
+          },
           api: `${requestOptions.api}/run_sse`
         };
         return ctx;
@@ -1275,6 +1279,10 @@ var AdkPlugin = class extends ChatkitPlugin {
       };
       ctx.extraRequestOptions = {
         ...ctx.extraRequestOptions,
+        headers: {
+          ...requestOptions.headers,
+          ["x-session-id"]: thread.metadata?.["x-session-id"]
+        },
         api: `${requestOptions.api}/run_sse`
       };
       return ctx;
@@ -1292,12 +1300,14 @@ var AdkPlugin = class extends ChatkitPlugin {
       });
       if (getFetchResponse.ok) {
         const data = await getFetchResponse.json();
+        const xSessionId = getFetchResponse.headers.get("x-session-id");
         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: {
@@ -1349,10 +1359,12 @@ 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
           },
@@ -1390,7 +1402,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({
@@ -1688,8 +1701,7 @@ var ChatController = class {
       onError,
       dynamicParams: {},
       extraRequestOptions: {},
-      shouldSend: true,
-      controller: this
+      shouldSend: true
     };
     try {
       hookContext = await this.pluginManager.hooks.message.beforeSend.callAsync(
@@ -1697,30 +1709,6 @@ 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) {
-      }
-    }
     if (hookContext.shouldSend === false) {
       this.store.setLoading(threadId, false, false);
       return;