@miqro/core 1.3.2 → 1.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,6 +5,7 @@ import { ParseOptions } from "../util/parser/common";
5
5
  import { Handler } from "./common";
6
6
  export interface APIHandlerOptions {
7
7
  parser?: Parser;
8
+ headers?: ParseOptions | ParseOptions[];
8
9
  query?: ParseOptions | false | ParseOptions[];
9
10
  params?: ParseOptions | false | ParseOptions[];
10
11
  body?: ParseOptions | false | ParseOptions[];
@@ -26,6 +26,7 @@ const APIHandler = (options) =>
26
26
  .concat(options.policy ? [(0, group_1.GroupPolicyHandler)(options.policy)] : [])
27
27
  // setup request parse
28
28
  .concat([(0, parse_1.ParseRequest)({
29
+ headers: options.headers,
29
30
  query: options.query,
30
31
  params: options.params,
31
32
  body: options.body,
@@ -1 +1 @@
1
- {"version":3,"file":"api-handler.js","sourceRoot":"","sources":["../../src/handler/api-handler.ts"],"names":[],"mappings":";;;AACA,kDAA6E;AAC7E,8CAAwD;AAIxD,8CAAkD;AAClD,0CAAkD;AAClD,8CAAiD;AAejD;;;;;;;;;;GAUG;AACI,MAAM,UAAU,GAAG,CAAC,OAA0B,EAAkB,EAAE;AACvE,2BAA2B;AAC3B,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5C,gBAAgB;KACf,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,OAAO,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,wBAAc,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7H,eAAe;KACd,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAA,0BAAkB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnE,sBAAsB;KACrB,MAAM,CAAC,CAAC,IAAA,oBAAY,EAAC;QACpB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC,CAAC;IACJ,wBAAwB;KACvB,MAAM,CAAC,OAAO,CAAC,OAAO,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/E,uBAAuB;KACtB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,qBAAY,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,yBAAyB;KACxB,MAAM,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,IAAA,sBAAe,GAAE,CAAC,CAAC,CAAC;AAnBxE,QAAA,UAAU,cAmB8D"}
1
+ {"version":3,"file":"api-handler.js","sourceRoot":"","sources":["../../src/handler/api-handler.ts"],"names":[],"mappings":";;;AACA,kDAA6E;AAC7E,8CAAwD;AAIxD,8CAAkD;AAClD,0CAAkD;AAClD,8CAAiD;AAgBjD;;;;;;;;;;GAUG;AACI,MAAM,UAAU,GAAG,CAAC,OAA0B,EAAkB,EAAE;AACvE,2BAA2B;AAC3B,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5C,gBAAgB;KACf,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,OAAO,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,wBAAc,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7H,eAAe;KACd,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAA,0BAAkB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnE,sBAAsB;KACrB,MAAM,CAAC,CAAC,IAAA,oBAAY,EAAC;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC,CAAC;IACJ,wBAAwB;KACvB,MAAM,CAAC,OAAO,CAAC,OAAO,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/E,uBAAuB;KACtB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,qBAAY,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,yBAAyB;KACxB,MAAM,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,IAAA,sBAAe,GAAE,CAAC,CAAC,CAAC;AApBxE,QAAA,UAAU,cAoB8D"}
@@ -27,10 +27,7 @@ class App extends common_1.Router {
27
27
  }
28
28
  catch (e) {
29
29
  try {
30
- await this.handleError(e, ctx);
31
- }
32
- catch (e2) {
33
- try {
30
+ if (!ctx.res.headersSent) {
34
31
  await errorHandler(e, ctx);
35
32
  if (!ctx.res.headersSent) {
36
33
  ctx.logger.error(e);
@@ -41,9 +38,9 @@ class App extends common_1.Router {
41
38
  });
42
39
  }
43
40
  }
44
- catch (e3) {
45
- ctx.logger.error(e3);
46
- }
41
+ }
42
+ catch (e3) {
43
+ ctx.logger.error(e3);
47
44
  }
48
45
  }
49
46
  };
@@ -1 +1 @@
1
- {"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/handler/app.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/handler/app.ts"],"names":[],"mappings":"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"}
@@ -18,7 +18,7 @@ export declare class Context {
18
18
  readonly path: string;
19
19
  readonly hash: string;
20
20
  readonly method: string;
21
- readonly headers: IncomingHttpHeaders;
21
+ headers: IncomingHttpHeaders;
22
22
  readonly cookies: {
23
23
  [name: string]: string;
24
24
  };
@@ -0,0 +1,26 @@
1
+ import { Router } from "./router";
2
+ import { Context, Handler } from "./context";
3
+ import { Method } from "./context";
4
+ import { PathPartToken } from "./tokenize-match";
5
+ export declare class RouterHandler {
6
+ private readonly path;
7
+ private readonly method;
8
+ private readonly tokens;
9
+ private readonly handler;
10
+ private readonly isRouter;
11
+ constructor(handler: Array<Handler> | Handler | Router, path: string | undefined, method: Method | undefined);
12
+ invoke(ctx: Context, pathTokens: {
13
+ value: string;
14
+ lower: string;
15
+ }[], prePathTokens: PathPartToken[]): Promise<boolean>;
16
+ isMatch(method: string, pathTokens: {
17
+ value: string;
18
+ lower: string;
19
+ }[], prePathTokens: PathPartToken[]): {
20
+ match: boolean;
21
+ params?: {
22
+ [name: string]: string | undefined;
23
+ };
24
+ };
25
+ private pushResults;
26
+ }
@@ -0,0 +1,59 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.RouterHandler = void 0;
4
+ const router_1 = require("./router");
5
+ const tokenize_match_1 = require("./tokenize-match");
6
+ class RouterHandler {
7
+ constructor(handler, path, method) {
8
+ this.path = path;
9
+ this.method = method;
10
+ this.tokens = (0, tokenize_match_1.tokenizePath)(path);
11
+ this.handler = handler instanceof Array ? handler : [handler];
12
+ this.isRouter = handler instanceof router_1.Router;
13
+ if (!this.isRouter && this.handler.length !== this.handler.filter(h => typeof h === "function").length) {
14
+ throw new Error("bad arguments handler must be an array of Handler or a Router");
15
+ }
16
+ }
17
+ async invoke(ctx, pathTokens, prePathTokens) {
18
+ for (let i = 0; i < this.handler.length; i++) {
19
+ const h = this.handler[i];
20
+ if (h instanceof router_1.Router) {
21
+ if (!this.pushResults(await h.run(ctx, pathTokens, prePathTokens.concat(this.tokens)), ctx)) {
22
+ return false;
23
+ }
24
+ }
25
+ else {
26
+ if (!this.pushResults(await h(ctx), ctx)) {
27
+ return false;
28
+ }
29
+ }
30
+ }
31
+ return true;
32
+ }
33
+ isMatch(method, pathTokens, prePathTokens) {
34
+ if ((this.method === undefined || this.method === method)) {
35
+ if (this.path === undefined) {
36
+ return {
37
+ match: true
38
+ };
39
+ }
40
+ return (0, tokenize_match_1.matchTokenizePath)(this.isRouter, prePathTokens.concat(this.tokens), pathTokens);
41
+ }
42
+ return {
43
+ match: false
44
+ };
45
+ }
46
+ pushResults(shouldContinue, ctx) {
47
+ if (shouldContinue === false) {
48
+ // ctx.logger.debug(`avoiding next handlers because handler returned false.`);
49
+ return false;
50
+ }
51
+ else if (shouldContinue !== true && shouldContinue !== undefined) {
52
+ ctx.logger.trace("pushing to results [%o]", shouldContinue);
53
+ ctx.results.push(shouldContinue);
54
+ }
55
+ return true;
56
+ }
57
+ }
58
+ exports.RouterHandler = RouterHandler;
59
+ //# sourceMappingURL=router-utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"router-utils.js","sourceRoot":"","sources":["../../../src/handler/common/router-utils.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAGlC,qDAAkF;AAElF,MAAa,aAAa;IAMtB,YAAmB,OAA0C,EAAmB,IAAwB,EAAmB,MAA0B;QAArE,SAAI,GAAJ,IAAI,CAAoB;QAAmB,WAAM,GAAN,MAAM,CAAoB;QACjJ,IAAI,CAAC,MAAM,GAAG,IAAA,6BAAY,EAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,OAAO,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC9D,IAAI,CAAC,QAAQ,GAAG,OAAO,YAAY,eAAM,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,UAAU,CAAC,CAAC,MAAM,EAAE;YACpG,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;SACpF;IACL,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,UAA+C,EAAE,aAA8B;QAC7G,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC1C,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,CAAC,YAAY,eAAM,EAAE;gBACrB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;oBACzF,OAAO,KAAK,CAAC;iBAChB;aACJ;iBAAM;gBACH,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE;oBACtC,OAAO,KAAK,CAAC;iBAChB;aACJ;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,OAAO,CACV,MAAc,EACd,UAA+C,EAC/C,aAA8B;QAI9B,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,EAAE;YACvD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;gBACzB,OAAO;oBACH,KAAK,EAAE,IAAI;iBACd,CAAC;aACL;YACD,OAAO,IAAA,kCAAiB,EAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC;SAC1F;QACD,OAAO;YACH,KAAK,EAAE,KAAK;SACf,CAAC;IACN,CAAC;IAEO,WAAW,CAAC,cAAuB,EAAE,GAAY;QACrD,IAAI,cAAc,KAAK,KAAK,EAAE;YAC1B,8EAA8E;YAC9E,OAAO,KAAK,CAAC;SAChB;aAAM,IAAI,cAAc,KAAK,IAAI,IAAI,cAAc,KAAK,SAAS,EAAE;YAChE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAC;YAC5D,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACpC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AA7DD,sCA6DC"}
@@ -1,14 +1,6 @@
1
1
  import { Method, Handler, Context, ErrorHandler } from "./context";
2
- interface RouterHandler {
3
- handler: Handler | Router;
4
- method?: Method;
5
- path?: string;
6
- tokens: {
7
- optional: boolean;
8
- wild: boolean;
9
- token: string;
10
- }[];
11
- }
2
+ import { RouterHandler } from "./router-utils";
3
+ import { PathPartToken } from "./tokenize-match";
12
4
  export declare class Router {
13
5
  protected readonly handlers: RouterHandler[];
14
6
  protected readonly errorHandlers: ErrorHandler[];
@@ -20,9 +12,8 @@ export declare class Router {
20
12
  options(path: string, handler: Array<Handler> | Handler | Router): Router;
21
13
  use(handler: Array<Handler> | Handler | Router, path?: string, method?: Method): Router;
22
14
  catch(errorHandler: Array<ErrorHandler> | ErrorHandler): Router;
23
- protected isMatch(ctx: Context, h: RouterHandler, prePath?: string): boolean;
24
- protected callHandler: (ctx: Context, handler: Handler | Router, prePath?: string | undefined) => Promise<boolean>;
25
- protected handleError(e: unknown, ctx: Context): Promise<boolean>;
26
- run(ctx: Context, prePath?: string): Promise<boolean>;
15
+ run(ctx: Context, pathTokens?: {
16
+ value: string;
17
+ lower: string;
18
+ }[], prePathTokens?: PathPartToken[]): Promise<boolean>;
27
19
  }
28
- export {};
@@ -1,26 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Router = void 0;
4
+ const router_utils_1 = require("./router-utils");
4
5
  const tokenize_match_1 = require("./tokenize-match");
5
6
  class Router {
6
7
  constructor() {
7
8
  this.handlers = [];
8
9
  this.errorHandlers = [];
9
- this.callHandler = async (ctx, handler, prePath) => {
10
- const shouldContinue = typeof handler === "function" ?
11
- await handler(ctx) : await handler.run(ctx, prePath);
12
- if (shouldContinue === false) {
13
- // ctx.logger.debug(`avoiding next handlers because handler returned false.`);
14
- return false;
15
- }
16
- else if (shouldContinue !== true && shouldContinue !== undefined) {
17
- ctx.logger.trace("pushing to results [%o]", shouldContinue);
18
- ctx.results.push(shouldContinue);
19
- } /*else {
20
- // ctx.logger.debug("NOT pushing to results [%s]", String(shouldContinue));
21
- }*/
22
- return true;
23
- };
24
10
  }
25
11
  get(path, handler) {
26
12
  return this.use(handler, path, "get");
@@ -41,62 +27,20 @@ class Router {
41
27
  return this.use(handler, path, "options");
42
28
  }
43
29
  use(handler, path, method) {
44
- if (handler instanceof Array) {
45
- for (const h of handler) {
46
- const nPath = path !== undefined ? (0, tokenize_match_1.normalizePath)(path) : undefined;
47
- this.handlers.push({
48
- handler: h,
49
- method: method ? method.toUpperCase() : method,
50
- path: nPath,
51
- tokens: (0, tokenize_match_1.tokenizePath)(nPath)
52
- });
53
- }
54
- }
55
- else {
56
- const nPath = path !== undefined ? (0, tokenize_match_1.normalizePath)(path) : undefined;
57
- this.handlers.push({
58
- handler,
59
- method: method ? method.toUpperCase() : method,
60
- path: nPath,
61
- tokens: (0, tokenize_match_1.tokenizePath)(nPath)
62
- });
63
- }
30
+ const nPath = path !== undefined ? (0, tokenize_match_1.normalizePath)(path) : undefined;
31
+ const nMethod = method ? method.toUpperCase() : method;
32
+ this.handlers.push(new router_utils_1.RouterHandler(handler, nPath, nMethod));
64
33
  return this;
65
34
  }
66
35
  catch(errorHandler) {
67
- if (errorHandler instanceof Array) {
68
- for (const e of errorHandler) {
69
- this.errorHandlers.push(e);
70
- }
71
- }
72
- else {
73
- this.errorHandlers.push(errorHandler);
36
+ const errorHandlers = errorHandler instanceof Array ? errorHandler : [errorHandler];
37
+ for (const e of errorHandlers) {
38
+ this.errorHandlers.push(e);
74
39
  }
75
40
  return this;
76
41
  }
77
- isMatch(ctx, h, prePath) {
78
- if ((h.method === undefined || h.method === ctx.method)) {
79
- if (h.path === undefined) {
80
- return true;
81
- }
82
- const ret = typeof h.handler === "function" || h.handler instanceof Array ?
83
- (0, tokenize_match_1.matchTokenizePath)(false, h.tokens, ctx.path, prePath) :
84
- (0, tokenize_match_1.matchTokenizePath)(true, h.tokens, ctx.path, prePath);
85
- ctx.params = ret.params;
86
- return ret.match;
87
- }
88
- return false;
89
- }
90
- async handleError(e, ctx) {
91
- for (const eH of this.errorHandlers) {
92
- const ret = await eH(e, ctx);
93
- if (ret === false || ctx.res.headersSent) {
94
- return false;
95
- }
96
- }
97
- throw e; // pass the error along
98
- }
99
- async run(ctx, prePath) {
42
+ async run(ctx, pathTokens, prePathTokens = []) {
43
+ pathTokens = pathTokens ? pathTokens : (0, tokenize_match_1.splitPath)(ctx.path);
100
44
  try {
101
45
  let shouldContinue = true;
102
46
  for (const h of this.handlers) {
@@ -104,14 +48,27 @@ class Router {
104
48
  shouldContinue = false;
105
49
  break;
106
50
  }
107
- if (this.isMatch(ctx, h, prePath)) {
108
- shouldContinue = await this.callHandler(ctx, h.handler, `${prePath ? prePath : "/"}${h.path ? h.path.substring(1) : ""}`);
51
+ const isMatch = h.isMatch(ctx.method, pathTokens, prePathTokens);
52
+ if (isMatch.match) {
53
+ if (isMatch.params) {
54
+ ctx.params = ctx.params ? {
55
+ ...ctx.params,
56
+ ...isMatch.params
57
+ } : isMatch.params;
58
+ }
59
+ shouldContinue = await h.invoke(ctx, pathTokens, prePathTokens);
109
60
  }
110
61
  }
111
62
  return !ctx.res.headersSent;
112
63
  }
113
64
  catch (e) {
114
- return this.handleError(e, ctx);
65
+ for (const eH of this.errorHandlers) {
66
+ const ret = await eH(e, ctx);
67
+ if (ret === false || ctx.res.headersSent) {
68
+ return false;
69
+ }
70
+ }
71
+ throw e; // pass the error along
115
72
  }
116
73
  }
117
74
  }
@@ -1 +1 @@
1
- {"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/handler/common/router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/handler/common/router.ts"],"names":[],"mappings":"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"}
@@ -6,18 +6,27 @@ export declare const mergeSearchParams: (search: URLSearchParams, append?: {
6
6
  [name: string]: string | number | boolean | string[] | number[] | boolean[];
7
7
  } | undefined) => URLSearchParams;
8
8
  export declare const normalizePath: (path: string) => string;
9
- export declare const tokenizePath: (path?: string | undefined) => {
9
+ export interface PathPartToken {
10
10
  optional: boolean;
11
- wild: boolean;
11
+ wild?: string;
12
12
  token: string;
13
+ lower: string;
14
+ }
15
+ export declare const pathPartTokenize: (token: {
16
+ value: string;
17
+ lower: string;
18
+ }) => PathPartToken;
19
+ export declare const splitPath: (path?: string | undefined) => {
20
+ value: string;
21
+ lower: string;
13
22
  }[];
14
- export declare const matchTokenizePath: (checkOnlyTokens: boolean, tokens: {
15
- optional: boolean;
16
- wild: boolean;
17
- token: string;
18
- }[], normalizePath: string, prePath?: string | undefined) => {
23
+ export declare const tokenizePath: (path?: string | undefined) => PathPartToken[];
24
+ export declare const matchTokenizePath: (checkAsRouter: boolean, tokens: PathPartToken[], ctxTokens: {
25
+ value: string;
26
+ lower: string;
27
+ }[]) => {
19
28
  match: boolean;
20
- params: {
29
+ params?: {
21
30
  [name: string]: string | undefined;
22
- };
31
+ } | undefined;
23
32
  };
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.matchTokenizePath = exports.tokenizePath = exports.normalizePath = exports.mergeSearchParams = exports.parseSearchParams = void 0;
3
+ exports.matchTokenizePath = exports.tokenizePath = exports.splitPath = exports.pathPartTokenize = exports.normalizePath = exports.mergeSearchParams = exports.parseSearchParams = void 0;
4
4
  const helpers_1 = require("./helpers");
5
5
  const parseSearchParams = (search) => {
6
6
  const query = {};
@@ -65,19 +65,30 @@ const normalizePath = (path) => {
65
65
  }
66
66
  };
67
67
  exports.normalizePath = normalizePath;
68
+ const pathPartTokenize = (token) => {
69
+ const isWild = token.value[0] === ":";
70
+ const optional = token.value[token.value.length - 1] === "?";
71
+ const wild = isWild ? token.value.substring(1, token.value.length - (optional ? 1 : 0)) : undefined;
72
+ return {
73
+ optional,
74
+ wild,
75
+ token: token.value,
76
+ lower: token.lower
77
+ };
78
+ };
79
+ exports.pathPartTokenize = pathPartTokenize;
80
+ const splitPath = (path) => path === undefined ? [] : path.split("/").filter(p => p).map(p => {
81
+ return {
82
+ value: p,
83
+ lower: p.toLocaleLowerCase()
84
+ };
85
+ });
86
+ exports.splitPath = splitPath;
68
87
  const tokenizePath = (path) => {
69
88
  if (path === undefined) {
70
89
  return [];
71
90
  }
72
- const tokens = path.split("/").filter(p => p).map(token => {
73
- const wild = token[0] === ":";
74
- const optional = token[token.length - 1] === "?";
75
- return {
76
- optional,
77
- wild,
78
- token
79
- };
80
- });
91
+ const tokens = (0, exports.splitPath)(path).map(token => (0, exports.pathPartTokenize)(token));
81
92
  for (let i = 0; i < tokens.length; i++) {
82
93
  if (tokens[i].optional && i != tokens.length - 1) {
83
94
  throw new Error("cannot set a path token as optional that's not the last one");
@@ -86,34 +97,29 @@ const tokenizePath = (path) => {
86
97
  return tokens;
87
98
  };
88
99
  exports.tokenizePath = tokenizePath;
89
- const matchTokenizePath = (checkOnlyTokens, tokens, normalizePath, prePath) => {
90
- if (prePath !== "/" && prePath !== undefined) {
91
- tokens = prePath.split("/").filter(p => p).map(s => {
92
- return {
93
- optional: false,
94
- token: s,
95
- wild: false
96
- };
97
- }).concat(tokens);
100
+ const matchTokenizePath = (checkAsRouter, tokens, ctxTokens) => {
101
+ for (let i = 0; i < tokens.length; i++) {
102
+ if (tokens[i].optional && i != tokens.length - 1) {
103
+ throw new Error("cannot set a path token as optional that's not the last one");
104
+ }
98
105
  }
99
- const ctxTokens = normalizePath.split("/").filter(p => p);
100
106
  const lastTokenIsOptional = tokens.length > 0 ? tokens[tokens.length - 1].optional : false;
101
107
  const couldBeUsingOptional = (lastTokenIsOptional &&
102
- ((!checkOnlyTokens && tokens.length - 1 === ctxTokens.length) ||
103
- (checkOnlyTokens && tokens.length - 1 <= ctxTokens.length)));
108
+ ((!checkAsRouter && tokens.length - 1 === ctxTokens.length) ||
109
+ (checkAsRouter && tokens.length - 1 <= ctxTokens.length)));
104
110
  const params = {};
105
- if ((!checkOnlyTokens && tokens.length === ctxTokens.length) || couldBeUsingOptional || (checkOnlyTokens && tokens.length <= ctxTokens.length)) {
111
+ if ((!checkAsRouter && tokens.length === ctxTokens.length) || couldBeUsingOptional || (checkAsRouter && tokens.length <= ctxTokens.length)) {
106
112
  // similiar count of tokens
107
113
  for (let i = 0; i < ctxTokens.length; i++) {
108
114
  const ctxToken = ctxTokens[i];
109
- if (checkOnlyTokens && i >= tokens.length) {
115
+ if (checkAsRouter && i >= tokens.length) {
110
116
  break;
111
117
  }
112
- if (tokens[i].wild || ctxToken.toLocaleLowerCase() === tokens[i].token.toLocaleLowerCase()) {
118
+ if (tokens[i].wild || ctxToken.lower === tokens[i].lower) {
113
119
  // check pass
114
- if (tokens[i].wild) {
115
- const paramKey = tokens[i].token.substring(1, tokens[i].token.length - (tokens[i].optional ? 1 : 0));
116
- params[paramKey] = ctxToken;
120
+ const wild = tokens[i].wild;
121
+ if (wild) {
122
+ params[wild] = ctxToken.value;
117
123
  }
118
124
  continue;
119
125
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tokenize-match.js","sourceRoot":"","sources":["../../../src/handler/common/tokenize-match.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tokenize-match.js","sourceRoot":"","sources":["../../../src/handler/common/tokenize-match.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ import { Parser } from "../../util/parser";
2
2
  import { ParseOptions } from "../../util/parser/common";
3
3
  import { Handler } from "../common";
4
4
  export interface ParseRequestOptions {
5
+ headers?: ParseOptions | ParseOptions[];
5
6
  query?: ParseOptions | false | ParseOptions[];
6
7
  params?: ParseOptions | false | ParseOptions[];
7
8
  body?: ParseOptions | false | ParseOptions[];
@@ -35,8 +35,18 @@ const ParseRequest = (options) => {
35
35
  const query = normalizeParseOptions(options.query);
36
36
  const params = normalizeParseOptions(options.params);
37
37
  const body = normalizeParseOptions(options.body);
38
+ const headers = normalizeParseOptions(options.headers);
38
39
  return async (ctx) => {
39
40
  try {
41
+ try {
42
+ if (options.headers !== undefined) {
43
+ parseRequestPart("headers", ctx, headers, options.parser);
44
+ }
45
+ }
46
+ catch (e) {
47
+ ctx.logger.error("error parsing headers %o", ctx.headers);
48
+ throw e;
49
+ }
40
50
  try {
41
51
  if (options.query !== undefined) {
42
52
  parseRequestPart("query", ctx, query, options.parser);
@@ -1 +1 @@
1
- {"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../src/handler/middleware/parse.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../src/handler/middleware/parse.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@miqro/core",
3
- "version": "1.3.2",
3
+ "version": "1.3.3",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -10,6 +10,7 @@ import { ResultParser } from "./response/result";
10
10
 
11
11
  export interface APIHandlerOptions {
12
12
  parser?: Parser;
13
+ headers?: ParseOptions | ParseOptions[];
13
14
  query?: ParseOptions | false | ParseOptions[];
14
15
  params?: ParseOptions | false | ParseOptions[];
15
16
  body?: ParseOptions | false | ParseOptions[];
@@ -41,6 +42,7 @@ export const APIHandler = (options: APIHandlerOptions): Array<Handler> =>
41
42
  .concat(options.policy ? [GroupPolicyHandler(options.policy)] : [])
42
43
  // setup request parse
43
44
  .concat([ParseRequest({
45
+ headers: options.headers,
44
46
  query: options.query,
45
47
  params: options.params,
46
48
  body: options.body,
@@ -34,9 +34,7 @@ export class App extends Router {
34
34
  }
35
35
  } catch (e: any) {
36
36
  try {
37
- await this.handleError(e, ctx);
38
- } catch (e2) {
39
- try {
37
+ if (!ctx.res.headersSent) {
40
38
  await errorHandler(e, ctx);
41
39
  if (!ctx.res.headersSent) {
42
40
  ctx.logger.error(e);
@@ -46,9 +44,9 @@ export class App extends Router {
46
44
  body: "SERVER ERROR"
47
45
  });
48
46
  }
49
- } catch (e3) {
50
- ctx.logger.error(e3);
51
47
  }
48
+ } catch (e3) {
49
+ ctx.logger.error(e3);
52
50
  }
53
51
  }
54
52
  };
@@ -26,7 +26,7 @@ export class Context {
26
26
  public readonly path: string; // normalized path
27
27
  public readonly hash: string; // from this.url.hash
28
28
  public readonly method: string; // from this.url.method
29
- public readonly headers: IncomingHttpHeaders; // from this.req.headers
29
+ public headers: IncomingHttpHeaders; // from this.req.headers
30
30
  public readonly cookies: { [name: string]: string }; // a middleware will fill this
31
31
  public query: { [name: string]: string | string[] }; // parseSearchParams will fill this with this.url.searchParams
32
32
  public params: { [name: string]: string | undefined } = {}; // the router will fill this
@@ -0,0 +1,67 @@
1
+ import { Router } from "./router";
2
+ import { Context, Handler } from "./context";
3
+ import { Method } from "./context";
4
+ import { matchTokenizePath, PathPartToken, tokenizePath } from "./tokenize-match";
5
+
6
+ export class RouterHandler {
7
+
8
+ private readonly tokens: PathPartToken[];
9
+ private readonly handler: Array<Handler | Handler | Router>;
10
+ private readonly isRouter: boolean;
11
+
12
+ public constructor(handler: Array<Handler> | Handler | Router, private readonly path: string | undefined, private readonly method: Method | undefined) {
13
+ this.tokens = tokenizePath(path);
14
+ this.handler = handler instanceof Array ? handler : [handler];
15
+ this.isRouter = handler instanceof Router;
16
+ if (!this.isRouter && this.handler.length !== this.handler.filter(h => typeof h === "function").length) {
17
+ throw new Error("bad arguments handler must be an array of Handler or a Router");
18
+ }
19
+ }
20
+
21
+ public async invoke(ctx: Context, pathTokens: { value: string; lower: string; }[], prePathTokens: PathPartToken[]): Promise<boolean> {
22
+ for (let i = 0; i < this.handler.length; i++) {
23
+ const h = this.handler[i];
24
+ if (h instanceof Router) {
25
+ if (!this.pushResults(await h.run(ctx, pathTokens, prePathTokens.concat(this.tokens)), ctx)) {
26
+ return false;
27
+ }
28
+ } else {
29
+ if (!this.pushResults(await h(ctx), ctx)) {
30
+ return false;
31
+ }
32
+ }
33
+ }
34
+ return true;
35
+ }
36
+
37
+ public isMatch(
38
+ method: string,
39
+ pathTokens: { value: string; lower: string; }[],
40
+ prePathTokens: PathPartToken[]): {
41
+ match: boolean;
42
+ params?: { [name: string]: string | undefined }
43
+ } {
44
+ if ((this.method === undefined || this.method === method)) {
45
+ if (this.path === undefined) {
46
+ return {
47
+ match: true
48
+ };
49
+ }
50
+ return matchTokenizePath(this.isRouter, prePathTokens.concat(this.tokens), pathTokens);
51
+ }
52
+ return {
53
+ match: false
54
+ };
55
+ }
56
+
57
+ private pushResults(shouldContinue: boolean, ctx: Context): boolean {
58
+ if (shouldContinue === false) {
59
+ // ctx.logger.debug(`avoiding next handlers because handler returned false.`);
60
+ return false;
61
+ } else if (shouldContinue !== true && shouldContinue !== undefined) {
62
+ ctx.logger.trace("pushing to results [%o]", shouldContinue);
63
+ ctx.results.push(shouldContinue);
64
+ }
65
+ return true;
66
+ }
67
+ }
@@ -1,16 +1,6 @@
1
- import { Method, Handler, Context, ErrorHandler, } from "./context";
2
- import { normalizePath, tokenizePath, matchTokenizePath } from "./tokenize-match";
3
-
4
- interface RouterHandler {
5
- handler: Handler | Router;
6
- method?: Method;
7
- path?: string;
8
- tokens: {
9
- optional: boolean;
10
- wild: boolean;
11
- token: string;
12
- }[]
13
- }
1
+ import { Method, Handler, Context, ErrorHandler } from "./context";
2
+ import { RouterHandler } from "./router-utils";
3
+ import { normalizePath, PathPartToken, splitPath } from "./tokenize-match";
14
4
 
15
5
  export class Router {
16
6
  protected readonly handlers: RouterHandler[] = [];
@@ -34,76 +24,20 @@ export class Router {
34
24
  return this.use(handler, path, "options");
35
25
  }
36
26
  public use(handler: Array<Handler> | Handler | Router, path?: string, method?: Method): Router {
37
- if (handler instanceof Array) {
38
- for (const h of handler) {
39
- const nPath = path !== undefined ? normalizePath(path) : undefined;
40
- this.handlers.push({
41
- handler: h,
42
- method: method ? method.toUpperCase() as Method : method,
43
- path: nPath,
44
- tokens: tokenizePath(nPath)
45
- });
46
- }
47
- } else {
48
- const nPath = path !== undefined ? normalizePath(path) : undefined;
49
- this.handlers.push({
50
- handler,
51
- method: method ? method.toUpperCase() as Method : method,
52
- path: nPath,
53
- tokens: tokenizePath(nPath)
54
- });
55
- }
27
+ const nPath = path !== undefined ? normalizePath(path) : undefined;
28
+ const nMethod = method ? method.toUpperCase() as Method : method;
29
+ this.handlers.push(new RouterHandler(handler, nPath, nMethod));
56
30
  return this;
57
31
  }
58
32
  public catch(errorHandler: Array<ErrorHandler> | ErrorHandler): Router {
59
- if (errorHandler instanceof Array) {
60
- for (const e of errorHandler) {
61
- this.errorHandlers.push(e);
62
- }
63
- } else {
64
- this.errorHandlers.push(errorHandler);
33
+ const errorHandlers = errorHandler instanceof Array ? errorHandler : [errorHandler];
34
+ for (const e of errorHandlers) {
35
+ this.errorHandlers.push(e);
65
36
  }
66
37
  return this;
67
38
  }
68
- protected isMatch(ctx: Context, h: RouterHandler, prePath?: string): boolean {
69
- if ((h.method === undefined || h.method === ctx.method)) {
70
-
71
- if (h.path === undefined) {
72
- return true;
73
- }
74
-
75
- const ret = typeof h.handler === "function" || h.handler instanceof Array ?
76
- matchTokenizePath(false, h.tokens, ctx.path, prePath) :
77
- matchTokenizePath(true, h.tokens, ctx.path, prePath);
78
- ctx.params = ret.params;
79
- return ret.match;
80
- }
81
- return false;
82
- }
83
- protected callHandler = async (ctx: Context, handler: Handler | Router, prePath?: string): Promise<boolean> => {
84
- const shouldContinue = typeof handler === "function" ?
85
- await handler(ctx) : await handler.run(ctx, prePath);
86
- if (shouldContinue === false) {
87
- // ctx.logger.debug(`avoiding next handlers because handler returned false.`);
88
- return false;
89
- } else if (shouldContinue !== true && shouldContinue !== undefined) {
90
- ctx.logger.trace("pushing to results [%o]", shouldContinue);
91
- ctx.results.push(shouldContinue);
92
- } /*else {
93
- // ctx.logger.debug("NOT pushing to results [%s]", String(shouldContinue));
94
- }*/
95
- return true;
96
- };
97
- protected async handleError(e: unknown, ctx: Context): Promise<boolean> {
98
- for (const eH of this.errorHandlers) {
99
- const ret = await eH(e, ctx);
100
- if (ret === false || ctx.res.headersSent) {
101
- return false;
102
- }
103
- }
104
- throw e; // pass the error along
105
- }
106
- public async run(ctx: Context, prePath?: string): Promise<boolean> {
39
+ public async run(ctx: Context, pathTokens?: { value: string; lower: string; }[], prePathTokens: PathPartToken[] = []): Promise<boolean> {
40
+ pathTokens = pathTokens ? pathTokens : splitPath(ctx.path);
107
41
  try {
108
42
  let shouldContinue = true;
109
43
  for (const h of this.handlers) {
@@ -111,17 +45,26 @@ export class Router {
111
45
  shouldContinue = false;
112
46
  break;
113
47
  }
114
- if (this.isMatch(ctx, h, prePath)) {
115
- shouldContinue = await this.callHandler(
116
- ctx,
117
- h.handler,
118
- `${prePath ? prePath : "/"}${h.path ? h.path.substring(1) : ""}`
119
- );
48
+ const isMatch = h.isMatch(ctx.method, pathTokens, prePathTokens);
49
+ if (isMatch.match) {
50
+ if (isMatch.params) {
51
+ ctx.params = ctx.params ? {
52
+ ...ctx.params,
53
+ ...isMatch.params
54
+ } : isMatch.params;
55
+ }
56
+ shouldContinue = await h.invoke(ctx, pathTokens, prePathTokens);
120
57
  }
121
58
  }
122
59
  return !ctx.res.headersSent;
123
60
  } catch (e: any) {
124
- return this.handleError(e as Error, ctx);
61
+ for (const eH of this.errorHandlers) {
62
+ const ret = await eH(e, ctx);
63
+ if (ret === false || ctx.res.headersSent) {
64
+ return false;
65
+ }
66
+ }
67
+ throw e; // pass the error along
125
68
  }
126
69
  }
127
70
  }
@@ -59,23 +59,37 @@ export const normalizePath = (path: string): string => {
59
59
  }
60
60
  }
61
61
 
62
- export const tokenizePath = (path?: string): {
62
+ export interface PathPartToken {
63
63
  optional: boolean;
64
- wild: boolean;
64
+ wild?: string;
65
65
  token: string;
66
- }[] => {
66
+ lower: string;
67
+ }
68
+
69
+ export const pathPartTokenize = (token: { value: string; lower: string; }): PathPartToken => {
70
+ const isWild = token.value[0] === ":";
71
+ const optional = token.value[token.value.length - 1] === "?";
72
+ const wild = isWild ? token.value.substring(1, token.value.length - (optional ? 1 : 0)) : undefined;
73
+ return {
74
+ optional,
75
+ wild,
76
+ token: token.value,
77
+ lower: token.lower
78
+ }
79
+ }
80
+
81
+ export const splitPath = (path?: string): { value: string; lower: string; }[] => path === undefined ? [] : path.split("/").filter(p => p).map(p => {
82
+ return {
83
+ value: p,
84
+ lower: p.toLocaleLowerCase()
85
+ };
86
+ });
87
+
88
+ export const tokenizePath = (path?: string): PathPartToken[] => {
67
89
  if (path === undefined) {
68
90
  return [];
69
91
  }
70
- const tokens = path.split("/").filter(p => p).map(token => {
71
- const wild = token[0] === ":";
72
- const optional = token[token.length - 1] === "?";
73
- return {
74
- optional,
75
- wild,
76
- token
77
- }
78
- });
92
+ const tokens = splitPath(path).map(token => pathPartTokenize(token));
79
93
  for (let i = 0; i < tokens.length; i++) {
80
94
  if (tokens[i].optional && i != tokens.length - 1) {
81
95
  throw new Error("cannot set a path token as optional that's not the last one");
@@ -84,52 +98,38 @@ export const tokenizePath = (path?: string): {
84
98
  return tokens;
85
99
  }
86
100
 
87
- export const matchTokenizePath = (checkOnlyTokens: boolean, tokens: {
88
- optional: boolean;
89
- wild: boolean;
90
- token: string;
91
- }[], normalizePath: string, prePath?: string): {
101
+ export const matchTokenizePath = (checkAsRouter: boolean, tokens: PathPartToken[], ctxTokens: { value: string; lower: string; }[]): {
92
102
  match: boolean;
93
- params: { [name: string]: string | undefined }
103
+ params?: { [name: string]: string | undefined }
94
104
  } => {
95
- if (prePath !== "/" && prePath !== undefined) {
96
- tokens = (prePath.split("/").filter(p => p).map(s => {
97
- return {
98
- optional: false,
99
- token: s,
100
- wild: false
101
- };
102
- }) as {
103
- optional: boolean;
104
- wild: boolean;
105
- token: string;
106
- }[]).concat(tokens);
105
+ for (let i = 0; i < tokens.length; i++) {
106
+ if (tokens[i].optional && i != tokens.length - 1) {
107
+ throw new Error("cannot set a path token as optional that's not the last one");
108
+ }
107
109
  }
108
-
109
- const ctxTokens = normalizePath.split("/").filter(p => p);
110
110
  const lastTokenIsOptional = tokens.length > 0 ? tokens[tokens.length - 1].optional : false;
111
111
  const couldBeUsingOptional = (lastTokenIsOptional &&
112
112
  (
113
- (!checkOnlyTokens && tokens.length - 1 === ctxTokens.length) ||
114
- (checkOnlyTokens && tokens.length - 1 <= ctxTokens.length)
113
+ (!checkAsRouter && tokens.length - 1 === ctxTokens.length) ||
114
+ (checkAsRouter && tokens.length - 1 <= ctxTokens.length)
115
115
  )
116
116
  );
117
117
 
118
118
  const params: { [name: string]: string | undefined } = {};
119
119
 
120
- if ((!checkOnlyTokens && tokens.length === ctxTokens.length) || couldBeUsingOptional || (checkOnlyTokens && tokens.length <= ctxTokens.length)) {
120
+ if ((!checkAsRouter && tokens.length === ctxTokens.length) || couldBeUsingOptional || (checkAsRouter && tokens.length <= ctxTokens.length)) {
121
121
  // similiar count of tokens
122
122
  for (let i = 0; i < ctxTokens.length; i++) {
123
123
  const ctxToken = ctxTokens[i];
124
- if (checkOnlyTokens && i >= tokens.length) {
124
+ if (checkAsRouter && i >= tokens.length) {
125
125
  break;
126
126
  }
127
127
 
128
- if (tokens[i].wild || ctxToken.toLocaleLowerCase() === tokens[i].token.toLocaleLowerCase()) {
128
+ if (tokens[i].wild || ctxToken.lower === tokens[i].lower) {
129
129
  // check pass
130
- if (tokens[i].wild) {
131
- const paramKey = tokens[i].token.substring(1, tokens[i].token.length - (tokens[i].optional ? 1 : 0));
132
- params[paramKey] = ctxToken;
130
+ const wild = tokens[i].wild;
131
+ if (wild) {
132
+ params[wild] = ctxToken.value;
133
133
  }
134
134
  continue;
135
135
  }
@@ -3,6 +3,7 @@ import { ParseOptions } from "../../util/parser/common";
3
3
  import { Context, Handler } from "../common";
4
4
 
5
5
  export interface ParseRequestOptions {
6
+ headers?: ParseOptions | ParseOptions[];
6
7
  query?: ParseOptions | false | ParseOptions[];
7
8
  params?: ParseOptions | false | ParseOptions[];
8
9
  body?: ParseOptions | false | ParseOptions[];
@@ -22,7 +23,7 @@ const ADD_EXTRA: ParseOptions[] = [{
22
23
  const normalizeParseOptions = (option?: ParseOptions | false | ParseOptions[]): ParseOptions[] =>
23
24
  option ? (option instanceof Array ? option : [option]) : (option === false ? NO_OPTIONS : ADD_EXTRA);
24
25
 
25
- const parseRequestPart = (part: "query" | "body" | "params", ctx: Context, option: ParseOptions[], parser?: Parser): void => {
26
+ const parseRequestPart = (part: "query" | "body" | "params" | "headers", ctx: Context, option: ParseOptions[], parser?: Parser): void => {
26
27
  const value = ctx[part] === undefined ? {} : ctx[part];
27
28
  for (let i = 0; i < option.length; i++) {
28
29
  const o = option[i];
@@ -46,9 +47,18 @@ export const ParseRequest = (options: ParseRequestOptions): Handler<void> => {
46
47
  const query = normalizeParseOptions(options.query);
47
48
  const params = normalizeParseOptions(options.params);
48
49
  const body = normalizeParseOptions(options.body);
50
+ const headers = normalizeParseOptions(options.headers);
49
51
 
50
52
  return async (ctx: Context): Promise<void> => {
51
53
  try {
54
+ try {
55
+ if (options.headers !== undefined) {
56
+ parseRequestPart("headers", ctx, headers, options.parser);
57
+ }
58
+ } catch (e) {
59
+ ctx.logger.error("error parsing headers %o", ctx.headers);
60
+ throw e;
61
+ }
52
62
  try {
53
63
  if (options.query !== undefined) {
54
64
  parseRequestPart("query", ctx, query, options.parser);