@abyss-project/monitor 2.2.1 → 2.4.0

package/README.md

@@ -28,6 +28,42 @@ pnpm add @abyss-project/monitor
 
 Voir la [documentation produit](https://docs.abyss-project.fr/monitor) pour les guides d'utilisation, la configuration du Core, les exemples d'appel et la référence des permissions.
 
+## Livraison fiable des logs
+
+Depuis la version portant le pipeline de logs fiable (SP-1), le `Logger` n'envoie plus un `POST` par
+ligne : les logs sont mis en file, regroupés en lots (100 lignes ou 1 Mo, toutes les 500 ms) puis
+envoyés à `POST /application-log/:applicationId/bulk`. En cas de coupure réseau ou de crash du process,
+les lots en attente sont conservés sur disque et rejoués, et un lot rejoué est dédupliqué côté serveur
+par `clientLogId`. Ce qui peut encore se perdre est borné : les lignes jetées par une file saturée
+(10 000 lignes ou 32 Mo en mémoire), évincées d'un spool plein (64 Mo) ou refusées définitivement par
+le serveur sont comptées, et ce nombre est remonté au serveur avec le lot suivant ; les lignes encore en
+mémoire quand le process est tué sans arrêt propre (SIGKILL, OOM) — celles émises depuis le dernier
+flush, 500 ms d'ordinaire, davantage pendant un envoi en cours — meurent avec lui sans être comptées.
+
+```typescript
+AbyssMonitorCore.setConfig({
+  // ... vos options habituelles
+  shipper: {
+    spoolDirectory: '/var/lib/my-app/abyss-monitor-spool', // ou ABYSS_MONITOR_SPOOL_DIR
+  },
+});
+```
+
+Sur Kubernetes/k3s, le répertoire par défaut (le répertoire temporaire du système) ne survit pas à un
+redémarrage de conteneur : montez un volume sur le chemin donné à `ABYSS_MONITOR_SPOOL_DIR` pour que les
+logs en attente survivent au redémarrage. Un `emptyDir` survit au redémarrage d'un conteneur, pas au
+remplacement du pod (déploiement, drain d'un nœud) : seul un volume persistant couvre ce cas. Chaque
+application écrit dans son propre sous-dossier, `<ABYSS_MONITOR_SPOOL_DIR>/<applicationId>/`.
+
+**Dans les tests d'un service consommateur**, désactivez le spool — `shipper: { spoolDirectory: null }`
+— ou pointez `ABYSS_MONITOR_SPOOL_DIR` vers un répertoire temporaire propre au run : sinon les tests
+écrivent dans le spool réel de la machine. Un process qui n'appelle jamais `setConfig` avec un
+`applicationId` et un `secretPublishToken` garde ses logs en mémoire, jusqu'à 10 000 lignes ou 32 Mo,
+en attendant une identité qui ne vient pas.
+
+Détails complets — options du `shipper`, contrat de l'endpoint `bulk`, ce que la fiabilisation garantit
+et ne garantit pas — dans la [documentation du Logger](https://docs.abyss-project.fr/monitor/setup/logger).
+
 ## Support
 
 Pour toute demande, ouvrir un ticket depuis [l'application Abyss](https://app.abyss-project.fr/dashboard/my-account/ticket/create).

package/dist/__tests__/alert-log-url.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__tests__/alert-log-url.test.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const alert_utils_1 = require("../utils/alert.utils");
+describe('D2 : lien du tableau de bord sans identifiant serveur', () => {
+    it("ne contient pas application_log_id= quand l'identifiant est absent (null)", () => {
+        const url = (0, alert_utils_1.buildDashboardLogUrl)(null);
+        expect(url).not.toContain('application_log_id=');
+        expect(url.endsWith('/monitor/log')).toBe(true);
+    });
+    it("ne contient pas application_log_id= quand l'identifiant est absent (undefined)", () => {
+        const url = (0, alert_utils_1.buildDashboardLogUrl)(undefined);
+        expect(url).not.toContain('application_log_id=');
+        expect(url.endsWith('/monitor/log')).toBe(true);
+    });
+    it("ajoute application_log_id= quand l'identifiant est connu", () => {
+        const url = (0, alert_utils_1.buildDashboardLogUrl)('log-123');
+        expect(url).toContain('application_log_id=log-123');
+        expect(url).not.toMatch(/application_log_id=$/);
+    });
+});
+//# sourceMappingURL=alert-log-url.test.js.map

package/dist/__tests__/alert-log-url.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"alert-log-url.test.js","sourceRoot":"","sources":["../../src/__tests__/alert-log-url.test.ts"],"names":[],"mappings":";;AAAA,sDAA4D;AAE5D,QAAQ,CAAC,uDAAuD,EAAE,GAAG,EAAE;IACrE,EAAE,CAAC,2EAA2E,EAAE,GAAG,EAAE;QACnF,MAAM,GAAG,GAAG,IAAA,kCAAoB,EAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;QACjD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gFAAgF,EAAE,GAAG,EAAE;QACxF,MAAM,GAAG,GAAG,IAAA,kCAAoB,EAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;QACjD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,GAAG,GAAG,IAAA,kCAAoB,EAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;QACpD,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/__tests__/application-log-bulk-api.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__tests__/application-log-bulk-api.test.js

@@ -0,0 +1,125 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const net = __importStar(require("net"));
+const axios_1 = require("axios");
+const __1 = require("..");
+const application_log_api_1 = require("../api/application-log.api");
+const log_shipper_model_1 = require("../models/log-shipper.model");
+const types_1 = require("../types");
+describe('createBulkApplicationLog', () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+    it('POST sur /application-log/:applicationId/bulk avec le token en query', async () => {
+        const post = jest
+            .spyOn(__1.AbyssMonitorCore.axios, 'post')
+            .mockResolvedValue({ data: { data: { created: 2, deduped: 0 } } });
+        const body = {
+            logs: [
+                { message: 'a', level: types_1.LogLevel.LOG, processId: '1', dateValue: new Date() },
+                { message: 'b', level: types_1.LogLevel.LOG, processId: '1', dateValue: new Date() },
+            ],
+            droppedCount: 3,
+        };
+        const response = await (0, application_log_api_1.createBulkApplicationLog)({ applicationId: 'app-1' }, { token: 'secret' }, body);
+        expect(post).toHaveBeenCalledWith('application-log/app-1/bulk', body, {
+            params: { token: 'secret' },
+            timeout: application_log_api_1.BULK_REQUEST_TIMEOUT_MS,
+            'axios-retry': { retries: 0 },
+        });
+        expect(response.data.created).toBe(2);
+    });
+    it("prend le délai de la requête dans timeoutMs quand l'appelant en donne un", async () => {
+        const post = jest
+            .spyOn(__1.AbyssMonitorCore.axios, 'post')
+            .mockResolvedValue({ data: { data: { created: 0, deduped: 0 } } });
+        await (0, application_log_api_1.createBulkApplicationLog)({ applicationId: 'app-1' }, { token: 'secret' }, {
+            logs: [],
+        }, { timeoutMs: 1_234 });
+        expect(post.mock.calls[0][2]).toMatchObject({ timeout: 1_234 });
+    });
+    describe('timeout', () => {
+        it('abandonne une requête restée sans réponse, et le shipper la garde pour plus tard', async () => {
+            const sockets = [];
+            const server = net.createServer((socket) => {
+                sockets.push(socket);
+            });
+            await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve));
+            const { port } = server.address();
+            const originalBaseURL = __1.AbyssMonitorCore.axios.defaults.baseURL;
+            __1.AbyssMonitorCore.axios.defaults.baseURL = `http://127.0.0.1:${port}/`;
+            let requestedTimeout;
+            const interceptor = __1.AbyssMonitorCore.axios.interceptors.request.use((config) => {
+                requestedTimeout = config.timeout;
+                config.timeout = 50;
+                return config;
+            });
+            try {
+                const startedAt = Date.now();
+                const error = await (0, application_log_api_1.createBulkApplicationLog)({ applicationId: 'app-1' }, { token: 'secret' }, { logs: [] }).then(() => null, (rejection) => rejection);
+                expect(application_log_api_1.BULK_REQUEST_TIMEOUT_MS).toBe(10_000);
+                expect(requestedTimeout).toBe(application_log_api_1.BULK_REQUEST_TIMEOUT_MS);
+                expect(Date.now() - startedAt).toBeLessThan(2_000);
+                expect(error?.code).toMatch(/^(ECONNABORTED|ETIMEDOUT)$/);
+                expect(error?.response).toBeUndefined();
+                expect((0, log_shipper_model_1.classifySendError)(error)).toBe(log_shipper_model_1.SendOutcome.RETRY);
+            }
+            finally {
+                __1.AbyssMonitorCore.axios.interceptors.request.eject(interceptor);
+                __1.AbyssMonitorCore.axios.defaults.baseURL = originalBaseURL;
+                sockets.forEach((socket) => socket.destroy());
+                await new Promise((resolve) => server.close(resolve));
+            }
+        });
+    });
+    describe('axios-retry override', () => {
+        const originalAdapter = __1.AbyssMonitorCore.axios.defaults.adapter;
+        afterEach(() => {
+            __1.AbyssMonitorCore.axios.defaults.adapter = originalAdapter;
+        });
+        const rejectWith503Adapter = (attempts) => (config) => {
+            attempts.count += 1;
+            const response = {
+                status: 503,
+                statusText: 'Service Unavailable',
+                headers: {},
+                config,
+                data: {},
+            };
+            return Promise.reject(new axios_1.AxiosError('Service Unavailable', axios_1.AxiosError.ERR_BAD_RESPONSE, config, null, response));
+        };
+        it('rejects after exactly one attempt even though the shared axios-retry config is enabled', async () => {
+            __1.AbyssMonitorCore.enableAxiosRetry({ retryDelay: () => 0 });
+            const attempts = { count: 0 };
+            __1.AbyssMonitorCore.axios.defaults.adapter = rejectWith503Adapter(attempts);
+            await expect((0, application_log_api_1.createBulkApplicationLog)({ applicationId: 'app-1' }, { token: 'secret' }, {
+                logs: [],
+            })).rejects.toMatchObject({ response: { status: 503 } });
+            expect(attempts.count).toBe(1);
+        });
+    });
+});
+//# sourceMappingURL=application-log-bulk-api.test.js.map

package/dist/__tests__/application-log-bulk-api.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"application-log-bulk-api.test.js","sourceRoot":"","sources":["../../src/__tests__/application-log-bulk-api.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/body-redaction.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__tests__/body-redaction.test.js

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const body_redaction_1 = require("../utils/body-redaction");
+describe('redactCapturedBody', () => {
+    it('drops credential keys by suffix, whatever the case or separator', () => {
+        const body = {
+            email: 'a@b.c',
+            password: 'p',
+            currentPassword: 'p',
+            new_password: 'p',
+            accessToken: 't',
+            refresh_token: 't',
+            'x-admin-token': 't',
+            adminToken: 't',
+            clientSecret: 's',
+            webhook_secret: 's',
+            apiKey: 'k',
+            API_KEY: 'k',
+        };
+        expect((0, body_redaction_1.redactCapturedBody)(body, body_redaction_1.CapturedBodySide.REQUEST)).toEqual({ email: 'a@b.c' });
+    });
+    it('drops exact keys sid, authorization and cookie', () => {
+        const body = { sid: 's', Authorization: 'Bearer x', cookie: 'c', user: { id: 'u1' } };
+        expect((0, body_redaction_1.redactCapturedBody)(body, body_redaction_1.CapturedBodySide.RESPONSE)).toEqual({ user: { id: 'u1' } });
+    });
+    it('drops code on the request side only', () => {
+        expect((0, body_redaction_1.redactCapturedBody)({ code: 'oauth-code', state: 'x' }, body_redaction_1.CapturedBodySide.REQUEST)).toEqual({
+            state: 'x',
+        });
+        expect((0, body_redaction_1.redactCapturedBody)({ code: 'emailNotVerified', type: 'authError' }, body_redaction_1.CapturedBodySide.RESPONSE)).toEqual({ code: 'emailNotVerified', type: 'authError' });
+    });
+    it('walks nested objects and arrays', () => {
+        const body = {
+            data: {
+                user: { id: 'u1' },
+                adminToken: 't',
+                items: [
+                    { id: 1, token: 'a' },
+                    { id: 2, token: 'b' },
+                ],
+            },
+        };
+        expect((0, body_redaction_1.redactCapturedBody)(body, body_redaction_1.CapturedBodySide.RESPONSE)).toEqual({
+            data: { user: { id: 'u1' }, items: [{ id: 1 }, { id: 2 }] },
+        });
+    });
+    it('passes primitives, strings and null through unchanged', () => {
+        expect((0, body_redaction_1.redactCapturedBody)('Payload Too Large', body_redaction_1.CapturedBodySide.RESPONSE)).toBe('Payload Too Large');
+        expect((0, body_redaction_1.redactCapturedBody)(null, body_redaction_1.CapturedBodySide.REQUEST)).toBeNull();
+        expect((0, body_redaction_1.redactCapturedBody)(42, body_redaction_1.CapturedBodySide.REQUEST)).toBe(42);
+        expect((0, body_redaction_1.redactCapturedBody)(['a', 'b'], body_redaction_1.CapturedBodySide.REQUEST)).toEqual(['a', 'b']);
+    });
+    it('keeps keys that only contain a credential word without ending with it', () => {
+        expect((0, body_redaction_1.redactCapturedBody)({ tokenCount: 3, passwordUpdatedAt: 'd', secretName: 'n' }, body_redaction_1.CapturedBodySide.RESPONSE)).toEqual({ tokenCount: 3, passwordUpdatedAt: 'd', secretName: 'n' });
+    });
+    it('drops invitationTokenId, the consumption credential of an invitation (card #471 / ADR-0090)', () => {
+        const body = { invitationTokenId: 'inv-1', email: 'a@b.c' };
+        expect((0, body_redaction_1.redactCapturedBody)(body, body_redaction_1.CapturedBodySide.REQUEST)).toEqual({ email: 'a@b.c' });
+        expect((0, body_redaction_1.redactCapturedBody)(body, body_redaction_1.CapturedBodySide.RESPONSE)).toEqual({ email: 'a@b.c' });
+    });
+    it('keeps tokenHistoryId: it does not end with the tokenid suffix', () => {
+        const body = { tokenHistoryId: 'th-1' };
+        expect((0, body_redaction_1.redactCapturedBody)(body, body_redaction_1.CapturedBodySide.REQUEST)).toEqual({ tokenHistoryId: 'th-1' });
+        expect((0, body_redaction_1.redactCapturedBody)(body, body_redaction_1.CapturedBodySide.RESPONSE)).toEqual({ tokenHistoryId: 'th-1' });
+    });
+    it('never mutates its input', () => {
+        const body = { password: 'p', nested: { token: 't' } };
+        (0, body_redaction_1.redactCapturedBody)(body, body_redaction_1.CapturedBodySide.REQUEST);
+        expect(body).toEqual({ password: 'p', nested: { token: 't' } });
+    });
+    it('replaces nesting deeper than 32 levels with null', () => {
+        let deep = { token: 'leak' };
+        for (let i = 0; i < 40; i += 1)
+            deep = { child: deep };
+        const out = JSON.stringify((0, body_redaction_1.redactCapturedBody)(deep, body_redaction_1.CapturedBodySide.REQUEST));
+        expect(out).not.toContain('leak');
+    });
+    it('keeps a JSON-parsed __proto__ key as an own property instead of letting it vanish', () => {
+        const body = JSON.parse('{"__proto__":{"isAdmin":true},"email":"a@b.c"}');
+        const out = (0, body_redaction_1.redactCapturedBody)(body, body_redaction_1.CapturedBodySide.REQUEST);
+        expect(Object.keys(out)).toEqual(['__proto__', 'email']);
+        expect(JSON.stringify(out)).toContain('"__proto__"');
+        expect(Object.getPrototypeOf(out)).toBe(Object.prototype);
+    });
+    it('still drops a credential key nested under a __proto__ own property', () => {
+        const body = JSON.parse('{"__proto__":{"token":"leak","id":1}}');
+        const out = (0, body_redaction_1.redactCapturedBody)(body, body_redaction_1.CapturedBodySide.REQUEST);
+        expect(JSON.stringify(out)).not.toContain('leak');
+        expect(JSON.stringify(out)).toContain('"id":1');
+    });
+    it('does not pollute the global Object prototype', () => {
+        (0, body_redaction_1.redactCapturedBody)(JSON.parse('{"__proto__":{"isAdmin":true},"email":"a@b.c"}'), body_redaction_1.CapturedBodySide.REQUEST);
+        (0, body_redaction_1.redactCapturedBody)(JSON.parse('{"__proto__":{"token":"leak","id":1}}'), body_redaction_1.CapturedBodySide.REQUEST);
+        expect({}.isAdmin).toBeUndefined();
+    });
+});
+describe('isCredentialBodyKey', () => {
+    it('matches suffixes after normalization', () => {
+        expect((0, body_redaction_1.isCredentialBodyKey)('secretPublishToken', body_redaction_1.CapturedBodySide.RESPONSE)).toBe(true);
+        expect((0, body_redaction_1.isCredentialBodyKey)('personal_api_key', body_redaction_1.CapturedBodySide.RESPONSE)).toBe(true);
+        expect((0, body_redaction_1.isCredentialBodyKey)('description', body_redaction_1.CapturedBodySide.RESPONSE)).toBe(false);
+    });
+});
+//# sourceMappingURL=body-redaction.test.js.map

package/dist/__tests__/body-redaction.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"body-redaction.test.js","sourceRoot":"","sources":["../../src/__tests__/body-redaction.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/graceful-shutdown-flush.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__tests__/graceful-shutdown-flush.test.js

@@ -0,0 +1,253 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const graceful_shutdown_utils_1 = require("../utils/graceful-shutdown.utils");
+const logger_model_1 = require("../models/logger.model");
+const __1 = require("..");
+const request_tracker_utils_1 = require("../utils/request-tracker.utils");
+const applicationLogApi = __importStar(require("../api/application-log.api"));
+const types_1 = require("../types");
+const ACK = { data: { created: 1, deduped: 0 } };
+const messagesSent = (spy) => spy.mock.calls.flatMap((call) => call[2].logs.map((log) => log.message));
+class DelayedErrorLogger extends logger_model_1.Logger {
+    async error(message, payload, options) {
+        await new Promise((resolve) => setImmediate(resolve));
+        return super.error(message, payload, options);
+    }
+}
+class HangingErrorLogger extends logger_model_1.Logger {
+    async error() {
+        return new Promise(() => undefined);
+    }
+}
+const httpError = (status) => Object.assign(new Error(`HTTP ${status}`), { response: { status } });
+const removeAllShutdownListeners = () => {
+    process.removeAllListeners('SIGTERM');
+    process.removeAllListeners('SIGINT');
+    process.removeAllListeners('uncaughtException');
+    process.removeAllListeners('unhandledRejection');
+};
+describe('setupGracefulShutdown — flush avant process.exit', () => {
+    afterEach(() => {
+        removeAllShutdownListeners();
+        (0, request_tracker_utils_1.setIsShuttingDown)(false);
+        __1.AbyssMonitorCore.getShipper().stop();
+        jest.restoreAllMocks();
+        jest.useRealTimers();
+    });
+    it('vide le shipper AVANT process.exit (succès)', async () => {
+        const order = [];
+        jest.spyOn(__1.AbyssMonitorCore.getShipper(), 'flush').mockImplementation(async () => {
+            order.push('flush');
+        });
+        const exit = jest.spyOn(process, 'exit').mockImplementation((() => {
+            order.push('exit');
+            return undefined;
+        }));
+        (0, graceful_shutdown_utils_1.setupGracefulShutdown)({ logger: new logger_model_1.Logger({ shouldDisableConsoleLogging: true }) });
+        process.emit('SIGTERM');
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        expect(order).toEqual(['flush', 'exit']);
+        expect(exit).toHaveBeenCalledWith(0);
+    });
+    it('vide le shipper AVANT process.exit (erreur pendant le shutdown)', async () => {
+        const order = [];
+        jest.spyOn(__1.AbyssMonitorCore.getShipper(), 'flush').mockImplementation(async () => {
+            order.push('flush');
+        });
+        const exit = jest.spyOn(process, 'exit').mockImplementation((() => {
+            order.push('exit');
+            return undefined;
+        }));
+        (0, graceful_shutdown_utils_1.setupGracefulShutdown)({
+            logger: new logger_model_1.Logger({ shouldDisableConsoleLogging: true }),
+            httpServer: {
+                close: (callback) => callback(new Error('close failed')),
+            },
+        });
+        process.emit('SIGTERM');
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        expect(order).toEqual(['flush', 'exit']);
+        expect(exit).toHaveBeenCalledWith(1);
+    });
+    it("le timeout de shutdown vide la file sur disque (flush(0)) avant de forcer l'exit", async () => {
+        const order = [];
+        const flush = jest
+            .spyOn(__1.AbyssMonitorCore.getShipper(), 'flush')
+            .mockImplementation(async () => {
+            order.push('flush');
+        });
+        const exit = jest.spyOn(process, 'exit').mockImplementation((() => {
+            order.push('exit');
+            return undefined;
+        }));
+        (0, graceful_shutdown_utils_1.setupGracefulShutdown)({
+            logger: new logger_model_1.Logger({ shouldDisableConsoleLogging: true }),
+            shutdownTimeout: 20,
+            otherResources: [{ close: () => new Promise(() => { }) }],
+        });
+        process.emit('SIGTERM');
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        expect(order).toEqual(['flush', 'exit']);
+        expect(flush).toHaveBeenCalledWith(0, { ignoreBackoff: true });
+        expect(exit).toHaveBeenCalledWith(1);
+    });
+    it('appelle stop() sur le shipper AVANT le flush', async () => {
+        const order = [];
+        const shipper = __1.AbyssMonitorCore.getShipper();
+        jest.spyOn(shipper, 'stop').mockImplementation(() => {
+            order.push('stop');
+        });
+        jest.spyOn(shipper, 'flush').mockImplementation(async () => {
+            order.push('flush');
+        });
+        jest.spyOn(process, 'exit').mockImplementation((() => undefined));
+        (0, graceful_shutdown_utils_1.setupGracefulShutdown)({ logger: new logger_model_1.Logger({ shouldDisableConsoleLogging: true }) });
+        process.emit('SIGTERM');
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        expect(order).toEqual(['stop', 'flush']);
+    });
+    it('borne un flush qui ne se termine jamais : exit survient quand même après le délai + marge', async () => {
+        jest.useFakeTimers({ doNotFake: ['nextTick', 'setImmediate', 'queueMicrotask'] });
+        jest.spyOn(__1.AbyssMonitorCore.getShipper(), 'flush').mockImplementation(() => new Promise(() => {
+        }));
+        const exit = jest.spyOn(process, 'exit').mockImplementation((() => undefined));
+        (0, graceful_shutdown_utils_1.setupGracefulShutdown)({ logger: new logger_model_1.Logger({ shouldDisableConsoleLogging: true }) });
+        process.emit('SIGTERM');
+        await jest.advanceTimersByTimeAsync(2_000);
+        expect(exit).not.toHaveBeenCalled();
+        await jest.advanceTimersByTimeAsync(1_500);
+        expect(exit).toHaveBeenCalledWith(0);
+    });
+    it('envoie malgré un recul actif (503 puis SIGTERM) — amendement A3', async () => {
+        const order = [];
+        __1.AbyssMonitorCore.setConfig({
+            applicationId: 'app-flush-backoff',
+            secretPublishToken: 'secret',
+            shipper: { spoolDirectory: null, flushIntervalMs: 60_000 },
+        });
+        const shipper = __1.AbyssMonitorCore.getShipper();
+        const post = jest
+            .spyOn(applicationLogApi, 'createBulkApplicationLog')
+            .mockRejectedValueOnce(httpError(503))
+            .mockResolvedValue({ data: { created: 1, deduped: 0 } });
+        shipper.enqueue({
+            message: 'en attente de recul',
+            level: types_1.LogLevel.LOG,
+            processId: '1',
+            dateValue: new Date(),
+            clientLogId: 'flush-backoff-1',
+        });
+        await shipper.flush(3_000);
+        expect(post).toHaveBeenCalledTimes(1);
+        jest.spyOn(process, 'exit').mockImplementation((() => {
+            order.push('exit');
+            return undefined;
+        }));
+        const flushSpy = jest.spyOn(shipper, 'flush');
+        (0, graceful_shutdown_utils_1.setupGracefulShutdown)({ logger: new logger_model_1.Logger({ shouldDisableConsoleLogging: true }) });
+        process.emit('SIGTERM');
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        expect(post).toHaveBeenCalledTimes(2);
+        expect(flushSpy).toHaveBeenCalledWith(3_000, { ignoreBackoff: true });
+        expect(order).toEqual(['exit']);
+    });
+});
+describe.each([
+    ['uncaughtException', () => process.emit('uncaughtException', new Error('boom'))],
+    [
+        'unhandledRejection',
+        () => process.emit('unhandledRejection', new Error('boom'), Promise.resolve()),
+    ],
+])('setupGracefulShutdown — %s : un seul flush par sortie', (eventName, emitCrash) => {
+    afterEach(() => {
+        removeAllShutdownListeners();
+        (0, request_tracker_utils_1.setIsShuttingDown)(false);
+        __1.AbyssMonitorCore.getShipper().stop();
+        jest.restoreAllMocks();
+        jest.useRealTimers();
+    });
+    it('pas de shutdown en cours : un seul flush, celui de gracefulShutdown — le log de crash y figure', async () => {
+        __1.AbyssMonitorCore.setConfig({
+            applicationId: `app-crash-a-${eventName}`,
+            secretPublishToken: 'secret',
+            shipper: { spoolDirectory: null, flushIntervalMs: 60_000 },
+        });
+        const shipper = __1.AbyssMonitorCore.getShipper();
+        const post = jest
+            .spyOn(applicationLogApi, 'createBulkApplicationLog')
+            .mockResolvedValue(ACK);
+        const flushSpy = jest.spyOn(shipper, 'flush');
+        const exit = jest.spyOn(process, 'exit').mockImplementation((() => undefined));
+        (0, graceful_shutdown_utils_1.setupGracefulShutdown)({
+            logger: new DelayedErrorLogger({ shouldDisableConsoleLogging: true }),
+        });
+        emitCrash();
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        expect(flushSpy).toHaveBeenCalledTimes(1);
+        expect(exit).toHaveBeenCalledWith(0);
+        expect(messagesSent(post)).toContain(eventName === 'uncaughtException' ? 'Uncaught Exception' : 'Unhandled Rejection');
+    });
+    it(`un log de crash qui ne rend jamais la main ne retient l'arrêt que ${graceful_shutdown_utils_1.CRASH_LOG_TIMEOUT_MS} ms`, async () => {
+        jest.useFakeTimers({ doNotFake: ['nextTick', 'setImmediate', 'queueMicrotask'] });
+        const flush = jest
+            .spyOn(__1.AbyssMonitorCore.getShipper(), 'flush')
+            .mockImplementation(async () => undefined);
+        const exit = jest.spyOn(process, 'exit').mockImplementation((() => undefined));
+        (0, graceful_shutdown_utils_1.setupGracefulShutdown)({
+            logger: new HangingErrorLogger({ shouldDisableConsoleLogging: true }),
+        });
+        emitCrash();
+        await jest.advanceTimersByTimeAsync(graceful_shutdown_utils_1.CRASH_LOG_TIMEOUT_MS - 1);
+        expect(flush).not.toHaveBeenCalled();
+        expect(exit).not.toHaveBeenCalled();
+        await jest.advanceTimersByTimeAsync(1);
+        expect(flush).toHaveBeenCalledTimes(1);
+        expect(exit).toHaveBeenCalledWith(0);
+    });
+    it('shutdown déjà en cours : le flush du handler tourne seul, le log y figure, gracefulShutdown ne reflushe pas', async () => {
+        __1.AbyssMonitorCore.setConfig({
+            applicationId: `app-crash-b-${eventName}`,
+            secretPublishToken: 'secret',
+            shipper: { spoolDirectory: null, flushIntervalMs: 60_000 },
+        });
+        const shipper = __1.AbyssMonitorCore.getShipper();
+        const post = jest
+            .spyOn(applicationLogApi, 'createBulkApplicationLog')
+            .mockResolvedValue(ACK);
+        const flushSpy = jest.spyOn(shipper, 'flush');
+        const exit = jest.spyOn(process, 'exit').mockImplementation((() => undefined));
+        (0, graceful_shutdown_utils_1.setupGracefulShutdown)({
+            logger: new DelayedErrorLogger({ shouldDisableConsoleLogging: true }),
+        });
+        (0, request_tracker_utils_1.setIsShuttingDown)(true);
+        emitCrash();
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        expect(flushSpy).toHaveBeenCalledTimes(1);
+        expect(exit).not.toHaveBeenCalled();
+        expect(messagesSent(post)).toContain(eventName === 'uncaughtException' ? 'Uncaught Exception' : 'Unhandled Rejection');
+    });
+});
+//# sourceMappingURL=graceful-shutdown-flush.test.js.map

package/dist/__tests__/graceful-shutdown-flush.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graceful-shutdown-flush.test.js","sourceRoot":"","sources":["../../src/__tests__/graceful-shutdown-flush.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/header-pattern.test.js

@@ -21,6 +21,9 @@ describe('shouldCaptureHeader', () => {
         expect((0, header_pattern_1.shouldCaptureHeader)('Authorization', ['authorization'])).toBe(false);
         expect((0, header_pattern_1.shouldCaptureHeader)('Cookie', ['cookie'])).toBe(false);
     });
+    it('returns false for the mesh admin token even if allowlisted by wildcard', () => {
+        expect((0, header_pattern_1.shouldCaptureHeader)('abyss-admin-token', ['abyss-*'])).toBe(false);
+    });
     it('returns false when not in allowlist', () => {
         expect((0, header_pattern_1.shouldCaptureHeader)('X-Custom', ['content-type'])).toBe(false);
     });