🐛 New sendMessage version for the new parser

Make sure old client still communicate with old parser

apps/viewer/src/features/chat/api/sendMessageV1.ts

@@ -12,7 +12,7 @@ import { continueBotFlow } from '@typebot.io/bot-engine/continueBotFlow'
 import { parseDynamicTheme } from '@typebot.io/bot-engine/parseDynamicTheme'
 import { isDefined } from '@typebot.io/lib/utils'
 
-export const sendMessage = publicProcedure
+export const sendMessageV1 = publicProcedure
   .meta({
     openapi: {
       method: 'POST',
@@ -57,7 +57,12 @@ export const sendMessage = publicProcedure
           logs,
           clientSideActions,
           newSessionState,
-        } = await startSession({ startParams, userId: user?.id, message })
+        } = await startSession({
+          version: 1,
+          startParams,
+          userId: user?.id,
+          message,
+        })
 
         const allLogs = clientLogs ? [...(logs ?? []), ...clientLogs] : logs
 
@@ -98,7 +103,7 @@ export const sendMessage = publicProcedure
           newSessionState,
           logs,
           lastMessageNewFormat,
-        } = await continueBotFlow(session.state)(message)
+        } = await continueBotFlow(message, { version: 1, state: session.state })
 
         const allLogs = clientLogs ? [...(logs ?? []), ...clientLogs] : logs
 

apps/viewer/src/features/chat/api/sendMessageV2.ts

@@ -0,0 +1,131 @@
+import { publicProcedure } from '@/helpers/server/trpc'
+import {
+  chatReplySchema,
+  sendMessageInputSchema,
+} from '@typebot.io/schemas/features/chat/schema'
+import { TRPCError } from '@trpc/server'
+import { getSession } from '@typebot.io/bot-engine/queries/getSession'
+import { startSession } from '@typebot.io/bot-engine/startSession'
+import { saveStateToDatabase } from '@typebot.io/bot-engine/saveStateToDatabase'
+import { restartSession } from '@typebot.io/bot-engine/queries/restartSession'
+import { continueBotFlow } from '@typebot.io/bot-engine/continueBotFlow'
+import { parseDynamicTheme } from '@typebot.io/bot-engine/parseDynamicTheme'
+import { isDefined } from '@typebot.io/lib/utils'
+
+export const sendMessageV2 = publicProcedure
+  .meta({
+    openapi: {
+      method: 'POST',
+      path: '/sendMessage',
+      summary: 'Send a message',
+      description:
+        'To initiate a chat, do not provide a `sessionId` nor a `message`.\n\nContinue the conversation by providing the `sessionId` and the `message` that should answer the previous question.\n\nSet the `isPreview` option to `true` to chat with the non-published version of the typebot.',
+    },
+  })
+  .input(sendMessageInputSchema)
+  .output(chatReplySchema)
+  .mutation(
+    async ({
+      input: { sessionId, message, startParams, clientLogs },
+      ctx: { user },
+    }) => {
+      const session = sessionId ? await getSession(sessionId) : null
+
+      const isSessionExpired =
+        session &&
+        isDefined(session.state.expiryTimeout) &&
+        session.updatedAt.getTime() + session.state.expiryTimeout < Date.now()
+
+      if (isSessionExpired)
+        throw new TRPCError({
+          code: 'NOT_FOUND',
+          message: 'Session expired. You need to start a new session.',
+        })
+
+      if (!session) {
+        if (!startParams)
+          throw new TRPCError({
+            code: 'BAD_REQUEST',
+            message: 'Missing startParams',
+          })
+        const {
+          typebot,
+          messages,
+          input,
+          resultId,
+          dynamicTheme,
+          logs,
+          clientSideActions,
+          newSessionState,
+        } = await startSession({
+          version: 2,
+          startParams,
+          userId: user?.id,
+          message,
+        })
+
+        const allLogs = clientLogs ? [...(logs ?? []), ...clientLogs] : logs
+
+        const session = startParams?.isOnlyRegistering
+          ? await restartSession({
+              state: newSessionState,
+            })
+          : await saveStateToDatabase({
+              session: {
+                state: newSessionState,
+              },
+              input,
+              logs: allLogs,
+              clientSideActions,
+            })
+
+        return {
+          sessionId: session.id,
+          typebot: typebot
+            ? {
+                id: typebot.id,
+                theme: typebot.theme,
+                settings: typebot.settings,
+              }
+            : undefined,
+          messages,
+          input,
+          resultId,
+          dynamicTheme,
+          logs,
+          clientSideActions,
+        }
+      } else {
+        const {
+          messages,
+          input,
+          clientSideActions,
+          newSessionState,
+          logs,
+          lastMessageNewFormat,
+        } = await continueBotFlow(message, { version: 2, state: session.state })
+
+        const allLogs = clientLogs ? [...(logs ?? []), ...clientLogs] : logs
+
+        if (newSessionState)
+          await saveStateToDatabase({
+            session: {
+              id: session.id,
+              state: newSessionState,
+            },
+            input,
+            logs: allLogs,
+            clientSideActions,
+          })
+
+        return {
+          messages,
+          input,
+          clientSideActions,
+          dynamicTheme: parseDynamicTheme(newSessionState),
+          logs,
+          lastMessageNewFormat,
+        }
+      }
+    }
+  )