blax-software
/
laravel-websockets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug where obsolete data still remained in the server.

This commit is contained in:
Alex Renoki 2020-09-17 13:57:10 +03:00
parent 23e8b3db44
commit da7f1ba578
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/ChannelManagers/RedisChannelManager.php
View File

@ -186,35 +186,32 @@ class RedisChannelManager extends LocalChannelManager
$this->getGlobalConnectionsCount($connection->app->id, $channelName) $this->getGlobalConnectionsCount($connection->app->id, $channelName)
->then(function ($count) use ($connection, $channelName) { ->then(function ($count) use ($connection, $channelName) {
if ($count === 0) { if ($count === 0) {
// Make sure to not stay subscribed to the PubSub topic
// if there are no connections.
$this->unsubscribeFromTopic($connection->app->id, $channelName); $this->unsubscribeFromTopic($connection->app->id, $channelName);
$this->removeUserData(
$connection->app->id, $channelName, $connection->socketId
);
$this->removeChannelFromSet($connection->app->id, $channelName);
$this->removeConnectionFromSet($connection);
return;
} }
$this->decrementSubscriptionsCount( $this->decrementSubscriptionsCount($connection->app->id, $channelName)
$connection->app->id, $channelName,
)
->then(function ($count) use ($connection, $channelName) { ->then(function ($count) use ($connection, $channelName) {
// If the total connections count gets to 0 after unsubscribe,
// try again to check & unsubscribe from the PubSub topic if needed.
if ($count < 1) { if ($count < 1) {
$this->unsubscribeFromTopic($connection->app->id, $channelName); $this->unsubscribeFromTopic($connection->app->id, $channelName);
}
});
$this->removeUserData( $this->getChannelMember($connection, $channelName)
$connection->app->id, $channelName, $connection->socketId ->then(function ($member) use ($connection, $channelName) {
if ($member) {
$this->userLeftPresenceChannel(
$connection, json_decode($member), $channelName,
); );
}
});
$this->removeChannelFromSet($connection->app->id, $channelName); $this->removeChannelFromSet($connection->app->id, $channelName);
$this->removeConnectionFromSet($connection); $this->removeConnectionFromSet($connection);
}
});
}); });
parent::unsubscribeFromChannel($connection, $channelName, $payload); parent::unsubscribeFromChannel($connection, $channelName, $payload);
@ -677,7 +674,7 @@ class RedisChannelManager extends LocalChannelManager
public function removeUserData($appId, string $channel = null, string $key) public function removeUserData($appId, string $channel = null, string $key)
{ {
return $this->publishClient->hdel( return $this->publishClient->hdel(
$this->getRedisKey($appId, $channel), $key $this->getRedisKey($appId, $channel, ['users']), $key
); );
} }