From f3b67f09b4b171e247e9db4cddaf331fe1b86387 Mon Sep 17 00:00:00 2001
From: winstxnhdw <winstxnhdw@gmail.com>
Date: Mon, 13 May 2024 15:52:01 +0800
Subject: [PATCH] feat: add remaining tests

---
 src/convenience/frameworks.ts    | 44 +++++++++++++++++---------------
 test/convenience/webhook.test.ts | 41 +++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/src/convenience/frameworks.ts b/src/convenience/frameworks.ts
index fa8e9f2c..7dedd334 100644
--- a/src/convenience/frameworks.ts
+++ b/src/convenience/frameworks.ts
@@ -171,14 +171,16 @@ export type KoaAdapter = (ctx: {
     };
 }) => ReqResHandler;
 
-export type NextAdapter = (request: {
+export type NextAdapter = (req: {
     body: Update;
-    headers: Record<string, string>;
-}, response: {
-    end: () => void;
-    status: (code: number) => typeof response;
-    json: (json: string) => typeof response;
-    send: (json: string) => typeof response;
+    headers: NodeJS.Dict<string | string[]>;
+}, res: {
+    end: (cb?: () => void) => typeof res;
+    status: (code: number) => typeof res;
+    // deno-lint-ignore no-explicit-any
+    json: (json: string) => any;
+    // deno-lint-ignore no-explicit-any
+    send: (json: string) => any;
 }) => ReqResHandler;
 
 export type NHttpAdapter = (rev: {
@@ -211,10 +213,12 @@ export type OakAdapter = (ctx: {
     };
 }) => ReqResHandler;
 
-export type ServeHttpAdapter = (requestEvent: {
-    request: Request;
-    respondWith: (response: Response) => void;
-}) => ReqResHandler;
+export type ServeHttpAdapter = (
+    requestEvent: {
+        request: Request;
+        respondWith: (response: Response) => void;
+    },
+) => ReqResHandler;
 
 export type StdHttpAdapter = (
     req: Request,
@@ -225,14 +229,12 @@ export type SveltekitAdapter = (
 ) => ReqResHandler<Promise<unknown>>;
 
 export type WorktopAdapter = (req: {
-    body: {
-        json: () => Promise<Update>;
-    };
+    json: () => Promise<Update>;
     headers: {
-        get: (header: string) => string | undefined;
+        get: (header: string) => string | null;
     };
 }, res: {
-    end: () => void;
+    end: (data: BodyInit | null) => void;
     send: (status: number, json: string) => void;
 }) => ReqResHandler;
 
@@ -433,7 +435,7 @@ const koa: KoaAdapter = (ctx) => ({
 /** Next.js Serverless Functions */
 const nextJs: NextAdapter = (request, response) => ({
     update: Promise.resolve(request.body),
-    header: request.headers[SECRET_HEADER_LOWERCASE],
+    header: request.headers[SECRET_HEADER_LOWERCASE] as string,
     end: () => response.end(),
     respond: (json) => response.status(200).json(json),
     unauthorized: () => response.status(401).send(WRONG_TOKEN_ERROR),
@@ -518,11 +520,11 @@ const sveltekit: SveltekitAdapter = ({ request }) => {
         }),
     };
 };
-/** worktop CloudFlare workers framework */
+/** worktop Cloudflare workers framework */
 const worktop: WorktopAdapter = (req, res) => ({
-    update: Promise.resolve(req.body.json()),
-    header: req.headers.get(SECRET_HEADER),
-    end: () => res.end(),
+    update: Promise.resolve(req.json()),
+    header: req.headers.get(SECRET_HEADER) ?? undefined,
+    end: () => res.end(null),
     respond: (json) => res.send(200, json),
     unauthorized: () => res.send(401, WRONG_TOKEN_ERROR),
     handlerReturn: undefined,
diff --git a/test/convenience/webhook.test.ts b/test/convenience/webhook.test.ts
index c02f5726..d0615652 100644
--- a/test/convenience/webhook.test.ts
+++ b/test/convenience/webhook.test.ts
@@ -5,8 +5,11 @@ import type {
     APIGatewayProxyEventV2,
     Context as LambdaContext,
 } from "https://deno.land/x/lambda/mod.ts";
+import nhttp from "https://deno.land/x/nhttp/mod.ts";
+import { Application } from "https://deno.land/x/oak/mod.ts";
 import { createServer } from "node:http";
 import Fastify from "npm:fastify";
+import type { NextApiRequest, NextApiResponse } from "npm:next";
 import { Bot, webhookCallback } from "../../src/mod.ts";
 import { describe, it } from "../deps.test.ts";
 
@@ -66,6 +69,44 @@ describe("webhook", () => {
         });
     });
 
+    it("Next serverless functions should be compatible with grammY adapter", () => {
+        ((
+            req: NextApiRequest,
+            res: NextApiResponse,
+        ) => {
+            return webhookCallback(new Bot(""), "next-js")(req, res);
+        });
+    });
+
+    it("NHttp should be compatible with grammY adapter", () => {
+        nhttp().post("/", (rev) => {
+            return webhookCallback(new Bot(""), "nhttp")(rev);
+        });
+    });
+
+    it("Oak should be compatible with grammY adapter", () => {
+        new Application().use((ctx) => {
+            return webhookCallback(new Bot(""), "oak")(ctx);
+        });
+    });
+
+    it("serveHttp should be compatible with grammY adapter", async () => {
+        try {
+            Deno.serveHttp(await Deno.listen({ port: 8080 }).accept())
+                .nextRequest()
+                .then(
+                    (req) => {
+                        return !req
+                            ? undefined
+                            : webhookCallback(new Bot(""), "serveHttp")(req);
+                    },
+                );
+        } catch (error) {
+            if (error instanceof Deno.errors.PermissionDenied) return;
+            throw error;
+        }
+    });
+
     it("std/http should be compatible with grammY adapter", () => {
         try {
             Deno.serve(