1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-18 20:59:44 +02:00

fix: Socket bug fixes and improvements

This commit is contained in:
Maksim Eltyshev 2022-10-03 12:11:19 +02:00
parent 694fa17bdf
commit e623e8a3a8
6 changed files with 53 additions and 32 deletions

View file

@ -1,3 +1,5 @@
const { v4: uuid } = require('uuid');
module.exports = { module.exports = {
inputs: { inputs: {
record: { record: {
@ -29,18 +31,9 @@ module.exports = {
const boardMembership = await BoardMembership.destroyOne(inputs.record.id); const boardMembership = await BoardMembership.destroyOne(inputs.record.id);
if (boardMembership) { if (boardMembership) {
sails.sockets.broadcast( const notify = (room) => {
`user:${boardMembership.userId}`,
'boardMembershipDelete',
{
item: boardMembership,
},
inputs.request,
);
const notifyBoard = () => {
sails.sockets.broadcast( sails.sockets.broadcast(
`board:${boardMembership.boardId}`, room,
'boardMembershipDelete', 'boardMembershipDelete',
{ {
item: boardMembership, item: boardMembership,
@ -54,16 +47,32 @@ module.exports = {
inputs.project.id, inputs.project.id,
); );
if (isProjectManager) { if (!isProjectManager) {
notifyBoard();
} else {
// TODO: also remove if unsubscribed to user
sails.sockets.removeRoomMembersFromRooms( sails.sockets.removeRoomMembersFromRooms(
`user:${boardMembership.userId}`, `@user:${boardMembership.userId}`,
`board:${boardMembership.boardId}`, `board:${boardMembership.boardId}`,
notifyBoard, () => {
notify(`board:${boardMembership.boardId}`);
},
); );
} }
notify(`user:${boardMembership.userId}`);
if (isProjectManager) {
const tempRoom = uuid();
sails.sockets.addRoomMembersToRooms(`board:${boardMembership.boardId}`, tempRoom, () => {
sails.sockets.removeRoomMembersFromRooms(
`user:${boardMembership.userId}`,
tempRoom,
() => {
notify(tempRoom);
sails.sockets.removeRoomMembersFromRooms(tempRoom, tempRoom);
},
);
});
}
} }
return boardMembership; return boardMembership;

View file

@ -17,16 +17,23 @@ module.exports = {
const board = await Board.archiveOne(inputs.record.id); const board = await Board.archiveOne(inputs.record.id);
if (board) { if (board) {
sails.sockets.leaveAll(`board:${board.id}`); sails.sockets.removeRoomMembersFromRooms(`board:${board.id}`, `board:${board.id}`);
sails.sockets.broadcast( const managerUserIds = await sails.helpers.projects.getManagerUserIds(board.projectId);
`project:${board.projectId}`, const memberUserIds = await sails.helpers.boards.getMemberUserIds(board.id);
'boardDelete',
{ const userIds = _.union(managerUserIds, memberUserIds);
item: board,
}, userIds.forEach((userId) => {
inputs.request, sails.sockets.broadcast(
); `user:${userId}`,
'boardDelete',
{
item: board,
},
inputs.request,
);
});
} }
return board; return board;

View file

@ -25,9 +25,10 @@ module.exports = {
}, },
async fn(inputs) { async fn(inputs) {
const userIds = await sails.helpers.projects.getManagerAndBoardMemberUserIds( const managerUserIds = await sails.helpers.projects.getManagerUserIds(inputs.record.projectId);
inputs.record.projectId, const memberUserIds = await sails.helpers.boards.getMemberUserIds(inputs.record.id);
);
const userIds = _.union(managerUserIds, memberUserIds);
if (!_.isUndefined(inputs.values.position)) { if (!_.isUndefined(inputs.values.position)) {
const boards = await sails.helpers.projects.getBoards( const boards = await sails.helpers.projects.getBoards(

View file

@ -26,7 +26,7 @@ module.exports = {
const userIds = _.union(managerUserIds, memberUserIds); const userIds = _.union(managerUserIds, memberUserIds);
userIds.forEach((userId) => { userIds.forEach((userId) => {
sails.sockets.removeRoomMembersFromRooms(`user:${userId}`, boardRooms); sails.sockets.removeRoomMembersFromRooms(`@user:${userId}`, boardRooms);
sails.sockets.broadcast( sails.sockets.broadcast(
`user:${userId}`, `user:${userId}`,

View file

@ -123,13 +123,13 @@ module.exports = {
if (user.id === inputs.user.id && inputs.request && inputs.request.isSocket) { if (user.id === inputs.user.id && inputs.request && inputs.request.isSocket) {
const tempRoom = uuid(); const tempRoom = uuid();
sails.sockets.addRoomMembersToRooms(`user:${user.id}`, tempRoom, () => { sails.sockets.addRoomMembersToRooms(`@user:${user.id}`, tempRoom, () => {
sails.sockets.leave(inputs.request, tempRoom, () => { sails.sockets.leave(inputs.request, tempRoom, () => {
sails.sockets.leaveAll(tempRoom); sails.sockets.leaveAll(tempRoom);
}); });
}); });
} else { } else {
sails.sockets.leaveAll(`user:${user.id}`); sails.sockets.leaveAll(`@user:${user.id}`);
} }
} }

View file

@ -59,6 +59,10 @@ module.exports = function defineCurrentUserHook(sails) {
accessToken, accessToken,
currentUser, currentUser,
}); });
if (req.isSocket) {
sails.sockets.join(req, `@user:${currentUser.id}`);
}
} }
} }