eh-commons 0.0.2-testing.81 → 0.0.2-testing.83

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eh-commons",
   "type": "commonjs",
-  "version": "0.0.2-testing.81",
+  "version": "0.0.2-testing.83",
   "description": "eh-commons",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/clients/logger.client.ts

@@ -1,10 +1,13 @@
-import { Kafka, Producer, RecordMetadata, TopicMessages } from 'kafkajs';
-import { Observable, catchError, from, map, mergeMap, of } from 'rxjs';
+import { Kafka, Producer, RecordMetadata } from 'kafkajs';
+import { Observable, catchError, from, mergeMap, of } from 'rxjs';
 
 export class LoggerClient {
   private kafka: Kafka;
   private kafkaTopic: string;
   private producer: Producer;
+  private connected = false;
+  private connecting: Promise<void> | null = null;
+
   constructor(
     kafkaBrokers: string[],
     kafkaClientId: string,
@@ -15,43 +18,42 @@ export class LoggerClient {
     this.producer = this.kafka.producer();
   }
 
-  private connectProducer(): Observable<void> {
-    return from(this.producer.connect());
-  }
-  private disconnectProducer(): Observable<void> {
-    return from(this.producer.disconnect());
+  private async ensureConnected(): Promise<void> {
+    if (this.connected) return;
+    if (this.connecting) return this.connecting;
+    this.connecting = this.producer
+      .connect()
+      .then(() => {
+        this.connected = true;
+      })
+      .finally(() => {
+        this.connecting = null;
+      });
+    return this.connecting;
   }
-  private sendLog(log: any, key?: string): Observable<RecordMetadata[]> {
-    let messageString = JSON.stringify(log);
-    return this.connectProducer().pipe(
-      mergeMap(() => {
-        return this.send(messageString, key).pipe(
-          map((recordMetadata) => {
-            this.disconnectProducer().subscribe();
-            return recordMetadata;
+
+  sendLog(log: any, key?: string): Observable<RecordMetadata[]> {
+    const messageString = JSON.stringify(log);
+    return from(this.ensureConnected()).pipe(
+      mergeMap(() =>
+        from(
+          this.producer.send({
+            topic: this.kafkaTopic,
+            messages: [{ key, value: messageString }],
           }),
-        );
-      }),
+        ),
+      ),
       catchError((err) => {
+        this.connected = false;
         return of(err);
       }),
     );
   }
 
-  private send(
-    messageString: string,
-    key?: string,
-  ): Observable<RecordMetadata[]> {
-    return from(
-      this.producer.send({
-        topic: this.kafkaTopic,
-        messages: [
-          {
-            key,
-            value: messageString,
-          },
-        ],
-      }),
-    );
+  async disconnect(): Promise<void> {
+    if (this.connected) {
+      await this.producer.disconnect();
+      this.connected = false;
+    }
   }
 }

package/src/modules/session/guards/permission.guard.ts

@@ -75,6 +75,10 @@ export class PermissionGuard implements CanActivate {
   }
 
   private _checkPermission(userPermissions: IPermission[], allowedPermission: string): boolean {
+    if (userPermissions?.some((item) => item.keyword === 'eh.root')) {
+      return true;
+    }
+
     if (allowedPermission) {
       if (!userPermissions || !userPermissions.length) {
         throw new RESTError('forbidden', null, HttpStatus.FORBIDDEN);

package/src/modules/session/models/interfaces/index.ts

@@ -41,7 +41,7 @@ export interface IUserScope {
 export interface IUserSessionData {
   userId: string;
   username: string;
-  fistName: string;
+  firstName: string;
   lastName: string;
   contacts: IContact[];
   pid: string;

package/tsconfig.json

@@ -9,7 +9,7 @@
     "target": "es2017",
     "sourceMap": true,
     "outDir": "./dist",
-    "baseUrl": "./",
+    "rootDir": "./src",
     "incremental": true,
     "skipLibCheck": true,
     "strictNullChecks": false,