@miqro/core 3.0.0 → 3.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/build/cjs/common/context.d.ts +1 -1
- package/build/cjs/common/context.js +3 -3
- package/build/cjs/common/context.js.map +1 -1
- package/build/cjs/common/index.d.ts +1 -1
- package/build/cjs/common/index.js +2 -1
- package/build/cjs/common/index.js.map +1 -1
- package/build/cjs/common/logger/constants.js +2 -2
- package/build/cjs/common/logger/constants.js.map +1 -1
- package/build/cjs/common/logger/transport/console.d.ts +1 -1
- package/build/cjs/common/logger/transport/console.js +3 -3
- package/build/cjs/common/logger/transport/console.js.map +1 -1
- package/build/cjs/common/logger/transport/file.d.ts +1 -1
- package/build/cjs/common/logger/transport/file.js +3 -3
- package/build/cjs/common/logger/transport/file.js.map +1 -1
- package/build/cjs/common/router-default-logger-factory.js +3 -1
- package/build/cjs/common/router-default-logger-factory.js.map +1 -1
- package/build/cjs/common/url-utils.d.ts +0 -1
- package/build/cjs/common/url-utils.js +8 -7
- package/build/cjs/common/url-utils.js.map +1 -1
- package/build/esm/common/context.d.ts +1 -1
- package/build/esm/common/context.js +2 -2
- package/build/esm/common/context.js.map +1 -1
- package/build/esm/common/index.d.ts +1 -1
- package/build/esm/common/index.js +1 -1
- package/build/esm/common/index.js.map +1 -1
- package/build/esm/common/logger/constants.js +4 -4
- package/build/esm/common/logger/constants.js.map +1 -1
- package/build/esm/common/logger/transport/console.d.ts +1 -1
- package/build/esm/common/logger/transport/console.js +1 -1
- package/build/esm/common/logger/transport/console.js.map +1 -1
- package/build/esm/common/logger/transport/file.d.ts +1 -1
- package/build/esm/common/logger/transport/file.js +1 -1
- package/build/esm/common/logger/transport/file.js.map +1 -1
- package/build/esm/common/router-default-logger-factory.js +3 -1
- package/build/esm/common/router-default-logger-factory.js.map +1 -1
- package/build/esm/common/url-utils.d.ts +0 -1
- package/build/esm/common/url-utils.js +8 -7
- package/build/esm/common/url-utils.js.map +1 -1
- package/package.json +1 -1
- package/src/common/context.ts +3 -2
- package/src/common/index.ts +1 -1
- package/src/common/logger/constants.ts +4 -4
- package/src/common/logger/transport/console.ts +1 -1
- package/src/common/logger/transport/file.ts +1 -1
- package/src/common/router-default-logger-factory.ts +3 -1
- package/src/common/url-utils.ts +8 -9
package/README.md
CHANGED
|
@@ -185,8 +185,9 @@ to load the routes
|
|
|
185
185
|
|
|
186
186
|
```typescript
|
|
187
187
|
import {APIRouter} from "@miqro/core";
|
|
188
|
+
import {resolve} from "path";
|
|
188
189
|
|
|
189
|
-
const api = APIRouter({ dirname: resolve(
|
|
190
|
+
const api = await APIRouter({ dirname: resolve("api") });
|
|
190
191
|
|
|
191
192
|
app.use(api);
|
|
192
193
|
```
|
|
@@ -6,7 +6,6 @@ import { Session } from "./session";
|
|
|
6
6
|
import { IncomingHttpHeaders, IncomingMessage, OutgoingHttpHeaders, ServerResponse } from "http";
|
|
7
7
|
import { CookieSerializeOptions } from "cookie";
|
|
8
8
|
export type Method = "get" | "post" | "put" | "delete" | "patch" | "options" | "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS";
|
|
9
|
-
export declare const IGNORE_HEADER: string[];
|
|
10
9
|
export interface HandlerResponse {
|
|
11
10
|
status?: number;
|
|
12
11
|
headers?: OutgoingHttpHeaders;
|
|
@@ -19,6 +18,7 @@ export declare class Context {
|
|
|
19
18
|
readonly req: IncomingMessage;
|
|
20
19
|
readonly res: ServerResponse;
|
|
21
20
|
readonly logger: Logger;
|
|
21
|
+
static IGNORE_HEADER: string[];
|
|
22
22
|
readonly startMS: number;
|
|
23
23
|
session?: Session;
|
|
24
24
|
results: any[];
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Context =
|
|
3
|
+
exports.Context = void 0;
|
|
4
4
|
const url_utils_js_1 = require("./url-utils.js");
|
|
5
5
|
const cookie_1 = require("cookie");
|
|
6
|
-
exports.IGNORE_HEADER = ["keep-alive", "connection"];
|
|
7
6
|
class Context {
|
|
8
7
|
constructor(uuid, req, res, logger) {
|
|
9
8
|
this.uuid = uuid;
|
|
@@ -76,7 +75,7 @@ class Context {
|
|
|
76
75
|
this.res.statusCode = status !== undefined ? status : 200;
|
|
77
76
|
const keys = Object.keys(headers);
|
|
78
77
|
for (const key of keys) {
|
|
79
|
-
if (
|
|
78
|
+
if (Context.IGNORE_HEADER.indexOf(key.toLocaleLowerCase()) !== -1) {
|
|
80
79
|
this.logger.warn("ignoring " + key);
|
|
81
80
|
continue;
|
|
82
81
|
}
|
|
@@ -138,4 +137,5 @@ class Context {
|
|
|
138
137
|
}
|
|
139
138
|
}
|
|
140
139
|
exports.Context = Context;
|
|
140
|
+
Context.IGNORE_HEADER = ["keep-alive", "connection"];
|
|
141
141
|
//# sourceMappingURL=context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/common/context.ts"],"names":[],"mappings":";;;AAIA,iDAA0E;AAC1E,mCAA2D;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/common/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,6 @@ export * from "./session";
|
|
|
6
6
|
export * from "./error";
|
|
7
7
|
export * from "./config";
|
|
8
8
|
export * from "./logger";
|
|
9
|
-
export { normalizePath } from "./url-utils";
|
|
9
|
+
export { normalizePath, newURL } from "./url-utils";
|
|
10
10
|
export { traverseAPIRouteDir, APIRouteValidator } from "./api-router-utils";
|
|
11
11
|
export { OldResponseHandler, ResponseHandler } from "./router-utils";
|
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.ResponseHandler = exports.OldResponseHandler = exports.APIRouteValidator = exports.traverseAPIRouteDir = exports.normalizePath = void 0;
|
|
17
|
+
exports.ResponseHandler = exports.OldResponseHandler = exports.APIRouteValidator = exports.traverseAPIRouteDir = exports.newURL = exports.normalizePath = void 0;
|
|
18
18
|
__exportStar(require("./context"), exports);
|
|
19
19
|
__exportStar(require("./router-default-logger-factory"), exports);
|
|
20
20
|
__exportStar(require("./api-router-types"), exports);
|
|
@@ -25,6 +25,7 @@ __exportStar(require("./config"), exports);
|
|
|
25
25
|
__exportStar(require("./logger"), exports);
|
|
26
26
|
var url_utils_1 = require("./url-utils");
|
|
27
27
|
Object.defineProperty(exports, "normalizePath", { enumerable: true, get: function () { return url_utils_1.normalizePath; } });
|
|
28
|
+
Object.defineProperty(exports, "newURL", { enumerable: true, get: function () { return url_utils_1.newURL; } });
|
|
28
29
|
var api_router_utils_1 = require("./api-router-utils");
|
|
29
30
|
Object.defineProperty(exports, "traverseAPIRouteDir", { enumerable: true, get: function () { return api_router_utils_1.traverseAPIRouteDir; } });
|
|
30
31
|
Object.defineProperty(exports, "APIRouteValidator", { enumerable: true, get: function () { return api_router_utils_1.APIRouteValidator; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,kEAAgD;AAChD,qDAAmC;AACnC,iDAA+B;AAC/B,4CAA0B;AAC1B,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,kEAAgD;AAChD,qDAAmC;AACnC,iDAA+B;AAC/B,4CAA0B;AAC1B,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,yCAAoD;AAA3C,0GAAA,aAAa,OAAA;AAAE,mGAAA,MAAM,OAAA;AAC9B,uDAA4E;AAAnE,uHAAA,mBAAmB,OAAA;AAAE,qHAAA,iBAAiB,OAAA;AAC/C,+CAAqE;AAA5D,kHAAA,kBAAkB,OAAA;AAAE,+GAAA,eAAe,OAAA"}
|
|
@@ -4,8 +4,8 @@ exports.LoggerEvents = exports.LOG_LEVEL_MAP = exports.DEFAULT_LOGGER_FORMATTER
|
|
|
4
4
|
const file_js_1 = require("./transport/file.js");
|
|
5
5
|
const console_js_1 = require("./transport/console.js");
|
|
6
6
|
const DEFAULT_LOGGER_TRANSPORTS = () => [
|
|
7
|
-
(0, console_js_1.
|
|
8
|
-
(0, file_js_1.
|
|
7
|
+
(0, console_js_1.ConsoleTransport)(),
|
|
8
|
+
(0, file_js_1.FileTransport)()
|
|
9
9
|
];
|
|
10
10
|
exports.DEFAULT_LOGGER_TRANSPORTS = DEFAULT_LOGGER_TRANSPORTS;
|
|
11
11
|
const DEFAULT_LOGGER_FORMATTER = ({ identifier, level, message }) => `${new Date().toISOString()} ${process.pid} ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/common/logger/constants.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/common/logger/constants.ts"],"names":[],"mappings":";;;AACA,iDAAkD;AAClD,uDAAwD;AAEjD,MAAM,yBAAyB,GAA4B,GAAG,EAAE,CAAC;IACtE,IAAA,6BAAgB,GAAE;IAClB,IAAA,uBAAa,GAAE;CAChB,CAAC;AAHW,QAAA,yBAAyB,6BAGpC;AAEK,MAAM,wBAAwB,GACnC,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,GAAG,GAAG;IAC7E,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;IACzC,GAAG,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;IAClH,GAAG,OAAO,EAAE,CAAC;AAJJ,QAAA,wBAAwB,4BAIpB;AAEJ,QAAA,aAAa,GACxB;IACE,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,CAAC;CACX,CAAC;AAES,QAAA,YAAY,GAAG;IAC1B,KAAK,EAAE,OAAO;CACf,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { LoggerTransportWriteArgs, LogLevel } from "../interfaces.js";
|
|
2
|
-
export declare function
|
|
2
|
+
export declare function ConsoleTransport(color?: boolean, level?: LogLevel): {
|
|
3
3
|
level: LogLevel | undefined;
|
|
4
4
|
write: ({ level, out }: LoggerTransportWriteArgs) => Promise<void>;
|
|
5
5
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
function
|
|
3
|
+
exports.ConsoleTransport = void 0;
|
|
4
|
+
function ConsoleTransport(color = true, level) {
|
|
5
5
|
return {
|
|
6
6
|
level,
|
|
7
7
|
write: async ({ level, out }) => {
|
|
@@ -35,5 +35,5 @@ function Console(color = true, level) {
|
|
|
35
35
|
}
|
|
36
36
|
};
|
|
37
37
|
}
|
|
38
|
-
exports.
|
|
38
|
+
exports.ConsoleTransport = ConsoleTransport;
|
|
39
39
|
//# sourceMappingURL=console.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/console.ts"],"names":[],"mappings":";;;AAEA,SAAgB,
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/console.ts"],"names":[],"mappings":";;;AAEA,SAAgB,gBAAgB,CAAC,QAAiB,IAAI,EAAE,KAAgB;IACtE,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,4CA+BC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { LoggerTransport, LogLevel } from "../interfaces.js";
|
|
2
|
-
export declare const
|
|
2
|
+
export declare const FileTransport: (filePath?: string | null, level?: LogLevel) => LoggerTransport;
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.FileTransport = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const FILE_TRANSPORT_ENVVAR = "LOG_FILE";
|
|
7
|
-
const
|
|
7
|
+
const FileTransport = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_TRANSPORT_ENVVAR] : null, level) => {
|
|
8
8
|
const fileHandler = filePath ? (0, fs_1.createWriteStream)((0, path_1.resolve)(filePath), { flags: "a" }) : null;
|
|
9
9
|
return {
|
|
10
10
|
level,
|
|
@@ -25,5 +25,5 @@ const File = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_T
|
|
|
25
25
|
}
|
|
26
26
|
};
|
|
27
27
|
};
|
|
28
|
-
exports.
|
|
28
|
+
exports.FileTransport = FileTransport;
|
|
29
29
|
//# sourceMappingURL=file.js.map
|
|
@@ -1 +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,
|
|
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,aAAa,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;IAC5M,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,aAAa,iBAmBxB"}
|
|
@@ -5,11 +5,13 @@ const url_utils_1 = require("./url-utils");
|
|
|
5
5
|
const logger_1 = require("./logger");
|
|
6
6
|
const defaultLoggerFactory = (uuid, req) => {
|
|
7
7
|
let path = "";
|
|
8
|
+
let query = "";
|
|
8
9
|
let urlParsingError;
|
|
9
10
|
let method = "GET";
|
|
10
11
|
let remoteAddress = "";
|
|
11
12
|
try {
|
|
12
13
|
const url = (0, url_utils_1.newURL)(req.url ? req.url : "/");
|
|
14
|
+
query = url.searchParams.toString();
|
|
13
15
|
path = (0, url_utils_1.normalizePath)(url.pathname); // normalized path
|
|
14
16
|
method = req.method ? req.method.toUpperCase() : "GET";
|
|
15
17
|
remoteAddress = req.socket.remoteAddress;
|
|
@@ -21,7 +23,7 @@ const defaultLoggerFactory = (uuid, req) => {
|
|
|
21
23
|
const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
|
|
22
24
|
const logger = (0, logger_1.getLogger)(identifier, {
|
|
23
25
|
formatter: (args) => {
|
|
24
|
-
args.message = `${method} ${path}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
|
|
26
|
+
args.message = `${method} ${path}${query ? `?${query}` : ""}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
|
|
25
27
|
return (0, logger_1.DEFAULT_LOGGER_FORMATTER)(args);
|
|
26
28
|
}
|
|
27
29
|
}, false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-default-logger-factory.js","sourceRoot":"","sources":["../../../src/common/router-default-logger-factory.ts"],"names":[],"mappings":";;;AAEA,2CAAoD;AACpD,qCAAuE;AAEhE,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAE,GAAoB,EAAU,EAAE;IACjF,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,eAAe,CAAC;IACpB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,aAAa,GAAuB,EAAE,CAAC;IAC3C,IAAI;QACF,MAAM,GAAG,GAAG,IAAA,kBAAM,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAQ,CAAC;QACnD,IAAI,GAAG,IAAA,yBAAa,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;QACtD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,KAAK,CAAC;QACjE,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;KAC1C;IAAC,OAAO,CAAC,EAAE;QACV,eAAe,GAAG,CAAC,CAAC;KACrB;IACD,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;IAE/F,MAAM,MAAM,GAAG,IAAA,kBAAS,EAAC,UAAU,EAAE;QACnC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,GAAG,MAAM,IAAI,IAAI,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;
|
|
1
|
+
{"version":3,"file":"router-default-logger-factory.js","sourceRoot":"","sources":["../../../src/common/router-default-logger-factory.ts"],"names":[],"mappings":";;;AAEA,2CAAoD;AACpD,qCAAuE;AAEhE,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAE,GAAoB,EAAU,EAAE;IACjF,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,eAAe,CAAC;IACpB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,aAAa,GAAuB,EAAE,CAAC;IAC3C,IAAI;QACF,MAAM,GAAG,GAAG,IAAA,kBAAM,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAQ,CAAC;QACnD,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QACpC,IAAI,GAAG,IAAA,yBAAa,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;QACtD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,KAAK,CAAC;QACjE,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;KAC1C;IAAC,OAAO,CAAC,EAAE;QACV,eAAe,GAAG,CAAC,CAAC;KACrB;IACD,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;IAE/F,MAAM,MAAM,GAAG,IAAA,kBAAS,EAAC,UAAU,EAAE;QACnC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,GAAG,MAAM,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,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;YACtJ,OAAO,IAAA,iCAAwB,EAAC,IAAI,CAAC,CAAC;QACxC,CAAC;KACF,EAAE,KAAK,CAAC,CAAC;IAEV,IAAI,eAAe,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;KAC/B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA;AA9BY,QAAA,oBAAoB,wBA8BhC"}
|
|
@@ -3,17 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.parseSearchParams = exports.normalizePath = exports.newURL = void 0;
|
|
4
4
|
const newURL = (input) => {
|
|
5
5
|
/*
|
|
6
|
-
|
|
6
|
+
remove /+ at the start of the input before using new URL ( it changes the host )
|
|
7
7
|
*/
|
|
8
|
-
let
|
|
9
|
-
for (
|
|
10
|
-
|
|
11
|
-
if (c !== "/") {
|
|
12
|
-
isOnlyTrailing = false;
|
|
8
|
+
let slashIndex = 0;
|
|
9
|
+
for (slashIndex = 0; slashIndex < input.length; slashIndex++) {
|
|
10
|
+
if (input.charAt(slashIndex) !== "/") {
|
|
13
11
|
break;
|
|
14
12
|
}
|
|
15
13
|
}
|
|
16
|
-
const
|
|
14
|
+
const removedSlashes = input.substring(0, slashIndex - 1);
|
|
15
|
+
const ret = new URL(input.substring(slashIndex), "http://localhost");
|
|
16
|
+
// restore path
|
|
17
|
+
ret.pathname = `${slashIndex > 0 ? removedSlashes : ""}${ret.pathname}`;
|
|
17
18
|
return ret;
|
|
18
19
|
};
|
|
19
20
|
exports.newURL = newURL;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url-utils.js","sourceRoot":"","sources":["../../../src/common/url-utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"url-utils.js","sourceRoot":"","sources":["../../../src/common/url-utils.ts"],"names":[],"mappings":";;;AAAO,MAAM,MAAM,GAAG,CAAC,KAAa,EAAO,EAAE;IAC3C;;MAEE;IACF,IAAI,UAAU,GAAG,CAAC,CAAA;IAClB,KAAK,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE;QAC5D,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,GAAG,EAAE;YACpC,MAAM;SACP;KACF;IACD,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACrE,eAAe;IACf,GAAG,CAAC,QAAQ,GAAG,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IACxE,OAAO,GAAG,CAAC;AACb,CAAC,CAAA;AAfY,QAAA,MAAM,UAelB;AAED,iCAAiC;AACjC,2EAA2E;AAC3E,SAAgB,aAAa,CAAC,IAAY;IACxC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;KACpC;IACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;YACjC,OAAO,GAAG,IAAI,GAAG,CAAC;SACnB;aAAM;YACL,OAAO,IAAI,CAAC,CAAC,qBAAqB;SACnC;KACF;SAAM,IAAI,IAAI,KAAK,GAAG,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;SAAM;QACL,OAAO,IAAI,CAAC,CAAC,MAAM;KACpB;AACH,CAAC;AAlBD,sCAkBC;AAED,SAAgB,iBAAiB,CAAC,MAAuB;IACvD,MAAM,KAAK,GAA0C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,GAAW,EAAE,EAAE;QAC5C,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAE,KAAK,CAAC,GAAG,CAAc,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAW,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3I,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAND,8CAMC"}
|
|
@@ -6,7 +6,6 @@ import { Session } from "./session";
|
|
|
6
6
|
import { IncomingHttpHeaders, IncomingMessage, OutgoingHttpHeaders, ServerResponse } from "http";
|
|
7
7
|
import { CookieSerializeOptions } from "cookie";
|
|
8
8
|
export type Method = "get" | "post" | "put" | "delete" | "patch" | "options" | "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS";
|
|
9
|
-
export declare const IGNORE_HEADER: string[];
|
|
10
9
|
export interface HandlerResponse {
|
|
11
10
|
status?: number;
|
|
12
11
|
headers?: OutgoingHttpHeaders;
|
|
@@ -19,6 +18,7 @@ export declare class Context {
|
|
|
19
18
|
readonly req: IncomingMessage;
|
|
20
19
|
readonly res: ServerResponse;
|
|
21
20
|
readonly logger: Logger;
|
|
21
|
+
static IGNORE_HEADER: string[];
|
|
22
22
|
readonly startMS: number;
|
|
23
23
|
session?: Session;
|
|
24
24
|
results: any[];
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { normalizePath, parseSearchParams, newURL } from "./url-utils.js";
|
|
2
2
|
import { serialize } from "cookie";
|
|
3
|
-
export const IGNORE_HEADER = ["keep-alive", "connection"];
|
|
4
3
|
export class Context {
|
|
5
4
|
constructor(uuid, req, res, logger) {
|
|
6
5
|
this.uuid = uuid;
|
|
@@ -73,7 +72,7 @@ export class Context {
|
|
|
73
72
|
this.res.statusCode = status !== undefined ? status : 200;
|
|
74
73
|
const keys = Object.keys(headers);
|
|
75
74
|
for (const key of keys) {
|
|
76
|
-
if (IGNORE_HEADER.indexOf(key.toLocaleLowerCase()) !== -1) {
|
|
75
|
+
if (Context.IGNORE_HEADER.indexOf(key.toLocaleLowerCase()) !== -1) {
|
|
77
76
|
this.logger.warn("ignoring " + key);
|
|
78
77
|
continue;
|
|
79
78
|
}
|
|
@@ -134,4 +133,5 @@ export class Context {
|
|
|
134
133
|
});
|
|
135
134
|
}
|
|
136
135
|
}
|
|
136
|
+
Context.IGNORE_HEADER = ["keep-alive", "connection"];
|
|
137
137
|
//# sourceMappingURL=context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/common/context.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAA0B,SAAS,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/common/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,6 @@ export * from "./session";
|
|
|
6
6
|
export * from "./error";
|
|
7
7
|
export * from "./config";
|
|
8
8
|
export * from "./logger";
|
|
9
|
-
export { normalizePath } from "./url-utils";
|
|
9
|
+
export { normalizePath, newURL } from "./url-utils";
|
|
10
10
|
export { traverseAPIRouteDir, APIRouteValidator } from "./api-router-utils";
|
|
11
11
|
export { OldResponseHandler, ResponseHandler } from "./router-utils";
|
|
@@ -6,7 +6,7 @@ export * from "./session";
|
|
|
6
6
|
export * from "./error";
|
|
7
7
|
export * from "./config";
|
|
8
8
|
export * from "./logger";
|
|
9
|
-
export { normalizePath } from "./url-utils";
|
|
9
|
+
export { normalizePath, newURL } from "./url-utils";
|
|
10
10
|
export { traverseAPIRouteDir, APIRouteValidator } from "./api-router-utils";
|
|
11
11
|
export { OldResponseHandler, ResponseHandler } from "./router-utils";
|
|
12
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,iCAAiC,CAAC;AAChD,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,iCAAiC,CAAC;AAChD,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { FileTransport } from "./transport/file.js";
|
|
2
|
+
import { ConsoleTransport } from "./transport/console.js";
|
|
3
3
|
export const DEFAULT_LOGGER_TRANSPORTS = () => [
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
ConsoleTransport(),
|
|
5
|
+
FileTransport()
|
|
6
6
|
];
|
|
7
7
|
export const DEFAULT_LOGGER_FORMATTER = ({ identifier, level, message }) => `${new Date().toISOString()} ${process.pid} ` +
|
|
8
8
|
`${identifier ? `[${identifier}] ` : ""}` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/common/logger/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/common/logger/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAExD,MAAM,CAAC,MAAM,yBAAyB,GAA4B,GAAG,EAAE,CAAC;IACtE,gBAAgB,EAAE;IAClB,aAAa,EAAE;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GACnC,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,GAAG,GAAG;IAC7E,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;IACzC,GAAG,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;IAClH,GAAG,OAAO,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,aAAa,GACxB;IACE,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,CAAC;CACX,CAAC;AAEJ,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,KAAK,EAAE,OAAO;CACf,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { LoggerTransportWriteArgs, LogLevel } from "../interfaces.js";
|
|
2
|
-
export declare function
|
|
2
|
+
export declare function ConsoleTransport(color?: boolean, level?: LogLevel): {
|
|
3
3
|
level: LogLevel | undefined;
|
|
4
4
|
write: ({ level, out }: LoggerTransportWriteArgs) => Promise<void>;
|
|
5
5
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/console.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/console.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,gBAAgB,CAAC,QAAiB,IAAI,EAAE,KAAgB;IACtE,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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { LoggerTransport, LogLevel } from "../interfaces.js";
|
|
2
|
-
export declare const
|
|
2
|
+
export declare const FileTransport: (filePath?: string | null, level?: LogLevel) => LoggerTransport;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createWriteStream } from "fs";
|
|
2
2
|
import { resolve } from "path";
|
|
3
3
|
const FILE_TRANSPORT_ENVVAR = "LOG_FILE";
|
|
4
|
-
export const
|
|
4
|
+
export const FileTransport = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_TRANSPORT_ENVVAR] : null, level) => {
|
|
5
5
|
const fileHandler = filePath ? createWriteStream(resolve(filePath), { flags: "a" }) : null;
|
|
6
6
|
return {
|
|
7
7
|
level,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,IAAI,CAAC;AACrC,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAG7B,MAAM,qBAAqB,GAAG,UAAU,CAAC;AAEzC,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,IAAI,CAAC;AACrC,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAG7B,MAAM,qBAAqB,GAAG,UAAU,CAAC;AAEzC,MAAM,CAAC,MAAM,aAAa,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;IAC5M,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,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"}
|
|
@@ -2,11 +2,13 @@ import { newURL, normalizePath } from "./url-utils";
|
|
|
2
2
|
import { DEFAULT_LOGGER_FORMATTER, getLogger } from "./logger";
|
|
3
3
|
export const defaultLoggerFactory = (uuid, req) => {
|
|
4
4
|
let path = "";
|
|
5
|
+
let query = "";
|
|
5
6
|
let urlParsingError;
|
|
6
7
|
let method = "GET";
|
|
7
8
|
let remoteAddress = "";
|
|
8
9
|
try {
|
|
9
10
|
const url = newURL(req.url ? req.url : "/");
|
|
11
|
+
query = url.searchParams.toString();
|
|
10
12
|
path = normalizePath(url.pathname); // normalized path
|
|
11
13
|
method = req.method ? req.method.toUpperCase() : "GET";
|
|
12
14
|
remoteAddress = req.socket.remoteAddress;
|
|
@@ -18,7 +20,7 @@ export const defaultLoggerFactory = (uuid, req) => {
|
|
|
18
20
|
const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
|
|
19
21
|
const logger = getLogger(identifier, {
|
|
20
22
|
formatter: (args) => {
|
|
21
|
-
args.message = `${method} ${path}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
|
|
23
|
+
args.message = `${method} ${path}${query ? `?${query}` : ""}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
|
|
22
24
|
return DEFAULT_LOGGER_FORMATTER(args);
|
|
23
25
|
}
|
|
24
26
|
}, false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-default-logger-factory.js","sourceRoot":"","sources":["../../../src/common/router-default-logger-factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,SAAS,EAAU,MAAM,UAAU,CAAC;AAEvE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAE,GAAoB,EAAU,EAAE;IACjF,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,eAAe,CAAC;IACpB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,aAAa,GAAuB,EAAE,CAAC;IAC3C,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAQ,CAAC;QACnD,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;QACtD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,KAAK,CAAC;QACjE,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;KAC1C;IAAC,OAAO,CAAC,EAAE;QACV,eAAe,GAAG,CAAC,CAAC;KACrB;IACD,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;IAE/F,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,EAAE;QACnC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,GAAG,MAAM,IAAI,IAAI,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;
|
|
1
|
+
{"version":3,"file":"router-default-logger-factory.js","sourceRoot":"","sources":["../../../src/common/router-default-logger-factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,SAAS,EAAU,MAAM,UAAU,CAAC;AAEvE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAE,GAAoB,EAAU,EAAE;IACjF,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,eAAe,CAAC;IACpB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,aAAa,GAAuB,EAAE,CAAC;IAC3C,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAQ,CAAC;QACnD,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QACpC,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;QACtD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,KAAK,CAAC;QACjE,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;KAC1C;IAAC,OAAO,CAAC,EAAE;QACV,eAAe,GAAG,CAAC,CAAC;KACrB;IACD,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;IAE/F,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,EAAE;QACnC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,GAAG,MAAM,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,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;YACtJ,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC;KACF,EAAE,KAAK,CAAC,CAAC;IAEV,IAAI,eAAe,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;KAC/B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
export const newURL = (input) => {
|
|
2
2
|
/*
|
|
3
|
-
|
|
3
|
+
remove /+ at the start of the input before using new URL ( it changes the host )
|
|
4
4
|
*/
|
|
5
|
-
let
|
|
6
|
-
for (
|
|
7
|
-
|
|
8
|
-
if (c !== "/") {
|
|
9
|
-
isOnlyTrailing = false;
|
|
5
|
+
let slashIndex = 0;
|
|
6
|
+
for (slashIndex = 0; slashIndex < input.length; slashIndex++) {
|
|
7
|
+
if (input.charAt(slashIndex) !== "/") {
|
|
10
8
|
break;
|
|
11
9
|
}
|
|
12
10
|
}
|
|
13
|
-
const
|
|
11
|
+
const removedSlashes = input.substring(0, slashIndex - 1);
|
|
12
|
+
const ret = new URL(input.substring(slashIndex), "http://localhost");
|
|
13
|
+
// restore path
|
|
14
|
+
ret.pathname = `${slashIndex > 0 ? removedSlashes : ""}${ret.pathname}`;
|
|
14
15
|
return ret;
|
|
15
16
|
};
|
|
16
17
|
// adds "/" to the final of path
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url-utils.js","sourceRoot":"","sources":["../../../src/common/url-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"url-utils.js","sourceRoot":"","sources":["../../../src/common/url-utils.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAa,EAAO,EAAE;IAC3C;;MAEE;IACF,IAAI,UAAU,GAAG,CAAC,CAAA;IAClB,KAAK,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE;QAC5D,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,GAAG,EAAE;YACpC,MAAM;SACP;KACF;IACD,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACrE,eAAe;IACf,GAAG,CAAC,QAAQ,GAAG,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IACxE,OAAO,GAAG,CAAC;AACb,CAAC,CAAA;AAED,iCAAiC;AACjC,2EAA2E;AAC3E,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;KACpC;IACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;YACjC,OAAO,GAAG,IAAI,GAAG,CAAC;SACnB;aAAM;YACL,OAAO,IAAI,CAAC,CAAC,qBAAqB;SACnC;KACF;SAAM,IAAI,IAAI,KAAK,GAAG,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;SAAM;QACL,OAAO,IAAI,CAAC,CAAC,MAAM;KACpB;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAuB;IACvD,MAAM,KAAK,GAA0C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,GAAW,EAAE,EAAE;QAC5C,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAE,KAAK,CAAC,GAAG,CAAc,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAW,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3I,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/package.json
CHANGED
package/src/common/context.ts
CHANGED
|
@@ -19,7 +19,7 @@ export type Method =
|
|
|
19
19
|
| "PATCH"
|
|
20
20
|
| "OPTIONS";
|
|
21
21
|
|
|
22
|
-
export const IGNORE_HEADER = ["keep-alive", "connection"];
|
|
22
|
+
//export const IGNORE_HEADER = ["keep-alive", "connection"];
|
|
23
23
|
|
|
24
24
|
export interface HandlerResponse {
|
|
25
25
|
status?: number;
|
|
@@ -34,6 +34,7 @@ export type ErrorHandler<T = boolean | void | any> =
|
|
|
34
34
|
| ((e: unknown, ctx: Context) => T);
|
|
35
35
|
|
|
36
36
|
export class Context {
|
|
37
|
+
public static IGNORE_HEADER = ["keep-alive", "connection"];
|
|
37
38
|
//public readonly url: URL; // new URL(req.url ? req.url : "/", `http://${req.headers.host}`)
|
|
38
39
|
public readonly startMS: number; // Date.now()
|
|
39
40
|
public session?: Session; // a middleware will fill this
|
|
@@ -124,7 +125,7 @@ export class Context {
|
|
|
124
125
|
this.res.statusCode = status !== undefined ? status : 200;
|
|
125
126
|
const keys = Object.keys(headers);
|
|
126
127
|
for (const key of keys) {
|
|
127
|
-
if (IGNORE_HEADER.indexOf(key.toLocaleLowerCase()) !== -1) {
|
|
128
|
+
if (Context.IGNORE_HEADER.indexOf(key.toLocaleLowerCase()) !== -1) {
|
|
128
129
|
this.logger.warn("ignoring " + key);
|
|
129
130
|
continue;
|
|
130
131
|
}
|
package/src/common/index.ts
CHANGED
|
@@ -6,6 +6,6 @@ export * from "./session";
|
|
|
6
6
|
export * from "./error";
|
|
7
7
|
export * from "./config";
|
|
8
8
|
export * from "./logger";
|
|
9
|
-
export { normalizePath } from "./url-utils";
|
|
9
|
+
export { normalizePath, newURL } from "./url-utils";
|
|
10
10
|
export { traverseAPIRouteDir, APIRouteValidator } from "./api-router-utils";
|
|
11
11
|
export { OldResponseHandler, ResponseHandler } from "./router-utils";
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import {LoggerFormatter, LoggerTransport} from "./interfaces.js";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import {FileTransport} from "./transport/file.js";
|
|
3
|
+
import {ConsoleTransport} from "./transport/console.js";
|
|
4
4
|
|
|
5
5
|
export const DEFAULT_LOGGER_TRANSPORTS: () => LoggerTransport[] = () => [
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
ConsoleTransport(),
|
|
7
|
+
FileTransport()
|
|
8
8
|
];
|
|
9
9
|
|
|
10
10
|
export const DEFAULT_LOGGER_FORMATTER: LoggerFormatter =
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {LoggerTransportWriteArgs, LogLevel} from "../interfaces.js";
|
|
2
2
|
|
|
3
|
-
export function
|
|
3
|
+
export function ConsoleTransport(color: boolean = true, level?: LogLevel) {
|
|
4
4
|
return {
|
|
5
5
|
level,
|
|
6
6
|
write: async ({level, out}: LoggerTransportWriteArgs): Promise<void> => {
|
|
@@ -4,7 +4,7 @@ import {LoggerTransport, LoggerTransportWriteArgs, LogLevel} from "../interfaces
|
|
|
4
4
|
|
|
5
5
|
const FILE_TRANSPORT_ENVVAR = "LOG_FILE";
|
|
6
6
|
|
|
7
|
-
export const
|
|
7
|
+
export const FileTransport: (filePath?: string | null, level?: LogLevel) => LoggerTransport = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_TRANSPORT_ENVVAR] : null, level?: LogLevel) => {
|
|
8
8
|
const fileHandler = filePath ? createWriteStream(resolve(filePath), {flags: "a"}) : null;
|
|
9
9
|
return {
|
|
10
10
|
level,
|
|
@@ -5,11 +5,13 @@ import { DEFAULT_LOGGER_FORMATTER, getLogger, Logger } from "./logger";
|
|
|
5
5
|
|
|
6
6
|
export const defaultLoggerFactory = (uuid: string, req: IncomingMessage): Logger => {
|
|
7
7
|
let path = "";
|
|
8
|
+
let query = "";
|
|
8
9
|
let urlParsingError;
|
|
9
10
|
let method = "GET";
|
|
10
11
|
let remoteAddress: string | undefined = "";
|
|
11
12
|
try {
|
|
12
13
|
const url = newURL(req.url ? req.url : "/") as URL;
|
|
14
|
+
query = url.searchParams.toString();
|
|
13
15
|
path = normalizePath(url.pathname); // normalized path
|
|
14
16
|
method = req.method ? req.method.toUpperCase() as string : "GET";
|
|
15
17
|
remoteAddress = req.socket.remoteAddress;
|
|
@@ -21,7 +23,7 @@ export const defaultLoggerFactory = (uuid: string, req: IncomingMessage): Logger
|
|
|
21
23
|
|
|
22
24
|
const logger = getLogger(identifier, {
|
|
23
25
|
formatter: (args) => {
|
|
24
|
-
args.message = `${method} ${path}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
|
|
26
|
+
args.message = `${method} ${path}${query ? `?${query}` : ""}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
|
|
25
27
|
return DEFAULT_LOGGER_FORMATTER(args);
|
|
26
28
|
}
|
|
27
29
|
}, false);
|
package/src/common/url-utils.ts
CHANGED
|
@@ -1,18 +1,17 @@
|
|
|
1
|
-
import {URLSearchParams} from "url";
|
|
2
|
-
|
|
3
1
|
export const newURL = (input: string): URL => {
|
|
4
2
|
/*
|
|
5
|
-
|
|
3
|
+
remove /+ at the start of the input before using new URL ( it changes the host )
|
|
6
4
|
*/
|
|
7
|
-
let
|
|
8
|
-
for(
|
|
9
|
-
|
|
10
|
-
if(c !== "/") {
|
|
11
|
-
isOnlyTrailing = false;
|
|
5
|
+
let slashIndex = 0
|
|
6
|
+
for (slashIndex = 0; slashIndex < input.length; slashIndex++) {
|
|
7
|
+
if (input.charAt(slashIndex) !== "/") {
|
|
12
8
|
break;
|
|
13
9
|
}
|
|
14
10
|
}
|
|
15
|
-
const
|
|
11
|
+
const removedSlashes = input.substring(0, slashIndex - 1);
|
|
12
|
+
const ret = new URL(input.substring(slashIndex), "http://localhost");
|
|
13
|
+
// restore path
|
|
14
|
+
ret.pathname = `${slashIndex > 0 ? removedSlashes : ""}${ret.pathname}`;
|
|
16
15
|
return ret;
|
|
17
16
|
}
|
|
18
17
|
|