@lucaapp/service-utils 1.9.2 → 1.11.0

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export * from './lib/kafka';
 export * from './lib/serviceIdentity';
 export * from './lib/metrics';
+export * from './lib/requestTracer';
 export * from './lib/wsEvent';
 export * from './lib/lifecycle';
 export * from './lib/logger';

package/dist/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./lib/kafka"), exports);
 __exportStar(require("./lib/serviceIdentity"), exports);
 __exportStar(require("./lib/metrics"), exports);
+__exportStar(require("./lib/requestTracer"), exports);
 __exportStar(require("./lib/wsEvent"), exports);
 __exportStar(require("./lib/lifecycle"), exports);
 __exportStar(require("./lib/logger"), exports);

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/requestTracer/index.d.ts

@@ -0,0 +1 @@
+export * from './requestTracer';

package/dist/lib/requestTracer/index.js

@@ -0,0 +1,17 @@
+"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./requestTracer"), exports);

package/dist/lib/requestTracer/requestTracer.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="node/http" />
+/// <reference types="lib/logger/types" />
+/// <reference types="pino-http" />
+declare const getRequestTracerId: () => string;
+declare const getRequestTracerMixin: () => {
+    reqId: {};
+} | {
+    reqId?: undefined;
+};
+declare const getRequestIdHeader: () => object;
+declare const requestTracerMiddleware: () => (req: import("http").IncomingMessage, res: import("http").ServerResponse<import("http").IncomingMessage>, next: (err?: any) => void) => void;
+export { getRequestTracerId, getRequestTracerMixin, getRequestIdHeader, requestTracerMiddleware, };

package/dist/lib/requestTracer/requestTracer.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requestTracerMiddleware = exports.getRequestIdHeader = exports.getRequestTracerMixin = exports.getRequestTracerId = void 0;
+const uuid_1 = require("uuid");
+const cls_rtracer_1 = __importDefault(require("cls-rtracer"));
+const REQUEST_ID_HEADER = 'x-request-id';
+const getRequestTracerId = () => cls_rtracer_1.default.id() ? `${cls_rtracer_1.default.id()}` : (0, uuid_1.v4)();
+exports.getRequestTracerId = getRequestTracerId;
+const getRequestTracerMixin = () => {
+    const reqId = cls_rtracer_1.default.id();
+    return reqId ? { reqId } : {};
+};
+exports.getRequestTracerMixin = getRequestTracerMixin;
+const getRequestIdHeader = () => {
+    const reqId = getRequestTracerId();
+    return reqId ? { [REQUEST_ID_HEADER]: reqId } : {};
+};
+exports.getRequestIdHeader = getRequestIdHeader;
+const requestTracerMiddleware = () => cls_rtracer_1.default.expressMiddleware({
+    echoHeader: true,
+    useHeader: true,
+});
+exports.requestTracerMiddleware = requestTracerMiddleware;

package/dist/lib/serviceIdentity/serviceIdentity.js

@@ -31,6 +31,7 @@ const jose = __importStar(require("jose"));
 const url_1 = require("url");
 const boom_1 = require("@hapi/boom");
 const moment_1 = __importDefault(require("moment"));
+const requestTracer_1 = require("../requestTracer");
 const axios_1 = __importDefault(require("axios"));
 const JWT_ALGORITHM = 'ES256';
 const JWT_HEADER_NAME = 'X-Identity';
@@ -86,6 +87,7 @@ class ServiceIdentity {
             const request = {
                 headers: {
                     [JWT_HEADER_NAME]: jwt,
+                    ...(0, requestTracer_1.getRequestIdHeader)(),
                 },
                 baseURL: `http://${service}:8080/`,
                 url,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucaapp/service-utils",
-  "version": "1.9.2",
+  "version": "1.11.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -38,6 +38,7 @@
     "@hapi/boom": "^10.0.0",
     "@types/express": "4.17.13",
     "axios": "^0.27.2",
+    "cls-rtracer": "^2.6.2",
     "jose": "4.9.2",
     "kafkajs": "2.1.0",
     "lodash": "^4.17.21",