vani-meeting-server 2.0.3 → 2.0.5

package/lib/lib/redis/RedisHandler.js

@@ -50,6 +50,7 @@ class RedisHandler {
     }
     //Clean Room Id
     async cleanUpRoomId(roomId) {
+        console.log("Cleanup Room From Redis");
         await this.redisClient.del(roomId);
     }
     //ip addresss

package/lib/models/Event.d.ts

@@ -5,6 +5,7 @@ import { Participant } from "./Participant";
 export declare enum VaniEvent {
     OnNewMeetingStarted = "onNewMeetingStarted",
     OnNewMeetingEnded = "onNewMeetingEnded",
+    OnAllParticipantLeftOnServer = "OnAllParticipantLeftOnServer",
     OnUserJoined = "onUserJoined",
     OnUserLeft = "onUserLeft",
     OnServerStarted = "onServerStarted",
@@ -16,6 +17,7 @@ export declare enum VaniEvent {
 interface VaniConnectionEvents {
     [VaniEvent.OnNewMeetingStarted]: (roomId: string) => any;
     [VaniEvent.OnNewMeetingEnded]: (roomId: string) => any;
+    [VaniEvent.OnAllParticipantLeftOnServer]: (roomId: string) => any;
     [VaniEvent.OnUserJoined]: (participant: Participant) => any;
     [VaniEvent.OnUserLeft]: (participant: Participant) => any;
     [VaniEvent.OnServerStarted]: () => any;

package/lib/models/Event.js

@@ -5,6 +5,7 @@ var VaniEvent;
 (function (VaniEvent) {
     VaniEvent["OnNewMeetingStarted"] = "onNewMeetingStarted";
     VaniEvent["OnNewMeetingEnded"] = "onNewMeetingEnded";
+    VaniEvent["OnAllParticipantLeftOnServer"] = "OnAllParticipantLeftOnServer";
     VaniEvent["OnUserJoined"] = "onUserJoined";
     VaniEvent["OnUserLeft"] = "onUserLeft";
     VaniEvent["OnServerStarted"] = "onServerStarted";

package/lib/sfu/SFUEachRoomHandler.d.ts

@@ -68,5 +68,5 @@ export declare class SFUEachRoomHandler extends BaseSFUWebsocket implements SFUE
     resumeAllBroadcastingConsumers(): Promise<void>;
     startBroadcasting(plainTransportPayload: PlainTransportPayload): Promise<void>;
     private consumeProducerForPlainTransport;
-    cleanUp(): void;
+    cleanUp(): Promise<void>;
 }

package/lib/sfu/SFUEachRoomHandler.js

@@ -371,12 +371,24 @@ class SFUEachRoomHandler extends BaseSFUWebsocket_1.BaseSFUWebsocket {
             }
         }
     }
-    cleanUp() {
+    async cleanUp() {
         console.debug("Clean Up Room Id ", this.roomId);
-        RedisHandler_1.RedisHandler.getInstance().cleanUpRoomId(this.roomId);
+        const allParticipants = await RedisHandler_1.RedisHandler.getInstance().getAllParticipants(this.roomId);
+        let shouldCleanupRedis = true;
+        if (allParticipants && allParticipants.length > 0) {
+            const selfIpAddress = await Constant_1.default.getPublicIp();
+            const participantOnOtherServer = allParticipants.filter((eachParticipant) => eachParticipant.serverIpAddress !== selfIpAddress);
+            if (participantOnOtherServer && participantOnOtherServer.length > 0) {
+                shouldCleanupRedis = false;
+            }
+        }
+        if (shouldCleanupRedis) {
+            RedisHandler_1.RedisHandler.getInstance().cleanUpRoomId(this.roomId);
+            EventEmitterHandler_1.EventEmitterHandler.getInstance().vaniEventEmitter.emit(Event_1.VaniEvent.OnNewMeetingEnded, this.roomId);
+        }
+        EventEmitterHandler_1.EventEmitterHandler.getInstance().vaniEventEmitter.emit(Event_1.VaniEvent.OnAllParticipantLeftOnServer, this.roomId);
         this.eachRoomMutliserverHandler?.cleanUp();
         this.eachRoomMutliserverHandler = undefined;
-        EventEmitterHandler_1.EventEmitterHandler.getInstance().vaniEventEmitter.emit(Event_1.VaniEvent.OnNewMeetingEnded, this.roomId);
         this.roomPaticipants.forEach((sfuEachRoomUser) => {
             this.onUserLeft(sfuEachRoomUser.selfParticipant);
         });

package/lib/sfu/SFUEachRoomMutliServerHandler.d.ts

@@ -19,4 +19,5 @@ export declare class SFUEachRoomMutliServerHandler extends BaseSFUWebsocket {
     consumeProductAndInfrom: (transport: PipeTransport, ipAddress: string, producer: SFUEachRoomProducer) => Promise<void>;
     onNewLocalProducer(producer: SFUEachRoomProducer): Promise<void>;
     onNewRemoteProducer(producer: Producer): Promise<void>;
+    private onRemoteConsumerClosed;
 }

package/lib/sfu/SFUEachRoomMutliServerHandler.js

@@ -75,10 +75,16 @@ class SFUEachRoomMutliServerHandler extends BaseSFUWebsocket_1.BaseSFUWebsocket
             const ip = message.data.ip;
             if (this.pipeTransports[ip]) {
                 const producer = await this.pipeTransports[ip].transport.produce({ rtpParameters: message.data.rtpParameters, kind: message.data.kind, appData: message.data.appData });
+                producer.appData.consumerId = message.data.consumerId;
                 this.onNewRemoteProducer(producer);
                 console.log("MultiSystemEvents.OnConsumerData", producer);
             }
         }
+        else if (message.type === EachSocketConnectionHandler_1.MultiSystemEvents.OnRemoteConsumerClosed) {
+            if (message.data.consumerId) {
+                this.onRemoteConsumerClosed(message.data.consumerId);
+            }
+        }
     };
     createPipeTransport = async (ip) => {
         if (this.pipeTransports[ip]) {
@@ -113,13 +119,12 @@ class SFUEachRoomMutliServerHandler extends BaseSFUWebsocket_1.BaseSFUWebsocket
             const consumer = await transport.consume({ producerId: producer.producer.id });
             console.log("consumeProductAndInfrom consumer.paused", consumer.paused);
             if (consumer) {
-                consumer.on("@close", () => {
-                    console.log("Transport consumer closed");
-                });
-                consumer.on("@producerclose", () => {
+                consumer.on("@producerclose", async () => {
                     console.log("Transport producerclose closed");
+                    consumer.close();
+                    this.redisBroadcastMessageToTopic(Utility_1.Utility.getTopicForRoomIdAndIp(this.roomId, ipAddress), this.prepareMutilSystemEvents(EachSocketConnectionHandler_1.MultiSystemEvents.OnRemoteConsumerClosed, this.roomId, { ip: await Constant_1.default.getPublicIp(), consumerId: consumer.id }));
                 });
-                this.redisBroadcastMessageToTopic(Utility_1.Utility.getTopicForRoomIdAndIp(this.roomId, ipAddress), this.prepareMutilSystemEvents(EachSocketConnectionHandler_1.MultiSystemEvents.OnConsumerData, this.roomId, { ip: await Constant_1.default.getPublicIp(), rtpParameters: consumer?.rtpParameters, kind: consumer.kind, appData: producer.producer.appData }));
+                this.redisBroadcastMessageToTopic(Utility_1.Utility.getTopicForRoomIdAndIp(this.roomId, ipAddress), this.prepareMutilSystemEvents(EachSocketConnectionHandler_1.MultiSystemEvents.OnConsumerData, this.roomId, { ip: await Constant_1.default.getPublicIp(), rtpParameters: consumer?.rtpParameters, kind: consumer.kind, appData: producer.producer.appData, consumerId: consumer.id }));
             }
         }
     };
@@ -137,15 +142,17 @@ class SFUEachRoomMutliServerHandler extends BaseSFUWebsocket_1.BaseSFUWebsocket
                 if (remoteParticipant) {
                     await producer.resume();
                     producer.on("@close", async () => {
-                        console.log("On Producer closed", producer);
-                        const response = { producerId: producer.id };
-                        const remoteProducer = this.remoteProducers.find((eachRemoteProducer) => eachRemoteProducer.producer.id === producer.id);
-                        if (remoteProducer) {
-                            this.redisBroadcastMessageToTopic(Utility_1.Utility.getTopicForRoomIdAndIp(this.roomId, (await Constant_1.default.getPublicIp())), this.preapreClientMessageBody(false, remoteProducer.participant, this.preapreWebSocketMessageBody(EachSocketConnectionHandler_1.SFUMessageType.OnTrackEnded, response)));
-                            this.remoteProducers = this.remoteProducers.filter((eachRemoteProducer) => eachRemoteProducer.producer.id !== producer.id);
+                        if (producer.appData.consumerId) {
+                            this.onRemoteConsumerClosed(producer.appData.consumerId);
                         }
+                        // console.log("On Producer closed", producer)
+                        // const response = { producerId: producer.id }
+                        // const remoteProducer = this.remoteProducers.find((eachRemoteProducer) => eachRemoteProducer.producer.id === producer.id)
+                        // if (remoteProducer) {
+                        //     this.redisBroadcastMessageToTopic(Utility.getTopicForRoomIdAndIp(this.roomId, (await Constant.getPublicIp())!), this.preapreClientMessageBody(false, remoteProducer.participant, this.preapreWebSocketMessageBody(SFUMessageType.OnTrackEnded, response)));
+                        //     this.remoteProducers = this.remoteProducers.filter((eachRemoteProducer) => eachRemoteProducer.producer.id !== producer.id)
+                        // }
                     });
-                    console.log("onNewRemoteProducer producer.paused", producer.paused);
                     await this.roomHandlerDataSource.pipeToRoute(producer);
                     this.remoteProducers.push({ producer: producer, participant: remoteParticipant });
                     this.roomHandlerDataSource.onNewProducer(producer, remoteParticipant);
@@ -154,5 +161,14 @@ class SFUEachRoomMutliServerHandler extends BaseSFUWebsocket_1.BaseSFUWebsocket
             }
         }
     }
+    onRemoteConsumerClosed = async (remoteConsumerId) => {
+        const remoteProducer = this.remoteProducers.find((eachRemoteProducer) => eachRemoteProducer.producer.appData.consumerId === remoteConsumerId);
+        if (remoteProducer) {
+            remoteProducer.producer.close();
+            const response = { producerId: remoteProducer.producer.id };
+            this.redisBroadcastMessageToTopic(Utility_1.Utility.getTopicForRoomIdAndIp(this.roomId, (await Constant_1.default.getPublicIp())), this.preapreClientMessageBody(false, remoteProducer.participant, this.preapreWebSocketMessageBody(EachSocketConnectionHandler_1.SFUMessageType.OnTrackEnded, response)));
+            this.remoteProducers = this.remoteProducers.filter((eachRemoteProducer) => eachRemoteProducer.producer.id !== remoteProducer.producer.id);
+        }
+    };
 }
 exports.SFUEachRoomMutliServerHandler = SFUEachRoomMutliServerHandler;

package/lib/sfu/SFUHandler.d.ts

@@ -9,7 +9,7 @@ export declare class SFUHandler {
     constructor();
     init(): Promise<void>;
     checkAndSetupRoom(roomId: string, connectionProtocol: ConnectionProtocol): Promise<void>;
-    checkIfCanCloseRoom(roomId: string): void;
+    checkIfCanCloseRoom(roomId: string): Promise<void>;
     getRoomSFUHandler(roomId: string): SFUEachRoomHandler | undefined;
     startPlainTransportForBroadcasting(plainTransportPayload: PlainTransportPayload, forRoomid: string): Promise<void>;
     resumeAllBroadcastingConsumers(forRoomid: string): Promise<void>;

package/lib/sfu/SFUHandler.js

@@ -51,10 +51,10 @@ class SFUHandler {
             this.sfuRooms.set(roomId, sfuEachRoomHandler);
         }
     }
-    checkIfCanCloseRoom(roomId) {
+    async checkIfCanCloseRoom(roomId) {
         const room = this.getRoomSFUHandler(roomId);
         if (room && room.roomPaticipants.size === 0) {
-            room.cleanUp();
+            await room.cleanUp();
             this.sfuRooms.delete(roomId);
         }
     }

package/lib/websocket/EachSocketConnectionHandler.d.ts

@@ -66,6 +66,7 @@ export declare enum SFUMessageType {
 export declare enum MultiSystemEvents {
     OnNewServerJoinedForRoom = "OnNewServerJoinedForRoom",
     OnConsumerData = "OnConsumerData",
+    OnRemoteConsumerClosed = "OnRemoteConsumerClosed",
     OnConnectPipe = "OnConnectPipe",
     OnPipeConnected = "OnPipeConnected"
 }

package/lib/websocket/EachSocketConnectionHandler.js

@@ -84,6 +84,7 @@ var MultiSystemEvents;
 (function (MultiSystemEvents) {
     MultiSystemEvents["OnNewServerJoinedForRoom"] = "OnNewServerJoinedForRoom";
     MultiSystemEvents["OnConsumerData"] = "OnConsumerData";
+    MultiSystemEvents["OnRemoteConsumerClosed"] = "OnRemoteConsumerClosed";
     MultiSystemEvents["OnConnectPipe"] = "OnConnectPipe";
     MultiSystemEvents["OnPipeConnected"] = "OnPipeConnected";
 })(MultiSystemEvents = exports.MultiSystemEvents || (exports.MultiSystemEvents = {}));

package/package.json

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