@ejfdelgado/ejflab-back 1.33.1 → 1.34.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ejfdelgado/ejflab-back",
-  "version": "1.33.1",
+  "version": "1.34.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-back.git"

package/srv/SocketIOCall.mjs

@@ -34,6 +34,8 @@ import { PostgresSrv } from "./PostgresSrv.mjs";
 import { OpenVideoChatProcessor } from "./callprocessors/OpenVideoChatProcessor.mjs";
 import { CloseVideoChatProcessor } from "./callprocessors/CloseVideoChatProcessor.mjs";
 import { IncludeOtherPeersProcessor } from "./callprocessors/IncludeOtherPeersProcessor.mjs";
+import { RegisterSessionProcessor } from "./callprocessors/RegisterSessionProcessor.mjs";
+import { UnregisterSessionProcessor } from "./callprocessors/UnregisterSessionProcessor.mjs";
 
 import stream from "stream";
 
@@ -50,6 +52,7 @@ export class SocketIOCall {
     static socketToImage = {};
     static hookProcessors = {};
     static internalBus = new EventEmitter();
+    static sessionsByProvider = {};
 
     static echoLog(message) {
         if (process.env.ENV != "pro") {
@@ -374,6 +377,14 @@ export class SocketIOCall {
             //SocketIOCall.echoLog(`${socket.id} sends includeOtherPeers with ${JSON.stringify(payload)}`);
             new IncludeOtherPeersProcessor(SocketIOCall, SocketIOCall.io, socket).executeSave(payload);
         });
+        socket.on("registerSession", (payload) => {
+            //SocketIOCall.echoLog(`${socket.id} sends includeOtherPeers with ${JSON.stringify(payload)}`);
+            new RegisterSessionProcessor(SocketIOCall, SocketIOCall.io, socket).executeSave(payload);
+        });
+        socket.on("unregisterSession", (payload) => {
+            //SocketIOCall.echoLog(`${socket.id} sends includeOtherPeers with ${JSON.stringify(payload)}`);
+            new UnregisterSessionProcessor(SocketIOCall, SocketIOCall.io, socket).executeSave(payload);
+        });
 
         const extraHooks = Object.keys(SocketIOCall.hookProcessors);
         for (let k = 0; k < extraHooks.length; k++) {

package/srv/callprocessors/DisconnectProcessor.mjs

@@ -20,6 +20,19 @@ export class DisconnectProcessor extends GenericProcessor {
     clearPersonFromPeople(people, socketId, room) {
         for (let personId in people) {
             const onePerson = people[personId];
+            //console.log(room, JSON.stringify(onePerson));
+            if (room == "public") {
+                // public room control
+                const { type, user_id } = onePerson;
+                if (type == "provider") {
+                    // It's provider, then remove it from connected providers
+                    //console.log(`Register session end to ${user_id}`);
+                    this.context.internalBus.emit("unregisterSession", {
+                        provider: user_id,
+                        socketId: socketId,
+                    });
+                }
+            }
             if (onePerson.socket == socketId || socketId == personId) {
                 if (onePerson.sharedState && onePerson.sharedState.user_id) {
                     this.context.internalBus.emit("closeVideoChat", {

package/srv/callprocessors/RegisterSessionProcessor.mjs

@@ -0,0 +1,44 @@
+import { GenericProcessor } from "./GenericProcessor.mjs";
+
+
+export class RegisterSessionProcessor extends GenericProcessor {
+    constructor(context, io, socket) {
+        super(context, io, socket);
+    }
+    execute(args) {
+        //console.log(`RegisterSessionProcessor... ${JSON.stringify(args)}`);
+        const sessionsData = this.context.sessionsByProvider;
+        const { socketId, sessionId, provider } = args;
+        if (!(provider in sessionsData)) {
+            const userSessions = {
+                sockets: {},
+                sessions: {},
+            };
+            sessionsData[provider] = userSessions;
+            userSessions.sockets[socketId] = sessionId;
+            userSessions.sessions[sessionId] = socketId;
+        } else {
+            const userSessions = sessionsData[provider];
+            const { sockets, sessions } = userSessions;
+            if (sessionId in sessions) {
+                // If it is an existent session, then switch the socketId
+                const oldSocketId = sessions[sessionId];
+                sessions[sessionId] = socketId;
+                delete sockets[oldSocketId];
+                sockets[socketId] = sessionId;
+            } else {
+                // Register the new session
+                userSessions.sockets[socketId] = sessionId;
+                userSessions.sessions[sessionId] = socketId;
+            }
+        }
+        //console.log(JSON.stringify(sessionsData, null, 4));
+        // Notify all sockets the amount of sessions
+        const allSockets = Object.keys(sessionsData[provider].sockets);
+        const count = allSockets.length;
+        for (let i = 0; i < allSockets.length; i++) {
+            const socketIdOther = allSockets[i];
+            this.io.to(socketIdOther).emit("sessionCount", { count });
+        }
+    }
+}

package/srv/callprocessors/UnregisterSessionProcessor.mjs

@@ -0,0 +1,30 @@
+import { GenericProcessor } from "./GenericProcessor.mjs";
+
+
+export class UnregisterSessionProcessor extends GenericProcessor {
+    constructor(context, io, socket) {
+        super(context, io, socket);
+    }
+    execute(args) {
+        //console.log(`UnregisterSessionProcessor... ${JSON.stringify(args)}`);
+        const sessionsData = this.context.sessionsByProvider;
+        const { socketId, provider } = args;
+        if ((provider in sessionsData)) {
+            const userSessions = sessionsData[provider];
+            const { sockets, sessions } = userSessions;
+            // Get session by socketId
+            const oldSession = sockets[socketId];
+            if (oldSession) {
+                delete sessions[oldSession];
+                delete sockets[socketId];
+            }
+        }
+        //console.log(JSON.stringify(sessionsData, null, 4));
+        const allSockets = Object.keys(sessionsData[provider].sockets);
+        const count = allSockets.length;
+        for (let i = 0; i < allSockets.length; i++) {
+            const socketIdOther = allSockets[i];
+            this.io.to(socketIdOther).emit("sessionCount", { count });
+        }
+    }
+}