fixes and tests

Author: enisdenjo

src/__tests__/use.ts

@@ -5,6 +5,7 @@ import fastify from 'fastify';
 import Koa from 'koa';
 import mount from 'koa-mount';
 import { createServerAdapter } from '@whatwg-node/server';
+import uWS from 'uWebSockets.js';
 import { startDisposableServer } from './utils/tserver';
 import { serverAudits } from '../audits';
 import { schema } from './fixtures/simple';
@@ -14,6 +15,7 @@ import { createHandler as createExpressHandler } from '../use/express';
 import { createHandler as createFastifyHandler } from '../use/fastify';
 import { createHandler as createFetchHandler } from '../use/fetch';
 import { createHandler as createKoaHandler } from '../use/koa';
+import { createHandler as createUWSHandler } from '../use/uWebSockets';
 
 describe('http', () => {
   const [url, , dispose] = startDisposableServer(
@@ -219,3 +221,39 @@ describe('koa', () => {
     await dispose();
   });
 });
+
+describe('uWebSockets.js', () => {
+  let url = '';
+  beforeAll(async () => {
+    // get available port by starting a temporary server
+    const [availableUrl, availablePort, dispose] = startDisposableServer(
+      http.createServer(),
+    );
+    await dispose();
+    url = availableUrl;
+
+    new Promise<void>((resolve, reject) => {
+      uWS
+        .App()
+        .any('/', createUWSHandler({ schema }))
+        .listen(availablePort, (listenSocket) => {
+          if (!listenSocket) {
+            reject(new Error('Unavailable uWS listen socket'));
+          } else {
+            resolve();
+          }
+        });
+    });
+  });
+
+  // TODO: dispose of app afterAll
+
+  for (const audit of serverAudits({ url: () => url, fetchFn: fetch })) {
+    it(audit.name, async () => {
+      const result = await audit.fn();
+      if (result.status !== 'ok') {
+        throw result.reason;
+      }
+    });
+  }
+});

src/use/uWebSockets.ts

@@ -46,33 +46,45 @@ export function createHandler<Context extends OperationContext = undefined>(
 ): (res: HttpResponse, req: HttpRequest) => Promise<void> {
   const handle = createRawHandler(options);
   return async function requestListener(res, req) {
+    let aborted = false;
+    res.onAborted(() => (aborted = true));
     try {
+      let url = req.getUrl();
+      const query = req.getQuery();
+      if (query) {
+        url += '?' + query;
+      }
       const [body, init] = await handle({
-        url: req.getUrl(),
-        method: req.getMethod(),
-        headers: { get: req.getHeader },
+        url,
+        method: req.getMethod().toUpperCase(),
+        headers: { get: (key) => req.getHeader(key) },
         body: () =>
           new Promise<string>((resolve) => {
             let body = '';
-            res.onData((chunk, isLast) => {
-              body += chunk;
-              if (isLast) {
-                resolve(body);
-              }
-            });
+            if (aborted) {
+              resolve(body);
+            } else {
+              res.onData((chunk, isLast) => {
+                body += Buffer.from(chunk, 0, chunk.byteLength).toString();
+                if (isLast) {
+                  resolve(body);
+                }
+              });
+            }
           }),
         raw: req,
         context: { res },
       });
-
-      res.writeStatus(`${init.status} ${init.statusText}`);
-      for (const [key, val] of Object.entries(init.headers || {})) {
-        res.writeHeader(key, val);
-      }
-      if (body) {
-        res.end(body);
-      } else {
-        res.endWithoutBody();
+      if (!aborted) {
+        res.writeStatus(`${init.status} ${init.statusText}`);
+        for (const [key, val] of Object.entries(init.headers || {})) {
+          res.writeHeader(key, val);
+        }
+        if (body) {
+          res.end(body);
+        } else {
+          res.endWithoutBody();
+        }
       }
     } catch (err) {
       // The handler shouldnt throw errors.
@@ -82,7 +94,9 @@ export function createHandler<Context extends OperationContext = undefined>(
           'Please check your implementation.',
         err,
       );
-      res.writeStatus('500 Internal Server Error').endWithoutBody();
+      if (!aborted) {
+        res.writeStatus('500 Internal Server Error').endWithoutBody();
+      }
     }
   };
 }