Skip to content
This repository was archived by the owner on Feb 7, 2024. It is now read-only.

Commit e6cfa85

Browse files
rennokkirennokki
committed
Replaced blocking Redis instance with non-blocking I/O client
1 parent 0cb0e6c commit e6cfa85

14 files changed

+434
-166
lines changed

‎src/PubSub/Drivers/RedisClient.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,8 @@ public function onMessage(string $redisChannel, string $payload)
362362
*/
363363
protected function getConnectionUri()
364364
{
365-
$name = config('websockets.replication.redis.connection') ?: 'default';
366-
$config = config('database.redis')[$name];
365+
$name = config('websockets.replication.redis.connection', 'default');
366+
$config = config("database.redis.{$name}");
367367

368368
$host = $config['host'];
369369
$port = $config['port'] ?: 6379;

‎src/Statistics/Logger/RedisStatisticsLogger.php

Lines changed: 112 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
namespace BeyondCode\LaravelWebSockets\Statistics\Logger;
44

55
use BeyondCode\LaravelWebSockets\Apps\App;
6+
use BeyondCode\LaravelWebSockets\PubSub\ReplicationInterface;
67
use BeyondCode\LaravelWebSockets\Statistics\Drivers\StatisticsDriver;
78
use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
89
use Illuminate\Cache\RedisLock;
9-
use Illuminate\Support\Facades\Cache;
10+
use Illuminate\Support\Facades\Redis;
1011

1112
class RedisStatisticsLogger implements StatisticsLogger
1213
{
@@ -42,7 +43,11 @@ public function __construct(ChannelManager $channelManager, StatisticsDriver $dr
4243
{
4344
$this->channelManager = $channelManager;
4445
$this->driver = $driver;
45-
$this->redis = Cache::getRedis();
46+
$this->replicator = app(ReplicationInterface::class);
47+
48+
$this->redis = Redis::connection(
49+
config('websockets.replication.redis.connection', 'default')
50+
);
4651
}
4752

4853
/**
@@ -54,7 +59,7 @@ public function __construct(ChannelManager $channelManager, StatisticsDriver $dr
5459
public function webSocketMessage($appId)
5560
{
5661
$this->ensureAppIsSet($appId)
57-
->hincrby($this->getHash($appId), 'websocket_message_count', 1);
62+
->__call('hincrby', [$this->getHash($appId), 'websocket_message_count', 1]);
5863
}
5964

6065
/**
@@ -66,7 +71,7 @@ public function webSocketMessage($appId)
6671
public function apiMessage($appId)
6772
{
6873
$this->ensureAppIsSet($appId)
69-
->hincrby($this->getHash($appId), 'api_message_count', 1);
74+
->__call('hincrby', [$this->getHash($appId), 'api_message_count', 1]);
7075
}
7176

7277
/**
@@ -77,16 +82,30 @@ public function apiMessage($appId)
7782
*/
7883
public function connection($appId)
7984
{
80-
$currentConnectionCount = $this->ensureAppIsSet($appId)
81-
->hincrby($this->getHash($appId), 'current_connection_count', 1);
85+
// Increment the current connections count by 1.
86+
$incremented = $this->ensureAppIsSet($appId)
87+
->__call('hincrby', [$this->getHash($appId), 'current_connection_count', 1]);
88+
89+
$incremented->then(function ($currentConnectionCount) {
90+
// Get the peak connections count from Redis.
91+
$peakConnectionCount = $this->replicator
92+
->getPublishClient()
93+
->__call('hget', [$this->getHash($appId), 'peak_connection_count']);
8294

83-
$currentPeakConnectionCount = $this->redis->hget($this->getHash($appId), 'peak_connection_count');
95+
$peakConnectionCount->then(function ($currentPeakConnectionCount) use ($currentConnectionCount) {
96+
// Extract the greatest number between the current peak connection count
97+
// and the current connection number.
8498

85-
$peakConnectionCount = is_null($currentPeakConnectionCount)
86-
? $currentConnectionCount
87-
: max($currentPeakConnectionCount, $currentConnectionCount);
99+
$peakConnectionCount = is_null($currentPeakConnectionCount)
100+
? $currentConnectionCount
101+
: max($currentPeakConnectionCount, $currentConnectionCount);
88102

89-
$this->redis->hset($this->getHash($appId), 'peak_connection_count', $peakConnectionCount);
103+
// Then set it to the database.
104+
$this->replicator
105+
->getPublishClient()
106+
->__call('hset', [$this->getHash($appId), 'peak_connection_count', $peakConnectionCount]);
107+
});
108+
});
90109
}
91110

92111
/**
@@ -97,16 +116,30 @@ public function connection($appId)
97116
*/
98117
public function disconnection($appId)
99118
{
100-
$currentConnectionCount = $this->ensureAppIsSet($appId)
101-
->hincrby($this->getHash($appId), 'current_connection_count', -1);
119+
// Decrement the current connections count by 1.
120+
$decremented = $this->ensureAppIsSet($appId)
121+
->__call('hincrby', [$this->getHash($appId), 'current_connection_count', -1]);
122+
123+
$decremented->then(function ($currentConnectionCount) {
124+
// Get the peak connections count from Redis.
125+
$peakConnectionCount = $this->replicator
126+
->getPublishClient()
127+
->__call('hget', [$this->getHash($appId), 'peak_connection_count']);
102128

103-
$currentPeakConnectionCount = $this->redis->hget($this->getHash($appId), 'peak_connection_count');
129+
$peakConnectionCount->then(function ($currentPeakConnectionCount) use ($currentConnectionCount) {
130+
// Extract the greatest number between the current peak connection count
131+
// and the current connection number.
104132

105-
$peakConnectionCount = is_null($currentPeakConnectionCount)
106-
? $currentConnectionCount
107-
: max($currentPeakConnectionCount, $currentConnectionCount);
133+
$peakConnectionCount = is_null($currentPeakConnectionCount)
134+
? $currentConnectionCount
135+
: max($currentPeakConnectionCount, $currentConnectionCount);
108136

109-
$this->redis->hset($this->getHash($appId), 'peak_connection_count', $peakConnectionCount);
137+
// Then set it to the database.
138+
$this->replicator
139+
->getPublishClient()
140+
->__call('hset', [$this->getHash($appId), 'peak_connection_count', $peakConnectionCount]);
141+
});
142+
});
110143
}
111144

112145
/**
@@ -117,19 +150,33 @@ public function disconnection($appId)
117150
public function save()
118151
{
119152
$this->lock()->get(function () {
120-
foreach ($this->redis->smembers('laravel-websockets:apps') as $appId) {
121-
if (! $statistic = $this->redis->hgetall($this->getHash($appId))) {
122-
continue;
123-
}
153+
$setMembers = $this->replicator
154+
->getPublishClient()
155+
->__call('smembers', ['laravel-websockets:apps']);
156+
157+
$setMembers->then(function ($members) {
158+
foreach ($members as $appId) {
159+
$member = $this->replicator
160+
->getPublishClient()
161+
->__call('hgetall', [$this->getHash($appId)]);
124162

125-
$this->createRecord($statistic, $appId);
163+
$member->then(function ($statistic) use ($appId) {
164+
if (! $statistic) {
165+
return;
166+
}
126167

127-
$currentConnectionCount = $this->channelManager->getGlobalConnectionsCount($appId);
168+
$this->createRecord($statistic, $appId);
128169

129-
$currentConnectionCount === 0
130-
? $this->resetAppTraces($appId)
131-
: $this->resetStatistics($appId, $currentConnectionCount);
132-
}
170+
$this->channelManager
171+
->getGlobalConnectionsCount($appId)
172+
->then(function ($currentConnectionCount) use ($appId) {
173+
$currentConnectionCount === 0
174+
? $this->resetAppTraces($appId)
175+
: $this->resetStatistics($appId, $currentConnectionCount);
176+
});
177+
});
178+
}
179+
});
133180
});
134181
}
135182

@@ -141,9 +188,11 @@ public function save()
141188
*/
142189
protected function ensureAppIsSet($appId)
143190
{
144-
$this->redis->sadd('laravel-websockets:apps', $appId);
191+
$this->replicator
192+
->getPublishClient()
193+
->__call('sadd', ['laravel-websockets:apps', $appId]);
145194

146-
return $this->redis;
195+
return $this->replicator->getPublishClient();
147196
}
148197

149198
/**
@@ -155,10 +204,21 @@ protected function ensureAppIsSet($appId)
155204
*/
156205
public function resetStatistics($appId, int $currentConnectionCount)
157206
{
158-
$this->redis->hset($this->getHash($appId), 'current_connection_count', $currentConnectionCount);
159-
$this->redis->hset($this->getHash($appId), 'peak_connection_count', $currentConnectionCount);
160-
$this->redis->hset($this->getHash($appId), 'websocket_message_count', 0);
161-
$this->redis->hset($this->getHash($appId), 'api_message_count', 0);
207+
$this->replicator
208+
->getPublishClient()
209+
->__call('hset', [$this->getHash($appId), 'current_connection_count', $currentConnectionCount]);
210+
211+
$this->replicator
212+
->getPublishClient()
213+
->__call('hset', [$this->getHash($appId), 'peak_connection_count', $currentConnectionCount]);
214+
215+
$this->replicator
216+
->getPublishClient()
217+
->__call('hset', [$this->getHash($appId), 'websocket_message_count', 0]);
218+
219+
$this->replicator
220+
->getPublishClient()
221+
->__call('hset', [$this->getHash($appId), 'api_message_count', 0]);
162222
}
163223

164224
/**
@@ -170,12 +230,25 @@ public function resetStatistics($appId, int $currentConnectionCount)
170230
*/
171231
public function resetAppTraces($appId)
172232
{
173-
$this->redis->hdel($this->getHash($appId), 'current_connection_count');
174-
$this->redis->hdel($this->getHash($appId), 'peak_connection_count');
175-
$this->redis->hdel($this->getHash($appId), 'websocket_message_count');
176-
$this->redis->hdel($this->getHash($appId), 'api_message_count');
233+
$this->replicator
234+
->getPublishClient()
235+
->__call('hdel', [$this->getHash($appId), 'current_connection_count']);
236+
237+
$this->replicator
238+
->getPublishClient()
239+
->__call('hdel', [$this->getHash($appId), 'peak_connection_count']);
240+
241+
$this->replicator
242+
->getPublishClient()
243+
->__call('hdel', [$this->getHash($appId), 'websocket_message_count']);
244+
245+
$this->replicator
246+
->getPublishClient()
247+
->__call('hdel', [$this->getHash($appId), 'api_message_count']);
177248

178-
$this->redis->srem('laravel-websockets:apps', $appId);
249+
$this->replicator
250+
->getPublishClient()
251+
->__call('srem', ['laravel-websockets:apps', $appId]);
179252
}
180253

181254
/**

‎src/WebSockets/Channels/ChannelManager.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ public function getChannels($appId): array;
3636
* Get the connections count on the app.
3737
*
3838
* @param mixed $appId
39-
* @return int
39+
* @return int|\React\Promise\PromiseInterface
4040
*/
4141
public function getLocalConnectionsCount($appId): int;
4242

4343
/**
4444
* Get the connections count across multiple servers.
4545
*
4646
* @param mixed $appId
47-
* @return int
47+
* @return int|\React\Promise\PromiseInterface
4848
*/
49-
public function getGlobalConnectionsCount($appId): int;
49+
public function getGlobalConnectionsCount($appId);
5050

5151
/**
5252
* Remove connection from all channels.

‎src/WebSockets/Channels/ChannelManagers/ArrayChannelManager.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function getChannels($appId): array
7171
* Get the connections count on the app.
7272
*
7373
* @param mixed $appId
74-
* @return int
74+
* @return int|\React\Promise\PromiseInterface
7575
*/
7676
public function getLocalConnectionsCount($appId): int
7777
{
@@ -87,9 +87,9 @@ public function getLocalConnectionsCount($appId): int
8787
* Get the connections count across multiple servers.
8888
*
8989
* @param mixed $appId
90-
* @return int
90+
* @return int|\React\Promise\PromiseInterface
9191
*/
92-
public function getGlobalConnectionsCount($appId): int
92+
public function getGlobalConnectionsCount($appId)
9393
{
9494
return $this->getLocalConnectionsCount($appId);
9595
}

‎src/WebSockets/Channels/ChannelManagers/RedisChannelManager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public function __construct()
2727
* Get the connections count across multiple servers.
2828
*
2929
* @param mixed $appId
30-
* @return int
30+
* @return int|\React\Promise\PromiseInterface
3131
*/
32-
public function getGlobalConnectionsCount($appId): int
32+
public function getGlobalConnectionsCount($appId)
3333
{
3434
return $this->replicator->getGlobalConnectionsCount($appId);
3535
}

‎src/WebSockets/WebSocketHandler.php

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Ratchet\ConnectionInterface;
1818
use Ratchet\RFC6455\Messaging\MessageInterface;
1919
use Ratchet\WebSocket\MessageComponentInterface;
20+
use React\Promise\PromiseInterface;
2021

2122
class WebSocketHandler implements MessageComponentInterface
2223
{
@@ -167,8 +168,12 @@ protected function limitConcurrentConnections(ConnectionInterface $connection)
167168
if (! is_null($capacity = $connection->app->capacity)) {
168169
$connectionsCount = $this->channelManager->getGlobalConnectionsCount($connection->app->id);
169170

170-
if ($connectionsCount >= $capacity) {
171-
throw new ConnectionsOverCapacity();
171+
if ($connectionsCount instanceof PromiseInterface) {
172+
$connectionsCount->then(function ($connectionsCount) use ($capacity, $connection) {
173+
$this->sendExceptionIfOverCapacity($connectionsCount, $capacity, $connection);
174+
});
175+
} else {
176+
$this->throwExceptionIfOverCapacity($connectionsCount, $capacity);
172177
}
173178
}
174179

@@ -220,4 +225,37 @@ protected function establishConnection(ConnectionInterface $connection)
220225

221226
return $this;
222227
}
228+
229+
/**
230+
* Throw a ConnectionsOverCapacity exception.
231+
*
232+
* @param int $connectionsCount
233+
* @param int $capacity
234+
* @return void
235+
* @throws ConnectionsOverCapacity
236+
*/
237+
protected function throwExceptionIfOverCapacity(int $connectionsCount, int $capacity)
238+
{
239+
if ($connectionsCount >= $capacity) {
240+
throw new ConnectionsOverCapacity;
241+
}
242+
}
243+
244+
/**
245+
* Send the ConnectionsOverCapacity exception through
246+
* the connection and close the channel.
247+
*
248+
* @param int $connectionsCount
249+
* @param int $capacity
250+
* @param ConnectionInterface $connection
251+
* @return void
252+
*/
253+
protected function sendExceptionIfOverCapacity(int $connectionsCount, int $capacity, ConnectionInterface $connection)
254+
{
255+
if ($connectionsCount >= $capacity) {
256+
$payload = json_encode((new ConnectionsOverCapacity)->getPayload());
257+
258+
tap($connection)->send($payload)->close();
259+
}
260+
}
223261
}

‎tests/ConnectionTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ public function app_can_not_exceed_maximum_capacity_on_redis_replication()
5757
$this->getPublishClient()
5858
->assertCalledWithArgsCount(2, 'hincrby', ['laravel_database_1234', 'connections', 1]);
5959

60-
$this->expectException(ConnectionsOverCapacity::class);
60+
$failedConnection = $this->getConnectedWebSocketConnection(['test-channel']);
6161

62-
$this->getConnectedWebSocketConnection(['test-channel']);
62+
$this->markTestIncomplete(
63+
'The $failedConnection should somehow detect the tap($connection)->send($payload)->close() message.'
64+
);
6365
}
6466

6567
/** @test */

0 commit comments

Comments
 (0)