Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

-improved logging in RTS (#6846)

Browse Source
This commit is contained in:
Nayan 2021-08-25 15:52:58 +06:00 committed by GitHub
parent f4210e4601
commit 2f473fbd66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
app/rts/src/server.ts
View File

@ -61,14 +61,17 @@ function main() {
}); });
io.of(ROOT_NAMESPACE).adapter.on("leave-room", (room, id) => { io.of(ROOT_NAMESPACE).adapter.on("leave-room", (room, id) => {
console.log(`ns:${ROOT_NAMESPACE}# socket ${id} left the room ${room}`)
sendCurrentUsers(io, room, APP_ROOM_PREFIX); sendCurrentUsers(io, room, APP_ROOM_PREFIX);
}); });
io.of(ROOT_NAMESPACE).adapter.on("join-room", (room, id) => { io.of(ROOT_NAMESPACE).adapter.on("join-room", (room, id) => {
console.log(`ns:${ROOT_NAMESPACE}# socket ${id} joined the room ${room}`)
sendCurrentUsers(io, room, APP_ROOM_PREFIX); sendCurrentUsers(io, room, APP_ROOM_PREFIX);
}); });
io.of(PAGE_EDIT_NAMESPACE).adapter.on("leave-room", (room, id) => { io.of(PAGE_EDIT_NAMESPACE).adapter.on("leave-room", (room, id) => {
console.log(`ns:${PAGE_EDIT_NAMESPACE}# socket ${id} left the room ${room}`)
if(room.startsWith(PAGE_ROOM_PREFIX)) { // someone left the page edit, notify others if(room.startsWith(PAGE_ROOM_PREFIX)) { // someone left the page edit, notify others
io.of(PAGE_EDIT_NAMESPACE).to(room).emit(LEAVE_EDIT_EVENT_NAME, id); io.of(PAGE_EDIT_NAMESPACE).to(room).emit(LEAVE_EDIT_EVENT_NAME, id);
} }
@ -85,11 +88,13 @@ function main() {
function joinEditRoom(socket:Socket, roomId:string, roomPrefix:string) { function joinEditRoom(socket:Socket, roomId:string, roomPrefix:string) {
// remove this socket from any other app rooms // remove this socket from any other app rooms
socket.rooms.forEach(roomName => { if(socket.rooms) {
if(roomName.startsWith(roomPrefix)) { socket.rooms.forEach(roomName => {
socket.leave(roomName); if(roomName.startsWith(roomPrefix)) {
} socket.leave(roomName);
}); }
});
}
// add this socket to room with application id // add this socket to room with application id
let roomName = roomPrefix + roomId; let roomName = roomPrefix + roomId;
@ -133,39 +138,42 @@ async function onPageSocketConnected(socket:Socket, socketIo:Server) {
async function tryAuth(socket:Socket) { async function tryAuth(socket:Socket) {
const connectionCookie = socket.handshake.headers.cookie const connectionCookie = socket.handshake.headers.cookie
if (connectionCookie != null && connectionCookie !== "") { if (connectionCookie != null && connectionCookie !== "") {
const sessionCookie = connectionCookie.match(/\bSESSION=\S+/)[0] const matchedCookie = connectionCookie.match(/\bSESSION=\S+/)
let response if(matchedCookie) {
try { const sessionCookie = matchedCookie[0]
response = await axios.request({ let response
method: "GET", try {
url: API_BASE_URL + "/applications/new", response = await axios.request({
headers: { method: "GET",
Cookie: sessionCookie, url: API_BASE_URL + "/applications/new",
}, headers: {
}) Cookie: sessionCookie,
} catch (error) { },
if (error.response?.status === 401) { })
console.info("Couldn't authenticate user with cookie:") } catch (error) {
} else { if (error.response?.status === 401) {
console.error("Error authenticating", error) console.info("401 received when authenticating user with cookie: " + sessionCookie)
} else if(error.response) {
console.error("Error response received while authentication: ", error.response)
} else {
console.error("Error authenticating", error)
}
return false
} }
return false
const email = response.data.data.user.email
const name = response.data.data.user.name ? response.data.data.user.name : email;
socket.data.email = email
socket.data.name = name
if(socket.data.pendingRoomId) { // an appId or pageId is pending for this socket, join now
joinEditRoom(socket, socket.data.pendingRoomId, socket.data.pendingRoomPrefix);
}
return true
} }
const email = response.data.data.user.email
const name = response.data.data.user.name ? response.data.data.user.name : email;
socket.data.email = email
socket.data.name = name
if(socket.data.pendingRoomId) { // an appId or pageId is pending for this socket, join now
joinEditRoom(socket, socket.data.pendingRoomId, socket.data.pendingRoomPrefix);
}
return true
} }
return false return false
} }
async function watchMongoDB(io) { async function watchMongoDB(io) {
@ -299,6 +307,14 @@ async function watchMongoDB(io) {
io.to("email:" + notification.forUsername).emit(eventName, { notification }) io.to("email:" + notification.forUsername).emit(eventName, { notification })
}) })
process.on('uncaughtExceptionMonitor', (err, origin) => {
console.error(`Caught exception: ${err}\n` + `Exception origin: ${origin}`);
});
process.on('unhandledRejection', (reason, promise) => {
console.log('Unhandled Rejection at:', promise, 'reason:', reason);
});
process.on("exit", () => { process.on("exit", () => {
(commentChangeStream != null ? commentChangeStream.close() : Promise.bind(client).resolve()) (commentChangeStream != null ? commentChangeStream.close() : Promise.bind(client).resolve())
.then(client.close.bind(client)) .then(client.close.bind(client))