tabletcommand-logger 3.2.2 → 3.2.4
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/index.js +17 -7
- package/build/index.js.map +1 -1
- package/build/middleware/logger.js +2 -3
- package/build/middleware/logger.js.map +1 -1
- package/build/middleware/metrics.js +2 -3
- package/build/middleware/metrics.js.map +1 -1
- package/build/middleware/status-logger.js +4 -5
- package/build/middleware/status-logger.js.map +1 -1
- package/build/test/middleware-metrics.js +37 -8
- package/build/test/middleware-metrics.js.map +1 -1
- package/build/winston-logger.js +1 -1
- package/build/winston-logger.js.map +1 -1
- package/definitions/index.d.ts.map +1 -1
- package/definitions/middleware/logger.d.ts.map +1 -1
- package/definitions/middleware/metrics.d.ts.map +1 -1
- package/definitions/middleware/status-logger.d.ts +0 -1
- package/definitions/middleware/status-logger.d.ts.map +1 -1
- package/eslint.config.mjs +56 -39
- package/gulpfile.js +5 -2
- package/package.json +25 -24
- package/src/index.ts +0 -1
- package/src/test/middleware-metrics.ts +2 -3
- package/src/types/express-statsd.d.ts +5 -5
package/build/index.js
CHANGED
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
37
|
};
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAAuC;AACvC,iEAAoD;AACpD,gEAA0E;AAC1E,+EAAuD;AAI1C,QAAA,MAAM,GAAG,wBAAO,CAAC;AACjB,QAAA,gBAAgB,GAAG,gBAAiB,CAAC;AACrC,QAAA,oBAAoB,GAAG,uBAAa,CAAC;AACrC,QAAA,iBAAiB,GAAG,iBAAkB,CAAC;AACvC,QAAA,YAAY,GAAG,uBAAa,CAAC;AAE1C,kBAAe;IACb,MAAM,EAAN,cAAM;IACN,gBAAgB,EAAhB,wBAAgB;IAChB,iBAAiB,EAAjB,yBAAiB;IACjB,oBAAoB,EAApB,4BAAoB;IACpB,YAAY,EAAZ,oBAAY;CACb,CAAC"}
|
|
@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.redactOriginalURL =
|
|
6
|
+
exports.redactOriginalURL = redactOriginalURL;
|
|
7
|
+
exports.default = loggerMiddleware;
|
|
7
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
9
|
function redactOriginalURL(maybeURL) {
|
|
9
10
|
if (!maybeURL) {
|
|
@@ -24,7 +25,6 @@ function redactOriginalURL(maybeURL) {
|
|
|
24
25
|
// Fallback
|
|
25
26
|
return maybeURL.replace(/apikey=.*?(&|$)/, "apikey=xxx&");
|
|
26
27
|
}
|
|
27
|
-
exports.redactOriginalURL = redactOriginalURL;
|
|
28
28
|
function loggerMiddleware(logger) {
|
|
29
29
|
return function accessLogMiddleware(req, res, next) {
|
|
30
30
|
// This doesn't fire the log immediately, but waits until the response is finished
|
|
@@ -55,5 +55,4 @@ function loggerMiddleware(logger) {
|
|
|
55
55
|
return next();
|
|
56
56
|
};
|
|
57
57
|
}
|
|
58
|
-
exports.default = loggerMiddleware;
|
|
59
58
|
//# sourceMappingURL=logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":";;;;;AAQA,8CAmBC;AAED,mCA6BC;AA1DD,oDAAuB;AAQvB,SAAgB,iBAAiB,CAAC,QAAiB;IACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,CAAC;QACH,+CAA+C;QAC/C,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,UAAU,IAAI,gBAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAAC,WAAM,CAAC;QACP,EAAE;IACJ,CAAC;IAED,WAAW;IACX,OAAO,QAAQ,CAAC,OAAO,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;AAC5D,CAAC;AAED,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,CAAC;gBACZ,OAAO;YACT,CAAC;YACD,MAAM,CAAC,IAAI,CAAC;gBACV,aAAa,EAAE,GAAG,CAAC,EAAE;gBACrB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC;gBACvC,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,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.default = metrics;
|
|
7
|
+
exports.cleanUpParams = cleanUpParams;
|
|
7
8
|
const os_1 = __importDefault(require("os"));
|
|
8
9
|
const url_1 = require("url");
|
|
9
10
|
const lodash_1 = __importDefault(require("lodash"));
|
|
@@ -78,7 +79,6 @@ function metrics(filter) {
|
|
|
78
79
|
statsd,
|
|
79
80
|
};
|
|
80
81
|
}
|
|
81
|
-
exports.default = metrics;
|
|
82
82
|
function cleanUpParams(req) {
|
|
83
83
|
var _a;
|
|
84
84
|
if (!lodash_1.default.isString(req.statsdKey)) {
|
|
@@ -100,5 +100,4 @@ function cleanUpParams(req) {
|
|
|
100
100
|
path = path.replace(/\//g, " ").trim().replace(/\s/g, ".");
|
|
101
101
|
req.statsdKey = path.toLowerCase();
|
|
102
102
|
}
|
|
103
|
-
exports.cleanUpParams = cleanUpParams;
|
|
104
103
|
//# sourceMappingURL=metrics.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/middleware/metrics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/middleware/metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.shouldIgnore = shouldIgnore;
|
|
7
|
+
exports.requestDuration = requestDuration;
|
|
8
|
+
exports.redactQuery = redactQuery;
|
|
9
|
+
exports.default = statusLogger;
|
|
7
10
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
11
|
const logger_1 = require("./logger");
|
|
9
12
|
const allowedMethods = ["POST"];
|
|
@@ -24,21 +27,18 @@ function shouldIgnore(req, res) {
|
|
|
24
27
|
}
|
|
25
28
|
return false;
|
|
26
29
|
}
|
|
27
|
-
exports.shouldIgnore = shouldIgnore;
|
|
28
30
|
function requestDuration(endTime, startTime) {
|
|
29
31
|
if (!lodash_1.default.isObject(startTime) || !lodash_1.default.isDate(startTime)) {
|
|
30
32
|
return 0;
|
|
31
33
|
}
|
|
32
34
|
return endTime.valueOf() - startTime.valueOf();
|
|
33
35
|
}
|
|
34
|
-
exports.requestDuration = requestDuration;
|
|
35
36
|
function redactQuery(q) {
|
|
36
37
|
if (lodash_1.default.isString(q.apikey)) {
|
|
37
38
|
q.apikey = q.apikey.substring(0, 7);
|
|
38
39
|
}
|
|
39
40
|
return q;
|
|
40
41
|
}
|
|
41
|
-
exports.redactQuery = redactQuery;
|
|
42
42
|
function statusLogger(logger) {
|
|
43
43
|
return function requestLogger(req, res, next) {
|
|
44
44
|
if (!lodash_1.default.isObject(req._startTime)) {
|
|
@@ -97,5 +97,4 @@ function statusLogger(logger) {
|
|
|
97
97
|
return next();
|
|
98
98
|
};
|
|
99
99
|
}
|
|
100
|
-
exports.default = statusLogger;
|
|
101
100
|
//# sourceMappingURL=status-logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,41 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
5
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
36
|
require("mocha");
|
|
7
37
|
const chai_1 = require("chai");
|
|
8
|
-
const metrics_1 =
|
|
9
|
-
const metrics_2 = require("../middleware/metrics");
|
|
38
|
+
const metrics_1 = __importStar(require("../middleware/metrics"));
|
|
10
39
|
const metrics = (0, metrics_1.default)();
|
|
11
40
|
describe("Metrics Middleware", function () {
|
|
12
41
|
context("Default Filter", () => {
|
|
@@ -55,18 +84,18 @@ describe("cleanUpParams", () => {
|
|
|
55
84
|
x123: "admin",
|
|
56
85
|
}
|
|
57
86
|
};
|
|
58
|
-
(0,
|
|
87
|
+
(0, metrics_1.cleanUpParams)(req);
|
|
59
88
|
chai_1.assert.strictEqual(req.statsdKey, "api.a1.x123.department.departmentid"); // cspell: words departmentid
|
|
60
89
|
});
|
|
61
90
|
it("cleans up params when values are undefined", () => {
|
|
62
91
|
const req = {
|
|
63
92
|
statsdKey: "api.a1.admin.department",
|
|
64
93
|
params: {
|
|
65
|
-
departmentId: undefined,
|
|
94
|
+
departmentId: undefined, // Force value to undefined, when setting param as optional ":departmentId?"
|
|
66
95
|
x123: "admin",
|
|
67
96
|
}
|
|
68
97
|
};
|
|
69
|
-
(0,
|
|
98
|
+
(0, metrics_1.cleanUpParams)(req);
|
|
70
99
|
chai_1.assert.strictEqual(req.statsdKey, "api.a1.x123.department");
|
|
71
100
|
});
|
|
72
101
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-metrics.js","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"middleware-metrics.js","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":"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"}
|
package/build/winston-logger.js
CHANGED
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.default = logger;
|
|
6
7
|
const winston_1 = require("winston");
|
|
7
8
|
const winston_daily_rotate_file_1 = __importDefault(require("winston-daily-rotate-file"));
|
|
8
9
|
const datadog_winston_1 = __importDefault(require("datadog-winston"));
|
|
@@ -49,5 +50,4 @@ function logger(config) {
|
|
|
49
50
|
});
|
|
50
51
|
return loggerClient;
|
|
51
52
|
}
|
|
52
|
-
exports.default = logger;
|
|
53
53
|
//# sourceMappingURL=winston-logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"winston-logger.js","sourceRoot":"","sources":["../src/winston-logger.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"winston-logger.js","sourceRoot":"","sources":["../src/winston-logger.ts"],"names":[],"mappings":";;;;;AAiBA,yBAoDC;AArED,qCAAmE;AAEnE,0FAAwD;AACxD,sEAA+C;AAc/C,SAAwB,MAAM,CAAC,MAAoB;IACjD,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,KAAK,IAAI,IAAI,MAAM,CAAC,SAAS,KAAK,IAAI,IAAI,MAAM,CAAC,YAAY,KAAK,IAAI,CAAC;IACjH,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,GAAG,GAAgB,EAAE,CAAC;IAE5B,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,MAAM,GAAG,GAAc,IAAI,oBAAU,CAAC,OAAO,EAAE,CAAC;QAChD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,MAAM,KAAK,GAAoB,IAAI,mCAAe,CAAC;YACjD,QAAQ,EAAE,GAAG,MAAM,CAAC,QAAQ,cAAc;YAC1C,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,WAAW,EAAE,YAAY;YACzB,aAAa,EAAE,IAAI;YACnB,QAAQ,EAAE,KAAK;YACf,GAAG,EAAE,IAAI;YACT,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;YAC9B,MAAM,EAAE,MAAM,CAAC,aAAa;YAC5B,OAAO,EAAE,MAAM,CAAC,IAAI;SACrB,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,sBAAY,EAAC;QAChC,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,gBAAM,CAAC,OAAO;QACpB,mFAAmF;QACnF,gBAAM,CAAC,SAAS,EAAE,EAClB,gBAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAC9B,gBAAM,CAAC,KAAK,EAAE,EACd,gBAAM,CAAC,IAAI,EAAE,CACd;QACD,WAAW,EAAE;YACX,GAAG,MAAM,CAAC,SAAS;YACnB,OAAO,EAAE,MAAM,CAAC,IAAI;SACrB;QACD,UAAU,EAAE,GAAG;QACf,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,kBAAkB,EAAE,EAAE,aAAa,EAAG,MAAM,sBAAsB,CAAC;AAC1E,OAAO,aAAa,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,eAAO,MAAM,MAAM,gBAAU,CAAC;AAC9B,eAAO,MAAM,gBAAgB,0BAAoB,CAAC;AAClD,eAAO,MAAM,oBAAoB,sBAAgB,CAAC;AAClD,eAAO,MAAM,iBAAiB,2BAAqB,CAAC;AACpD,eAAO,MAAM,YAAY,sBAAgB,CAAC;;;;;;;;AAE1C,wBAME"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,wBAAgB,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAmB3D;AAED,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,wBAAgB,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAmB3D;AAED,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,IAClB,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,UA4BpF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/middleware/metrics.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE1D,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC;AAMpD,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,MAAM,CAAC,EAAE,cAAc;4BAMtB,MAAM,KAAG,MAAM;wBAmBnB,OAAO,YAAY,MAAM,OAAO,MAAM;
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/middleware/metrics.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE1D,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC;AAMpD,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,MAAM,CAAC,EAAE,cAAc;4BAMtB,MAAM,KAAG,MAAM;wBAmBnB,OAAO,YAAY,MAAM,OAAO,MAAM;mBA4BpC,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY;EAiB7E;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,QAsBlD;AAED,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-logger.d.ts","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"status-logger.d.ts","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAOlD,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAkBjE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,CAMvE;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,yBAMnC;AAED,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,IACpB,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,UAgE9E;AAED,MAAM,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC"}
|
package/eslint.config.mjs
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { defineConfig } from "eslint/config";
|
|
2
|
-
import standard from "eslint-plugin-standard";
|
|
3
2
|
import security from "eslint-plugin-security";
|
|
4
3
|
import typescriptEslint from "@typescript-eslint/eslint-plugin";
|
|
5
4
|
import globals from "globals";
|
|
@@ -8,6 +7,7 @@ import path from "node:path";
|
|
|
8
7
|
import { fileURLToPath } from "node:url";
|
|
9
8
|
import js from "@eslint/js";
|
|
10
9
|
import { FlatCompat } from "@eslint/eslintrc";
|
|
10
|
+
import neostandard, { plugins } from "neostandard";
|
|
11
11
|
|
|
12
12
|
const __filename = fileURLToPath(import.meta.url);
|
|
13
13
|
const __dirname = path.dirname(__filename);
|
|
@@ -17,45 +17,62 @@ const compat = new FlatCompat({
|
|
|
17
17
|
allConfig: js.configs.all
|
|
18
18
|
});
|
|
19
19
|
|
|
20
|
-
export default defineConfig([
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
20
|
+
export default defineConfig([
|
|
21
|
+
...neostandard({
|
|
22
|
+
ts: true,
|
|
23
|
+
}),
|
|
24
|
+
plugins.n.configs["flat/recommended"],
|
|
25
|
+
{
|
|
26
|
+
extends: compat.extends(
|
|
27
|
+
"eslint:recommended",
|
|
28
|
+
"plugin:@typescript-eslint/recommended",
|
|
29
|
+
"plugin:@typescript-eslint/recommended-requiring-type-checking",
|
|
30
|
+
),
|
|
31
|
+
|
|
32
|
+
plugins: {
|
|
33
|
+
security,
|
|
34
|
+
"@typescript-eslint": typescriptEslint,
|
|
35
|
+
},
|
|
36
|
+
|
|
37
|
+
languageOptions: {
|
|
38
|
+
globals: {
|
|
39
|
+
...globals.node,
|
|
40
|
+
...globals.mocha,
|
|
41
|
+
},
|
|
42
|
+
|
|
43
|
+
parser: tsParser,
|
|
44
|
+
ecmaVersion: 5,
|
|
45
|
+
sourceType: "commonjs",
|
|
46
|
+
|
|
47
|
+
parserOptions: {
|
|
48
|
+
project: "./src/tsconfig.json",
|
|
49
|
+
},
|
|
37
50
|
},
|
|
38
51
|
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
52
|
+
rules: {
|
|
53
|
+
quotes: [2, "double"],
|
|
54
|
+
semi: [2, "always"],
|
|
55
|
+
"space-before-function-paren": [0],
|
|
56
|
+
"@typescript-eslint/explicit-module-boundary-types": 0,
|
|
57
|
+
"@typescript-eslint/no-empty-interface": 0,
|
|
58
|
+
"@typescript-eslint/require-await": 0,
|
|
59
|
+
"@typescript-eslint/restrict-template-expressions": 0,
|
|
42
60
|
|
|
43
|
-
|
|
44
|
-
|
|
61
|
+
"@typescript-eslint/no-misused-promises": ["error", {
|
|
62
|
+
checksVoidReturn: false,
|
|
63
|
+
}],
|
|
64
|
+
//
|
|
65
|
+
"@stylistic/quotes": [2, "double"],
|
|
66
|
+
"@stylistic/space-before-function-paren": [0],
|
|
67
|
+
"@stylistic/semi": [2, "always"],
|
|
68
|
+
"import-x/first": [0],
|
|
69
|
+
"camelcase": [0],
|
|
70
|
+
"n/no-process-exit": [0],
|
|
71
|
+
"n/no-unpublished-import": ["error", {
|
|
72
|
+
"allowModules": ["chai", "mocha"]
|
|
73
|
+
}],
|
|
74
|
+
// this is a workaround for import of .ts files
|
|
75
|
+
"n/no-missing-import": [0],
|
|
45
76
|
},
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
rules: {
|
|
49
|
-
quotes: [2, "double"],
|
|
50
|
-
semi: [2, "always"],
|
|
51
|
-
"space-before-function-paren": [0],
|
|
52
|
-
"@typescript-eslint/explicit-module-boundary-types": 0,
|
|
53
|
-
"@typescript-eslint/no-empty-interface": 0,
|
|
54
|
-
"@typescript-eslint/require-await": 0,
|
|
55
|
-
"@typescript-eslint/restrict-template-expressions": 0,
|
|
56
|
-
|
|
57
|
-
"@typescript-eslint/no-misused-promises": ["error", {
|
|
58
|
-
checksVoidReturn: false,
|
|
59
|
-
}],
|
|
60
|
-
},
|
|
61
|
-
}]);
|
|
77
|
+
}
|
|
78
|
+
]);
|
package/gulpfile.js
CHANGED
|
@@ -2,8 +2,11 @@ const gulp = require("gulp");
|
|
|
2
2
|
const exec = require("gulp-execa");
|
|
3
3
|
const { deleteAsync } = require("del");
|
|
4
4
|
|
|
5
|
-
gulp.task("clean", function() {
|
|
6
|
-
return deleteAsync([
|
|
5
|
+
gulp.task("clean", function () {
|
|
6
|
+
return deleteAsync([
|
|
7
|
+
"build/**",
|
|
8
|
+
"definitions/**",
|
|
9
|
+
], {
|
|
7
10
|
force: true
|
|
8
11
|
});
|
|
9
12
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tabletcommand-logger",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.4",
|
|
4
4
|
"description": "Tablet Command Logging Configuration",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "gulp ts",
|
|
@@ -17,40 +17,41 @@
|
|
|
17
17
|
"types": "definitions/index.d.ts",
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"datadog-winston": "^1.6.0",
|
|
20
|
-
"debug": "^4.4.
|
|
20
|
+
"debug": "^4.4.3",
|
|
21
21
|
"express-statsd": "^0.3.0",
|
|
22
|
-
"lodash": "^4.17.
|
|
23
|
-
"winston": "^3.
|
|
22
|
+
"lodash": "^4.17.23",
|
|
23
|
+
"winston": "^3.19.0",
|
|
24
24
|
"winston-daily-rotate-file": "^5.0.0"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@eslint/eslintrc": "^3.3.
|
|
28
|
-
"@eslint/js": "^9.
|
|
29
|
-
"@types/chai": "^5.2.
|
|
27
|
+
"@eslint/eslintrc": "^3.3.3",
|
|
28
|
+
"@eslint/js": "^9.39.2",
|
|
29
|
+
"@types/chai": "^5.2.3",
|
|
30
30
|
"@types/datadog-winston": "^1.0.7",
|
|
31
31
|
"@types/debug": "4.1.12",
|
|
32
|
-
"@types/express": "^4.17.
|
|
33
|
-
"@types/express-serve-static-core": "^4.19.
|
|
34
|
-
"@types/lodash": "^4.17.
|
|
32
|
+
"@types/express": "^4.17.25",
|
|
33
|
+
"@types/express-serve-static-core": "^4.19.8",
|
|
34
|
+
"@types/lodash": "^4.17.23",
|
|
35
35
|
"@types/mocha": "^10.0.10",
|
|
36
|
-
"@types/node": "^
|
|
37
|
-
"@
|
|
38
|
-
"@typescript-eslint/
|
|
39
|
-
"
|
|
40
|
-
"
|
|
41
|
-
"
|
|
42
|
-
"
|
|
43
|
-
"eslint
|
|
44
|
-
"eslint-plugin-node": "^11.1.0",
|
|
36
|
+
"@types/node": "^24.10.9",
|
|
37
|
+
"@types/serve-static": "^2.2.0",
|
|
38
|
+
"@typescript-eslint/eslint-plugin": "^8.54.0",
|
|
39
|
+
"@typescript-eslint/parser": "^8.54.0",
|
|
40
|
+
"chai": "^6.2.2",
|
|
41
|
+
"cspell": "^9.6.2",
|
|
42
|
+
"del": "^8.0.1",
|
|
43
|
+
"eslint": "^9.39.2",
|
|
45
44
|
"eslint-plugin-promise": "^7.2.1",
|
|
46
45
|
"eslint-plugin-security": "^3.0.1",
|
|
47
|
-
"
|
|
48
|
-
"
|
|
49
|
-
"gulp": "^5.0.0",
|
|
46
|
+
"globals": "^17.2.0",
|
|
47
|
+
"gulp": "^5.0.1",
|
|
50
48
|
"gulp-execa": "^8.0.1",
|
|
51
|
-
"mocha": "^11.
|
|
49
|
+
"mocha": "^11.7.5",
|
|
50
|
+
"neostandard": "^0.12.2",
|
|
51
|
+
"ts-mocha": "^11.1.0",
|
|
52
52
|
"ts-node": "^10.9.2",
|
|
53
|
+
"tsconfig-paths": "^4.2.0",
|
|
53
54
|
"type-coverage": "^2.29.7",
|
|
54
|
-
"typescript": "~
|
|
55
|
+
"typescript": "~5.9.3"
|
|
55
56
|
}
|
|
56
57
|
}
|
package/src/index.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import "mocha";
|
|
2
2
|
import { assert } from "chai";
|
|
3
3
|
import { Request } from "express";
|
|
4
|
-
import MetricsModule from "../middleware/metrics";
|
|
5
|
-
import { cleanUpParams } from "../middleware/metrics";
|
|
4
|
+
import MetricsModule, { cleanUpParams } from "../middleware/metrics";
|
|
6
5
|
const metrics = MetricsModule();
|
|
7
6
|
|
|
8
7
|
describe("Metrics Middleware", function() {
|
|
@@ -72,4 +71,4 @@ describe("cleanUpParams", () => {
|
|
|
72
71
|
cleanUpParams(req);
|
|
73
72
|
assert.strictEqual(req.statsdKey, "api.a1.x123.department");
|
|
74
73
|
});
|
|
75
|
-
});
|
|
74
|
+
});
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
declare module "express-statsd" {
|
|
2
|
-
import {
|
|
3
|
-
Request,
|
|
2
|
+
import {
|
|
3
|
+
Request,
|
|
4
4
|
Response
|
|
5
5
|
} from "express";
|
|
6
|
-
|
|
6
|
+
|
|
7
7
|
interface ExpressStatsdOpts {
|
|
8
|
-
host: string,
|
|
8
|
+
host: string,
|
|
9
9
|
port: number,
|
|
10
10
|
requestKey: string,
|
|
11
11
|
}
|
|
12
|
-
|
|
12
|
+
|
|
13
13
|
function ExpressStatsd (opts?: ExpressStatsdOpts): (req: Request, res: Response) => void;
|
|
14
14
|
export = ExpressStatsd;
|
|
15
15
|
}
|