add stream selector

alexmorbo · Nov 22, 2023 · d18c5dc · d18c5dc
1 parent a321b6f
commit d18c5dc
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 36 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Controller/AbstractController.php b/src/Controller/AbstractController.php
@@ -3,7 +3,6 @@
 namespace AlexMorbo\React\Trassir\Controller;
 
 use AlexMorbo\React\Trassir\Router\Router;
-use HttpSoft\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
 use React\Promise\PromiseInterface;

diff --git a/src/Controller/InfoController.php b/src/Controller/InfoController.php
@@ -4,7 +4,6 @@
 
 use AlexMorbo\React\Trassir\Router\Router;
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Message\ResponseInterface;
 use React\Http\Message\Response;
 use React\Promise\PromiseInterface;
 use Symfony\Component\Yaml\Yaml;

diff --git a/src/Controller/InstanceController.php b/src/Controller/InstanceController.php
@@ -53,12 +53,13 @@ public function addRoutes(Router $router): void
             )
         );
         $router->get(
-            "/api/instance/{instanceId}/channel/{channelId}/video/{streamType}",
-            fn(ServerRequestInterface $request, $instanceId, $channelId, $streamType) => $this->getChannelVideo(
+            "/api/instance/{instanceId}/channel/{channelId}/video/{streamType}/{stream}",
+            fn(ServerRequestInterface $request, $instanceId, $channelId, $streamType, $stream) => $this->getChannelVideo(
                 $request,
                 $instanceId,
                 $channelId,
-                $streamType
+                $streamType,
+                $stream
             )
         );
     }
@@ -241,30 +242,37 @@ public function getChannelVideo(
         string $instanceId,
         string $channelId,
         string $streamType,
+        string $stream,
     ): PromiseInterface {
         $instanceId = (int)$instanceId;
 
         if (!in_array($streamType, ['hls', 'rtsp'])) {
             throw new BadRequestHttpException('Invalid stream type');
         }
 
+        if (!in_array($stream, ['main', 'sub'])) {
+            throw new BadRequestHttpException('Invalid stream type');
+        }
+
         return $this->trassirHelper->getInstance($instanceId)
             ->then(
-                function (Instance $instance) use ($channelId, $streamType) {
+                function (Instance $instance) use ($channelId, $streamType, $stream) {
                     foreach ($instance->getTrassir()->getChannels() as $type => $channels) {
                         foreach ($channels as $channel) {
                             if ($channel['guid'] === $channelId) {
                                 if ($type === 'channels') {
                                     return $instance->getTrassir()->getVideo(
                                         $instance->getName(),
                                         $channelId,
-                                        $streamType
+                                        $streamType,
+                                        $stream,
                                     );
                                 } else {
                                     return $instance->getTrassir()->getVideo(
                                         $channel['server_guid'],
                                         $channelId,
-                                        $streamType
+                                        $streamType,
+                                        $stream,
                                     );
                                 }
                             }