async listners

Author: OmerKat

src/client.ts

@@ -12,6 +12,8 @@ export type CreateClientOptions = {
   onError?: (error: Error) => void;
 };
 
+export type Base44SDK = ReturnType<typeof createClient>;
+
 /**
  * Create a Base44 client instance
  * @param {Object} config - Client configuration

src/index.ts

@@ -1,4 +1,4 @@
-import { createClient, createClientFromRequest } from "./client.js";
+import { createClient, createClientFromRequest, Base44SDK } from "./client.js";
 import { Base44Error } from "./utils/axios-client.js";
 import {
   getAccessToken,
@@ -16,3 +16,7 @@ export {
   removeAccessToken,
   getLoginUrl,
 };
+
+export type { Base44SDK };
+
+export * from "./types.js";

src/modules/agents.ts

@@ -1,7 +1,7 @@
-import { RoomsSocket, RoomsSocketConfig } from "../utils/socket-utils.js";
-import { createAxiosClient } from "../utils/axios-client.js";
-import { AgentConversation, AgentMessage } from "./agents.types.js";
+import { RoomsSocket } from "../utils/socket-utils.js";
+import { AgentConversation, AgentMessage } from "./types.js";
 import { AxiosInstance } from "axios";
+import { ModelFilterParams } from "../types.js";
 
 export type AgentsModuleConfig = {
   axios: AxiosInstance;
@@ -14,7 +14,6 @@ export function createAgentsModule({
   socket,
   appId,
 }: AgentsModuleConfig) {
-  let currentConversation: any = null;
   const baseURL = `/apps/${appId}/agents`;
 
   const getConversations = () => {
@@ -27,48 +26,50 @@ export function createAgentsModule({
     );
   };
 
-  const listConversations = (filterParams: any) => {
+  const listConversations = (filterParams: ModelFilterParams) => {
     return axios.get<any, AgentConversation[]>(`${baseURL}/conversations`, {
       params: filterParams,
     });
   };
 
-  const createConversation = (conversation: any) => {
+  const createConversation = (conversation: {
+    agent_name: string;
+    metadata?: Record<string, any>;
+  }) => {
     return axios.post<any, AgentConversation>(
       `${baseURL}/conversations`,
       conversation
     );
   };
-
-  const addMessage = (conversation: any, message: any) => {
-    // this whole trick with current conversation so that we can call the onUpdateModel with the latest messages
-    let convLatestMessages = null;
-    if (currentConversation && currentConversation.id === conversation.id) {
-      convLatestMessages = currentConversation.messages;
-    } else {
-      currentConversation = conversation;
-      convLatestMessages = conversation.messages;
-    }
-    conversation.messages = [...convLatestMessages, message];
-    socket.handlers.update_model({
-      room: `/agent-conversations/${conversation.id}`,
-      data: JSON.stringify(conversation),
-    });
+ 
+  const addMessage = async (
+    conversation: AgentConversation,
+    message: AgentMessage
+  ) => {
+    const room = `/agent-conversations/${conversation.id}`;
+    await socket.updateModel(
+      room,
+      {
+        ...conversation,
+        messages: [...(conversation.messages || []), message],
+      }
+    );
     return axios.post<any, AgentMessage>(
       `${baseURL}/conversations/${conversation.id}/messages`,
       message
     );
   };
 
-  const subscribeToConversation = (conversationId: string, onUpdate: any) => {
-    return socket.subscribeToRoom(`/agent-conversations/${conversationId}`, {
+  const subscribeToConversation = (
+    conversationId: string,
+    onUpdate?: (conversation: AgentConversation) => void
+  ) => {
+    const room = `/agent-conversations/${conversationId}`;
+    return socket.subscribeToRoom(room, {
       connect: () => {},
       update_model: ({ data: jsonStr }) => {
-        const data = JSON.parse(jsonStr) as {} & { id: string };
-        if (currentConversation && currentConversation.id === data.id) {
-          currentConversation = data;
-        }
-        onUpdate(data);
+        const conv = JSON.parse(jsonStr) as AgentConversation;
+        onUpdate?.(conv);
       },
     });
   };

src/modules/agents.types.ts

@@ -0,0 +1,43 @@
+export type AgentConversation = {
+  id: string;
+  app_id: string;
+  agent_name: string;
+  created_by_id: string;
+  messages: AgentMessage[];
+  metadata?: Record<string, any>;
+};
+
+export type AgentMessage = {
+  id: string;
+  role: "user" | "assistant" | "system";
+  reasoning?: {
+    start_date: string;
+    end_date?: string;
+    content: string;
+  };
+  content?: string | Record<string, any> | null;
+  file_urls?: string[] | null;
+  tool_calls?:
+    | {
+        id: string;
+        name: string;
+        arguments_string: string;
+        status: "running" | "success" | "error" | "stopped";
+        results?: string | null;
+      }[]
+    | null;
+
+  usage?: { prompt_tokens?: number; completion_tokens?: number } | null;
+  hidden?: boolean;
+  custom_context?:
+    | { message: string; data: Record<string, any>; type: string }[]
+    | null;
+  model?: string | null;
+  checkpoint_id?: string | null;
+  metadata?: {
+    created_date: string;
+    created_by_email: string;
+    created_by_full_name: string | null;
+  };
+  additional_message_params?: Record<string, any>;
+};

src/modules/types.ts

@@ -0,0 +1,12 @@
+export * from "./modules/types.js";
+
+export type ModelFilterParams = {
+  q?: Record<string, any>;
+  sort?: string | null;
+  sort_by?: string | null;
+  limit?: number | null;
+  skip?: number | null;
+  fields?: string[] | null;
+};
+
+

src/types.ts

@@ -14,9 +14,12 @@ export type TJsonStr = string;
 
 type RoomsSocketEventsMap = {
   listen: {
-    connect: () => void;
-    update_model: (msg: { room: string; data: TJsonStr }) => void;
-    error: (error: Error) => void;
+    connect: () => Promise<void> | void;
+    update_model: (msg: {
+      room: string;
+      data: TJsonStr;
+    }) => Promise<void> | void;
+    error: (error: Error) => Promise<void> | void;
   };
   emit: {
     join: (room: string) => void;
@@ -26,9 +29,7 @@ type RoomsSocketEventsMap = {
 
 type TEvent = keyof RoomsSocketEventsMap["listen"];
 
-type THandler<E extends TEvent> = (
-  ...args: Parameters<RoomsSocketEventsMap["listen"][E]>
-) => void;
+type THandler<E extends TEvent> = RoomsSocketEventsMap["listen"][E];
 
 function initializeSocket(
   config: RoomsSocketConfig,
@@ -68,6 +69,8 @@ function initializeSocket(
   return socket;
 }
 
+export type RoomsSocket = ReturnType<typeof RoomsSocket>;
+
 export function RoomsSocket({ config }: { config: RoomsSocketConfig }) {
   let currentConfig = { ...config };
   const roomsToListeners: Record<
@@ -76,24 +79,28 @@ export function RoomsSocket({ config }: { config: RoomsSocketConfig }) {
   > = {};
 
   const handlers: { [k in TEvent]: THandler<k> } = {
-    connect: () => {
+    connect: async () => {
+      const promises: Promise<void>[] = [];
       Object.keys(roomsToListeners).forEach((room) => {
         joinRoom(room);
-        getListeners(room)?.forEach(({ connect: connectHandler }) => {
-          connectHandler?.();
+        const listeners = getListeners(room);
+        listeners?.forEach(({ connect }) => {
+          const promise = async () => connect?.();
+          promises.push(promise());
         });
       });
+      await Promise.all(promises);
     },
-    update_model: (msg) => {
-      if (roomsToListeners[msg.room]) {
-        getListeners(msg.room)?.forEach(({ update_model }) => {
-          update_model?.(msg);
-        });
-      }
+    update_model: async (msg) => {
+      const listeners = getListeners(msg.room);
+      const promises = listeners.map((listener) =>
+        listener.update_model?.(msg)
+      );
+      await Promise.all(promises);
     },
-    error: (error) => {
+    error: async (error) => {
       console.error("error", error);
-      handlers.error?.(error);
+      await handlers.error?.(error);
     },
   };
 
@@ -126,6 +133,11 @@ export function RoomsSocket({ config }: { config: RoomsSocketConfig }) {
     socket.emit("leave", room);
   }
 
+  async function updateModel(room: string, data: any) {
+    const dataStr = JSON.stringify(data);
+    return handlers.update_model?.({ room, data: dataStr });
+  }
+
   function getListeners(room: string) {
     return roomsToListeners[room];
   }
@@ -152,7 +164,7 @@ export function RoomsSocket({ config }: { config: RoomsSocketConfig }) {
     socket,
     subscribeToRoom,
     updateConfig,
-    handlers,
+    updateModel,
     disconnect,
   };
 }