feat: added laravel reverb and websocket, also emote throwing added

This commit is contained in:
2026-08-16 17:10:42 +02:00
parent 50e9fbd0b0
commit 6f47ed0674
30 changed files with 2244 additions and 34 deletions
+15
View File
@@ -0,0 +1,15 @@
<?php
namespace App\Enums;
enum RoomStateChange: string
{
case PlayerJoined = 'player_joined';
case VoteChanged = 'vote_changed';
case CardsRevealed = 'cards_revealed';
case VotesReset = 'votes_reset';
case NextRound = 'next_round';
case RoomReopened = 'room_reopened';
case RoomClosed = 'room_closed';
case RoomDeleted = 'room_deleted';
}
+43
View File
@@ -0,0 +1,43 @@
<?php
namespace App\Events;
use Illuminate\Broadcasting\Channel;
use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
class PaperBallThrown implements ShouldBroadcastNow
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public function __construct(
public readonly string $id,
public readonly string $roomId,
public readonly int $fromPlayerId,
public readonly int $targetPlayerId,
) {}
public function broadcastOn(): Channel
{
return new Channel("rooms.{$this->roomId}");
}
public function broadcastAs(): string
{
return 'room.emote.thrown';
}
/**
* @return array{id: string, from_player_id: int, target_player_id: int}
*/
public function broadcastWith(): array
{
return [
'id' => $this->id,
'from_player_id' => $this->fromPlayerId,
'target_player_id' => $this->targetPlayerId,
];
}
}
+42
View File
@@ -0,0 +1,42 @@
<?php
namespace App\Events;
use App\Enums\RoomStateChange;
use Illuminate\Broadcasting\Channel;
use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
class RoomStateChanged implements ShouldBroadcast
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public function __construct(
public readonly string $roomId,
public readonly int $version,
public readonly RoomStateChange $change,
) {}
public function broadcastOn(): Channel
{
return new Channel("rooms.{$this->roomId}");
}
public function broadcastAs(): string
{
return 'room.state.changed';
}
/**
* @return array{version: int, change: string}
*/
public function broadcastWith(): array
{
return [
'version' => $this->version,
'change' => $this->change->value,
];
}
}
+30 -5
View File
@@ -2,6 +2,8 @@
namespace App\Http\Controllers;
use App\Enums\RoomStateChange;
use App\Events\RoomStateChanged;
use App\Http\Requests\StoreRoomRequest;
use App\Models\Deck;
use App\Models\Player;
@@ -187,11 +189,13 @@ class RoomController extends Controller
abort_if($room->trashed(), 404);
abort_unless($user !== null && $user->id === $room->owner_id, 403);
$player = DB::transaction(function () use ($room, $user) {
[$player, $stateVersion, $wasReopened] = DB::transaction(function () use ($room, $user): array {
$lockedRoom = Room::query()->lockForUpdate()->findOrFail($room->id);
abort_unless($user->id === $lockedRoom->owner_id, 403);
$wasReopened = $lockedRoom->isClosed();
if ($lockedRoom->isClosed()) {
$lockedRoom->update([
'current_round' => $lockedRoom->current_round + 1,
@@ -202,13 +206,25 @@ class RoomController extends Controller
]);
}
return $lockedRoom->players()
->where('user_id', $user->id)
->firstOrFail();
return [
$lockedRoom->players()
->where('user_id', $user->id)
->firstOrFail(),
$lockedRoom->state_version,
$wasReopened,
];
});
$request->session()->put("room_players.{$room->id}", $player->id);
if ($wasReopened) {
RoomStateChanged::dispatch(
$room->id,
$stateVersion,
RoomStateChange::RoomReopened,
);
}
return to_route('room.show', $room);
}
@@ -219,7 +235,7 @@ class RoomController extends Controller
abort_if($room->trashed(), 404);
abort_unless($user !== null && $user->id === $room->owner_id, 403);
DB::transaction(function () use ($room, $user): void {
$stateVersion = DB::transaction(function () use ($room, $user): int {
$lockedRoom = Room::withTrashed()
->lockForUpdate()
->findOrFail($room->id);
@@ -231,9 +247,18 @@ class RoomController extends Controller
'state_version' => $lockedRoom->state_version + 1,
]);
$lockedRoom->delete();
return $lockedRoom->state_version;
});
$request->session()->forget("room_players.{$room->id}");
RoomStateChanged::dispatch(
$room->id,
$stateVersion,
RoomStateChange::RoomDeleted,
);
Inertia::flash('toast', [
'type' => 'success',
'message' => 'Der Raum wurde gelöscht.',
@@ -0,0 +1,65 @@
<?php
namespace App\Http\Controllers;
use App\Events\PaperBallThrown;
use App\Models\Player;
use App\Models\Room;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Support\Str;
use Illuminate\Validation\ValidationException;
class RoomEmoteController extends Controller
{
public function store(Request $request, Room $room): Response
{
$player = $request->attributes->get('currentPlayer');
abort_unless(
$player instanceof Player && $player->room_id === $room->id,
403,
);
$validated = $request->validate([
'target_player_id' => ['required', 'integer'],
]);
$targetPlayerId = (int) $validated['target_player_id'];
if ($targetPlayerId === $player->id) {
throw ValidationException::withMessages([
'target_player_id' => 'Du kannst dich nicht selbst abwerfen.',
]);
}
$targetExists = $room->players()
->whereKey($targetPlayerId)
->exists();
if (! $targetExists) {
throw ValidationException::withMessages([
'target_player_id' => 'Dieser Spieler sitzt nicht an diesem Tisch.',
]);
}
$rateLimitKey = "room-emote:{$room->id}:{$player->id}";
abort_if(
RateLimiter::tooManyAttempts($rateLimitKey, 10),
429,
'Bitte warte kurz, bevor du erneut wirfst.',
);
RateLimiter::hit($rateLimitKey, 10);
PaperBallThrown::dispatch(
Str::uuid()->toString(),
$room->id,
$player->id,
$targetPlayerId,
);
return response()->noContent();
}
}
@@ -2,6 +2,8 @@
namespace App\Http\Controllers;
use App\Enums\RoomStateChange;
use App\Events\RoomStateChanged;
use App\Http\Requests\JoinRoomRequest;
use App\Models\Player;
use App\Models\Room;
@@ -54,6 +56,12 @@ class RoomPlayerController extends Controller
$player->id,
);
RoomStateChanged::dispatch(
$room->id,
$room->state_version,
RoomStateChange::PlayerJoined,
);
return to_route('room.show', $room);
}
+29 -3
View File
@@ -2,6 +2,8 @@
namespace App\Http\Controllers;
use App\Enums\RoomStateChange;
use App\Events\RoomStateChanged;
use App\Models\Player;
use App\Models\Room;
use App\Models\Vote;
@@ -25,7 +27,7 @@ class RoundController extends Controller
403,
);
DB::transaction(function () use ($room) {
$stateVersion = DB::transaction(function () use ($room): int {
$lockedRoom = Room::query()
->lockForUpdate()
->findOrFail($room->id);
@@ -42,8 +44,16 @@ class RoundController extends Controller
'last_activity_at' => now(),
'state_version' => $lockedRoom->state_version + 1,
]);
return $lockedRoom->state_version;
});
RoomStateChanged::dispatch(
$room->id,
$stateVersion,
RoomStateChange::VotesReset,
);
return back();
}
@@ -60,7 +70,7 @@ class RoundController extends Controller
403,
);
DB::transaction(function () use ($room) {
$stateVersion = DB::transaction(function () use ($room): int {
$lockedRoom = Room::query()
->lockForUpdate()
->findOrFail($room->id);
@@ -78,8 +88,16 @@ class RoundController extends Controller
'last_activity_at' => now(),
'state_version' => $lockedRoom->state_version + 1,
]);
return $lockedRoom->state_version;
});
RoomStateChanged::dispatch(
$room->id,
$stateVersion,
RoomStateChange::CardsRevealed,
);
return back();
}
@@ -96,7 +114,7 @@ class RoundController extends Controller
403,
);
DB::transaction(function () use ($room) {
$stateVersion = DB::transaction(function () use ($room): int {
$lockedRoom = Room::query()
->lockForUpdate()
->findOrFail($room->id);
@@ -115,8 +133,16 @@ class RoundController extends Controller
'last_activity_at' => now(),
'state_version' => $lockedRoom->state_version + 1,
]);
return $lockedRoom->state_version;
});
RoomStateChanged::dispatch(
$room->id,
$stateVersion,
RoomStateChange::NextRound,
);
return back();
}
+11 -1
View File
@@ -2,6 +2,8 @@
namespace App\Http\Controllers;
use App\Enums\RoomStateChange;
use App\Events\RoomStateChanged;
use App\Http\Requests\SubmitVoteRequest;
use App\Models\Player;
use App\Models\Room;
@@ -26,7 +28,7 @@ class VoteController extends Controller
$value = $request->validated('value');
DB::transaction(function () use ($room, $player, $value) {
$stateVersion = DB::transaction(function () use ($room, $player, $value): int {
$lockedRoom = Room::query()
->lockForUpdate()
->findOrFail($room->id);
@@ -58,8 +60,16 @@ class VoteController extends Controller
'last_activity_at' => now(),
'state_version' => $lockedRoom->state_version + 1,
]);
return $lockedRoom->state_version;
});
RoomStateChanged::dispatch(
$room->id,
$stateVersion,
RoomStateChange::VoteChanged,
);
return back();
}
}
+37 -20
View File
@@ -2,6 +2,8 @@
namespace App\Jobs;
use App\Enums\RoomStateChange;
use App\Events\RoomStateChanged;
use App\Models\Room;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Queue\Queueable;
@@ -13,7 +15,7 @@ class CloseInactiveRooms implements ShouldQueue
public function handle(): void
{
$closedAt = now();
$closedAt = now()->toImmutable();
$guestCutoff = $closedAt->subDays(config('rooms.guest_retention_days'));
$accountCutoff = $closedAt->subDays(config('rooms.account_retention_days'));
@@ -32,25 +34,40 @@ class CloseInactiveRooms implements ShouldQueue
})
->select('id')
->chunkById(100, function ($rooms) use ($closedAt, $guestCutoff, $accountCutoff): void {
Room::query()
->whereKey($rooms->pluck('id'))
->whereNull('closed_at')
->where(function ($query) use ($guestCutoff, $accountCutoff): void {
$query
->where(function ($query) use ($guestCutoff): void {
$query->whereNull('owner_id')
->where('last_activity_at', '<=', $guestCutoff);
})
->orWhere(function ($query) use ($accountCutoff): void {
$query->whereNotNull('owner_id')
->where('last_activity_at', '<=', $accountCutoff);
});
})
->update([
'closed_at' => $closedAt,
'state_version' => DB::raw('state_version + 1'),
'updated_at' => $closedAt,
]);
foreach ($rooms->pluck('id') as $roomId) {
$stateVersion = DB::transaction(function () use ($roomId, $closedAt, $guestCutoff, $accountCutoff): ?int {
$room = Room::query()
->lockForUpdate()
->find((string) $roomId);
if ($room === null || $room->isClosed() || $room->last_activity_at === null) {
return null;
}
$cutoff = $room->owner_id === null
? $guestCutoff
: $accountCutoff;
if ($room->last_activity_at->greaterThan($cutoff)) {
return null;
}
$room->update([
'closed_at' => $closedAt,
'state_version' => $room->state_version + 1,
]);
return $room->state_version;
});
if ($stateVersion !== null) {
RoomStateChanged::dispatch(
(string) $roomId,
$stateVersion,
RoomStateChange::RoomClosed,
);
}
}
}, 'id');
}
}
+5
View File
@@ -3,6 +3,7 @@
namespace App\Providers;
use Carbon\CarbonImmutable;
use Illuminate\Foundation\DevCommands;
use Illuminate\Support\Facades\Date;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\ServiceProvider;
@@ -24,6 +25,10 @@ class AppServiceProvider extends ServiceProvider
public function boot(): void
{
$this->configureDefaults();
if (app()->isLocal()) {
DevCommands::artisan('reverb:start --debug', 'reverb');
}
}
/**