From b74144cdd5fd75728654e20d117059f057bba995 Mon Sep 17 00:00:00 2001 From: Alex Renoki Date: Mon, 7 Dec 2020 23:30:12 +0200 Subject: [PATCH] Revert "wip formatting" This reverts commit 19ca49a4a8920ae1cb4111271528a9a1e95b18b1. --- src/API/Controller.php | 3 +- src/Apps/ConfigAppManager.php | 11 +++-- src/ChannelManagers/LocalChannelManager.php | 43 +++++++++++-------- src/ChannelManagers/RedisChannelManager.php | 13 +++--- src/Channels/Channel.php | 3 +- src/Statistics/Collectors/MemoryCollector.php | 12 ++++-- src/Statistics/Collectors/RedisCollector.php | 10 ++--- src/Statistics/Stores/DatabaseStore.php | 20 +++++---- tests/PresenceChannelTest.php | 3 +- tests/PrivateChannelTest.php | 3 +- tests/PublicChannelTest.php | 3 +- 11 files changed, 74 insertions(+), 50 deletions(-) diff --git a/src/API/Controller.php b/src/API/Controller.php index 30284e4..74267de 100644 --- a/src/API/Controller.php +++ b/src/API/Controller.php @@ -176,7 +176,8 @@ abstract class Controller implements HttpServerInterface $laravelRequest = Request::createFromBase((new HttpFoundationFactory)->createRequest($serverRequest)); - $this->ensureValidAppId($laravelRequest->appId) + $this + ->ensureValidAppId($laravelRequest->appId) ->ensureValidSignature($laravelRequest); // Invoke the controller action diff --git a/src/Apps/ConfigAppManager.php b/src/Apps/ConfigAppManager.php index aa4f198..eb3d5db 100644 --- a/src/Apps/ConfigAppManager.php +++ b/src/Apps/ConfigAppManager.php @@ -30,9 +30,11 @@ class ConfigAppManager implements AppManager */ public function all(): array { - return $this->apps->map(function (array $appAttributes) { - return $this->convertIntoApp($appAttributes); - })->toArray(); + return $this->apps + ->map(function (array $appAttributes) { + return $this->convertIntoApp($appAttributes); + }) + ->toArray(); } /** @@ -104,7 +106,8 @@ class ConfigAppManager implements AppManager $app->setPath($appAttributes['path']); } - $app->enableClientMessages($appAttributes['enable_client_messages']) + $app + ->enableClientMessages($appAttributes['enable_client_messages']) ->enableStatistics($appAttributes['enable_statistics']) ->setCapacity($appAttributes['capacity'] ?? null) ->setAllowedOrigins($appAttributes['allowed_origins'] ?? []); diff --git a/src/ChannelManagers/LocalChannelManager.php b/src/ChannelManagers/LocalChannelManager.php index 9b90d3c..03dbd21 100644 --- a/src/ChannelManagers/LocalChannelManager.php +++ b/src/ChannelManagers/LocalChannelManager.php @@ -111,12 +111,16 @@ class LocalChannelManager implements ChannelManager */ public function getLocalConnections(): PromiseInterface { - $connections = collect($this->channels)->map(function ($channelsWithConnections, $appId) { - return collect($channelsWithConnections)->values(); - })->values()->collapse() - ->map(function ($channel) { - return collect($channel->getConnections()); - })->values()->collapse()->toArray(); + $connections = collect($this->channels) + ->map(function ($channelsWithConnections, $appId) { + return collect($channelsWithConnections)->values(); + }) + ->values()->collapse() + ->map(function ($channel) { + return collect($channel->getConnections()); + }) + ->values()->collapse() + ->toArray(); return Helpers::createFulfilledPromise($connections); } @@ -162,9 +166,11 @@ class LocalChannelManager implements ChannelManager $this->getLocalChannels($connection->app->id)->then(function ($channels) use ($connection) { collect($channels)->each->unsubscribe($connection); - collect($channels)->reject->hasConnections()->each(function (Channel $channel, string $channelName) use ($connection) { - unset($this->channels[$connection->app->id][$channelName]); - }); + collect($channels) + ->reject->hasConnections() + ->each(function (Channel $channel, string $channelName) use ($connection) { + unset($this->channels[$connection->app->id][$channelName]); + }); }); $this->getLocalChannels($connection->app->id)->then(function ($channels) use ($connection) { @@ -249,9 +255,11 @@ class LocalChannelManager implements ChannelManager return $collection->filter(function (Channel $channel) use ($channelName) { return $channel->getName() === $channelName; }); - })->flatMap(function (Channel $channel) { + }) + ->flatMap(function (Channel $channel) { return collect($channel->getConnections())->pluck('socketId'); - })->unique()->count(); + }) + ->unique()->count(); }); } @@ -370,13 +378,14 @@ class LocalChannelManager implements ChannelManager */ public function getChannelsMembersCount($appId, array $channelNames): PromiseInterface { - $results = collect($channelNames)->reduce(function ($results, $channel) use ($appId) { - $results[$channel] = isset($this->users["{$appId}:{$channel}"]) - ? count($this->users["{$appId}:{$channel}"]) - : 0; + $results = collect($channelNames) + ->reduce(function ($results, $channel) use ($appId) { + $results[$channel] = isset($this->users["{$appId}:{$channel}"]) + ? count($this->users["{$appId}:{$channel}"]) + : 0; - return $results; - }, []); + return $results; + }, []); return Helpers::createFulfilledPromise($results); } diff --git a/src/ChannelManagers/RedisChannelManager.php b/src/ChannelManagers/RedisChannelManager.php index 5cedeb8..a927e68 100644 --- a/src/ChannelManagers/RedisChannelManager.php +++ b/src/ChannelManagers/RedisChannelManager.php @@ -412,13 +412,14 @@ class RedisChannelManager extends LocalChannelManager public function removeObsoleteConnections(): PromiseInterface { $this->lock()->get(function () { - $this->getConnectionsFromSet(0, now()->subMinutes(2)->format('U'))->then(function ($connections) { - foreach ($connections as $socketId => $appId) { - $connection = $this->fakeConnectionForApp($appId, $socketId); + $this->getConnectionsFromSet(0, now()->subMinutes(2)->format('U')) + ->then(function ($connections) { + foreach ($connections as $socketId => $appId) { + $connection = $this->fakeConnectionForApp($appId, $socketId); - $this->unsubscribeFromAllChannels($connection); - } - }); + $this->unsubscribeFromAllChannels($connection); + } + }); }); return parent::removeObsoleteConnections(); diff --git a/src/Channels/Channel.php b/src/Channels/Channel.php index f648d2a..fd857e2 100644 --- a/src/Channels/Channel.php +++ b/src/Channels/Channel.php @@ -155,7 +155,8 @@ class Channel */ public function broadcast($appId, stdClass $payload, bool $replicate = true): bool { - collect($this->getConnections())->each->send(json_encode($payload)); + collect($this->getConnections()) + ->each->send(json_encode($payload)); if ($replicate) { $this->channelManager->broadcastAcrossServers($appId, null, $this->getName(), $payload); diff --git a/src/Statistics/Collectors/MemoryCollector.php b/src/Statistics/Collectors/MemoryCollector.php index 2394e0a..34644de 100644 --- a/src/Statistics/Collectors/MemoryCollector.php +++ b/src/Statistics/Collectors/MemoryCollector.php @@ -43,7 +43,8 @@ class MemoryCollector implements StatisticsCollector */ public function webSocketMessage($appId) { - $this->findOrMake($appId)->webSocketMessage(); + $this->findOrMake($appId) + ->webSocketMessage(); } /** @@ -54,7 +55,8 @@ class MemoryCollector implements StatisticsCollector */ public function apiMessage($appId) { - $this->findOrMake($appId)->apiMessage(); + $this->findOrMake($appId) + ->apiMessage(); } /** @@ -65,7 +67,8 @@ class MemoryCollector implements StatisticsCollector */ public function connection($appId) { - $this->findOrMake($appId)->connection(); + $this->findOrMake($appId) + ->connection(); } /** @@ -76,7 +79,8 @@ class MemoryCollector implements StatisticsCollector */ public function disconnection($appId) { - $this->findOrMake($appId)->disconnection(); + $this->findOrMake($appId) + ->disconnection(); } /** diff --git a/src/Statistics/Collectors/RedisCollector.php b/src/Statistics/Collectors/RedisCollector.php index 050eb74..4840a10 100644 --- a/src/Statistics/Collectors/RedisCollector.php +++ b/src/Statistics/Collectors/RedisCollector.php @@ -55,9 +55,8 @@ class RedisCollector extends MemoryCollector */ public function webSocketMessage($appId) { - $this->ensureAppIsInSet($appId)->hincrby( - $this->channelManager->getRedisKey($appId, null, ['stats']), 'websocket_messages_count', 1 - ); + $this->ensureAppIsInSet($appId) + ->hincrby($this->channelManager->getRedisKey($appId, null, ['stats']), 'websocket_messages_count', 1); } /** @@ -68,9 +67,8 @@ class RedisCollector extends MemoryCollector */ public function apiMessage($appId) { - $this->ensureAppIsInSet($appId)->hincrby( - $this->channelManager->getRedisKey($appId, null, ['stats']), 'api_messages_count', 1 - ); + $this->ensureAppIsInSet($appId) + ->hincrby($this->channelManager->getRedisKey($appId, null, ['stats']), 'api_messages_count', 1); } /** diff --git a/src/Statistics/Stores/DatabaseStore.php b/src/Statistics/Stores/DatabaseStore.php index d579173..042e72b 100644 --- a/src/Statistics/Stores/DatabaseStore.php +++ b/src/Statistics/Stores/DatabaseStore.php @@ -42,7 +42,8 @@ class DatabaseStore implements StatisticsStore return static::$model::where('created_at', '<', $moment->toDateTimeString()) ->when(! is_null($appId), function ($query) use ($appId) { return $query->whereAppId($appId); - })->delete(); + }) + ->delete(); } /** @@ -53,11 +54,12 @@ class DatabaseStore implements StatisticsStore */ public function getRawRecords(callable $processQuery = null) { - return static::$model::query()->when(! is_null($processQuery), function ($query) use ($processQuery) { - return call_user_func($processQuery, $query); - }, function ($query) { - return $query->latest()->limit(120); - })->get(); + return static::$model::query() + ->when(! is_null($processQuery), function ($query) use ($processQuery) { + return call_user_func($processQuery, $query); + }, function ($query) { + return $query->latest()->limit(120); + })->get(); } /** @@ -72,9 +74,11 @@ class DatabaseStore implements StatisticsStore return $this->getRawRecords($processQuery) ->when(! is_null($processCollection), function ($collection) use ($processCollection) { return call_user_func($processCollection, $collection); - })->map(function (Model $statistic) { + }) + ->map(function (Model $statistic) { return $this->statisticToArray($statistic); - })->toArray(); + }) + ->toArray(); } /** diff --git a/tests/PresenceChannelTest.php b/tests/PresenceChannelTest.php index f1427af..e5a294b 100644 --- a/tests/PresenceChannelTest.php +++ b/tests/PresenceChannelTest.php @@ -371,7 +371,8 @@ class PresenceChannelTest extends TestCase $receiver->assertSentEvent('some-event', $message->getPayloadAsArray()); - $this->getSubscribeClient()->assertNothingDispatched(); + $this->getSubscribeClient() + ->assertNothingDispatched(); $this->getPublishClient()->assertCalledWithArgs('publish', [ $this->channelManager->getRedisKey('1234', 'presence-channel'), diff --git a/tests/PrivateChannelTest.php b/tests/PrivateChannelTest.php index dace784..14be78b 100644 --- a/tests/PrivateChannelTest.php +++ b/tests/PrivateChannelTest.php @@ -205,7 +205,8 @@ class PrivateChannelTest extends TestCase $receiver->assertSentEvent('some-event', $message->getPayloadAsArray()); - $this->getSubscribeClient()->assertNothingDispatched(); + $this->getSubscribeClient() + ->assertNothingDispatched(); $this->getPublishClient()->assertCalledWithArgs('publish', [ $this->channelManager->getRedisKey('1234', 'private-channel'), diff --git a/tests/PublicChannelTest.php b/tests/PublicChannelTest.php index 70da239..d3bd5a0 100644 --- a/tests/PublicChannelTest.php +++ b/tests/PublicChannelTest.php @@ -186,7 +186,8 @@ class PublicChannelTest extends TestCase $receiver->assertSentEvent('some-event', $message->getPayloadAsArray()); - $this->getSubscribeClient()->assertNothingDispatched(); + $this->getSubscribeClient() + ->assertNothingDispatched(); $this->getPublishClient()->assertCalledWithArgs('publish', [ $this->channelManager->getRedisKey('1234', 'public-channel'),