@lucaapp/service-utils 1.10.0 → 1.12.0

package/dist/lib/kafka/kafkaClient.d.ts

@@ -10,6 +10,7 @@ declare class KafkaClient {
     private readonly topicSecrets;
     private readonly admin;
     private readonly producer;
+    private readonly consumers;
     readonly serviceIdentity: ServiceIdentity;
     constructor(parentLogger: Logger, kafkaConfig: KafkaConfiguration, topicSecrets: Partial<Record<KafkaTopic, string>>, serviceIdentity: ServiceIdentity);
     connect: () => Promise<void>;
@@ -23,5 +24,6 @@ declare class KafkaClient {
     private ensureTopics;
     consume: <T extends KafkaTopic>(kafkaTopic: T, handler: EventPayloadHandler<T>, fromBeginning?: boolean) => Promise<Consumer>;
     produce: <T extends KafkaTopic>(kafkaTopic: T, key: string, value: KafkaEvent<T>) => Promise<void>;
+    shutdown: () => Promise<void>;
 }
 export { KafkaClient };

package/dist/lib/kafka/kafkaClient.js

@@ -159,6 +159,7 @@ class KafkaClient {
             const groupId = `${this.environment.valueOf()}_${this.serviceIdentity.identityName}`;
             try {
                 const consumer = this.kafkaClient.consumer({ groupId });
+                this.consumers.push(consumer);
                 await consumer.connect();
                 await consumer.subscribe({ topic, fromBeginning });
                 await consumer.run({
@@ -218,6 +219,19 @@ class KafkaClient {
                 throw (0, utils_1.logAndGetError)(this.logger, `Could not produce message for topic=${topic}`, error);
             }
         };
+        this.shutdown = async () => {
+            try {
+                for (const consumer of this.consumers) {
+                    await consumer.disconnect();
+                }
+                await this.producer.disconnect();
+                await this.admin.disconnect();
+                this.logger.info('Disconnected kafka consumers and producer');
+            }
+            catch (error) {
+                this.logger.error(error, 'Unable to properly disconnect kafka');
+            }
+        };
         this.environment = kafkaConfig.environment;
         this.logger = parentLogger.child({
             kafkaClientId: kafkaConfig.clientId,
@@ -243,6 +257,7 @@ class KafkaClient {
             });
             this.admin = this.kafkaClient.admin();
             this.producer = this.kafkaClient.producer();
+            this.consumers = [];
         }
         catch (error) {
             throw (0, utils_1.logAndGetError)(this.logger, 'Unable to connect to Kafka', error);

package/dist/lib/logger/index.js

@@ -7,22 +7,22 @@ exports.LoggerFactory = void 0;
 const pino_1 = __importDefault(require("pino"));
 const pino_http_1 = __importDefault(require("pino-http"));
 const pick_1 = __importDefault(require("lodash/pick"));
-const uuid_1 = require("uuid");
+const requestTracer_1 = require("../requestTracer");
 class LoggerFactory {
     static getLogger(logLevel) {
-        return (0, pino_1.default)({ level: logLevel });
+        return (0, pino_1.default)({ level: logLevel, mixin: requestTracer_1.getRequestTracerMixin });
     }
     static getHttpLogger(options) {
         const { requestSerializer, responseSerializer, errorSerializer, defaultHttpLogLevel, customMessage, } = new HttpLoggerHelpers(options);
         const logger = this.getLogger(options.logLevel);
         return (0, pino_http_1.default)({
-            logger: logger,
+            logger,
             serializers: {
                 req: requestSerializer,
                 res: responseSerializer,
                 err: errorSerializer,
             },
-            customLogLevel: (response, error) => {
+            customLogLevel: (_, response, error) => {
                 if (response.statusCode >= 400 && response.statusCode < 500)
                     return 'warn';
                 if (response.statusCode >= 500 || error)
@@ -30,8 +30,9 @@ class LoggerFactory {
                 return defaultHttpLogLevel;
             },
             customSuccessMessage: customMessage,
-            customErrorMessage: (_, response) => customMessage(response),
-            genReqId: () => (0, uuid_1.v4)(),
+            customErrorMessage: customMessage,
+            mixin: requestTracer_1.getRequestTracerMixin,
+            genReqId: requestTracer_1.getRequestTracerId,
         });
     }
 }
@@ -51,6 +52,7 @@ class HttpLoggerHelpers {
                 'x-forwarded-host',
                 'x-forwarded-port',
                 'x-scheme',
+                'x-request-id',
                 'user-agent',
                 'content-type',
                 'accept',
@@ -69,6 +71,7 @@ class HttpLoggerHelpers {
             ]);
             return response;
         };
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         this.errorSerializer = (error) => {
             if (error?.parameters)
                 error.parameters = undefined;
@@ -78,12 +81,13 @@ class HttpLoggerHelpers {
                 error.original.parameters = undefined;
             return error;
         };
-        this.customMessage = (response) => {
-            const { req: { method, originalUrl }, statusCode, } = response;
+        this.customMessage = (request, response) => {
+            const { method, originalUrl } = request;
+            const { statusCode } = response;
             return `${statusCode} ${method} ${originalUrl}`;
         };
-        this.debug = !!debug;
-        this.e2e = !!e2e;
+        this.debug = debug;
+        this.e2e = e2e;
         this.defaultHttpLogLevel = defaultHttpLogLevel || 'info';
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucaapp/service-utils",
-  "version": "1.10.0",
+  "version": "1.12.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -43,7 +43,7 @@
     "kafkajs": "2.1.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
-    "pino-http": "6.6.0",
+    "pino-http": "8.2.1",
     "prom-client": "14.1.0",
     "uuid": "^9.0.0"
   }