✨ (whatsapp) Add custom session expiration (#842)

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
### Summary by CodeRabbit

- New Feature: Introduced session expiry timeout for WhatsApp
integration, allowing users to set the duration after which a session
expires.
- New Feature: Added an option to enable/disable the start bot condition
in WhatsApp integration settings.
- Refactor: Enhanced error handling by throwing specific errors when
necessary conditions are not met.
- Refactor: Improved UI components like `NumberInput` and
`SwitchWithLabel` for better usability.
- Bug Fix: Fixed issues related to session resumption and message
sending in expired sessions. Now, if a session is expired, a new one
will be started instead of attempting to resume the old one.
- Chore: Updated various schemas to reflect changes in session
management and WhatsApp settings.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

packages/bot-engine/continueBotFlow.ts

@@ -29,6 +29,7 @@ import { validateRatingReply } from './blocks/inputs/rating/validateRatingReply'
 import { parsePictureChoicesReply } from './blocks/inputs/pictureChoice/parsePictureChoicesReply'
 import { parseVariables } from './variables/parseVariables'
 import { updateVariablesInSession } from './variables/updateVariablesInSession'
+import { TRPCError } from '@trpc/server'
 
 export const continueBotFlow =
   (state: SessionState) =>
@@ -46,7 +47,11 @@ export const continueBotFlow =
 
     const block = blockIndex >= 0 ? group?.blocks[blockIndex ?? 0] : null
 
-    if (!block || !group) return startBotFlow(state)
+    if (!block || !group)
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: 'Group / block not found',
+      })
 
     if (block.type === LogicBlockType.SET_VARIABLE) {
       const existingVariable = state.typebotsQueue[0].typebot.variables.find(

packages/bot-engine/queries/getSession.ts

@@ -1,12 +1,10 @@
 import prisma from '@typebot.io/lib/prisma'
 import { ChatSession, sessionStateSchema } from '@typebot.io/schemas'
 
-export const getSession = async (
-  sessionId: string
-): Promise<Pick<ChatSession, 'state' | 'id'> | null> => {
+export const getSession = async (sessionId: string) => {
   const session = await prisma.chatSession.findUnique({
     where: { id: sessionId },
-    select: { id: true, state: true },
+    select: { id: true, state: true, updatedAt: true },
   })
   if (!session) return null
   return { ...session, state: sessionStateSchema.parse(session.state) }

packages/bot-engine/whatsapp/resumeWhatsAppFlow.ts

@@ -11,6 +11,7 @@ import { continueBotFlow } from '../continueBotFlow'
 import { decrypt } from '@typebot.io/lib/api'
 import { saveStateToDatabase } from '../saveStateToDatabase'
 import prisma from '@typebot.io/lib/prisma'
+import { isDefined } from '@typebot.io/lib/utils'
 
 export const resumeWhatsAppFlow = async ({
   receivedMessage,
@@ -64,17 +65,23 @@ export const resumeWhatsAppFlow = async ({
     }
   }
 
-  const resumeResponse = sessionState
-    ? await continueBotFlow(sessionState)(messageContent)
-    : workspaceId
-    ? await startWhatsAppSession({
-        message: receivedMessage,
-        sessionId,
-        workspaceId,
-        credentials: { ...credentials, id: credentialsId as string },
-        contact,
-      })
-    : undefined
+  const isSessionExpired =
+    session &&
+    isDefined(session.state.expiryTimeout) &&
+    session?.updatedAt.getTime() + session.state.expiryTimeout < Date.now()
+
+  const resumeResponse =
+    sessionState && !isSessionExpired
+      ? await continueBotFlow(sessionState)(messageContent)
+      : workspaceId
+      ? await startWhatsAppSession({
+          message: receivedMessage,
+          sessionId,
+          workspaceId,
+          credentials: { ...credentials, id: credentialsId as string },
+          contact,
+        })
+      : undefined
 
   if (!resumeResponse) {
     console.error('Could not find or create session', sessionId)

packages/bot-engine/whatsapp/startWhatsAppSession.ts

@@ -11,6 +11,7 @@ import {
 import {
   WhatsAppCredentials,
   WhatsAppIncomingMessage,
+  defaultSessionExpiryTimeout,
 } from '@typebot.io/schemas/features/whatsapp'
 import { isNotDefined } from '@typebot.io/lib/utils'
 import { startSession } from '../startSession'
@@ -76,14 +77,18 @@ export const startWhatsAppSession = async ({
     userId: undefined,
   })
 
+  const sessionExpiryTimeoutHours =
+    publicTypebot.settings.whatsApp?.sessionExpiryTimeout ??
+    defaultSessionExpiryTimeout
+
   return {
     ...session,
     newSessionState: {
       ...session.newSessionState,
       whatsApp: {
         contact,
-        credentialsId: credentials.id,
       },
+      expiryTimeout: sessionExpiryTimeoutHours * 60 * 60 * 1000,
     },
   }
 }