Resolve merge conflicts by accepting remote changes from origin/main

bin/api/streaming_handler.dart

@@ -5,20 +5,22 @@ import 'dart:math';
 import 'package:shelf/shelf.dart';
 import 'package:shelf_router/shelf_router.dart';
 import 'package:http/http.dart' as http;
-import 'package:xtremflow/core/models/playlist_config.dart';
+import '../models/playlist_config.dart';
 
 /// Active FFmpeg processes for VOD transcoding
 final Map<String, Process> _vodProcesses = {};
 
 /// Directory for temporary HLS segments
-final Directory _hlsTempDir = Directory('${Directory.systemTemp.path}/xtremflow_streams');
+final Directory _hlsTempDir =
+    Directory('${Directory.systemTemp.path}/xtremflow_streams');
 
 /// Helper to resolve FFmpeg path (SYSTEM PATH vs Portable)
 String _getFFmpegPath() {
   if (Platform.isWindows) {
     if (File('ffmpeg.exe').existsSync()) return 'ffmpeg.exe';
     if (File('bin/ffmpeg.exe').existsSync()) return 'bin/ffmpeg.exe';
-    if (File('ffmpeg/bin/ffmpeg.exe').existsSync()) return 'ffmpeg/bin/ffmpeg.exe';
+    if (File('ffmpeg/bin/ffmpeg.exe').existsSync())
+      return 'ffmpeg/bin/ffmpeg.exe';
   }
   return 'ffmpeg'; // Default to PATH
 }
@@ -30,6 +32,55 @@ Future<void> initStreaming() async {
   }
 }
 
+/// Helper to resolve HTTP redirects and get final URL
+/// Some IPTV servers return 302 redirects that FFmpeg doesn't follow properly
+Future<String> _resolveRedirects(String url, {int maxRedirects = 5}) async {
+  String currentUrl = url;
+  final client = http.Client();
+
+  try {
+    for (int i = 0; i < maxRedirects; i++) {
+      final request = http.Request('GET', Uri.parse(currentUrl));
+      request.headers['User-Agent'] = 'VLC/3.0.18 LibVLC/3.0.18';
+      request.followRedirects = false;
+
+      final response = await client.send(request).timeout(
+            const Duration(seconds: 10),
+            onTimeout: () =>
+                throw TimeoutException('Redirect resolution timeout'),
+          );
+
+      // Check if it's a redirect (301, 302, 307, 308)
+      if (response.statusCode >= 300 && response.statusCode < 400) {
+        final location = response.headers['location'];
+        if (location != null && location.isNotEmpty) {
+          // Handle relative URLs
+          if (location.startsWith('/')) {
+            final uri = Uri.parse(currentUrl);
+            currentUrl = '${uri.scheme}://${uri.host}:${uri.port}$location';
+          } else {
+            currentUrl = location;
+          }
+          print('[Redirect] $i: $url -> $currentUrl');
+          await response.stream.drain();
+          continue;
+        }
+      }
+
+      // Not a redirect - we're done
+      await response.stream.drain();
+      break;
+    }
+  } catch (e) {
+    print('[Redirect] Error resolving redirects: $e');
+    // Return original URL if redirect resolution fails
+  } finally {
+    client.close();
+  }
+
+  return currentUrl;
+}
+
 /// Helper to get current playlist configuration (mocked for now, implies single user)
 /// In a real scenario, this should come from the request session/context
 PlaylistConfig? _getCurrentPlaylist(Request request) {
@@ -42,7 +93,8 @@ PlaylistConfig? _getCurrentPlaylist(Request request) {
 // 1. LIVE TV HANDLER (Direct MPEG-TS Proxy)
 // ==========================================
 
-Handler createLiveStreamHandler(Future<PlaylistConfig?> Function(Request) getPlaylist) {
+Handler createLiveStreamHandler(
+    Future<PlaylistConfig?> Function(Request) getPlaylist) {
   final router = Router();
 
   // Route: /api/live/{streamId} (Catch all pattern to debug)
@@ -64,16 +116,21 @@ Handler createLiveStreamHandler(Future<PlaylistConfig?> Function(Request) getPla
       return Response.internalServerError(body: 'No playlist configured');
     }
 
-    final targetUrl = '${playlist.dns}/live/${playlist.username}/${playlist.password}/$streamId.ts';
+    // Use original URL - let FFmpeg handle HTTP redirects natively
+    // Manual redirect resolution consumes one-time tokens from IPTV servers
+    final targetUrl =
+        '${playlist.dns}/live/${playlist.username}/${playlist.password}/$streamId.ts';
     print('[Live] Streaming via FFmpeg: $targetUrl');
 
     // Start FFmpeg to proxy and stabilize the stream
     // We use "-c copy" to avoid transcoding (Low CPU) but gain FFmpeg's network robustness
     final ffmpegArgs = [
       '-hide_banner', '-loglevel', 'error',
-      '-headers', 'User-Agent: VLC/3.0.18 LibVLC/3.0.18\r\n',
+      // Full headers to mimic a real video player
+      '-headers',
+      'User-Agent: VLC/3.0.18 LibVLC/3.0.18\r\nAccept: */*\r\nConnection: keep-alive\r\nReferer: ${playlist.dns}/\r\n',
 
-      // Robustness flags (Same as VOD)
+      // HTTP redirect handling and robustness flags
       '-reconnect', '1',
       '-reconnect_at_eof', '1',
       '-reconnect_streamed', '1',
@@ -146,53 +203,17 @@ Handler createLiveStreamHandler(Future<PlaylistConfig?> Function(Request) getPla
 
 final _lastLogTime = <String, int>{};
 
-Handler createVodStreamHandler(Future<PlaylistConfig?> Function(Request) getPlaylist) {
+Handler createVodStreamHandler(
+    Future<PlaylistConfig?> Function(Request) getPlaylist) {
   final router = Router();
 
-  // Route: /api/vod/{streamId_with_ext}/playlist.m3u8
+  // Route: /api/vod/{streamId}/playlist.m3u8
-  router.get('/<filename>/playlist.m3u8', (Request request, String filename) async {
+  router.get('/<streamId>/playlist.m3u8',
+      (Request request, String streamId) async {
     final playlist = await getPlaylist(request);
-    if (playlist == null) return Response.internalServerError(body: 'No playlist');
+    if (playlist == null)
+      return Response.internalServerError(body: 'No playlist');
 
-    // Parse streamId and extension from filename (e.g., "12345.mp4" -> id="12345", ext="mp4")
-    String streamId = filename;
-    String extension = ''; // No default yet
-    
-    if (filename.contains('.')) {
-      final lastDotIndex = filename.lastIndexOf('.');
-      streamId = filename.substring(0, lastDotIndex);
-      extension = filename.substring(lastDotIndex + 1);
-    }
-
-    // If extension is missing, fetch it from API (Robustness fallback)
-    if (extension.isEmpty) {
-      print('[VOD] No extension provided for $streamId, fetching info...');
-      try {
-        final infoUrl = Uri.parse('${playlist.dns}/player_api.php?username=${playlist.username}&password=${playlist.password}&action=get_vod_info&vod_id=$streamId');
-        final response = await http.get(infoUrl);
-        if (response.statusCode == 200) {
-          final data = jsonDecode(response.body);
-          if (data['movie_data'] != null && data['movie_data']['container_extension'] != null) {
-            extension = data['movie_data']['container_extension'].toString();
-            print('[VOD] Resolved extension: $extension');
-          }
-        }
-      } catch (e) {
-        print('[VOD] Failed to resolve extension: $e');
-      }
-      
-      // Final fallback if API fails
-      if (extension.isEmpty) extension = 'mkv'; 
-    }
-
-    // Clean up old session if exists
-    if (_vodProcesses.containsKey(streamId)) {
-      print('[VOD] Killing previous session for $streamId');
-      _vodProcesses[streamId]?.kill();
-      _vodProcesses.remove(streamId);
-    }
-    
-    // Prepare directory
     final streamDir = Directory('${_hlsTempDir.path}/$streamId');
 
     // Check if existing session is healthy
@@ -207,7 +228,8 @@ Handler createVodStreamHandler(Future<PlaylistConfig?> Function(Request) getPlay
         if (content.contains('.ts')) {
           // Only log once per second to avoid spam
           final now = DateTime.now().millisecondsSinceEpoch;
-          if (!_lastLogTime.containsKey(streamId) || (now - _lastLogTime[streamId]! > 2000)) {
+          if (!_lastLogTime.containsKey(streamId) ||
+              (now - _lastLogTime[streamId]! > 2000)) {
             print('[VOD] Reusing existing session for $streamId');
             _lastLogTime[streamId] = now;
           }
@@ -242,8 +264,6 @@ Handler createVodStreamHandler(Future<PlaylistConfig?> Function(Request) getPlay
       }
     }
 
-
-
     // Build Upstream URL based on content type
     // Check for type parameter in request URL (?type=series or ?type=movie)
     final contentType = request.url.queryParameters['type'] ?? 'movie';
@@ -257,7 +277,8 @@ Handler createVodStreamHandler(Future<PlaylistConfig?> Function(Request) getPlay
       }
       streamDir.createSync(recursive: true);
 
-       final targetUrl = '${playlist.dns}/$basePath/${playlist.username}/${playlist.password}/$streamId.$extension';
+      final targetUrl =
+          '${playlist.dns}/$basePath/${playlist.username}/${playlist.password}/$streamId.mkv';
       print('[VOD] Starting Transcode ($contentType): $targetUrl');
 
       // Start FFmpeg
@@ -271,7 +292,8 @@ Handler createVodStreamHandler(Future<PlaylistConfig?> Function(Request) getPlay
         '-reconnect_streamed', '1',
         '-reconnect_delay_max', '5',
         '-rw_timeout', '15000000',
-      '-analyzeduration', '2000000', // Reduced from 10M to 2M for faster start
+        '-analyzeduration',
+        '2000000', // Reduced from 10M to 2M for faster start
         '-probesize', '2000000', // Reduced from 10M to 2M for faster start
 
         '-i', targetUrl,
@@ -295,13 +317,14 @@ Handler createVodStreamHandler(Future<PlaylistConfig?> Function(Request) getPlay
         // Advanced Audio Filtering:
         // 1. "pan": Downmix 5.1/7.1 to Stereo with center mix (dialogue) boosted.
         // 2. "dynaudnorm": Dynamic Audio Normalizer to boost quiet dialogue and limit loud explosions (Night Mode effect).
-      '-af', 'pan=stereo|FL=1.0*FL+0.707*FC+0.5*BL+0.5*SL+0.5*LFE|FR=1.0*FR+0.707*FC+0.5*BR+0.5*SR+0.5*LFE,dynaudnorm=f=150:g=15',
+        '-af',
-
+        'pan=stereo|FL=1.0*FL+0.707*FC+0.5*BL+0.5*SL+0.5*LFE|FR=1.0*FR+0.707*FC+0.5*BR+0.5*SR+0.5*LFE,dynaudnorm=f=150:g=15',
 
         '-f', 'hls',
         '-hls_time', '4',
         '-hls_list_size', '0',
-      '-hls_playlist_type', 'event', // Event type allows immediate playback while transcoding
+        '-hls_playlist_type',
+        'event', // Event type allows immediate playback while transcoding
         '-hls_allow_cache', '1',
         '-hls_segment_type', 'mpegts',
         '-hls_segment_filename', '${streamDir.path}/segment_%03d.ts',
@@ -337,7 +360,8 @@ Handler createVodStreamHandler(Future<PlaylistConfig?> Function(Request) getPlay
     }
 
     if (!playlistFile.existsSync()) {
-      return Response.internalServerError(body: 'Timeout waiting for transcoder');
+      return Response.internalServerError(
+          body: 'Timeout waiting for transcoder');
     }
 
     return Response.ok(
@@ -350,14 +374,9 @@ Handler createVodStreamHandler(Future<PlaylistConfig?> Function(Request) getPlay
     );
   });
 
-  // Route: /api/vod/{filename}/segment_{n}.ts (Serve segments)
+  // Route: /api/vod/{streamId}/segment_{n}.ts (Serve segments)
-  router.get('/<filename>/<segment>', (Request request, String filename, String segment) async {
+  router.get('/<streamId>/<segment>',
-    // Extract streamId from filename to find the directory
+      (Request request, String streamId, String segment) async {
-    String streamId = filename;
-    if (filename.contains('.')) {
-      streamId = filename.substring(0, filename.lastIndexOf('.'));
-    }
-
     final file = File('${_hlsTempDir.path}/$streamId/$segment');
 
     if (!file.existsSync()) {

bin/models/playlist_config.dart

@@ -0,0 +1,52 @@
+/// Pure Dart model for Xtream Codes playlist configuration
+/// This is a server-side copy without Hive/Equatable dependencies
+class PlaylistConfig {
+  final String id;
+  final String name;
+
+  /// Xtream server URL (without trailing slash)
+  final String dns;
+
+  final String username;
+
+  /// Xtream password
+  final String password;
+
+  final DateTime createdAt;
+
+  final bool isActive;
+
+  const PlaylistConfig({
+    required this.id,
+    required this.name,
+    required this.dns,
+    required this.username,
+    required this.password,
+    required this.createdAt,
+    this.isActive = true,
+  });
+
+  /// Creates a copy of this playlist with updated fields
+  PlaylistConfig copyWith({
+    String? id,
+    String? name,
+    String? dns,
+    String? username,
+    String? password,
+    DateTime? createdAt,
+    bool? isActive,
+  }) {
+    return PlaylistConfig(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      dns: dns ?? this.dns,
+      username: username ?? this.username,
+      password: password ?? this.password,
+      createdAt: createdAt ?? this.createdAt,
+      isActive: isActive ?? this.isActive,
+    );
+  }
+
+  /// Generate Xtream API base URL
+  String get apiBaseUrl => '$dns/player_api.php';
+}

bin/server.dart

@@ -10,7 +10,7 @@ import 'package:args/args.dart';
 import 'database/database.dart';
 import 'models/user.dart';
 import 'models/playlist.dart';
-import 'package:xtremflow/core/models/playlist_config.dart';
+import 'models/playlist_config.dart';
 import 'api/auth_handler.dart';
 import 'api/users_handler.dart';
 import 'api/playlists_handler.dart';
@@ -49,17 +49,26 @@ void main(List<String> args) async {
     // Auth endpoints
     ..mount('/api/auth', authHandler.router)
     // Playlists endpoints
-    ..mount('/api/playlists', const Pipeline()
+    ..mount(
+      '/api/playlists',
+      const Pipeline()
           .addMiddleware(authMiddleware(db))
-      .addHandler(playlistsHandler.router.call),)
+          .addHandler(playlistsHandler.router.call),
+    )
     // Users endpoints
-    ..mount('/api/users', const Pipeline()
+    ..mount(
+      '/api/users',
+      const Pipeline()
           .addMiddleware(authMiddleware(db))
-      .addHandler(usersHandler.router.call),)
+          .addHandler(usersHandler.router.call),
+    )
     // Settings endpoints
-    ..mount('/api/settings', const Pipeline()
+    ..mount(
+      '/api/settings',
+      const Pipeline()
           .addMiddleware(authMiddleware(db))
-      .addHandler(settingsHandler.router.call),);
+          .addHandler(settingsHandler.router.call),
+    );
 
   // Initialize Cleanup Service
   final cleanupService = CleanupService();
@@ -70,7 +79,9 @@ void main(List<String> args) async {
   cleanupService.start();
 
   // Admin Routes (protected)
-  apiRouter.mount('/api/admin', const Pipeline()
+  apiRouter.mount(
+    '/api/admin',
+    const Pipeline()
         .addMiddleware(authMiddleware(db))
         .addHandler((Request request) {
       final router = Router();
@@ -79,7 +90,8 @@ void main(List<String> args) async {
       router.post('/purge', (Request req) async {
         final user = req.context['user'] as User?;
         if (user == null || !user.isAdmin) {
-             return Response.forbidden(jsonEncode({'error': 'Admin access required'}));
+          return Response.forbidden(
+              jsonEncode({'error': 'Admin access required'}));
         }
 
         final result = await cleanupService.runCleanup();
@@ -90,7 +102,8 @@ void main(List<String> args) async {
       });
 
       return router(request);
-      }),);
+    }),
+  );
 
   // Create static handler
   final baseStaticHandler = createStaticHandler(
@@ -109,17 +122,21 @@ void main(List<String> args) async {
         path == 'index.html' ||
         path.endsWith('.js') ||
         path.endsWith('.json')) {
-      return response.change(headers: {
+      return response.change(
+        headers: {
           'Cache-Control': 'no-store, no-cache, must-revalidate, max-age=0',
           'Pragma': 'no-cache',
           'Expires': '0',
-      },);
+        },
+      );
     }
 
     // Allow aggressive caching for hashed assets
-    return response.change(headers: {
+    return response.change(
+      headers: {
         'Cache-Control': 'public, max-age=86400',
-    },);
+      },
+    );
   }
 
   // Helper to get playlist from request
@@ -194,8 +211,6 @@ void main(List<String> args) async {
   });
 }
 
-
-
 /// CORS middleware to allow cross-origin requests
 Middleware _corsMiddleware() {
   return (Handler handler) {
@@ -270,7 +285,9 @@ Handler _createXtreamProxyHandler() {
             );
       } else if (request.method == 'POST') {
         final body = await request.readAsString();
-        response = await http.post(targetUrl, headers: proxyHeaders, body: body).timeout(
+        response = await http
+            .post(targetUrl, headers: proxyHeaders, body: body)
+            .timeout(
               const Duration(seconds: 30),
               onTimeout: () => http.Response('Request timeout', 504),
             );
@@ -282,7 +299,8 @@ Handler _createXtreamProxyHandler() {
         response.statusCode,
         body: response.bodyBytes,
         headers: {
-          'content-type': response.headers['content-type'] ?? 'application/json',
+          'content-type':
+              response.headers['content-type'] ?? 'application/json',
           'access-control-allow-origin': '*',
         },
       );

lib/features/iptv/services/xtream_service.dart

@@ -17,8 +17,8 @@ class XtreamService {
 
   XtreamService() {
     _dio = Dio(BaseOptions(
-      connectTimeout: const Duration(seconds: 60),
+      connectTimeout: const Duration(seconds: 15),
-      receiveTimeout: const Duration(seconds: 60),
+      receiveTimeout: const Duration(seconds: 15),
     ),);
 
     // Setup caching for API responses
@@ -70,19 +70,18 @@ class XtreamService {
   String getVodStreamUrl(String streamId, String containerExtension) {
     if (_currentPlaylist == null) throw Exception('No playlist configured');
     
-    // Pass extension to backend for correct upstream URL construction
+    // Point to new dedicated VOD API (HLS playlist)
     final baseUrl = html.window.location.origin;
-    return '$baseUrl/api/vod/$streamId.$containerExtension/playlist.m3u8';
+    return '$baseUrl/api/vod/$streamId/playlist.m3u8';
   }
 
   /// Generate stream URL for series episodes
   String getSeriesStreamUrl(String streamId, String containerExtension) {
     if (_currentPlaylist == null) throw Exception('No playlist configured');
     
-    // Pass extension to backend for correct upstream URL construction
+    // Point to new dedicated VOD API (HLS playlist) with series type
-    // And include type parameter for correct path handling (movie vs series)
     final baseUrl = html.window.location.origin;
-    return '$baseUrl/api/vod/$streamId.$containerExtension/playlist.m3u8?type=series';
+    return '$baseUrl/api/vod/$streamId/playlist.m3u8?type=series';
   }
 
   /// Authenticate and get server info

task.md

@@ -1,48 +1,6 @@
-# XtremFlow Development
+# Fix EPG Overlay Interaction
 
-Context: Developing a high-performance IPTV Web App with Flutter and Docker.
+- [ ] Analyze `player_screen.dart` for overlap issues.
-
+- [ ] Reproduce/Locate the code responsible for EPG overlay.
-Current Focus: Resuming development after environment fix.
+- [ ] Fix the touch event propagation issue.
-
+- [x] Verify the fix.
-Master Plan:
-
-## 🧹 Housekeeping
-
-- [x] Commit pending changes in `xtream_service.dart` (Timeout increase).
-
-## 🎥 Player Debugging (CRITICAL)
-
-- [ ] **Fix VOD Playback**: User reports VOD is not playing.
-  - [x] Check VOD URL generation in `xtream_service.dart`. (Fixed upstream URL to include extension)
-  - [x] Check `web/player.html` compatibility with VOD formats. (HLS/Direct support verified)
-  - [x] Verify `PlayerScreen` logic for VOD StreamType. (Correctly passes extension)
-  - [x] Update `streaming_handler.dart` to handle extensions dynamically. (Done)
-    - [x] Rebuild Docker Image to apply backend changes.
-    - [x] Restart Docker containers.
-    - [x] Verify VOD playback. (Failed)
-    - [ ] **Phase 2 Debugging**:
-      - [x] Analyze Docker logs for FFmpeg/Proxy errors. (Found 404/4XX on MKV)
-      - [x] Implement backend auto-detection of extension via Xtream API.
-        - [x] Restart Docker containers.
-        - [x] Restart Docker containers.
-        - [x] Verify VOD playback. (Backend Fallback active)
-    - [ ] **Clean Reinstall** (User Request):
-      - [x] Stop and Remove Containers (`down`).
-      - [/] Force Rebuild and Start (`up --build`).
-
-## 🎥 Player Improvements (Active Context)
-
-- [ ] Review `player_screen.dart` controls logic.
-- [ ] **Goal**: Enhance VOD/Series controls vs Live TV controls.
-  - *Context*: User wants skip/prev buttons to change channels only for Live TV? Need clarification on VOD behavior.
-
-## 📦 Backlog
-
-- [ ] Resolve Git Conflict ModuleNotFoundError: No module named 'rich' (Done)
-- [x] Update Docker Image (Timeout increase)
-
-## 🔧 Git Maintenance
-
-- [x] **Resolve Conflicts**:
-  - [x] `bin/api/streaming_handler.dart`
-  - [x] `lib/features/iptv/services/xtream_service.dart`