@miqro/core 1.6.0 → 1.7.1

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 (67) hide show
  1. package/README.md +101 -41
  2. package/dist/api-router.d.ts +1 -1
  3. package/dist/app.js +2 -2
  4. package/dist/app.js.map +1 -1
  5. package/dist/common/api-router-utils.d.ts +1 -1
  6. package/dist/common/api-router-utils.js +6 -21
  7. package/dist/common/api-router-utils.js.map +1 -1
  8. package/dist/common/api-router.d.ts +3 -16
  9. package/dist/common/context.d.ts +1 -1
  10. package/dist/common/logger/constants.d.ts +13 -0
  11. package/dist/common/logger/constants.js +26 -0
  12. package/dist/common/logger/constants.js.map +1 -0
  13. package/dist/common/logger/factory.d.ts +2 -4
  14. package/dist/common/logger/factory.js +7 -3
  15. package/dist/common/logger/factory.js.map +1 -1
  16. package/dist/common/logger/index.d.ts +5 -5
  17. package/dist/common/logger/index.js +5 -4
  18. package/dist/common/logger/index.js.map +1 -1
  19. package/dist/common/logger/{transport.d.ts → interfaces.d.ts} +6 -3
  20. package/dist/common/logger/interfaces.js +3 -0
  21. package/dist/common/logger/interfaces.js.map +1 -0
  22. package/dist/common/logger/logger.d.ts +15 -7
  23. package/dist/common/logger/logger.js +35 -27
  24. package/dist/common/logger/logger.js.map +1 -1
  25. package/dist/common/logger/transport/console.d.ts +5 -0
  26. package/dist/common/logger/transport/console.js +39 -0
  27. package/dist/common/logger/transport/console.js.map +1 -0
  28. package/dist/common/logger/transport/file.d.ts +2 -0
  29. package/dist/common/logger/transport/file.js +29 -0
  30. package/dist/common/logger/transport/file.js.map +1 -0
  31. package/dist/common/router-helpers.d.ts +1 -1
  32. package/dist/common/router-helpers.js +3 -3
  33. package/dist/common/router-helpers.js.map +1 -1
  34. package/dist/proxy.js +1 -0
  35. package/dist/proxy.js.map +1 -1
  36. package/dist/router.d.ts +1 -1
  37. package/dist/router.js +2 -2
  38. package/dist/router.js.map +1 -1
  39. package/package.json +4 -6
  40. package/src/api-router.ts +1 -1
  41. package/src/app.ts +2 -2
  42. package/src/app.unit.test.js +6 -7
  43. package/src/common/api-router-utils.ts +18 -34
  44. package/src/common/api-router.ts +3 -16
  45. package/src/common/context.ts +1 -1
  46. package/src/common/logger/constants.ts +27 -0
  47. package/src/common/logger/factory.ts +11 -9
  48. package/src/common/logger/index.ts +5 -5
  49. package/src/common/logger/interfaces.ts +19 -0
  50. package/src/common/logger/logger.ts +52 -30
  51. package/src/common/logger/transport/console.ts +34 -0
  52. package/src/common/logger/transport/file.ts +26 -0
  53. package/src/common/router-helpers.ts +2 -2
  54. package/src/proxy.ts +1 -0
  55. package/src/router.ts +3 -3
  56. package/src/router.unit.test.js +3 -4
  57. package/dist/common/logger/common.d.ts +0 -4
  58. package/dist/common/logger/common.js +0 -7
  59. package/dist/common/logger/common.js.map +0 -1
  60. package/dist/common/logger/formatter.d.ts +0 -7
  61. package/dist/common/logger/formatter.js +0 -9
  62. package/dist/common/logger/formatter.js.map +0 -1
  63. package/dist/common/logger/transport.js +0 -59
  64. package/dist/common/logger/transport.js.map +0 -1
  65. package/src/common/logger/common.ts +0 -6
  66. package/src/common/logger/formatter.ts +0 -9
  67. package/src/common/logger/transport.ts +0 -71
@@ -1,44 +1,46 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Logger = void 0;
3
+ exports.Logger = exports.LoggerErrorEvent = void 0;
4
4
  const util_1 = require("util");
5
- const events_1 = require("events");
6
- const transport_1 = require("./transport");
7
- const formatter_1 = require("./formatter");
8
- const common_1 = require("./common");
9
- const defaultLoggerTransports = () => [
10
- (0, transport_1.ConsoleTransport)(),
11
- (0, transport_1.FileTransport)()
12
- ];
13
- const LOG_LEVEL_MAP = {
14
- "error": 1,
15
- "warn": 2,
16
- "info": 3,
17
- "debug": 4,
18
- "trace": 5,
19
- };
20
- class Logger extends events_1.EventEmitter {
5
+ const constants_js_1 = require("./constants.js");
6
+ class LoggerErrorEvent extends Event {
7
+ constructor(event, init) {
8
+ super(event, init);
9
+ this.error = init.error;
10
+ }
11
+ }
12
+ exports.LoggerErrorEvent = LoggerErrorEvent;
13
+ class Logger extends EventTarget {
21
14
  constructor(identifier, level = "info", options) {
22
15
  super();
23
16
  this.identifier = identifier;
24
17
  this.level = level;
25
- if (!LOG_LEVEL_MAP[level]) {
18
+ if (!constants_js_1.LOG_LEVEL_MAP[level]) {
26
19
  throw new Error(`Unknown level [${level}]`);
27
20
  }
28
- this.on(common_1.LoggerEvents.error, (e) => {
29
- console.error(e);
21
+ this.addEventListener(constants_js_1.LoggerEvents.error, (ev) => {
22
+ console.error(ev.error);
30
23
  });
31
24
  this.options = {
32
- transports: options && options.transports !== undefined ? options.transports : defaultLoggerTransports(),
33
- formatter: options && options.formatter !== undefined ? options.formatter : formatter_1.defaultLoggerFormatter,
25
+ transports: options && options.transports !== undefined ? options.transports : (0, constants_js_1.DEFAULT_LOGGER_TRANSPORTS)(),
26
+ formatter: options && options.formatter !== undefined ? options.formatter : constants_js_1.DEFAULT_LOGGER_FORMATTER,
34
27
  };
35
28
  }
29
+ setLevel(level) {
30
+ if (!constants_js_1.LOG_LEVEL_MAP[level]) {
31
+ throw new Error(`Unknown level [${level}]`);
32
+ }
33
+ this.level = level;
34
+ }
35
+ addTransport(transport) {
36
+ this.options.transports.push(transport);
37
+ }
36
38
  write(args) {
37
39
  try {
38
40
  let eventArgs = undefined;
39
41
  const tR = [];
40
42
  for (const transport of this.options.transports) {
41
- if (LOG_LEVEL_MAP[transport.level ? transport.level : this.level] >= LOG_LEVEL_MAP[args.level]) {
43
+ if (constants_js_1.LOG_LEVEL_MAP[transport.level ? transport.level : this.level] >= constants_js_1.LOG_LEVEL_MAP[args.level]) {
42
44
  try {
43
45
  eventArgs = eventArgs ? eventArgs : {
44
46
  out: this.options.formatter({
@@ -51,16 +53,22 @@ class Logger extends events_1.EventEmitter {
51
53
  tR.push(transport.write(eventArgs));
52
54
  }
53
55
  catch (e2) {
54
- this.emit(common_1.LoggerEvents.error, e2);
56
+ this.dispatchEvent(new LoggerErrorEvent(constants_js_1.LoggerEvents.error, {
57
+ error: e2
58
+ }));
55
59
  }
56
60
  }
57
61
  }
58
- Promise.all(tR).catch((e) => {
59
- this.emit(common_1.LoggerEvents.error, e);
62
+ Promise.allSettled(tR).catch((e) => {
63
+ this.dispatchEvent(new LoggerErrorEvent(constants_js_1.LoggerEvents.error, {
64
+ error: e
65
+ }));
60
66
  });
61
67
  }
62
68
  catch (e) {
63
- this.emit(common_1.LoggerEvents.error, e);
69
+ this.dispatchEvent(new LoggerErrorEvent(constants_js_1.LoggerEvents.error, {
70
+ error: e
71
+ }));
64
72
  }
65
73
  }
66
74
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/common/logger/logger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/common/logger/logger.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,5 @@
1
+ import { LoggerTransportWriteArgs, LogLevel } from "../interfaces.js";
2
+ export declare function Console(color?: boolean, level?: LogLevel): {
3
+ level: LogLevel | undefined;
4
+ write: ({ level, out }: LoggerTransportWriteArgs) => Promise<void>;
5
+ };
@@ -0,0 +1,39 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Console = void 0;
4
+ function Console(color = true, level) {
5
+ return {
6
+ level,
7
+ write: async ({ level, out }) => {
8
+ if (color) {
9
+ switch (level) {
10
+ case "warn":
11
+ console.warn("\x1b[33m%s\x1b[0m", out);
12
+ break;
13
+ case "error":
14
+ console.error("\x1b[31m%s\x1b[0m", out);
15
+ break;
16
+ case "trace":
17
+ console.log("\x1b[34m%s\x1b[0m", out);
18
+ break;
19
+ case "debug":
20
+ console.log("\x1b[36m%s\x1b[0m", out);
21
+ break;
22
+ default:
23
+ console[level](out);
24
+ break;
25
+ }
26
+ }
27
+ else {
28
+ if (level === "trace" || level === "debug") {
29
+ console.log(out);
30
+ }
31
+ else {
32
+ console[level](out);
33
+ }
34
+ }
35
+ }
36
+ };
37
+ }
38
+ exports.Console = Console;
39
+ //# sourceMappingURL=console.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../src/common/logger/transport/console.ts"],"names":[],"mappings":";;;AAEA,SAAgB,OAAO,CAAC,QAAiB,IAAI,EAAE,KAAgB;IAC7D,OAAO;QACL,KAAK;QACL,KAAK,EAAE,KAAK,EAAE,EAAC,KAAK,EAAE,GAAG,EAA2B,EAAiB,EAAE;YACrE,IAAI,KAAK,EAAE;gBACT,QAAQ,KAAK,EAAE;oBACb,KAAK,MAAM;wBACT,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACvC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACxC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACtC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACtC,MAAM;oBACR;wBACE,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;wBACpB,MAAM;iBACT;aACF;iBAAM;gBACL,IAAG,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,OAAO,EAAE;oBACzC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBAClB;qBAAM;oBACL,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;iBACrB;aACF;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AA/BD,0BA+BC"}
@@ -0,0 +1,2 @@
1
+ import { LoggerTransport, LogLevel } from "../interfaces.js";
2
+ export declare const File: (filePath?: string | null, level?: LogLevel) => LoggerTransport;
@@ -0,0 +1,29 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.File = void 0;
4
+ const fs_1 = require("fs");
5
+ const path_1 = require("path");
6
+ const FILE_TRANSPORT_ENVVAR = "LOG_FILE";
7
+ const File = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_TRANSPORT_ENVVAR] : null, level) => {
8
+ const fileHandler = filePath ? (0, fs_1.createWriteStream)((0, path_1.resolve)(filePath), { flags: "a" }) : null;
9
+ return {
10
+ level,
11
+ write: async ({ out }) => {
12
+ if (fileHandler) {
13
+ return new Promise((resolve, reject) => {
14
+ fileHandler.write(`${out}\n`, (err) => {
15
+ if (err) {
16
+ reject(err);
17
+ }
18
+ else {
19
+ resolve();
20
+ }
21
+ });
22
+ });
23
+ }
24
+ return;
25
+ }
26
+ };
27
+ };
28
+ exports.File = File;
29
+ //# sourceMappingURL=file.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../src/common/logger/transport/file.ts"],"names":[],"mappings":";;;AAAA,2BAAqC;AACrC,+BAA6B;AAG7B,MAAM,qBAAqB,GAAG,UAAU,CAAC;AAElC,MAAM,IAAI,GAAoE,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAgB,EAAE,EAAE;IACnM,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,sBAAiB,EAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE,EAAC,KAAK,EAAE,GAAG,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzF,OAAO;QACL,KAAK;QACL,KAAK,EAAE,KAAK,EAAE,EAAC,GAAG,EAA2B,EAAiB,EAAE;YAC9D,IAAI,WAAW,EAAE;gBACf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACrC,WAAW,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;wBACpC,IAAI,GAAG,EAAE;4BACP,MAAM,CAAC,GAAG,CAAC,CAAC;yBACb;6BAAM;4BACL,OAAO,EAAE,CAAC;yBACX;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;aACJ;YACD,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,IAAI,QAmBf"}
@@ -1,3 +1,3 @@
1
- import { Logger } from "./logger";
2
1
  import { IncomingMessage } from "http";
2
+ import { Logger } from "./logger/index.js";
3
3
  export declare const defaultLoggerFactory: (uuid: string, req: IncomingMessage) => Logger;
@@ -1,9 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.defaultLoggerFactory = void 0;
4
- const logger_1 = require("./logger");
5
4
  const helpers_1 = require("./helpers");
6
5
  const tokenize_match_1 = require("./tokenize-match");
6
+ const index_js_1 = require("./logger/index.js");
7
7
  const defaultLoggerFactory = (uuid, req) => {
8
8
  const url = (0, helpers_1.newURL)(req.url ? req.url : "/", `http://${req.headers.host}`);
9
9
  const method = req.method ? req.method.toUpperCase() : "GET";
@@ -11,10 +11,10 @@ const defaultLoggerFactory = (uuid, req) => {
11
11
  const pathToEnv = path.replace(/\//ig, "_").toUpperCase();
12
12
  const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
13
13
  const remoteAddress = req.socket.remoteAddress;
14
- return (0, logger_1.getLogger)(identifier, {
14
+ return (0, index_js_1.getLogger)(identifier, {
15
15
  formatter: (args) => {
16
16
  args.message = `${method} ${url}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
17
- return (0, logger_1.defaultLoggerFormatter)(args);
17
+ return (0, index_js_1.DEFAULT_LOGGER_FORMATTER)(args);
18
18
  }
19
19
  }, false);
20
20
  };
@@ -1 +1 @@
1
- {"version":3,"file":"router-helpers.js","sourceRoot":"","sources":["../../src/common/router-helpers.ts"],"names":[],"mappings":";;;AAAA,qCAAmE;AAGnE,uCAAiC;AACjC,qDAA+C;AAExC,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAE,GAAoB,EAAU,EAAE;IACjF,MAAM,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;IACjF,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,KAAK,CAAC;IACvE,MAAM,IAAI,GAAG,IAAA,8BAAa,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;IAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC1D,MAAM,UAAU,GAAG,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;IAC/F,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;IAC/C,OAAO,IAAA,kBAAS,EAAC,UAAU,EAAE;QAC3B,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,GAAG,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC1H,OAAO,IAAA,+BAAsB,EAAC,IAAI,CAAC,CAAC;QACtC,CAAC;KACF,EAAE,KAAK,CAAC,CAAC;AACZ,CAAC,CAAA;AAbY,QAAA,oBAAoB,wBAahC"}
1
+ {"version":3,"file":"router-helpers.js","sourceRoot":"","sources":["../../src/common/router-helpers.ts"],"names":[],"mappings":";;;AAEA,uCAAiC;AACjC,qDAA+C;AAC/C,gDAA8E;AAEvE,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAE,GAAoB,EAAU,EAAE;IACjF,MAAM,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;IACjF,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,KAAK,CAAC;IACvE,MAAM,IAAI,GAAG,IAAA,8BAAa,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;IAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC1D,MAAM,UAAU,GAAG,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;IAC/F,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;IAC/C,OAAO,IAAA,oBAAS,EAAC,UAAU,EAAE;QAC3B,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,GAAG,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC1H,OAAO,IAAA,mCAAwB,EAAC,IAAI,CAAC,CAAC;QACxC,CAAC;KACF,EAAE,KAAK,CAAC,CAAC;AACZ,CAAC,CAAA;AAbY,QAAA,oBAAoB,wBAahC"}
package/dist/proxy.js CHANGED
@@ -28,6 +28,7 @@ class ProxyRouter extends router_1.Router {
28
28
  delete headers["keep-alive"];
29
29
  const requestArgs = {
30
30
  url: url.toString(),
31
+ query: ctx.query,
31
32
  disableThrow: true,
32
33
  rejectUnauthorized: this.rejectUnauthorized,
33
34
  disableUserAgent: true,
package/dist/proxy.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"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"}
package/dist/router.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  /// <reference types="node" />
2
2
  import { IncomingMessage, RequestListener } from "http";
3
- import { Logger } from "./common/logger";
3
+ import { Logger } from "./common/logger/index.js";
4
4
  import { Context, ErrorHandler, Handler, Method } from "./common/context";
5
5
  import { HandlerWithOptions, RouterHandlerOptions, RouterJSONDoc } from "./common/router-utils";
6
6
  import { PathPart, PathPartToken } from "./common/tokenize-match";
package/dist/router.js CHANGED
@@ -1,11 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Router = void 0;
4
- const uuid_1 = require("uuid");
5
4
  const context_1 = require("./common/context");
6
5
  const tokenize_match_1 = require("./common/tokenize-match");
7
6
  const router_helpers_1 = require("./common/router-helpers");
8
7
  const router_handler_1 = require("./common/router-handler");
8
+ const crypto_1 = require("crypto");
9
9
  class Router {
10
10
  constructor(config) {
11
11
  this.config = config;
@@ -13,7 +13,7 @@ class Router {
13
13
  this.errorHandlers = [];
14
14
  const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : router_helpers_1.defaultLoggerFactory;
15
15
  this.listener = async (req, res) => {
16
- const uuid = (0, uuid_1.v4)().toString();
16
+ const uuid = (0, crypto_1.randomUUID)();
17
17
  const logger = loggerFactory(uuid, req);
18
18
  const ctx = new context_1.Context(uuid, req, res, logger);
19
19
  ctx.logger.trace(`request received`);
@@ -1 +1 @@
1
- {"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.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.6.0",
3
+ "version": "1.7.1",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -17,10 +17,9 @@
17
17
  "devDependencies": {
18
18
  "@miqro/test": "0.2.4",
19
19
  "@miqro/test-http": "0.0.7",
20
- "@types/node": "17.0.23",
20
+ "@types/node": "18.6.1",
21
21
  "typescript": "4.7.4",
22
- "@types/cookie": "0.4.1",
23
- "@types/uuid": "8.3.4"
22
+ "@types/cookie": "0.4.1"
24
23
  },
25
24
  "engines": {
26
25
  "node": ">=16.0.0",
@@ -29,7 +28,6 @@
29
28
  "dependencies": {
30
29
  "@miqro/parser": "^0.1.5",
31
30
  "@miqro/request": "^0.1.1",
32
- "cookie": "0.5.0",
33
- "uuid": "8.3.2"
31
+ "cookie": "0.5.0"
34
32
  }
35
33
  }
package/src/api-router.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import {existsSync, lstatSync} from "fs";
2
2
  import {basename} from "path";
3
3
  import {FeatureRouter, traverseAPIRouteDir} from "./common/api-router-utils";
4
- import {Logger} from "./common/logger";
4
+ import {Logger} from "./common/logger/index.js";
5
5
  import {parse, ParseOptionMap} from "@miqro/parser";
6
6
 
7
7
  export interface APIRouterOptions {
package/src/app.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import {createServer, RequestListener, Server} from "http";
2
- import {v4} from "uuid";
2
+ import { randomUUID } from 'crypto'
3
3
  import {Context, defaultLoggerFactory} from "./common";
4
4
  import {Router, RouterOptions} from "./router";
5
5
  import {defaultAppErrorHandler, HTML_HEADERS, STATUS} from "./app-utils";
@@ -12,7 +12,7 @@ export class App extends Router {
12
12
  const errorHandler = defaultAppErrorHandler();
13
13
  const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : defaultLoggerFactory;
14
14
  this.listener = async (req, res) => {
15
- const uuid = v4().toString();
15
+ const uuid = randomUUID();
16
16
  const logger = loggerFactory(uuid, req);
17
17
  const ctx = new Context(uuid, req, res, logger);
18
18
  ctx.logger.trace(`request received`);
@@ -22,7 +22,6 @@ describe("app unit tests", () => {
22
22
  "http": {
23
23
  createServer
24
24
  },
25
- "uuid": {},
26
25
  "./common": {},
27
26
  "./router": {
28
27
  Router: class {
@@ -95,8 +94,8 @@ describe("app unit tests", () => {
95
94
 
96
95
  const {App} = requireMock(testFilePath, {
97
96
  "http": {},
98
- "uuid": {
99
- v4
97
+ "crypto": {
98
+ randomUUID: v4
100
99
  },
101
100
  "./common": {
102
101
  defaultLoggerFactory,
@@ -189,8 +188,8 @@ describe("app unit tests", () => {
189
188
 
190
189
  const {App} = requireMock(testFilePath, {
191
190
  "http": {},
192
- "uuid": {
193
- v4
191
+ "crypto": {
192
+ randomUUID: v4
194
193
  },
195
194
  "./common": {
196
195
  defaultLoggerFactory,
@@ -286,8 +285,8 @@ describe("app unit tests", () => {
286
285
 
287
286
  const {App} = requireMock(testFilePath, {
288
287
  "http": {},
289
- "uuid": {
290
- v4
288
+ "crypto": {
289
+ randomUUID: v4
291
290
  },
292
291
  "./common": {
293
292
  defaultLoggerFactory,
@@ -1,29 +1,18 @@
1
- import {lstatSync, readdirSync} from "fs";
2
- import {join, parse as pathParse, resolve} from "path";
3
- import {Logger} from "./logger";
4
- import {APIRoute} from "./api-router";
5
- import {normalizePath} from "./tokenize-match";
6
- import {isFeatureEnabled} from "./config";
7
- import {Router} from "../router";
8
- import {Handler, Method} from "./context";
9
- import {RouterHandlerOptions} from "./router-utils";
10
- import {parse, ParseOptionMap} from "@miqro/parser";
1
+ import { lstatSync, readdirSync } from "fs";
2
+ import { join, parse as pathParse, resolve } from "path";
3
+ import { Logger } from "./logger/index.js";
4
+ import { APIRoute } from "./api-router";
5
+ import { normalizePath } from "./tokenize-match";
6
+ import { isFeatureEnabled } from "./config";
7
+ import { Router } from "../router";
8
+ import { Handler, Method } from "./context";
9
+ import { handlerWithOptionsParseOptions, RouterHandlerOptions } from "./router-utils";
10
+ import { parse, ParseOptionMap } from "@miqro/parser";
11
11
 
12
12
  export const APIRouteValidator: ParseOptionMap = {
13
- name: "string?",
14
- description: "string?",
15
- method: "string[]!?",
16
- path: "string[]!?",
17
- parser: "ParserInterface?",
18
- headers: "ParseOptions[]!?",
19
- query: "boolean?|ParseOptions[]!?|string?",
20
- params: "boolean?|ParseOptions[]!?|string?",
21
- body: "boolean?|ParseOptions[]!?|string?",
22
- response: "ParseOptions[]!?|string?",
23
- handler: "function[]!",
24
- middleware: "function[]!?",
25
- session: "function?|SessionHandlerOptions?",
26
- policy: "GroupPolicy?"
13
+ ...handlerWithOptionsParseOptions,
14
+ method: "string?|string[]?",
15
+ path: "string?|string[]?"
27
16
  };
28
17
 
29
18
  export function traverseAPIRouteDir(
@@ -38,11 +27,11 @@ export function traverseAPIRouteDir(
38
27
  const dirs = files.filter(f => lstatSync(join(dirname, f)).isDirectory());
39
28
  const methods = files.filter(f => !lstatSync(join(dirname, f)).isDirectory());
40
29
  for (const f of dirs) {
41
- const {name} = pathParse(f);
30
+ const { name } = pathParse(f);
42
31
  features = traverseAPIRouteDir(`${featureName}_${name}`.toUpperCase(), join(dirname, f), `${basePath}/${name}`, features, logger);
43
32
  }
44
33
  for (const f of methods) {
45
- const {name, ext} = pathParse(f);
34
+ const { name, ext } = pathParse(f);
46
35
  if (name !== "index" && ((ext === ".ts" || ext === ".js") && name.slice(-2) !== ".d")) {
47
36
  const filePath = join(dirname, name);
48
37
  // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -101,14 +90,9 @@ export function traverseAPIRouteDir(
101
90
  middleware: route.middleware,
102
91
  session: route.session,
103
92
  policy: route.policy,
104
- request: {
105
- headers: route.headers,
106
- query: route.query,
107
- body: route.body,
108
- params: route.params,
109
- },
93
+ request: route.request,
110
94
  response: {
111
- body: route.response ? route.response : true
95
+ body: route.response && route.response.body ? route.response.body : true
112
96
  }
113
97
  },
114
98
  path,
@@ -144,7 +128,7 @@ export const FeatureRouter = (options: FeatureRouterOptions, logger?: Logger): R
144
128
  if (!handlerOptions) {
145
129
  throw new Error(`no handler options for feature [${featureName}]`);
146
130
  } else {
147
- const {path, handler: implementation, method} = handlerOptions;
131
+ const { path, handler: implementation, method } = handlerOptions;
148
132
  if (!method) {
149
133
  throw new Error(`no methods for feature [${featureName}]`);
150
134
  } else if (!implementation) {
@@ -1,6 +1,5 @@
1
- import {ParseOptions, ParserInterface} from "@miqro/parser";
2
- import {GroupPolicy, SessionHandlerOptions} from "./session";
3
- import {Handler, Method} from "./context";
1
+ import { Method } from "./context";
2
+ import { HandlerWithOptions } from "./router-utils";
4
3
 
5
4
  /**
6
5
  * # APIRoute
@@ -14,19 +13,7 @@ import {Handler, Method} from "./context";
14
13
  *export default route;
15
14
  * ```
16
15
  */
17
- export interface APIRoute {
18
- name?: string;
19
- description?: string;
16
+ export interface APIRoute extends HandlerWithOptions{
20
17
  method?: Method | Method[];
21
18
  path?: string | string[];
22
- parser?: ParserInterface;
23
- headers?: ParseOptions | ParseOptions[];
24
- query?: ParseOptions | boolean | ParseOptions[] | string;
25
- params?: ParseOptions | boolean | ParseOptions[] | string;
26
- body?: ParseOptions | boolean | ParseOptions[] | string;
27
- response?: ParseOptions | ParseOptions[] | string;
28
- handler: Array<Handler> | Handler;
29
- middleware?: Handler[];
30
- session?: SessionHandlerOptions | Handler;
31
- policy?: GroupPolicy;
32
19
  }
@@ -1,4 +1,4 @@
1
- import {Logger} from "./logger";
1
+ import {Logger} from "./logger/index.js";
2
2
  import {Session} from "./session";
3
3
  import {IncomingHttpHeaders, IncomingMessage, OutgoingHttpHeaders, ServerResponse} from "http";
4
4
  import {normalizePath, parseSearchParams} from "./tokenize-match";
@@ -0,0 +1,27 @@
1
+ import {LoggerFormatter, LoggerTransport} from "./interfaces.js";
2
+ import {File} from "./transport/file.js";
3
+ import {Console} from "./transport/console.js";
4
+
5
+ export const DEFAULT_LOGGER_TRANSPORTS: () => LoggerTransport[] = () => [
6
+ Console(),
7
+ File()
8
+ ];
9
+
10
+ export const DEFAULT_LOGGER_FORMATTER: LoggerFormatter =
11
+ ({identifier, level, message}) => `${new Date().toISOString()} ${process.pid} ` +
12
+ `${identifier ? `[${identifier}] ` : ""}` +
13
+ `${level !== "info" ? (level === "error" || level === "warn" ? `[${level.toUpperCase()}] ` : `[${level}] `) : ""}` +
14
+ `${message}`;
15
+
16
+ export const LOG_LEVEL_MAP =
17
+ {
18
+ "error": 1,
19
+ "warn": 2,
20
+ "info": 3,
21
+ "debug": 4,
22
+ "trace": 5,
23
+ };
24
+
25
+ export const LoggerEvents = {
26
+ error: "error"
27
+ };
@@ -1,8 +1,7 @@
1
- import {Logger} from "./logger";
2
- import {LoggerFormatter} from "./formatter";
3
- import {LoggerTransport} from "./transport";
4
- import {LogLevel} from "./common";
5
- import {ConfigStore} from "../config";
1
+ import { LoggerFormatter, LoggerTransport, LogLevel } from "./interfaces";
2
+ import { ConfigStore } from "../config";
3
+ import {Logger} from "./logger.js";
4
+ import {DEFAULT_LOGGER_FORMATTER, DEFAULT_LOGGER_TRANSPORTS} from "./constants.js";
6
5
 
7
6
  const loggerContainer: Map<string, Logger> = new Map<string, Logger>();
8
7
  const DEFAULT_ENV_NAME = "LOG_LEVEL";
@@ -17,7 +16,7 @@ export const getLogger = (identifier: string, options?: { formatter?: LoggerForm
17
16
  const envVarName = `LOG_LEVEL_${identifier}`;
18
17
  const level = ConfigStore.getConfig(envVarName) ? ConfigStore.getConfig(envVarName) as LogLevel : ConfigStore.getConfig(DEFAULT_ENV_NAME, "info") as LogLevel;
19
18
  const factory = getLoggerFactory();
20
- const logger = factory({identifier, level, options});
19
+ const logger = factory({ identifier, level, options });
21
20
  if (useCache) {
22
21
  loggerContainer.set(identifier, logger);
23
22
  }
@@ -27,15 +26,18 @@ export const getLogger = (identifier: string, options?: { formatter?: LoggerForm
27
26
 
28
27
  export type LoggerFactory = (args: { identifier: string, level: LogLevel; options?: { transports?: LoggerTransport[]; formatter?: LoggerFormatter; } }) => Logger;
29
28
 
30
- const defaultLoggerFactory: LoggerFactory = ({identifier, options, level}): Logger => {
31
- return new Logger(identifier, level, options);
29
+ const defaultLoggerFactory: LoggerFactory = ({ identifier, options, level }): Logger => {
30
+ return new Logger(identifier, level, {
31
+ formatter: options && options.formatter ? options.formatter : DEFAULT_LOGGER_FORMATTER,
32
+ transports: options && options.transports ? options.transports : DEFAULT_LOGGER_TRANSPORTS()
33
+ });
32
34
  };
33
35
 
34
36
  let customLoggerFactory: LoggerFactory | undefined = undefined;
35
37
 
36
38
  export const setLoggerFactory = (factory: LoggerFactory): LoggerFactory => {
37
39
  if (customLoggerFactory !== undefined) {
38
- throw new Error("cannot change logger factory. it has been used already.");
40
+ throw new Error("cannot change logger factory after it has been used.");
39
41
  }
40
42
  customLoggerFactory = factory;
41
43
  return customLoggerFactory;
@@ -1,6 +1,6 @@
1
- export {LogLevel} from "./common";
2
- export * from "./factory";
3
- export * from "./formatter";
4
- export * from "./logger";
5
- export * from "./transport";
1
+ export * from "./constants.js";
2
+ export * from "./logger.js";
3
+ export * from "./factory.js";
4
+ export * from "./interfaces.js";
5
+ export * from "./transport/console.js";
6
6