⚡ (bot) Use ky for queries in bot to improve reliability

2023-12-20 08:31:22 +01:00
parent f2cccbd33f
commit a6536461e5
11 changed files with 167 additions and 135 deletions
--- a/packages/embeds/js/src/queries/continueChatQuery.ts
+++ b/packages/embeds/js/src/queries/continueChatQuery.ts
@@ -1,8 +1,9 @@
 import { guessApiHost } from '@/utils/guessApiHost'
-import { isNotEmpty, sendRequest } from '@typebot.io/lib'
+import { isNotEmpty } from '@typebot.io/lib'
 import { ContinueChatResponse } from '@typebot.io/schemas'
+import ky from 'ky'

-export const continueChatQuery = ({
+export const continueChatQuery = async ({
  apiHost,
  message,
  sessionId,
@@ -10,13 +11,24 @@ export const continueChatQuery = ({
  apiHost?: string
  message: string | undefined
  sessionId: string
-}) =>
-  sendRequest<ContinueChatResponse>({
-    method: 'POST',
-    url: `${
-      isNotEmpty(apiHost) ? apiHost : guessApiHost()
-    }/api/v1/sessions/${sessionId}/continueChat`,
-    body: {
-      message,
-    },
-  })
+}) => {
+  try {
+    const data = await ky
+      .post(
+        `${
+          isNotEmpty(apiHost) ? apiHost : guessApiHost()
+        }/api/v1/sessions/${sessionId}/continueChat`,
+        {
+          json: {
+            message,
+          },
+          timeout: false,
+        }
+      )
+      .json<ContinueChatResponse>()
+
+    return { data }
+  } catch (error) {
+    return { error }
+  }
+}
--- a/packages/embeds/js/src/queries/getOpenAiStreamerQuery.ts
+++ b/packages/embeds/js/src/queries/getOpenAiStreamerQuery.ts
@@ -1,33 +0,0 @@
-import { guessApiHost } from '@/utils/guessApiHost'
-import { isNotEmpty } from '@typebot.io/lib'
-
-export const getOpenAiStreamerQuery =
-  ({ apiHost, sessionId }: { apiHost?: string; sessionId: string }) =>
-  async (
-    messages: {
-      content?: string | undefined
-      role?: 'system' | 'user' | 'assistant' | undefined
-    }[]
-  ) => {
-    const response = await fetch(
-      `${
-        isNotEmpty(apiHost) ? apiHost : guessApiHost()
-      }/api/integrations/openai/streamer`,
-      {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          sessionId,
-          messages,
-        }),
-      }
-    )
-    if (!response.ok) {
-      throw new Error(response.statusText)
-    }
-
-    const data = response.body
-    return data
-  }
--- a/packages/embeds/js/src/queries/saveClientLogsQuery.ts
+++ b/packages/embeds/js/src/queries/saveClientLogsQuery.ts
@@ -1,8 +1,9 @@
 import { guessApiHost } from '@/utils/guessApiHost'
 import type { ChatLog } from '@typebot.io/schemas'
-import { isNotEmpty, sendRequest } from '@typebot.io/lib'
+import { isNotEmpty } from '@typebot.io/lib'
+import ky from 'ky'

-export const saveClientLogsQuery = ({
+export const saveClientLogsQuery = async ({
  apiHost,
  sessionId,
  clientLogs,
@@ -10,13 +11,19 @@ export const saveClientLogsQuery = ({
  apiHost?: string
  sessionId: string
  clientLogs: ChatLog[]
-}) =>
-  sendRequest({
-    method: 'POST',
-    url: `${
-      isNotEmpty(apiHost) ? apiHost : guessApiHost()
-    }/api/v1/sessions/${sessionId}/clientLogs`,
-    body: {
-      clientLogs,
-    },
-  })
+}) => {
+  try {
+    await ky.post(
+      `${
+        isNotEmpty(apiHost) ? apiHost : guessApiHost()
+      }/api/v1/sessions/${sessionId}/clientLogs`,
+      {
+        json: {
+          clientLogs,
+        },
+      }
+    )
+  } catch (e) {
+    console.log(e)
+  }
+}
--- a/packages/embeds/js/src/queries/startChatQuery.ts
+++ b/packages/embeds/js/src/queries/startChatQuery.ts
@@ -1,6 +1,6 @@
 import { BotContext, InitialChatReply } from '@/types'
 import { guessApiHost } from '@/utils/guessApiHost'
-import { isNotDefined, isNotEmpty, sendRequest } from '@typebot.io/lib'
+import { isNotDefined, isNotEmpty } from '@typebot.io/lib'
 import {
  getPaymentInProgressInStorage,
  removePaymentInProgressFromStorage,
@@ -10,6 +10,18 @@ import {
  StartFrom,
  StartPreviewChatInput,
 } from '@typebot.io/schemas'
+import ky from 'ky'
+
+type Props = {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  typebot: string | any
+  stripeRedirectStatus?: string
+  apiHost?: string
+  startFrom?: StartFrom
+  isPreview: boolean
+  prefilledVariables?: Record<string, unknown>
+  resultId?: string
+}

 export async function startChatQuery({
  typebot,
@@ -19,16 +31,7 @@ export async function startChatQuery({
  resultId,
  stripeRedirectStatus,
  startFrom,
-}: {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  typebot: string | any
-  stripeRedirectStatus?: string
-  apiHost?: string
-  startFrom?: StartFrom
-  isPreview: boolean
-  prefilledVariables?: Record<string, unknown>
-  resultId?: string
-}) {
+}: Props) {
  if (isNotDefined(typebot))
    throw new Error('Typebot ID is required to get initial messages')

@@ -41,67 +44,75 @@ export async function startChatQuery({
    : undefined
  if (paymentInProgressState) {
    removePaymentInProgressFromStorage()
-    const { data, error, response } = await sendRequest<InitialChatReply>({
-      method: 'POST',
-      url: `${isNotEmpty(apiHost) ? apiHost : guessApiHost()}/api/v1/sessions/${
-        paymentInProgressState.sessionId
-      }/continueChat`,
-      body: {
-        message: paymentInProgressState
-          ? stripeRedirectStatus === 'failed'
-            ? 'fail'
-            : 'Success'
-          : undefined,
-      },
-    })
-    return {
-      data: data
-        ? {
-            ...data,
-            ...(paymentInProgressState
-              ? { typebot: paymentInProgressState.typebot }
-              : {}),
+
+    try {
+      const data = await ky
+        .post(
+          `${isNotEmpty(apiHost) ? apiHost : guessApiHost()}/api/v1/sessions/${
+            paymentInProgressState.sessionId
+          }/continueChat`,
+          {
+            json: {
+              message: paymentInProgressState
+                ? stripeRedirectStatus === 'failed'
+                  ? 'fail'
+                  : 'Success'
+                : undefined,
+            },
+            timeout: false,
          }
-        : undefined,
-      error,
-      response,
+        )
+        .json<InitialChatReply>()
+
+      return { data }
+    } catch (error) {
+      return { error }
    }
  }
  const typebotId = typeof typebot === 'string' ? typebot : typebot.id
  if (isPreview) {
-    const { data, error, response } = await sendRequest<InitialChatReply>({
-      method: 'POST',
-      url: `${
-        isNotEmpty(apiHost) ? apiHost : guessApiHost()
-      }/api/v1/typebots/${typebotId}/preview/startChat`,
-      body: {
-        isStreamEnabled: true,
-        startFrom,
-        typebot,
-      } satisfies Omit<StartPreviewChatInput, 'typebotId'>,
-    })
-    return {
-      data,
-      error,
-      response,
+    try {
+      const data = await ky
+        .post(
+          `${
+            isNotEmpty(apiHost) ? apiHost : guessApiHost()
+          }/api/v1/typebots/${typebotId}/preview/startChat`,
+          {
+            json: {
+              isStreamEnabled: true,
+              startFrom,
+              typebot,
+            } satisfies Omit<StartPreviewChatInput, 'typebotId'>,
+            timeout: false,
+          }
+        )
+        .json<InitialChatReply>()
+
+      return { data }
+    } catch (error) {
+      return { error }
    }
  }

-  const { data, error, response } = await sendRequest<InitialChatReply>({
-    method: 'POST',
-    url: `${
-      isNotEmpty(apiHost) ? apiHost : guessApiHost()
-    }/api/v1/typebots/${typebotId}/startChat`,
-    body: {
-      isStreamEnabled: true,
-      prefilledVariables,
-      resultId,
-    } satisfies Omit<StartChatInput, 'publicId'>,
-  })
+  try {
+    const data = await ky
+      .post(
+        `${
+          isNotEmpty(apiHost) ? apiHost : guessApiHost()
+        }/api/v1/typebots/${typebotId}/startChat`,
+        {
+          json: {
+            isStreamEnabled: true,
+            prefilledVariables,
+            resultId,
+          } satisfies Omit<StartChatInput, 'publicId'>,
+          timeout: false,
+        }
+      )
+      .json<InitialChatReply>()

-  return {
-    data,
-    error,
-    response,
+    return { data }
+  } catch (error) {
+    return { error }
  }
 }