Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 12 additions & 26 deletions internal/msggateway/ws_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,17 @@ func (ws *WsServer) KickUserConn(client *Client) error {
}

func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Client, newClient *Client) {
kickTokenFunc := func(kickClients []*Client) {
kickTokenFunc := func(kickClients []*Client, newClient *Client) {
var kickTokens []string
ws.clients.DeleteClients(newClient.UserID, kickClients)
for _, c := range kickClients {
// If reconnecting: When multiple msgGateway instances are deployed, a client may disconnect from instance A and reconnect to instance B.
// During this process, instance A might still be executing, resulting in two clients with the same token existing simultaneously.
// This situation needs to be filtered to prevent duplicate clients.
if c.token == newClient.token {
log.ZDebug(newClient.ctx, "token is same, not kick", "userID", newClient.UserID, "platformID", newClient.PlatformID, "token", newClient.token)
continue
}
kickTokens = append(kickTokens, c.token)
err := c.KickOnlineMessage()
if err != nil {
Expand All @@ -334,27 +341,6 @@ func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Clien
}
}

// If reconnect: When multiple msgGateway instances are deployed, a client may disconnect from instance A and reconnect to instance B.
// During this process, instance A might still be executing, resulting in two clients with the same token existing simultaneously.
// This situation needs to be filtered to prevent duplicate clients.
checkSameTokenFunc := func(oldClients []*Client) []*Client {
var clientsNeedToKick []*Client

for _, c := range oldClients {
if c.token == newClient.token {
log.ZDebug(newClient.ctx, "token is same, not kick",
"userID", newClient.UserID,
"platformID", newClient.PlatformID,
"token", newClient.token)
continue
}

clientsNeedToKick = append(clientsNeedToKick, c)
}

return clientsNeedToKick
}

switch ws.msgGatewayConfig.Share.MultiLogin.Policy {
case constant.DefalutNotKick:
case constant.PCAndOther:
Expand All @@ -377,10 +363,11 @@ func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Clien
return
}

oldClients = checkSameTokenFunc(oldClients)

ws.clients.DeleteClients(newClient.UserID, oldClients)
for _, c := range oldClients {
if c.token == newClient.token {
continue
}
err := c.KickOnlineMessage()
if err != nil {
log.ZWarn(c.ctx, "KickOnlineMessage", err)
Expand Down Expand Up @@ -414,9 +401,8 @@ func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Clien
}
}
}
kickClients = checkSameTokenFunc(kickClients)

kickTokenFunc(kickClients)
kickTokenFunc(kickClients, newClient)
}
}

Expand Down