From 87bf0ae05e20e22c6cb68ba51900ba1dcddbbb0c Mon Sep 17 00:00:00 2001 From: Blax Software Date: Sat, 18 Jan 2025 17:06:52 +0100 Subject: [PATCH] Pusher : -> . --- src/Server/Exceptions/WebSocketException.php | 2 +- .../Messages/PusherChannelProtocolMessage.php | 2 +- src/Server/WebSocketHandler.php | 2 +- src/Websocket/Controller.php | 4 ++++ src/Websocket/Handler.php | 2 +- tests/ConnectionTest.php | 16 ++++++++-------- tests/Dashboard/AuthTest.php | 4 ++-- tests/PingTest.php | 4 ++-- tests/PresenceChannelTest.php | 6 +++--- tests/PrivateChannelTest.php | 6 +++--- tests/PublicChannelTest.php | 4 ++-- tests/TestCase.php | 6 +++--- 12 files changed, 31 insertions(+), 27 deletions(-) diff --git a/src/Server/Exceptions/WebSocketException.php b/src/Server/Exceptions/WebSocketException.php index a72b663..c2aa80d 100644 --- a/src/Server/Exceptions/WebSocketException.php +++ b/src/Server/Exceptions/WebSocketException.php @@ -14,7 +14,7 @@ class WebSocketException extends Exception public function getPayload() { return [ - 'event' => 'pusher:error', + 'event' => 'pusher.error', 'data' => [ 'message' => $this->getMessage(), 'code' => $this->getCode(), diff --git a/src/Server/Messages/PusherChannelProtocolMessage.php b/src/Server/Messages/PusherChannelProtocolMessage.php index 0899d2e..5f4c565 100644 --- a/src/Server/Messages/PusherChannelProtocolMessage.php +++ b/src/Server/Messages/PusherChannelProtocolMessage.php @@ -36,7 +36,7 @@ class PusherChannelProtocolMessage extends PusherClientMessage $this->channelManager ->connectionPonged($connection) ->then(function () use ($connection) { - $connection->send(json_encode(['event' => 'pusher:pong'])); + $connection->send(json_encode(['event' => 'pusher.pong'])); ConnectionPonged::dispatch($connection->app->id, $connection->socketId); }); diff --git a/src/Server/WebSocketHandler.php b/src/Server/WebSocketHandler.php index a106307..ec6e549 100644 --- a/src/Server/WebSocketHandler.php +++ b/src/Server/WebSocketHandler.php @@ -273,7 +273,7 @@ class WebSocketHandler implements MessageComponentInterface protected function establishConnection(ConnectionInterface $connection) { $connection->send(json_encode([ - 'event' => 'pusher:connection_established', + 'event' => 'pusher.connection_established', 'data' => json_encode([ 'socket_id' => $connection->socketId, 'activity_timeout' => 30, diff --git a/src/Websocket/Controller.php b/src/Websocket/Controller.php index 135ae6e..ceb54b8 100644 --- a/src/Websocket/Controller.php +++ b/src/Websocket/Controller.php @@ -258,6 +258,10 @@ class Controller { $event = explode('.', $message['event']); + if (strpos($event[0], 'pusher.') > -1) { + $event = explode('.', $event[0]); + } + if (strpos($event[0], 'pusher:') > -1) { $event = explode(':', $event[0]); } diff --git a/src/Websocket/Handler.php b/src/Websocket/Handler.php index f24c8a2..fde0521 100644 --- a/src/Websocket/Handler.php +++ b/src/Websocket/Handler.php @@ -321,7 +321,7 @@ class Handler implements MessageComponentInterface protected function establishConnection(ConnectionInterface $connection) { $connection->send(json_encode([ - 'event' => 'pusher:connection_established', + 'event' => 'pusher.connection_established', 'data' => json_encode([ 'socket_id' => $connection->socketId, 'activity_timeout' => 30, diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php index fbf733c..fe4c31a 100644 --- a/tests/ConnectionTest.php +++ b/tests/ConnectionTest.php @@ -11,7 +11,7 @@ class ConnectionTest extends TestCase $this->startServer(); $response = $this->await($this->joinWebSocketServer(['public-channel'], 'NonWorkingKey')); - $this->assertSame('{"event":"pusher:error","data":{"message":"Could not find app key `NonWorkingKey`.","code":4001}}', (string) $response); + $this->assertSame('{"event":"pusher.error","data":{"message":"Could not find app key `NonWorkingKey`.","code":4001}}', (string) $response); } public function test_unconnected_app_cannot_store_statistics() @@ -19,7 +19,7 @@ class ConnectionTest extends TestCase $this->startServer(); $response = $this->await($this->joinWebSocketServer(['public-channel'], 'NonWorkingKey')); - $this->assertSame('{"event":"pusher:error","data":{"message":"Could not find app key `NonWorkingKey`.","code":4001}}', (string) $response); + $this->assertSame('{"event":"pusher.error","data":{"message":"Could not find app key `NonWorkingKey`.","code":4001}}', (string) $response); $count = $this->await($this->statisticsCollector->getStatistics()); $this->assertCount(0, $count); @@ -30,7 +30,7 @@ class ConnectionTest extends TestCase $this->startServer(); $response = $this->await($this->joinWebSocketServer(['public-channel'], 'TestOrigin')); - $this->assertSame('{"event":"pusher:error","data":{"message":"The origin is not allowed for `TestOrigin`.","code":4009}}', (string) $response); + $this->assertSame('{"event":"pusher.error","data":{"message":"The origin is not allowed for `TestOrigin`.","code":4009}}', (string) $response); } public function test_origin_validation_should_fail_for_wrong_origin() @@ -38,7 +38,7 @@ class ConnectionTest extends TestCase $this->startServer(); $response = $this->await($this->joinWebSocketServer(['public-channel'], 'TestOrigin', ['Origin' => 'https://google.ro'])); - $this->assertSame('{"event":"pusher:error","data":{"message":"The origin is not allowed for `TestOrigin`.","code":4009}}', (string) $response); + $this->assertSame('{"event":"pusher.error","data":{"message":"The origin is not allowed for `TestOrigin`.","code":4009}}', (string) $response); } public function test_origin_validation_should_pass_for_the_right_origin() @@ -47,7 +47,7 @@ class ConnectionTest extends TestCase $this->pusherServer->onOpen($connection); - $connection->assertSentEvent('pusher:connection_established'); + $connection->assertSentEvent('pusher.connection_established'); } public function test_close_connection() @@ -87,7 +87,7 @@ class ConnectionTest extends TestCase $this->pusherServer->onError($connection, new UnknownAppKey('NonWorkingKey')); - $connection->assertSentEvent('pusher:error', [ + $connection->assertSentEvent('pusher.error', [ 'data' => [ 'message' => 'Could not find app key `NonWorkingKey`.', 'code' => 4001, @@ -105,14 +105,14 @@ class ConnectionTest extends TestCase $failedConnection = $this->newActiveConnection(['test-channel']); $failedConnection - ->assertSentEvent('pusher:error', ['data' => ['message' => 'Over capacity', 'code' => 4100]]) + ->assertSentEvent('pusher.error', ['data' => ['message' => 'Over capacity', 'code' => 4100]]) ->assertClosed(); } public function test_close_all_new_connections_after_stating_the_server_does_not_accept_new_connections() { $this->newActiveConnection(['test-channel']) - ->assertSentEvent('pusher:connection_established') + ->assertSentEvent('pusher.connection_established') ->assertSentEvent('pusher_internal:subscription_succeeded'); $this->channelManager->declineNewConnections(); diff --git a/tests/Dashboard/AuthTest.php b/tests/Dashboard/AuthTest.php index 946944e..4b8054e 100644 --- a/tests/Dashboard/AuthTest.php +++ b/tests/Dashboard/AuthTest.php @@ -32,7 +32,7 @@ class AuthTest extends TestCase $this->pusherServer->onOpen($connection); $message = new SignedMessage([ - 'event' => 'pusher:subscribe', + 'event' => 'pusher.subscribe', 'data' => [ 'channel' => 'private-channel', ], @@ -68,7 +68,7 @@ class AuthTest extends TestCase ]); $message = new SignedMessage([ - 'event' => 'pusher:subscribe', + 'event' => 'pusher.subscribe', 'data' => [ 'channel' => 'presence-channel', 'channel_data' => $user, diff --git a/tests/PingTest.php b/tests/PingTest.php index 3f8691c..0964417 100644 --- a/tests/PingTest.php +++ b/tests/PingTest.php @@ -8,10 +8,10 @@ class PingTest extends TestCase { $connection = $this->newActiveConnection(['public-channel']); - $message = new Mocks\Message(['event' => 'pusher:ping']); + $message = new Mocks\Message(['event' => 'pusher.ping']); $this->pusherServer->onMessage($connection, $message); - $connection->assertSentEvent('pusher:pong'); + $connection->assertSentEvent('pusher.pong'); } } diff --git a/tests/PresenceChannelTest.php b/tests/PresenceChannelTest.php index 10c1368..c2d1a86 100644 --- a/tests/PresenceChannelTest.php +++ b/tests/PresenceChannelTest.php @@ -18,7 +18,7 @@ class PresenceChannelTest extends TestCase $connection = $this->newConnection(); $message = new Mocks\Message([ - 'event' => 'pusher:subscribe', + 'event' => 'pusher.subscribe', 'data' => [ 'auth' => 'invalid', 'channel' => 'presence-channel', @@ -45,7 +45,7 @@ class PresenceChannelTest extends TestCase $encodedUser = json_encode($user); $message = new Mocks\SignedMessage([ - 'event' => 'pusher:subscribe', + 'event' => 'pusher.subscribe', 'data' => [ 'channel' => 'presence-channel', 'channel_data' => $encodedUser, @@ -173,7 +173,7 @@ class PresenceChannelTest extends TestCase }); $message = new Mocks\Message([ - 'event' => 'pusher:unsubscribe', + 'event' => 'pusher.unsubscribe', 'data' => [ 'channel' => 'presence-channel', ], diff --git a/tests/PrivateChannelTest.php b/tests/PrivateChannelTest.php index 051b5f2..63490d7 100644 --- a/tests/PrivateChannelTest.php +++ b/tests/PrivateChannelTest.php @@ -18,7 +18,7 @@ class PrivateChannelTest extends TestCase $connection = $this->newConnection(); $message = new Mocks\Message([ - 'event' => 'pusher:subscribe', + 'event' => 'pusher.subscribe', 'data' => [ 'auth' => 'invalid', 'channel' => 'private-channel', @@ -36,7 +36,7 @@ class PrivateChannelTest extends TestCase $this->pusherServer->onOpen($connection); $message = new Mocks\SignedMessage([ - 'event' => 'pusher:subscribe', + 'event' => 'pusher.subscribe', 'data' => [ 'channel' => 'private-channel', ], @@ -66,7 +66,7 @@ class PrivateChannelTest extends TestCase }); $message = new Mocks\Message([ - 'event' => 'pusher:unsubscribe', + 'event' => 'pusher.unsubscribe', 'data' => [ 'channel' => 'private-channel', ], diff --git a/tests/PublicChannelTest.php b/tests/PublicChannelTest.php index eda696c..53295cf 100644 --- a/tests/PublicChannelTest.php +++ b/tests/PublicChannelTest.php @@ -21,7 +21,7 @@ class PublicChannelTest extends TestCase }); $connection->assertSentEvent( - 'pusher:connection_established', + 'pusher.connection_established', [ 'data' => json_encode([ 'socket_id' => $connection->socketId, @@ -47,7 +47,7 @@ class PublicChannelTest extends TestCase }); $message = new Mocks\Message([ - 'event' => 'pusher:unsubscribe', + 'event' => 'pusher.unsubscribe', 'data' => [ 'channel' => 'public-channel', ], diff --git a/tests/TestCase.php b/tests/TestCase.php index 6ecab93..0a4cdc7 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -427,7 +427,7 @@ abstract class TestCase extends Orchestra foreach ($channelsToJoin as $channel) { $message = new Mocks\Message([ - 'event' => 'pusher:subscribe', + 'event' => 'pusher.subscribe', 'data' => [ 'channel' => $channel, ], @@ -462,7 +462,7 @@ abstract class TestCase extends Orchestra $encodedUser = json_encode($user); $message = new Mocks\SignedMessage([ - 'event' => 'pusher:subscribe', + 'event' => 'pusher.subscribe', 'data' => [ 'channel' => $channel, 'channel_data' => $encodedUser, @@ -489,7 +489,7 @@ abstract class TestCase extends Orchestra $this->pusherServer->onOpen($connection); $message = new Mocks\SignedMessage([ - 'event' => 'pusher:subscribe', + 'event' => 'pusher.subscribe', 'data' => [ 'channel' => $channel, ],