vani-meeting-server 3.0.2 → 3.0.4-beta1

package/lib/base/BaseSFUWebsocket.js

@@ -10,7 +10,7 @@ class BaseSFUWebsocket {
         RedisHandler_1.RedisHandler.getInstance().redisPublisher.publish(topic, stringifyData);
         if (data.interfaceName !== 'MultiSystemEventsBody') {
             EventEmitterHandler_1.EventEmitterHandler.getInstance().vaniEventEmitter.emit(topic, stringifyData);
-            console.log("Message sent", topic, stringifyData);
+            // console.log("Message sent",topic,stringifyData)
         }
     }
     //Utilility function

package/lib/lib/redis/RedisHandler.d.ts

@@ -39,7 +39,8 @@ export declare class RedisHandler {
     removeParticipantForRoom(roomId: string, participant: Participant): Promise<undefined>;
     addUpdateParticipantForRoom(roomId: string, participant: Participant): Promise<undefined>;
     getParticipantByUserId(roomId: string, userId: string): Promise<Participant | undefined>;
-    getAllParticipants(roomId: string, canFetchFromLocal?: boolean): Promise<Participant[]>;
+    private getAllParticipantsFromRedis;
+    getAllParticipants(roomId: string): Promise<Participant[]>;
     getAllRoomsId(): Promise<string[] | undefined>;
     private updateRoomCleanupTimeOut;
     releaseRedis: () => Promise<void>;

package/lib/lib/redis/RedisHandler.js

@@ -201,8 +201,8 @@ class RedisHandler {
     };
     storeKeyValueForLocalCacheFromOtherServer = async (data) => {
         try {
-            ServerHandler_1.ServerHandler.getInstance().serverStartRequest && ServerHandler_1.ServerHandler.getInstance().serverStartRequest.logLevel !== WebSocketServerStartRequest_1.LogLevel.None
-                && console.log("storeKeyValueForLocalCacheFromOtherServer recived ", data);
+            // ServerHandler.getInstance().serverStartRequest && ServerHandler.getInstance().serverStartRequest.logLevel !== LogLevel.None 
+            // &&   console.log("storeKeyValueForLocalCacheFromOtherServer recived ", data)
             if (data.senderIp !== await Constant_1.default.getPublicIp()) {
                 const key = data.data?.key;
                 const fieldOne = data.data?.fieldOne;
@@ -211,8 +211,8 @@ class RedisHandler {
                     let keyData = this.localCacheDataStorage.get(key);
                     if (keyData && fieldOne && fieldTwo) {
                         keyData.set(fieldOne, fieldTwo);
-                        ServerHandler_1.ServerHandler.getInstance().serverStartRequest && ServerHandler_1.ServerHandler.getInstance().serverStartRequest.logLevel !== WebSocketServerStartRequest_1.LogLevel.None
-                            && console.log("storeKeyValueForLocalCacheFromOtherServer set ", keyData);
+                        // ServerHandler.getInstance().serverStartRequest && ServerHandler.getInstance().serverStartRequest.logLevel !== LogLevel.None 
+                        //     &&   console.log("storeKeyValueForLocalCacheFromOtherServer set ", keyData)
                     }
                 }
             }
@@ -394,34 +394,49 @@ class RedisHandler {
             return undefined;
         }
     }
-    async getAllParticipants(roomId, canFetchFromLocal = true) {
+    async getAllParticipantsFromRedis(roomId) {
+        const particpantsInStringify = await this.redisClient.hGetAll(roomId);
+        const participants = [];
+        if (particpantsInStringify) {
+            console.log("getAllParticipantsFromRedis getAllParticipantsFromRedis ", particpantsInStringify);
+            Object.entries(particpantsInStringify).forEach(([key, value]) => {
+                console.log("getAllParticipantsFromRedis key ", key);
+                if (key.includes(RedisKeyType.Participants)) {
+                    const valueStr = value;
+                    participants.push(Object.assign(new Participant_1.Participant(), JSON.parse(valueStr)));
+                    console.log("getAllParticipantsFromRedis key ", valueStr);
+                }
+            });
+        }
+        return participants;
+    }
+    async getAllParticipants(roomId) {
         let particpantsInStringify;
         try {
             try {
-                if (canFetchFromLocal) {
-                    const localCacheMessages = this.getKeyValueForLocalCache(roomId);
-                    if (localCacheMessages) {
-                        particpantsInStringify = localCacheMessages;
-                        console.log("getAllParticipants from cache", particpantsInStringify, canFetchFromLocal);
-                    }
+                const localCacheMessages = this.getKeyValueForLocalCache(roomId);
+                if (localCacheMessages) {
+                    particpantsInStringify = localCacheMessages;
+                    console.log("getAllParticipants from cache", particpantsInStringify);
                 }
             }
             catch (err) {
             }
-            if (!particpantsInStringify) {
-                particpantsInStringify = await this.redisClient.hGetAll(roomId);
-            }
             const participants = [];
             if (particpantsInStringify) {
-                Object.entries(particpantsInStringify).forEach(([key, value]) => {
+                console.log("getAllParticipants particpantsInStringify ", particpantsInStringify);
+                const keysArray = [...particpantsInStringify.keys()];
+                keysArray.forEach((key) => {
+                    console.log("getAllParticipants key ", key);
                     if (key.includes(RedisKeyType.Participants)) {
-                        const valueStr = value;
+                        const valueStr = particpantsInStringify.get(key);
                         participants.push(Object.assign(new Participant_1.Participant(), JSON.parse(valueStr)));
+                        console.log("getAllParticipants key ", valueStr);
                     }
                 });
             }
-            if (participants.length === 0 && !canFetchFromLocal) {
-                return this.getAllParticipants(roomId, false);
+            if (participants.length < 2) {
+                return await this.getAllParticipantsFromRedis(roomId);
             }
             return participants;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vani-meeting-server",
-  "version": "3.0.2",
+  "version": "3.0.4beta1",
   "description": "Vani Meeting Server SDK",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",