The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: optimize webhook routing (#2236)
David Nguyene364b08b6a32
diff --git a/apps/remix/app/routes/api+/webhook.trigger.ts b/apps/remix/app/routes/api+/webhook.trigger.tsindex 582c86296..d7ed16a96 100644--- a/apps/remix/app/routes/api+/webhook.trigger.ts+++ b/apps/remix/app/routes/api+/webhook.trigger.ts@@ -1,3 +1,4 @@+// Todo: [Webhooks] delete file after deployment.import { handlerTriggerWebhooks } from '@documenso/lib/server-only/webhooks/trigger/handler';import type { Route } from './+types/webhook.trigger';diff --git a/packages/lib/jobs/definitions/internal/execute-webhook.handler.ts b/packages/lib/jobs/definitions/internal/execute-webhook.handler.tsindex a357ea51f..2e1799d70 100644--- a/packages/lib/jobs/definitions/internal/execute-webhook.handler.ts+++ b/packages/lib/jobs/definitions/internal/execute-webhook.handler.ts@@ -22,53 +22,51 @@ export const run = async ({const { webhookUrl: url, secret } = webhook;- await io.runTask('execute-webhook', async () => {- const payloadData = {- event,- payload: data,- createdAt: new Date().toISOString(),- webhookEndpoint: url,- };+ const payloadData = {+ event,+ payload: data,+ createdAt: new Date().toISOString(),+ webhookEndpoint: url,+ };- const response = await fetch(url, {- method: 'POST',- body: JSON.stringify(payloadData),- headers: {- 'Content-Type': 'application/json',- 'X-Documenso-Secret': secret ?? '',- },- });+ const response = await fetch(url, {+ method: 'POST',+ body: JSON.stringify(payloadData),+ headers: {+ 'Content-Type': 'application/json',+ 'X-Documenso-Secret': secret ?? '',+ },+ });- const body = await response.text();+ const body = await response.text();- let responseBody: Prisma.InputJsonValue | Prisma.JsonNullValueInput = Prisma.JsonNull;+ let responseBody: Prisma.InputJsonValue | Prisma.JsonNullValueInput = Prisma.JsonNull;- try {- responseBody = JSON.parse(body);- } catch (err) {- responseBody = body;- }+ try {+ responseBody = JSON.parse(body);+ } catch (err) {+ responseBody = body;+ }- await prisma.webhookCall.create({- data: {- url,- event,- status: response.ok ? WebhookCallStatus.SUCCESS : WebhookCallStatus.FAILED,- requestBody: payloadData as Prisma.InputJsonValue,- responseCode: response.status,- responseBody,- responseHeaders: Object.fromEntries(response.headers.entries()),- webhookId: webhook.id,- },- });+ await prisma.webhookCall.create({+ data: {+ url,+ event,+ status: response.ok ? WebhookCallStatus.SUCCESS : WebhookCallStatus.FAILED,+ requestBody: payloadData as Prisma.InputJsonValue,+ responseCode: response.status,+ responseBody,+ responseHeaders: Object.fromEntries(response.headers.entries()),+ webhookId: webhook.id,+ },+ });- if (!response.ok) {- throw new Error(`Webhook execution failed with status ${response.status}`);- }+ if (!response.ok) {+ throw new Error(`Webhook execution failed with status ${response.status}`);+ }- return {- success: response.ok,- status: response.status,- };- });+ return {+ success: response.ok,+ status: response.status,+ };};diff --git a/packages/lib/server-only/webhooks/trigger/handler.ts b/packages/lib/server-only/webhooks/trigger/handler.tsindex 55d287bac..3b99cc092 100644--- a/packages/lib/server-only/webhooks/trigger/handler.ts+++ b/packages/lib/server-only/webhooks/trigger/handler.ts@@ -13,6 +13,7 @@ export type HandlerTriggerWebhooksResponse =error: string;};+// Todo: [Webhooks] delete after deployment.export const handlerTriggerWebhooks = async (req: Request) => {const signature = req.headers.get('x-webhook-signature');diff --git a/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts b/packages/lib/server-only/webhooks/trigger/trigger-webhook.tsindex 998da6e53..49c18e048 100644--- a/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts+++ b/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts@@ -1,7 +1,6 @@import type { WebhookTriggerEvents } from '@prisma/client';-import { NEXT_PRIVATE_INTERNAL_WEBAPP_URL } from '../../../constants/app';-import { sign } from '../../crypto/sign';+import { jobs } from '../../../jobs/client';import { getAllWebhooksByEventTrigger } from '../get-all-webhooks-by-event-trigger';export type TriggerWebhookOptions = {@@ -13,35 +12,26 @@ export type TriggerWebhookOptions = {export const triggerWebhook = async ({ event, data, userId, teamId }: TriggerWebhookOptions) => {try {- const body = {- event,- data,- userId,- teamId,- };-const registeredWebhooks = await getAllWebhooksByEventTrigger({ event, userId, teamId });if (registeredWebhooks.length === 0) {return;}- const signature = sign(body);-- await Promise.race([- fetch(`${NEXT_PRIVATE_INTERNAL_WEBAPP_URL()}/api/webhook/trigger`, {- method: 'POST',- headers: {- 'content-type': 'application/json',- 'x-webhook-signature': signature,- },- body: JSON.stringify(body),- }),- new Promise((_, reject) => {- setTimeout(() => reject(new Error('Request timeout')), 500);+ await Promise.allSettled(+ registeredWebhooks.map(async (webhook) => {+ await jobs.triggerJob({+ name: 'internal.execute-webhook',+ payload: {+ event,+ webhookId: webhook.id,+ data,+ },+ });}),- ]).catch(() => null);+ );} catch (err) {+ console.error(err);throw new Error(`Failed to trigger webhook`);}};