bubble/educt-server
1
0
Fork 0
mirror of https://github.com/sergeyyarkov/educt-server.git synced 2026-10-11 10:19:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed session saving

Browse Source
This commit is contained in:
Sergey Yarkov 2022-01-30 19:08:30 +03:00
parent d52cee9f57
commit 448d071f93
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Services/WsService.ts
View File

@ -26,7 +26,7 @@ export interface ClientToServerEvents {
/** /**
* User * User
*/ */
'user:logout': (data: { sessionId: string }) => void; 'user:logout': () => void;
} }
export interface InterServerEvents {} export interface InterServerEvents {}
@ -69,10 +69,13 @@ class WsService {
const { sessionId, userId, userName } = socket.data; const { sessionId, userId, userName } = socket.data;
const isExistSocketData = !!(sessionId && userId && userName); const isExistSocketData = !!(sessionId && userId && userName);
console.log('New socket connected');
/** /**
* Set user session and send online count * Set user session and send online count
*/ */
if (isExistSocketData) { if (isExistSocketData) {
console.log('Saving session');
this.sessionStore this.sessionStore
.saveSession(sessionId, { userId, userName, connected: true }) .saveSession(sessionId, { userId, userName, connected: true })
.then(() => this.sessionStore.getOnlineSessionsCount()) .then(() => this.sessionStore.getOnlineSessionsCount())
@ -87,6 +90,13 @@ class WsService {
*/ */
socket.emit('user:session', { sessionId: socket.data.sessionId, userId: socket.data.userId }); socket.emit('user:session', { sessionId: socket.data.sessionId, userId: socket.data.userId });
/**
* Destroy session on user logout request
*/
socket.on('user:logout', () => {
console.log('Destroy session', sessionId);
});
/** /**
* Broadcast to all clients about new connection * Broadcast to all clients about new connection
*/ */

11
app/Store/SessionStore.ts
View File

@ -49,8 +49,13 @@ class RedisSessionStore {
nextIndex = parseInt(nextIndexAsStr, 10); nextIndex = parseInt(nextIndexAsStr, 10);
result.forEach(s => keys.add(s)); result.forEach(s => keys.add(s));
} while (nextIndex !== 0); } while (nextIndex !== 0);
const commands = Array.from(keys).map(key => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const [prefix, ...id] = key.split('-');
return ['hmget', id.join('-'), 'userId', 'userName', 'connected'];
});
const commands = Array.from(keys).map(key => ['hmget', key.split('-')[1], 'userId', 'userName', 'connected']); console.log(commands);
return this.redisClient return this.redisClient
.multi(commands) .multi(commands)
@ -63,8 +68,8 @@ class RedisSessionStore {
*/ */
public async getOnlineSessionsCount() { public async getOnlineSessionsCount() {
const sessions = await this.getSessions(); const sessions = await this.getSessions();
const online = new Set(sessions.filter(s => s?.connected === true).map(s => s?.userId)); const online = new Set(sessions.filter(s => s?.connected === true).map(s => s?.userId));
return online.size; return online.size;
} }
@ -75,7 +80,7 @@ class RedisSessionStore {
* @param data Session data * @param data Session data
*/ */
public async saveSession(id: string, data: SessionDataType): Promise<void> { public async saveSession(id: string, data: SessionDataType): Promise<void> {
this.redisClient await this.redisClient
.multi() .multi()
.hmset(id, { .hmset(id, {
userId: data.userId, userId: data.userId,