fix server assignment

app/Console/Kernel.php

@@ -19,6 +19,7 @@ protected function schedule(Schedule $schedule): void
         $schedule->job(new \App\Jobs\ServerAssignmentJob())->everyFifteenSeconds();
         $schedule->job(new \App\Jobs\CheckClientActivityJob())->everyFifteenMinutes();
         $schedule->job(new \App\Jobs\CleanUpUnusedClientsJob())->everyMinute();
+        $schedule->job(new \App\Jobs\CleanUpInactiveServerAssignmentsJob())->everyFiveMinutes();
     }
 
     /**

app/Http/Controllers/Api/ClientController.php

@@ -34,12 +34,21 @@ public function play(HookRequest $request)
             return new Response("Missing streamkey or client id", 422);
         }
 
+        // This is the streamkey for external apps
+        if($result['streamkey'] === config('services.signage.streamkey')) {
+            return new Response(0, 200);
+        }
+
         $user = User::where('streamkey', $result['streamkey'])->first();
 
         if (is_null($user)) {
             return new Response("No assigned server found by streamkey", 403);
         }
 
+        if((int) $request->get('server_id') !== $user->server_id && !\App::isLocal()) {
+            return new Response("Server id does not match", 403);
+        }
+
         if (isset($result['client'])) {
             $client = ($result['client'] === "vlc") ? 'vlc' : 'web';
         }
@@ -66,6 +75,12 @@ public function stop(HookRequest $request)
         if (!isset($result['streamkey'])) {
             return new Response(422, 422);
         }
+
+        // This is the streamkey for external apps
+        if($result['streamkey'] === config('services.signage.streamkey')) {
+            return new Response(0, 200);
+        }
+
         $user = User::where('streamkey', $result['streamkey'])->first();
         if (is_null($user)) {
             return new Response(403, 403);

app/Jobs/CleanUpInactiveServerAssignmentsJob.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class CleanUpInactiveServerAssignmentsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct()
+    {
+    }
+
+    public function handle(): void
+    {
+        // Get list of Users that connection ended more than 5 minutes ago
+        $users = User::whereNotNull('server_id')
+            ->whereDoesntHave('clients', fn($q) => $q->where(fn($q) => $q->connected())
+                ->orWhere('stop', '>', now()->subMinutes(5)))
+            ->get()
+            ->each(function (User $user) {
+                $user->server_id = null;
+                $user->save();
+            });
+
+    }
+}

app/Jobs/Server/Deprovision/ServerMoveClientsToOtherServerJob.php

@@ -2,7 +2,6 @@
 
 namespace App\Jobs\Server\Deprovision;
 
-use App\Events\ServerAssignmentChanged;
 use App\Models\Client;
 use App\Models\Server;
 use App\Models\User;
@@ -30,7 +29,6 @@ public function handle(): void
 
         $connectedClients->each(function (Client $client) {
             $foundNewServer = $client->user->assignServerToUser();
-            ServerAssignmentChanged::dispatch($client->user, !$foundNewServer);
         });
     }
 }

app/Jobs/ServerAssignmentJob.php

@@ -22,12 +22,6 @@ public function handle(): void
     {
         // Get all users waiting for provisioning
         $users = User::where('is_provisioning',true)->get();
-        $users->each(function($user) {
-            $server = $user->assignServerToUser();
-            // If server could be assigned, send broadcast to user
-            if ($server === true) {
-                event(new ServerAssignmentChanged($user));
-            }
-        });
+        $users->each(fn($user) => $user->assignServerToUser());
     }
 }

app/Models/User.php

@@ -40,7 +40,6 @@ class User extends Authenticatable implements FilamentUser
      * @var array<int, string>
      */
     protected $hidden = [
-        'password',
         'remember_token',
     ];
 

app/Observers/UserObserver.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Observers;
+
+use App\Events\ServerAssignmentChanged;
+use App\Models\User;
+
+class UserObserver
+{
+    public function created(User $user): void
+    {
+
+    }
+
+    public function updated(User $user): void
+    {
+        if($user->isDirty('server_id')) {
+            ServerAssignmentChanged::dispatch($user, is_null($user->server_id));
+        }
+    }
+
+    public function deleted(User $user): void
+    {
+    }
+
+    public function restored(User $user): void
+    {
+    }
+
+    public function forceDeleted(User $user): void
+    {
+    }
+}

app/Providers/AppServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Models\User;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\ServiceProvider;
@@ -31,5 +32,7 @@ public function boot(): void
                 ->withToken(Session::get('access_token'))
                 ->baseUrl(config('services.attsrv.url'));
         });
+
+        //User::observe(\App\Observers\UserObserver::class);
     }
 }

config/services.php

@@ -55,6 +55,10 @@
         'token' => env('HETZNER_TOKEN')
     ],
 
+    'signage' => [
+        'streamkey' => env('SIGNAGE_STREAMKEY'),
+    ],
+
     // This is the URL of the origin server, where a low res version is being pushed to via rtmp.
     'forward' => [
         'url' => env('RTMP_FORWARD')

resources/js/Pages/Dashboard.vue

@@ -50,14 +50,14 @@ export default {
             });
 
         let userid = this.$page.props.auth.user.id;
-        this.notifyDeviceChange = Echo.private(`User.${userid}.StreamUrl`)
+        Echo.private(`User.${userid}.StreamUrl`)
             .listen('.server.assignment.changed', (e) => {
                 this.streamUrls = e.streamUrls;
                 this.clientId = e.clientId;
                 this.provisioning = e.provisioning;
 
                 if (this.notifyDeviceChange !== null) {
-                    this.notifyDeviceChange().unsubscribe()
+                    this.notifyDeviceChange.unsubscribe()
                 }
 
                 this.startNotifyDeviceChange();