@kaito-http/core 2.1.0 → 2.2.0

package/dist/declarations/src/error.d.ts

@@ -1,5 +1,6 @@
 export declare class WrappedError<T> extends Error {
     readonly data: T;
-    static from<T>(maybeError: T): (T & Error) | WrappedError<T>;
-    constructor(data: T);
+    static maybe<T>(maybeError: T): (T & Error) | WrappedError<T>;
+    static from<T>(data: T): WrappedError<T>;
+    private constructor();
 }

package/dist/declarations/src/server.d.ts

@@ -13,135 +13,115 @@ export declare type ContextWithInput<Ctx, Input> = {
     input: Input;
 };
 declare type Values<T> = T[keyof T];
-declare type Proc<Ctx, Result, Input extends z.ZodTypeAny | Never = Never> = Readonly<{
+export declare type Proc<Ctx, Result, Input extends z.ZodTypeAny | Never = Never> = Readonly<{
     input?: Input;
     run(arg: ContextWithInput<Ctx, Input extends ZodTypeAny ? z.infer<Input> : undefined>): Promise<Result>;
 }>;
-declare type ProcsInit<Ctx> = {
-    [Key in string]: Proc<Ctx, unknown, z.ZodTypeAny> & {
-        method: Method;
-        name: Key;
-    };
+export interface RouterProc<Path extends string = string, M extends Method = Method> {
+    method: M;
+    path: Path;
+    pattern: RegExp;
+}
+export declare type AnyProcs<Ctx> = {
+    [Path in string]: Proc<Ctx, unknown, z.ZodTypeAny> & RouterProc<Path>;
 };
-declare type AnyRouter<Ctx> = Router<Ctx, ProcsInit<Ctx>>;
-export declare class Router<Ctx, Procs extends ProcsInit<Ctx>> {
+export declare type AnyRouter<Ctx> = Router<Ctx, AnyProcs<Ctx>>;
+export declare class Router<Ctx, Procs extends AnyProcs<Ctx>> {
     private readonly procs;
+    private readonly _procsArray;
+    /**
+     * Ensures that the path does not start or end with a slash.
+     * @param path
+     * @private
+     */
+    private static stripSlashes;
     constructor(procs: Procs);
     getProcs(): Procs;
+    find(method: Method, url: string): (Readonly<{
+        input?: z.ZodTypeAny | undefined;
+        run(arg: ContextWithInput<Ctx, any>): Promise<unknown>;
+    }> & RouterProc<string, Method>) | null;
     private readonly create;
-    readonly merge: <Prefix extends string, NewCtx, NewProcs extends ProcsInit<NewCtx>>(prefix: Prefix, router: Router<NewCtx, NewProcs>) => Router<NewCtx & Ctx, Procs & { [Key in `${Prefix}${Extract<keyof NewProcs, string>}`]: Omit<NewProcs[Key extends `${Prefix}${infer Rest}` ? Rest : never], "name"> & {
-        name: Key;
+    readonly merge: <Prefix extends string, NewCtx, NewProcs extends AnyProcs<NewCtx>>(prefix: Prefix, router: Router<NewCtx, NewProcs>) => Router<NewCtx & Ctx, Procs & { [P in `${Prefix}${Extract<keyof NewProcs, string>}`]: Omit<NewProcs[P extends `${Prefix}${infer Rest}` ? Rest : never], "path"> & {
+        path: P;
     }; }>;
-    readonly get: <Name extends string, Result, Input extends z.ZodTypeAny>(name: Name, proc: Readonly<{
+    readonly get: <Path extends string, Result, Input extends z.ZodTypeAny>(path: Path, proc: Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }>) => Router<Ctx, Procs & Record<Name, Readonly<{
+    }>) => Router<Ctx, Procs & Record<Path, Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }> & {
-        method: "GET";
-        name: Name;
-    }>>;
-    readonly post: <Name extends string, Result, Input extends z.ZodTypeAny>(name: Name, proc: Readonly<{
+    }> & RouterProc<Path, "GET">>>;
+    readonly post: <Path extends string, Result, Input extends z.ZodTypeAny>(path: Path, proc: Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }>) => Router<Ctx, Procs & Record<Name, Readonly<{
+    }>) => Router<Ctx, Procs & Record<Path, Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }> & {
-        method: "POST";
-        name: Name;
-    }>>;
-    readonly put: <Name extends string, Result, Input extends z.ZodTypeAny>(name: Name, proc: Readonly<{
+    }> & RouterProc<Path, "POST">>>;
+    readonly put: <Path extends string, Result, Input extends z.ZodTypeAny>(path: Path, proc: Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }>) => Router<Ctx, Procs & Record<Name, Readonly<{
+    }>) => Router<Ctx, Procs & Record<Path, Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }> & {
-        method: "PUT";
-        name: Name;
-    }>>;
-    readonly patch: <Name extends string, Result, Input extends z.ZodTypeAny>(name: Name, proc: Readonly<{
+    }> & RouterProc<Path, "PUT">>>;
+    readonly patch: <Path extends string, Result, Input extends z.ZodTypeAny>(path: Path, proc: Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }>) => Router<Ctx, Procs & Record<Name, Readonly<{
+    }>) => Router<Ctx, Procs & Record<Path, Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }> & {
-        method: "PATCH";
-        name: Name;
-    }>>;
-    readonly delete: <Name extends string, Result, Input extends z.ZodTypeAny>(name: Name, proc: Readonly<{
+    }> & RouterProc<Path, "PATCH">>>;
+    readonly delete: <Path extends string, Result, Input extends z.ZodTypeAny>(path: Path, proc: Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }>) => Router<Ctx, Procs & Record<Name, Readonly<{
+    }>) => Router<Ctx, Procs & Record<Path, Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }> & {
-        method: "DELETE";
-        name: Name;
-    }>>;
-    readonly head: <Name extends string, Result, Input extends z.ZodTypeAny>(name: Name, proc: Readonly<{
+    }> & RouterProc<Path, "DELETE">>>;
+    readonly head: <Path extends string, Result, Input extends z.ZodTypeAny>(path: Path, proc: Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }>) => Router<Ctx, Procs & Record<Name, Readonly<{
+    }>) => Router<Ctx, Procs & Record<Path, Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }> & {
-        method: "HEAD";
-        name: Name;
-    }>>;
-    readonly options: <Name extends string, Result, Input extends z.ZodTypeAny>(name: Name, proc: Readonly<{
+    }> & RouterProc<Path, "HEAD">>>;
+    readonly options: <Path extends string, Result, Input extends z.ZodTypeAny>(path: Path, proc: Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }>) => Router<Ctx, Procs & Record<Name, Readonly<{
+    }>) => Router<Ctx, Procs & Record<Path, Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }> & {
-        method: "OPTIONS";
-        name: Name;
-    }>>;
-    readonly connect: <Name extends string, Result, Input extends z.ZodTypeAny>(name: Name, proc: Readonly<{
+    }> & RouterProc<Path, "OPTIONS">>>;
+    readonly connect: <Path extends string, Result, Input extends z.ZodTypeAny>(path: Path, proc: Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }>) => Router<Ctx, Procs & Record<Name, Readonly<{
+    }>) => Router<Ctx, Procs & Record<Path, Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }> & {
-        method: "CONNECT";
-        name: Name;
-    }>>;
-    readonly trace: <Name extends string, Result, Input extends z.ZodTypeAny>(name: Name, proc: Readonly<{
+    }> & RouterProc<Path, "CONNECT">>>;
+    readonly trace: <Path extends string, Result, Input extends z.ZodTypeAny>(path: Path, proc: Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }>) => Router<Ctx, Procs & Record<Name, Readonly<{
+    }>) => Router<Ctx, Procs & Record<Path, Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }> & {
-        method: "TRACE";
-        name: Name;
-    }>>;
-    readonly acl: <Name extends string, Result, Input extends z.ZodTypeAny>(name: Name, proc: Readonly<{
+    }> & RouterProc<Path, "TRACE">>>;
+    readonly acl: <Path extends string, Result, Input extends z.ZodTypeAny>(path: Path, proc: Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }>) => Router<Ctx, Procs & Record<Name, Readonly<{
+    }>) => Router<Ctx, Procs & Record<Path, Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }> & {
-        method: "ACL";
-        name: Name;
-    }>>;
-    readonly bind: <Name extends string, Result, Input extends z.ZodTypeAny>(name: Name, proc: Readonly<{
+    }> & RouterProc<Path, "ACL">>>;
+    readonly bind: <Path extends string, Result, Input extends z.ZodTypeAny>(path: Path, proc: Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }>) => Router<Ctx, Procs & Record<Name, Readonly<{
+    }>) => Router<Ctx, Procs & Record<Path, Readonly<{
         input?: Input | undefined;
         run(arg: ContextWithInput<Ctx, Input extends z.ZodTypeAny ? z.TypeOf<Input> : undefined>): Promise<Result>;
-    }> & {
-        method: "BIND";
-        name: Name;
-    }>>;
+    }> & RouterProc<Path, "BIND">>>;
 }
 export declare class KaitoError extends Error {
     readonly status: number;
@@ -151,8 +131,8 @@ export declare class KaitoError extends Error {
 export declare function createRouter<Ctx>(): Router<Ctx, {}>;
 export declare type InferAPIResponseType<R extends AnyRouter<unknown>, M extends Method, Path extends Extract<Values<ReturnType<R['getProcs']>>, {
     method: M;
-}>['name']> = ReturnType<ReturnType<R['getProcs']>[Path]['run']> extends Promise<infer V> ? V : never;
-export declare function createServer<Ctx, R extends Router<Ctx, ProcsInit<Ctx>>>(config: {
+}>['path']> = ReturnType<ReturnType<R['getProcs']>[Path]['run']> extends Promise<infer V> ? V : never;
+export declare function createServer<Ctx, R extends Router<Ctx, AnyProcs<Ctx>>>(config: {
     getContext: GetContext<Ctx>;
     router: R;
     onError(error: {

package/dist/kaito-http-core.cjs.dev.js

@@ -101,12 +101,16 @@ function _objectSpread2(target) {
 }
 
 class WrappedError extends Error {
-  static from(maybeError) {
+  static maybe(maybeError) {
     if (maybeError instanceof Error) {
       return maybeError;
     }
 
-    return new WrappedError(maybeError);
+    return WrappedError.from(maybeError);
+  }
+
+  static from(data) {
+    return new WrappedError(data);
   }
 
   constructor(data) {
@@ -227,22 +231,45 @@ function createGetContext(getContext) {
   return getContext;
 }
 class Router {
+  /**
+   * Ensures that the path does not start or end with a slash.
+   * @param path
+   * @private
+   */
+  static stripSlashes(path) {
+    if (path.startsWith('/')) {
+      path = path.slice(1);
+    }
+
+    if (path.endsWith('/')) {
+      path = path.slice(-1);
+    }
+
+    return path;
+  }
+
   constructor(procs) {
-    _defineProperty(this, "create", method => (name, proc) => {
-      return new Router(_objectSpread2(_objectSpread2({}, this.procs), {}, {
-        [name]: _objectSpread2(_objectSpread2({}, proc), {}, {
+    _defineProperty(this, "create", method => (path, proc) => {
+      var stripped = Router.stripSlashes(path);
+      var pattern = new RegExp("^/".concat(stripped, "/?$"), 'i');
+
+      var merged = _objectSpread2(_objectSpread2({}, this.procs), {}, {
+        [path]: _objectSpread2(_objectSpread2({}, proc), {}, {
           method,
-          name
+          path,
+          pattern
         })
-      }));
+      });
+
+      return new Router(merged);
     });
 
     _defineProperty(this, "merge", (prefix, router) => {
       var newProcs = Object.entries(router.getProcs()).reduce((all, entry) => {
-        var [name, proc] = entry;
+        var [path, proc] = entry;
         return _objectSpread2(_objectSpread2({}, all), {}, {
-          ["".concat(prefix).concat(name)]: _objectSpread2(_objectSpread2({}, proc), {}, {
-            name: "".concat(prefix).concat(name)
+          ["".concat(prefix).concat(path)]: _objectSpread2(_objectSpread2({}, proc), {}, {
+            path: "".concat(prefix).concat(path)
           })
         });
       }, {});
@@ -275,12 +302,27 @@ class Router {
     _defineProperty(this, "bind", this.create('BIND'));
 
     this.procs = procs;
+    this._procsArray = Object.values(procs);
   }
 
   getProcs() {
     return this.procs;
   }
 
+  find(method, url) {
+    for (var proc of this._procsArray) {
+      if (proc.method !== method) {
+        continue;
+      }
+
+      if (proc.pattern.test(url)) {
+        return proc;
+      }
+    }
+
+    return null;
+  }
+
 }
 class KaitoError extends Error {
   constructor(status, message, cause) {
@@ -302,8 +344,7 @@ function createServer(config) {
     }
   };
 
-  var tree = config.router.getProcs();
-  var server = http__default["default"].createServer( /*#__PURE__*/function () {
+  return http__default["default"].createServer( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (incomingMessage, serverResponse) {
       var start = Date.now();
       var req = new KaitoRequest(incomingMessage);
@@ -312,7 +353,7 @@ function createServer(config) {
       try {
         var _handler$input, _yield$getInput;
 
-        var handler = tree[req.url.pathname];
+        var handler = config.router.find(req.method, req.url.pathname);
 
         if (!handler) {
           throw new KaitoError(404, "Cannot ".concat(req.method, " this route."));
@@ -343,7 +384,7 @@ function createServer(config) {
           status: _status,
           message: _message
         } = yield config.onError({
-          error: WrappedError.from(error),
+          error: WrappedError.maybe(error),
           req,
           res
         }).catch(() => ({
@@ -365,7 +406,6 @@ function createServer(config) {
       return _ref.apply(this, arguments);
     };
   }());
-  return server;
 }
 
 exports.KaitoError = KaitoError;

package/dist/kaito-http-core.cjs.prod.js

@@ -101,12 +101,16 @@ function _objectSpread2(target) {
 }
 
 class WrappedError extends Error {
-  static from(maybeError) {
+  static maybe(maybeError) {
     if (maybeError instanceof Error) {
       return maybeError;
     }
 
-    return new WrappedError(maybeError);
+    return WrappedError.from(maybeError);
+  }
+
+  static from(data) {
+    return new WrappedError(data);
   }
 
   constructor(data) {
@@ -227,22 +231,45 @@ function createGetContext(getContext) {
   return getContext;
 }
 class Router {
+  /**
+   * Ensures that the path does not start or end with a slash.
+   * @param path
+   * @private
+   */
+  static stripSlashes(path) {
+    if (path.startsWith('/')) {
+      path = path.slice(1);
+    }
+
+    if (path.endsWith('/')) {
+      path = path.slice(-1);
+    }
+
+    return path;
+  }
+
   constructor(procs) {
-    _defineProperty(this, "create", method => (name, proc) => {
-      return new Router(_objectSpread2(_objectSpread2({}, this.procs), {}, {
-        [name]: _objectSpread2(_objectSpread2({}, proc), {}, {
+    _defineProperty(this, "create", method => (path, proc) => {
+      var stripped = Router.stripSlashes(path);
+      var pattern = new RegExp("^/".concat(stripped, "/?$"), 'i');
+
+      var merged = _objectSpread2(_objectSpread2({}, this.procs), {}, {
+        [path]: _objectSpread2(_objectSpread2({}, proc), {}, {
           method,
-          name
+          path,
+          pattern
         })
-      }));
+      });
+
+      return new Router(merged);
     });
 
     _defineProperty(this, "merge", (prefix, router) => {
       var newProcs = Object.entries(router.getProcs()).reduce((all, entry) => {
-        var [name, proc] = entry;
+        var [path, proc] = entry;
         return _objectSpread2(_objectSpread2({}, all), {}, {
-          ["".concat(prefix).concat(name)]: _objectSpread2(_objectSpread2({}, proc), {}, {
-            name: "".concat(prefix).concat(name)
+          ["".concat(prefix).concat(path)]: _objectSpread2(_objectSpread2({}, proc), {}, {
+            path: "".concat(prefix).concat(path)
           })
         });
       }, {});
@@ -275,12 +302,27 @@ class Router {
     _defineProperty(this, "bind", this.create('BIND'));
 
     this.procs = procs;
+    this._procsArray = Object.values(procs);
   }
 
   getProcs() {
     return this.procs;
   }
 
+  find(method, url) {
+    for (var proc of this._procsArray) {
+      if (proc.method !== method) {
+        continue;
+      }
+
+      if (proc.pattern.test(url)) {
+        return proc;
+      }
+    }
+
+    return null;
+  }
+
 }
 class KaitoError extends Error {
   constructor(status, message, cause) {
@@ -302,8 +344,7 @@ function createServer(config) {
     }
   };
 
-  var tree = config.router.getProcs();
-  var server = http__default["default"].createServer( /*#__PURE__*/function () {
+  return http__default["default"].createServer( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (incomingMessage, serverResponse) {
       var start = Date.now();
       var req = new KaitoRequest(incomingMessage);
@@ -312,7 +353,7 @@ function createServer(config) {
       try {
         var _handler$input, _yield$getInput;
 
-        var handler = tree[req.url.pathname];
+        var handler = config.router.find(req.method, req.url.pathname);
 
         if (!handler) {
           throw new KaitoError(404, "Cannot ".concat(req.method, " this route."));
@@ -343,7 +384,7 @@ function createServer(config) {
           status: _status,
           message: _message
         } = yield config.onError({
-          error: WrappedError.from(error),
+          error: WrappedError.maybe(error),
           req,
           res
         }).catch(() => ({
@@ -365,7 +406,6 @@ function createServer(config) {
       return _ref.apply(this, arguments);
     };
   }());
-  return server;
 }
 
 exports.KaitoError = KaitoError;

package/dist/kaito-http-core.esm.js

@@ -92,12 +92,16 @@ function _objectSpread2(target) {
 }
 
 class WrappedError extends Error {
-  static from(maybeError) {
+  static maybe(maybeError) {
     if (maybeError instanceof Error) {
       return maybeError;
     }
 
-    return new WrappedError(maybeError);
+    return WrappedError.from(maybeError);
+  }
+
+  static from(data) {
+    return new WrappedError(data);
   }
 
   constructor(data) {
@@ -218,22 +222,45 @@ function createGetContext(getContext) {
   return getContext;
 }
 class Router {
+  /**
+   * Ensures that the path does not start or end with a slash.
+   * @param path
+   * @private
+   */
+  static stripSlashes(path) {
+    if (path.startsWith('/')) {
+      path = path.slice(1);
+    }
+
+    if (path.endsWith('/')) {
+      path = path.slice(-1);
+    }
+
+    return path;
+  }
+
   constructor(procs) {
-    _defineProperty(this, "create", method => (name, proc) => {
-      return new Router(_objectSpread2(_objectSpread2({}, this.procs), {}, {
-        [name]: _objectSpread2(_objectSpread2({}, proc), {}, {
+    _defineProperty(this, "create", method => (path, proc) => {
+      var stripped = Router.stripSlashes(path);
+      var pattern = new RegExp("^/".concat(stripped, "/?$"), 'i');
+
+      var merged = _objectSpread2(_objectSpread2({}, this.procs), {}, {
+        [path]: _objectSpread2(_objectSpread2({}, proc), {}, {
           method,
-          name
+          path,
+          pattern
         })
-      }));
+      });
+
+      return new Router(merged);
     });
 
     _defineProperty(this, "merge", (prefix, router) => {
       var newProcs = Object.entries(router.getProcs()).reduce((all, entry) => {
-        var [name, proc] = entry;
+        var [path, proc] = entry;
         return _objectSpread2(_objectSpread2({}, all), {}, {
-          ["".concat(prefix).concat(name)]: _objectSpread2(_objectSpread2({}, proc), {}, {
-            name: "".concat(prefix).concat(name)
+          ["".concat(prefix).concat(path)]: _objectSpread2(_objectSpread2({}, proc), {}, {
+            path: "".concat(prefix).concat(path)
           })
         });
       }, {});
@@ -266,12 +293,27 @@ class Router {
     _defineProperty(this, "bind", this.create('BIND'));
 
     this.procs = procs;
+    this._procsArray = Object.values(procs);
   }
 
   getProcs() {
     return this.procs;
   }
 
+  find(method, url) {
+    for (var proc of this._procsArray) {
+      if (proc.method !== method) {
+        continue;
+      }
+
+      if (proc.pattern.test(url)) {
+        return proc;
+      }
+    }
+
+    return null;
+  }
+
 }
 class KaitoError extends Error {
   constructor(status, message, cause) {
@@ -293,8 +335,7 @@ function createServer(config) {
     }
   };
 
-  var tree = config.router.getProcs();
-  var server = http.createServer( /*#__PURE__*/function () {
+  return http.createServer( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (incomingMessage, serverResponse) {
       var start = Date.now();
       var req = new KaitoRequest(incomingMessage);
@@ -303,7 +344,7 @@ function createServer(config) {
       try {
         var _handler$input, _yield$getInput;
 
-        var handler = tree[req.url.pathname];
+        var handler = config.router.find(req.method, req.url.pathname);
 
         if (!handler) {
           throw new KaitoError(404, "Cannot ".concat(req.method, " this route."));
@@ -334,7 +375,7 @@ function createServer(config) {
           status: _status,
           message: _message
         } = yield config.onError({
-          error: WrappedError.from(error),
+          error: WrappedError.maybe(error),
           req,
           res
         }).catch(() => ({
@@ -356,7 +397,6 @@ function createServer(config) {
       return _ref.apply(this, arguments);
     };
   }());
-  return server;
 }
 
 export { KaitoError, Router, createGetContext, createRouter, createServer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaito-http/core",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Functional HTTP Framework for TypeScript",
   "repository": "https://github.com/kaito-http/kaito",
   "author": "Alistair Smith <hi@alistair.sh>",