@miqro/core 1.3.5 → 1.3.11

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.
Files changed (171) hide show
  1. package/README.md +81 -253
  2. package/dist/handler/api-router-utils.d.ts +13 -2
  3. package/dist/handler/api-router-utils.js +86 -1
  4. package/dist/handler/api-router-utils.js.map +1 -1
  5. package/dist/handler/api-router.d.ts +29 -2
  6. package/dist/handler/api-router.js +2 -2
  7. package/dist/handler/api-router.js.map +1 -1
  8. package/dist/handler/app.d.ts +4 -9
  9. package/dist/handler/app.js +10 -9
  10. package/dist/handler/app.js.map +1 -1
  11. package/dist/handler/common/context.d.ts +3 -11
  12. package/dist/handler/common/context.js +18 -13
  13. package/dist/handler/common/context.js.map +1 -1
  14. package/dist/handler/common/router-utils.d.ts +18 -10
  15. package/dist/handler/common/router-utils.js +97 -15
  16. package/dist/handler/common/router-utils.js.map +1 -1
  17. package/dist/handler/common/router.d.ts +18 -8
  18. package/dist/handler/common/router.js +12 -1
  19. package/dist/handler/common/router.js.map +1 -1
  20. package/dist/handler/index.d.ts +0 -3
  21. package/dist/handler/index.js +0 -3
  22. package/dist/handler/index.js.map +1 -1
  23. package/dist/handler/middleware/cookie.js +2 -2
  24. package/dist/handler/middleware/cookie.js.map +1 -1
  25. package/dist/handler/middleware/form.js +7 -1
  26. package/dist/handler/middleware/form.js.map +1 -1
  27. package/dist/handler/middleware/group.js +44 -2
  28. package/dist/handler/middleware/group.js.map +1 -1
  29. package/dist/handler/middleware/index.js +2 -6
  30. package/dist/handler/middleware/index.js.map +1 -1
  31. package/dist/handler/middleware/json.js +8 -2
  32. package/dist/handler/middleware/json.js.map +1 -1
  33. package/dist/handler/middleware/text.js +8 -1
  34. package/dist/handler/middleware/text.js.map +1 -1
  35. package/dist/handler/proxy.d.ts +2 -5
  36. package/dist/handler/proxy.js +2 -3
  37. package/dist/handler/proxy.js.map +1 -1
  38. package/dist/index.d.ts +1 -0
  39. package/dist/index.js +1 -0
  40. package/dist/index.js.map +1 -1
  41. package/dist/{util/test → test/common}/app.d.ts +2 -2
  42. package/dist/{util/test → test/common}/app.js +3 -2
  43. package/dist/test/common/app.js.map +1 -0
  44. package/dist/{util/test → test/common}/common.d.ts +0 -0
  45. package/dist/{util/test → test/common}/common.js +0 -0
  46. package/dist/test/common/common.js.map +1 -0
  47. package/dist/{util/test → test/common}/index.d.ts +1 -0
  48. package/dist/{util/test → test/common}/index.js +1 -0
  49. package/dist/test/common/index.js.map +1 -0
  50. package/dist/test/common/runner.d.ts +28 -0
  51. package/dist/test/common/runner.js +88 -0
  52. package/dist/test/common/runner.js.map +1 -0
  53. package/dist/test/index.d.ts +1 -0
  54. package/dist/{handler/response → test}/index.js +1 -3
  55. package/dist/test/index.js.map +1 -0
  56. package/dist/test/main.d.ts +1 -0
  57. package/dist/test/main.js +31 -0
  58. package/dist/test/main.js.map +1 -0
  59. package/dist/util/cli/index.d.ts +5 -1
  60. package/dist/util/cli/index.js +26 -0
  61. package/dist/util/cli/index.js.map +1 -1
  62. package/dist/util/error/parsererror.d.ts +2 -1
  63. package/dist/util/error/parsererror.js +5 -1
  64. package/dist/util/error/parsererror.js.map +1 -1
  65. package/dist/util/index.d.ts +0 -1
  66. package/dist/util/index.js +0 -3
  67. package/dist/util/index.js.map +1 -1
  68. package/dist/util/loader/index.d.ts +0 -3
  69. package/dist/util/loader/index.js +2 -9
  70. package/dist/util/loader/index.js.map +1 -1
  71. package/dist/util/logger/formatter.js +1 -1
  72. package/dist/util/logger/formatter.js.map +1 -1
  73. package/dist/util/parser/get.js +3 -6
  74. package/dist/util/parser/get.js.map +1 -1
  75. package/dist/util/request/index.d.ts +1 -1
  76. package/dist/util/request/index.js +1 -3
  77. package/dist/util/request/index.js.map +1 -1
  78. package/dist/util/session/common.d.ts +0 -1
  79. package/dist/util/session/common.js +0 -46
  80. package/dist/util/session/common.js.map +1 -1
  81. package/dist/util/session/service.js +2 -2
  82. package/dist/util/session/service.js.map +1 -1
  83. package/package.json +13 -11
  84. package/src/handler/api-router-utils.ts +91 -2
  85. package/src/handler/api-router.ts +30 -4
  86. package/src/handler/app.ts +10 -15
  87. package/src/handler/common/context.ts +19 -24
  88. package/src/handler/common/router-utils.ts +207 -108
  89. package/src/handler/common/router.ts +30 -8
  90. package/src/handler/index.ts +0 -3
  91. package/src/handler/middleware/cookie.ts +12 -12
  92. package/src/handler/middleware/form.ts +8 -2
  93. package/src/handler/middleware/group.ts +44 -2
  94. package/src/handler/middleware/index.ts +0 -4
  95. package/src/handler/middleware/json.ts +9 -3
  96. package/src/handler/middleware/text.ts +8 -1
  97. package/src/handler/proxy.ts +3 -8
  98. package/src/index.ts +1 -0
  99. package/src/{util/test → test/common}/app.ts +6 -5
  100. package/src/{util/test → test/common}/common.ts +0 -0
  101. package/src/{util/test → test/common}/index.ts +1 -0
  102. package/src/test/common/runner.ts +116 -0
  103. package/src/test/index.ts +1 -0
  104. package/src/test/main.ts +32 -0
  105. package/src/util/cli/index.ts +24 -1
  106. package/src/util/error/parsererror.ts +6 -1
  107. package/src/util/index.ts +0 -3
  108. package/src/util/loader/index.ts +1 -7
  109. package/src/util/logger/formatter.ts +1 -1
  110. package/src/util/parser/get.ts +3 -5
  111. package/src/util/request/index.ts +1 -1
  112. package/src/util/session/common.ts +0 -43
  113. package/src/util/session/service.ts +126 -126
  114. package/dist/handler/api-handler.d.ts +0 -29
  115. package/dist/handler/api-handler.js +0 -42
  116. package/dist/handler/api-handler.js.map +0 -1
  117. package/dist/handler/feature-router.d.ts +0 -12
  118. package/dist/handler/feature-router.js +0 -90
  119. package/dist/handler/feature-router.js.map +0 -1
  120. package/dist/handler/response/html.d.ts +0 -10
  121. package/dist/handler/response/html.js +0 -34
  122. package/dist/handler/response/html.js.map +0 -1
  123. package/dist/handler/response/index.d.ts +0 -3
  124. package/dist/handler/response/index.js.map +0 -1
  125. package/dist/handler/response/json.d.ts +0 -2
  126. package/dist/handler/response/json.js +0 -21
  127. package/dist/handler/response/json.js.map +0 -1
  128. package/dist/handler/response/result.d.ts +0 -4
  129. package/dist/handler/response/result.js +0 -46
  130. package/dist/handler/response/result.js.map +0 -1
  131. package/dist/util/cookie/cookie.d.ts +0 -50
  132. package/dist/util/cookie/cookie.js +0 -168
  133. package/dist/util/cookie/cookie.js.map +0 -1
  134. package/dist/util/cookie/index.d.ts +0 -16
  135. package/dist/util/cookie/index.js +0 -9
  136. package/dist/util/cookie/index.js.map +0 -1
  137. package/dist/util/test/app.js.map +0 -1
  138. package/dist/util/test/common.js.map +0 -1
  139. package/dist/util/test/index.js.map +0 -1
  140. package/dist/util/uuid/index.d.ts +0 -7
  141. package/dist/util/uuid/index.js +0 -8
  142. package/dist/util/uuid/index.js.map +0 -1
  143. package/dist/util/uuid/regex.d.ts +0 -2
  144. package/dist/util/uuid/regex.js +0 -5
  145. package/dist/util/uuid/regex.js.map +0 -1
  146. package/dist/util/uuid/rng.d.ts +0 -1
  147. package/dist/util/uuid/rng.js +0 -18
  148. package/dist/util/uuid/rng.js.map +0 -1
  149. package/dist/util/uuid/stringify.d.ts +0 -2
  150. package/dist/util/uuid/stringify.js +0 -50
  151. package/dist/util/uuid/stringify.js.map +0 -1
  152. package/dist/util/uuid/v4.d.ts +0 -5
  153. package/dist/util/uuid/v4.js +0 -27
  154. package/dist/util/uuid/v4.js.map +0 -1
  155. package/dist/util/uuid/validate.d.ts +0 -2
  156. package/dist/util/uuid/validate.js +0 -12
  157. package/dist/util/uuid/validate.js.map +0 -1
  158. package/src/handler/api-handler.ts +0 -55
  159. package/src/handler/feature-router.ts +0 -92
  160. package/src/handler/response/html.ts +0 -36
  161. package/src/handler/response/index.ts +0 -3
  162. package/src/handler/response/json.ts +0 -19
  163. package/src/handler/response/result.ts +0 -40
  164. package/src/util/cookie/cookie.ts +0 -207
  165. package/src/util/cookie/index.ts +0 -6
  166. package/src/util/uuid/index.ts +0 -5
  167. package/src/util/uuid/regex.ts +0 -2
  168. package/src/util/uuid/rng.ts +0 -14
  169. package/src/util/uuid/stringify.ts +0 -53
  170. package/src/util/uuid/v4.ts +0 -30
  171. package/src/util/uuid/validate.ts +0 -8
@@ -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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"}
@@ -3,6 +3,7 @@ import { Logger } from "../../util/logger";
3
3
  import { Session } from "../../util/session";
4
4
  import { IncomingHttpHeaders, IncomingMessage, OutgoingHttpHeaders, ServerResponse } from "http";
5
5
  import { URL } from "url";
6
+ import { CookieSerializeOptions } from "cookie";
6
7
  export declare type Method = "get" | "post" | "put" | "delete" | "patch" | "options" | "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS";
7
8
  export declare type Handler<T = boolean | void | any> = ((ctx: Context) => Promise<T>) | ((ctx: Context) => T);
8
9
  export declare type ErrorHandler<T = boolean | void | any> = ((e: unknown, ctx: Context) => Promise<T>) | ((e: unknown, ctx: Context) => T);
@@ -28,23 +29,14 @@ export declare class Context {
28
29
  params: {
29
30
  [name: string]: string | undefined;
30
31
  };
31
- buffer: Buffer;
32
+ buffer?: Buffer;
32
33
  readonly remoteAddress?: string;
33
34
  body: any;
34
35
  constructor(req: IncomingMessage, res: ServerResponse, logger?: Logger);
35
36
  close(): Promise<void>;
36
37
  addVaryHeader(value: number | string | ReadonlyArray<string>): ServerResponse;
37
38
  setHeader(name: string, value: number | string | ReadonlyArray<string>): ServerResponse;
38
- setCookie(name: string, value: string, options?: {
39
- encode?: (uriComponent: string | number | boolean) => string;
40
- maxAge?: number | null;
41
- domain?: string;
42
- httpOnly?: boolean;
43
- secure?: boolean;
44
- path?: string;
45
- expires?: Date;
46
- sameSite?: "lax" | "strict" | "none" | true;
47
- }): ServerResponse;
39
+ setCookie(name: string, value: string, options?: CookieSerializeOptions): ServerResponse;
48
40
  end({ status, headers, body }: {
49
41
  body?: any;
50
42
  status: number;
@@ -5,8 +5,8 @@ const logger_1 = require("../../util/logger");
5
5
  const tokenize_match_1 = require("./tokenize-match");
6
6
  const formatter_1 = require("../../util/logger/formatter");
7
7
  const helpers_1 = require("./helpers");
8
- const uuid_1 = require("../../util/uuid");
9
- const cookie_1 = require("../../util/cookie");
8
+ const uuid_1 = require("uuid");
9
+ const cookie_1 = require("cookie");
10
10
  class Context {
11
11
  constructor(req, res, logger) {
12
12
  this.req = req;
@@ -19,12 +19,12 @@ class Context {
19
19
  this.path = (0, tokenize_match_1.normalizePath)(this.url.pathname); // normalized path
20
20
  this.hash = this.url.hash;
21
21
  this.query = (0, tokenize_match_1.parseSearchParams)(this.url.searchParams);
22
- this.buffer = Buffer.from("");
22
+ //this.buffer = Buffer.from("");
23
23
  this.remoteAddress = req.socket.remoteAddress;
24
24
  this.cookies = {}; // a middleware will fill
25
25
  this.headers = req.headers;
26
26
  this.startMS = Date.now();
27
- this.uuid = uuid_1.UUID.v4().toString("utf-8");
27
+ this.uuid = (0, uuid_1.v4)().toString();
28
28
  this.results = []; // handlers will fill this
29
29
  const pathToEnv = this.path.replace(/\//ig, "_").toUpperCase();
30
30
  const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${this.method.toUpperCase()}`;
@@ -57,21 +57,26 @@ class Context {
57
57
  return this.res.setHeader(name, value);
58
58
  }
59
59
  setCookie(name, value, options) {
60
- return this.setHeader('Set-Cookie', cookie_1.COOKIE.serialize(name, String(value), options));
60
+ return this.setHeader('Set-Cookie', (0, cookie_1.serialize)(name, String(value), options));
61
61
  }
62
62
  async end({ status, headers, body }) {
63
63
  return new Promise((resolve, reject) => {
64
64
  try {
65
- this.res.statusCode = status;
66
- const keys = Object.keys(headers);
67
- for (const key of keys) {
68
- if (headers[key] !== undefined) {
69
- this.res.setHeader(key, headers[key]);
65
+ if (this.res.headersSent) {
66
+ reject(new Error("already ended"));
67
+ }
68
+ else {
69
+ this.res.statusCode = status;
70
+ const keys = Object.keys(headers);
71
+ for (const key of keys) {
72
+ if (headers[key] !== undefined) {
73
+ this.res.setHeader(key, headers[key]);
74
+ }
70
75
  }
76
+ this.res.end(body !== undefined ? String(body) : undefined, () => {
77
+ resolve();
78
+ });
71
79
  }
72
- this.res.end(body !== undefined ? String(body) : undefined, () => {
73
- resolve();
74
- });
75
80
  }
76
81
  catch (e) {
77
82
  reject(e);
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/handler/common/context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/handler/common/context.ts"],"names":[],"mappings":";;;AAAA,8CAAsD;AAGtD,qDAAoE;AAEpE,2DAAqE;AACrE,uCAAmC;AACnC,+BAA0B;AAC1B,mCAA2D;AAU3D,MAAa,OAAO;IAiBlB,YAA4B,GAAoB,EAAkB,GAAmB,EAAE,MAAe;QAA1E,QAAG,GAAH,GAAG,CAAiB;QAAkB,QAAG,GAAH,GAAG,CAAgB;QAJ9E,WAAM,GAA2C,EAAE,CAAC,CAAC,4BAA4B;QAKtF,IAAI,CAAC,IAAI,GAAG,SAAgB,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,GAAG,IAAA,gBAAM,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,UAAU,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAQ,CAAC;QAChF,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,KAAK,CAAC;QACtE,IAAI,CAAC,IAAI,GAAG,IAAA,8BAAa,EAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;QAChE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,IAAA,kCAAiB,EAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACtD,gCAAgC;QAChC,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;QAC9C,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,yBAAyB;QAC5C,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAA,SAAE,GAAE,CAAC,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,0BAA0B;QAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC/D,MAAM,UAAU,GAAG,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;QACpG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,kBAAS,EAAC,UAAU,EAAE;YACpD,SAAS,EAAE,CAAC,EACV,UAAU,EACV,KAAK,EACL,OAAO,GACR,EAAE,EAAE,CAAC,IAAA,kCAAsB,EAAC;gBAC3B,UAAU;gBACV,KAAK;gBACL,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC9I,YAAY,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,CAAC;oBAC9D,EACA,IAAI,OAAO,EAAE;aAChB,CAAC;SACH,EAAE,KAAK,CAAC,CAAC;IACZ,CAAC;IACM,KAAK,CAAC,KAAK;QAChB,OAAO,IAAI,CAAC,GAAG,CAAC;YACd,MAAM,EAAE,GAAG;YACX,OAAO,EAAE;gBACP,UAAU,EAAE,OAAO;aACpB;SACF,CAAC,CAAC;IACL,CAAC;IACM,aAAa,CAAC,KAA8C;QACjE,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,MAAM,EAAE,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrE,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACnF,CAAC;IACM,SAAS,CAAC,IAAY,EAAE,KAA8C;QAC3E,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC;IACM,SAAS,CAAC,IAAY,EAAE,KAAa,EAAE,OAAgC;QAC5E,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAA,kBAAS,EAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAC/E,CAAC;IACM,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAIvC;QACC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,IAAI;gBACF,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE;oBACxB,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;iBACpC;qBAAM;oBACL,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC;oBAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAClC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;wBACtB,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;4BAC9B,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAQ,CAAC,CAAC;yBAC9C;qBACF;oBACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE;wBAC/D,OAAO,EAAE,CAAC;oBACZ,CAAC,CAAC,CAAC;iBACJ;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,uEAAuE;IAChE,KAAK,CAAC,IAAI,CAAC,IAAS,EAAE,OAA6B,EAAE,MAAe;QACzE,OAAO,IAAI,CAAC,GAAG,CAAC;YACd,MAAM,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG;YAC3C,OAAO,EAAE;gBACP,CAAC,cAAc,CAAC,EAAE,iCAAiC;gBACnD,GAAG,OAAO;aACX;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CAAC,CAAA;IACJ,CAAC;IACM,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,OAA6B,EAAE,MAAe;QAC5E,OAAO,IAAI,CAAC,GAAG,CAAC;YACd,MAAM,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG;YAC3C,OAAO,EAAE;gBACP,CAAC,cAAc,CAAC,EAAE,2BAA2B;gBAC7C,GAAG,OAAO;aACX;YACD,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;IACL,CAAC;IACM,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,OAA6B,EAAE,MAAe;QAC5E,OAAO,IAAI,CAAC,GAAG,CAAC;YACd,MAAM,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG;YAC3C,OAAO,EAAE;gBACP,CAAC,cAAc,CAAC,EAAE,0BAA0B;gBAC5C,GAAG,OAAO;aACX;YACD,IAAI,EAAE,IAAI;SACX,CAAC,CAAA;IACJ,CAAC;IACM,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,OAA6B,EAAE,MAAe;QAC/E,OAAO,IAAI,CAAC,GAAG,CAAC;YACd,MAAM,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG;YAC3C,OAAO,EAAE;gBACP,CAAC,UAAU,CAAC,EAAE,GAAG;gBACjB,GAAG,OAAO;aACX;SACF,CAAC,CAAA;IACJ,CAAC;CACF;AAxID,0BAwIC"}
@@ -5,17 +5,12 @@ import { PathPartToken } from "./tokenize-match";
5
5
  import { Parser, ParseOptions } from "../../util/parser";
6
6
  import { SessionHandlerOptions } from "../middleware/session";
7
7
  import { GroupPolicy } from "../../util/session";
8
- export interface RouterJSONDoc {
9
- [path: string]: {
10
- [method: string]: RouterHandlerOptions;
11
- };
8
+ export interface HandlerWithOptions extends RouterHandlerOptions {
9
+ handler: Handler | Array<Handler>;
12
10
  }
13
- export interface RouterHandlerOptions {
11
+ export interface RouteOptions {
14
12
  name?: string;
15
13
  description?: string;
16
- parser?: Parser;
17
- middleware?: Handler | Handler[];
18
- session?: SessionHandlerOptions | Handler;
19
14
  policy?: GroupPolicy;
20
15
  request?: {
21
16
  headers?: ParseOptions | ParseOptions[];
@@ -25,14 +20,27 @@ export interface RouterHandlerOptions {
25
20
  };
26
21
  response?: true | ParseOptions | ParseOptions[];
27
22
  }
23
+ export interface RouteJSONDoc extends RouteOptions {
24
+ identifier: string;
25
+ }
26
+ export interface RouterJSONDoc {
27
+ [path: string]: {
28
+ [method: string]: RouteJSONDoc;
29
+ };
30
+ }
31
+ export interface RouterHandlerOptions extends RouteOptions {
32
+ parser?: Parser;
33
+ middleware?: Handler | Handler[];
34
+ session?: SessionHandlerOptions | Handler;
35
+ }
28
36
  export declare class RouterHandler {
29
37
  private readonly path;
30
38
  private readonly method;
31
- private readonly options?;
32
39
  private readonly tokens;
33
40
  private readonly handler;
34
41
  private readonly isRouter;
35
- constructor(handler: Array<Handler> | Handler | Router, path: string | undefined, method: Method | undefined, options?: RouterHandlerOptions | undefined);
42
+ private readonly options?;
43
+ constructor(handler: Array<Handler> | HandlerWithOptions | Handler | Router, path: string | undefined, method: Method | undefined, options?: RouterHandlerOptions);
36
44
  getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
37
45
  invoke(ctx: Context, pathTokens: {
38
46
  value: string;
@@ -4,20 +4,90 @@ exports.RouterHandler = void 0;
4
4
  const router_1 = require("./router");
5
5
  const tokenize_match_1 = require("./tokenize-match");
6
6
  const parse_1 = require("../middleware/parse");
7
+ const parser_1 = require("../../util/parser");
7
8
  const session_1 = require("../middleware/session");
8
9
  const group_1 = require("../middleware/group");
9
- const result_1 = require("../response/result");
10
- const json_1 = require("../response/json");
10
+ const ResultParser = (options, parser) => async (ctx) => {
11
+ if (!ctx.results || ctx.results.length === 0) {
12
+ ctx.logger.debug(`not parsing results`);
13
+ return undefined;
14
+ }
15
+ else {
16
+ const index = ctx.results.length - 1;
17
+ const lastResult = ctx.results[index];
18
+ ctx.logger.trace(`parsing lastResult[%o]`, lastResult);
19
+ try {
20
+ if (options instanceof Array) {
21
+ for (let i = 0; i < options.length; i++) {
22
+ const o = options[i];
23
+ try {
24
+ const mappedResults = (parser ? parser.parse : parser_1.parse)(`ctx.results[${index}]`, lastResult, o.options, o.mode, o.ignoreUndefined);
25
+ ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
26
+ return mappedResults;
27
+ }
28
+ catch (e) {
29
+ if (i === options.length - 1) {
30
+ throw e;
31
+ }
32
+ else {
33
+ continue;
34
+ }
35
+ }
36
+ }
37
+ }
38
+ else {
39
+ const mappedResults = (parser ? parser.parse : parser_1.parse)(`ctx.results[${index}]`, lastResult, options.options, options.mode, options.ignoreUndefined);
40
+ ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
41
+ return mappedResults;
42
+ }
43
+ }
44
+ catch (e) {
45
+ ctx.logger.error(`error parsing lastResult[%o]`, lastResult);
46
+ throw e;
47
+ }
48
+ }
49
+ };
50
+ const ResponseHandler = () => async (ctx) => {
51
+ ctx.logger.trace("results [%o]", ctx.results);
52
+ if (!ctx.results || ctx.results.length === 0) {
53
+ throw new Error(`no response to send. Is your handler returning a value differente than boolean 'true|false' ?`);
54
+ }
55
+ else {
56
+ const lastResult = ctx.results[ctx.results.length - 1];
57
+ ctx.logger.debug("response [%o]", lastResult);
58
+ if (lastResult !== undefined) {
59
+ await ctx.json(lastResult);
60
+ }
61
+ else {
62
+ throw new Error(`no response to send. Is your handler returning a value differente than boolean 'true|false' ?`);
63
+ }
64
+ }
65
+ };
11
66
  class RouterHandler {
12
67
  constructor(handler, path, method, options) {
13
68
  this.path = path;
14
69
  this.method = method;
15
- this.options = options;
16
70
  this.tokens = (0, tokenize_match_1.tokenizePath)(path);
17
- const routeHandlers = handler instanceof Array ? handler : [handler];
18
71
  let handlers = [];
19
72
  this.isRouter = handler instanceof router_1.Router;
20
- if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && options)) {
73
+ if (!this.isRouter && !(handler instanceof Array) && typeof handler === "object") {
74
+ // HandlerWithOptions
75
+ if (options) {
76
+ throw new Error("bad arguments. cannot send options with HandlerWithOptions");
77
+ }
78
+ const realHandler = handler.handler;
79
+ const newOptions = {
80
+ ...handler
81
+ };
82
+ delete newOptions.handler;
83
+ handler = realHandler;
84
+ this.options = newOptions;
85
+ }
86
+ else {
87
+ this.options = options;
88
+ }
89
+ const routeHandlers = handler instanceof Array ? handler : [handler];
90
+ if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && this.options)) {
21
91
  throw new Error("bad arguments");
22
92
  }
23
93
  if (this.options && this.options.middleware) {
@@ -35,11 +105,11 @@ class RouterHandler {
35
105
  handlers = handlers.concat(routeHandlers);
36
106
  if (this.options && this.options.response) {
37
107
  if (typeof this.options.response === "boolean") {
38
- handlers.push((0, json_1.ResponseHandler)());
108
+ handlers.push(ResponseHandler());
39
109
  }
40
110
  else {
41
- handlers.push((0, result_1.ResultParser)(this.options.response, this.options.parser));
42
- handlers.push((0, json_1.ResponseHandler)());
111
+ handlers.push(ResultParser(this.options.response, this.options.parser));
112
+ handlers.push(ResponseHandler());
43
113
  }
44
114
  }
45
115
  this.handler = handlers;
@@ -49,7 +119,7 @@ class RouterHandler {
49
119
  const nMethod = this.method ? this.method : "";
50
120
  if (this.isRouter) {
51
121
  const router = this.handler[0];
52
- router.getJSONDoc(doc, nPath);
122
+ router.getJSONDoc(doc, `${prePath}${nPath}`);
53
123
  }
54
124
  else if (this.options) {
55
125
  if (!doc[`${prePath}${nPath}`]) {
@@ -58,7 +128,19 @@ class RouterHandler {
58
128
  if (doc[`${prePath}${nPath}`][nMethod]) {
59
129
  throw new Error("cannot create doc routes override each other");
60
130
  }
61
- doc[`${prePath}${nPath}`][nMethod] = this.options;
131
+ doc[`${prePath}${nPath}`][nMethod] = {
132
+ description: this.options.description,
133
+ name: this.options.name,
134
+ identifier: `${prePath}${nPath}${this.options.name ? this.options.name : ""}${nMethod ? `_${nMethod}` : ""}`.replace(/[^a-z0-9+]+/gi, '_').split("_").map(s => s.trim()).filter(s => s).join("_").toUpperCase(),
135
+ policy: this.options.policy,
136
+ request: this.options.request ? {
137
+ body: this.options.request.body,
138
+ headers: this.options.request.headers,
139
+ params: this.options.request.params,
140
+ query: this.options.request.query,
141
+ } : undefined,
142
+ response: this.options.response
143
+ };
62
144
  }
63
145
  return doc;
64
146
  }
@@ -91,14 +173,14 @@ class RouterHandler {
91
173
  match: false
92
174
  };
93
175
  }
94
- pushResults(shouldContinue, ctx) {
95
- if (shouldContinue === false) {
176
+ pushResults(result, ctx) {
177
+ if (result === false) {
96
178
  // ctx.logger.debug(`avoiding next handlers because handler returned false.`);
97
179
  return false;
98
180
  }
99
- else if (shouldContinue !== true && shouldContinue !== undefined) {
100
- ctx.logger.trace("pushing to results [%o]", shouldContinue);
101
- ctx.results.push(shouldContinue);
181
+ else if (result !== true && result !== undefined) {
182
+ ctx.logger.trace("pushing to results [%o]", result);
183
+ ctx.results.push(result);
102
184
  }
103
185
  return true;
104
186
  }
@@ -1 +1 @@
1
- {"version":3,"file":"router-utils.js","sourceRoot":"","sources":["../../../src/handler/common/router-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router-utils.js","sourceRoot":"","sources":["../../../src/handler/common/router-utils.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,26 @@
1
+ /// <reference types="node" />
2
+ import { IncomingMessage, RequestListener, ServerResponse } from "http";
3
+ import { Logger } from "../../util/logger";
1
4
  import { Method, Handler, Context, ErrorHandler } from "./context";
2
- import { RouterHandler, RouterJSONDoc, RouterHandlerOptions } from "./router-utils";
5
+ import { RouterHandler, RouterJSONDoc, RouterHandlerOptions, HandlerWithOptions } from "./router-utils";
3
6
  import { PathPartToken } from "./tokenize-match";
7
+ export interface RouterOptions {
8
+ newRequestLogger?: (req: IncomingMessage) => Logger;
9
+ newContext?: (req: IncomingMessage, res: ServerResponse) => Context;
10
+ }
4
11
  export declare class Router {
12
+ protected config?: RouterOptions | undefined;
5
13
  protected readonly handlers: RouterHandler[];
6
14
  protected readonly errorHandlers: ErrorHandler[];
7
- get(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
8
- post(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
9
- patch(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
10
- delete(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
11
- put(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
12
- options(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
13
- use(handler: Array<Handler> | Handler | Router, path?: string, method?: Method, options?: RouterHandlerOptions): Router;
15
+ readonly listener: RequestListener;
16
+ constructor(config?: RouterOptions | undefined);
17
+ get(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
18
+ post(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
19
+ patch(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
20
+ delete(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
21
+ put(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
22
+ options(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
23
+ use(handler: Array<Handler> | HandlerWithOptions | Handler | Router, path?: string, method?: Method, options?: RouterHandlerOptions): Router;
14
24
  catch(errorHandler: Array<ErrorHandler> | ErrorHandler): Router;
15
25
  run(ctx: Context, pathTokens?: {
16
26
  value: string;
@@ -1,12 +1,23 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Router = void 0;
4
+ const context_1 = require("./context");
4
5
  const router_utils_1 = require("./router-utils");
5
6
  const tokenize_match_1 = require("./tokenize-match");
6
7
  class Router {
7
- constructor() {
8
+ constructor(config) {
9
+ this.config = config;
8
10
  this.handlers = [];
9
11
  this.errorHandlers = [];
12
+ this.listener = async (req, res) => {
13
+ const ctx = this.config && this.config.newContext ?
14
+ this.config.newContext(req, res) :
15
+ new context_1.Context(req, res, this.config && this.config.newRequestLogger ?
16
+ this.config.newRequestLogger(req) :
17
+ undefined);
18
+ ctx.logger.trace(`request received`);
19
+ await this.run(ctx);
20
+ };
10
21
  }
11
22
  get(path, handler, options) {
12
23
  return this.use(handler, path, "get", options);
@@ -1 +1 @@
1
- {"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/handler/common/router.ts"],"names":[],"mappings":";;;AACA,iDAAoF;AACpF,qDAA2E;AAE3E,MAAa,MAAM;IAAnB;QACqB,aAAQ,GAAoB,EAAE,CAAC;QAC/B,kBAAa,GAAmB,EAAE,CAAC;IAqExD,CAAC;IApEQ,GAAG,CAAC,IAAY,EAAE,OAA0C,EAAE,OAA8B;QACjG,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IACM,IAAI,CAAC,IAAY,EAAE,OAA0C,EAAE,OAA8B;QAClG,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IACM,KAAK,CAAC,IAAY,EAAE,OAA0C,EAAE,OAA8B;QACnG,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IACM,MAAM,CAAC,IAAY,EAAE,OAA0C,EAAE,OAA8B;QACpG,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IACM,GAAG,CAAC,IAAY,EAAE,OAA0C,EAAE,OAA8B;QACjG,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IACM,OAAO,CAAC,IAAY,EAAE,OAA0C,EAAE,OAA8B;QACrG,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IACM,GAAG,CAAC,OAA0C,EAAE,IAAa,EAAE,MAAe,EAAE,OAA8B;QACnH,MAAM,KAAK,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,8BAAa,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,MAAM,CAAC;QACjE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,4BAAa,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC;IACd,CAAC;IACM,KAAK,CAAC,YAAgD;QAC3D,MAAM,aAAa,GAAG,YAAY,YAAY,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACpF,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE;YAC7B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC5B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACM,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,UAAgD,EAAE,gBAAiC,EAAE;QAClH,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,0BAAS,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI;YACF,IAAI,cAAc,GAAG,IAAI,CAAC;YAC1B,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAC7B,IAAI,CAAC,cAAc,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;oBAC1C,cAAc,GAAG,KAAK,CAAC;oBACvB,MAAM;iBACP;gBACD,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;gBACjE,IAAI,OAAO,CAAC,KAAK,EAAE;oBACjB,IAAI,OAAO,CAAC,MAAM,EAAE;wBAClB,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;4BACxB,GAAG,GAAG,CAAC,MAAM;4BACb,GAAG,OAAO,CAAC,MAAM;yBAClB,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;qBACpB;oBACD,cAAc,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;iBACjE;aACF;YACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;SAC7B;QAAC,OAAO,CAAM,EAAE;YACf,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,aAAa,EAAE;gBACnC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;gBAC7B,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;oBACxC,OAAO,KAAK,CAAC;iBACd;aACF;YACD,MAAM,CAAC,CAAC,CAAC,uBAAuB;SACjC;IACH,CAAC;IACM,UAAU,CAAC,MAAqB,EAAE,EAAE,OAAO,GAAG,GAAG;QACtD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC7B,GAAG,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;SAClC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAvED,wBAuEC"}
1
+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/handler/common/router.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,5 @@
1
1
  export * from "./app";
2
- export * from "./api-handler";
3
2
  export * from "./api-router";
4
- export * from "./response";
5
3
  export * from "./common";
6
- export * from "./feature-router";
7
4
  export * from "./proxy";
8
5
  export * from "./middleware";
@@ -11,11 +11,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
11
11
  };
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  __exportStar(require("./app"), exports);
14
- __exportStar(require("./api-handler"), exports);
15
14
  __exportStar(require("./api-router"), exports);
16
- __exportStar(require("./response"), exports);
17
15
  __exportStar(require("./common"), exports);
18
- __exportStar(require("./feature-router"), exports);
19
16
  __exportStar(require("./proxy"), exports);
20
17
  __exportStar(require("./middleware"), exports);
21
18
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/handler/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAsB;AACtB,gDAA8B;AAC9B,+CAA6B;AAC7B,6CAA2B;AAC3B,2CAAyB;AACzB,mDAAiC;AACjC,0CAAwB;AACxB,+CAA6B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/handler/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAsB;AACtB,+CAA6B;AAC7B,2CAAyB;AACzB,0CAAwB;AACxB,+CAA6B"}
@@ -1,10 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CookieParser = void 0;
4
- const cookie_1 = require("../../util/cookie");
4
+ const cookie_1 = require("cookie");
5
5
  const CookieParser = (options) => {
6
6
  return async (ctx) => {
7
- const cookies = cookie_1.COOKIE.parse(ctx.headers.cookie || '', options);
7
+ const cookies = (0, cookie_1.parse)(ctx.headers.cookie || '', options);
8
8
  const cookieList = Object.keys(cookies);
9
9
  for (const name of cookieList) {
10
10
  const value = cookies[name];
@@ -1 +1 @@
1
- {"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../../src/handler/middleware/cookie.ts"],"names":[],"mappings":";;;AAEA,8CAA2C;AAEpC,MAAM,YAAY,GAAG,CAAC,OAE5B,EAAiB,EAAE;IAChB,OAAO,KAAK,EAAE,GAAY,EAAiB,EAAE;QACzC,MAAM,OAAO,GAAG,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;YAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;YAC5B,IAAI,KAAK,EAAE;gBACP,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;aAC7B;SACJ;IACL,CAAC,CAAC;AACN,CAAC,CAAA;AAbY,QAAA,YAAY,gBAaxB"}
1
+ {"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../../src/handler/middleware/cookie.ts"],"names":[],"mappings":";;;AAEA,mCAA+B;AAExB,MAAM,YAAY,GAAG,CAAC,OAE5B,EAAiB,EAAE;IAClB,OAAO,KAAK,EAAE,GAAY,EAAiB,EAAE;QAC3C,MAAM,OAAO,GAAG,IAAA,cAAK,EAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;YAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;YAC5B,IAAI,KAAK,EAAE;gBACT,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;aAC3B;SACF;IACH,CAAC,CAAC;AACJ,CAAC,CAAA;AAbY,QAAA,YAAY,gBAaxB"}
@@ -21,9 +21,15 @@ const URLEncodedParser = (options) => {
21
21
  type = typeS;
22
22
  maxKeys = maxKeysS !== "undefined" ? parseInt(maxKeysS, 10) : DEFAULT_FORM_MAX_KEYS;
23
23
  }
24
+ const readBuffer = (0, buffer_1.ReadBuffer)({
25
+ limit
26
+ });
24
27
  return async (ctx) => {
25
28
  try {
26
29
  const isType = ctx.body === undefined && ctx.headers["content-type"] ? ctx.headers["content-type"].toLocaleLowerCase().indexOf(type.toLocaleLowerCase()) !== -1 : false;
30
+ if (isType && !ctx.buffer) {
31
+ await readBuffer(ctx);
32
+ }
27
33
  if (isType && ctx.buffer && ctx.buffer.length <= limit) {
28
34
  const string = ctx.buffer.toString();
29
35
  if (string) {
@@ -40,7 +46,7 @@ const URLEncodedParser = (options) => {
40
46
  }
41
47
  }
42
48
  catch (e) {
43
- if (e && e.name === "ParseOptionsError") {
49
+ if (e && e.name === "BadRequestError") {
44
50
  throw e;
45
51
  }
46
52
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"form.js","sourceRoot":"","sources":["../../../src/handler/middleware/form.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"form.js","sourceRoot":"","sources":["../../../src/handler/middleware/form.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,50 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.GroupPolicyHandler = void 0;
4
- const session_1 = require("../../util/session");
5
4
  const error_1 = require("../../util/error");
5
+ const policyCheck = (session, options) => {
6
+ switch (options.groupPolicy) {
7
+ case "at_least_one":
8
+ for (const group of options.groups) {
9
+ if (group instanceof Array) {
10
+ let ret = true;
11
+ for (const g of group) {
12
+ if (session.groups.indexOf(g) === -1) {
13
+ ret = false;
14
+ break;
15
+ }
16
+ }
17
+ if (ret) {
18
+ return true;
19
+ }
20
+ }
21
+ else {
22
+ if (session.groups.indexOf(group) !== -1) {
23
+ return true;
24
+ }
25
+ }
26
+ }
27
+ return false;
28
+ case "all":
29
+ for (const group of options.groups) {
30
+ if (group instanceof Array) {
31
+ for (const g of group) {
32
+ if (session.groups.indexOf(g) === -1) {
33
+ return false;
34
+ }
35
+ }
36
+ }
37
+ else {
38
+ if (session.groups.indexOf(group) === -1) {
39
+ return false;
40
+ }
41
+ }
42
+ }
43
+ return true;
44
+ default:
45
+ throw new error_1.ParseOptionsError(`policy [${options.groupPolicy}] not implemented!!`);
46
+ }
47
+ };
6
48
  const GroupPolicyHandler = (options) => {
7
49
  return async (ctx) => {
8
50
  try {
@@ -10,7 +52,7 @@ const GroupPolicyHandler = (options) => {
10
52
  throw new error_1.UnAuthorizedError(`No Session!`);
11
53
  }
12
54
  else {
13
- const result = await (0, session_1.policyCheck)(ctx.session, options);
55
+ const result = await policyCheck(ctx.session, options);
14
56
  if (result) {
15
57
  ctx.logger.debug("groups validated!");
16
58
  }