@zhin.js/adapter-github 1.1.25 → 1.1.27

package/src/protocol.ts

@@ -5,7 +5,6 @@ import type { EndpointProfileConfiguration } from 'zhin.js/adapter';
  */
 
 import { createHmac, timingSafeEqual } from 'node:crypto';
-import type { IncomingMessage } from 'node:http';
 import { isMediaRef, type ConversationRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 
@@ -242,32 +241,12 @@ export function verifyWebhookSignature(
 }
 
 export function headerValue(
-  headers: IncomingMessage['headers'],
+  headers: Headers,
   name: string,
 ): string {
-  const raw = headers[name] ?? headers[name.toLowerCase()];
-  if (Array.isArray(raw)) return raw[0] ?? '';
-  return raw ?? '';
+  return headers.get(name) ?? '';
 }
 
-export async function readTextBody(
-  request: IncomingMessage,
-  options: { readonly limit?: number } = {},
-): Promise<string> {
-  const limit = options.limit ?? 1_048_576;
-  const chunks: Buffer[] = [];
-  let size = 0;
-  for await (const chunk of request) {
-    const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-    size += buffer.length;
-    if (size > limit) {
-      request.destroy();
-      throw new Error(`Request body exceeds ${limit} bytes`);
-    }
-    chunks.push(buffer);
-  }
-  return Buffer.concat(chunks).toString('utf8');
-}
 
 export function parseIssueCommentInbound(payload: IssueCommentPayload): GithubInboundComment | null {
   if (payload.action !== 'created' || !payload.comment) return null;
@@ -366,8 +345,3 @@ export function formatNotification(event: string, p: GenericWebhookPayload): str
       return `📬 ${repo}\n📡 ${event}${p.action ? ` (${p.action})` : ''} by ${sender}\n🔗 ${repoUrl}`;
   }
 }
-
-/** Parse @mentions in markdown into a flat display string (gateway text path). */
-export function parseMarkdownMentions(md: string): string {
-  return md;
-}

package/src/webhook.ts

@@ -1,15 +1,14 @@
 /**
  * GitHub webhook HTTP: verify → parse → admit inbound comments.
  */
-import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { HttpHost, HttpRouteRegistration } from '@zhin.js/host-http';
+import { readTextBody } from '@zhin.js/host-http-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import {
   headerValue,
   parseIssueCommentInbound,
   parsePrReviewCommentInbound,
   parsePrReviewInbound,
-  readTextBody,
   verifyWebhookSignature,
   type GithubInboundComment,
   type IssueCommentPayload,
@@ -32,22 +31,17 @@ export function registerGithubWebhookRoutes(
 ): HttpRouteRegistration[] {
   const routePath = handler.config.webhookPath;
   return [
-    http.route('POST', routePath, async (request, response) => {
-      await handleGithubWebhookRequest(request, response, handler);
-    }, { summary: 'GitHub webhook', tags: ['github'] }),
+    http.route('POST', routePath, (request) => handleGithubWebhookRequest(request, handler), { summary: 'GitHub webhook', tags: ['github'] }),
   ];
 }
 
 export async function handleGithubWebhookRequest(
-  request: IncomingMessage,
-  response: ServerResponse,
+  request: Request,
   handler: GithubWebhookHandler,
-): Promise<void> {
+): Promise<Response> {
   const secret = handler.config.webhookSecret;
   if (!secret) {
-    response.writeHead(503, { 'Content-Type': 'application/json' });
-    response.end(JSON.stringify({ error: 'Webhook not configured' }));
-    return;
+    return new Response(JSON.stringify({ error: 'Webhook not configured' }), { status: 503, headers: { 'Content-Type': 'application/json' } });
   }
 
   const signature = headerValue(request.headers, 'x-hub-signature-256');
@@ -55,9 +49,7 @@ export async function handleGithubWebhookRequest(
   const deliveryId = headerValue(request.headers, 'x-github-delivery');
 
   if (!signature || !event) {
-    response.writeHead(400, { 'Content-Type': 'application/json' });
-    response.end(JSON.stringify({ error: 'Missing signature or event header' }));
-    return;
+    return new Response(JSON.stringify({ error: 'Missing signature or event header' }), { status: 400, headers: { 'Content-Type': 'application/json' } });
   }
 
   try {
@@ -69,32 +61,23 @@ export async function handleGithubWebhookRequest(
         error: 'invalid signature',
         delivery: deliveryId,
       }));
-      response.writeHead(401, { 'Content-Type': 'application/json' });
-      response.end(JSON.stringify({ error: 'Invalid signature' }));
-      return;
+      return new Response(JSON.stringify({ error: 'Invalid signature' }), { status: 401, headers: { 'Content-Type': 'application/json' } });
     }
 
     let payload: unknown;
     try {
       payload = rawBody ? JSON.parse(rawBody) : {};
     } catch {
-      response.writeHead(400, { 'Content-Type': 'application/json' });
-      response.end(JSON.stringify({ error: 'Invalid JSON' }));
-      return;
+      return new Response(JSON.stringify({ error: 'Invalid JSON' }), { status: 400, headers: { 'Content-Type': 'application/json' } });
     }
 
-    response.writeHead(200, { 'Content-Type': 'application/json' });
-    response.end(JSON.stringify({ ok: true }));
-
     void dispatchGithubWebhookPayload(event, payload, handler).catch((e) => {
       logger.error(`Webhook 事件处理失败 (${event}):`, e);
     });
+    return new Response(JSON.stringify({ ok: true }), { status: 200, headers: { 'Content-Type': 'application/json' } });
   } catch (error) {
     logger.error('Webhook error:', error);
-    if (!response.headersSent) {
-      response.writeHead(500, { 'Content-Type': 'application/json' });
-      response.end(JSON.stringify({ error: 'Internal Server Error' }));
-    }
+    return new Response(JSON.stringify({ error: 'Internal Server Error' }), { status: 500, headers: { 'Content-Type': 'application/json' } });
   }
 }