fix: types

router.ts

@@ -1,8 +1,12 @@
 // Copyright 2019 Yusuke Sakurai. All rights reserved. MIT license.
-import {IncomingHttpRequest, serve, ServeOptions} from "./server.ts";
-import {encode} from "https://deno.land/[email protected]/strings/strings.ts";
+import {
+  serve,
+  ServeOptions,
+  ServerRequest
+} from "./server.ts";
+import { encode } from "https://deno.land/[email protected]/strings/strings.ts";
 
-export type RoutedServerRequest = IncomingHttpRequest & {
+export type RoutedServerRequest = ServerRequest & {
   match?: RegExpMatchArray;
 };
 

router_test.ts

@@ -52,26 +52,26 @@ test(function httpMatchNearest() {
 });
 test(async function router() {
   const server = createRouter();
-  server.handle("/index", async (req, { respond }) => {
-    await respond({
+  server.handle("/index", async req => {
+    await req.respond({
       status: 200,
       headers: new Headers({
         "content-type": "text/plain"
       }),
       body: new StringReader("ok")
     });
   });
-  server.handle(new RegExp("/foo/(?<id>.+)"), async (req, { respond }) => {
+  server.handle(new RegExp("/foo/(?<id>.+)"), async req => {
     const { id } = req.match.groups;
-    await respond({
+    await req.respond({
       status: 200,
       headers: new Headers({
         "content-type": "application/json"
       }),
       body: new StringReader(JSON.stringify({ id }))
     });
   });
-  server.handle("/no-response", async (req, res) => {});
+  server.handle("/no-response", async req => {});
   const cancel = defer<void>();
   try {
     server.listen("127.0.0.1:8898", { cancel: cancel.promise });

serveio.ts

@@ -18,7 +18,8 @@ import {
   encode
 } from "https://deno.land/[email protected]/strings/strings.ts";
 import {
-  ClientRequest, IncomingHttpRequest,
+  ClientRequest,
+  IncomingHttpRequest,
   IncomingHttpResponse,
   ServerRequest,
   ServerResponse