@miqro/core 1.5.15 → 1.5.16

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.
@@ -0,0 +1,13 @@
1
+ import { ErrorHandler } from "./common";
2
+ export declare const HTML_HEADERS: {
3
+ "Content-Type": string;
4
+ };
5
+ export declare const STATUS: {
6
+ ERROR: number;
7
+ BAD_REQUEST: number;
8
+ NOT_FOUND: number;
9
+ NOT_IMPLEMENTED: number;
10
+ FORBIDDEN: number;
11
+ UNAUTHORIZED: number;
12
+ };
13
+ export declare function defaultAppErrorHandler(): ErrorHandler<void>;
@@ -0,0 +1,82 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.defaultAppErrorHandler = exports.STATUS = exports.HTML_HEADERS = void 0;
4
+ exports.HTML_HEADERS = {
5
+ ["Content-Type"]: "text/html; charset=utf-8"
6
+ };
7
+ exports.STATUS = {
8
+ ERROR: 503,
9
+ BAD_REQUEST: 400,
10
+ NOT_FOUND: 404,
11
+ NOT_IMPLEMENTED: 501,
12
+ FORBIDDEN: 403,
13
+ UNAUTHORIZED: 401,
14
+ };
15
+ function defaultAppErrorHandler() {
16
+ const isTestEnv = (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test");
17
+ return async (e, ctx) => {
18
+ if (isTestEnv &&
19
+ (!e || !e.name || e.name === "Error")) {
20
+ ctx.logger.error(e);
21
+ await ctx.end({
22
+ headers: exports.HTML_HEADERS,
23
+ status: exports.STATUS.ERROR,
24
+ body: `${e && e.message ? e.message : String(e)}. You are seeing this message because NODE_ENV === "development" || NODE_ENV === "test"${e && e.stack ? ` ${e.stack}` : ""}`
25
+ });
26
+ }
27
+ else {
28
+ ctx.logger.error(e);
29
+ const name = e && e.name ? e.name : undefined;
30
+ switch (name) {
31
+ case "NotFoundError":
32
+ await ctx.end({
33
+ headers: exports.HTML_HEADERS,
34
+ status: exports.STATUS.NOT_FOUND,
35
+ body: e.message ? e.message : "NOT FOUND"
36
+ });
37
+ break;
38
+ case "MethodNotImplementedError":
39
+ await ctx.end({
40
+ headers: exports.HTML_HEADERS,
41
+ status: exports.STATUS.NOT_IMPLEMENTED,
42
+ body: e.message ? e.message : "NOT IMPLEMENTED"
43
+ });
44
+ break;
45
+ case "ForbiddenError":
46
+ await ctx.end({
47
+ headers: exports.HTML_HEADERS,
48
+ status: exports.STATUS.FORBIDDEN,
49
+ body: e.message ? e.message : "FORBIDDEN"
50
+ });
51
+ break;
52
+ case "UnAuthorizedError":
53
+ await ctx.end({
54
+ headers: exports.HTML_HEADERS,
55
+ status: exports.STATUS.UNAUTHORIZED,
56
+ body: e.message ? e.message : "UNAUTHORIZED"
57
+ });
58
+ break;
59
+ case "ParseOptionsError":
60
+ case "BadRequestError":
61
+ case "SequelizeValidationError":
62
+ case "SequelizeEagerLoadingError":
63
+ case "SequelizeUniqueConstraintError":
64
+ await ctx.end({
65
+ headers: exports.HTML_HEADERS,
66
+ status: exports.STATUS.BAD_REQUEST,
67
+ body: e.message ? e.message : "BAD REQUEST"
68
+ });
69
+ break;
70
+ case "ConfigFileNotFoundError":
71
+ await ctx.end({
72
+ headers: exports.HTML_HEADERS,
73
+ status: exports.STATUS.ERROR,
74
+ body: e.message ? e.message : "SERVER ERROR"
75
+ });
76
+ break;
77
+ }
78
+ }
79
+ };
80
+ }
81
+ exports.defaultAppErrorHandler = defaultAppErrorHandler;
82
+ //# sourceMappingURL=app-utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"app-utils.js","sourceRoot":"","sources":["../src/app-utils.ts"],"names":[],"mappings":"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"}
package/dist/app.js CHANGED
@@ -5,10 +5,11 @@ const http_1 = require("http");
5
5
  const uuid_1 = require("uuid");
6
6
  const common_1 = require("./common");
7
7
  const router_1 = require("./router");
8
+ const app_utils_1 = require("./app-utils");
8
9
  class App extends router_1.Router {
9
10
  constructor(config) {
10
11
  super(config);
11
- const errorHandler = DefaultErrorHandler();
12
+ const errorHandler = (0, app_utils_1.defaultAppErrorHandler)();
12
13
  const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : common_1.defaultLoggerFactory;
13
14
  this.listener = async (req, res) => {
14
15
  const uuid = (0, uuid_1.v4)().toString();
@@ -19,8 +20,8 @@ class App extends router_1.Router {
19
20
  await this.run(ctx);
20
21
  if (!ctx.res.headersSent) {
21
22
  await ctx.end({
22
- headers: HTML_HEADERS,
23
- status: STATUS.NOT_FOUND,
23
+ headers: app_utils_1.HTML_HEADERS,
24
+ status: app_utils_1.STATUS.NOT_FOUND,
24
25
  body: "NOT FOUND"
25
26
  });
26
27
  }
@@ -32,8 +33,8 @@ class App extends router_1.Router {
32
33
  if (!ctx.res.headersSent) {
33
34
  ctx.logger.error(e);
34
35
  await ctx.end({
35
- headers: TEXT_HEADERS,
36
- status: STATUS.ERROR,
36
+ headers: app_utils_1.HTML_HEADERS,
37
+ status: app_utils_1.STATUS.ERROR,
37
38
  body: "SERVER ERROR"
38
39
  });
39
40
  }
@@ -50,87 +51,4 @@ class App extends router_1.Router {
50
51
  }
51
52
  }
52
53
  exports.App = App;
53
- const TEXT_HEADERS = {
54
- ["Content-Type"]: "plain/text; charset=utf-8"
55
- };
56
- const HTML_HEADERS = {
57
- ["Content-Type"]: "text/html; charset=utf-8"
58
- };
59
- const STATUS = {
60
- ERROR: 503,
61
- BAD_REQUEST: 400,
62
- NOT_FOUND: 404,
63
- NOT_IMPLEMENTED: 501,
64
- FORBIDDEN: 403,
65
- UNAUTHORIZED: 401,
66
- };
67
- const DefaultErrorHandler = () => {
68
- return async (e, ctx) => {
69
- if (!e || !e.name || e.name === "Error") {
70
- if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
71
- ctx.logger.error(e);
72
- await ctx.end({
73
- headers: TEXT_HEADERS,
74
- status: STATUS.ERROR,
75
- body: `${e && e.message ? e.message : String(e)}. You are seeing this message because NODE_ENV === "development" || NODE_ENV === "test"${e && e.stack ? ` ${e.stack}` : ""}`
76
- });
77
- return false;
78
- }
79
- }
80
- else {
81
- ctx.logger.error(e);
82
- const name = e && e.name ? e.name : undefined;
83
- switch (name) {
84
- case "NotFoundError":
85
- await ctx.end({
86
- headers: HTML_HEADERS,
87
- status: STATUS.NOT_FOUND,
88
- body: e.message ? e.message : "NOT FOUND"
89
- });
90
- break;
91
- case "MethodNotImplementedError":
92
- await ctx.end({
93
- headers: HTML_HEADERS,
94
- status: STATUS.NOT_IMPLEMENTED,
95
- body: e.message ? e.message : "NOT IMPLEMENTED"
96
- });
97
- break;
98
- case "ForbiddenError":
99
- await ctx.end({
100
- headers: HTML_HEADERS,
101
- status: STATUS.FORBIDDEN,
102
- body: e.message ? e.message : "FORBIDDEN"
103
- });
104
- break;
105
- case "UnAuthorizedError":
106
- await ctx.end({
107
- headers: HTML_HEADERS,
108
- status: STATUS.UNAUTHORIZED,
109
- body: e.message ? e.message : "UNAUTHORIZED"
110
- });
111
- break;
112
- case "ParseOptionsError":
113
- case "BadRequestError":
114
- case "SequelizeValidationError":
115
- case "SequelizeEagerLoadingError":
116
- case "SequelizeUniqueConstraintError":
117
- await ctx.end({
118
- headers: HTML_HEADERS,
119
- status: STATUS.BAD_REQUEST,
120
- body: e.message ? e.message : "BAD REQUEST"
121
- });
122
- break;
123
- default:
124
- await ctx.end({
125
- headers: HTML_HEADERS,
126
- status: STATUS.ERROR,
127
- body: e.message ? e.message : "SERVER ERROR"
128
- });
129
- break;
130
- }
131
- return false;
132
- }
133
- return true;
134
- };
135
- };
136
54
  //# sourceMappingURL=app.js.map
package/dist/app.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;AAAA,+BAA2D;AAC3D,+BAAwB;AACxB,qCAAuD;AACvD,qCAA+C;AAC/C,2CAAyE;AAEzE,MAAa,GAAI,SAAQ,eAAM;IAG7B,YAAY,MAAsB;QAChC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAM,YAAY,GAAG,IAAA,kCAAsB,GAAE,CAAC;QAC9C,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,6BAAoB,CAAC;QAClH,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACjC,MAAM,IAAI,GAAG,IAAA,SAAE,GAAE,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACxC,MAAM,GAAG,GAAG,IAAI,gBAAO,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;YAChD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACrC,IAAI;gBACF,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;oBACxB,MAAM,GAAG,CAAC,GAAG,CAAC;wBACZ,OAAO,EAAE,wBAAY;wBACrB,MAAM,EAAE,kBAAM,CAAC,SAAS;wBACxB,IAAI,EAAE,WAAW;qBAClB,CAAC,CAAC;iBACJ;aACF;YAAC,OAAO,CAAM,EAAE;gBACf,IAAI;oBACF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;wBACxB,MAAM,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;wBAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;4BACxB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;4BACpB,MAAM,GAAG,CAAC,GAAG,CAAC;gCACZ,OAAO,EAAE,wBAAY;gCACrB,MAAM,EAAE,kBAAM,CAAC,KAAK;gCACpB,IAAI,EAAE,cAAc;6BACrB,CAAC,CAAC;yBACJ;qBACF;iBACF;gBAAC,OAAO,EAAE,EAAE;oBACX,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;iBACtB;aACF;QACH,CAAC,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,GAAG,IAAW;QAC1B,OAAO,IAAA,mBAAY,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA;IACpD,CAAC;CACF;AA5CD,kBA4CC"}
@@ -38,7 +38,7 @@ class Context {
38
38
  const current = c ? c instanceof Array ? c.join(", ") : String(c) : "";
39
39
  const nV = value instanceof Array ? value.join(", ") : String(value);
40
40
  const newValue = current ? `${current}, ${nV}` : nV;
41
- return this.res.setHeader("Vary", newValue.indexOf("*") !== -1 ? "*" : newValue);
41
+ return this.setHeader("Vary", newValue.indexOf("*") !== -1 ? "*" : newValue);
42
42
  }
43
43
  setHeader(name, value) {
44
44
  return this.res.setHeader(name, value);
@@ -47,6 +47,9 @@ class Context {
47
47
  return this.setHeader('Set-Cookie', (0, cookie_1.serialize)(name, String(value), options));
48
48
  }
49
49
  async end({ status, headers, body }) {
50
+ if (this.res.headersSent) {
51
+ return Promise.reject(new Error("already ended"));
52
+ }
50
53
  return new Promise((resolve, reject) => {
51
54
  try {
52
55
  if (this.res.headersSent) {
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/common/context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/common/context.ts"],"names":[],"mappings":"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"}
package/dist/router.js CHANGED
@@ -47,6 +47,9 @@ class Router {
47
47
  catch(errorHandler) {
48
48
  const errorHandlers = errorHandler instanceof Array ? errorHandler : [errorHandler];
49
49
  for (const e of errorHandlers) {
50
+ if (typeof e !== "function") {
51
+ throw new Error(`errorHandler ${e} not a function!`);
52
+ }
50
53
  this.errorHandlers.push(e);
51
54
  }
52
55
  return this;
@@ -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.5.15",
3
+ "version": "1.5.16",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -9,15 +9,15 @@
9
9
  "prebuild": "rm -Rf dist/;",
10
10
  "build": "tsc",
11
11
  "pretest": "npm run build",
12
- "test": "npm run test:unit && npm run test:func",
13
- "test:unit": "LOG_LEVEL=debug NODE_ENV=test miqro-test -r src/ -n ",
14
- "test:func": "LOG_LEVEL=debug NODE_ENV=test miqro-test test/*.test.js -n ",
15
- "test:file": "LOG_LEVEL=debug NODE_ENV=test miqro-test"
12
+ "test": "LOG_LEVEL=debug NODE_ENV=test npx miqro-test -r src/ test/*.test.js -n ",
13
+ "test:unit": "LOG_LEVEL=debug NODE_ENV=test npx miqro-test -r src/ -n ",
14
+ "test:func": "LOG_LEVEL=debug NODE_ENV=test npx miqro-test test/*.test.js -n "
16
15
  },
17
16
  "author": "claukers",
18
17
  "license": "ISC",
19
18
  "devDependencies": {
20
- "@miqro/test": "0.1.1",
19
+ "@miqro/test": "0.2.0",
20
+ "@miqro/test-http": "0.0.2",
21
21
  "@types/node": "17.0.23",
22
22
  "typescript": "4.6.3",
23
23
  "@types/cookie": "0.4.1",
@@ -0,0 +1,82 @@
1
+ import {Context, ErrorHandler} from "./common";
2
+
3
+ export const HTML_HEADERS = {
4
+ ["Content-Type"]: "text/html; charset=utf-8"
5
+ }
6
+
7
+ export const STATUS = {
8
+ ERROR: 503,
9
+ BAD_REQUEST: 400,
10
+ NOT_FOUND: 404,
11
+ NOT_IMPLEMENTED: 501,
12
+ FORBIDDEN: 403,
13
+ UNAUTHORIZED: 401,
14
+ };
15
+
16
+ export function defaultAppErrorHandler(): ErrorHandler<void> {
17
+ const isTestEnv = (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test");
18
+ return async (e: any, ctx: Context): Promise<void> => {
19
+ if (
20
+ isTestEnv &&
21
+ (!e || !e.name || e.name === "Error")
22
+ ) {
23
+ ctx.logger.error(e);
24
+ await ctx.end({
25
+ headers: HTML_HEADERS,
26
+ status: STATUS.ERROR,
27
+ body: `${e && e.message ? e.message : String(e)}. You are seeing this message because NODE_ENV === "development" || NODE_ENV === "test"${e && e.stack ? ` ${e.stack}` : ""}`
28
+ });
29
+ } else {
30
+ ctx.logger.error(e);
31
+ const name = e && e.name ? e.name : undefined;
32
+ switch (name) {
33
+ case "NotFoundError":
34
+ await ctx.end({
35
+ headers: HTML_HEADERS,
36
+ status: STATUS.NOT_FOUND,
37
+ body: e.message ? e.message : "NOT FOUND"
38
+ });
39
+ break;
40
+ case "MethodNotImplementedError":
41
+ await ctx.end({
42
+ headers: HTML_HEADERS,
43
+ status: STATUS.NOT_IMPLEMENTED,
44
+ body: e.message ? e.message : "NOT IMPLEMENTED"
45
+ });
46
+ break;
47
+ case "ForbiddenError":
48
+ await ctx.end({
49
+ headers: HTML_HEADERS,
50
+ status: STATUS.FORBIDDEN,
51
+ body: e.message ? e.message : "FORBIDDEN"
52
+ });
53
+ break;
54
+ case "UnAuthorizedError":
55
+ await ctx.end({
56
+ headers: HTML_HEADERS,
57
+ status: STATUS.UNAUTHORIZED,
58
+ body: e.message ? e.message : "UNAUTHORIZED"
59
+ });
60
+ break;
61
+ case "ParseOptionsError":
62
+ case "BadRequestError":
63
+ case "SequelizeValidationError":
64
+ case "SequelizeEagerLoadingError":
65
+ case "SequelizeUniqueConstraintError":
66
+ await ctx.end({
67
+ headers: HTML_HEADERS,
68
+ status: STATUS.BAD_REQUEST,
69
+ body: e.message ? e.message : "BAD REQUEST"
70
+ });
71
+ break;
72
+ case "ConfigFileNotFoundError":
73
+ await ctx.end({
74
+ headers: HTML_HEADERS,
75
+ status: STATUS.ERROR,
76
+ body: e.message ? e.message : "SERVER ERROR"
77
+ });
78
+ break;
79
+ }
80
+ }
81
+ };
82
+ }
@@ -0,0 +1,100 @@
1
+ const {fake, requireMock} = require("@miqro/test");
2
+ const {resolve} = require("path");
3
+ const {strictEqual} = require("assert");
4
+ const {distPath} = require("./setup-test.js");
5
+ const {ForbiddenError, NotFoundError, MethodNotImplementedError, UnAuthorizedError, BadRequestError} = require("../dist");
6
+ const {ParseOptionsError} = require("@miqro/parser");
7
+
8
+ const testFilePath = resolve(distPath, "app-utils.js");
9
+
10
+ describe("app-utils unit tests", () => {
11
+ describe("defaultAppErrorHandler", () => {
12
+ [{err: new Error("some error")}, {err: undefined}, {err: null}, {err: false}, {err: ""}, {err: true}].forEach(({err}) => {
13
+ [{env: "test"}, {env: "development"}, {env: "OTHER"}].forEach(({env}) => {
14
+ describe("NODE_ENV=" + env, () => {
15
+ const oldNODE_ENV = process.env.NODE_ENV;
16
+
17
+ before(() => {
18
+ process.env.NODE_ENV = env;
19
+ });
20
+ after(() => {
21
+ process.env.NODE_ENV = oldNODE_ENV;
22
+ });
23
+
24
+ it("error is " + err + " ends only on test and development", async () => {
25
+ const context = {
26
+ headersSent: false,
27
+ logger: {
28
+ error: fake(() => {
29
+
30
+ })
31
+ },
32
+ end: fake(() => {
33
+ if (context.headersSent) {
34
+ throw new Error("double end");
35
+ }
36
+ context.headersSent = true;
37
+ })
38
+ };
39
+ const {defaultAppErrorHandler} = requireMock(testFilePath, {
40
+ "./common": {},
41
+ }, distPath);
42
+ const handler = defaultAppErrorHandler();
43
+ await handler(err, context);
44
+ if (env === "OTHER") {
45
+ strictEqual(context.end.callCount, 0);
46
+ strictEqual(context.logger.error.callCount, 1);
47
+ strictEqual(context.logger.error.callArgs[0][0], err);
48
+ } else {
49
+ strictEqual(context.end.callCount, 1);
50
+ strictEqual(context.end.callArgs[0][0].status, 503);
51
+ strictEqual(context.end.callArgs[0][0].headers["Content-Type"], "text/html; charset=utf-8");
52
+ strictEqual(context.end.callArgs[0][0].body.indexOf("You are seeing this message") !== -1, true);
53
+ strictEqual(context.logger.error.callCount, 1);
54
+ strictEqual(context.logger.error.callArgs[0][0], err);
55
+ }
56
+ });
57
+ });
58
+ });
59
+ });
60
+ [
61
+ {err: {name: "ConfigFileNotFoundError"}, res: {status: 503}},
62
+ {err: {name: "SequelizeUniqueConstraintError"}, res: {status: 400}},
63
+ {err: {name: "SequelizeEagerLoadingError"}, res: {status: 400}},
64
+ {err: {name: "SequelizeValidationError"}, res: {status: 400}},
65
+ {err: new ParseOptionsError(), res: {status: 400}},
66
+ {err: new BadRequestError(), res: {status: 400}},
67
+ {err: new UnAuthorizedError(), res: {status: 401}},
68
+ {err: new ForbiddenError(), res: {status: 403}},
69
+ {err: new MethodNotImplementedError(), res: {status: 501}},
70
+ {err: new NotFoundError(), res: {status: 404}}
71
+ ].forEach(({err, res}) => {
72
+ it("error is " + err.name + " sends " + res.status, async () => {
73
+ const context = {
74
+ headersSent: false,
75
+ logger: {
76
+ error: fake(() => {
77
+
78
+ })
79
+ },
80
+ end: fake(() => {
81
+ if (context.headersSent) {
82
+ throw new Error("double end");
83
+ }
84
+ context.headersSent = true;
85
+ })
86
+ };
87
+ const {defaultAppErrorHandler} = requireMock(testFilePath, {
88
+ "./common": {},
89
+ }, distPath);
90
+ const handler = defaultAppErrorHandler();
91
+ await handler(err, context);
92
+ strictEqual(context.end.callCount, 1);
93
+ strictEqual(context.end.callArgs[0][0].status, res.status);
94
+ strictEqual(context.end.callArgs[0][0].headers["Content-Type"], "text/html; charset=utf-8");
95
+ strictEqual(context.logger.error.callCount, 1);
96
+ strictEqual(context.logger.error.callArgs[0][0], err);
97
+ });
98
+ })
99
+ });
100
+ });
package/src/app.ts CHANGED
@@ -1,14 +1,15 @@
1
1
  import {createServer, RequestListener, Server} from "http";
2
2
  import {v4} from "uuid";
3
- import {Context, defaultLoggerFactory, ErrorHandler} from "./common";
3
+ import {Context, defaultLoggerFactory} from "./common";
4
4
  import {Router, RouterOptions} from "./router";
5
+ import {defaultAppErrorHandler, HTML_HEADERS, STATUS} from "./app-utils";
5
6
 
6
7
  export class App extends Router {
7
8
  public readonly listener: RequestListener;
8
9
 
9
10
  constructor(config?: RouterOptions) {
10
11
  super(config);
11
- const errorHandler = DefaultErrorHandler();
12
+ const errorHandler = defaultAppErrorHandler();
12
13
  const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : defaultLoggerFactory;
13
14
  this.listener = async (req, res) => {
14
15
  const uuid = v4().toString();
@@ -31,7 +32,7 @@ export class App extends Router {
31
32
  if (!ctx.res.headersSent) {
32
33
  ctx.logger.error(e);
33
34
  await ctx.end({
34
- headers: TEXT_HEADERS,
35
+ headers: HTML_HEADERS,
35
36
  status: STATUS.ERROR,
36
37
  body: "SERVER ERROR"
37
38
  });
@@ -48,89 +49,3 @@ export class App extends Router {
48
49
  return createServer(this.listener).listen(...args)
49
50
  }
50
51
  }
51
-
52
- const TEXT_HEADERS = {
53
- ["Content-Type"]: "plain/text; charset=utf-8"
54
- }
55
-
56
- const HTML_HEADERS = {
57
- ["Content-Type"]: "text/html; charset=utf-8"
58
- }
59
-
60
- const STATUS = {
61
- ERROR: 503,
62
- BAD_REQUEST: 400,
63
- NOT_FOUND: 404,
64
- NOT_IMPLEMENTED: 501,
65
- FORBIDDEN: 403,
66
- UNAUTHORIZED: 401,
67
- };
68
-
69
- const DefaultErrorHandler = (): ErrorHandler<boolean> => {
70
- return async (e: any, ctx: Context): Promise<boolean> => {
71
- if (!e || !e.name || e.name === "Error") {
72
- if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
73
- ctx.logger.error(e);
74
- await ctx.end({
75
- headers: TEXT_HEADERS,
76
- status: STATUS.ERROR,
77
- body: `${e && e.message ? e.message : String(e)}. You are seeing this message because NODE_ENV === "development" || NODE_ENV === "test"${e && e.stack ? ` ${e.stack}` : ""}`
78
- });
79
- return false;
80
- }
81
- } else {
82
- ctx.logger.error(e);
83
- const name = e && e.name ? e.name : undefined;
84
- switch (name) {
85
- case "NotFoundError":
86
- await ctx.end({
87
- headers: HTML_HEADERS,
88
- status: STATUS.NOT_FOUND,
89
- body: e.message ? e.message : "NOT FOUND"
90
- });
91
- break;
92
- case "MethodNotImplementedError":
93
- await ctx.end({
94
- headers: HTML_HEADERS,
95
- status: STATUS.NOT_IMPLEMENTED,
96
- body: e.message ? e.message : "NOT IMPLEMENTED"
97
- });
98
- break;
99
- case "ForbiddenError":
100
- await ctx.end({
101
- headers: HTML_HEADERS,
102
- status: STATUS.FORBIDDEN,
103
- body: e.message ? e.message : "FORBIDDEN"
104
- });
105
- break;
106
- case "UnAuthorizedError":
107
- await ctx.end({
108
- headers: HTML_HEADERS,
109
- status: STATUS.UNAUTHORIZED,
110
- body: e.message ? e.message : "UNAUTHORIZED"
111
- });
112
- break;
113
- case "ParseOptionsError":
114
- case "BadRequestError":
115
- case "SequelizeValidationError":
116
- case "SequelizeEagerLoadingError":
117
- case "SequelizeUniqueConstraintError":
118
- await ctx.end({
119
- headers: HTML_HEADERS,
120
- status: STATUS.BAD_REQUEST,
121
- body: e.message ? e.message : "BAD REQUEST"
122
- });
123
- break;
124
- default:
125
- await ctx.end({
126
- headers: HTML_HEADERS,
127
- status: STATUS.ERROR,
128
- body: e.message ? e.message : "SERVER ERROR"
129
- });
130
- break;
131
- }
132
- return false;
133
- }
134
- return true;
135
- };
136
- };