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

Merge branch 'master' of github.com:beyondcode/laravel-websockets

This commit is contained in:
freek 2018-11-22 00:09:44 +01:00
parent a34b052f97 c8054f80ba
commit 4c0ee1e3a3
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/LaravelEcho/Pusher/Channels/Channel.php
View File

@ -26,15 +26,15 @@ class Channel
/**
* @link https://pusher.com/docs/pusher_protocol#presence-channel-events
*
* @param ConnectionInterface $conn
* @param ConnectionInterface $connection
* @param $payload
*/
public function subscribe(ConnectionInterface $conn, $payload)
public function subscribe(ConnectionInterface $connection, $payload)
{
$this->saveConnection($conn);
$this->saveConnection($connection);
// Send the success event
$conn->send(json_encode([
$connection->send(json_encode([
'event' => 'pusher_internal:subscription_succeeded',
'channel' => $this->channelId
]));

14
src/LaravelEcho/Pusher/Channels/PresenceChannel.php
View File

@ -11,24 +11,28 @@ class PresenceChannel extends Channel
/**
* @link https://pusher.com/docs/pusher_protocol#presence-channel-events
*
* @param ConnectionInterface $conn
* @param ConnectionInterface $connection
* @param $payload
*/
public function subscribe(ConnectionInterface $conn, $payload)
public function subscribe(ConnectionInterface $connection, $payload)
{
$this->saveConnection($conn);
$this->saveConnection($connection);
$channelData = json_decode($payload->channel_data);
$this->subscriptions[$channelData->user_id] = $channelData;
// Send the success event
$conn->send(json_encode([
$connection->send(json_encode([
'event' => 'pusher_internal:subscription_succeeded',
'channel' => $this->channelId,
'data' => json_encode($this->getChannelData())
]));
//TODO: send member_added message back to client, and broadcast to everyone on channel
$this->broadcastToOthers($connection, [
'event' => 'pusher_internal:member_added',
'channel' => $this->channelId,
'data' => json_encode($channelData)
]);
}
public function unsubscribe(ConnectionInterface $connection)

2
src/LaravelEcho/WebSocket/EchoServer.php
View File

@ -2,12 +2,10 @@
namespace BeyondCode\LaravelWebSockets\LaravelEcho\WebSocket;
use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\PusherMessage;
use Ratchet\ConnectionInterface;
use Ratchet\RFC6455\Messaging\MessageInterface;
use BeyondCode\LaravelWebSockets\WebSocketController;
use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
use stdClass;
class EchoServer extends WebSocketController
{