Merge branch 'imprv/7166s-socketio-service-refactor-use-rooms' into imprv/7386-remove-socket-client-id

packages/app/src/server/service/socket-io.js

@@ -1,5 +1,5 @@
 import loggerFactory from '~/utils/logger';
-import { RoomPrefix, getRoomNameWithId } from './utils/socket-io-helpers';
+import { RoomPrefix, getRoomNameWithId } from '../util/socket-io-helpers';
 
 const socketIo = require('socket.io');
 const expressSession = require('express-session');
@@ -42,6 +42,7 @@ class SocketIoService {
 
     await this.setupStoreGuestIdEventHandler();
 
+    await this.setupLoginedUserRoomsJoinOnConnection();
     await this.setupDefaultSocketJoinRoomsEventHandler();
   }
 
@@ -127,16 +128,20 @@ class SocketIoService {
     });
   }
 
-  setupDefaultSocketJoinRoomsEventHandler() {
+  setupLoginedUserRoomsJoinOnConnection() {
     this.io.on('connection', (socket) => {
       const user = socket.request.user;
       if (user == null) {
         logger.debug('Socket io: An anonymous user has connected');
         return;
       }
-      // make a room for each user. the user will leave automatically
       socket.join(getRoomNameWithId(RoomPrefix.USER, user._id));
+    });
+  }
 
+  setupDefaultSocketJoinRoomsEventHandler() {
+    this.io.on('connection', (socket) => {
+      // set event handlers for joining rooms
       socket.on('join:page', ({ pageId }) => {
         socket.join(getRoomNameWithId(RoomPrefix.PAGE, pageId));
       });

packages/app/src/server/service/system-events/sync-page-status.ts

@@ -5,7 +5,7 @@ import { S2cMessagePageUpdated } from '../../models/vo/s2c-message';
 import { S2sMessageHandlable } from '../s2s-messaging/handlable';
 import { S2sMessagingService } from '../s2s-messaging/base';
 
-import { RoomPrefix, getRoomNameWithId } from '../utils/socket-io-helpers';
+import { RoomPrefix, getRoomNameWithId } from '../../util/socket-io-helpers';
 
 const logger = loggerFactory('growi:service:system-events:SyncPageStatusService');