@aichatwar/shared 1.0.145 → 1.0.146

package/build/index.d.ts

@@ -8,6 +8,9 @@ export * from "./middlewares/error-handler";
 export * from "./middlewares/jwt-extractor";
 export * from "./middlewares/login-required";
 export * from "./middlewares/validate-request";
+export * from "./observability/logger";
+export * from "./observability/correlation";
+export * from "./observability/express";
 export * from "./events/nats/baseListener";
 export * from "./events/nats/basePublisher";
 export * from "./events/kafka/baseListener";

package/build/index.js

@@ -24,6 +24,10 @@ __exportStar(require("./middlewares/error-handler"), exports);
 __exportStar(require("./middlewares/jwt-extractor"), exports);
 __exportStar(require("./middlewares/login-required"), exports);
 __exportStar(require("./middlewares/validate-request"), exports);
+// Observability (Phase 1)
+__exportStar(require("./observability/logger"), exports);
+__exportStar(require("./observability/correlation"), exports);
+__exportStar(require("./observability/express"), exports);
 __exportStar(require("./events/nats/baseListener"), exports);
 __exportStar(require("./events/nats/basePublisher"), exports);
 __exportStar(require("./events/kafka/baseListener"), exports);

package/build/middlewares/error-handler.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.errorHandler = void 0;
 const customError_1 = require("../errors/customError");
+const correlation_1 = require("../observability/correlation");
+const logger_1 = require("../observability/logger");
 `common structure for errors:
 {
   errors:{
@@ -10,7 +12,15 @@ const customError_1 = require("../errors/customError");
 }
 `;
 const errorHandler = (err, req, res, next) => {
-    console.log("Error:", err);
+    const correlationId = (0, correlation_1.getCorrelationId)();
+    (0, logger_1.logger)().error({
+        correlationId,
+        err,
+        http: {
+            method: req.method,
+            path: req.originalUrl || req.url,
+        },
+    }, "request.error");
     if (err instanceof customError_1.CustomError) {
         return res.status(err.statusCode).send({ errors: err.serializeDetails() });
     }

package/build/observability/correlation.d.ts

@@ -0,0 +1,6 @@
+export type CorrelationContext = {
+    correlationId: string;
+};
+export declare function runWithCorrelationId<T>(correlationId: string | undefined, fn: () => T): T;
+export declare function getCorrelationId(): string | undefined;
+export declare function getOrCreateCorrelationId(incoming?: string): string;

package/build/observability/correlation.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runWithCorrelationId = runWithCorrelationId;
+exports.getCorrelationId = getCorrelationId;
+exports.getOrCreateCorrelationId = getOrCreateCorrelationId;
+const async_hooks_1 = require("async_hooks");
+const crypto_1 = __importDefault(require("crypto"));
+const storage = new async_hooks_1.AsyncLocalStorage();
+function newCorrelationId() {
+    // Prefer Node's built-in UUID when available.
+    const anyCrypto = crypto_1.default;
+    if (typeof anyCrypto.randomUUID === 'function') {
+        return anyCrypto.randomUUID();
+    }
+    return crypto_1.default.randomBytes(16).toString('hex');
+}
+function runWithCorrelationId(correlationId, fn) {
+    const cid = correlationId && String(correlationId).trim() ? String(correlationId).trim() : newCorrelationId();
+    return storage.run({ correlationId: cid }, fn);
+}
+function getCorrelationId() {
+    var _a;
+    return (_a = storage.getStore()) === null || _a === void 0 ? void 0 : _a.correlationId;
+}
+function getOrCreateCorrelationId(incoming) {
+    const existing = getCorrelationId();
+    if (existing)
+        return existing;
+    return (incoming && String(incoming).trim()) || newCorrelationId();
+}

package/build/observability/express.d.ts

@@ -0,0 +1,3 @@
+import type { NextFunction, Request, Response } from 'express';
+export declare function correlationIdMiddleware(req: Request, res: Response, next: NextFunction): void;
+export declare function requestLoggingMiddleware(req: Request, res: Response, next: NextFunction): void;

package/build/observability/express.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.correlationIdMiddleware = correlationIdMiddleware;
+exports.requestLoggingMiddleware = requestLoggingMiddleware;
+const correlation_1 = require("./correlation");
+const logger_1 = require("./logger");
+function correlationIdMiddleware(req, res, next) {
+    const incoming = req.headers['x-correlation-id'] || req.headers['x-request-id'];
+    (0, correlation_1.runWithCorrelationId)(incoming, () => {
+        const cid = (0, correlation_1.getCorrelationId)();
+        if (cid) {
+            res.setHeader('x-correlation-id', cid);
+        }
+        next();
+    });
+}
+function requestLoggingMiddleware(req, res, next) {
+    const start = Date.now();
+    const cid = () => (0, correlation_1.getCorrelationId)();
+    // Log at finish so that downstream middleware (e.g. JWT extractors) can attach context to req.
+    res.on('finish', () => {
+        const durationMs = Date.now() - start;
+        const statusCode = res.statusCode;
+        const level = statusCode >= 500 ? 'error' : statusCode >= 400 ? 'warn' : 'info';
+        const jwtPayload = req.jwtPayload;
+        const userId = (jwtPayload === null || jwtPayload === void 0 ? void 0 : jwtPayload.id) ? String(jwtPayload.id) : undefined;
+        (0, logger_1.logger)()[level]({
+            correlationId: cid(),
+            http: {
+                method: req.method,
+                path: req.originalUrl || req.url,
+                statusCode,
+                durationMs,
+            },
+            userId,
+        }, 'http.request');
+    });
+    next();
+}

package/build/observability/logger.d.ts

@@ -0,0 +1,2 @@
+import { type Logger } from 'pino';
+export declare function logger(): Logger;

package/build/observability/logger.js

@@ -0,0 +1,49 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logger = logger;
+const pino_1 = __importDefault(require("pino"));
+let _logger = null;
+function buildLogger() {
+    const isDev = (process.env.NODE_ENV || '').toLowerCase() !== 'production';
+    const base = {
+        service: process.env.SERVICE_NAME,
+        environment: process.env.NODE_ENV,
+        version: process.env.APP_VERSION,
+    };
+    // Keep redaction broad and safe. Services can add more redaction upstream.
+    const redactPaths = [
+        'req.headers.authorization',
+        'req.headers.cookie',
+        'req.headers["set-cookie"]',
+        'req.headers["x-api-key"]',
+        'password',
+        'token',
+        'accessToken',
+        'refreshToken',
+        'apiKey',
+        'authorization',
+        'cookie',
+    ];
+    return (0, pino_1.default)({
+        level: process.env.LOG_LEVEL || (isDev ? 'debug' : 'info'),
+        timestamp: pino_1.default.stdTimeFunctions.isoTime,
+        base,
+        redact: { paths: redactPaths, remove: true },
+        formatters: {
+            level: (label) => ({ level: label }),
+        },
+        serializers: {
+            err: pino_1.default.stdSerializers.err,
+            req: pino_1.default.stdSerializers.req,
+            res: pino_1.default.stdSerializers.res,
+        },
+    });
+}
+function logger() {
+    if (!_logger)
+        _logger = buildLogger();
+    return _logger;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aichatwar/shared",
-  "version": "1.0.145",
+  "version": "1.0.146",
   "main": "./build/index.js",
   "typs": "./build/index.d.ts",
   "files": [
@@ -31,6 +31,7 @@
     "jsonwebtoken": "^9.0.2",
     "kafkajs": "^2.2.4",
     "mongoose-update-if-current": "^1.4.0",
-    "node-nats-streaming": "^0.3.2"
+    "node-nats-streaming": "^0.3.2",
+    "pino": "^9.9.0"
   }
 }