Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,16 @@ export function createClient(config: {
token,
};

const socket = RoomsSocket({
config: socketConfig,
});
let socket: ReturnType<typeof RoomsSocket> | null = null;

const getSocket = () => {
if (!socket) {
socket = RoomsSocket({
config: socketConfig,
});
}
return socket;
};

const headers = {
...optionalHeaders,
Expand Down Expand Up @@ -113,14 +120,16 @@ export function createClient(config: {
functions: createFunctionsModule(functionsAxiosClient, appId),
agents: createAgentsModule({
axios: axiosClient,
socket,
getSocket,
appId,
serverUrl,
token,
}),
appLogs: createAppLogsModule(axiosClient, appId),
cleanup: () => {
socket.disconnect();
if (socket) {
socket.disconnect();
}
},
};

Expand All @@ -132,14 +141,16 @@ export function createClient(config: {
functions: createFunctionsModule(serviceRoleFunctionsAxiosClient, appId),
agents: createAgentsModule({
axios: serviceRoleAxiosClient,
socket,
getSocket,
appId,
serverUrl,
token,
}),
appLogs: createAppLogsModule(serviceRoleAxiosClient, appId),
cleanup: () => {
socket.disconnect();
if (socket) {
socket.disconnect();
}
},
};

Expand Down Expand Up @@ -178,9 +189,12 @@ export function createClient(config: {
*/
setToken(newToken: string) {
userModules.auth.setToken(newToken);
socket.updateConfig({
token: newToken,
});
if (socket) {
socket.updateConfig({
token: newToken,
});
}
socketConfig.token = newToken;
},

/**
Expand Down
6 changes: 4 additions & 2 deletions src/modules/agents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import { getAccessToken } from "../utils/auth-utils.js";

export type AgentsModuleConfig = {
axios: AxiosInstance;
socket: ReturnType<typeof RoomsSocket>;
getSocket: () => ReturnType<typeof RoomsSocket>;
appId: string;
serverUrl?: string;
token?: string;
};

export function createAgentsModule({
axios,
socket,
getSocket,
appId,
serverUrl,
token,
Expand Down Expand Up @@ -52,6 +52,7 @@ export function createAgentsModule({
message: AgentMessage
) => {
const room = `/agent-conversations/${conversation.id}`;
const socket = getSocket();
await socket.updateModel(
room,
{
Expand All @@ -70,6 +71,7 @@ export function createAgentsModule({
onUpdate?: (conversation: AgentConversation) => void
) => {
const room = `/agent-conversations/${conversationId}`;
const socket = getSocket();
return socket.subscribeToRoom(room, {
connect: () => {},
update_model: ({ data: jsonStr }) => {
Expand Down