From 59b1064fad5fbbdc7eb2b1fe81383ba92c374aab Mon Sep 17 00:00:00 2001
From: riku6460 <17585784+riku6460@users.noreply.github.com>
Date: Sun, 2 Jul 2023 12:17:55 +0900
Subject: [PATCH] =?UTF-8?q?JSON.parse=20=E3=81=AE=E5=9B=9E=E6=95=B0?=
 =?UTF-8?q?=E3=82=92=E5=89=8A=E6=B8=9B=E3=81=99=E3=82=8B=20(#93)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/server/api/StreamingApiServerService.ts  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/server/api/StreamingApiServerService.ts b/packages/backend/src/server/api/StreamingApiServerService.ts
index d1394d6d76..8c3025e625 100644
--- a/packages/backend/src/server/api/StreamingApiServerService.ts
+++ b/packages/backend/src/server/api/StreamingApiServerService.ts
@@ -93,6 +93,13 @@ export class StreamingApiServerService {
 			});
 		});
 
+		const globalEv = new EventEmitter();
+
+		this.redisForSub.on('message', (_: string, data: string) => {
+			const parsed = JSON.parse(data);
+			globalEv.emit('message', parsed);
+		});
+
 		this.#wss.on('connection', async (connection: WebSocket.WebSocket, request: http.IncomingMessage, ctx: {
 			stream: MainStreamConnection,
 			user: LocalUser | null;
@@ -102,12 +109,11 @@ export class StreamingApiServerService {
 
 			const ev = new EventEmitter();
 
-			async function onRedisMessage(_: string, data: string): Promise<void> {
-				const parsed = JSON.parse(data);
-				ev.emit(parsed.channel, parsed.message);
+			function onRedisMessage(data: any): void {
+				ev.emit(data.channel, data.message);
 			}
 
-			this.redisForSub.on('message', onRedisMessage);
+			globalEv.on('message', onRedisMessage);
 
 			await stream.listen(ev, connection);
 
@@ -127,7 +133,7 @@ export class StreamingApiServerService {
 			connection.once('close', () => {
 				ev.removeAllListeners();
 				stream.dispose();
-				this.redisForSub.off('message', onRedisMessage);
+				globalEv.off('message', onRedisMessage);
 				this.#connections.delete(connection);
 				if (userUpdateIntervalId) clearInterval(userUpdateIntervalId);
 			});