@chat-lab/ui 0.1.0-beta.83 → 0.1.0-beta.85

package/dist/core/dist/index.cjs

@@ -2,8 +2,8 @@
 
 var lodashEs = require('lodash-es');
 var uuid = require('uuid');
-var valtio = require('valtio');
 var dayjs = require('dayjs');
+var valtio = require('valtio');
 var client = require('@a2a-js/sdk/client');
 var vanilla = require('valtio/vanilla');
 var mitt = require('mitt');
@@ -47,15 +47,14 @@ var MessageStatus = /* @__PURE__ */ ((MessageStatus2) => {
   MessageStatus2["ABORTED"] = "aborted";
   return MessageStatus2;
 })(MessageStatus || {});
-
-// src/utils/Message.ts
 function generateModelMessage(message) {
   return {
     id: uuid.v4(),
     role: "assistant",
     status: "sending" /* SENDING */,
     content: [],
-    createdAt: Date.now(),
+    createdAt: dayjs().unix(),
+    updatedAt: dayjs().unix(),
     metadata: {},
     ...message
   };
@@ -885,15 +884,33 @@ function getHostUrl(fullUrl) {
     return "";
   }
 }
+function getQueryString(fullUrl) {
+  if (!fullUrl) return "";
+  try {
+    const urlObj = new URL(fullUrl);
+    return urlObj.search;
+  } catch (error) {
+    return "";
+  }
+}
+function buildSessionUrl(api, appName, userId, sessionId) {
+  const hostUrl = getHostUrl(api);
+  const queryString = getQueryString(api);
+  const baseUrl = `${hostUrl}/apps/${appName}/users/${userId}/sessions/${sessionId}`;
+  return queryString ? `${baseUrl}${queryString}` : baseUrl;
+}
 var AdkCompletion = async (params) => {
   try {
     await completion(params);
   } catch (error) {
     if (error instanceof SSEError && error.message === '{"detail":"Session not found"}') {
-      await fetch(
-        `${getHostUrl(params.requestOptions.api)}/apps/${params.requestOptions.data?.appName}/users/${params.requestOptions.data?.userId}/sessions/${params.requestOptions.data?.sessionId}`,
-        { method: "post", headers: params.requestOptions.headers }
+      const url = buildSessionUrl(
+        params.requestOptions.api,
+        params.requestOptions.data?.appName,
+        params.requestOptions.data?.userId,
+        params.requestOptions.data?.sessionId
       );
+      await fetch(url, { method: "post", headers: params.requestOptions.headers });
       await completion(params);
       return;
     }
@@ -1415,7 +1432,7 @@ var LocalStorage = class {
   }
 };
 var pluginName = "ADKPlugin";
-function buildSessionUrl(api, appName, userId, sessionId) {
+function buildSessionUrl2(api, appName, userId, sessionId) {
   const apiUrlObj = new URL(api);
   const baseUrl = `${apiUrlObj.origin}/apps/${appName}/users/${userId}/sessions/${sessionId}`;
   const queryString = apiUrlObj.search;
@@ -1484,7 +1501,7 @@ var AdkPlugin = class extends ChatkitPlugin {
         };
         let res;
         try {
-          const url = buildSessionUrl(
+          const url = buildSessionUrl2(
             requestOptions.api,
             this.options.appName,
             this.options.userId,
@@ -1570,7 +1587,7 @@ var AdkPlugin = class extends ChatkitPlugin {
         );
         return thread;
       }
-      const url = buildSessionUrl(
+      const url = buildSessionUrl2(
         requestOptions.api,
         this.options.appName,
         this.options.userId,
@@ -1672,7 +1689,7 @@ var AdkPlugin = class extends ChatkitPlugin {
         }
         const threadId = thread.id;
         const requestOptions = this.chatController?.getRequestOptions();
-        const url = buildSessionUrl(
+        const url = buildSessionUrl2(
           requestOptions.api,
           this.options.appName,
           this.options.userId,
@@ -1788,7 +1805,7 @@ async function fetchChatCompletion({
         ...currentMessage,
         status: "error" /* ERROR */,
         sending: false,
-        endedAt: Date.now(),
+        endedAt: dayjs().unix(),
         error: {
           message: error.message || "\u672A\u77E5\u9519\u8BEF",
           extra: error.stack
@@ -1803,7 +1820,9 @@ async function fetchChatCompletion({
       id: currentMessage.id,
       threadId: currentMessage.threadId,
       status: currentMessage.status !== "error" /* ERROR */ ? "success" /* SUCCESS */ : "error" /* ERROR */,
-      endedAt: Date.now()
+      updatedAt: dayjs().unix(),
+      endedAt: dayjs().unix(),
+      sending: false
     });
   } catch (error) {
     console.log(error);
@@ -2115,7 +2134,8 @@ var ChatController = class {
       });
       if (userMessage) storeManager.addMessage(threadId, userMessage);
       assistantMessage = assistantMessageFromProps || generateModelMessage({
-        threadId
+        threadId,
+        sending: true
       });
       if (!assistantMessageFromProps) {
         if (override) {
@@ -2151,8 +2171,9 @@ var ChatController = class {
             updatedMessage = updatedMessageOrFactory;
           }
           if (updatedMessage.status === "pending" /* PENDING */ && !updatedMessage.createdAt) {
-            updatedMessage.createdAt = Date.now();
+            updatedMessage.createdAt = dayjs().unix();
           }
+          updatedMessage.updatedAt = dayjs().unix();
           storeManager.updateMessage(threadId, updatedMessage.id, {
             updatedMessage,
             partial: true