From 3a0ff4b59ea7ac0b1adc7fda37b561301a24e1ae Mon Sep 17 00:00:00 2001 From: Baptiste Arnaud Date: Thu, 18 Dec 2025 11:13:05 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Fix=20bot=20handler=20a?= =?UTF-8?q?pi=20error=20definition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/bot-engine/src/api/handleContinueChat.ts | 8 +++----- packages/bot-engine/src/api/handleSaveClientLogs.ts | 11 ++++------- .../src/api/handleUpdateTypebotInSession.ts | 6 +++--- .../src/api/legacy/handleSaveClientLogsV1.ts | 11 ++++------- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/packages/bot-engine/src/api/handleContinueChat.ts b/packages/bot-engine/src/api/handleContinueChat.ts index 70d789fb1..5014f0f11 100644 --- a/packages/bot-engine/src/api/handleContinueChat.ts +++ b/packages/bot-engine/src/api/handleContinueChat.ts @@ -1,4 +1,4 @@ -import { TRPCError } from "@trpc/server"; +import { ORPCError } from "@orpc/server"; import { BubbleBlockType } from "@typebot.io/blocks-bubbles/constants"; import { messageSchema } from "@typebot.io/chat-api/schemas"; import { getSession } from "@typebot.io/chat-session/queries/getSession"; @@ -40,8 +40,7 @@ export const handleContinueChat = async ({ const session = await getSession(sessionId); if (!session?.state) { - throw new TRPCError({ - code: "NOT_FOUND", + throw new ORPCError("NOT_FOUND", { message: "Session not found.", }); } @@ -57,8 +56,7 @@ export const handleContinueChat = async ({ session.updatedAt.getTime() + session.state.expiryTimeout < Date.now(); if (isSessionExpired) - throw new TRPCError({ - code: "NOT_FOUND", + throw new ORPCError("NOT_FOUND", { message: "Session expired. You need to start a new session.", }); diff --git a/packages/bot-engine/src/api/handleSaveClientLogs.ts b/packages/bot-engine/src/api/handleSaveClientLogs.ts index 56acaa497..d0acfa591 100644 --- a/packages/bot-engine/src/api/handleSaveClientLogs.ts +++ b/packages/bot-engine/src/api/handleSaveClientLogs.ts @@ -1,4 +1,4 @@ -import { TRPCError } from "@trpc/server"; +import { ORPCError } from "@orpc/server"; import { getSession } from "@typebot.io/chat-session/queries/getSession"; import { logInSessionSchema } from "@typebot.io/logs/schemas"; import { z } from "@typebot.io/zod"; @@ -26,8 +26,7 @@ export const handleSaveClientLogs = async ({ const session = await getSession(sessionId); if (!session?.state) { - throw new TRPCError({ - code: "NOT_FOUND", + throw new ORPCError("NOT_FOUND", { message: "Session not found.", }); } @@ -40,8 +39,7 @@ export const handleSaveClientLogs = async ({ const resultId = session.state.typebotsQueue[0].resultId; if (!resultId) { - throw new TRPCError({ - code: "NOT_FOUND", + throw new ORPCError("NOT_FOUND", { message: "Result not found.", }); } @@ -59,8 +57,7 @@ export const handleSaveClientLogs = async ({ }; } catch (e) { console.error("Failed to save logs", e); - throw new TRPCError({ - code: "INTERNAL_SERVER_ERROR", + throw new ORPCError("INTERNAL_SERVER_ERROR", { message: "Failed to save logs.", }); } diff --git a/packages/bot-engine/src/api/handleUpdateTypebotInSession.ts b/packages/bot-engine/src/api/handleUpdateTypebotInSession.ts index 3813be242..27d35a6e9 100644 --- a/packages/bot-engine/src/api/handleUpdateTypebotInSession.ts +++ b/packages/bot-engine/src/api/handleUpdateTypebotInSession.ts @@ -1,4 +1,4 @@ -import { TRPCError } from "@trpc/server"; +import { ORPCError } from "@orpc/server"; import { getSession } from "@typebot.io/chat-session/queries/getSession"; import type { SessionState } from "@typebot.io/chat-session/schemas"; import prisma from "@typebot.io/prisma"; @@ -24,7 +24,7 @@ export const handleUpdateTypebotInSession = async ({ }) => { const session = await getSession(sessionId); if (!session?.state) - throw new TRPCError({ code: "NOT_FOUND", message: "Session not found" }); + throw new ORPCError("NOT_FOUND", { message: "Session not found" }); const publicTypebot = (await prisma.publicTypebot.findFirst({ where: { @@ -54,7 +54,7 @@ export const handleUpdateTypebotInSession = async ({ })) as Pick | null; if (!publicTypebot) - throw new TRPCError({ code: "UNAUTHORIZED", message: "Unauthorized" }); + throw new ORPCError("UNAUTHORIZED", { message: "Unauthorized" }); const newSessionState = updateSessionState(session.state, publicTypebot); diff --git a/packages/bot-engine/src/api/legacy/handleSaveClientLogsV1.ts b/packages/bot-engine/src/api/legacy/handleSaveClientLogsV1.ts index b870edecf..1efc25edf 100644 --- a/packages/bot-engine/src/api/legacy/handleSaveClientLogsV1.ts +++ b/packages/bot-engine/src/api/legacy/handleSaveClientLogsV1.ts @@ -1,4 +1,4 @@ -import { TRPCError } from "@trpc/server"; +import { ORPCError } from "@orpc/server"; import { getSession } from "@typebot.io/chat-session/queries/getSession"; import { safeStringify } from "@typebot.io/lib/safeStringify"; import { logInSessionSchema } from "@typebot.io/logs/schemas"; @@ -31,8 +31,7 @@ export const handleSaveClientLogsV1 = async ({ const session = await getSession(sessionId); if (!session?.state) { - throw new TRPCError({ - code: "NOT_FOUND", + throw new ORPCError("NOT_FOUND", { message: "Session not found.", }); } @@ -45,8 +44,7 @@ export const handleSaveClientLogsV1 = async ({ const resultId = session.state.typebotsQueue[0].resultId; if (!resultId) { - throw new TRPCError({ - code: "NOT_FOUND", + throw new ORPCError("NOT_FOUND", { message: "Result not found.", }); } @@ -71,8 +69,7 @@ export const handleSaveClientLogsV1 = async ({ }; } catch (e) { console.error("Failed to save logs", e); - throw new TRPCError({ - code: "INTERNAL_SERVER_ERROR", + throw new ORPCError("INTERNAL_SERVER_ERROR", { message: "Failed to save logs.", }); }