@kaito-http/core 2.3.6 → 2.3.9

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

@@ -26,7 +26,6 @@ export declare class Router<Context, Routes extends RoutesInit<Context>> {
     readonly 'mkcol': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "MKCOL", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "MKCOL", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "MKCOL", Context, Input>; }>;
     readonly 'move': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "MOVE", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "MOVE", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "MOVE", Context, Input>; }>;
     readonly 'notify': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "NOTIFY", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "NOTIFY", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "NOTIFY", Context, Input>; }>;
-    readonly 'options': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "OPTIONS", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "OPTIONS", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "OPTIONS", Context, Input>; }>;
     readonly 'patch': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "PATCH", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "PATCH", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "PATCH", Context, Input>; }>;
     readonly 'post': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "POST", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "POST", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "POST", Context, Input>; }>;
     readonly 'propfind': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "PROPFIND", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "PROPFIND", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "PROPFIND", Context, Input>; }>;

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

@@ -5,9 +5,11 @@ import { KaitoRequest } from './req';
 import { KaitoResponse } from './res';
 import { KaitoError } from './error';
 import { GetContext } from './util';
+export declare type Before = (req: http.IncomingMessage, res: http.ServerResponse) => Promise<void>;
 export interface ServerConfig<Context> {
     router: Router<Context, RoutesInit<Context>>;
     getContext: GetContext<Context>;
+    before?: Before[];
     onError(arg: {
         error: Error;
         req: KaitoRequest;

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

@@ -5,37 +5,92 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var http = require('http');
 var fmw = require('find-my-way');
 var tls = require('tls');
+var contentType = require('content-type');
 var getRawBody = require('raw-body');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
 function _interopNamespace(e) {
-	if (e && e.__esModule) return e;
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n["default"] = e;
-	return Object.freeze(n);
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
 }
 
 var http__namespace = /*#__PURE__*/_interopNamespace(http);
 var fmw__default = /*#__PURE__*/_interopDefault(fmw);
 var getRawBody__default = /*#__PURE__*/_interopDefault(getRawBody);
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+  try {
+    var info = gen[key](arg);
+    var value = info.value;
+  } catch (error) {
+    reject(error);
+    return;
+  }
+
+  if (info.done) {
+    resolve(value);
+  } else {
+    Promise.resolve(value).then(_next, _throw);
+  }
+}
+
+function _asyncToGenerator(fn) {
+  return function () {
+    var self = this,
+        args = arguments;
+    return new Promise(function (resolve, reject) {
+      var gen = fn.apply(self, args);
+
+      function _next(value) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+      }
+
+      function _throw(err) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+      }
+
+      _next(undefined);
+    });
+  };
+}
+
 function createFMWServer(config) {
   var fmw = config.router.toFindMyWay(config);
-  var server = http__namespace.createServer((req, res) => {
-    fmw.lookup(req, res);
-  });
+  var server = http__namespace.createServer( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* (req, res) {
+      for (var fn of (_config$before = config.before) !== null && _config$before !== void 0 ? _config$before : []) {
+        var _config$before;
+
+        // Disabled because we need these to run in order!
+        // eslint-disable-next-line no-await-in-loop
+        yield fn(req, res);
+      }
+
+      if (req.method === 'OPTIONS') {
+        return;
+      }
+
+      fmw.lookup(req, res);
+    });
+
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }());
   return {
     server,
     fmw
@@ -98,42 +153,6 @@ function _objectSpread2(target) {
   return target;
 }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
-  }
-}
-
-function _asyncToGenerator(fn) {
-  return function () {
-    var self = this,
-        args = arguments;
-    return new Promise(function (resolve, reject) {
-      var gen = fn.apply(self, args);
-
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-
-      _next(undefined);
-    });
-  };
-}
-
 class WrappedError extends Error {
   static maybe(maybeError) {
     if (maybeError instanceof Error) {
@@ -187,7 +206,15 @@ function _getInput() {
 
     var buffer = yield getRawBody__default["default"](req.raw);
 
-    switch (req.headers['content-type']) {
+    if (!req.headers['content-type']) {
+      return null;
+    }
+
+    var {
+      type
+    } = contentType.parse(req.headers['content-type']);
+
+    switch (type) {
       case 'application/json':
         {
           return JSON.parse(buffer.toString());
@@ -365,8 +392,6 @@ class Router {
 
     _defineProperty(this, 'notify', this.make('NOTIFY'));
 
-    _defineProperty(this, 'options', this.make('OPTIONS'));
-
     _defineProperty(this, 'patch', this.make('PATCH'));
 
     _defineProperty(this, 'post', this.make('POST'));

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

@@ -5,37 +5,92 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var http = require('http');
 var fmw = require('find-my-way');
 var tls = require('tls');
+var contentType = require('content-type');
 var getRawBody = require('raw-body');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
 function _interopNamespace(e) {
-	if (e && e.__esModule) return e;
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n["default"] = e;
-	return Object.freeze(n);
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
 }
 
 var http__namespace = /*#__PURE__*/_interopNamespace(http);
 var fmw__default = /*#__PURE__*/_interopDefault(fmw);
 var getRawBody__default = /*#__PURE__*/_interopDefault(getRawBody);
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+  try {
+    var info = gen[key](arg);
+    var value = info.value;
+  } catch (error) {
+    reject(error);
+    return;
+  }
+
+  if (info.done) {
+    resolve(value);
+  } else {
+    Promise.resolve(value).then(_next, _throw);
+  }
+}
+
+function _asyncToGenerator(fn) {
+  return function () {
+    var self = this,
+        args = arguments;
+    return new Promise(function (resolve, reject) {
+      var gen = fn.apply(self, args);
+
+      function _next(value) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+      }
+
+      function _throw(err) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+      }
+
+      _next(undefined);
+    });
+  };
+}
+
 function createFMWServer(config) {
   var fmw = config.router.toFindMyWay(config);
-  var server = http__namespace.createServer((req, res) => {
-    fmw.lookup(req, res);
-  });
+  var server = http__namespace.createServer( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* (req, res) {
+      for (var fn of (_config$before = config.before) !== null && _config$before !== void 0 ? _config$before : []) {
+        var _config$before;
+
+        // Disabled because we need these to run in order!
+        // eslint-disable-next-line no-await-in-loop
+        yield fn(req, res);
+      }
+
+      if (req.method === 'OPTIONS') {
+        return;
+      }
+
+      fmw.lookup(req, res);
+    });
+
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }());
   return {
     server,
     fmw
@@ -98,42 +153,6 @@ function _objectSpread2(target) {
   return target;
 }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
-  }
-}
-
-function _asyncToGenerator(fn) {
-  return function () {
-    var self = this,
-        args = arguments;
-    return new Promise(function (resolve, reject) {
-      var gen = fn.apply(self, args);
-
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-
-      _next(undefined);
-    });
-  };
-}
-
 class WrappedError extends Error {
   static maybe(maybeError) {
     if (maybeError instanceof Error) {
@@ -187,7 +206,15 @@ function _getInput() {
 
     var buffer = yield getRawBody__default["default"](req.raw);
 
-    switch (req.headers['content-type']) {
+    if (!req.headers['content-type']) {
+      return null;
+    }
+
+    var {
+      type
+    } = contentType.parse(req.headers['content-type']);
+
+    switch (type) {
       case 'application/json':
         {
           return JSON.parse(buffer.toString());
@@ -365,8 +392,6 @@ class Router {
 
     _defineProperty(this, 'notify', this.make('NOTIFY'));
 
-    _defineProperty(this, 'options', this.make('OPTIONS'));
-
     _defineProperty(this, 'patch', this.make('PATCH'));
 
     _defineProperty(this, 'post', this.make('POST'));

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

@@ -1,13 +1,68 @@
 import * as http from 'http';
 import fmw from 'find-my-way';
 import { TLSSocket } from 'tls';
+import { parse } from 'content-type';
 import getRawBody from 'raw-body';
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+  try {
+    var info = gen[key](arg);
+    var value = info.value;
+  } catch (error) {
+    reject(error);
+    return;
+  }
+
+  if (info.done) {
+    resolve(value);
+  } else {
+    Promise.resolve(value).then(_next, _throw);
+  }
+}
+
+function _asyncToGenerator(fn) {
+  return function () {
+    var self = this,
+        args = arguments;
+    return new Promise(function (resolve, reject) {
+      var gen = fn.apply(self, args);
+
+      function _next(value) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+      }
+
+      function _throw(err) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+      }
+
+      _next(undefined);
+    });
+  };
+}
+
 function createFMWServer(config) {
   var fmw = config.router.toFindMyWay(config);
-  var server = http.createServer((req, res) => {
-    fmw.lookup(req, res);
-  });
+  var server = http.createServer( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* (req, res) {
+      for (var fn of (_config$before = config.before) !== null && _config$before !== void 0 ? _config$before : []) {
+        var _config$before;
+
+        // Disabled because we need these to run in order!
+        // eslint-disable-next-line no-await-in-loop
+        yield fn(req, res);
+      }
+
+      if (req.method === 'OPTIONS') {
+        return;
+      }
+
+      fmw.lookup(req, res);
+    });
+
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }());
   return {
     server,
     fmw
@@ -70,42 +125,6 @@ function _objectSpread2(target) {
   return target;
 }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
-  }
-}
-
-function _asyncToGenerator(fn) {
-  return function () {
-    var self = this,
-        args = arguments;
-    return new Promise(function (resolve, reject) {
-      var gen = fn.apply(self, args);
-
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-
-      _next(undefined);
-    });
-  };
-}
-
 class WrappedError extends Error {
   static maybe(maybeError) {
     if (maybeError instanceof Error) {
@@ -159,7 +178,15 @@ function _getInput() {
 
     var buffer = yield getRawBody(req.raw);
 
-    switch (req.headers['content-type']) {
+    if (!req.headers['content-type']) {
+      return null;
+    }
+
+    var {
+      type
+    } = parse(req.headers['content-type']);
+
+    switch (type) {
       case 'application/json':
         {
           return JSON.parse(buffer.toString());
@@ -337,8 +364,6 @@ class Router {
 
     _defineProperty(this, 'notify', this.make('NOTIFY'));
 
-    _defineProperty(this, 'options', this.make('OPTIONS'));
-
     _defineProperty(this, 'patch', this.make('PATCH'));
 
     _defineProperty(this, 'post', this.make('POST'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaito-http/core",
-  "version": "2.3.6",
+  "version": "2.3.9",
   "description": "Functional HTTP Framework for TypeScript",
   "repository": "https://github.com/kaito-http/kaito",
   "author": "Alistair Smith <hi@alistair.sh>",
@@ -9,6 +9,7 @@
   "module": "dist/kaito-http-core.esm.js",
   "types": "dist/kaito-http-core.cjs.d.ts",
   "devDependencies": {
+    "@types/content-type": "^1.1.5",
     "@types/node": "^17.0.25",
     "typescript": "4.6",
     "zod": "^3.14.4"
@@ -31,6 +32,7 @@
     "framework"
   ],
   "dependencies": {
+    "content-type": "^1.0.4",
     "find-my-way": "^5.5.0",
     "raw-body": "^2.5.1"
   }