tabletcommand-logger 2.2.0 → 2.2.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.
- package/build/middleware/logger.js +5 -1
- package/build/middleware/logger.js.map +1 -1
- package/build/middleware/status-logger.js +1 -1
- package/build/middleware/status-logger.js.map +1 -1
- package/build/test/middleware-metrics.js +1 -1
- package/build/test/middleware-metrics.js.map +1 -1
- package/cspell.json +3 -2
- package/definitions/middleware/logger.d.ts +1 -1
- package/definitions/middleware/logger.d.ts.map +1 -1
- package/definitions/middleware/status-logger.d.ts +1 -1
- package/definitions/middleware/status-logger.d.ts.map +1 -1
- package/package.json +10 -9
- package/src/middleware/logger.ts +6 -2
- package/src/middleware/status-logger.ts +2 -2
- package/src/test/middleware-metrics.ts +1 -1
|
@@ -5,6 +5,10 @@ function loggerMiddleware(logger) {
|
|
|
5
5
|
// This doesn't fire the log immediately, but waits until the response is finished
|
|
6
6
|
// This means we have a chance of logging the response code
|
|
7
7
|
res.on("finish", () => {
|
|
8
|
+
// Skip this if no logger is set
|
|
9
|
+
if (!logger) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
8
12
|
logger.info({
|
|
9
13
|
remoteAddress: req.ip,
|
|
10
14
|
method: req.method,
|
|
@@ -23,7 +27,7 @@ function loggerMiddleware(logger) {
|
|
|
23
27
|
status: res.statusCode ? res.statusCode : 0
|
|
24
28
|
}, "access_log");
|
|
25
29
|
});
|
|
26
|
-
next();
|
|
30
|
+
return next();
|
|
27
31
|
};
|
|
28
32
|
}
|
|
29
33
|
exports.default = loggerMiddleware;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":";;AAOA,SAAwB,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":";;AAOA,SAAwB,gBAAgB,CAAC,MAAe;IACtD,OAAO,SAAS,mBAAmB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACjF,kFAAkF;QAClF,2DAA2D;QAC3D,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACpB,gCAAgC;YAChC,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO;aACR;YACD,MAAM,CAAC,IAAI,CAAC;gBACV,aAAa,EAAE,GAAG,CAAC,EAAE;gBACrB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,GAAG,EAAE,GAAG,CAAC,WAAW;gBACpB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,WAAW,EAAE,GAAG,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,gBAAgB,EAAE;gBAC9D,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;gBACpC,yBAAyB;gBACzB,GAAG,EAAE;oBACH,IAAI,EAAE,GAAG,CAAC,IAAe;oBACzB,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,WAAW,EAAE,GAAG,CAAC,WAAW;iBAC7B;gBACD,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;aAC5C,EAAE,YAAY,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AA7BD,mCA6BC"}
|
|
@@ -48,7 +48,7 @@ function statusLogger(logger) {
|
|
|
48
48
|
function logRequest() {
|
|
49
49
|
res.removeListener("finish", logRequest);
|
|
50
50
|
res.removeListener("close", logRequest);
|
|
51
|
-
if (shouldIgnore(req, res)) {
|
|
51
|
+
if (shouldIgnore(req, res) || !logger) {
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
54
|
const cleanReq = lodash_1.default.pick(req, [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":";;;;;AAMA,oDAAuB;AAEvB,SAAS,YAAY,CAAC,GAAY,EAAE,GAAa;IAC/C,IAAI,gBAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;QAC7C,OAAO,IAAI,CAAC;KACb;IAED,MAAM,SAAS,GAAY,gBAAC,CAAC,GAAG,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAC;IAC5D,IAAI,gBAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QACvD,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,eAAe,CAAC,OAAa,EAAE,SAAgB;IACtD,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAClD,OAAO,CAAC,CAAC;KACV;IAED,OAAO,OAAO,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;AACjD,CAAC;AAED,SAAwB,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ describe("Metrics Middleware", function () {
|
|
|
31
31
|
});
|
|
32
32
|
context("setStatsDKey", () => {
|
|
33
33
|
it("Parses URL without a set base hostname", () => {
|
|
34
|
-
const sampleUrl = "/api/v2/cad-vehicle-status?apikey=
|
|
34
|
+
const sampleUrl = "/api/v2/cad-vehicle-status?apikey=some123key";
|
|
35
35
|
const req = {
|
|
36
36
|
method: "POST",
|
|
37
37
|
url: sampleUrl,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-metrics.js","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":";;;;;AAAA,+BAA8B;AAE9B,oEAAkD;AAClD,MAAM,OAAO,GAAG,IAAA,iBAAa,GAAE,CAAC;AAEhC,QAAQ,CAAC,oBAAoB,EAAE;IAC7B,OAAO,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,gCAAgC,EAAE;YACnC,MAAM,IAAI,GAAG,+CAA+C,CAAC;YAC7D,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC9C,aAAM,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE;YACtC,MAAM,IAAI,GAAG,oDAAoD,CAAC;YAClE,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC9C,aAAM,CAAC,KAAK,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE;YAC1C,MAAM,IAAI,GAAG,4CAA4C,CAAC;YAC1D,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC9C,aAAM,CAAC,KAAK,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0BAA0B,EAAE;YAC7B,MAAM,IAAI,GAAG,kBAAkB,CAAC;YAChC,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC9C,aAAM,CAAC,KAAK,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,cAAc,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;YAChD,MAAM,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"middleware-metrics.js","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":";;;;;AAAA,+BAA8B;AAE9B,oEAAkD;AAClD,MAAM,OAAO,GAAG,IAAA,iBAAa,GAAE,CAAC;AAEhC,QAAQ,CAAC,oBAAoB,EAAE;IAC7B,OAAO,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,gCAAgC,EAAE;YACnC,MAAM,IAAI,GAAG,+CAA+C,CAAC;YAC7D,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC9C,aAAM,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE;YACtC,MAAM,IAAI,GAAG,oDAAoD,CAAC;YAClE,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC9C,aAAM,CAAC,KAAK,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE;YAC1C,MAAM,IAAI,GAAG,4CAA4C,CAAC;YAC1D,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC9C,aAAM,CAAC,KAAK,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0BAA0B,EAAE;YAC7B,MAAM,IAAI,GAAG,kBAAkB,CAAC;YAChC,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC9C,aAAM,CAAC,KAAK,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,cAAc,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;YAChD,MAAM,SAAS,GAAG,8CAA8C,CAAC;YACjE,MAAM,GAAG,GAAqB;gBAC5B,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,SAAS;aACf,CAAC;YACF,MAAM,QAAQ,GAAG,GAAG,CAAC;YACrB,MAAM,GAAG,GAAG,GAAG,CAAC;YAChB,OAAO,CAAC,YAAY,CAAC,GAAc,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YACpD,MAAM,iBAAiB,GAAG,yCAAyC,CAAC;YACpE,aAAM,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/cspell.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// cSpell Settings
|
|
2
2
|
{
|
|
3
3
|
// Version of the setting file. Always 0.1
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.2",
|
|
5
5
|
// language - current active spelling language
|
|
6
6
|
"language": "en-US",
|
|
7
7
|
// words - list of words to be always considered correct
|
|
@@ -9,7 +9,8 @@
|
|
|
9
9
|
"tabletcommand",
|
|
10
10
|
"backend",
|
|
11
11
|
"Ursache",
|
|
12
|
-
"bamse"
|
|
12
|
+
"bamse",
|
|
13
|
+
"apikey"
|
|
13
14
|
],
|
|
14
15
|
// flagWords - list of words to be always considered incorrect
|
|
15
16
|
// This is useful for offensive words and common spelling errors.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import bunyan from "bunyan";
|
|
2
2
|
import { NextFunction, Request, Response } from "express";
|
|
3
|
-
export default function loggerMiddleware(logger
|
|
3
|
+
export default function loggerMiddleware(logger?: bunyan): (req: Request, res: Response, next: NextFunction) => void;
|
|
4
4
|
//# sourceMappingURL=logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,SACb,OAAO,OAAO,QAAQ,QAAQ,YAAY,UA4BpF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import bunyan from "bunyan";
|
|
2
2
|
import { NextFunction, Request, Response } from "express";
|
|
3
|
-
export default function statusLogger(logger
|
|
3
|
+
export default function statusLogger(logger?: bunyan): (req: Request, res: Response, next: NextFunction) => void;
|
|
4
4
|
export declare type StatusLoggerModule = ReturnType<typeof statusLogger>;
|
|
5
5
|
//# sourceMappingURL=status-logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-logger.d.ts","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AAwBjB,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"status-logger.d.ts","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AAwBjB,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,SACf,OAAO,OAAO,QAAQ,QAAQ,YAAY,UA8D9E;AAED,oBAAY,kBAAkB,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tabletcommand-logger",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.1",
|
|
4
4
|
"description": "Tablet Command Logging Configuration",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "gulp ts",
|
|
@@ -25,17 +25,17 @@
|
|
|
25
25
|
"@types/bunyan": "^1.8.8",
|
|
26
26
|
"@types/chai": "^4.3.3",
|
|
27
27
|
"@types/debug": "4.1.7",
|
|
28
|
-
"@types/express": "^4.17.
|
|
29
|
-
"@types/express-serve-static-core": "^4.17.
|
|
28
|
+
"@types/express": "^4.17.14",
|
|
29
|
+
"@types/express-serve-static-core": "^4.17.31",
|
|
30
30
|
"@types/gulp-copy": "0.0.4",
|
|
31
|
-
"@types/lodash": "^4.14.
|
|
31
|
+
"@types/lodash": "^4.14.185",
|
|
32
32
|
"@types/mocha": "^9.1.1",
|
|
33
|
-
"@types/node": "^18.7.
|
|
34
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
35
|
-
"@typescript-eslint/parser": "^5.
|
|
33
|
+
"@types/node": "^18.7.18",
|
|
34
|
+
"@typescript-eslint/eslint-plugin": "^5.38.0",
|
|
35
|
+
"@typescript-eslint/parser": "^5.38.0",
|
|
36
36
|
"chai": "^4.3.6",
|
|
37
37
|
"del": "^6.1.1",
|
|
38
|
-
"eslint": "^8.23.
|
|
38
|
+
"eslint": "^8.23.1",
|
|
39
39
|
"eslint-config-standard": "^17.0.0",
|
|
40
40
|
"eslint-plugin-import": "^2.26.0",
|
|
41
41
|
"eslint-plugin-mocha-only": "0.0.3",
|
|
@@ -49,6 +49,7 @@
|
|
|
49
49
|
"gulp-eslint": "^6.0.0",
|
|
50
50
|
"gulp-mocha": "^8.0.0",
|
|
51
51
|
"gulp-shell": "^0.8.0",
|
|
52
|
-
"mocha": "^10.0.0"
|
|
52
|
+
"mocha": "^10.0.0",
|
|
53
|
+
"typescript": "~4.7.4"
|
|
53
54
|
}
|
|
54
55
|
}
|
package/src/middleware/logger.ts
CHANGED
|
@@ -5,11 +5,15 @@ import {
|
|
|
5
5
|
Response,
|
|
6
6
|
} from "express";
|
|
7
7
|
|
|
8
|
-
export default function loggerMiddleware(logger
|
|
8
|
+
export default function loggerMiddleware(logger?: bunyan) {
|
|
9
9
|
return function accessLogMiddleware(req: Request, res: Response, next: NextFunction) {
|
|
10
10
|
// This doesn't fire the log immediately, but waits until the response is finished
|
|
11
11
|
// This means we have a chance of logging the response code
|
|
12
12
|
res.on("finish", () => {
|
|
13
|
+
// Skip this if no logger is set
|
|
14
|
+
if (!logger) {
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
13
17
|
logger.info({
|
|
14
18
|
remoteAddress: req.ip,
|
|
15
19
|
method: req.method,
|
|
@@ -28,6 +32,6 @@ export default function loggerMiddleware(logger: bunyan) {
|
|
|
28
32
|
status: res.statusCode ? res.statusCode : 0
|
|
29
33
|
}, "access_log");
|
|
30
34
|
});
|
|
31
|
-
next();
|
|
35
|
+
return next();
|
|
32
36
|
};
|
|
33
37
|
}
|
|
@@ -27,7 +27,7 @@ function requestDuration(endTime: Date, startTime?: Date): number {
|
|
|
27
27
|
return endTime.valueOf() - startTime.valueOf();
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
-
export default function statusLogger(logger
|
|
30
|
+
export default function statusLogger(logger?: bunyan) {
|
|
31
31
|
return function requestLogger(req: Request, res: Response, next: NextFunction) {
|
|
32
32
|
if (!_.isObject(req._startTime)) {
|
|
33
33
|
req._startTime = new Date();
|
|
@@ -58,7 +58,7 @@ export default function statusLogger(logger: bunyan) {
|
|
|
58
58
|
res.removeListener("finish", logRequest);
|
|
59
59
|
res.removeListener("close", logRequest);
|
|
60
60
|
|
|
61
|
-
if (shouldIgnore(req, res)) {
|
|
61
|
+
if (shouldIgnore(req, res) || !logger) {
|
|
62
62
|
return;
|
|
63
63
|
}
|
|
64
64
|
|
|
@@ -32,7 +32,7 @@ describe("Metrics Middleware", function() {
|
|
|
32
32
|
|
|
33
33
|
context("setStatsDKey", () => {
|
|
34
34
|
it("Parses URL without a set base hostname", () => {
|
|
35
|
-
const sampleUrl = "/api/v2/cad-vehicle-status?apikey=
|
|
35
|
+
const sampleUrl = "/api/v2/cad-vehicle-status?apikey=some123key";
|
|
36
36
|
const req: Partial<Request> = {
|
|
37
37
|
method: "POST",
|
|
38
38
|
url: sampleUrl,
|