tabletcommand-logger 3.2.5 → 3.2.6
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 +1 -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-logger.js +6 -6
- package/build/test/middleware-logger.js.map +1 -1
- package/build/test/middleware-metrics.js +12 -12
- package/build/test/middleware-metrics.js.map +1 -1
- package/definitions/test/middleware-logger.d.ts +1 -1
- package/definitions/test/middleware-logger.d.ts.map +1 -1
- package/definitions/test/middleware-metrics.d.ts +1 -1
- package/definitions/test/middleware-metrics.d.ts.map +1 -1
- package/definitions/types/express.aug.d.ts.map +1 -1
- package/eslint.config.mjs +25 -8
- package/gulpfile.js +6 -2
- package/package.json +5 -9
- package/src/test/middleware-logger.ts +1 -1
- package/src/test/middleware-metrics.ts +2 -1
- package/src/tsconfig.json +4 -1
- package/src/types/express.aug.ts +0 -1
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,MAAM,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":";;;;;AAcA,oCAkBC;AAED,0CAMC;AAED,kCAMC;AAED,+BAiEC;AA3GD,oDAAuB;AAEvB,qCAA6C;AAE7C,MAAM,cAAc,GAAG,CAAC,MAAM,CAAC,CAAC;AAEhC,SAAgB,YAAY,CAAC,GAAY,EAAE,GAAa;;IACtD,IAAI,gBAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,6CAA6C;IAC7C,MAAM,CAAC,GAAG,CAAC,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,mCAAI,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;IACnD,MAAM,SAAS,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACjD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;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,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,eAAe,CAAC,OAAa,EAAE,SAAgB;IAC7D,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QACnD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;AACjD,CAAC;AAED,SAAgB,WAAW,CAAC,CAAQ;IAClC,IAAI,gBAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAwB,YAAY,CAAC,MAAe;IAClD,OAAO,SAAS,aAAa,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QAC3E,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YAChC,GAAG,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,CAAC;QAED,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;QAEpB,mCAAmC;QACnC,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnC,kCAAkC;QAClC,GAAG,CAAC,IAAI,GAAG,SAAS,OAAO,CAAC,IAAa;YACvC,IAAI,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrB,IAAI,CAAC;oBACH,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClC,CAAC;gBAAC,
|
|
1
|
+
{"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
require("mocha");
|
|
4
3
|
const chai_1 = require("chai");
|
|
4
|
+
const node_test_1 = require("node:test");
|
|
5
5
|
const logger_1 = require("../middleware/logger");
|
|
6
|
-
describe("Logger Middleware", function () {
|
|
7
|
-
|
|
6
|
+
(0, node_test_1.describe)("Logger Middleware", function () {
|
|
7
|
+
(0, node_test_1.describe)("Redact Original URL", () => {
|
|
8
8
|
const url = "http://local:3442/incident?";
|
|
9
|
-
it("apikey is last", function () {
|
|
9
|
+
(0, node_test_1.it)("apikey is last", function () {
|
|
10
10
|
const prevApiKey = "apikey=abcdef1234567";
|
|
11
11
|
const expApiKey = "apikey=abcdef1";
|
|
12
12
|
const redacted = (0, logger_1.redactOriginalURL)(url + prevApiKey);
|
|
13
13
|
chai_1.assert.equal(redacted, url + expApiKey);
|
|
14
14
|
});
|
|
15
|
-
it("apikey is middle of url", function () {
|
|
15
|
+
(0, node_test_1.it)("apikey is middle of url", function () {
|
|
16
16
|
const prevApiKey = "apikey=abcdef1234567&k=1";
|
|
17
17
|
const expApiKey = "apikey=abcdef1&k=1";
|
|
18
18
|
const redacted = (0, logger_1.redactOriginalURL)(url + prevApiKey);
|
|
19
19
|
chai_1.assert.equal(redacted, url + expApiKey);
|
|
20
20
|
});
|
|
21
|
-
it("apikey is short", function () {
|
|
21
|
+
(0, node_test_1.it)("apikey is short", function () {
|
|
22
22
|
const prevApiKey = "apikey=1&";
|
|
23
23
|
const expApiKey = "apikey=1";
|
|
24
24
|
const redacted = (0, logger_1.redactOriginalURL)(url + prevApiKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-logger.js","sourceRoot":"","sources":["../../src/test/middleware-logger.ts"],"names":[],"mappings":";;AAAA
|
|
1
|
+
{"version":3,"file":"middleware-logger.js","sourceRoot":"","sources":["../../src/test/middleware-logger.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,yCAA8D;AAC9D,iDAAyD;AAEzD,IAAA,oBAAQ,EAAC,mBAAmB,EAAE;IAC5B,IAAA,oBAAO,EAAC,qBAAqB,EAAE,GAAG,EAAE;QAClC,MAAM,GAAG,GAAG,6BAA6B,CAAC;QAC1C,IAAA,cAAE,EAAC,gBAAgB,EAAE;YACnB,MAAM,UAAU,GAAG,sBAAsB,CAAC;YAC1C,MAAM,SAAS,GAAG,gBAAgB,CAAC;YACnC,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,GAAG,GAAG,UAAU,CAAC,CAAC;YACrD,aAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,GAAG,SAAS,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,IAAA,cAAE,EAAC,yBAAyB,EAAE;YAC5B,MAAM,UAAU,GAAG,0BAA0B,CAAC;YAC9C,MAAM,SAAS,GAAG,oBAAoB,CAAC;YACvC,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,GAAG,GAAG,UAAU,CAAC,CAAC;YACrD,aAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,GAAG,SAAS,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,IAAA,cAAE,EAAC,iBAAiB,EAAE;YACpB,MAAM,UAAU,GAAG,WAAW,CAAC;YAC/B,MAAM,SAAS,GAAG,UAAU,CAAC;YAC7B,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,GAAG,GAAG,UAAU,CAAC,CAAC;YACrD,aAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,GAAG,SAAS,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -33,35 +33,35 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
require("mocha");
|
|
37
36
|
const chai_1 = require("chai");
|
|
37
|
+
const node_test_1 = require("node:test");
|
|
38
38
|
const metrics_1 = __importStar(require("../middleware/metrics"));
|
|
39
39
|
const metrics = (0, metrics_1.default)();
|
|
40
|
-
describe("Metrics Middleware", function () {
|
|
41
|
-
|
|
42
|
-
it("removes uuid from end of paths", function () {
|
|
40
|
+
(0, node_test_1.describe)("Metrics Middleware", function () {
|
|
41
|
+
(0, node_test_1.describe)("Default Filter", () => {
|
|
42
|
+
(0, node_test_1.it)("removes uuid from end of paths", function () {
|
|
43
43
|
const path = "api.user.daafe605-feac-add0-ad0e-89023d48deab";
|
|
44
44
|
const cleanPath = metrics.defaultFilter(path);
|
|
45
45
|
chai_1.assert.equal(cleanPath, "api.user");
|
|
46
46
|
});
|
|
47
|
-
it("removes uuid from middle of paths", function () {
|
|
47
|
+
(0, node_test_1.it)("removes uuid from middle of paths", function () {
|
|
48
48
|
const path = "api.user.daafe605-feac-add0-ad0e-89023d48deab.info";
|
|
49
49
|
const cleanPath = metrics.defaultFilter(path);
|
|
50
50
|
chai_1.assert.equal(cleanPath, "api.user.info");
|
|
51
51
|
});
|
|
52
|
-
it("removes mongo id from middle of paths", function () {
|
|
52
|
+
(0, node_test_1.it)("removes mongo id from middle of paths", function () {
|
|
53
53
|
const path = "api.online.515a41a3e0387575cc939002.status";
|
|
54
54
|
const cleanPath = metrics.defaultFilter(path);
|
|
55
55
|
chai_1.assert.equal(cleanPath, "api.online.status");
|
|
56
56
|
});
|
|
57
|
-
it("skips paths without uuid", function () {
|
|
57
|
+
(0, node_test_1.it)("skips paths without uuid", function () {
|
|
58
58
|
const path = "api.user.profile";
|
|
59
59
|
const cleanPath = metrics.defaultFilter(path);
|
|
60
60
|
chai_1.assert.equal(cleanPath, "api.user.profile");
|
|
61
61
|
});
|
|
62
62
|
});
|
|
63
|
-
|
|
64
|
-
it("Parses URL without a set base hostname", () => {
|
|
63
|
+
(0, node_test_1.describe)("setStatsDKey", () => {
|
|
64
|
+
(0, node_test_1.it)("Parses URL without a set base hostname", () => {
|
|
65
65
|
const sampleUrl = "/api/v2/cad-vehicle-status?apikey=some123key";
|
|
66
66
|
const req = {
|
|
67
67
|
method: "POST",
|
|
@@ -75,8 +75,8 @@ describe("Metrics Middleware", function () {
|
|
|
75
75
|
});
|
|
76
76
|
});
|
|
77
77
|
});
|
|
78
|
-
describe("cleanUpParams", () => {
|
|
79
|
-
it("cleans up params", () => {
|
|
78
|
+
(0, node_test_1.describe)("cleanUpParams", () => {
|
|
79
|
+
(0, node_test_1.it)("cleans up params", () => {
|
|
80
80
|
const req = {
|
|
81
81
|
statsdKey: "api.a1.admin.department.abcd",
|
|
82
82
|
params: {
|
|
@@ -87,7 +87,7 @@ describe("cleanUpParams", () => {
|
|
|
87
87
|
(0, metrics_1.cleanUpParams)(req);
|
|
88
88
|
chai_1.assert.strictEqual(req.statsdKey, "api.a1.x123.department.departmentid"); // cspell: words departmentid
|
|
89
89
|
});
|
|
90
|
-
it("cleans up params when values are undefined", () => {
|
|
90
|
+
(0, node_test_1.it)("cleans up params when values are undefined", () => {
|
|
91
91
|
const req = {
|
|
92
92
|
statsdKey: "api.a1.admin.department",
|
|
93
93
|
params: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-metrics.js","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"middleware-metrics.js","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
export {};
|
|
2
2
|
//# sourceMappingURL=middleware-logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-logger.d.ts","sourceRoot":"","sources":["../../src/test/middleware-logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"middleware-logger.d.ts","sourceRoot":"","sources":["../../src/test/middleware-logger.ts"],"names":[],"mappings":""}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
export {};
|
|
2
2
|
//# sourceMappingURL=middleware-metrics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-metrics.d.ts","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"middleware-metrics.d.ts","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express.aug.d.ts","sourceRoot":"","sources":["../../src/types/express.aug.ts"],"names":[],"mappings":"AACA,OAAO,EAAG,CAAC;AAEX,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"express.aug.d.ts","sourceRoot":"","sources":["../../src/types/express.aug.ts"],"names":[],"mappings":"AACA,OAAO,EAAG,CAAC;AAEX,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,SAAS,EAAE,MAAM,CAAC;YAClB,UAAU,CAAC,EAAE,IAAI,CAAC;SACnB;QAED,UAAU,QAAQ;YAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;YACnB,SAAS,CAAC,EAAE,OAAO,CAAC;YACpB,YAAY,EAAE,MAAM,CAAC;SACtB;KACF;CACF"}
|
package/eslint.config.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { defineConfig } from "eslint/config";
|
|
2
|
+
import promise from "eslint-plugin-promise";
|
|
2
3
|
import security from "eslint-plugin-security";
|
|
3
|
-
import typescriptEslint from "@typescript-eslint/eslint-plugin";
|
|
4
4
|
import globals from "globals";
|
|
5
5
|
import tsParser from "@typescript-eslint/parser";
|
|
6
6
|
import path from "node:path";
|
|
@@ -19,19 +19,20 @@ const compat = new FlatCompat({
|
|
|
19
19
|
|
|
20
20
|
export default defineConfig([
|
|
21
21
|
...neostandard({
|
|
22
|
+
env: [
|
|
23
|
+
"node",
|
|
24
|
+
],
|
|
22
25
|
ts: true,
|
|
23
26
|
}),
|
|
24
27
|
plugins.n.configs["flat/recommended"],
|
|
25
28
|
{
|
|
26
29
|
extends: compat.extends(
|
|
27
30
|
"eslint:recommended",
|
|
28
|
-
"plugin:@typescript-eslint/recommended",
|
|
29
|
-
"plugin:@typescript-eslint/recommended-requiring-type-checking",
|
|
30
31
|
),
|
|
31
32
|
|
|
32
33
|
plugins: {
|
|
34
|
+
promise,
|
|
33
35
|
security,
|
|
34
|
-
"@typescript-eslint": typescriptEslint,
|
|
35
36
|
},
|
|
36
37
|
|
|
37
38
|
languageOptions: {
|
|
@@ -41,7 +42,7 @@ export default defineConfig([
|
|
|
41
42
|
},
|
|
42
43
|
|
|
43
44
|
parser: tsParser,
|
|
44
|
-
ecmaVersion:
|
|
45
|
+
ecmaVersion: 2019,
|
|
45
46
|
sourceType: "commonjs",
|
|
46
47
|
|
|
47
48
|
parserOptions: {
|
|
@@ -49,16 +50,26 @@ export default defineConfig([
|
|
|
49
50
|
},
|
|
50
51
|
},
|
|
51
52
|
|
|
53
|
+
settings: {
|
|
54
|
+
node: {
|
|
55
|
+
version: ">=24.15.0",
|
|
56
|
+
}
|
|
57
|
+
},
|
|
58
|
+
|
|
52
59
|
rules: {
|
|
53
60
|
quotes: [2, "double"],
|
|
54
61
|
semi: [2, "always"],
|
|
62
|
+
"@typescript-eslint/await-thenable": [1],
|
|
63
|
+
"@typescript-eslint/no-floating-promises": [1],
|
|
64
|
+
"@typescript-eslint/no-for-in-array": [1],
|
|
65
|
+
|
|
55
66
|
"space-before-function-paren": [0],
|
|
56
67
|
"@typescript-eslint/explicit-module-boundary-types": 0,
|
|
57
68
|
"@typescript-eslint/no-empty-interface": 0,
|
|
58
69
|
"@typescript-eslint/require-await": 0,
|
|
59
70
|
"@typescript-eslint/restrict-template-expressions": 0,
|
|
60
71
|
|
|
61
|
-
"@typescript-eslint/no-misused-promises": ["
|
|
72
|
+
"@typescript-eslint/no-misused-promises": ["warn", {
|
|
62
73
|
checksVoidReturn: false,
|
|
63
74
|
}],
|
|
64
75
|
//
|
|
@@ -69,10 +80,16 @@ export default defineConfig([
|
|
|
69
80
|
"camelcase": [0],
|
|
70
81
|
"n/no-process-exit": [0],
|
|
71
82
|
"n/no-unpublished-import": ["error", {
|
|
72
|
-
"allowModules": ["chai"
|
|
83
|
+
"allowModules": ["chai"]
|
|
73
84
|
}],
|
|
74
85
|
// this is a workaround for import of .ts files
|
|
75
86
|
"n/no-missing-import": [0],
|
|
76
87
|
},
|
|
88
|
+
},
|
|
89
|
+
{
|
|
90
|
+
files: ["src/test/**"],
|
|
91
|
+
rules: {
|
|
92
|
+
"@typescript-eslint/no-floating-promises": [0],
|
|
93
|
+
},
|
|
77
94
|
}
|
|
78
|
-
]);
|
|
95
|
+
]);
|
package/gulpfile.js
CHANGED
|
@@ -17,10 +17,14 @@ gulp.task("ts",
|
|
|
17
17
|
exec.task("tsc -p src")
|
|
18
18
|
));
|
|
19
19
|
|
|
20
|
+
gulp.task("spell", exec.task("cspell --no-progress"));
|
|
21
|
+
|
|
22
|
+
gulp.task("type-coverage", exec.task("type-coverage --detail"));
|
|
23
|
+
|
|
20
24
|
gulp.task("lint", exec.task("eslint src"));
|
|
21
25
|
|
|
22
|
-
gulp.task("test", exec.task("
|
|
26
|
+
gulp.task("test", exec.task("tsx --test --test-concurrency=1 --test-reporter=spec src/test/*.ts"));
|
|
23
27
|
|
|
24
28
|
gulp.task("build", gulp.series("ts"));
|
|
25
29
|
|
|
26
|
-
gulp.task("default", gulp.series("ts", "lint", "test"));
|
|
30
|
+
gulp.task("default", gulp.series("type-coverage", "spell", "ts", "lint", "test"));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tabletcommand-logger",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.6",
|
|
4
4
|
"description": "Tablet Command Logging Configuration",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "gulp ts",
|
|
@@ -32,11 +32,10 @@
|
|
|
32
32
|
"@types/express": "^4.17.25",
|
|
33
33
|
"@types/express-serve-static-core": "^4.19.8",
|
|
34
34
|
"@types/lodash": "^4.17.24",
|
|
35
|
-
"@types/
|
|
36
|
-
"@types/node": "^24.12.3",
|
|
35
|
+
"@types/node": "^24.12.4",
|
|
37
36
|
"@types/serve-static": "^2.2.0",
|
|
38
|
-
"@typescript-eslint/eslint-plugin": "^8.59.
|
|
39
|
-
"@typescript-eslint/parser": "^8.59.
|
|
37
|
+
"@typescript-eslint/eslint-plugin": "^8.59.3",
|
|
38
|
+
"@typescript-eslint/parser": "^8.59.3",
|
|
40
39
|
"chai": "^6.2.2",
|
|
41
40
|
"cspell": "^10.0.0",
|
|
42
41
|
"del": "^8.0.1",
|
|
@@ -46,11 +45,8 @@
|
|
|
46
45
|
"globals": "^17.6.0",
|
|
47
46
|
"gulp": "^5.0.1",
|
|
48
47
|
"gulp-execa": "^8.0.1",
|
|
49
|
-
"mocha": "^11.7.5",
|
|
50
48
|
"neostandard": "^0.13.0",
|
|
51
|
-
"
|
|
52
|
-
"ts-node": "^10.9.2",
|
|
53
|
-
"tsconfig-paths": "^4.2.0",
|
|
49
|
+
"tsx": "^4.21.0",
|
|
54
50
|
"type-coverage": "^2.29.7",
|
|
55
51
|
"typescript": "~5.9.3"
|
|
56
52
|
}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import "mocha";
|
|
2
1
|
import { assert } from "chai";
|
|
2
|
+
import { describe, it, describe as context } from "node:test";
|
|
3
3
|
import { Request } from "express";
|
|
4
4
|
import MetricsModule, { cleanUpParams } from "../middleware/metrics";
|
|
5
|
+
|
|
5
6
|
const metrics = MetricsModule();
|
|
6
7
|
|
|
7
8
|
describe("Metrics Middleware", function() {
|
package/src/tsconfig.json
CHANGED