🔥 Remove streamer Pages API endpoint

apps/builder/src/features/blocks/integrations/openai/api/listModels.ts

@@ -3,7 +3,7 @@ import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'
 import { isReadWorkspaceFobidden } from '@/features/workspace/helpers/isReadWorkspaceFobidden'
-import { decrypt } from '@typebot.io/lib/api'
+import { decrypt } from '@typebot.io/lib/api/encryption/decrypt'
 import {
   OpenAICredentials,
   defaultBaseUrl,

apps/builder/src/features/blocks/integrations/zemanticAi/api/listProjects.ts

@@ -3,7 +3,7 @@ import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'
 import { isReadWorkspaceFobidden } from '@/features/workspace/helpers/isReadWorkspaceFobidden'
-import { decrypt } from '@typebot.io/lib/api'
+import { decrypt } from '@typebot.io/lib/api/encryption/decrypt'
 import { ZemanticAiCredentials } from '@typebot.io/schemas/features/blocks/integrations/zemanticAi'
 import got from 'got'
 

apps/builder/src/features/credentials/api/createCredentials.ts

@@ -5,7 +5,7 @@ import { stripeCredentialsSchema } from '@typebot.io/schemas/features/blocks/inp
 import { googleSheetsCredentialsSchema } from '@typebot.io/schemas/features/blocks/integrations/googleSheets/schemas'
 import { openAICredentialsSchema } from '@typebot.io/schemas/features/blocks/integrations/openai'
 import { smtpCredentialsSchema } from '@typebot.io/schemas/features/blocks/integrations/sendEmail'
-import { encrypt } from '@typebot.io/lib/api/encryption'
+import { encrypt } from '@typebot.io/lib/api/encryption/encrypt'
 import { z } from 'zod'
 import { whatsAppCredentialsSchema } from '@typebot.io/schemas/features/whatsapp'
 import { Credentials, zemanticAiCredentialsSchema } from '@typebot.io/schemas'

apps/builder/src/features/whatsapp/getPhoneNumber.ts

@@ -2,7 +2,7 @@ import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { z } from 'zod'
 import got from 'got'
 import prisma from '@typebot.io/lib/prisma'
-import { decrypt } from '@typebot.io/lib/api'
+import { decrypt } from '@typebot.io/lib/api/encryption/decrypt'
 import { TRPCError } from '@trpc/server'
 import { WhatsAppCredentials } from '@typebot.io/schemas/features/whatsapp'
 

apps/builder/src/features/whatsapp/getSystemTokenInfo.ts

@@ -4,7 +4,7 @@ import got from 'got'
 import { TRPCError } from '@trpc/server'
 import { WhatsAppCredentials } from '@typebot.io/schemas/features/whatsapp'
 import prisma from '@typebot.io/lib/prisma'
-import { decrypt } from '@typebot.io/lib/api/encryption'
+import { decrypt } from '@typebot.io/lib/api/encryption/decrypt'
 
 const inputSchema = z.object({
   token: z.string().optional(),

apps/builder/src/lib/googleSheets.ts

@@ -2,9 +2,10 @@ import { Credentials as CredentialsFromDb } from '@typebot.io/prisma'
 import { OAuth2Client, Credentials } from 'google-auth-library'
 import { GoogleSheetsCredentials } from '@typebot.io/schemas'
 import { isDefined } from '@typebot.io/lib'
-import { decrypt, encrypt } from '@typebot.io/lib/api'
 import { env } from '@typebot.io/env'
 import prisma from '@typebot.io/lib/prisma'
+import { decrypt } from '@typebot.io/lib/api/encryption/decrypt'
+import { encrypt } from '@typebot.io/lib/api/encryption/encrypt'
 
 export const oauth2Client = new OAuth2Client(
   env.GOOGLE_CLIENT_ID,

apps/builder/src/pages/api/credentials.ts

@@ -7,8 +7,8 @@ import {
   forbidden,
   methodNotAllowed,
   notAuthenticated,
-  encrypt,
 } from '@typebot.io/lib/api'
+import { encrypt } from '@typebot.io/lib/api/encryption/encrypt'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req, res)

apps/builder/src/pages/api/credentials/google-sheets/callback.ts

@@ -3,10 +3,11 @@ import { Prisma } from '@typebot.io/prisma'
 import prisma from '@typebot.io/lib/prisma'
 import { googleSheetsScopes } from './consent-url'
 import { stringify } from 'querystring'
-import { badRequest, encrypt, notAuthenticated } from '@typebot.io/lib/api'
+import { badRequest, notAuthenticated } from '@typebot.io/lib/api'
 import { oauth2Client } from '@/lib/googleSheets'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { env } from '@typebot.io/env'
+import { encrypt } from '@typebot.io/lib/api/encryption/encrypt'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req, res)

apps/builder/src/pages/api/typebots/[typebotId]/whatsapp/media/[mediaId].ts

@@ -2,7 +2,6 @@ import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import {
-  decrypt,
   methodNotAllowed,
   notAuthenticated,
   notFound,
@@ -10,6 +9,7 @@ import {
 import { isReadWorkspaceFobidden } from '@/features/workspace/helpers/isReadWorkspaceFobidden'
 import { WhatsAppCredentials } from '@typebot.io/schemas/features/whatsapp'
 import got from 'got'
+import { decrypt } from '@typebot.io/lib/api/encryption/decrypt'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method === 'GET') {

apps/viewer/next-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/basic-features/typescript for more information.

apps/viewer/src/app/api/integrations/openai/streamer/route.ts

@@ -7,24 +7,25 @@ import OpenAI from 'openai'
 import { NextResponse } from 'next/dist/server/web/spec-extension/response'
 
 export const runtime = 'edge'
-export const regions = ['lhr1']
+export const preferredRegion = 'lhr1'
 export const dynamic = 'force-dynamic'
 
 const responseHeaders = {
   'Access-Control-Allow-Origin': '*',
 }
 
-const handler = async (req: Request) => {
-  if (req.method === 'OPTIONS') {
-    return new Response('ok', {
-      headers: {
-        'Access-Control-Allow-Origin': '*',
-        'Access-Control-Allow-Methods': 'POST',
-        'Access-Control-Expose-Headers': 'Content-Length, X-JSON',
-        'Access-Control-Allow-Headers': '*',
-      },
-    })
-  }
+export async function OPTIONS() {
+  return new Response('ok', {
+    headers: {
+      'Access-Control-Allow-Origin': '*',
+      'Access-Control-Allow-Methods': 'POST',
+      'Access-Control-Expose-Headers': 'Content-Length, X-JSON',
+      'Access-Control-Allow-Headers': '*',
+    },
+  })
+}
+
+export async function POST(req: Request) {
   const { sessionId, messages } = (await req.json()) as {
     sessionId: string
     messages: OpenAI.Chat.ChatCompletionMessage[]
@@ -110,5 +111,3 @@ const handler = async (req: Request) => {
     }
   }
 }
-
-export default handler

apps/viewer/src/lib/google-sheets.ts

@@ -2,9 +2,10 @@ import { Credentials as CredentialsFromDb } from '@typebot.io/prisma'
 import { OAuth2Client, Credentials } from 'google-auth-library'
 import { GoogleSheetsCredentials } from '@typebot.io/schemas'
 import { isDefined } from '@typebot.io/lib'
-import { decrypt, encrypt } from '@typebot.io/lib/api'
 import { env } from '@typebot.io/env'
 import prisma from '@typebot.io/lib/prisma'
+import { decrypt } from '@typebot.io/lib/api/encryption/decrypt'
+import { encrypt } from '@typebot.io/lib/api/encryption/encrypt'
 
 export const getAuthenticatedGoogleClient = async (
   credentialsId: string

apps/viewer/src/pages/api/integrations/openai/streamer.ts

@@ -1,115 +0,0 @@
-import { connect } from '@planetscale/database'
-import { env } from '@typebot.io/env'
-import { IntegrationBlockType, SessionState } from '@typebot.io/schemas'
-import { StreamingTextResponse } from 'ai'
-import { getChatCompletionStream } from '@typebot.io/bot-engine/blocks/integrations/openai/getChatCompletionStream'
-import OpenAI from 'openai'
-import { NextResponse } from 'next/dist/server/web/spec-extension/response'
-
-export const config = {
-  runtime: 'edge',
-  regions: ['lhr1'],
-}
-
-const responseHeaders = {
-  'Access-Control-Allow-Origin': '*',
-}
-
-const handler = async (req: Request) => {
-  if (req.method === 'OPTIONS') {
-    return new Response('ok', {
-      headers: {
-        'Access-Control-Allow-Origin': '*',
-        'Access-Control-Allow-Methods': 'POST',
-        'Access-Control-Expose-Headers': 'Content-Length, X-JSON',
-        'Access-Control-Allow-Headers': '*',
-      },
-    })
-  }
-  const { sessionId, messages } = (await req.json()) as {
-    sessionId: string
-    messages: OpenAI.Chat.ChatCompletionMessage[]
-  }
-
-  if (!sessionId)
-    return NextResponse.json(
-      { message: 'No session ID provided' },
-      { status: 400, headers: responseHeaders }
-    )
-
-  if (!messages)
-    return NextResponse.json(
-      { message: 'No messages provided' },
-      { status: 400, headers: responseHeaders }
-    )
-
-  const conn = connect({ url: env.DATABASE_URL })
-
-  const chatSession = await conn.execute(
-    'select state from ChatSession where id=?',
-    [sessionId]
-  )
-
-  const state = (chatSession.rows.at(0) as { state: SessionState } | undefined)
-    ?.state
-
-  if (!state)
-    return NextResponse.json(
-      { message: 'No state found' },
-      { status: 400, headers: responseHeaders }
-    )
-
-  const group = state.typebotsQueue[0].typebot.groups.find(
-    (group) => group.id === state.currentBlock?.groupId
-  )
-  const blockIndex =
-    group?.blocks.findIndex(
-      (block) => block.id === state.currentBlock?.blockId
-    ) ?? -1
-
-  const block = blockIndex >= 0 ? group?.blocks[blockIndex ?? 0] : null
-
-  if (!block || !group)
-    return NextResponse.json(
-      { message: 'Current block not found' },
-      { status: 400, headers: responseHeaders }
-    )
-
-  if (
-    block.type !== IntegrationBlockType.OPEN_AI ||
-    block.options.task !== 'Create chat completion'
-  )
-    return NextResponse.json(
-      { message: 'Current block is not an OpenAI block' },
-      { status: 400, headers: responseHeaders }
-    )
-
-  try {
-    const stream = await getChatCompletionStream(conn)(
-      state,
-      block.options,
-      messages
-    )
-    if (!stream)
-      return NextResponse.json(
-        { message: 'Could not create stream' },
-        { status: 400, headers: responseHeaders }
-      )
-
-    return new StreamingTextResponse(stream, {
-      headers: responseHeaders,
-    })
-  } catch (error) {
-    if (error instanceof OpenAI.APIError) {
-      const { name, status, message } = error
-      return NextResponse.json(
-        { name, status, message },
-        { status, headers: responseHeaders }
-      )
-    } else {
-      throw error
-    }
-  }
-}
-
-export default handler

apps/viewer/src/pages/api/integrations/stripe/createPaymentIntent.ts

@@ -1,11 +1,11 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 import {
   badRequest,
-  decrypt,
   forbidden,
   initMiddleware,
   methodNotAllowed,
 } from '@typebot.io/lib/api'
+import { decrypt } from '@typebot.io/lib/api/encryption/decrypt'
 import Stripe from 'stripe'
 
 import Cors from 'cors'

apps/viewer/src/pages/api/typebots/[typebotId]/integrations/email.tsx

@@ -8,7 +8,8 @@ import { NextApiRequest, NextApiResponse } from 'next'
 import { createTransport, getTestMessageUrl } from 'nodemailer'
 import { isDefined, isEmpty, isNotDefined, omit } from '@typebot.io/lib'
 import { parseAnswers } from '@typebot.io/lib/results'
-import { methodNotAllowed, initMiddleware, decrypt } from '@typebot.io/lib/api'
+import { methodNotAllowed, initMiddleware } from '@typebot.io/lib/api'
+import { decrypt } from '@typebot.io/lib/api/encryption/decrypt'
 
 import Cors from 'cors'
 import Mail from 'nodemailer/lib/mailer'

apps/viewer/src/test/utils/databaseActions.ts

@@ -1,6 +1,6 @@
 import { PrismaClient } from '@typebot.io/prisma'
 import { SmtpCredentials } from '@typebot.io/schemas'
-import { encrypt } from '@typebot.io/lib/api'
+import { encrypt } from '@typebot.io/lib/api/encryption/encrypt'
 import { proWorkspaceId } from '@typebot.io/lib/playwright/databaseSetup'
 
 const prisma = new PrismaClient()

apps/viewer/tsconfig.json

@@ -3,8 +3,21 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*"]
-    }
+      "@/*": [
+        "src/*"
+      ]
+    },
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "strictNullChecks": true
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts"
+  ]
 }