21
.github/workflows/send-total-results-digest.yml
vendored
Normal file
21
.github/workflows/send-total-results-digest.yml
vendored
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
name: Send total results daily digest
|
||||||
|
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
- cron: '0 5 * * *'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
send:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
defaults:
|
||||||
|
run:
|
||||||
|
working-directory: ./packages/scripts
|
||||||
|
env:
|
||||||
|
DATABASE_URL: '${{ secrets.DATABASE_URL }}'
|
||||||
|
TELEMETRY_WEBHOOK_URL: '${{ secrets.TELEMETRY_WEBHOOK_URL }}'
|
||||||
|
TELEMETRY_WEBHOOK_BEARER_TOKEN: '${{ secrets.TELEMETRY_WEBHOOK_BEARER_TOKEN }}'
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- uses: pnpm/action-setup@v2.2.2
|
||||||
|
- run: pnpm i --frozen-lockfile
|
||||||
|
- run: pnpm turbo run telemetry:sendTotalResultsDigest
|
@ -78,6 +78,7 @@
|
|||||||
"nodemailer": "6.9.1",
|
"nodemailer": "6.9.1",
|
||||||
"nprogress": "0.2.0",
|
"nprogress": "0.2.0",
|
||||||
"papaparse": "5.3.2",
|
"papaparse": "5.3.2",
|
||||||
|
"posthog-node": "^2.5.4",
|
||||||
"prettier": "2.8.4",
|
"prettier": "2.8.4",
|
||||||
"qs": "6.11.0",
|
"qs": "6.11.0",
|
||||||
"react": "18.2.0",
|
"react": "18.2.0",
|
||||||
|
@ -107,7 +107,13 @@ export const createCheckoutSession = authenticatedProcedure
|
|||||||
name: 'never',
|
name: 'never',
|
||||||
},
|
},
|
||||||
mode: 'subscription',
|
mode: 'subscription',
|
||||||
metadata: { workspaceId, plan, additionalChats, additionalStorage },
|
metadata: {
|
||||||
|
workspaceId,
|
||||||
|
plan,
|
||||||
|
additionalChats,
|
||||||
|
additionalStorage,
|
||||||
|
userId: user.id,
|
||||||
|
},
|
||||||
currency,
|
currency,
|
||||||
billing_address_collection: 'required',
|
billing_address_collection: 'required',
|
||||||
automatic_tax: { enabled: true },
|
automatic_tax: { enabled: true },
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
import { sendTelemetryEvents } from 'utils/telemetry/sendTelemetryEvent'
|
||||||
import prisma from '@/lib/prisma'
|
import prisma from '@/lib/prisma'
|
||||||
import { authenticatedProcedure } from '@/utils/server/trpc'
|
import { authenticatedProcedure } from '@/utils/server/trpc'
|
||||||
import { TRPCError } from '@trpc/server'
|
import { TRPCError } from '@trpc/server'
|
||||||
@ -141,6 +142,19 @@ export const updateSubscription = authenticatedProcedure
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
await sendTelemetryEvents([
|
||||||
|
{
|
||||||
|
name: 'Subscription updated',
|
||||||
|
workspaceId,
|
||||||
|
userId: user.id,
|
||||||
|
data: {
|
||||||
|
plan,
|
||||||
|
additionalChatsIndex: additionalChats,
|
||||||
|
additionalStorageIndex: additionalStorage,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
|
|
||||||
return { workspace: updatedWorkspace }
|
return { workspace: updatedWorkspace }
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
@ -0,0 +1,93 @@
|
|||||||
|
import { eventSchema } from 'models/features/telemetry'
|
||||||
|
import { z } from 'zod'
|
||||||
|
import { PostHog } from 'posthog-node'
|
||||||
|
import { TRPCError } from '@trpc/server'
|
||||||
|
import got from 'got'
|
||||||
|
import { authenticatedProcedure } from '@/utils/server/trpc'
|
||||||
|
|
||||||
|
// Only used for the cloud version of Typebot. It's the way it processes telemetry events and inject it to thrid-party services.
|
||||||
|
export const processTelemetryEvent = authenticatedProcedure
|
||||||
|
.meta({
|
||||||
|
openapi: {
|
||||||
|
method: 'POST',
|
||||||
|
path: '/t/process',
|
||||||
|
description:
|
||||||
|
"Only used for the cloud version of Typebot. It's the way it processes telemetry events and inject it to thrid-party services.",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.input(
|
||||||
|
z.object({
|
||||||
|
events: z.array(eventSchema),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
.output(
|
||||||
|
z.object({
|
||||||
|
message: z.literal('Events injected'),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
.query(async ({ input: { events }, ctx: { user } }) => {
|
||||||
|
if (user.email !== process.env.ADMIN_EMAIL)
|
||||||
|
throw new TRPCError({
|
||||||
|
code: 'BAD_REQUEST',
|
||||||
|
message: 'Only app admin can process telemetry events',
|
||||||
|
})
|
||||||
|
if (!process.env.POSTHOG_API_KEY)
|
||||||
|
throw new TRPCError({
|
||||||
|
code: 'BAD_REQUEST',
|
||||||
|
message: 'Server does not have POSTHOG_API_KEY configured',
|
||||||
|
})
|
||||||
|
const client = new PostHog(process.env.POSTHOG_API_KEY, {
|
||||||
|
host: 'https://eu.posthog.com',
|
||||||
|
})
|
||||||
|
|
||||||
|
events.forEach(async (event) => {
|
||||||
|
if (event.name === 'User created') {
|
||||||
|
client.identify({
|
||||||
|
distinctId: event.userId,
|
||||||
|
properties: event.data,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
event.name === 'Workspace created' ||
|
||||||
|
event.name === 'Subscription updated'
|
||||||
|
)
|
||||||
|
client.groupIdentify({
|
||||||
|
groupType: 'workspace',
|
||||||
|
groupKey: event.workspaceId,
|
||||||
|
properties: event.data,
|
||||||
|
})
|
||||||
|
if (
|
||||||
|
event.name === 'Typebot created' ||
|
||||||
|
event.name === 'Typebot published'
|
||||||
|
)
|
||||||
|
client.groupIdentify({
|
||||||
|
groupType: 'typebot',
|
||||||
|
groupKey: event.typebotId,
|
||||||
|
properties: { name: event.data.name },
|
||||||
|
})
|
||||||
|
if (
|
||||||
|
event.name === 'User created' &&
|
||||||
|
process.env.USER_CREATED_WEBHOOK_URL
|
||||||
|
) {
|
||||||
|
await got.post(process.env.USER_CREATED_WEBHOOK_URL, {
|
||||||
|
json: {
|
||||||
|
email: event.data.email,
|
||||||
|
name: event.data.name ? event.data.name.split(' ')[0] : undefined,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
const groups: { workspace?: string; typebot?: string } = {}
|
||||||
|
if ('workspaceId' in event) groups['workspace'] = event.workspaceId
|
||||||
|
if ('typebotId' in event) groups['typebot'] = event.typebotId
|
||||||
|
client.capture({
|
||||||
|
distinctId: event.userId,
|
||||||
|
event: event.name,
|
||||||
|
properties: event.data,
|
||||||
|
groups,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
await client.shutdownAsync()
|
||||||
|
|
||||||
|
return { message: 'Events injected' }
|
||||||
|
})
|
@ -1,3 +1,4 @@
|
|||||||
|
import { sendTelemetryEvents } from 'utils/telemetry/sendTelemetryEvent'
|
||||||
import prisma from '@/lib/prisma'
|
import prisma from '@/lib/prisma'
|
||||||
import { authenticatedProcedure } from '@/utils/server/trpc'
|
import { authenticatedProcedure } from '@/utils/server/trpc'
|
||||||
import { TRPCError } from '@trpc/server'
|
import { TRPCError } from '@trpc/server'
|
||||||
@ -49,6 +50,18 @@ export const createWorkspaceProcedure = authenticatedProcedure
|
|||||||
},
|
},
|
||||||
})) as Workspace
|
})) as Workspace
|
||||||
|
|
||||||
|
await sendTelemetryEvents([
|
||||||
|
{
|
||||||
|
name: 'Workspace created',
|
||||||
|
workspaceId: newWorkspace.id,
|
||||||
|
userId: user.id,
|
||||||
|
data: {
|
||||||
|
name,
|
||||||
|
plan,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
|
|
||||||
return {
|
return {
|
||||||
workspace: newWorkspace,
|
workspace: newWorkspace,
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
import { PrismaClient, Prisma, WorkspaceRole, Session } from 'db'
|
import { PrismaClient, Prisma, WorkspaceRole, Session } from 'db'
|
||||||
import type { Adapter, AdapterUser } from 'next-auth/adapters'
|
import type { Adapter, AdapterUser } from 'next-auth/adapters'
|
||||||
import { createId } from '@paralleldrive/cuid2'
|
import { createId } from '@paralleldrive/cuid2'
|
||||||
import { got } from 'got'
|
|
||||||
import { generateId } from 'utils'
|
import { generateId } from 'utils'
|
||||||
import { parseWorkspaceDefaultPlan } from '@/features/workspace'
|
import { parseWorkspaceDefaultPlan } from '@/features/workspace'
|
||||||
import {
|
import {
|
||||||
@ -10,6 +9,8 @@ import {
|
|||||||
convertInvitationsToCollaborations,
|
convertInvitationsToCollaborations,
|
||||||
joinWorkspaces,
|
joinWorkspaces,
|
||||||
} from '@/features/auth/api'
|
} from '@/features/auth/api'
|
||||||
|
import { sendTelemetryEvents } from 'utils/telemetry/sendTelemetryEvent'
|
||||||
|
import { TelemetryEvent } from 'models/features/telemetry'
|
||||||
|
|
||||||
export function CustomAdapter(p: PrismaClient): Adapter {
|
export function CustomAdapter(p: PrismaClient): Adapter {
|
||||||
return {
|
return {
|
||||||
@ -28,6 +29,11 @@ export function CustomAdapter(p: PrismaClient): Adapter {
|
|||||||
workspaceInvitations.length === 0
|
workspaceInvitations.length === 0
|
||||||
)
|
)
|
||||||
throw Error('New users are forbidden')
|
throw Error('New users are forbidden')
|
||||||
|
|
||||||
|
const newWorkspaceData = {
|
||||||
|
name: data.name ? `${data.name}'s workspace` : `My workspace`,
|
||||||
|
plan: parseWorkspaceDefaultPlan(data.email),
|
||||||
|
}
|
||||||
const createdUser = await p.user.create({
|
const createdUser = await p.user.create({
|
||||||
data: {
|
data: {
|
||||||
...data,
|
...data,
|
||||||
@ -42,25 +48,35 @@ export function CustomAdapter(p: PrismaClient): Adapter {
|
|||||||
create: {
|
create: {
|
||||||
role: WorkspaceRole.ADMIN,
|
role: WorkspaceRole.ADMIN,
|
||||||
workspace: {
|
workspace: {
|
||||||
create: {
|
create: newWorkspaceData,
|
||||||
name: data.name
|
|
||||||
? `${data.name}'s workspace`
|
|
||||||
: `My workspace`,
|
|
||||||
plan: parseWorkspaceDefaultPlan(data.email),
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
onboardingCategories: [],
|
onboardingCategories: [],
|
||||||
},
|
},
|
||||||
|
include: {
|
||||||
|
workspaces: { select: { workspaceId: true } },
|
||||||
|
},
|
||||||
})
|
})
|
||||||
if (process.env.USER_CREATED_WEBHOOK_URL)
|
const newWorkspaceId = createdUser.workspaces.pop()?.workspaceId
|
||||||
await got.post(process.env.USER_CREATED_WEBHOOK_URL, {
|
const events: TelemetryEvent[] = []
|
||||||
json: {
|
if (newWorkspaceId) {
|
||||||
email: data.email,
|
events.push({
|
||||||
name: data.name ? (data.name as string).split(' ')[0] : undefined,
|
name: 'Workspace created',
|
||||||
},
|
workspaceId: newWorkspaceId,
|
||||||
|
userId: createdUser.id,
|
||||||
|
data: newWorkspaceData,
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
events.push({
|
||||||
|
name: 'User created',
|
||||||
|
userId: createdUser.id,
|
||||||
|
data: {
|
||||||
|
email: data.email,
|
||||||
|
name: data.name ? (data.name as string).split(' ')[0] : undefined,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
await sendTelemetryEvents(events)
|
||||||
if (invitations.length > 0)
|
if (invitations.length > 0)
|
||||||
await convertInvitationsToCollaborations(p, user, invitations)
|
await convertInvitationsToCollaborations(p, user, invitations)
|
||||||
if (workspaceInvitations.length > 0)
|
if (workspaceInvitations.length > 0)
|
||||||
|
@ -4,6 +4,7 @@ import { NextApiRequest, NextApiResponse } from 'next'
|
|||||||
import { canPublishFileInput } from '@/utils/api/dbRules'
|
import { canPublishFileInput } from '@/utils/api/dbRules'
|
||||||
import { badRequest, methodNotAllowed, notAuthenticated } from 'utils/api'
|
import { badRequest, methodNotAllowed, notAuthenticated } from 'utils/api'
|
||||||
import { getAuthenticatedUser } from '@/features/auth/api'
|
import { getAuthenticatedUser } from '@/features/auth/api'
|
||||||
|
import { sendTelemetryEvents } from 'utils/telemetry/sendTelemetryEvent'
|
||||||
|
|
||||||
const handler = async (req: NextApiRequest, res: NextApiResponse) => {
|
const handler = async (req: NextApiRequest, res: NextApiResponse) => {
|
||||||
const user = await getAuthenticatedUser(req)
|
const user = await getAuthenticatedUser(req)
|
||||||
@ -23,10 +24,25 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
|
|||||||
!(await canPublishFileInput({ userId: user.id, workspaceId, res }))
|
!(await canPublishFileInput({ userId: user.id, workspaceId, res }))
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
const typebot = await prisma.publicTypebot.create({
|
const publicTypebot = await prisma.publicTypebot.create({
|
||||||
data: { ...data },
|
data: { ...data },
|
||||||
|
include: {
|
||||||
|
typebot: { select: { name: true } },
|
||||||
|
},
|
||||||
})
|
})
|
||||||
return res.send(typebot)
|
await sendTelemetryEvents([
|
||||||
|
{
|
||||||
|
name: 'Typebot published',
|
||||||
|
userId: user.id,
|
||||||
|
workspaceId,
|
||||||
|
typebotId: publicTypebot.typebotId,
|
||||||
|
data: {
|
||||||
|
isFirstPublish: true,
|
||||||
|
name: publicTypebot.typebot.name,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
|
return res.send(publicTypebot)
|
||||||
}
|
}
|
||||||
return methodNotAllowed(res)
|
return methodNotAllowed(res)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
@ -4,6 +4,7 @@ import { NextApiRequest, NextApiResponse } from 'next'
|
|||||||
import { canPublishFileInput, canWriteTypebots } from '@/utils/api/dbRules'
|
import { canPublishFileInput, canWriteTypebots } from '@/utils/api/dbRules'
|
||||||
import { getAuthenticatedUser } from '@/features/auth/api'
|
import { getAuthenticatedUser } from '@/features/auth/api'
|
||||||
import { badRequest, methodNotAllowed, notAuthenticated } from 'utils/api'
|
import { badRequest, methodNotAllowed, notAuthenticated } from 'utils/api'
|
||||||
|
import { sendTelemetryEvents } from 'utils/telemetry/sendTelemetryEvent'
|
||||||
|
|
||||||
const handler = async (req: NextApiRequest, res: NextApiResponse) => {
|
const handler = async (req: NextApiRequest, res: NextApiResponse) => {
|
||||||
const user = await getAuthenticatedUser(req)
|
const user = await getAuthenticatedUser(req)
|
||||||
@ -25,11 +26,25 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
|
|||||||
!(await canPublishFileInput({ userId: user.id, workspaceId, res }))
|
!(await canPublishFileInput({ userId: user.id, workspaceId, res }))
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
const typebots = await prisma.publicTypebot.update({
|
const publicTypebot = await prisma.publicTypebot.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data,
|
data,
|
||||||
|
include: {
|
||||||
|
typebot: { select: { name: true } },
|
||||||
|
},
|
||||||
})
|
})
|
||||||
return res.send({ typebots })
|
await sendTelemetryEvents([
|
||||||
|
{
|
||||||
|
name: 'Typebot published',
|
||||||
|
userId: user.id,
|
||||||
|
workspaceId,
|
||||||
|
typebotId: publicTypebot.typebotId,
|
||||||
|
data: {
|
||||||
|
name: publicTypebot.typebot.name,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
|
return res.send({ typebot: publicTypebot })
|
||||||
}
|
}
|
||||||
if (req.method === 'DELETE') {
|
if (req.method === 'DELETE') {
|
||||||
const publishedTypebotId = req.query.id as string
|
const publishedTypebotId = req.query.id as string
|
||||||
|
@ -36,6 +36,7 @@ const createCheckoutSession = async (userId: string) => {
|
|||||||
mode: 'subscription',
|
mode: 'subscription',
|
||||||
metadata: {
|
metadata: {
|
||||||
claimableCustomPlanId: claimableCustomPlan.id,
|
claimableCustomPlanId: claimableCustomPlan.id,
|
||||||
|
userId,
|
||||||
},
|
},
|
||||||
currency: claimableCustomPlan.currency,
|
currency: claimableCustomPlan.currency,
|
||||||
automatic_tax: { enabled: true },
|
automatic_tax: { enabled: true },
|
||||||
|
@ -6,6 +6,7 @@ import { buffer } from 'micro'
|
|||||||
import prisma from '@/lib/prisma'
|
import prisma from '@/lib/prisma'
|
||||||
import { Plan } from 'db'
|
import { Plan } from 'db'
|
||||||
import { RequestHandler } from 'next/dist/server/next'
|
import { RequestHandler } from 'next/dist/server/next'
|
||||||
|
import { sendTelemetryEvents } from 'utils/telemetry/sendTelemetryEvent'
|
||||||
|
|
||||||
if (!process.env.STRIPE_SECRET_KEY || !process.env.STRIPE_WEBHOOK_SECRET)
|
if (!process.env.STRIPE_SECRET_KEY || !process.env.STRIPE_WEBHOOK_SECRET)
|
||||||
throw new Error('STRIPE_SECRET_KEY or STRIPE_WEBHOOK_SECRET missing')
|
throw new Error('STRIPE_SECRET_KEY or STRIPE_WEBHOOK_SECRET missing')
|
||||||
@ -46,11 +47,17 @@ const webhookHandler = async (req: NextApiRequest, res: NextApiResponse) => {
|
|||||||
additionalChats: string
|
additionalChats: string
|
||||||
additionalStorage: string
|
additionalStorage: string
|
||||||
workspaceId: string
|
workspaceId: string
|
||||||
|
userId: string
|
||||||
}
|
}
|
||||||
| { claimableCustomPlanId: string }
|
| { claimableCustomPlanId: string; userId: string }
|
||||||
if ('plan' in metadata) {
|
if ('plan' in metadata) {
|
||||||
const { workspaceId, plan, additionalChats, additionalStorage } =
|
const {
|
||||||
metadata
|
workspaceId,
|
||||||
|
plan,
|
||||||
|
additionalChats,
|
||||||
|
additionalStorage,
|
||||||
|
userId,
|
||||||
|
} = metadata
|
||||||
if (!workspaceId || !plan || !additionalChats || !additionalStorage)
|
if (!workspaceId || !plan || !additionalChats || !additionalStorage)
|
||||||
return res
|
return res
|
||||||
.status(500)
|
.status(500)
|
||||||
@ -58,7 +65,7 @@ const webhookHandler = async (req: NextApiRequest, res: NextApiResponse) => {
|
|||||||
await prisma.workspace.update({
|
await prisma.workspace.update({
|
||||||
where: { id: workspaceId },
|
where: { id: workspaceId },
|
||||||
data: {
|
data: {
|
||||||
plan: plan,
|
plan,
|
||||||
stripeId: session.customer as string,
|
stripeId: session.customer as string,
|
||||||
additionalChatsIndex: parseInt(additionalChats),
|
additionalChatsIndex: parseInt(additionalChats),
|
||||||
additionalStorageIndex: parseInt(additionalStorage),
|
additionalStorageIndex: parseInt(additionalStorage),
|
||||||
@ -68,8 +75,21 @@ const webhookHandler = async (req: NextApiRequest, res: NextApiResponse) => {
|
|||||||
storageLimitSecondEmailSentAt: null,
|
storageLimitSecondEmailSentAt: null,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
await sendTelemetryEvents([
|
||||||
|
{
|
||||||
|
name: 'Subscription updated',
|
||||||
|
workspaceId,
|
||||||
|
userId,
|
||||||
|
data: {
|
||||||
|
plan,
|
||||||
|
additionalChatsIndex: parseInt(additionalChats),
|
||||||
|
additionalStorageIndex: parseInt(additionalStorage),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
} else {
|
} else {
|
||||||
const { claimableCustomPlanId } = metadata
|
const { claimableCustomPlanId, userId } = metadata
|
||||||
if (!claimableCustomPlanId)
|
if (!claimableCustomPlanId)
|
||||||
return res
|
return res
|
||||||
.status(500)
|
.status(500)
|
||||||
@ -90,6 +110,19 @@ const webhookHandler = async (req: NextApiRequest, res: NextApiResponse) => {
|
|||||||
customSeatsLimit: seatsLimit,
|
customSeatsLimit: seatsLimit,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
await sendTelemetryEvents([
|
||||||
|
{
|
||||||
|
name: 'Subscription updated',
|
||||||
|
workspaceId,
|
||||||
|
userId,
|
||||||
|
data: {
|
||||||
|
plan: Plan.CUSTOM,
|
||||||
|
additionalChatsIndex: 0,
|
||||||
|
additionalStorageIndex: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
return res.status(200).send({ message: 'workspace upgraded in DB' })
|
return res.status(200).send({ message: 'workspace upgraded in DB' })
|
||||||
|
@ -11,6 +11,7 @@ import { getAuthenticatedUser } from '@/features/auth/api'
|
|||||||
import { parseNewTypebot } from '@/features/dashboard'
|
import { parseNewTypebot } from '@/features/dashboard'
|
||||||
import { NewTypebotProps } from '@/features/dashboard/api/parseNewTypebot'
|
import { NewTypebotProps } from '@/features/dashboard/api/parseNewTypebot'
|
||||||
import { omit } from 'utils'
|
import { omit } from 'utils'
|
||||||
|
import { sendTelemetryEvents } from 'utils/telemetry/sendTelemetryEvent'
|
||||||
|
|
||||||
const handler = async (req: NextApiRequest, res: NextApiResponse) => {
|
const handler = async (req: NextApiRequest, res: NextApiResponse) => {
|
||||||
const user = await getAuthenticatedUser(req)
|
const user = await getAuthenticatedUser(req)
|
||||||
@ -65,6 +66,17 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
|
|||||||
...data,
|
...data,
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
|
await sendTelemetryEvents([
|
||||||
|
{
|
||||||
|
name: 'Typebot created',
|
||||||
|
userId: user.id,
|
||||||
|
workspaceId: typebot.workspaceId,
|
||||||
|
typebotId: typebot.id,
|
||||||
|
data: {
|
||||||
|
name: typebot.name,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
return res.send(typebot)
|
return res.send(typebot)
|
||||||
}
|
}
|
||||||
return methodNotAllowed(res)
|
return methodNotAllowed(res)
|
||||||
|
@ -3,12 +3,14 @@ import { webhookRouter } from '@/features/blocks/integrations/webhook/api'
|
|||||||
import { credentialsRouter } from '@/features/credentials/api/router'
|
import { credentialsRouter } from '@/features/credentials/api/router'
|
||||||
import { getAppVersionProcedure } from '@/features/dashboard/api/getAppVersionProcedure'
|
import { getAppVersionProcedure } from '@/features/dashboard/api/getAppVersionProcedure'
|
||||||
import { resultsRouter } from '@/features/results/api'
|
import { resultsRouter } from '@/features/results/api'
|
||||||
|
import { processTelemetryEvent } from '@/features/telemetry/api/processTelemetryEvent'
|
||||||
import { typebotRouter } from '@/features/typebot/api'
|
import { typebotRouter } from '@/features/typebot/api'
|
||||||
import { workspaceRouter } from '@/features/workspace/api'
|
import { workspaceRouter } from '@/features/workspace/api'
|
||||||
import { router } from '../../trpc'
|
import { router } from '../../trpc'
|
||||||
|
|
||||||
export const trpcRouter = router({
|
export const trpcRouter = router({
|
||||||
getAppVersionProcedure,
|
getAppVersionProcedure,
|
||||||
|
processTelemetryEvent,
|
||||||
workspace: workspaceRouter,
|
workspace: workspaceRouter,
|
||||||
typebot: typebotRouter,
|
typebot: typebotRouter,
|
||||||
webhook: webhookRouter,
|
webhook: webhookRouter,
|
||||||
|
@ -235,12 +235,23 @@ These can also be added to the `viewer` environment
|
|||||||
|
|
||||||
</p></details>
|
</p></details>
|
||||||
|
|
||||||
<details><summary><h4>Internal Webhooks</h4></summary>
|
<details><summary><h4>Telemetry</h4></summary>
|
||||||
<p>
|
<p>
|
||||||
|
|
||||||
| Parameter | Default | Description |
|
| Parameter | Default | Description |
|
||||||
| ------------------------ | ------- | --------------------------------------------------------------------------------------------- |
|
| ------------------------------ | ------- | --------------------------------------------------------------------------------------------------------------- |
|
||||||
| USER_CREATED_WEBHOOK_URL | | Webhook URL called whenever a new user is created (used for importing a new SendGrid contact) |
|
| TELEMETRY_WEBHOOK_URL | | Webhook URL called whenever a new telemetry event is captured. See this file that lists all the possible events |
|
||||||
|
| TELEMETRY_WEBHOOK_BEARER_TOKEN | | Bearer token to add if the request needs to be authenticated |
|
||||||
|
|
||||||
|
</p></details>
|
||||||
|
|
||||||
|
<details><summary><h4>PostHog</h4></summary>
|
||||||
|
<p>
|
||||||
|
|
||||||
|
| Parameter | Default | Description |
|
||||||
|
| ---------------- | ------- | ---------------- |
|
||||||
|
| POSTHOG_API_KEY | | PostHog API Key |
|
||||||
|
| POSTHOG_API_HOST | | PostHog API Host |
|
||||||
|
|
||||||
</p></details>
|
</p></details>
|
||||||
|
|
||||||
|
@ -164,11 +164,10 @@ const saveAnswer =
|
|||||||
content: reply,
|
content: reply,
|
||||||
})
|
})
|
||||||
|
|
||||||
if (reply.includes('http') && block.type === InputBlockType.FILE) {
|
if (resultId) {
|
||||||
answer.storageUsed = await computeStorageUsed(reply)
|
if (reply.includes('http') && block.type === InputBlockType.FILE) {
|
||||||
}
|
answer.storageUsed = await computeStorageUsed(reply)
|
||||||
|
}
|
||||||
if (resultId)
|
|
||||||
await prisma.answer.upsert({
|
await prisma.answer.upsert({
|
||||||
where: {
|
where: {
|
||||||
resultId_blockId_groupId: {
|
resultId_blockId_groupId: {
|
||||||
@ -180,6 +179,8 @@ const saveAnswer =
|
|||||||
create: answer as Prisma.AnswerUncheckedCreateInput,
|
create: answer as Prisma.AnswerUncheckedCreateInput,
|
||||||
update: answer,
|
update: answer,
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
|
||||||
return newSessionState
|
return newSessionState
|
||||||
}
|
}
|
||||||
|
|
||||||
|
89
packages/models/features/telemetry.ts
Normal file
89
packages/models/features/telemetry.ts
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
import { Plan } from 'db'
|
||||||
|
import { z } from 'zod'
|
||||||
|
|
||||||
|
const userEvent = z.object({
|
||||||
|
userId: z.string(),
|
||||||
|
})
|
||||||
|
|
||||||
|
const workspaceEvent = userEvent.merge(
|
||||||
|
z.object({
|
||||||
|
workspaceId: z.string(),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
const typebotEvent = workspaceEvent.merge(
|
||||||
|
z.object({
|
||||||
|
typebotId: z.string(),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
const workspaceCreatedEventSchema = workspaceEvent.merge(
|
||||||
|
z.object({
|
||||||
|
name: z.literal('Workspace created'),
|
||||||
|
data: z.object({
|
||||||
|
name: z.string().optional(),
|
||||||
|
plan: z.nativeEnum(Plan),
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
const userCreatedEventSchema = userEvent.merge(
|
||||||
|
z.object({
|
||||||
|
name: z.literal('User created'),
|
||||||
|
data: z.object({
|
||||||
|
email: z.string(),
|
||||||
|
name: z.string().optional(),
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
const typebotCreatedEventSchema = typebotEvent.merge(
|
||||||
|
z.object({
|
||||||
|
name: z.literal('Typebot created'),
|
||||||
|
data: z.object({
|
||||||
|
name: z.string(),
|
||||||
|
template: z.string().optional(),
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
const publishedTypebotEventSchema = typebotEvent.merge(
|
||||||
|
z.object({
|
||||||
|
name: z.literal('Typebot published'),
|
||||||
|
data: z.object({
|
||||||
|
name: z.string(),
|
||||||
|
isFirstPublish: z.literal(true).optional(),
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
const subscriptionUpdatedEventSchema = workspaceEvent.merge(
|
||||||
|
z.object({
|
||||||
|
name: z.literal('Subscription updated'),
|
||||||
|
data: z.object({
|
||||||
|
plan: z.nativeEnum(Plan),
|
||||||
|
additionalChatsIndex: z.number(),
|
||||||
|
additionalStorageIndex: z.number(),
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
const newResultsCollectedEventSchema = typebotEvent.merge(
|
||||||
|
z.object({
|
||||||
|
name: z.literal('New results collected'),
|
||||||
|
data: z.object({
|
||||||
|
total: z.number(),
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
export const eventSchema = z.discriminatedUnion('name', [
|
||||||
|
workspaceCreatedEventSchema,
|
||||||
|
userCreatedEventSchema,
|
||||||
|
typebotCreatedEventSchema,
|
||||||
|
publishedTypebotEventSchema,
|
||||||
|
subscriptionUpdatedEventSchema,
|
||||||
|
newResultsCollectedEventSchema,
|
||||||
|
])
|
||||||
|
|
||||||
|
export type TelemetryEvent = z.infer<typeof eventSchema>
|
@ -11,7 +11,8 @@
|
|||||||
"db:restore": "tsx restoreDatabase.ts",
|
"db:restore": "tsx restoreDatabase.ts",
|
||||||
"db:setCustomPlan": "tsx setCustomPlan.ts",
|
"db:setCustomPlan": "tsx setCustomPlan.ts",
|
||||||
"db:bulkUpdate": "tsx bulkUpdate.ts",
|
"db:bulkUpdate": "tsx bulkUpdate.ts",
|
||||||
"db:fixTypebots": "tsx fixTypebots.ts"
|
"db:fixTypebots": "tsx fixTypebots.ts",
|
||||||
|
"telemetry:sendTotalResultsDigest": "tsx sendTotalResultsDigest.ts"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "18.14.0",
|
"@types/node": "18.14.0",
|
||||||
|
85
packages/scripts/sendTotalResultsDigest.ts
Normal file
85
packages/scripts/sendTotalResultsDigest.ts
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
import { PrismaClient, WorkspaceRole } from 'db'
|
||||||
|
import { isDefined } from 'utils'
|
||||||
|
import { promptAndSetEnvironment } from './utils'
|
||||||
|
import { TelemetryEvent } from 'models/features/telemetry'
|
||||||
|
import { sendTelemetryEvents } from 'utils/telemetry/sendTelemetryEvent'
|
||||||
|
|
||||||
|
const prisma = new PrismaClient()
|
||||||
|
|
||||||
|
export const sendTotalResultsDigest = async () => {
|
||||||
|
await promptAndSetEnvironment('production')
|
||||||
|
|
||||||
|
console.log("Generating total results yesterday's digest...")
|
||||||
|
const todayMidnight = new Date()
|
||||||
|
todayMidnight.setHours(0, 0, 0, 0)
|
||||||
|
const yesterday = new Date(todayMidnight)
|
||||||
|
yesterday.setDate(yesterday.getDate() - 1)
|
||||||
|
|
||||||
|
const results = await prisma.result.groupBy({
|
||||||
|
by: ['typebotId'],
|
||||||
|
_count: {
|
||||||
|
_all: true,
|
||||||
|
},
|
||||||
|
where: {
|
||||||
|
hasStarted: true,
|
||||||
|
createdAt: {
|
||||||
|
gte: yesterday,
|
||||||
|
lt: todayMidnight,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`Found ${results.reduce(
|
||||||
|
(total, result) => total + result._count._all,
|
||||||
|
0
|
||||||
|
)} results collected yesterday.`
|
||||||
|
)
|
||||||
|
|
||||||
|
const workspaces = await prisma.workspace.findMany({
|
||||||
|
where: {
|
||||||
|
typebots: {
|
||||||
|
some: {
|
||||||
|
id: { in: results.map((result) => result.typebotId) },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
select: {
|
||||||
|
id: true,
|
||||||
|
typebots: { select: { id: true } },
|
||||||
|
members: { select: { userId: true, role: true } },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
const resultsWithWorkspaces = results
|
||||||
|
.flatMap((result) => {
|
||||||
|
const workspace = workspaces.find((workspace) =>
|
||||||
|
workspace.typebots.some((typebot) => typebot.id === result.typebotId)
|
||||||
|
)
|
||||||
|
if (!workspace) return
|
||||||
|
return workspace.members
|
||||||
|
.filter((member) => member.role !== WorkspaceRole.GUEST)
|
||||||
|
.map((member) => ({
|
||||||
|
userId: member.userId,
|
||||||
|
workspaceId: workspace.id,
|
||||||
|
typebotId: result.typebotId,
|
||||||
|
totalResultsYesterday: result._count._all,
|
||||||
|
}))
|
||||||
|
})
|
||||||
|
.filter(isDefined)
|
||||||
|
|
||||||
|
const events = resultsWithWorkspaces.map((result) => ({
|
||||||
|
name: 'New results collected',
|
||||||
|
userId: result.userId,
|
||||||
|
workspaceId: result.workspaceId,
|
||||||
|
typebotId: result.typebotId,
|
||||||
|
data: {
|
||||||
|
total: result.totalResultsYesterday,
|
||||||
|
},
|
||||||
|
})) satisfies TelemetryEvent[]
|
||||||
|
|
||||||
|
await sendTelemetryEvents(events)
|
||||||
|
console.log(`Sent ${events.length} events.`)
|
||||||
|
}
|
||||||
|
|
||||||
|
sendTotalResultsDigest().then()
|
@ -6,10 +6,10 @@
|
|||||||
"main": "./index.ts",
|
"main": "./index.ts",
|
||||||
"types": "./index.ts",
|
"types": "./index.ts",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@paralleldrive/cuid2": "2.2.0",
|
||||||
"@playwright/test": "1.31.1",
|
"@playwright/test": "1.31.1",
|
||||||
"@types/nodemailer": "6.4.7",
|
"@types/nodemailer": "6.4.7",
|
||||||
"aws-sdk": "2.1321.0",
|
"aws-sdk": "2.1321.0",
|
||||||
"@paralleldrive/cuid2": "2.2.0",
|
|
||||||
"db": "workspace:*",
|
"db": "workspace:*",
|
||||||
"dotenv": "16.0.3",
|
"dotenv": "16.0.3",
|
||||||
"models": "workspace:*",
|
"models": "workspace:*",
|
||||||
@ -22,5 +22,8 @@
|
|||||||
"aws-sdk": "2.1152.0",
|
"aws-sdk": "2.1152.0",
|
||||||
"next": "13.0.0",
|
"next": "13.0.0",
|
||||||
"nodemailer": "6.7.8"
|
"nodemailer": "6.7.8"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"got": "12.5.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
29
packages/utils/telemetry/sendTelemetryEvent.ts
Normal file
29
packages/utils/telemetry/sendTelemetryEvent.ts
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
import got from 'got'
|
||||||
|
import { TelemetryEvent } from 'models/features/telemetry'
|
||||||
|
import { isEmpty, isNotEmpty } from '../utils'
|
||||||
|
|
||||||
|
export const sendTelemetryEvents = async (events: TelemetryEvent[]) => {
|
||||||
|
if (isEmpty(process.env.TELEMETRY_WEBHOOK_URL))
|
||||||
|
return { message: 'Telemetry not enabled' }
|
||||||
|
|
||||||
|
try {
|
||||||
|
await got.post(process.env.TELEMETRY_WEBHOOK_URL, {
|
||||||
|
json: { events },
|
||||||
|
headers: {
|
||||||
|
authorization: isNotEmpty(process.env.TELEMETRY_WEBHOOK_BEARER_TOKEN)
|
||||||
|
? `Bearer ${process.env.TELEMETRY_WEBHOOK_BEARER_TOKEN}`
|
||||||
|
: undefined,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to send event', err)
|
||||||
|
return {
|
||||||
|
message: 'Failed to send event',
|
||||||
|
error: err instanceof Error ? err.message : 'Unknown error',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
message: 'Event sent',
|
||||||
|
}
|
||||||
|
}
|
23
pnpm-lock.yaml
generated
23
pnpm-lock.yaml
generated
@ -103,6 +103,7 @@ importers:
|
|||||||
nodemailer: 6.9.1
|
nodemailer: 6.9.1
|
||||||
nprogress: 0.2.0
|
nprogress: 0.2.0
|
||||||
papaparse: 5.3.2
|
papaparse: 5.3.2
|
||||||
|
posthog-node: ^2.5.4
|
||||||
prettier: 2.8.4
|
prettier: 2.8.4
|
||||||
qs: 6.11.0
|
qs: 6.11.0
|
||||||
react: 18.2.0
|
react: 18.2.0
|
||||||
@ -189,6 +190,7 @@ importers:
|
|||||||
nodemailer: 6.9.1
|
nodemailer: 6.9.1
|
||||||
nprogress: 0.2.0
|
nprogress: 0.2.0
|
||||||
papaparse: 5.3.2
|
papaparse: 5.3.2
|
||||||
|
posthog-node: 2.5.4
|
||||||
prettier: 2.8.4
|
prettier: 2.8.4
|
||||||
qs: 6.11.0
|
qs: 6.11.0
|
||||||
react: 18.2.0
|
react: 18.2.0
|
||||||
@ -753,11 +755,14 @@ importers:
|
|||||||
aws-sdk: 2.1321.0
|
aws-sdk: 2.1321.0
|
||||||
db: workspace:*
|
db: workspace:*
|
||||||
dotenv: 16.0.3
|
dotenv: 16.0.3
|
||||||
|
got: 12.5.3
|
||||||
models: workspace:*
|
models: workspace:*
|
||||||
next: 13.1.6
|
next: 13.1.6
|
||||||
nodemailer: 6.9.1
|
nodemailer: 6.9.1
|
||||||
tsconfig: workspace:*
|
tsconfig: workspace:*
|
||||||
typescript: 4.9.5
|
typescript: 4.9.5
|
||||||
|
dependencies:
|
||||||
|
got: 12.5.3
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@paralleldrive/cuid2': 2.2.0
|
'@paralleldrive/cuid2': 2.2.0
|
||||||
'@playwright/test': 1.31.1
|
'@playwright/test': 1.31.1
|
||||||
@ -8469,6 +8474,15 @@ packages:
|
|||||||
- debug
|
- debug
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
|
/axios/0.27.2:
|
||||||
|
resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
|
||||||
|
dependencies:
|
||||||
|
follow-redirects: 1.15.2
|
||||||
|
form-data: 4.0.0
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- debug
|
||||||
|
dev: false
|
||||||
|
|
||||||
/axobject-query/3.1.1:
|
/axobject-query/3.1.1:
|
||||||
resolution: {integrity: sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==}
|
resolution: {integrity: sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==}
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -16535,6 +16549,15 @@ packages:
|
|||||||
picocolors: 1.0.0
|
picocolors: 1.0.0
|
||||||
source-map-js: 1.0.2
|
source-map-js: 1.0.2
|
||||||
|
|
||||||
|
/posthog-node/2.5.4:
|
||||||
|
resolution: {integrity: sha512-CdywlVh0CZU05/3MrBc0qY/zsLdU2X9XSz/yL1qMRhbyZhD8lrnuGlI69G2cpzZtli6S/nu64wcmULz/mFFA5w==}
|
||||||
|
engines: {node: '>=15.0.0'}
|
||||||
|
dependencies:
|
||||||
|
axios: 0.27.2
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- debug
|
||||||
|
dev: false
|
||||||
|
|
||||||
/postman-code-generators/1.3.0:
|
/postman-code-generators/1.3.0:
|
||||||
resolution: {integrity: sha512-ikjYTukybZ97SMyyBYNPtcYNpc8/nf5kpRUgThddadC4RkgQwfGBarormcdUQkPKTgQpDd889KVTwTLVGC0RUg==}
|
resolution: {integrity: sha512-ikjYTukybZ97SMyyBYNPtcYNpc8/nf5kpRUgThddadC4RkgQwfGBarormcdUQkPKTgQpDd889KVTwTLVGC0RUg==}
|
||||||
engines: {node: '>=6'}
|
engines: {node: '>=6'}
|
||||||
|
@ -39,6 +39,10 @@
|
|||||||
"db:cleanDatabase": {
|
"db:cleanDatabase": {
|
||||||
"dependsOn": ["db#db:generate"],
|
"dependsOn": ["db#db:generate"],
|
||||||
"cache": false
|
"cache": false
|
||||||
|
},
|
||||||
|
"telemetry:sendTotalResultsDigest": {
|
||||||
|
"dependsOn": ["db#db:generate"],
|
||||||
|
"cache": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user