@moreapp/common-nodejs 0.12.2 → 0.12.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.
Files changed (31) hide show
  1. package/dist/__tests__/MoreAppClient.test.js +85 -0
  2. package/dist/__tests__/dateUtil.test.js +42 -0
  3. package/dist/{logger.test.js → __tests__/logger.test.js} +23 -10
  4. package/dist/__tests__/utils.test.js +124 -0
  5. package/dist/dateUtil.js +38 -8
  6. package/dist/index.d.ts +1 -1
  7. package/dist/index.js +1 -1
  8. package/dist/logger.js +2 -1
  9. package/dist/observability/TerminationHandler.js +5 -1
  10. package/dist/observability/{ExpressRequestTracker.test.js → __tests__/ExpressRequestTracker.test.js} +16 -15
  11. package/dist/observability/{ObservabilityServer.test.js → __tests__/ObservabilityServer.test.js} +30 -23
  12. package/dist/observability/__tests__/TerminationHandler.test.js +171 -0
  13. package/dist/observability/index.d.ts +2 -1
  14. package/dist/observability/index.js +3 -1
  15. package/dist/observability/tracer.d.ts +12 -0
  16. package/dist/{tracer.js → observability/tracer.js} +15 -7
  17. package/package.json +12 -12
  18. package/dist/MoreAppClient.test.js +0 -79
  19. package/dist/dateUtil.test.js +0 -41
  20. package/dist/observability/TerminationHandler.test.js +0 -160
  21. package/dist/testUtils.d.ts +0 -1
  22. package/dist/testUtils.js +0 -13
  23. package/dist/tracer.d.ts +0 -8
  24. package/dist/utils.test.js +0 -123
  25. /package/dist/{MoreAppClient.test.d.ts → __tests__/MoreAppClient.test.d.ts} +0 -0
  26. /package/dist/{dateUtil.test.d.ts → __tests__/dateUtil.test.d.ts} +0 -0
  27. /package/dist/{logger.test.d.ts → __tests__/logger.test.d.ts} +0 -0
  28. /package/dist/{utils.test.d.ts → __tests__/utils.test.d.ts} +0 -0
  29. /package/dist/observability/{ExpressRequestTracker.test.d.ts → __tests__/ExpressRequestTracker.test.d.ts} +0 -0
  30. /package/dist/observability/{ObservabilityServer.test.d.ts → __tests__/ObservabilityServer.test.d.ts} +0 -0
  31. /package/dist/observability/{TerminationHandler.test.d.ts → __tests__/TerminationHandler.test.d.ts} +0 -0
@@ -0,0 +1,171 @@
1
+ "use strict";
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
+ })();
35
+ var __importDefault = (this && this.__importDefault) || function (mod) {
36
+ return (mod && mod.__esModule) ? mod : { "default": mod };
37
+ };
38
+ Object.defineProperty(exports, "__esModule", { value: true });
39
+ const vitest_1 = require("vitest");
40
+ const node_events_1 = require("node:events");
41
+ const timers = __importStar(require("node:timers"));
42
+ const TerminationHandler_1 = __importDefault(require("../TerminationHandler"));
43
+ vitest_1.vi.mock("../../logger", () => ({
44
+ logger: {
45
+ info: vitest_1.vi.fn(),
46
+ warn: vitest_1.vi.fn(),
47
+ error: vitest_1.vi.fn(),
48
+ debug: vitest_1.vi.fn(),
49
+ },
50
+ }));
51
+ // Mock tracer
52
+ vitest_1.vi.mock("../tracer", () => ({
53
+ default: {
54
+ shutdown: vitest_1.vi.fn(() => Promise.resolve()),
55
+ },
56
+ }));
57
+ // Mock node:timers so we can control callbacks (TerminationHandler imports from node:timers)
58
+ vitest_1.vi.mock("node:timers", () => ({
59
+ setInterval: vitest_1.vi.fn(),
60
+ clearInterval: vitest_1.vi.fn(),
61
+ setTimeout: vitest_1.vi.fn(),
62
+ }));
63
+ (0, vitest_1.describe)("TerminationHandler", () => {
64
+ let intervalCb;
65
+ let timeoutCallbacks = [];
66
+ (0, vitest_1.beforeEach)(() => {
67
+ intervalCb = undefined;
68
+ timeoutCallbacks = [];
69
+ vitest_1.vi.mocked(timers.setInterval).mockImplementation((cb) => {
70
+ intervalCb = cb;
71
+ return 1;
72
+ });
73
+ vitest_1.vi.mocked(timers.clearInterval).mockImplementation(() => { });
74
+ vitest_1.vi.spyOn(globalThis, "setTimeout").mockImplementation((cb) => {
75
+ timeoutCallbacks.push(cb);
76
+ return timeoutCallbacks.length;
77
+ });
78
+ });
79
+ (0, vitest_1.afterEach)(() => {
80
+ vitest_1.vi.resetAllMocks();
81
+ });
82
+ const createFakeServer = () => {
83
+ const emitter = new node_events_1.EventEmitter();
84
+ const server = {
85
+ close: vitest_1.vi.fn((cb) => {
86
+ if (cb)
87
+ cb();
88
+ return server;
89
+ }),
90
+ on: vitest_1.vi.fn((event, listener) => {
91
+ emitter.on(event, listener);
92
+ return server;
93
+ }),
94
+ emit: emitter.emit.bind(emitter),
95
+ };
96
+ return server;
97
+ };
98
+ const createSocket = () => {
99
+ const emitter = new node_events_1.EventEmitter();
100
+ const socket = emitter;
101
+ socket.destroy = vitest_1.vi.fn();
102
+ return socket;
103
+ };
104
+ (0, vitest_1.test)("shutdown waits for active requests to reach 0 then stops and exits 0", async () => {
105
+ const server = createFakeServer();
106
+ const hs = {
107
+ setReady: vitest_1.vi.fn(),
108
+ stop: vitest_1.vi.fn(() => Promise.resolve()),
109
+ };
110
+ const requestTracker = { nrOfActiveRequests: vitest_1.vi.fn(() => 0) };
111
+ const exitSpy = vitest_1.vi.spyOn(process, "exit").mockImplementation(() => undefined);
112
+ const th = new TerminationHandler_1.default(server, hs, requestTracker);
113
+ th.shutdown();
114
+ (0, vitest_1.expect)(hs.setReady).toHaveBeenCalledWith(false);
115
+ (0, vitest_1.expect)(server.close).toHaveBeenCalled();
116
+ // First interval tick should see 0 active and exit
117
+ intervalCb?.();
118
+ // ensure hs.stop called
119
+ (0, vitest_1.expect)(hs.stop).toHaveBeenCalled();
120
+ // Wait for Promise.all and .finally() to execute
121
+ await new Promise((resolve) => setImmediate(resolve));
122
+ // Trigger log flush timeout (index 1, after the 30s timeout at index 0)
123
+ timeoutCallbacks[1]?.();
124
+ (0, vitest_1.expect)(exitSpy).toHaveBeenCalledWith(0);
125
+ });
126
+ (0, vitest_1.test)("shutdown polls until requests finish then exits 0", async () => {
127
+ const server = createFakeServer();
128
+ const hs = {
129
+ setReady: vitest_1.vi.fn(),
130
+ stop: vitest_1.vi.fn(() => Promise.resolve()),
131
+ };
132
+ const requestTracker = { nrOfActiveRequests: vitest_1.vi.fn() };
133
+ // Return >0 first, then 0
134
+ requestTracker.nrOfActiveRequests.mockReturnValueOnce(2).mockReturnValueOnce(0);
135
+ const exitSpy = vitest_1.vi.spyOn(process, "exit").mockImplementation(() => undefined);
136
+ const th = new TerminationHandler_1.default(server, hs, requestTracker);
137
+ th.shutdown();
138
+ // First tick: still waiting
139
+ intervalCb?.();
140
+ (0, vitest_1.expect)(exitSpy).not.toHaveBeenCalled();
141
+ // Second tick: now 0
142
+ intervalCb?.();
143
+ (0, vitest_1.expect)(hs.stop).toHaveBeenCalled();
144
+ // Wait for Promise.all and .finally() to execute
145
+ await new Promise((resolve) => setImmediate(resolve));
146
+ // Trigger log flush timeout (index 1, after the 30s timeout at index 0)
147
+ timeoutCallbacks[1]?.();
148
+ (0, vitest_1.expect)(exitSpy).toHaveBeenCalledWith(0);
149
+ });
150
+ (0, vitest_1.test)("forceful stop after 30s destroys sockets and exits 1", () => {
151
+ const server = createFakeServer();
152
+ const hs = {
153
+ setReady: vitest_1.vi.fn(),
154
+ stop: vitest_1.vi.fn(() => Promise.resolve()),
155
+ };
156
+ const requestTracker = { nrOfActiveRequests: vitest_1.vi.fn(() => 5) }; // never reaches 0
157
+ const exitSpy = vitest_1.vi.spyOn(process, "exit").mockImplementation(() => undefined);
158
+ const th = new TerminationHandler_1.default(server, hs, requestTracker);
159
+ // Register a socket via the server's connection event
160
+ const socket = createSocket();
161
+ server.emit("connection", socket);
162
+ th.shutdown();
163
+ // Before timeout callback, no exit
164
+ (0, vitest_1.expect)(exitSpy).not.toHaveBeenCalled();
165
+ (0, vitest_1.expect)(socket.destroy).not.toHaveBeenCalled();
166
+ // Trigger shutdown timeout (index 0 is the 30s timeout)
167
+ timeoutCallbacks[0]?.();
168
+ (0, vitest_1.expect)(socket.destroy).toHaveBeenCalled();
169
+ (0, vitest_1.expect)(exitSpy).toHaveBeenCalledWith(1);
170
+ });
171
+ });
@@ -1,4 +1,5 @@
1
1
  import ExpressRequestTracker from "./ExpressRequestTracker";
2
2
  import ObservabilityServer from "./ObservabilityServer";
3
3
  import TerminationHandler from "./TerminationHandler";
4
- export { ExpressRequestTracker, ObservabilityServer, TerminationHandler };
4
+ import tracer from "./tracer";
5
+ export { ExpressRequestTracker, ObservabilityServer, TerminationHandler, tracer };
@@ -3,10 +3,12 @@ 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.TerminationHandler = exports.ObservabilityServer = exports.ExpressRequestTracker = void 0;
6
+ exports.tracer = exports.TerminationHandler = exports.ObservabilityServer = exports.ExpressRequestTracker = void 0;
7
7
  const ExpressRequestTracker_1 = __importDefault(require("./ExpressRequestTracker"));
8
8
  exports.ExpressRequestTracker = ExpressRequestTracker_1.default;
9
9
  const ObservabilityServer_1 = __importDefault(require("./ObservabilityServer"));
10
10
  exports.ObservabilityServer = ObservabilityServer_1.default;
11
11
  const TerminationHandler_1 = __importDefault(require("./TerminationHandler"));
12
12
  exports.TerminationHandler = TerminationHandler_1.default;
13
+ const tracer_1 = __importDefault(require("./tracer"));
14
+ exports.tracer = tracer_1.default;
@@ -0,0 +1,12 @@
1
+ import * as types from "@opentelemetry/instrumentation/build/src/types";
2
+ declare const _default: {
3
+ start: (serviceName: string, { http, extraInstrumentations, debug, }: {
4
+ http?: {
5
+ portsToInstrument: number[];
6
+ };
7
+ extraInstrumentations?: types.Instrumentation[];
8
+ debug?: boolean;
9
+ }) => void;
10
+ shutdown: () => Promise<void>;
11
+ };
12
+ export default _default;
@@ -1,6 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.tracer = void 0;
4
3
  const api_1 = require("@opentelemetry/api");
5
4
  const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
6
5
  const instrumentation_1 = require("@opentelemetry/instrumentation");
@@ -12,18 +11,21 @@ const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
12
11
  const resources_1 = require("@opentelemetry/resources");
13
12
  const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
14
13
  const propagator_b3_1 = require("@opentelemetry/propagator-b3");
15
- const utils_1 = require("./utils");
14
+ const utils_1 = require("../utils");
16
15
  const exporter_trace_otlp_grpc_1 = require("@opentelemetry/exporter-trace-otlp-grpc");
17
- const tracer = (serviceName, { http = {
16
+ const lodash_1 = require("lodash");
17
+ const logger_1 = require("../logger");
18
+ let provider;
19
+ const start = (serviceName, { http = {
18
20
  portsToInstrument: [3000],
19
21
  }, extraInstrumentations = [], debug = false, }) => {
20
22
  if (debug) {
21
23
  api_1.diag.setLogger(new api_1.DiagConsoleLogger(), api_1.DiagLogLevel.DEBUG);
22
24
  }
23
- const provider = new sdk_trace_node_1.NodeTracerProvider({
25
+ provider = new sdk_trace_node_1.NodeTracerProvider({
24
26
  resource: (0, resources_1.resourceFromAttributes)({
25
- [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: serviceName,
26
- [semantic_conventions_1.SemanticResourceAttributes.SERVICE_INSTANCE_ID]: (0, utils_1.environmentVariable)("HOSTNAME", "local"),
27
+ [semantic_conventions_1.ATTR_SERVICE_NAME]: serviceName,
28
+ [semantic_conventions_1.ATTR_SERVICE_INSTANCE_ID]: (0, utils_1.environmentVariable)("HOSTNAME", "local"),
27
29
  }),
28
30
  spanProcessors: [
29
31
  ...((0, utils_1.environmentVariable)("STACKDRIVER_TRACING_ENABLED", false)
@@ -51,4 +53,10 @@ const tracer = (serviceName, { http = {
51
53
  ],
52
54
  });
53
55
  };
54
- exports.tracer = tracer;
56
+ const shutdown = async () => {
57
+ if (!(0, lodash_1.isNil)(provider)) {
58
+ logger_1.logger.info("Shutting down tracer");
59
+ await provider.shutdown();
60
+ }
61
+ };
62
+ exports.default = { start, shutdown };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@moreapp/common-nodejs",
3
- "version": "0.12.2",
3
+ "version": "0.12.4",
4
4
  "license": "UNLICENSED",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -10,14 +10,14 @@
10
10
  "types": "./dist/index.d.ts"
11
11
  },
12
12
  "./tracer": {
13
- "default": "./dist/tracer.js",
14
- "types": "./dist/tracer.d.ts"
13
+ "default": "./dist/observability/tracer.js",
14
+ "types": "./dist/observability/tracer.d.ts"
15
15
  }
16
16
  },
17
17
  "scripts": {
18
18
  "build": "tsc",
19
- "test": "jest --detectOpenHandles",
20
- "test:workflow": "yarn test --coverage",
19
+ "test": "vitest run",
20
+ "test:workflow": "vitest run --coverage",
21
21
  "prettier": "prettier './**/*.{ts,json,yaml,md,}'",
22
22
  "format:check": "yarn prettier --check",
23
23
  "format:fix": "yarn prettier --write",
@@ -53,24 +53,24 @@
53
53
  },
54
54
  "devDependencies": {
55
55
  "@types/express": "5.0.6",
56
- "@types/jest": "30.0.0",
57
56
  "@types/lodash": "4.17.24",
58
57
  "@types/node": "24.12.3",
59
58
  "@typescript-eslint/eslint-plugin": "8.59.2",
60
59
  "@typescript-eslint/parser": "8.59.2",
60
+ "@vitest/coverage-v8": "4.1.6",
61
+ "@vitest/ui": "4.1.6",
61
62
  "eslint": "9.39.4",
62
63
  "eslint-config-prettier": "10.1.8",
63
64
  "eslint-plugin-prettier": "5.5.5",
64
65
  "husky": "9.1.7",
65
- "jest": "30.4.1",
66
- "jest-mock-extended": "4.0.1",
67
- "lint-staged": "17.0.2",
66
+ "lint-staged": "17.0.4",
68
67
  "nock": "14.0.15",
69
68
  "prettier": "3.8.3",
70
- "ts-jest": "29.4.9",
71
69
  "ts-node": "10.9.2",
72
- "typescript": "5.9.3",
73
- "typescript-eslint": "8.59.2"
70
+ "typescript": "6.0.3",
71
+ "typescript-eslint": "8.59.2",
72
+ "vitest": "4.1.6",
73
+ "vitest-mock-extended": "4.0.0"
74
74
  },
75
75
  "prettier": {
76
76
  "printWidth": 100,
@@ -1,79 +0,0 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- const nock_1 = __importDefault(require("nock"));
7
- const axios_1 = require("axios");
8
- const MoreAppClient_1 = __importDefault(require("./MoreAppClient"));
9
- test("download binary file", async () => {
10
- const file = Buffer.from("Some data");
11
- const apiMock = (0, nock_1.default)("https://api.moreapp.com")
12
- .get("/download")
13
- .matchHeader("x-more-seal", "my-seal")
14
- .reply(200, file, {
15
- "Content-Type": "image/jpg",
16
- "content-disposition": 'attachment; filename="my%20photo.jpg"',
17
- });
18
- const client = new MoreAppClient_1.default({
19
- serviceName: "Common Test",
20
- prefix: "https://api.moreapp.com",
21
- seal: "my-seal",
22
- });
23
- const binaryFile = await client.getBinary("/download");
24
- expect(binaryFile.buffer).toStrictEqual(file);
25
- expect(binaryFile.contentType).toBe("image/jpg");
26
- expect(binaryFile.filename).toBe("my photo.jpg");
27
- apiMock.done();
28
- });
29
- test("404", async () => {
30
- const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(404);
31
- const client = new MoreAppClient_1.default({
32
- serviceName: "Common Test",
33
- prefix: "https://api.moreapp.com",
34
- seal: "my-seal",
35
- });
36
- await expect(client.getBinary("/download")).rejects.toStrictEqual(new axios_1.AxiosError("Request failed with status code 404"));
37
- apiMock.done();
38
- });
39
- test("unable to connect", async () => {
40
- const client = new MoreAppClient_1.default({
41
- serviceName: "Common Test",
42
- prefix: "https://non-existing.moreapp.com",
43
- seal: "my-seal",
44
- });
45
- await expect(client.getBinary("/download")).rejects.toThrow("getaddrinfo ENOTFOUND non-existing.moreapp.com");
46
- });
47
- const client = new MoreAppClient_1.default({
48
- serviceName: "Common Test",
49
- prefix: "https://api.moreapp.com",
50
- seal: "my-seal",
51
- });
52
- test("Handle non existing file", async () => {
53
- const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(404);
54
- await expect(client.getBinary("/download")).rejects.toThrow("Request failed with status code 404");
55
- apiMock.done();
56
- });
57
- test("Handle missing 'content-type' header", async () => {
58
- const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(200);
59
- const binaryFile = await client.getBinary("/download");
60
- expect(binaryFile).not.toBeNull();
61
- expect(binaryFile.contentType).toBe("unknown");
62
- apiMock.done();
63
- });
64
- test("Handle missing 'content-disposition' header", async () => {
65
- const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(200);
66
- const binaryFile = await client.getBinary("/download");
67
- expect(binaryFile).not.toBeNull();
68
- expect(binaryFile.filename).toBeUndefined();
69
- apiMock.done();
70
- });
71
- test("Handle invalid 'content-disposition' header", async () => {
72
- const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(200, {}, {
73
- "content-disposition": "filename=my-photo.png",
74
- });
75
- const binaryFile = await client.getBinary("/download");
76
- expect(binaryFile).not.toBeNull();
77
- expect(binaryFile.filename).toBeUndefined();
78
- apiMock.done();
79
- });
@@ -1,41 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const dateUtil_1 = require("./dateUtil");
4
- describe("isDate", () => {
5
- test("should handle valid dates", () => {
6
- expect((0, dateUtil_1.isDate)("2020-01-01")).toBe(true);
7
- expect((0, dateUtil_1.isDate)("2020-1-1")).toBe(true);
8
- expect((0, dateUtil_1.isDate)("0000-1-1")).toBe(true);
9
- });
10
- test("should handle invalid dates", () => {
11
- expect((0, dateUtil_1.isDate)("not-a-date")).toBe(false);
12
- expect((0, dateUtil_1.isDate)("3039-20-01")).toBe(false);
13
- });
14
- });
15
- describe("isDateTime", () => {
16
- test("should handle valid date times", () => {
17
- expect((0, dateUtil_1.isDateTime)("2020-01-01 12:00")).toBe(true);
18
- expect((0, dateUtil_1.isDateTime)("2020-01-01 0:00")).toBe(true);
19
- });
20
- test("should handle invalid date times", () => {
21
- expect((0, dateUtil_1.isDateTime)("2020-01-01 0:99")).toBe(false);
22
- expect((0, dateUtil_1.isDateTime)("2020-01-01 25:12")).toBe(false);
23
- });
24
- });
25
- describe("formatDate", () => {
26
- test("should format to given input", () => {
27
- expect((0, dateUtil_1.formatDate)("2022-02-18", "DDMMYYYY")).toBe("18-02-2022");
28
- expect((0, dateUtil_1.formatDate)("2022-02-18", "MMDDYYYY")).toBe("02-18-2022");
29
- expect((0, dateUtil_1.formatDate)("2022-02-18", "YYYYMMDD")).toBe("2022-02-18");
30
- expect((0, dateUtil_1.formatDate)("2022-02-18", "invalid")).toBe("18-02-2022");
31
- });
32
- });
33
- describe("formatDateTime", () => {
34
- test("should format to given input", () => {
35
- expect((0, dateUtil_1.formatDateTime)(1645191420000, "DDMMYYYY")).toBe("18-02-2022 13:37");
36
- expect((0, dateUtil_1.formatDateTime)("2022-02-18 13:37", "DDMMYYYY")).toBe("18-02-2022 13:37");
37
- expect((0, dateUtil_1.formatDateTime)("2022-02-18 13:37", "MMDDYYYY")).toBe("02-18-2022 13:37");
38
- expect((0, dateUtil_1.formatDateTime)("2022-02-18 13:37", "YYYYMMDD")).toBe("2022-02-18 13:37");
39
- expect((0, dateUtil_1.formatDateTime)("2022-02-18 13:37", "invalid")).toBe("18-02-2022 13:37");
40
- });
41
- });
@@ -1,160 +0,0 @@
1
- "use strict";
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
- })();
35
- var __importDefault = (this && this.__importDefault) || function (mod) {
36
- return (mod && mod.__esModule) ? mod : { "default": mod };
37
- };
38
- Object.defineProperty(exports, "__esModule", { value: true });
39
- const testUtils_1 = require("../testUtils");
40
- (0, testUtils_1.silenceLogger)();
41
- const node_events_1 = require("node:events");
42
- const timers = __importStar(require("node:timers"));
43
- const TerminationHandler_1 = __importDefault(require("./TerminationHandler"));
44
- // Mock node:timers so we can control callbacks (TerminationHandler imports from node:timers)
45
- jest.mock("node:timers", () => ({
46
- setInterval: jest.fn(),
47
- clearInterval: jest.fn(),
48
- setTimeout: jest.fn(),
49
- }));
50
- describe("TerminationHandler", () => {
51
- let intervalCb;
52
- let timeoutCb;
53
- beforeEach(() => {
54
- intervalCb = undefined;
55
- timeoutCb = undefined;
56
- timers.setInterval.mockImplementation((cb) => {
57
- intervalCb = cb;
58
- return 1;
59
- });
60
- timers.clearInterval.mockImplementation(() => { });
61
- jest.spyOn(globalThis, "setTimeout").mockImplementation((cb) => {
62
- timeoutCb = cb;
63
- return 2;
64
- });
65
- });
66
- afterEach(() => {
67
- jest.resetAllMocks();
68
- });
69
- const createFakeServer = () => {
70
- const emitter = new node_events_1.EventEmitter();
71
- const server = {
72
- close: jest.fn((cb) => {
73
- if (cb)
74
- cb();
75
- return server;
76
- }),
77
- on: jest.fn((event, listener) => {
78
- emitter.on(event, listener);
79
- return server;
80
- }),
81
- emit: emitter.emit.bind(emitter),
82
- };
83
- return server;
84
- };
85
- const createSocket = () => {
86
- const emitter = new node_events_1.EventEmitter();
87
- const socket = emitter;
88
- socket.destroy = jest.fn();
89
- return socket;
90
- };
91
- test("shutdown waits for active requests to reach 0 then stops and exits 0", () => {
92
- const server = createFakeServer();
93
- const hs = {
94
- setReady: jest.fn(),
95
- stop: jest.fn(() => ({
96
- finally: (cb) => {
97
- cb();
98
- return Promise.resolve();
99
- },
100
- })),
101
- };
102
- const requestTracker = { nrOfActiveRequests: jest.fn(() => 0) };
103
- const exitSpy = jest.spyOn(process, "exit").mockImplementation(() => undefined);
104
- const th = new TerminationHandler_1.default(server, hs, requestTracker);
105
- th.shutdown();
106
- expect(hs.setReady).toHaveBeenCalledWith(false);
107
- expect(server.close).toHaveBeenCalled();
108
- // First interval tick should see 0 active and exit
109
- intervalCb?.();
110
- // ensure hs.stop called and exit called with 0
111
- expect(hs.stop).toHaveBeenCalled();
112
- expect(exitSpy).toHaveBeenCalledWith(0);
113
- });
114
- test("shutdown polls until requests finish then exits 0", () => {
115
- const server = createFakeServer();
116
- const hs = {
117
- setReady: jest.fn(),
118
- stop: jest.fn(() => ({
119
- finally: (cb) => {
120
- cb();
121
- return Promise.resolve();
122
- },
123
- })),
124
- };
125
- const requestTracker = { nrOfActiveRequests: jest.fn() };
126
- // Return >0 first, then 0
127
- requestTracker.nrOfActiveRequests.mockReturnValueOnce(2).mockReturnValueOnce(0);
128
- const exitSpy = jest.spyOn(process, "exit").mockImplementation(() => undefined);
129
- const th = new TerminationHandler_1.default(server, hs, requestTracker);
130
- th.shutdown();
131
- // First tick: still waiting
132
- intervalCb?.();
133
- expect(exitSpy).not.toHaveBeenCalled();
134
- // Second tick: now 0
135
- intervalCb?.();
136
- expect(hs.stop).toHaveBeenCalled();
137
- expect(exitSpy).toHaveBeenCalledWith(0);
138
- });
139
- test("forceful stop after 30s destroys sockets and exits 1", () => {
140
- const server = createFakeServer();
141
- const hs = {
142
- setReady: jest.fn(),
143
- stop: jest.fn(() => Promise.resolve()),
144
- };
145
- const requestTracker = { nrOfActiveRequests: jest.fn(() => 5) }; // never reaches 0
146
- const exitSpy = jest.spyOn(process, "exit").mockImplementation(() => undefined);
147
- const th = new TerminationHandler_1.default(server, hs, requestTracker);
148
- // Register a socket via the server's connection event
149
- const socket = createSocket();
150
- server.emit("connection", socket);
151
- th.shutdown();
152
- // Before timeout callback, no exit
153
- expect(exitSpy).not.toHaveBeenCalled();
154
- expect(socket.destroy).not.toHaveBeenCalled();
155
- // Trigger timeout
156
- timeoutCb?.();
157
- expect(socket.destroy).toHaveBeenCalled();
158
- expect(exitSpy).toHaveBeenCalledWith(1);
159
- });
160
- });
@@ -1 +0,0 @@
1
- export declare const silenceLogger: () => typeof jest;
package/dist/testUtils.js DELETED
@@ -1,13 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.silenceLogger = void 0;
4
- // Utility to silence logger output in tests must be at the top of the test file
5
- const silenceLogger = () => jest.mock("./logger", () => ({
6
- logger: {
7
- info: jest.fn(),
8
- warn: jest.fn(),
9
- error: jest.fn(),
10
- debug: jest.fn(),
11
- },
12
- }));
13
- exports.silenceLogger = silenceLogger;
package/dist/tracer.d.ts DELETED
@@ -1,8 +0,0 @@
1
- import * as types from "@opentelemetry/instrumentation/build/src/types";
2
- export declare const tracer: (serviceName: string, { http, extraInstrumentations, debug, }: {
3
- http?: {
4
- portsToInstrument: number[];
5
- };
6
- extraInstrumentations?: types.Instrumentation[];
7
- debug?: boolean;
8
- }) => void;