Skip to content

refactor(server): extract generic webhook handler factory to eliminate triplicated code #496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zbigniewsobiecki merged 3 commits into from
Feb 23, 2026
Merged

refactor(server): extract generic webhook handler factory to eliminate triplicated code #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd9977c
refactor(server): extract generic webhook handler factory to eliminat…
Feb 23, 2026
e6d7c55
fix(server): address review concerns — add fireAndForget and resolveL…
Feb 23, 2026
1584837
fix(server): eliminate lastResult race condition and restore error pr…
Feb 23, 2026
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
167 changes: 55 additions & 112 deletions src/router/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import { serve } from '@hono/node-server';
import { Hono } from 'hono';
import {
createWebhookHandler,
parseGitHubPayload,
parseJiraPayload,
parseTrelloPayload,
} from '../server/webhookHandlers.js';
import { registerBuiltInTriggers } from '../triggers/builtins.js';
import { createTriggerRegistry } from '../triggers/registry.js';
import { logWebhookCall } from '../utils/webhookLogger.js';
import { handleGitHubWebhook } from './github.js';
import { handleJiraWebhook } from './jira.js';
import { getQueueStats } from './queue.js';
import { handleTrelloWebhook } from './trello.js';
import { extractRawHeaders, parseGitHubWebhookPayload } from './webhookParsing.js';
import {
getActiveWorkerCount,
getActiveWorkers,
Expand Down Expand Up @@ -39,133 +43,72 @@ app.on(['HEAD', 'GET'], '/trello/webhook', (c) => {
});

// Trello webhook handler
app.post('/trello/webhook', async (c) => {
const rawHeaders = extractRawHeaders(c);
let payload: unknown;
try {
payload = await c.req.json();
} catch {
logWebhookCall({
source: 'trello',
method: c.req.method,
path: c.req.path,
headers: rawHeaders,
statusCode: 400,
processed: false,
});
return c.text('Bad Request', 400);
}

const { shouldProcess, project, actionType, cardId } = await handleTrelloWebhook(
payload,
triggerRegistry,
);

logWebhookCall({
app.post(
'/trello/webhook',
createWebhookHandler({
source: 'trello',
method: c.req.method,
path: c.req.path,
headers: rawHeaders,
body: payload,
statusCode: 200,
projectId: project?.id,
eventType: actionType,
processed: shouldProcess && !!project && !!cardId,
});

return c.text('OK', 200);
});
checkCapacity: false,
fireAndForget: false,
parsePayload: parseTrelloPayload,
processWebhook: async (payload) => {
const { shouldProcess, project, cardId } = await handleTrelloWebhook(
payload,
triggerRegistry,
);
return {
processed: shouldProcess && !!project && !!cardId,
projectId: project?.id,
};
},
}),
);

// GitHub webhook verification
app.get('/github/webhook', (c) => {
return c.text('OK', 200);
});

// GitHub webhook handler
app.post('/github/webhook', async (c) => {
const eventType = c.req.header('X-GitHub-Event') || 'unknown';
const contentType = c.req.header('Content-Type') || '';
const rawHeaders = extractRawHeaders(c);

const parseResult = await parseGitHubWebhookPayload(c, contentType);
if (!parseResult.ok) {
console.log('[Router] GitHub webhook parse error:', {
error: parseResult.error,
contentType,
eventType,
});
logWebhookCall({
source: 'github',
method: c.req.method,
path: c.req.path,
headers: rawHeaders,
bodyRaw: parseResult.error,
statusCode: 400,
eventType,
processed: false,
});
return c.text('Bad Request', 400);
}
const payload = parseResult.payload;

const { shouldProcess } = await handleGitHubWebhook(eventType, payload, triggerRegistry);

logWebhookCall({
app.post(
'/github/webhook',
createWebhookHandler({
source: 'github',
method: c.req.method,
path: c.req.path,
headers: rawHeaders,
body: payload,
statusCode: 200,
eventType,
processed: shouldProcess,
});

return c.text('OK', 200);
});
checkCapacity: false,
fireAndForget: false,
parsePayload: parseGitHubPayload,
processWebhook: async (payload, eventType) => {
const { shouldProcess } = await handleGitHubWebhook(
eventType ?? 'unknown',
payload,
triggerRegistry,
);
return { processed: shouldProcess };
},
}),
);

// JIRA webhook verification
app.get('/jira/webhook', (c) => {
return c.text('OK', 200);
});

// JIRA webhook handler
app.post('/jira/webhook', async (c) => {
const rawHeaders = extractRawHeaders(c);
let payload: unknown;
try {
payload = await c.req.json();
} catch {
logWebhookCall({
source: 'jira',
method: c.req.method,
path: c.req.path,
headers: rawHeaders,
statusCode: 400,
processed: false,
});
return c.text('Bad Request', 400);
}

const { shouldProcess, project, webhookEvent } = await handleJiraWebhook(
payload,
triggerRegistry,
);

logWebhookCall({
app.post(
'/jira/webhook',
createWebhookHandler({
source: 'jira',
method: c.req.method,
path: c.req.path,
headers: rawHeaders,
body: payload,
statusCode: 200,
projectId: project?.id,
eventType: webhookEvent || undefined,
processed: !!shouldProcess,
});

return c.text('OK', 200);
});
checkCapacity: false,
fireAndForget: false,
parsePayload: parseJiraPayload,
processWebhook: async (payload) => {
const { shouldProcess, project } = await handleJiraWebhook(payload, triggerRegistry);
return {
processed: !!shouldProcess,
projectId: project?.id,
};
},
}),
);

// Graceful shutdown
async function shutdown(signal: string): Promise<void> {
Expand Down
Loading