From eb6ed2c3a005d5e540b592d6803e025fe12bdc68 Mon Sep 17 00:00:00 2001 From: Fierflame Date: Fri, 24 Jan 2025 20:37:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E5=86=92=E5=85=85=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/index.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/server/index.js b/server/index.js index 82b0b06..76eda84 100644 --- a/server/index.js +++ b/server/index.js @@ -98,37 +98,37 @@ server.on('connection', (socket, request) => { message = null; } - const { uid, targetId, type, data } = message; - if (!type || !uid || !targetId) { + const { targetId, type, data } = message; + if (!type || !targetId) { return null; } - const me = service.getUser(ip, roomId, uid) + const me = service.getUser(ip, roomId, currentId) const target = service.getUser(ip, roomId, targetId) if (!me || !target) { return; } if (type === RECEIVE_TYPE_NEW_CANDIDATE) { - socketSend_Candidate(target.socket, { targetId: uid, candidate: data.candidate }); + socketSend_Candidate(target.socket, { targetId: currentId, candidate: data.candidate }); return; } if (type === RECEIVE_TYPE_NEW_CONNECTION) { - socketSend_ConnectInvite(target.socket, { targetId: uid, offer: data.targetAddr }); + socketSend_ConnectInvite(target.socket, { targetId: currentId, offer: data.targetAddr }); return; } if (type === RECEIVE_TYPE_CONNECTED) { - socketSend_Connected(target.socket, { targetId: uid, answer: data.targetAddr }); + socketSend_Connected(target.socket, { targetId: currentId, answer: data.targetAddr }); return; } if (type === RECEIVE_TYPE_KEEPALIVE) { return; } if (type === RECEIVE_TYPE_UPDATE_NICKNAME) { - const success = service.updateNickname(ip, roomId, uid, data.nickname); + const success = service.updateNickname(ip, roomId, currentId, data.nickname); if (success) { // 通知所有用户昵称更新 service.getUserList(ip, roomId).forEach(user => { - socketSend_NicknameUpdated(user.socket, { id: uid, nickname: data.nickname }); + socketSend_NicknameUpdated(user.socket, { id: currentId, nickname: data.nickname }); }); } return; From 26bb2c7f607a4f876500cffe06807763dfecc580 Mon Sep 17 00:00:00 2001 From: Fierflame Date: Fri, 24 Jan 2025 20:40:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E6=84=8F?= =?UTF-8?q?=E4=B9=89=E7=9A=84=E6=9D=A1=E4=BB=B6=E5=88=A4=E5=AE=9A=EF=BC=8C?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=AD=98=E5=9C=A8=E5=B0=B1=E6=84=8F=E5=91=B3?= =?UTF-8?q?=E7=9D=80=E7=94=A8=E6=88=B7=E5=9C=A8=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/index.js b/server/index.js index 76eda84..b114969 100644 --- a/server/index.js +++ b/server/index.js @@ -102,9 +102,8 @@ server.on('connection', (socket, request) => { if (!type || !targetId) { return null; } - const me = service.getUser(ip, roomId, currentId) const target = service.getUser(ip, roomId, targetId) - if (!me || !target) { + if (!target) { return; } From 7985b108725bd9cab5c7da260164940147c978b3 Mon Sep 17 00:00:00 2001 From: Fierflame Date: Fri, 24 Jan 2025 20:44:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=98=B5=E7=A7=B0=E7=9A=84=E5=88=A4=E5=AE=9A=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E8=BA=AB=E6=98=B5=E7=A7=B0=EF=BC=8C?= =?UTF-8?q?=E6=89=80=E4=BB=A5=E6=97=A0=E9=9C=80=E5=88=A4=E5=AE=9A=20target?= =?UTF-8?q?Id=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/index.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/server/index.js b/server/index.js index b114969..065864b 100644 --- a/server/index.js +++ b/server/index.js @@ -99,6 +99,16 @@ server.on('connection', (socket, request) => { } const { targetId, type, data } = message; + if (type === RECEIVE_TYPE_UPDATE_NICKNAME) { + const success = service.updateNickname(ip, roomId, currentId, data.nickname); + if (success) { + // 通知所有用户昵称更新 + service.getUserList(ip, roomId).forEach(user => { + socketSend_NicknameUpdated(user.socket, { id: currentId, nickname: data.nickname }); + }); + } + return; + } if (!type || !targetId) { return null; } @@ -122,16 +132,6 @@ server.on('connection', (socket, request) => { if (type === RECEIVE_TYPE_KEEPALIVE) { return; } - if (type === RECEIVE_TYPE_UPDATE_NICKNAME) { - const success = service.updateNickname(ip, roomId, currentId, data.nickname); - if (success) { - // 通知所有用户昵称更新 - service.getUserList(ip, roomId).forEach(user => { - socketSend_NicknameUpdated(user.socket, { id: currentId, nickname: data.nickname }); - }); - } - return; - } });