Revert "Emit node event then emit socket event"

This reverts commit aa61e10aef15a81a39afbe727a82daa77bb983d5.

packages/app/src/interfaces/events/page.ts

@@ -1,8 +0,0 @@
-export const PageEventName = {
-  // Public migration
-  PMStarted: 'PublicMigrationStarted',
-  PMMigrating: 'PublicMigrationMigrating',
-  PMErrorCount: 'PublicMigrationErrorCount',
-  PMEnded: 'PublicMigrationEnded',
-} as const;
-export type PageEventName = typeof PageEventName[keyof typeof PageEventName];

packages/app/src/server/service/page.ts

@@ -236,39 +236,6 @@ class PageService {
         logger.error(err);
       }
     });
-
-    // parent normalization
-    this.pageEvent.on(PageEventName.PMStarted, async(data: { total: number }, user) => {
-      if (user == null || !user.isAdmin) {
-        return;
-      }
-
-      this.crowi.socketIoService.getAdminSocket().emit(SocketEventName.PMStarted, data);
-    });
-
-    this.pageEvent.on(PageEventName.PMMigrating, async(data: { count: number }, user) => {
-      if (user == null || !user.isAdmin) {
-        return;
-      }
-
-      this.crowi.socketIoService.getAdminSocket().emit(SocketEventName.PMMigrating, data);
-    });
-
-    this.pageEvent.on(PageEventName.PMErrorCount, async(data: { skip: number }, user) => {
-      if (user == null || !user.isAdmin) {
-        return;
-      }
-
-      this.crowi.socketIoService.getAdminSocket().emit(SocketEventName.PMErrorCount, data);
-    });
-
-    this.pageEvent.on(PageEventName.PMEnded, async(data: { isSucceeded: boolean }, user) => {
-      if (user == null || !user.isAdmin) {
-        return;
-      }
-
-      this.crowi.socketIoService.getAdminSocket().emit(SocketEventName.PMEnded, data);
-    });
   }
 
   canDeleteCompletely(creatorId: ObjectIdLike, operator, isRecursively: boolean): boolean {
@@ -2812,6 +2779,8 @@ class PageService {
     const BATCH_SIZE = 100;
     const PAGES_LIMIT = 1000;
 
+    const socket = this.crowi.socketIoService.getAdminSocket();
+
     const Page = mongoose.model('Page') as unknown as PageModel;
     const { PageQueryBuilder } = Page;
 
@@ -2832,7 +2801,7 @@ class PageService {
     // Limit pages to get
     const total = await Page.countDocuments(matchFilter);
     if (isFirst) {
-      this.pageEvent.emit(PageEventName.PMStarted, { total });
+      socket.emit(SocketEventName.PMStarted, { total });
     }
     if (total > PAGES_LIMIT) {
       baseAggregation = baseAggregation.limit(Math.floor(total * 0.3));
@@ -2847,7 +2816,6 @@ class PageService {
 
     // eslint-disable-next-line max-len
     const buildPipelineToCreateEmptyPagesByUser = this.buildPipelineToCreateEmptyPagesByUser.bind(this);
-    const pageEvent = this.pageEvent;
 
     const migratePagesStream = new Writable({
       objectMode: true,
@@ -2940,13 +2908,13 @@ class PageService {
           nextSkiped += res.result.writeErrors.length;
           logger.info(`Page migration processing: (migratedPages=${res.result.nModified})`);
 
-          pageEvent.emit(PageEventName.PMMigrating, { count: nextCount });
-          pageEvent.emit(PageEventName.PMErrorCount, { skip: nextSkiped });
+          socket.emit(SocketEventName.PMMigrating, { count: nextCount });
+          socket.emit(SocketEventName.PMErrorCount, { skip: nextSkiped });
 
           // Throw if any error is found
           if (res.result.writeErrors.length > 0) {
             logger.error('Failed to migrate some pages', res.result.writeErrors);
-            pageEvent.emit(PageEventName.PMEnded, { isSucceeded: false });
+            socket.emit(SocketEventName.PMEnded, { isSucceeded: false });
             throw Error('Failed to migrate some pages');
           }
 
@@ -2954,7 +2922,7 @@ class PageService {
           if (res.result.nModified === 0 && res.result.nMatched === 0) {
             shouldContinue = false;
             logger.error('Migration is unable to continue', 'parentPaths:', parentPaths, 'bulkWriteResult:', res);
-            pageEvent.emit(PageEventName.PMEnded, { isSucceeded: false });
+            socket.emit(SocketEventName.PMEnded, { isSucceeded: false });
           }
         }
         catch (err) {
@@ -2980,7 +2948,7 @@ class PageService {
     }
 
     // End
-    this.pageEvent.emit(PageEventName.PMEnded, { isSucceeded: true });
+    socket.emit(SocketEventName.PMEnded, { isSucceeded: true });
 
     return nextCount;
   }