Don’t rate limit webhooks

Author: matt-aitken

apps/webapp/app/v3/services/alerts/deliverAlert.server.ts

@@ -36,7 +36,7 @@ import { commonWorker } from "~/v3/commonWorker.server";
 import { FINAL_ATTEMPT_STATUSES } from "~/v3/taskStatus";
 import { BaseService } from "../baseService.server";
 import { generateFriendlyId } from "~/v3/friendlyIdentifiers";
-import { ProjectAlertType } from "@trigger.dev/database";
+import { ProjectAlertChannelType, ProjectAlertType } from "@trigger.dev/database";
 import { alertsRateLimiter } from "~/v3/alertsRateLimiter.server";
 import { v3RunPath } from "~/utils/pathBuilder";
 import { isOOMError } from "../completeAttempt.server";
@@ -1068,13 +1068,15 @@ export class DeliverAlertService extends BaseService {
   static async createAndSendAlert(
     {
       channelId,
+      channelType,
       projectId,
       environmentId,
       alertType,
       deploymentId,
       taskRunId,
     }: {
       channelId: string;
+      channelType: ProjectAlertChannelType;
       projectId: string;
       environmentId: string;
       alertType: ProjectAlertType;
@@ -1083,7 +1085,7 @@ export class DeliverAlertService extends BaseService {
     },
     db: PrismaClientOrTransaction
   ) {
-    if (taskRunId) {
+    if (taskRunId && channelType !== "WEBHOOK") {
       try {
         const result = await alertsRateLimiter.check(channelId);
 

apps/webapp/app/v3/services/alerts/performDeploymentAlerts.server.ts

@@ -49,6 +49,7 @@ export class PerformDeploymentAlertsService extends BaseService {
     await DeliverAlertService.createAndSendAlert(
       {
         channelId: alertChannel.id,
+        channelType: alertChannel.type,
         projectId: deployment.projectId,
         environmentId: deployment.environmentId,
         alertType,

apps/webapp/app/v3/services/alerts/performTaskRunAlerts.server.ts

@@ -49,6 +49,7 @@ export class PerformTaskRunAlertsService extends BaseService {
     await DeliverAlertService.createAndSendAlert(
       {
         channelId: alertChannel.id,
+        channelType: alertChannel.type,
         projectId: run.projectId,
         environmentId: run.runtimeEnvironmentId,
         alertType: "TASK_RUN",