tabletcommand-logger 2.0.6 → 2.1.0
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 +3 -0
- package/build/middleware/metrics.js +2 -2
- package/build/middleware/metrics.js.map +1 -1
- package/build/middleware/status-logger.js +7 -3
- 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/definitions/middleware/status-logger.d.ts.map +1 -1
- package/package.json +21 -19
- package/src/middleware/status-logger.ts +15 -10
package/README.md
ADDED
|
@@ -8,11 +8,11 @@ const url_1 = require("url");
|
|
|
8
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
9
|
const debug_1 = __importDefault(require("debug"));
|
|
10
10
|
const express_statsd_1 = __importDefault(require("express-statsd"));
|
|
11
|
-
const monitorRequest = express_statsd_1.default();
|
|
11
|
+
const monitorRequest = (0, express_statsd_1.default)();
|
|
12
12
|
// Add an express-statsd key that looks like http.post.api.hello.world for a HTTP POST to /api/hello/world URL
|
|
13
13
|
// See https://github.com/uber/express-statsd
|
|
14
14
|
function metrics(filter) {
|
|
15
|
-
const debug = debug_1.default("tabletcommand-logger:middleware/metrics");
|
|
15
|
+
const debug = (0, debug_1.default)("tabletcommand-logger:middleware/metrics");
|
|
16
16
|
function defaultFilter(pathIn) {
|
|
17
17
|
const uuidRegex = /[-a-f\d]{36}/i;
|
|
18
18
|
const mongoIdRegex = /[a-f\d]{24}/i;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/middleware/metrics.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,6BAA0B;AAE1B,oDAAuB;AACvB,kDAAiC;AACjC,oEAA2C;AAK3C,MAAM,cAAc,GAAG,wBAAa,
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/middleware/metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,14 +14,17 @@ function shouldIgnore(req, res) {
|
|
|
14
14
|
}
|
|
15
15
|
return false;
|
|
16
16
|
}
|
|
17
|
+
function requestDuration(endTime, startTime) {
|
|
18
|
+
if (!lodash_1.default.isObject(startTime) || !lodash_1.default.isDate(startTime)) {
|
|
19
|
+
return 0;
|
|
20
|
+
}
|
|
21
|
+
return endTime.valueOf() - startTime.valueOf();
|
|
22
|
+
}
|
|
17
23
|
function statusLogger(logger) {
|
|
18
24
|
return function requestLogger(req, res, next) {
|
|
19
25
|
if (!lodash_1.default.isObject(req._startTime)) {
|
|
20
26
|
req._startTime = new Date();
|
|
21
27
|
}
|
|
22
|
-
if (lodash_1.default.isObject(req._startTime) && req._startTime instanceof Date) {
|
|
23
|
-
res.responseTime = new Date().valueOf() - req._startTime.valueOf();
|
|
24
|
-
}
|
|
25
28
|
res.bodyCopy = null;
|
|
26
29
|
// Save a copy of the response body
|
|
27
30
|
const oldJSON = res.json.bind(res);
|
|
@@ -39,6 +42,7 @@ function statusLogger(logger) {
|
|
|
39
42
|
res.bodyCopy = body;
|
|
40
43
|
}
|
|
41
44
|
oldJSON(body);
|
|
45
|
+
res.responseTime = requestDuration(new Date(), req._startTime);
|
|
42
46
|
return res;
|
|
43
47
|
};
|
|
44
48
|
function logRequest() {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const chai_1 = require("chai");
|
|
7
7
|
const metrics_1 = __importDefault(require("../middleware/metrics"));
|
|
8
|
-
const metrics = metrics_1.default();
|
|
8
|
+
const metrics = (0, metrics_1.default)();
|
|
9
9
|
describe("Metrics Middleware", function () {
|
|
10
10
|
context("Default Filter", () => {
|
|
11
11
|
it("removes uuid from end of paths", function () {
|
|
@@ -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,iBAAa,
|
|
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,2CAA2C,CAAC;YAC9D,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"}
|
|
@@ -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;
|
|
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,SACd,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.0
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "Tablet Command Logging Configuration",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "gulp ts",
|
|
@@ -17,36 +17,38 @@
|
|
|
17
17
|
"types": "definitions/index.d.ts",
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"bunyan": "^1.8.15",
|
|
20
|
-
"debug": "^4.3.
|
|
20
|
+
"debug": "^4.3.4",
|
|
21
21
|
"express-statsd": "^0.3.0",
|
|
22
22
|
"lodash": "^4.17.21"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"@types/bunyan": "^1.8.
|
|
26
|
-
"@types/chai": "^4.
|
|
27
|
-
"@types/debug": "4.1.
|
|
28
|
-
"@types/express": "^4.17.
|
|
25
|
+
"@types/bunyan": "^1.8.8",
|
|
26
|
+
"@types/chai": "^4.3.1",
|
|
27
|
+
"@types/debug": "4.1.7",
|
|
28
|
+
"@types/express": "^4.17.13",
|
|
29
|
+
"@types/express-serve-static-core": "^4.17.28",
|
|
29
30
|
"@types/gulp-copy": "0.0.4",
|
|
30
|
-
"@types/lodash": "^4.14.
|
|
31
|
-
"@types/mocha": "^
|
|
32
|
-
"@types/node": "^
|
|
33
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
34
|
-
"@typescript-eslint/parser": "^
|
|
35
|
-
"chai": "^4.3.
|
|
36
|
-
"del": "^6.
|
|
37
|
-
"eslint": "^
|
|
38
|
-
"eslint-config-standard": "^
|
|
39
|
-
"eslint-plugin-import": "^2.
|
|
31
|
+
"@types/lodash": "^4.14.182",
|
|
32
|
+
"@types/mocha": "^9.1.1",
|
|
33
|
+
"@types/node": "^17.0.40",
|
|
34
|
+
"@typescript-eslint/eslint-plugin": "^5.27.1",
|
|
35
|
+
"@typescript-eslint/parser": "^5.27.1",
|
|
36
|
+
"chai": "^4.3.6",
|
|
37
|
+
"del": "^6.1.1",
|
|
38
|
+
"eslint": "^8.17.0",
|
|
39
|
+
"eslint-config-standard": "^17.0.0",
|
|
40
|
+
"eslint-plugin-import": "^2.26.0",
|
|
40
41
|
"eslint-plugin-mocha-only": "0.0.3",
|
|
41
42
|
"eslint-plugin-node": "^11.1.0",
|
|
42
|
-
"eslint-plugin-promise": "^
|
|
43
|
-
"eslint-plugin-security": "^1.
|
|
43
|
+
"eslint-plugin-promise": "^6.0.0",
|
|
44
|
+
"eslint-plugin-security": "^1.5.0",
|
|
44
45
|
"eslint-plugin-standard": "^4.1.0",
|
|
45
46
|
"gulp": "^4.0.2",
|
|
47
|
+
"gulp-cli": "^2.3.0",
|
|
46
48
|
"gulp-copy": "^4.0.1",
|
|
47
49
|
"gulp-eslint": "^6.0.0",
|
|
48
50
|
"gulp-mocha": "^8.0.0",
|
|
49
51
|
"gulp-shell": "^0.8.0",
|
|
50
|
-
"mocha": "^
|
|
52
|
+
"mocha": "^10.0.0"
|
|
51
53
|
}
|
|
52
54
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import bunyan from "bunyan";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
3
|
NextFunction,
|
|
4
|
-
Request,
|
|
5
|
-
Response,
|
|
4
|
+
Request,
|
|
5
|
+
Response,
|
|
6
6
|
} from "express";
|
|
7
7
|
import _ from "lodash";
|
|
8
8
|
|
|
@@ -19,33 +19,38 @@ function shouldIgnore(req: Request, res: Response): boolean {
|
|
|
19
19
|
return false;
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
+
function requestDuration(endTime: Date, startTime?: Date): number {
|
|
23
|
+
if (!_.isObject(startTime) || !_.isDate(startTime)) {
|
|
24
|
+
return 0;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
return endTime.valueOf() - startTime.valueOf();
|
|
28
|
+
}
|
|
29
|
+
|
|
22
30
|
export default function statusLogger(logger: bunyan) {
|
|
23
31
|
return function requestLogger(req: Request, res: Response, next: NextFunction) {
|
|
24
32
|
if (!_.isObject(req._startTime)) {
|
|
25
33
|
req._startTime = new Date();
|
|
26
34
|
}
|
|
27
35
|
|
|
28
|
-
if (_.isObject(req._startTime) && req._startTime instanceof Date) {
|
|
29
|
-
res.responseTime = new Date().valueOf() - req._startTime.valueOf();
|
|
30
|
-
}
|
|
31
|
-
|
|
32
36
|
res.bodyCopy = null;
|
|
33
37
|
|
|
34
38
|
// Save a copy of the response body
|
|
35
39
|
const oldJSON = res.json.bind(res);
|
|
36
40
|
|
|
37
41
|
// Used when using res.json(body);
|
|
38
|
-
res.json = function newJson(body: unknown|string): Response {
|
|
42
|
+
res.json = function newJson(body: unknown | string): Response {
|
|
39
43
|
if (_.isString(body)) {
|
|
40
44
|
try {
|
|
41
45
|
res.bodyCopy = JSON.parse(body);
|
|
42
46
|
} catch (e) {
|
|
43
47
|
res.bodyCopy = body;
|
|
44
|
-
}
|
|
48
|
+
}
|
|
45
49
|
} else {
|
|
46
50
|
res.bodyCopy = body;
|
|
47
51
|
}
|
|
48
52
|
oldJSON(body);
|
|
53
|
+
res.responseTime = requestDuration(new Date(), req._startTime);
|
|
49
54
|
return res;
|
|
50
55
|
};
|
|
51
56
|
|
|
@@ -82,7 +87,7 @@ export default function statusLogger(logger: bunyan) {
|
|
|
82
87
|
|
|
83
88
|
res.on("finish", logRequest);
|
|
84
89
|
res.on("close", logRequest);
|
|
85
|
-
|
|
90
|
+
|
|
86
91
|
return next();
|
|
87
92
|
};
|
|
88
93
|
}
|