♻️ Include autoContinueChat function in startBotFlow

packages/bot-engine/src/apiHandlers/continueChat.ts

@@ -1,7 +1,6 @@
 import { TRPCError } from "@trpc/server";
 import { BubbleBlockType } from "@typebot.io/blocks-bubbles/constants";
 import { isDefined, isNotDefined } from "@typebot.io/lib/utils";
-import { autoContinueChatIfStartingWithInput } from "../autoContinueChatIfStartingWithInput";
 import { computeCurrentProgress } from "../computeCurrentProgress";
 import { continueBotFlow } from "../continueBotFlow";
 import { filterPotentiallySensitiveLogs } from "../logs/filterPotentiallySensitiveLogs";
@@ -53,13 +52,6 @@ export const continueChat = async ({
     else corsOrigin = session.state.allowedOrigins[0];
   }
 
-  const chatReply = await continueBotFlow(message, {
-    version: 2,
-    state: session.state,
-    startTime: Date.now(),
-    textBubbleContentFormat,
-  });
-
   const {
     messages,
     input,
@@ -69,14 +61,12 @@ export const continueChat = async ({
     lastMessageNewFormat,
     visitedEdges,
     setVariableHistory,
-  } = !session.state.currentBlockId
-    ? await autoContinueChatIfStartingWithInput({
-        message,
-        chatReply,
-        textBubbleContentFormat,
-        version: 2,
-      })
-    : chatReply;
+  } = await continueBotFlow(message, {
+    version: 2,
+    state: session.state,
+    startTime: Date.now(),
+    textBubbleContentFormat,
+  });
 
   if (newSessionState)
     await saveStateToDatabase({

packages/bot-engine/src/continueBotFlow.ts

@@ -71,6 +71,7 @@ export const continueBotFlow = async (
   resetVariablesGlobals();
   if (!state.currentBlockId)
     return startBotFlow({
+      message: reply,
       state: resetSessionState(state),
       version,
       textBubbleContentFormat,

packages/bot-engine/src/startBotFlow.ts

@@ -1,15 +1,24 @@
 import { TRPCError } from "@trpc/server";
 import type { Prisma } from "@typebot.io/prisma/types";
 import type { SetVariableHistoryItem } from "@typebot.io/variables/schemas";
+import { continueBotFlow } from "./continueBotFlow";
 import { executeGroup } from "./executeGroup";
 import { getFirstEdgeId } from "./getFirstEdgeId";
 import { getNextGroup } from "./getNextGroup";
 import { resetGlobals } from "./globals";
-import type { ContinueChatResponse, StartFrom } from "./schemas/api";
+import { upsertResult } from "./queries/upsertResult";
+import type { ContinueChatResponse, Message, StartFrom } from "./schemas/api";
 import type { SessionState } from "./schemas/chatSession";
 
+type ChatReply = ContinueChatResponse & {
+  newSessionState: SessionState;
+  visitedEdges: Prisma.VisitedEdge[];
+  setVariableHistory: SetVariableHistoryItem[];
+};
+
 type Props = {
   version: 1 | 2;
+  message: Message | undefined;
   state: SessionState;
   startFrom?: StartFrom;
   startTime?: number;
@@ -18,17 +27,12 @@ type Props = {
 
 export const startBotFlow = async ({
   version,
+  message,
   state,
   startFrom,
   startTime,
   textBubbleContentFormat,
-}: Props): Promise<
-  ContinueChatResponse & {
-    newSessionState: SessionState;
-    visitedEdges: Prisma.VisitedEdge[];
-    setVariableHistory: SetVariableHistoryItem[];
-  }
-> => {
+}: Props): Promise<ChatReply> => {
   resetGlobals();
   let newSessionState = state;
   const visitedEdges: Prisma.VisitedEdge[] = [];
@@ -70,12 +74,51 @@ export const startBotFlow = async ({
   newSessionState = nextGroup.newSessionState;
   if (!nextGroup.group)
     return { messages: [], newSessionState, visitedEdges, setVariableHistory };
-  return executeGroup(nextGroup.group, {
+  const chatReply = await executeGroup(nextGroup.group, {
     version,
     state: newSessionState,
     visitedEdges,
     setVariableHistory,
     startTime,
     textBubbleContentFormat,
   });
+
+  return autoContinueChatIfStartingWithInput({
+    message,
+    state: newSessionState,
+    chatReply,
+    textBubbleContentFormat,
+    version,
+  });
+};
+
+const autoContinueChatIfStartingWithInput = async ({
+  version,
+  message,
+  chatReply,
+  textBubbleContentFormat,
+}: Props & { chatReply: ChatReply }): Promise<ChatReply> => {
+  console.log("HEY", message, chatReply);
+  if (
+    !message ||
+    chatReply.messages.length > 0 ||
+    (chatReply.clientSideActions?.filter((c) => c.expectsDedicatedReply)
+      .length ?? 0) > 0
+  )
+    return chatReply;
+
+  const resultId = chatReply.newSessionState.typebotsQueue[0].resultId;
+  if (resultId)
+    await upsertResult({
+      hasStarted: true,
+      isCompleted: false,
+      resultId,
+      typebot: chatReply.newSessionState.typebotsQueue[0].typebot,
+    });
+  return continueBotFlow(message, {
+    version,
+    state: chatReply.newSessionState,
+    textBubbleContentFormat: textBubbleContentFormat,
+    startTime: Date.now(),
+  });
 };

packages/bot-engine/src/startSession.ts

@@ -31,7 +31,6 @@ import {
 } from "@typebot.io/variables/schemas";
 import { z } from "@typebot.io/zod";
 import { NodeType, parse } from "node-html-parser";
-import { autoContinueChatIfStartingWithInput } from "./autoContinueChatIfStartingWithInput";
 import { parseVariablesInRichText } from "./parseBubbleBlock";
 import { parseDynamicTheme } from "./parseDynamicTheme";
 import { findPublicTypebot } from "./queries/findPublicTypebot";
@@ -172,15 +171,6 @@ export const startSession = async ({
     };
   }
 
-  const chatReply = await startBotFlow({
-    version,
-    state: initialState,
-    startFrom:
-      startParams.type === "preview" ? startParams.startFrom : undefined,
-    startTime: Date.now(),
-    textBubbleContentFormat: startParams.textBubbleContentFormat,
-  });
-
   const {
     messages,
     input,
@@ -189,10 +179,13 @@ export const startSession = async ({
     logs,
     visitedEdges,
     setVariableHistory,
-  } = await autoContinueChatIfStartingWithInput({
+  } = await startBotFlow({
     version,
     message: startParams.message,
-    chatReply,
+    state: initialState,
+    startFrom:
+      startParams.type === "preview" ? startParams.startFrom : undefined,
+    startTime: Date.now(),
     textBubbleContentFormat: startParams.textBubbleContentFormat,
   });