Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion gateway/src/http/routes/twilio-connect-action-webhook.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { GatewayConfig } from "../../config.js";
import { getLogger } from "../../logger.js";
import { forwardTwilioConnectActionWebhook } from "../../runtime/client.js";
import { CircuitBreakerOpenError, forwardTwilioConnectActionWebhook } from "../../runtime/client.js";
import { validateTwilioWebhookRequest } from "../../twilio/validate-webhook.js";

const log = getLogger("twilio-connect-action-webhook");
Expand All @@ -20,6 +20,12 @@ export function createTwilioConnectActionWebhookHandler(config: GatewayConfig) {
headers: runtimeResponse.headers,
});
} catch (err) {
if (err instanceof CircuitBreakerOpenError) {
return Response.json(
{ error: "Service temporarily unavailable" },
{ status: 503, headers: { "Retry-After": String(err.retryAfterSecs) } },
);
}
log.error({ err }, "Failed to forward Twilio connect-action webhook to runtime");
return Response.json({ error: "Internal server error" }, { status: 502 });
}
Expand Down
8 changes: 7 additions & 1 deletion gateway/src/http/routes/twilio-status-webhook.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { GatewayConfig } from "../../config.js";
import { getLogger } from "../../logger.js";
import { forwardTwilioStatusWebhook } from "../../runtime/client.js";
import { CircuitBreakerOpenError, forwardTwilioStatusWebhook } from "../../runtime/client.js";
import { validateTwilioWebhookRequest } from "../../twilio/validate-webhook.js";

const log = getLogger("twilio-status-webhook");
Expand All @@ -23,6 +23,12 @@ export function createTwilioStatusWebhookHandler(config: GatewayConfig) {
headers: runtimeResponse.headers,
});
} catch (err) {
if (err instanceof CircuitBreakerOpenError) {
return Response.json(
{ error: "Service temporarily unavailable" },
{ status: 503, headers: { "Retry-After": String(err.retryAfterSecs) } },
);
}
log.error({ err }, "Failed to forward Twilio status webhook to runtime");
return Response.json({ error: "Internal server error" }, { status: 502 });
}
Expand Down
8 changes: 7 additions & 1 deletion gateway/src/http/routes/twilio-voice-webhook.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { GatewayConfig } from "../../config.js";
import { getLogger } from "../../logger.js";
import { forwardTwilioVoiceWebhook } from "../../runtime/client.js";
import { CircuitBreakerOpenError, forwardTwilioVoiceWebhook } from "../../runtime/client.js";
import { resolveAssistant, resolveAssistantByPhoneNumber, isRejection } from "../../routing/resolve-assistant.js";
import { validateTwilioWebhookRequest } from "../../twilio/validate-webhook.js";

Expand Down Expand Up @@ -69,6 +69,12 @@ export function createTwilioVoiceWebhookHandler(config: GatewayConfig) {
headers: runtimeResponse.headers,
});
} catch (err) {
if (err instanceof CircuitBreakerOpenError) {
return Response.json(
{ error: "Service temporarily unavailable" },
{ status: 503, headers: { "Retry-After": String(err.retryAfterSecs) } },
);
}
log.error({ err }, "Failed to forward Twilio voice webhook to runtime");
return Response.json({ error: "Internal server error" }, { status: 502 });
}
Expand Down
7 changes: 7 additions & 0 deletions gateway/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { createWhatsAppDeliverHandler } from "./http/routes/whatsapp-deliver.js"
import { createOAuthCallbackHandler } from "./http/routes/oauth-callback.js";
import { createPairingProxyHandler } from "./http/routes/pairing-proxy.js";
import { getLogger, initLogger } from "./logger.js";
import { CircuitBreakerOpenError } from "./runtime/client.js";
import { buildSchema } from "./schema.js";
import { callTelegramApi } from "./telegram/api.js";
import { reconcileTelegramWebhook } from "./telegram/webhook-manager.js";
Expand Down Expand Up @@ -64,6 +65,12 @@ function main() {
port: config.port,
websocket: getRelayWebsocketHandlers(),
error(err) {
if (err instanceof CircuitBreakerOpenError) {
return Response.json(
{ error: "Service temporarily unavailable — runtime is unreachable" },
{ status: 503, headers: { "Retry-After": String(err.retryAfterSecs) } },
);
}
log.error({ err }, "Unhandled gateway error");
return Response.json({ error: "Internal server error" }, { status: 500 });
},
Expand Down
Loading
Loading