@budibase/server 2.6.19-alpha.52 → 2.6.19-alpha.54

package/dist/index.js

@@ -31187,7 +31187,8 @@ var init_websocket2 = __esm({
                     email,
                     firstName,
                     lastName,
-                    sessionId: socket.id
+                    sessionId: socket.id,
+                    connectedAt: Date.now()
                   };
                   next();
                 }
@@ -31267,7 +31268,9 @@ var init_websocket2 = __esm({
         );
         const prunedSessionIds = sessionIds.filter((id, idx) => {
           if (!sessionsExist[idx]) {
-            this.io.to(room).emit("UserDisconnect" /* UserDisconnect */, sessionIds[idx]);
+            this.io.to(room).emit("UserDisconnect" /* UserDisconnect */, {
+              sessionId: sessionIds[idx]
+            });
             return false;
           }
           return true;
@@ -31297,7 +31300,9 @@ var init_websocket2 = __esm({
         if (!sessionIds.includes(sessionId)) {
           await this.setRoomSessionIds(room, [...sessionIds, sessionId]);
         }
-        socket.to(room).emit("UserUpdate" /* UserUpdate */, user2);
+        socket.to(room).emit("UserUpdate" /* UserUpdate */, {
+          user: user2
+        });
       }
       // Disconnects a socket from its current room
       async leaveRoom(socket) {
@@ -31316,7 +31321,7 @@ var init_websocket2 = __esm({
           room,
           sessionIds.filter((id) => id !== sessionId)
         );
-        socket.to(room).emit("UserDisconnect" /* UserDisconnect */, sessionId);
+        socket.to(room).emit("UserDisconnect" /* UserDisconnect */, { sessionId });
       }
       // Updates a connected user's metadata, assuming a room change is not required.
       async updateUser(socket, patch4) {
@@ -31682,12 +31687,12 @@ var init_grid = __esm({
         super(app2, server2, "/socket/grid", [authorized_default(permissions_exports.BUILDER)]);
       }
       async onConnect(socket) {
-        socket.on("SelectTable" /* SelectTable */, async (tableId, callback) => {
+        socket.on("SelectTable" /* SelectTable */, async ({ tableId }, callback) => {
           await this.joinRoom(socket, tableId);
           const sessions = await this.getRoomSessions(tableId);
           callback({ users: sessions });
         });
-        socket.on("SelectCell" /* SelectCell */, (cellId) => {
+        socket.on("SelectCell" /* SelectCell */, ({ cellId }) => {
           this.updateUser(socket, { focusedCellId: cellId });
         });
       }
@@ -31730,7 +31735,7 @@ var init_builder2 = __esm({
         super(app2, server2, "/socket/builder", [authorized_default(permissions_exports.BUILDER)]);
       }
       async onConnect(socket) {
-        socket == null ? void 0 : socket.on("SelectApp" /* SelectApp */, async (appId, callback) => {
+        socket == null ? void 0 : socket.on("SelectApp" /* SelectApp */, async ({ appId }, callback) => {
           await this.joinRoom(socket, appId);
           const sessions = await this.getRoomSessions(appId);
           callback({ users: sessions });
@@ -31747,6 +31752,19 @@ var init_builder2 = __esm({
           if (!hasOtherSession && room) {
             const user2 = { _id: socket.data._id };
             await clearLock(room, user2);
+            let otherSessions = sessions.filter((x) => x._id !== _id).slice();
+            otherSessions.sort((a, b) => {
+              return a.connectedAt < b.connectedAt ? -1 : 1;
+            });
+            const nextSession = otherSessions[0];
+            if (nextSession) {
+              const { _id: _id2, email, firstName, lastName } = nextSession;
+              const nextUser = { _id: _id2, email, firstName, lastName };
+              await updateLock(room, nextUser);
+              this.io.to(room).emit("LockTransfer" /* LockTransfer */, {
+                userId: _id2
+              });
+            }
           }
         } catch (e) {
         }