@zhin.js/adapter-kook 1.1.25 → 1.1.27

package/src/webhook.ts

@@ -2,7 +2,6 @@ import { endpointSpec, type Endpoint } from 'zhin.js/adapter';
 /**
  * KOOK webhook HTTP: verify → parse → admit.
  */
-import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { HttpHost, HttpRouteRegistration } from '@zhin.js/host-http';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import {
@@ -34,17 +33,14 @@ export function registerKookWebhookRoutes(
 ): HttpRouteRegistration[] {
   const path = handler.endpointConfig.webhookPath;
   return [
-    http.route('POST', path, async (request, response) => {
-      await handleKookWebhookRequest(request, response, handler);
-    }, { summary: 'KOOK webhook callback', tags: ['kook'] }),
+    http.route('POST', path, (request) => handleKookWebhookRequest(request, handler), { summary: 'KOOK webhook callback', tags: ['kook'] }),
   ];
 }
 
 export async function handleKookWebhookRequest(
-  request: IncomingMessage,
-  response: ServerResponse,
+  request: Request,
   handler: KookWebhookHandler,
-): Promise<void> {
+): Promise<Response> {
   try {
     const rawBody = await readRequestBody(request);
     let frame: KookWebhookFrame;
@@ -56,46 +52,32 @@ export async function handleKookWebhookRequest(
         ok: false,
         error: error instanceof Error ? error.message : String(error),
       }));
-      response.writeHead(400, { 'Content-Type': 'application/json' });
-      response.end(JSON.stringify({ message: 'Invalid webhook payload' }));
-      return;
+      return new Response(JSON.stringify({ message: 'Invalid webhook payload' }), { status: 400, headers: { 'Content-Type': 'application/json' } });
     }
 
     const event = frame.d;
     if (!event || typeof event !== 'object') {
-      response.writeHead(200, { 'Content-Type': 'application/json' });
-      response.end(JSON.stringify({ message: 'OK' }));
-      return;
+      return new Response(JSON.stringify({ message: 'OK' }), { status: 200, headers: { 'Content-Type': 'application/json' } });
     }
 
     if (isKookWebhookChallenge(event)) {
       if (!verifyKookWebhookToken(handler.endpointConfig.verifyToken, event.verify_token)) {
-        response.writeHead(403, { 'Content-Type': 'application/json' });
-        response.end(JSON.stringify({ message: 'Invalid verify_token' }));
-        return;
+        return new Response(JSON.stringify({ message: 'Invalid verify_token' }), { status: 403, headers: { 'Content-Type': 'application/json' } });
       }
-      response.writeHead(200, { 'Content-Type': 'application/json' });
-      response.end(JSON.stringify({ challenge: event.challenge ?? '' }));
-      return;
+      return new Response(JSON.stringify({ challenge: event.challenge ?? '' }), { status: 200, headers: { 'Content-Type': 'application/json' } });
     }
 
     if (!verifyKookWebhookToken(handler.endpointConfig.verifyToken, event.verify_token)) {
-      response.writeHead(403, { 'Content-Type': 'application/json' });
-      response.end(JSON.stringify({ message: 'Invalid verify_token' }));
-      return;
+      return new Response(JSON.stringify({ message: 'Invalid verify_token' }), { status: 403, headers: { 'Content-Type': 'application/json' } });
     }
 
     if (!handler.isOpen) {
-      response.writeHead(503, { 'Content-Type': 'application/json' });
-      response.end(JSON.stringify({ message: 'Endpoint unavailable' }));
-      return;
+      return new Response(JSON.stringify({ message: 'Endpoint unavailable' }), { status: 503, headers: { 'Content-Type': 'application/json' } });
     }
-    await handler[endpointSpec].events.run(async () => {
+    return await handler[endpointSpec].events.run(async () => {
       if (frame.sn != null) {
         if (!handler.checkAndRememberSn(frame.sn)) {
-          response.writeHead(200, { 'Content-Type': 'application/json' });
-          response.end(JSON.stringify({ message: 'OK' }));
-          return;
+          return new Response(JSON.stringify({ message: 'OK' }), { status: 200, headers: { 'Content-Type': 'application/json' } });
         }
       }
 
@@ -103,17 +85,13 @@ export async function handleKookWebhookRequest(
         await handler.admitEvent(event);
       } catch {
         if (frame.sn != null) handler.forgetSn?.(frame.sn);
-        response.writeHead(503, { 'Content-Type': 'application/json' });
-        response.end(JSON.stringify({ message: 'Admission unavailable' }));
-        return;
+        return new Response(JSON.stringify({ message: 'Admission unavailable' }), { status: 503, headers: { 'Content-Type': 'application/json' } });
       }
 
-      response.writeHead(200, { 'Content-Type': 'application/json' });
-      response.end(JSON.stringify({ message: 'OK' }));
+      return new Response(JSON.stringify({ message: 'OK' }), { status: 200, headers: { 'Content-Type': 'application/json' } });
     });
   } catch (error) {
     logger.error('KOOK webhook error:', error);
-    response.writeHead(200, { 'Content-Type': 'application/json' });
-    response.end(JSON.stringify({ message: 'OK' }));
+    return new Response(JSON.stringify({ message: 'OK' }), { status: 200, headers: { 'Content-Type': 'application/json' } });
   }
 }