feat(api): support prefixed IDs in routes and add unified mappers scaffolding

- Handlers parse IDs like kp_123 / tmdb_456 and set id_type accordingly - Add KP->Unified and TMDB->Unified movie mappers (basic fields) - Keep backward compatibility for numeric IDs
fix(search): force KP for ru language in multi search
2025-10-28 01:48:51 +05:00 · 2025-10-19 08:30:16 +00:00 · 2025-10-19 07:47:59 +00:00 · 2025-10-19 07:40:37 +00:00 · 2025-10-18 23:55:42 +00:00 · 2025-10-18 23:41:53 +00:00
19 changed files with 1760 additions and 232 deletions
--- a/.env.example
+++ b/.env.example
@@ -1,28 +1,34 @@
-# Required
-MONGO_URI=
-MONGO_DB_NAME=database
-TMDB_ACCESS_TOKEN=
-JWT_SECRET=
+MONGO_URI=mongodb://localhost:27017/neomovies
+MONGO_DB_NAME=neomovies

-# Service
-PORT=3000
-BASE_URL=http://localhost:3000
-NODE_ENV=development
+TMDB_ACCESS_TOKEN=your_tmdb_access_token_here

-# Email (Gmail)
-GMAIL_USER=
-GMAIL_APP_PASSWORD=
+KPAPI_KEY=920aaf6a-9f64-46f7-bda7-209fb1069440
+KPAPI_BASE_URL=https://kinopoiskapiunofficial.tech/api

-# Players
-LUMEX_URL=
-ALLOHA_TOKEN=
+HDVB_TOKEN=b9ae5f8c4832244060916af4aa9d1939
+
+VIBIX_HOST=https://vibix.org
+VIBIX_TOKEN=18745|NzecUXT4gikPUtFkSEFlDLPmr9kWnQACTo1N0Ixq9240bcf1
+
+LUMEX_URL=https://p.lumex.space
+
+ALLOHA_TOKEN=your_alloha_token

-# Torrents (RedAPI)
 REDAPI_BASE_URL=http://redapi.cfhttp.top
-REDAPI_KEY=
+REDAPI_KEY=your_redapi_key

-# Google OAuth
-GOOGLE_CLIENT_ID=
-GOOGLE_CLIENT_SECRET=
+JWT_SECRET=your_jwt_secret_key_here
+
+GMAIL_USER=your_gmail@gmail.com
+GMAIL_APP_PASSWORD=your_gmail_app_password
+
+GOOGLE_CLIENT_ID=your_google_client_id
+GOOGLE_CLIENT_SECRET=your_google_client_secret
 GOOGLE_REDIRECT_URL=http://localhost:3000/api/v1/auth/google/callback
+
+BASE_URL=http://localhost:3000
 FRONTEND_URL=http://localhost:3001
+
+PORT=3000
+NODE_ENV=development
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,11 @@
 node_modules
 package-lock.json
 yarn.lock
+# Binaries
+bin/
+main
+*.exe
+*.dll
+*.so
+*.dylib
+neomovies-api
--- a/README.md
+++ b/README.md
@@ -4,13 +4,14 @@ REST API для поиска и получения информации о фи

 ## Особенности

- Поиск фильмов
+- Интеграция с Kinopoisk API для русского контента
+- Автоматическое переключение между TMDB и Kinopoisk
+- Поиск фильмов и сериалов
 - Информация о фильмах
- Популярные фильмы
- Топ рейтинговые фильмы
- Предстоящие фильмы
+- Популярные, топ-рейтинговые, предстоящие фильмы
+- Поддержка русских плееров (Alloha, Lumex, Vibix, HDVB)
 - Swagger документация
- Поддержка русского языка
+- Полная поддержка русского языка

 ## 🛠 Быстрый старт

@@ -50,32 +51,39 @@ API будет доступен на `http://localhost:3000`

 ```bash
 # Обязательные
-MONGO_URI=
-MONGO_DB_NAME=database
-TMDB_ACCESS_TOKEN=
-JWT_SECRET=
+MONGO_URI=mongodb://localhost:27017/neomovies
+MONGO_DB_NAME=neomovies
+TMDB_ACCESS_TOKEN=your_tmdb_access_token
+JWT_SECRET=your_jwt_secret_key
+
+# Kinopoisk API
+KPAPI_KEY=your_kp_api_key
+KPAPI_BASE_URL=https://kinopoiskapiunofficial.tech/api

 # Сервис
 PORT=3000
 BASE_URL=http://localhost:3000
+FRONTEND_URL=http://localhost:3001
 NODE_ENV=development

 # Email (Gmail)
-GMAIL_USER=
-GMAIL_APP_PASSWORD=
+GMAIL_USER=your_gmail@gmail.com
+GMAIL_APP_PASSWORD=your_gmail_app_password

-# Плееры
-LUMEX_URL=
-ALLOHA_TOKEN=
-VIBIX_TOKEN=
+# Русские плееры
+LUMEX_URL=https://p.lumex.space
+ALLOHA_TOKEN=your_alloha_token
+VIBIX_HOST=https://vibix.org
+VIBIX_TOKEN=your_vibix_token
+HDVB_TOKEN=your_hdvb_token

 # Торренты (RedAPI)
 REDAPI_BASE_URL=http://redapi.cfhttp.top
-REDAPI_KEY=
+REDAPI_KEY=your_redapi_key

 # Google OAuth
-GOOGLE_CLIENT_ID=
-GOOGLE_CLIENT_SECRET=
+GOOGLE_CLIENT_ID=your_google_client_id
+GOOGLE_CLIENT_SECRET=your_google_client_secret
 GOOGLE_REDIRECT_URL=http://localhost:3000/api/v1/auth/google/callback
 ```

@@ -120,10 +128,14 @@ GET  /api/v1/tv/{id}                         # Детали сериала
 GET  /api/v1/tv/{id}/recommendations         # Рекомендации
 GET  /api/v1/tv/{id}/similar                 # Похожие

-# Плееры
-GET  /api/v1/players/alloha/{imdb_id}          # Alloha плеер по IMDb ID
-GET  /api/v1/players/lumex/{imdb_id}           # Lumex плеер по IMDb ID
-GET  /api/v1/players/vibix/{imdb_id}           # Vibix плеер по IMDb ID
+# Плееры (новый формат с типом ID)
+GET  /api/v1/players/alloha/{id_type}/{id}    # Alloha плеер (kp/301 или imdb/tt0133093)
+GET  /api/v1/players/lumex/{id_type}/{id}     # Lumex плеер (kp/301 или imdb/tt0133093)
+GET  /api/v1/players/vibix/{id_type}/{id}     # Vibix плеер (kp/301 или imdb/tt0133093)
+GET  /api/v1/players/hdvb/{id_type}/{id}      # HDVB плеер (kp/301 или imdb/tt0133093)
+GET  /api/v1/players/vidsrc/{media_type}/{imdb_id}  # Vidsrc (только IMDB)
+GET  /api/v1/players/vidlink/movie/{imdb_id}       # Vidlink фильмы (только IMDB)
+GET  /api/v1/players/vidlink/tv/{tmdb_id}          # Vidlink сериалы (только TMDB)

 # Торренты
 GET  /api/v1/torrents/search/{imdbId}        # Поиск торрентов
@@ -243,10 +255,42 @@ curl "https://api.neomovies.ru/api/v1/torrents/search/tt0111161?type=movie&quali
 - **Gorilla Mux** - HTTP роутер
 - **MongoDB** - база данных
 - **JWT** - аутентификация
- **TMDB API** - данные о фильмах
+- **TMDB API** - данные о фильмах (международный контент)
+- **Kinopoisk API Unofficial** - данные о русском контенте
 - **Gmail SMTP** - email уведомления
 - **Vercel** - деплой и хостинг

+## 🌍 Kinopoisk API интеграция
+
+API автоматически переключается между TMDB и Kinopoisk в зависимости от языка запроса:
+
+- **Русский язык (`lang=ru`)** → Kinopoisk API
+  - Русские названия фильмов
+  - Рейтинги Кинопоиска
+  - Поддержка Kinopoisk ID
+  
+- **Английский язык (`lang=en`)** → TMDB API
+  - Международные названия
+  - Рейтинги IMDB/TMDB
+  - Поддержка IMDB/TMDB ID
+
+### Формат ID в плеерах
+
+Все русские плееры поддерживают два типа идентификаторов:
+
+```bash
+# По Kinopoisk ID (приоритет для русского контента)
+GET /api/v1/players/alloha/kp/301
+
+# По IMDB ID (fallback)
+GET /api/v1/players/alloha/imdb/tt0133093
+
+# Примеры для других плееров
+GET /api/v1/players/lumex/kp/301
+GET /api/v1/players/vibix/kp/301
+GET /api/v1/players/hdvb/kp/301
+```
+
 ## 🚀 Производительность

 По сравнению с Node.js версией:
--- a/api/index.go
+++ b/api/index.go
@@ -52,11 +52,12 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 	}

 	tmdbService := services.NewTMDBService(globalCfg.TMDBAccessToken)
+	kpService := services.NewKinopoiskService(globalCfg.KPAPIKey, globalCfg.KPAPIBaseURL)
 	emailService := services.NewEmailService(globalCfg)
 	authService := services.NewAuthService(globalDB, globalCfg.JWTSecret, emailService, globalCfg.BaseURL, globalCfg.GoogleClientID, globalCfg.GoogleClientSecret, globalCfg.GoogleRedirectURL, globalCfg.FrontendURL)

-	movieService := services.NewMovieService(globalDB, tmdbService)
-	tvService := services.NewTVService(globalDB, tmdbService)
+	movieService := services.NewMovieService(globalDB, tmdbService, kpService)
+	tvService := services.NewTVService(globalDB, tmdbService, kpService)
 	favoritesService := services.NewFavoritesService(globalDB, tmdbService)
 	torrentService := services.NewTorrentServiceWithConfig(globalCfg.RedAPIBaseURL, globalCfg.RedAPIKey)
 	reactionsService := services.NewReactionsService(globalDB)
@@ -66,7 +67,7 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 	tvHandler := handlersPkg.NewTVHandler(tvService)
 	favoritesHandler := handlersPkg.NewFavoritesHandler(favoritesService, globalCfg)
 	docsHandler := handlersPkg.NewDocsHandler()
-	searchHandler := handlersPkg.NewSearchHandler(tmdbService)
+	searchHandler := handlersPkg.NewSearchHandler(tmdbService, kpService)
 	categoriesHandler := handlersPkg.NewCategoriesHandler(tmdbService)
 	playersHandler := handlersPkg.NewPlayersHandler(globalCfg)
 	torrentsHandler := handlersPkg.NewTorrentsHandler(torrentService, tmdbService)
@@ -94,9 +95,13 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 	api.HandleFunc("/categories/{id}/movies", categoriesHandler.GetMoviesByCategory).Methods("GET")
 	api.HandleFunc("/categories/{id}/media", categoriesHandler.GetMediaByCategory).Methods("GET")

-	api.HandleFunc("/players/alloha/{imdb_id}", playersHandler.GetAllohaPlayer).Methods("GET")
-	api.HandleFunc("/players/lumex/{imdb_id}", playersHandler.GetLumexPlayer).Methods("GET")
-	api.HandleFunc("/players/vibix/{imdb_id}", playersHandler.GetVibixPlayer).Methods("GET")
+	api.HandleFunc("/players/alloha/{id_type}/{id}", playersHandler.GetAllohaPlayer).Methods("GET")
+	api.HandleFunc("/players/lumex/{id_type}/{id}", playersHandler.GetLumexPlayer).Methods("GET")
+	api.HandleFunc("/players/vibix/{id_type}/{id}", playersHandler.GetVibixPlayer).Methods("GET")
+	api.HandleFunc("/players/hdvb/{id_type}/{id}", playersHandler.GetHDVBPlayer).Methods("GET")
+	api.HandleFunc("/players/vidsrc/{media_type}/{imdb_id}", playersHandler.GetVidsrcPlayer).Methods("GET")
+	api.HandleFunc("/players/vidlink/movie/{imdb_id}", playersHandler.GetVidlinkMoviePlayer).Methods("GET")
+	api.HandleFunc("/players/vidlink/tv/{tmdb_id}", playersHandler.GetVidlinkTVPlayer).Methods("GET")
 	api.HandleFunc("/players/rgshows/{tmdb_id}", playersHandler.GetRgShowsPlayer).Methods("GET")
 	api.HandleFunc("/players/rgshows/{tmdb_id}/{season}/{episode}", playersHandler.GetRgShowsTVPlayer).Methods("GET")
 	api.HandleFunc("/players/iframevideo/{kinopoisk_id}/{imdb_id}", playersHandler.GetIframeVideoPlayer).Methods("GET")
@@ -150,12 +155,30 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 	protected.HandleFunc("/reactions/{mediaType}/{mediaId}", reactionsHandler.RemoveReaction).Methods("DELETE")
 	protected.HandleFunc("/reactions/my", reactionsHandler.GetMyReactions).Methods("GET")

+	// CORS configuration - allow all origins
 	corsHandler := handlers.CORS(
-		handlers.AllowedOrigins([]string{"*"}),
-		handlers.AllowedMethods([]string{"GET", "POST", "PUT", "DELETE", "OPTIONS"}),
-		handlers.AllowedHeaders([]string{"Authorization", "Content-Type", "Accept", "Origin", "X-Requested-With", "X-CSRF-Token"}),
-		handlers.AllowCredentials(),
-		handlers.ExposedHeaders([]string{"Authorization", "Content-Type"}),
+		handlers.AllowedOrigins([]string{
+			"*", // Allow all origins
+		}),
+		handlers.AllowedMethods([]string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH", "HEAD"}),
+		handlers.AllowedHeaders([]string{
+			"Authorization",
+			"Content-Type",
+			"Accept",
+			"Origin",
+			"X-Requested-With",
+			"X-CSRF-Token",
+			"Access-Control-Allow-Origin",
+			"Access-Control-Allow-Headers",
+			"Access-Control-Allow-Methods",
+			"Access-Control-Allow-Credentials",
+		}),
+		handlers.ExposedHeaders([]string{
+			"Authorization",
+			"Content-Type",
+			"X-Total-Count",
+		}),
+		handlers.MaxAge(3600),
 	)

 	corsHandler(router).ServeHTTP(w, r)
--- a/main.go
+++ b/main.go
@@ -32,11 +32,12 @@ func main() {
 	defer database.Disconnect()

 	tmdbService := services.NewTMDBService(cfg.TMDBAccessToken)
+	kpService := services.NewKinopoiskService(cfg.KPAPIKey, cfg.KPAPIBaseURL)
 	emailService := services.NewEmailService(cfg)
 	authService := services.NewAuthService(db, cfg.JWTSecret, emailService, cfg.BaseURL, cfg.GoogleClientID, cfg.GoogleClientSecret, cfg.GoogleRedirectURL, cfg.FrontendURL)

-	movieService := services.NewMovieService(db, tmdbService)
-	tvService := services.NewTVService(db, tmdbService)
+	movieService := services.NewMovieService(db, tmdbService, kpService)
+	tvService := services.NewTVService(db, tmdbService, kpService)
 	favoritesService := services.NewFavoritesService(db, tmdbService)
 	torrentService := services.NewTorrentServiceWithConfig(cfg.RedAPIBaseURL, cfg.RedAPIKey)
 	reactionsService := services.NewReactionsService(db)
@@ -46,7 +47,7 @@ func main() {
 	tvHandler := appHandlers.NewTVHandler(tvService)
 	favoritesHandler := appHandlers.NewFavoritesHandler(favoritesService, cfg)
 	docsHandler := appHandlers.NewDocsHandler()
-	searchHandler := appHandlers.NewSearchHandler(tmdbService)
+	searchHandler := appHandlers.NewSearchHandler(tmdbService, kpService)
 	categoriesHandler := appHandlers.NewCategoriesHandler(tmdbService)
 	playersHandler := appHandlers.NewPlayersHandler(cfg)
 	torrentsHandler := appHandlers.NewTorrentsHandler(torrentService, tmdbService)
@@ -75,9 +76,13 @@ func main() {
 	api.HandleFunc("/categories/{id}/movies", categoriesHandler.GetMoviesByCategory).Methods("GET")
 	api.HandleFunc("/categories/{id}/media", categoriesHandler.GetMediaByCategory).Methods("GET")

-	api.HandleFunc("/players/alloha/{imdb_id}", playersHandler.GetAllohaPlayer).Methods("GET")
-	api.HandleFunc("/players/lumex/{imdb_id}", playersHandler.GetLumexPlayer).Methods("GET")
-	api.HandleFunc("/players/vibix/{imdb_id}", playersHandler.GetVibixPlayer).Methods("GET")
+	api.HandleFunc("/players/alloha/{id_type}/{id}", playersHandler.GetAllohaPlayer).Methods("GET")
+	api.HandleFunc("/players/lumex/{id_type}/{id}", playersHandler.GetLumexPlayer).Methods("GET")
+	api.HandleFunc("/players/vibix/{id_type}/{id}", playersHandler.GetVibixPlayer).Methods("GET")
+	api.HandleFunc("/players/vidsrc/{media_type}/{imdb_id}", playersHandler.GetVidsrcPlayer).Methods("GET")
+	api.HandleFunc("/players/vidlink/movie/{imdb_id}", playersHandler.GetVidlinkMoviePlayer).Methods("GET")
+	api.HandleFunc("/players/vidlink/tv/{tmdb_id}", playersHandler.GetVidlinkTVPlayer).Methods("GET")
+	api.HandleFunc("/players/hdvb/{id_type}/{id}", playersHandler.GetHDVBPlayer).Methods("GET")

 	api.HandleFunc("/torrents/search/{imdbId}", torrentsHandler.SearchTorrents).Methods("GET")
 	api.HandleFunc("/torrents/movies", torrentsHandler.SearchMovies).Methods("GET")
@@ -129,12 +134,30 @@ func main() {
 	protected.HandleFunc("/reactions/{mediaType}/{mediaId}", reactionsHandler.RemoveReaction).Methods("DELETE")
 	protected.HandleFunc("/reactions/my", reactionsHandler.GetMyReactions).Methods("GET")

+	// CORS configuration - allow all origins
 	corsHandler := handlers.CORS(
-		handlers.AllowedOrigins([]string{"*"}),
-		handlers.AllowedMethods([]string{"GET", "POST", "PUT", "DELETE", "OPTIONS"}),
-		handlers.AllowedHeaders([]string{"Authorization", "Content-Type", "Accept", "Origin", "X-Requested-With", "X-CSRF-Token"}),
-		handlers.AllowCredentials(),
-		handlers.ExposedHeaders([]string{"Authorization", "Content-Type"}),
+		handlers.AllowedOrigins([]string{
+			"*", // Allow all origins
+		}),
+		handlers.AllowedMethods([]string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH", "HEAD"}),
+		handlers.AllowedHeaders([]string{
+			"Authorization",
+			"Content-Type",
+			"Accept",
+			"Origin",
+			"X-Requested-With",
+			"X-CSRF-Token",
+			"Access-Control-Allow-Origin",
+			"Access-Control-Allow-Headers",
+			"Access-Control-Allow-Methods",
+			"Access-Control-Allow-Credentials",
+		}),
+		handlers.ExposedHeaders([]string{
+			"Authorization",
+			"Content-Type",
+			"X-Total-Count",
+		}),
+		handlers.MaxAge(3600),
 	)

 	var finalHandler http.Handler
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -25,6 +25,9 @@ type Config struct {
 	FrontendURL        string
 	VibixHost          string
 	VibixToken         string
+	KPAPIKey           string
+	HDVBToken          string
+	KPAPIBaseURL       string
 }

 func New() *Config {
@@ -50,6 +53,9 @@ func New() *Config {
 		FrontendURL:        getEnv(EnvFrontendURL, ""),
 		VibixHost:          getEnv(EnvVibixHost, DefaultVibixHost),
 		VibixToken:         getEnv(EnvVibixToken, ""),
+		KPAPIKey:           getEnv(EnvKPAPIKey, ""),
+		HDVBToken:          getEnv(EnvHDVBToken, ""),
+		KPAPIBaseURL:       getEnv("KPAPI_BASE_URL", DefaultKPAPIBase),
 	}
 }

--- a/pkg/config/vars.go
+++ b/pkg/config/vars.go
@@ -20,6 +20,8 @@ const (
 	EnvFrontendURL        = "FRONTEND_URL"
 	EnvVibixHost          = "VIBIX_HOST"
 	EnvVibixToken         = "VIBIX_TOKEN"
+	EnvKPAPIKey           = "KPAPI_KEY"
+	EnvHDVBToken          = "HDVB_TOKEN"

 	// Default values
 	DefaultJWTSecret   = "your-secret-key"
@@ -29,6 +31,7 @@ const (
 	DefaultRedAPIBase  = "http://redapi.cfhttp.top"
 	DefaultMongoDBName = "database"
 	DefaultVibixHost   = "https://vibix.org"
+	DefaultKPAPIBase   = "https://kinopoiskapiunofficial.tech/api"

 	// Static constants
 	TMDBImageBaseURL = "https://image.tmdb.org/t/p"
--- a/pkg/handlers/docs.go
+++ b/pkg/handlers/docs.go
@@ -37,11 +37,16 @@ func (h *DocsHandler) GetOpenAPISpec(w http.ResponseWriter, r *http.Request) {
 }

 func (h *DocsHandler) ServeDocs(w http.ResponseWriter, r *http.Request) {
-	baseURL := determineBaseURL(r)
+	spec := getOpenAPISpecWithURL("/")
+	specJSON, err := json.Marshal(spec)
+	if err != nil {
+		fmt.Printf("Error marshaling OpenAPI spec: %v", err)
+		http.Error(w, fmt.Sprintf("Error marshaling spec: %v", err), http.StatusInternalServerError)
+		return
+	}

-	// Use absolute SpecURL so the library does not try to read a local file path
 	htmlContent, err := scalar.ApiReferenceHTML(&scalar.Options{
-		SpecURL: fmt.Sprintf("%s/openapi.json", baseURL),
+		SpecContent: string(specJSON),
 		CustomOptions: scalar.CustomOptions{
 			PageTitle: "Neo Movies API Documentation",
 		},
@@ -56,6 +61,9 @@ func (h *DocsHandler) ServeDocs(w http.ResponseWriter, r *http.Request) {

 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
 	w.Header().Set("Access-Control-Allow-Origin", "*")
+	w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
+	w.Header().Set("Pragma", "no-cache")
+	w.Header().Set("Expires", "0")
 	fmt.Fprintln(w, htmlContent)
 }

@@ -327,123 +335,278 @@ func getOpenAPISpecWithURL(baseURL string) *OpenAPISpec {
 					},
 				},
 			},
-			"/api/v1/players/lumex/{imdb_id}": map[string]interface{}{
-				"get": map[string]interface{}{
-					"summary":     "Плеер Lumex",
-					"description": "Получение плеера Lumex по IMDb ID",
-					"tags":        []string{"Players"},
-					"parameters": []map[string]interface{}{
-						{
-							"name":        "imdb_id",
-							"in":          "path",
-							"required":    true,
-							"schema":      map[string]string{"type": "string"},
-							"description": "IMDb ID фильма",
-						},
+		"/api/v1/players/lumex/{imdb_id}": map[string]interface{}{
+			"get": map[string]interface{}{
+				"summary":     "Плеер Lumex",
+				"description": "Получение плеера Lumex по IMDb ID. Не поддерживает выбор сезона/серии - плеер работает напрямую с IMDb ID",
+				"tags":        []string{"Players"},
+				"parameters": []map[string]interface{}{
+					{
+						"name":        "imdb_id",
+						"in":          "path",
+						"required":    true,
+						"schema":      map[string]string{"type": "string"},
+						"description": "IMDb ID фильма или сериала (например, tt0133093)",
 					},
-					"responses": map[string]interface{}{
-						"200": map[string]interface{}{
-							"description": "Данные плеера",
+				},
+				"responses": map[string]interface{}{
+					"200": map[string]interface{}{
+						"description": "HTML со встроенным Lumex плеером",
+						"content": map[string]interface{}{
+							"text/html": map[string]interface{}{},
 						},
 					},
 				},
 			},
-			"/api/v1/players/vibix/{imdb_id}": map[string]interface{}{
+		},
+		"/api/v1/players/vibix/{imdb_id}": map[string]interface{}{
+			"get": map[string]interface{}{
+				"summary":     "Vibix плеер по IMDb ID",
+				"description": "Возвращает HTML-страницу с iframe Vibix для указанного IMDb ID. Не поддерживает выбор сезона/серии - плеер работает напрямую с IMDb ID",
+				"tags":        []string{"Players"},
+				"parameters": []map[string]interface{}{
+					{
+						"name":        "imdb_id",
+						"in":          "path",
+						"required":    true,
+						"schema":      map[string]string{"type": "string"},
+						"description": "IMDb ID, например tt0133093",
+					},
+				},
+				"responses": map[string]interface{}{
+					"200": map[string]interface{}{
+						"description": "HTML со встроенным Vibix плеером",
+						"content": map[string]interface{}{
+							"text/html": map[string]interface{}{},
+						},
+					},
+					"404": map[string]interface{}{"description": "Фильм не найден"},
+					"503": map[string]interface{}{"description": "VIBIX_TOKEN не настроен"},
+				},
+			},
+		},
+		"/api/v1/players/vidsrc/{media_type}/{imdb_id}": map[string]interface{}{
 				"get": map[string]interface{}{
-					"summary":     "Vibix плеер по IMDb ID",
-					"description": "Возвращает HTML-страницу с iframe Vibix для указанного IMDb ID",
+					"summary":     "Vidsrc плеер (английский)",
+					"description": "Возвращает HTML-страницу с iframe Vidsrc.to. Использует IMDb ID для фильмов и сериалов. Пример URL для фильма: https://vidsrc.to/embed/movie/tt1234567, для сериала: https://vidsrc.to/embed/tv/tt6385540/1/1",
 					"tags":        []string{"Players"},
 					"parameters": []map[string]interface{}{
+						{
+							"name":        "media_type",
+							"in":          "path",
+							"required":    true,
+							"schema":      map[string]interface{}{"type": "string", "enum": []string{"movie", "tv"}},
+							"description": "Тип контента: movie (фильм) или tv (сериал)",
+						},
 						{
 							"name":        "imdb_id",
 							"in":          "path",
 							"required":    true,
 							"schema":      map[string]string{"type": "string"},
-							"description": "IMDb ID, например tt0133093",
+							"description": "IMDb ID, например tt6385540 (с префиксом tt)",
+						},
+						{
+							"name":        "season",
+							"in":          "query",
+							"required":    false,
+							"schema":      map[string]string{"type": "integer"},
+							"description": "Номер сезона (обязательно для TV)",
+						},
+						{
+							"name":        "episode",
+							"in":          "query",
+							"required":    false,
+							"schema":      map[string]string{"type": "integer"},
+							"description": "Номер серии (обязательно для TV)",
 						},
 					},
 					"responses": map[string]interface{}{
 						"200": map[string]interface{}{
-							"description": "HTML со встроенным Vibix плеером",
+							"description": "HTML со встроенным Vidsrc плеером",
 							"content": map[string]interface{}{
 								"text/html": map[string]interface{}{},
 							},
 						},
-						"404": map[string]interface{}{"description": "Фильм не найден"},
-						"503": map[string]interface{}{"description": "VIBIX_TOKEN не настроен"},
+						"400": map[string]interface{}{"description": "Отсутствуют обязательные параметры"},
 					},
 				},
 			},
-			"/api/v1/webtorrent/player": map[string]interface{}{
+			"/api/v1/players/vidlink/movie/{imdb_id}": map[string]interface{}{
 				"get": map[string]interface{}{
-					"summary":     "WebTorrent плеер",
-					"description": "Открытие WebTorrent плеера с магнет ссылкой. Плеер работает полностью на стороне клиента.",
-					"tags":        []string{"WebTorrent"},
+					"summary":     "Vidlink плеер для фильмов (английский)",
+					"description": "Возвращает HTML-страницу с iframe Vidlink.pro для фильмов. Использует IMDb ID. Пример URL: https://vidlink.pro/movie/tt1234567",
+					"tags":        []string{"Players"},
 					"parameters": []map[string]interface{}{
 						{
-							"name":        "magnet",
-							"in":          "query",
-							"required":    false,
-							"schema":      map[string]string{"type": "string"},
-							"description": "Магнет ссылка торрента",
-						},
-						{
-							"name":        "X-Magnet-Link",
-							"in":          "header",
-							"required":    false,
-							"schema":      map[string]string{"type": "string"},
-							"description": "Магнет ссылка через заголовок (альтернативный способ)",
-						},
-					},
-					"responses": map[string]interface{}{
-						"200": map[string]interface{}{
-							"description": "HTML страница с WebTorrent плеером",
-							"content": map[string]interface{}{
-								"text/html": map[string]interface{}{
-									"schema": map[string]string{"type": "string"},
-								},
-							},
-						},
-						"400": map[string]interface{}{
-							"description": "Отсутствует магнет ссылка",
-						},
-					},
-				},
-			},
-			"/api/v1/webtorrent/metadata": map[string]interface{}{
-				"get": map[string]interface{}{
-					"summary":     "Метаданные медиа",
-					"description": "Получение метаданных фильма или сериала по названию для WebTorrent плеера",
-					"tags":        []string{"WebTorrent"},
-					"parameters": []map[string]interface{}{
-						{
-							"name":        "query",
-							"in":          "query",
+							"name":        "imdb_id",
+							"in":          "path",
 							"required":    true,
 							"schema":      map[string]string{"type": "string"},
-							"description": "Название для поиска (извлеченное из торрента)",
+							"description": "IMDb ID фильма, например tt1234567 (с префиксом tt)",
 						},
 					},
 					"responses": map[string]interface{}{
 						"200": map[string]interface{}{
-							"description": "Метаданные найдены",
+							"description": "HTML со встроенным Vidlink плеером",
 							"content": map[string]interface{}{
-								"application/json": map[string]interface{}{
-									"schema": map[string]interface{}{
-										"$ref": "#/components/schemas/WebTorrentMetadata",
-									},
-								},
+								"text/html": map[string]interface{}{},
 							},
 						},
-						"400": map[string]interface{}{
-							"description": "Отсутствует параметр query",
-						},
-						"404": map[string]interface{}{
-							"description": "Метаданные не найдены",
-						},
+						"400": map[string]interface{}{"description": "IMDb ID не указан"},
 					},
 				},
 			},
+			"/api/v1/players/vidlink/tv/{tmdb_id}": map[string]interface{}{
+				"get": map[string]interface{}{
+					"summary":     "Vidlink плеер для сериалов (английский)",
+					"description": "Возвращает HTML-страницу с iframe Vidlink.pro для сериалов. Использует TMDB ID (без префикса tt). Пример URL: https://vidlink.pro/tv/94997/1/1",
+					"tags":        []string{"Players"},
+					"parameters": []map[string]interface{}{
+						{
+							"name":        "tmdb_id",
+							"in":          "path",
+							"required":    true,
+							"schema":      map[string]string{"type": "integer"},
+							"description": "TMDB ID сериала, например 94997 (числовой идентификатор без префикса)",
+						},
+						{
+							"name":        "season",
+							"in":          "query",
+							"required":    true,
+							"schema":      map[string]string{"type": "integer"},
+							"description": "Номер сезона (обязательно)",
+						},
+						{
+							"name":        "episode",
+							"in":          "query",
+							"required":    true,
+							"schema":      map[string]string{"type": "integer"},
+							"description": "Номер серии (обязательно)",
+						},
+					},
+					"responses": map[string]interface{}{
+						"200": map[string]interface{}{
+							"description": "HTML со встроенным Vidlink плеером",
+							"content": map[string]interface{}{
+								"text/html": map[string]interface{}{},
+							},
+						},
+						"400": map[string]interface{}{"description": "Отсутствуют обязательные параметры (tmdb_id, season, episode)"},
+					},
+				},
+			},
+			"/api/v1/players/vidsrc-parse/{media_type}/{imdb_id}": map[string]interface{}{
+				"get": map[string]interface{}{
+					"summary":     "Vidsrc плеер с парсингом (кастомный плеер)",
+					"description": "Возвращает HTML-страницу с кастомным Video.js плеером. Автоматически извлекает m3u8 ссылку из Vidsrc.to через клиентский парсинг в iframe. Использует IMDb ID для фильмов и сериалов.",
+					"tags":        []string{"Players"},
+					"parameters": []map[string]interface{}{
+						{
+							"name":        "media_type",
+							"in":          "path",
+							"required":    true,
+							"schema":      map[string]interface{}{"type": "string", "enum": []string{"movie", "tv"}},
+							"description": "Тип контента: movie (фильм) или tv (сериал)",
+						},
+						{
+							"name":        "imdb_id",
+							"in":          "path",
+							"required":    true,
+							"schema":      map[string]string{"type": "string"},
+							"description": "IMDb ID, например tt6385540 (с префиксом tt)",
+						},
+						{
+							"name":        "season",
+							"in":          "query",
+							"required":    false,
+							"schema":      map[string]string{"type": "integer"},
+							"description": "Номер сезона (обязательно для TV)",
+						},
+						{
+							"name":        "episode",
+							"in":          "query",
+							"required":    false,
+							"schema":      map[string]string{"type": "integer"},
+							"description": "Номер серии (обязательно для TV)",
+						},
+					},
+					"responses": map[string]interface{}{
+						"200": map[string]interface{}{
+							"description": "HTML с кастомным Video.js плеером и системой парсинга",
+							"content": map[string]interface{}{
+								"text/html": map[string]interface{}{},
+							},
+						},
+						"400": map[string]interface{}{"description": "Отсутствуют обязательные параметры"},
+					},
+				},
+			},
+			"/api/v1/players/vidlink-parse/movie/{imdb_id}": map[string]interface{}{
+				"get": map[string]interface{}{
+					"summary":     "Vidlink плеер с парсингом для фильмов (кастомный)",
+					"description": "Возвращает HTML-страницу с кастомным Video.js плеером. Автоматически извлекает m3u8/mp4 ссылку из Vidlink.pro через клиентский парсинг. Использует IMDb ID для фильмов.",
+					"tags":        []string{"Players"},
+					"parameters": []map[string]interface{}{
+						{
+							"name":        "imdb_id",
+							"in":          "path",
+							"required":    true,
+							"schema":      map[string]string{"type": "string"},
+							"description": "IMDb ID фильма, например tt1234567 (с префиксом tt)",
+						},
+					},
+					"responses": map[string]interface{}{
+						"200": map[string]interface{}{
+							"description": "HTML с кастомным Video.js плеером и системой парсинга",
+							"content": map[string]interface{}{
+								"text/html": map[string]interface{}{},
+							},
+						},
+						"400": map[string]interface{}{"description": "IMDb ID не указан"},
+					},
+				},
+			},
+			"/api/v1/players/vidlink-parse/tv/{tmdb_id}": map[string]interface{}{
+				"get": map[string]interface{}{
+					"summary":     "Vidlink плеер с парсингом для сериалов (кастомный)",
+					"description": "Возвращает HTML-страницу с кастомным Video.js плеером. Автоматически извлекает m3u8/mp4 ссылку из Vidlink.pro через клиентский парсинг. Использует TMDB ID для сериалов.",
+					"tags":        []string{"Players"},
+					"parameters": []map[string]interface{}{
+						{
+							"name":        "tmdb_id",
+							"in":          "path",
+							"required":    true,
+							"schema":      map[string]string{"type": "integer"},
+							"description": "TMDB ID сериала, например 94997 (числовой идентификатор без префикса)",
+						},
+						{
+							"name":        "season",
+							"in":          "query",
+							"required":    true,
+							"schema":      map[string]string{"type": "integer"},
+							"description": "Номер сезона (обязательно)",
+						},
+						{
+							"name":        "episode",
+							"in":          "query",
+							"required":    true,
+							"schema":      map[string]string{"type": "integer"},
+							"description": "Номер серии (обязательно)",
+						},
+					},
+					"responses": map[string]interface{}{
+						"200": map[string]interface{}{
+							"description": "HTML с кастомным Video.js плеером и системой парсинга",
+							"content": map[string]interface{}{
+								"text/html": map[string]interface{}{},
+							},
+						},
+						"400": map[string]interface{}{"description": "Отсутствуют обязательные параметры (tmdb_id, season, episode)"},
+					},
+				},
+			},
+
+
 			"/api/v1/torrents/search/{imdbId}": map[string]interface{}{
 				"get": map[string]interface{}{
 					"summary":     "Поиск торрентов",
--- a/pkg/handlers/lang_helper.go
+++ b/pkg/handlers/lang_helper.go
@@ -0,0 +1,35 @@
+package handlers
+
+import (
+	"net/http"
+)
+
+// GetLanguage extracts the lang parameter from request and returns it with default "ru"
+// Supports both "lang" and "language" query parameters
+// Valid values: "ru", "en"
+// Default: "ru"
+func GetLanguage(r *http.Request) string {
+	// Check "lang" parameter first (our new standard)
+	lang := r.URL.Query().Get("lang")
+	
+	// Fall back to "language" for backward compatibility
+	if lang == "" {
+		lang = r.URL.Query().Get("language")
+	}
+	
+	// Default to "ru" if not specified
+	if lang == "" {
+		return "ru-RU"
+	}
+	
+	// Convert short codes to TMDB format
+	switch lang {
+	case "en":
+		return "en-US"
+	case "ru":
+		return "ru-RU"
+	default:
+		// Return as-is if already in correct format
+		return lang
+	}
+}
--- a/pkg/handlers/movie.go
+++ b/pkg/handlers/movie.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 	"strconv"
+	"strings"

 	"github.com/gorilla/mux"

@@ -29,7 +30,7 @@ func (h *MovieHandler) Search(w http.ResponseWriter, r *http.Request) {
 	}

 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)
 	region := r.URL.Query().Get("region")
 	year := getIntQuery(r, "year", 0)

@@ -48,15 +49,41 @@ func (h *MovieHandler) Search(w http.ResponseWriter, r *http.Request) {

 func (h *MovieHandler) GetByID(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
-	id, err := strconv.Atoi(vars["id"])
-	if err != nil {
-		http.Error(w, "Invalid movie ID", http.StatusBadRequest)
-		return
+	rawID := vars["id"]
+
+	// Support formats: "123" (old), "kp_123", "tmdb_123"
+	source := ""
+	var id int
+	if strings.Contains(rawID, "_") {
+		parts := strings.SplitN(rawID, "_", 2)
+		if len(parts) != 2 {
+			http.Error(w, "Invalid ID format", http.StatusBadRequest)
+			return
+		}
+		source = parts[0]
+		parsed, err := strconv.Atoi(parts[1])
+		if err != nil {
+			http.Error(w, "Invalid numeric ID", http.StatusBadRequest)
+			return
+		}
+		id = parsed
+	} else {
+		// Backward compatibility
+		parsed, err := strconv.Atoi(rawID)
+		if err != nil {
+			http.Error(w, "Invalid movie ID", http.StatusBadRequest)
+			return
+		}
+		id = parsed
 	}

-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)
+	idType := r.URL.Query().Get("id_type")
+	if source == "kp" || source == "tmdb" {
+		idType = source
+	}

-	movie, err := h.movieService.GetByID(id, language)
+	movie, err := h.movieService.GetByID(id, language, idType)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -71,7 +98,7 @@ func (h *MovieHandler) GetByID(w http.ResponseWriter, r *http.Request) {

 func (h *MovieHandler) Popular(w http.ResponseWriter, r *http.Request) {
 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)
 	region := r.URL.Query().Get("region")

 	movies, err := h.movieService.GetPopular(page, language, region)
@@ -89,7 +116,7 @@ func (h *MovieHandler) Popular(w http.ResponseWriter, r *http.Request) {

 func (h *MovieHandler) TopRated(w http.ResponseWriter, r *http.Request) {
 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)
 	region := r.URL.Query().Get("region")

 	movies, err := h.movieService.GetTopRated(page, language, region)
@@ -107,7 +134,7 @@ func (h *MovieHandler) TopRated(w http.ResponseWriter, r *http.Request) {

 func (h *MovieHandler) Upcoming(w http.ResponseWriter, r *http.Request) {
 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)
 	region := r.URL.Query().Get("region")

 	movies, err := h.movieService.GetUpcoming(page, language, region)
@@ -125,7 +152,7 @@ func (h *MovieHandler) Upcoming(w http.ResponseWriter, r *http.Request) {

 func (h *MovieHandler) NowPlaying(w http.ResponseWriter, r *http.Request) {
 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)
 	region := r.URL.Query().Get("region")

 	movies, err := h.movieService.GetNowPlaying(page, language, region)
@@ -150,7 +177,7 @@ func (h *MovieHandler) GetRecommendations(w http.ResponseWriter, r *http.Request
 	}

 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)

 	movies, err := h.movieService.GetRecommendations(id, page, language)
 	if err != nil {
@@ -174,7 +201,7 @@ func (h *MovieHandler) GetSimilar(w http.ResponseWriter, r *http.Request) {
 	}

 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)

 	movies, err := h.movieService.GetSimilar(id, page, language)
 	if err != nil {
--- a/pkg/handlers/players.go
+++ b/pkg/handlers/players.go
@@ -30,16 +30,22 @@ func (h *PlayersHandler) GetAllohaPlayer(w http.ResponseWriter, r *http.Request)
 	log.Printf("GetAllohaPlayer called: %s %s", r.Method, r.URL.Path)

 	vars := mux.Vars(r)
-	log.Printf("Route vars: %+v", vars)
+	idType := vars["id_type"]
+	id := vars["id"]

-	imdbID := vars["imdb_id"]
-	if imdbID == "" {
-		log.Printf("Error: imdb_id is empty")
-		http.Error(w, "imdb_id path param is required", http.StatusBadRequest)
+	if idType == "" || id == "" {
+		log.Printf("Error: id_type or id is empty")
+		http.Error(w, "id_type and id are required", http.StatusBadRequest)
 		return
 	}

-	log.Printf("Processing imdb_id: %s", imdbID)
+	if idType != "kp" && idType != "imdb" {
+		log.Printf("Error: invalid id_type: %s", idType)
+		http.Error(w, "id_type must be 'kp' or 'imdb'", http.StatusBadRequest)
+		return
+	}
+
+	log.Printf("Processing %s ID: %s", idType, id)

 	if h.config.AllohaToken == "" {
 		log.Printf("Error: ALLOHA_TOKEN is missing")
@@ -47,7 +53,7 @@ func (h *PlayersHandler) GetAllohaPlayer(w http.ResponseWriter, r *http.Request)
 		return
 	}

-	idParam := fmt.Sprintf("imdb=%s", url.QueryEscape(imdbID))
+	idParam := fmt.Sprintf("%s=%s", idType, url.QueryEscape(id))
 	apiURL := fmt.Sprintf("https://api.alloha.tv/?token=%s&%s", h.config.AllohaToken, idParam)
 	log.Printf("Calling Alloha API: %s", apiURL)

@@ -94,9 +100,30 @@ func (h *PlayersHandler) GetAllohaPlayer(w http.ResponseWriter, r *http.Request)
 		return
 	}

+	// Получаем параметры для сериалов
+	season := r.URL.Query().Get("season")
+	episode := r.URL.Query().Get("episode")
+	translation := r.URL.Query().Get("translation")
+	if translation == "" {
+		translation = "66" // дефолтная озвучка
+	}
+
+	// Используем iframe URL из API
 	iframeCode := allohaResponse.Data.Iframe
+
+	// Если это не HTML код, а просто URL
+	var playerURL string
 	if !strings.Contains(iframeCode, "<") {
-		iframeCode = fmt.Sprintf(`<iframe src="%s" allowfullscreen style="border:none;width:100%%;height:100%%"></iframe>`, iframeCode)
+		playerURL = iframeCode
+		// Добавляем параметры для сериалов
+		if season != "" && episode != "" {
+			separator := "?"
+			if strings.Contains(playerURL, "?") {
+				separator = "&"
+			}
+			playerURL = fmt.Sprintf("%s%sseason=%s&episode=%s&translation=%s", playerURL, separator, season, episode, translation)
+		}
+		iframeCode = fmt.Sprintf(`<iframe src="%s" allowfullscreen style="border:none;width:100%%;height:100%%"></iframe>`, playerURL)
 	}

 	htmlDoc := fmt.Sprintf(`<!DOCTYPE html><html><head><meta charset='utf-8'/><title>Alloha Player</title><style>html,body{margin:0;height:100%%;}</style></head><body>%s</body></html>`, iframeCode)
@@ -108,23 +135,29 @@ func (h *PlayersHandler) GetAllohaPlayer(w http.ResponseWriter, r *http.Request)
 	w.Header().Set("Content-Type", "text/html")
 	w.Write([]byte(htmlDoc))

-	log.Printf("Successfully served Alloha player for imdb_id: %s", imdbID)
+	log.Printf("Successfully served Alloha player for %s: %s", idType, id)
 }

 func (h *PlayersHandler) GetLumexPlayer(w http.ResponseWriter, r *http.Request) {
 	log.Printf("GetLumexPlayer called: %s %s", r.Method, r.URL.Path)

 	vars := mux.Vars(r)
-	log.Printf("Route vars: %+v", vars)
+	idType := vars["id_type"]
+	id := vars["id"]

-	imdbID := vars["imdb_id"]
-	if imdbID == "" {
-		log.Printf("Error: imdb_id is empty")
-		http.Error(w, "imdb_id path param is required", http.StatusBadRequest)
+	if idType == "" || id == "" {
+		log.Printf("Error: id_type or id is empty")
+		http.Error(w, "id_type and id are required", http.StatusBadRequest)
 		return
 	}

-	log.Printf("Processing imdb_id: %s", imdbID)
+	if idType != "kp" && idType != "imdb" {
+		log.Printf("Error: invalid id_type: %s", idType)
+		http.Error(w, "id_type must be 'kp' or 'imdb'", http.StatusBadRequest)
+		return
+	}
+
+	log.Printf("Processing %s ID: %s", idType, id)

 	if h.config.LumexURL == "" {
 		log.Printf("Error: LUMEX_URL is missing")
@@ -132,32 +165,45 @@ func (h *PlayersHandler) GetLumexPlayer(w http.ResponseWriter, r *http.Request)
 		return
 	}

-	url := fmt.Sprintf("%s?imdb_id=%s", h.config.LumexURL, url.QueryEscape(imdbID))
-	log.Printf("Generated Lumex URL: %s", url)
+	var paramName string
+	if idType == "kp" {
+		paramName = "kinopoisk_id"
+	} else {
+		paramName = "imdb_id"
+	}

-	iframe := fmt.Sprintf(`<iframe src="%s" allowfullscreen loading="lazy" style="border:none;width:100%%;height:100%%;"></iframe>`, url)
+	playerURL := fmt.Sprintf("%s?%s=%s", h.config.LumexURL, paramName, id)
+	log.Printf("Lumex URL: %s", playerURL)
+
+	iframe := fmt.Sprintf(`<iframe src="%s" allowfullscreen loading="lazy" style="border:none;width:100%%;height:100%%;"></iframe>`, playerURL)
 	htmlDoc := fmt.Sprintf(`<!DOCTYPE html><html><head><meta charset='utf-8'/><title>Lumex Player</title><style>html,body{margin:0;height:100%%;}</style></head><body>%s</body></html>`, iframe)

 	w.Header().Set("Content-Type", "text/html")
 	w.Write([]byte(htmlDoc))

-	log.Printf("Successfully served Lumex player for imdb_id: %s", imdbID)
+	log.Printf("Successfully served Lumex player for %s: %s", idType, id)
 }

 func (h *PlayersHandler) GetVibixPlayer(w http.ResponseWriter, r *http.Request) {
 	log.Printf("GetVibixPlayer called: %s %s", r.Method, r.URL.Path)

 	vars := mux.Vars(r)
-	log.Printf("Route vars: %+v", vars)
+	idType := vars["id_type"]
+	id := vars["id"]

-	imdbID := vars["imdb_id"]
-	if imdbID == "" {
-		log.Printf("Error: imdb_id is empty")
-		http.Error(w, "imdb_id path param is required", http.StatusBadRequest)
+	if idType == "" || id == "" {
+		log.Printf("Error: id_type or id is empty")
+		http.Error(w, "id_type and id are required", http.StatusBadRequest)
 		return
 	}

-	log.Printf("Processing imdb_id: %s", imdbID)
+	if idType != "kp" && idType != "imdb" {
+		log.Printf("Error: invalid id_type: %s", idType)
+		http.Error(w, "id_type must be 'kp' or 'imdb'", http.StatusBadRequest)
+		return
+	}
+
+	log.Printf("Processing %s ID: %s", idType, id)

 	if h.config.VibixToken == "" {
 		log.Printf("Error: VIBIX_TOKEN is missing")
@@ -170,7 +216,14 @@ func (h *PlayersHandler) GetVibixPlayer(w http.ResponseWriter, r *http.Request)
 		vibixHost = "https://vibix.org"
 	}

-	apiURL := fmt.Sprintf("%s/api/v1/publisher/videos/imdb/%s", vibixHost, imdbID)
+	var endpoint string
+	if idType == "kp" {
+		endpoint = "kinopoisk"
+	} else {
+		endpoint = "imdb"
+	}
+
+	apiURL := fmt.Sprintf("%s/api/v1/publisher/videos/%s/%s", vibixHost, endpoint, id)
 	log.Printf("Calling Vibix API: %s", apiURL)

 	req, err := http.NewRequest("GET", apiURL, nil)
@@ -181,7 +234,7 @@ func (h *PlayersHandler) GetVibixPlayer(w http.ResponseWriter, r *http.Request)
 	}

 	req.Header.Set("Accept", "application/json")
-	req.Header.Set("Authorization", "Bearer "+h.config.VibixToken)
+	req.Header.Set("Authorization", h.config.VibixToken)
 	req.Header.Set("X-CSRF-TOKEN", "")

 	client := &http.Client{Timeout: 8 * time.Second}
@@ -227,15 +280,17 @@ func (h *PlayersHandler) GetVibixPlayer(w http.ResponseWriter, r *http.Request)
 		return
 	}

-	log.Printf("Generated Vibix iframe URL: %s", vibixResponse.IframeURL)
+	// Vibix использует только iframe_url без season/episode
+	playerURL := vibixResponse.IframeURL
+	log.Printf("🔗 Vibix iframe URL: %s", playerURL)

-	iframe := fmt.Sprintf(`<iframe src="%s" allowfullscreen loading="lazy" style="border:none;width:100%%;height:100%%;"></iframe>`, vibixResponse.IframeURL)
+	iframe := fmt.Sprintf(`<iframe src="%s" allowfullscreen loading="lazy" style="border:none;width:100%%;height:100%%;"></iframe>`, playerURL)
 	htmlDoc := fmt.Sprintf(`<!DOCTYPE html><html><head><meta charset='utf-8'/><title>Vibix Player</title><style>html,body{margin:0;height:100%%;}</style></head><body>%s</body></html>`, iframe)

 	w.Header().Set("Content-Type", "text/html")
 	w.Write([]byte(htmlDoc))

-	log.Printf("Successfully served Vibix player for imdb_id: %s", imdbID)
+	log.Printf("Successfully served Vibix player for %s: %s", idType, id)
 }

 // GetRgShowsPlayer handles RgShows streaming requests
@@ -435,3 +490,228 @@ func (h *PlayersHandler) GetStreamAPI(w http.ResponseWriter, r *http.Request) {

 	log.Printf("Successfully served stream API for provider: %s, tmdb_id: %s", provider, tmdbID)
 }
+
+// GetVidsrcPlayer handles Vidsrc.to player (uses IMDb ID for both movies and TV shows)
+func (h *PlayersHandler) GetVidsrcPlayer(w http.ResponseWriter, r *http.Request) {
+	log.Printf("GetVidsrcPlayer called: %s %s", r.Method, r.URL.Path)
+
+	vars := mux.Vars(r)
+	imdbId := vars["imdb_id"]
+	mediaType := vars["media_type"] // "movie" or "tv"
+
+	if imdbId == "" || mediaType == "" {
+		http.Error(w, "imdb_id and media_type are required", http.StatusBadRequest)
+		return
+	}
+
+	var playerURL string
+	if mediaType == "movie" {
+		playerURL = fmt.Sprintf("https://vidsrc.to/embed/movie/%s", imdbId)
+	} else if mediaType == "tv" {
+		season := r.URL.Query().Get("season")
+		episode := r.URL.Query().Get("episode")
+		if season == "" || episode == "" {
+			http.Error(w, "season and episode are required for TV shows", http.StatusBadRequest)
+			return
+		}
+		playerURL = fmt.Sprintf("https://vidsrc.to/embed/tv/%s/%s/%s", imdbId, season, episode)
+	} else {
+		http.Error(w, "Invalid media_type. Use 'movie' or 'tv'", http.StatusBadRequest)
+		return
+	}
+
+	log.Printf("Generated Vidsrc URL: %s", playerURL)
+
+	// Используем общий шаблон с кастомными контролами
+	htmlDoc := getPlayerWithControlsHTML(playerURL, "Vidsrc Player")
+
+	w.Header().Set("Content-Type", "text/html")
+	w.Write([]byte(htmlDoc))
+
+	log.Printf("Successfully served Vidsrc player for %s: %s", mediaType, imdbId)
+}
+
+// GetVidlinkMoviePlayer handles vidlink.pro player for movies (uses IMDb ID)
+func (h *PlayersHandler) GetVidlinkMoviePlayer(w http.ResponseWriter, r *http.Request) {
+	log.Printf("GetVidlinkMoviePlayer called: %s %s", r.Method, r.URL.Path)
+
+	vars := mux.Vars(r)
+	imdbId := vars["imdb_id"]
+
+	if imdbId == "" {
+		http.Error(w, "imdb_id is required", http.StatusBadRequest)
+		return
+	}
+
+	playerURL := fmt.Sprintf("https://vidlink.pro/movie/%s", imdbId)
+
+	log.Printf("Generated Vidlink Movie URL: %s", playerURL)
+
+	// Используем общий шаблон с кастомными контролами
+	htmlDoc := getPlayerWithControlsHTML(playerURL, "Vidlink Player")
+
+	w.Header().Set("Content-Type", "text/html")
+	w.Write([]byte(htmlDoc))
+
+	log.Printf("Successfully served Vidlink movie player: %s", imdbId)
+}
+
+// GetVidlinkTVPlayer handles vidlink.pro player for TV shows (uses TMDB ID)
+func (h *PlayersHandler) GetHDVBPlayer(w http.ResponseWriter, r *http.Request) {
+	log.Printf("GetHDVBPlayer called: %s %s", r.Method, r.URL.Path)
+
+	vars := mux.Vars(r)
+	idType := vars["id_type"]
+	id := vars["id"]
+
+	if idType == "" || id == "" {
+		log.Printf("Error: id_type or id is empty")
+		http.Error(w, "id_type and id are required", http.StatusBadRequest)
+		return
+	}
+
+	if idType != "kp" && idType != "imdb" {
+		log.Printf("Error: invalid id_type: %s", idType)
+		http.Error(w, "id_type must be 'kp' or 'imdb'", http.StatusBadRequest)
+		return
+	}
+
+	log.Printf("Processing %s ID: %s", idType, id)
+
+	if h.config.HDVBToken == "" {
+		log.Printf("Error: HDVB_TOKEN is missing")
+		http.Error(w, "Server misconfiguration: HDVB_TOKEN missing", http.StatusInternalServerError)
+		return
+	}
+
+	var apiURL string
+	if idType == "kp" {
+		apiURL = fmt.Sprintf("https://apivb.com/api/videos.json?id_kp=%s&token=%s", id, h.config.HDVBToken)
+	} else {
+		apiURL = fmt.Sprintf("https://apivb.com/api/videos.json?imdb_id=%s&token=%s", id, h.config.HDVBToken)
+	}
+	log.Printf("HDVB API URL: %s", apiURL)
+
+	resp, err := http.Get(apiURL)
+	if err != nil {
+		log.Printf("Error fetching HDVB data: %v", err)
+		http.Error(w, "Failed to fetch player data", http.StatusInternalServerError)
+		return
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		log.Printf("Error reading HDVB response: %v", err)
+		http.Error(w, "Failed to read player data", http.StatusInternalServerError)
+		return
+	}
+
+	var hdvbData []map[string]interface{}
+	if err := json.Unmarshal(body, &hdvbData); err != nil {
+		log.Printf("Error parsing HDVB JSON: %v, body: %s", err, string(body))
+		http.Error(w, "Failed to parse player data", http.StatusInternalServerError)
+		return
+	}
+
+	if len(hdvbData) == 0 {
+		log.Printf("No HDVB data found for ID: %s", id)
+		http.Error(w, "No player data found", http.StatusNotFound)
+		return
+	}
+
+	iframeURL, ok := hdvbData[0]["iframe_url"].(string)
+	if !ok || iframeURL == "" {
+		log.Printf("No iframe_url in HDVB response for ID: %s", id)
+		http.Error(w, "No player URL found", http.StatusNotFound)
+		return
+	}
+
+	log.Printf("HDVB iframe URL: %s", iframeURL)
+
+	iframe := fmt.Sprintf(`<iframe src="%s" allowfullscreen loading="lazy" style="border:none;width:100%%;height:100%%;"></iframe>`, iframeURL)
+	htmlDoc := fmt.Sprintf(`<!DOCTYPE html><html><head><meta charset='utf-8'/><title>HDVB Player</title><style>html,body{margin:0;height:100%%;}</style></head><body>%s</body></html>`, iframe)
+
+	w.Header().Set("Content-Type", "text/html")
+	w.Write([]byte(htmlDoc))
+
+	log.Printf("Successfully served HDVB player for %s: %s", idType, id)
+}
+
+func (h *PlayersHandler) GetVidlinkTVPlayer(w http.ResponseWriter, r *http.Request) {
+	log.Printf("GetVidlinkTVPlayer called: %s %s", r.Method, r.URL.Path)
+
+	vars := mux.Vars(r)
+	tmdbId := vars["tmdb_id"]
+
+	if tmdbId == "" {
+		http.Error(w, "tmdb_id is required", http.StatusBadRequest)
+		return
+	}
+
+	season := r.URL.Query().Get("season")
+	episode := r.URL.Query().Get("episode")
+	if season == "" || episode == "" {
+		http.Error(w, "season and episode are required for TV shows", http.StatusBadRequest)
+		return
+	}
+
+	playerURL := fmt.Sprintf("https://vidlink.pro/tv/%s/%s/%s", tmdbId, season, episode)
+
+	log.Printf("Generated Vidlink TV URL: %s", playerURL)
+
+	// Используем общий шаблон с кастомными контролами
+	htmlDoc := getPlayerWithControlsHTML(playerURL, "Vidlink Player")
+
+	w.Header().Set("Content-Type", "text/html")
+	w.Write([]byte(htmlDoc))
+
+	log.Printf("Successfully served Vidlink TV player: %s S%sE%s", tmdbId, season, episode)
+}
+
+// getPlayerWithControlsHTML возвращает HTML с плеером и overlay для блокировки кликов
+func getPlayerWithControlsHTML(playerURL, title string) string {
+	return fmt.Sprintf(`<!DOCTYPE html>
+<html>
+<head>
+<meta charset='utf-8'/>
+<title>%s</title>
+<style>
+html,body{margin:0;height:100%%;overflow:hidden;background:#000;font-family:Arial,sans-serif;}
+#container{position:relative;width:100%%;height:100%%;}
+#player-iframe{position:absolute;top:0;left:0;width:100%%;height:100%%;border:none;}
+#overlay{position:absolute;top:0;left:0;width:100%%;height:100%%;z-index:10;pointer-events:none;}
+#controls{position:absolute;bottom:0;left:0;right:0;background:linear-gradient(transparent,rgba(0,0,0,0.8));padding:20px;opacity:0;transition:opacity 0.3s;pointer-events:auto;z-index:20;}
+#container:hover #controls{opacity:1;}
+.btn{background:rgba(255,255,255,0.2);border:none;color:#fff;padding:12px 20px;margin:0 5px;border-radius:5px;cursor:pointer;font-size:16px;transition:background 0.2s;}
+.btn:hover{background:rgba(255,255,255,0.4);}
+.btn:active{background:rgba(255,255,255,0.6);}
+</style>
+</head>
+<body>
+<div id="container">
+  <iframe id="player-iframe" src="%s" allowfullscreen allow="autoplay; encrypted-media; fullscreen; picture-in-picture"></iframe>
+  <div id="overlay"></div>
+  <div id="controls">
+    <button class="btn" id="btn-fullscreen" title="Fullscreen">⛶ Fullscreen</button>
+  </div>
+</div>
+<script>
+const overlay=document.getElementById('overlay');
+
+// Блокируем клики на iframe (защита от рекламы)
+overlay.addEventListener('click',(e)=>{e.preventDefault();e.stopPropagation();});
+overlay.addEventListener('mousedown',(e)=>{e.preventDefault();e.stopPropagation();});
+
+// Fullscreen
+document.getElementById('btn-fullscreen').addEventListener('click',()=>{
+  if(!document.fullscreenElement){
+    document.getElementById('container').requestFullscreen();
+  }else{
+    document.exitFullscreen();
+  }
+});
+</script>
+</body>
+</html>`, title, playerURL)
+}
--- a/pkg/handlers/search.go
+++ b/pkg/handlers/search.go
@@ -10,11 +10,13 @@ import (

 type SearchHandler struct {
 	tmdbService *services.TMDBService
+	kpService   *services.KinopoiskService
 }

-func NewSearchHandler(tmdbService *services.TMDBService) *SearchHandler {
+func NewSearchHandler(tmdbService *services.TMDBService, kpService *services.KinopoiskService) *SearchHandler {
 	return &SearchHandler{
 		tmdbService: tmdbService,
+		kpService:   kpService,
 	}
 }

@@ -26,20 +28,62 @@ func (h *SearchHandler) MultiSearch(w http.ResponseWriter, r *http.Request) {
 	}

 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
-	if language == "" {
-		language = "ru-RU"
-	}
+	language := GetLanguage(r)

-	results, err := h.tmdbService.SearchMulti(query, page, language)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
+    if services.ShouldUseKinopoisk(language) {
+        if h.kpService == nil {
+            http.Error(w, "Kinopoisk service is not configured", http.StatusBadGateway)
+            return
+        }

-	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(models.APIResponse{
-		Success: true,
-		Data:    results,
-	})
+        kpSearch, err := h.kpService.SearchFilms(query, page)
+        if err != nil {
+            http.Error(w, err.Error(), http.StatusBadGateway)
+            return
+        }
+
+        tmdbResp := services.MapKPSearchToTMDBResponse(kpSearch)
+        multiResults := make([]models.MultiSearchResult, 0)
+        for _, movie := range tmdbResp.Results {
+            multiResults = append(multiResults, models.MultiSearchResult{
+                ID:               movie.ID,
+                MediaType:        "movie",
+                Title:            movie.Title,
+                OriginalTitle:    movie.OriginalTitle,
+                Overview:         movie.Overview,
+                PosterPath:       movie.PosterPath,
+                BackdropPath:     movie.BackdropPath,
+                ReleaseDate:      movie.ReleaseDate,
+                VoteAverage:      movie.VoteAverage,
+                VoteCount:        movie.VoteCount,
+                Popularity:       movie.Popularity,
+                Adult:            movie.Adult,
+                OriginalLanguage: movie.OriginalLanguage,
+            })
+        }
+        w.Header().Set("Content-Type", "application/json")
+        json.NewEncoder(w).Encode(models.APIResponse{
+            Success: true,
+            Data: models.MultiSearchResponse{
+                Page:         page,
+                Results:      multiResults,
+                TotalPages:   tmdbResp.TotalPages,
+                TotalResults: tmdbResp.TotalResults,
+            },
+        })
+        return
+    }
+
+    // EN/прочие языки — TMDB
+    results, err := h.tmdbService.SearchMulti(query, page, language)
+    if err != nil {
+        http.Error(w, err.Error(), http.StatusInternalServerError)
+        return
+    }
+
+    w.Header().Set("Content-Type", "application/json")
+    json.NewEncoder(w).Encode(models.APIResponse{
+        Success: true,
+        Data:    results,
+    })
 }
--- a/pkg/handlers/tv.go
+++ b/pkg/handlers/tv.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 	"strconv"
+	"strings"

 	"github.com/gorilla/mux"

@@ -29,7 +30,7 @@ func (h *TVHandler) Search(w http.ResponseWriter, r *http.Request) {
 	}

 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)
 	year := getIntQuery(r, "first_air_date_year", 0)

 	tvShows, err := h.tvService.Search(query, page, language, year)
@@ -47,15 +48,41 @@ func (h *TVHandler) Search(w http.ResponseWriter, r *http.Request) {

 func (h *TVHandler) GetByID(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
-	id, err := strconv.Atoi(vars["id"])
-	if err != nil {
-		http.Error(w, "Invalid TV show ID", http.StatusBadRequest)
-		return
+	rawID := vars["id"]
+
+	// Support formats: "123" (old), "kp_123", "tmdb_123"
+	source := ""
+	var id int
+	if strings.Contains(rawID, "_") {
+		parts := strings.SplitN(rawID, "_", 2)
+		if len(parts) != 2 {
+			http.Error(w, "Invalid ID format", http.StatusBadRequest)
+			return
+		}
+		source = parts[0]
+		parsed, err := strconv.Atoi(parts[1])
+		if err != nil {
+			http.Error(w, "Invalid numeric ID", http.StatusBadRequest)
+			return
+		}
+		id = parsed
+	} else {
+		// Backward compatibility
+		parsed, err := strconv.Atoi(rawID)
+		if err != nil {
+			http.Error(w, "Invalid TV show ID", http.StatusBadRequest)
+			return
+		}
+		id = parsed
 	}

-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)
+	idType := r.URL.Query().Get("id_type")
+	if source == "kp" || source == "tmdb" {
+		idType = source
+	}

-	tvShow, err := h.tvService.GetByID(id, language)
+	tvShow, err := h.tvService.GetByID(id, language, idType)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -70,7 +97,7 @@ func (h *TVHandler) GetByID(w http.ResponseWriter, r *http.Request) {

 func (h *TVHandler) Popular(w http.ResponseWriter, r *http.Request) {
 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)

 	tvShows, err := h.tvService.GetPopular(page, language)
 	if err != nil {
@@ -87,7 +114,7 @@ func (h *TVHandler) Popular(w http.ResponseWriter, r *http.Request) {

 func (h *TVHandler) TopRated(w http.ResponseWriter, r *http.Request) {
 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)

 	tvShows, err := h.tvService.GetTopRated(page, language)
 	if err != nil {
@@ -104,7 +131,7 @@ func (h *TVHandler) TopRated(w http.ResponseWriter, r *http.Request) {

 func (h *TVHandler) OnTheAir(w http.ResponseWriter, r *http.Request) {
 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)

 	tvShows, err := h.tvService.GetOnTheAir(page, language)
 	if err != nil {
@@ -121,7 +148,7 @@ func (h *TVHandler) OnTheAir(w http.ResponseWriter, r *http.Request) {

 func (h *TVHandler) AiringToday(w http.ResponseWriter, r *http.Request) {
 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)

 	tvShows, err := h.tvService.GetAiringToday(page, language)
 	if err != nil {
@@ -145,7 +172,7 @@ func (h *TVHandler) GetRecommendations(w http.ResponseWriter, r *http.Request) {
 	}

 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)

 	tvShows, err := h.tvService.GetRecommendations(id, page, language)
 	if err != nil {
@@ -169,7 +196,7 @@ func (h *TVHandler) GetSimilar(w http.ResponseWriter, r *http.Request) {
 	}

 	page := getIntQuery(r, "page", 1)
-	language := r.URL.Query().Get("language")
+	language := GetLanguage(r)

 	tvShows, err := h.tvService.GetSimilar(id, page, language)
 	if err != nil {
--- a/pkg/models/movie.go
+++ b/pkg/models/movie.go
@@ -40,6 +40,7 @@ type Movie struct {
 	Tagline             string              `json:"tagline,omitempty"`
 	Homepage            string              `json:"homepage,omitempty"`
 	IMDbID              string              `json:"imdb_id,omitempty"`
+	KinopoiskID         int                 `json:"kinopoisk_id,omitempty"`
 	BelongsToCollection *Collection         `json:"belongs_to_collection,omitempty"`
 	ProductionCompanies []ProductionCompany `json:"production_companies,omitempty"`
 	ProductionCountries []ProductionCountry `json:"production_countries,omitempty"`
@@ -76,6 +77,8 @@ type TVShow struct {
 	CreatedBy           []Creator           `json:"created_by,omitempty"`
 	EpisodeRunTime      []int               `json:"episode_run_time,omitempty"`
 	Seasons             []Season            `json:"seasons,omitempty"`
+	IMDbID              string              `json:"imdb_id,omitempty"`
+	KinopoiskID         int                 `json:"kinopoisk_id,omitempty"`
 }

 // MultiSearchResult для мультипоиска
@@ -119,6 +122,7 @@ type GenresResponse struct {
 type ExternalIDs struct {
 	ID          int    `json:"id"`
 	IMDbID      string `json:"imdb_id"`
+	KinopoiskID int    `json:"kinopoisk_id,omitempty"`
 	TVDBID      int    `json:"tvdb_id,omitempty"`
 	WikidataID  string `json:"wikidata_id"`
 	FacebookID  string `json:"facebook_id"`
--- a/pkg/services/kinopoisk.go
+++ b/pkg/services/kinopoisk.go
@@ -0,0 +1,261 @@
+package services
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+)
+
+type KinopoiskService struct {
+	apiKey  string
+	baseURL string
+	client  *http.Client
+}
+
+type KPFilm struct {
+	KinopoiskId        int      `json:"kinopoiskId"`
+	ImdbId             string   `json:"imdbId"`
+	NameRu             string   `json:"nameRu"`
+	NameEn             string   `json:"nameEn"`
+	NameOriginal       string   `json:"nameOriginal"`
+	PosterUrl          string   `json:"posterUrl"`
+	PosterUrlPreview   string   `json:"posterUrlPreview"`
+	CoverUrl           string   `json:"coverUrl"`
+	LogoUrl            string   `json:"logoUrl"`
+	ReviewsCount       int      `json:"reviewsCount"`
+	RatingGoodReview   float64  `json:"ratingGoodReview"`
+	RatingGoodReviewVoteCount int `json:"ratingGoodReviewVoteCount"`
+	RatingKinopoisk    float64  `json:"ratingKinopoisk"`
+	RatingKinopoiskVoteCount int `json:"ratingKinopoiskVoteCount"`
+	RatingImdb         float64  `json:"ratingImdb"`
+	RatingImdbVoteCount int     `json:"ratingImdbVoteCount"`
+	RatingFilmCritics  float64  `json:"ratingFilmCritics"`
+	RatingFilmCriticsVoteCount int `json:"ratingFilmCriticsVoteCount"`
+	RatingAwait        float64  `json:"ratingAwait"`
+	RatingAwaitCount   int      `json:"ratingAwaitCount"`
+	RatingRfCritics    float64  `json:"ratingRfCritics"`
+	RatingRfCriticsVoteCount int `json:"ratingRfCriticsVoteCount"`
+	WebUrl             string   `json:"webUrl"`
+	Year               int      `json:"year"`
+	FilmLength         int      `json:"filmLength"`
+	Slogan             string   `json:"slogan"`
+	Description        string   `json:"description"`
+	ShortDescription   string   `json:"shortDescription"`
+	EditorAnnotation   string   `json:"editorAnnotation"`
+	IsTicketsAvailable bool     `json:"isTicketsAvailable"`
+	ProductionStatus   string   `json:"productionStatus"`
+	Type               string   `json:"type"`
+	RatingMpaa         string   `json:"ratingMpaa"`
+	RatingAgeLimits    string   `json:"ratingAgeLimits"`
+	HasImax            bool     `json:"hasImax"`
+	Has3D              bool     `json:"has3d"`
+	LastSync           string   `json:"lastSync"`
+	Countries          []struct {
+		Country string `json:"country"`
+	} `json:"countries"`
+	Genres []struct {
+		Genre string `json:"genre"`
+	} `json:"genres"`
+	StartYear int `json:"startYear"`
+	EndYear   int `json:"endYear"`
+	Serial    bool `json:"serial"`
+	ShortFilm bool `json:"shortFilm"`
+	Completed bool `json:"completed"`
+}
+
+type KPSearchResponse struct {
+	Keyword    string    `json:"keyword"`
+	PagesCount int       `json:"pagesCount"`
+	Films      []KPFilmShort `json:"films"`
+	SearchFilmsCountResult int `json:"searchFilmsCountResult"`
+}
+
+type KPFilmShort struct {
+	FilmId       int      `json:"filmId"`
+	NameRu       string   `json:"nameRu"`
+	NameEn       string   `json:"nameEn"`
+	Type         string   `json:"type"`
+	Year         string   `json:"year"`
+	Description  string   `json:"description"`
+	FilmLength   string   `json:"filmLength"`
+	Countries    []KPCountry `json:"countries"`
+	Genres       []KPGenre   `json:"genres"`
+	Rating       string   `json:"rating"`
+	RatingVoteCount int   `json:"ratingVoteCount"`
+	PosterUrl    string   `json:"posterUrl"`
+	PosterUrlPreview string `json:"posterUrlPreview"`
+}
+
+type KPCountry struct {
+	Country string `json:"country"`
+}
+
+type KPGenre struct {
+	Genre string `json:"genre"`
+}
+
+type KPExternalSource struct {
+	Source string `json:"source"`
+	ID     string `json:"id"`
+}
+
+func NewKinopoiskService(apiKey, baseURL string) *KinopoiskService {
+	return &KinopoiskService{
+		apiKey:  apiKey,
+		baseURL: baseURL,
+		client:  &http.Client{Timeout: 10 * time.Second},
+	}
+}
+
+func (s *KinopoiskService) makeRequest(endpoint string, target interface{}) error {
+	req, err := http.NewRequest("GET", endpoint, nil)
+	if err != nil {
+		return err
+	}
+
+	req.Header.Set("X-API-KEY", s.apiKey)
+	req.Header.Set("Accept", "application/json")
+
+	resp, err := s.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("Kinopoisk API error: %d", resp.StatusCode)
+	}
+
+	return json.NewDecoder(resp.Body).Decode(target)
+}
+
+func (s *KinopoiskService) GetFilmByKinopoiskId(id int) (*KPFilm, error) {
+	endpoint := fmt.Sprintf("%s/v2.2/films/%d", s.baseURL, id)
+	var film KPFilm
+	err := s.makeRequest(endpoint, &film)
+	return &film, err
+}
+
+func (s *KinopoiskService) GetFilmByImdbId(imdbId string) (*KPFilm, error) {
+	endpoint := fmt.Sprintf("%s/v2.2/films?imdbId=%s", s.baseURL, imdbId)
+	
+	var response struct {
+		Films []KPFilm `json:"items"`
+	}
+	
+	err := s.makeRequest(endpoint, &response)
+	if err != nil {
+		return nil, err
+	}
+	
+	if len(response.Films) == 0 {
+		return nil, fmt.Errorf("film not found")
+	}
+	
+	return &response.Films[0], nil
+}
+
+func (s *KinopoiskService) SearchFilms(keyword string, page int) (*KPSearchResponse, error) {
+	endpoint := fmt.Sprintf("%s/v2.1/films/search-by-keyword?keyword=%s&page=%d", s.baseURL, keyword, page)
+	var response KPSearchResponse
+	err := s.makeRequest(endpoint, &response)
+	return &response, err
+}
+
+func (s *KinopoiskService) GetExternalSources(kinopoiskId int) ([]KPExternalSource, error) {
+	endpoint := fmt.Sprintf("%s/v2.2/films/%d/external_sources", s.baseURL, kinopoiskId)
+	
+	var response struct {
+		Items []KPExternalSource `json:"items"`
+	}
+	
+	err := s.makeRequest(endpoint, &response)
+	if err != nil {
+		return nil, err
+	}
+	
+	return response.Items, nil
+}
+
+func (s *KinopoiskService) GetTopFilms(topType string, page int) (*KPSearchResponse, error) {
+	endpoint := fmt.Sprintf("%s/v2.2/films/top?type=%s&page=%d", s.baseURL, topType, page)
+	
+	var response struct {
+		PagesCount int           `json:"pagesCount"`
+		Films      []KPFilmShort `json:"films"`
+	}
+	
+	err := s.makeRequest(endpoint, &response)
+	if err != nil {
+		return nil, err
+	}
+	
+	return &KPSearchResponse{
+		PagesCount: response.PagesCount,
+		Films:      response.Films,
+		SearchFilmsCountResult: len(response.Films),
+	}, nil
+}
+
+func KPIdToImdbId(kpService *KinopoiskService, kpId int) (string, error) {
+	film, err := kpService.GetFilmByKinopoiskId(kpId)
+	if err != nil {
+		return "", err
+	}
+	return film.ImdbId, nil
+}
+
+func ImdbIdToKPId(kpService *KinopoiskService, imdbId string) (int, error) {
+	film, err := kpService.GetFilmByImdbId(imdbId)
+	if err != nil {
+		return 0, err
+	}
+	return film.KinopoiskId, nil
+}
+
+func TmdbIdToKPId(tmdbService *TMDBService, kpService *KinopoiskService, tmdbId int) (int, error) {
+	externalIds, err := tmdbService.GetMovieExternalIDs(tmdbId)
+	if err != nil {
+		return 0, err
+	}
+	
+	if externalIds.IMDbID == "" {
+		return 0, fmt.Errorf("no IMDb ID found for TMDB ID %d", tmdbId)
+	}
+	
+	return ImdbIdToKPId(kpService, externalIds.IMDbID)
+}
+
+func KPIdToTmdbId(tmdbService *TMDBService, kpService *KinopoiskService, kpId int) (int, error) {
+	imdbId, err := KPIdToImdbId(kpService, kpId)
+	if err != nil {
+		return 0, err
+	}
+	
+	movies, err := tmdbService.SearchMovies("", 1, "en-US", "", 0)
+	if err != nil {
+		return 0, err
+	}
+	
+	for _, movie := range movies.Results {
+		ids, err := tmdbService.GetMovieExternalIDs(movie.ID)
+		if err != nil {
+			continue
+		}
+		if ids.IMDbID == imdbId {
+			return movie.ID, nil
+		}
+	}
+	
+	return 0, fmt.Errorf("TMDB ID not found for KP ID %d", kpId)
+}
+
+func ConvertKPRating(rating float64) float64 {
+	return rating
+}
+
+func FormatKPYear(year int) string {
+	return strconv.Itoa(year)
+}
--- a/pkg/services/kp_mapper.go
+++ b/pkg/services/kp_mapper.go
@@ -0,0 +1,390 @@
+package services
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"neomovies-api/pkg/models"
+)
+
+func MapKPFilmToTMDBMovie(kpFilm *KPFilm) *models.Movie {
+	if kpFilm == nil {
+		return nil
+	}
+
+	releaseDate := ""
+	if kpFilm.Year > 0 {
+		releaseDate = fmt.Sprintf("%d-01-01", kpFilm.Year)
+	}
+
+	genres := make([]models.Genre, 0)
+	for _, g := range kpFilm.Genres {
+		genres = append(genres, models.Genre{
+			ID:   0,
+			Name: g.Genre,
+		})
+	}
+
+	countries := make([]models.ProductionCountry, 0)
+	for _, c := range kpFilm.Countries {
+		countries = append(countries, models.ProductionCountry{
+			ISO31661: "",
+			Name:     c.Country,
+		})
+	}
+
+	posterPath := ""
+	if kpFilm.PosterUrlPreview != "" {
+		posterPath = kpFilm.PosterUrlPreview
+	} else if kpFilm.PosterUrl != "" {
+		posterPath = kpFilm.PosterUrl
+	}
+
+	backdropPath := ""
+	if kpFilm.CoverUrl != "" {
+		backdropPath = kpFilm.CoverUrl
+	}
+
+	overview := kpFilm.Description
+	if overview == "" {
+		overview = kpFilm.ShortDescription
+	}
+
+	title := kpFilm.NameRu
+	if title == "" {
+		title = kpFilm.NameEn
+	}
+	if title == "" {
+		title = kpFilm.NameOriginal
+	}
+
+	originalTitle := kpFilm.NameOriginal
+	if originalTitle == "" {
+		originalTitle = kpFilm.NameEn
+	}
+
+	return &models.Movie{
+		ID:              kpFilm.KinopoiskId,
+		Title:           title,
+		OriginalTitle:   originalTitle,
+		Overview:        overview,
+		PosterPath:      posterPath,
+		BackdropPath:    backdropPath,
+		ReleaseDate:     releaseDate,
+		VoteAverage:     kpFilm.RatingKinopoisk,
+		VoteCount:       kpFilm.RatingKinopoiskVoteCount,
+		Popularity:      float64(kpFilm.RatingKinopoisk * 100),
+		Adult:           false,
+		OriginalLanguage: detectLanguage(kpFilm),
+		Runtime:         kpFilm.FilmLength,
+		Genres:          genres,
+		Tagline:         kpFilm.Slogan,
+		ProductionCountries: countries,
+		IMDbID:          kpFilm.ImdbId,
+		KinopoiskID:     kpFilm.KinopoiskId,
+	}
+}
+
+func MapKPFilmToTVShow(kpFilm *KPFilm) *models.TVShow {
+	if kpFilm == nil {
+		return nil
+	}
+
+	firstAirDate := ""
+	if kpFilm.StartYear > 0 {
+		firstAirDate = fmt.Sprintf("%d-01-01", kpFilm.StartYear)
+	}
+
+	lastAirDate := ""
+	if kpFilm.EndYear > 0 {
+		lastAirDate = fmt.Sprintf("%d-01-01", kpFilm.EndYear)
+	}
+
+	genres := make([]models.Genre, 0)
+	for _, g := range kpFilm.Genres {
+		genres = append(genres, models.Genre{
+			ID:   0,
+			Name: g.Genre,
+		})
+	}
+
+	posterPath := ""
+	if kpFilm.PosterUrlPreview != "" {
+		posterPath = kpFilm.PosterUrlPreview
+	} else if kpFilm.PosterUrl != "" {
+		posterPath = kpFilm.PosterUrl
+	}
+
+	backdropPath := ""
+	if kpFilm.CoverUrl != "" {
+		backdropPath = kpFilm.CoverUrl
+	}
+
+	overview := kpFilm.Description
+	if overview == "" {
+		overview = kpFilm.ShortDescription
+	}
+
+	name := kpFilm.NameRu
+	if name == "" {
+		name = kpFilm.NameEn
+	}
+	if name == "" {
+		name = kpFilm.NameOriginal
+	}
+
+	originalName := kpFilm.NameOriginal
+	if originalName == "" {
+		originalName = kpFilm.NameEn
+	}
+
+	status := "Ended"
+	if kpFilm.Completed {
+		status = "Ended"
+	} else {
+		status = "Returning Series"
+	}
+
+	return &models.TVShow{
+		ID:              kpFilm.KinopoiskId,
+		Name:            name,
+		OriginalName:    originalName,
+		Overview:        overview,
+		PosterPath:      posterPath,
+		BackdropPath:    backdropPath,
+		FirstAirDate:    firstAirDate,
+		LastAirDate:     lastAirDate,
+		VoteAverage:     kpFilm.RatingKinopoisk,
+		VoteCount:       kpFilm.RatingKinopoiskVoteCount,
+		Popularity:      float64(kpFilm.RatingKinopoisk * 100),
+		OriginalLanguage: detectLanguage(kpFilm),
+		Genres:          genres,
+		Status:          status,
+		InProduction:    !kpFilm.Completed,
+		KinopoiskID:     kpFilm.KinopoiskId,
+	}
+}
+
+// Unified mappers with prefixed IDs
+func MapKPToUnified(kpFilm *KPFilm) *models.UnifiedContent {
+    if kpFilm == nil {
+        return nil
+    }
+
+    releaseDate := FormatKPDate(kpFilm.Year)
+    endDate := (*string)(nil)
+    if kpFilm.EndYear > 0 {
+        v := FormatKPDate(kpFilm.EndYear)
+        endDate = &v
+    }
+
+    genres := make([]models.UnifiedGenre, 0)
+    for _, g := range kpFilm.Genres {
+        genres = append(genres, models.UnifiedGenre{ID: strings.ToLower(g.Genre), Name: g.Genre})
+    }
+
+    poster := kpFilm.PosterUrlPreview
+    if poster == "" {
+        poster = kpFilm.PosterUrl
+    }
+
+    country := ""
+    if len(kpFilm.Countries) > 0 {
+        country = kpFilm.Countries[0].Country
+    }
+
+    title := kpFilm.NameRu
+    if title == "" {
+        title = kpFilm.NameEn
+    }
+    originalTitle := kpFilm.NameOriginal
+    if originalTitle == "" {
+        originalTitle = kpFilm.NameEn
+    }
+
+    var budgetPtr *int64
+    var revenuePtr *int64
+
+    external := models.UnifiedExternalIDs{KP: &kpFilm.KinopoiskId, TMDB: nil, IMDb: kpFilm.ImdbId}
+
+    return &models.UnifiedContent{
+        ID:            strconv.Itoa(kpFilm.KinopoiskId),
+        SourceID:      "kp_" + strconv.Itoa(kpFilm.KinopoiskId),
+        Title:         title,
+        OriginalTitle: originalTitle,
+        Description:   firstNonEmpty(kpFilm.Description, kpFilm.ShortDescription),
+        ReleaseDate:   releaseDate,
+        EndDate:       endDate,
+        Type:          mapKPTypeToUnified(kpFilm),
+        Genres:        genres,
+        Rating:        kpFilm.RatingKinopoisk,
+        PosterURL:     poster,
+        BackdropURL:   kpFilm.CoverUrl,
+        Director:      "",
+        Cast:          []models.UnifiedCastMember{},
+        Duration:      kpFilm.FilmLength,
+        Country:       country,
+        Language:      detectLanguage(kpFilm),
+        Budget:        budgetPtr,
+        Revenue:       revenuePtr,
+        IMDbID:        kpFilm.ImdbId,
+        ExternalIDs:   external,
+    }
+}
+
+func mapKPTypeToUnified(kp *KPFilm) string {
+    if kp.Serial || kp.Type == "TV_SERIES" || kp.Type == "MINI_SERIES" {
+        return "tv"
+    }
+    return "movie"
+}
+
+func firstNonEmpty(values ...string) string {
+    for _, v := range values {
+        if strings.TrimSpace(v) != "" {
+            return v
+        }
+    }
+    return ""
+}
+
+func MapKPSearchToTMDBResponse(kpSearch *KPSearchResponse) *models.TMDBResponse {
+	if kpSearch == nil {
+		return &models.TMDBResponse{
+			Page:         1,
+			Results:      []models.Movie{},
+			TotalPages:   0,
+			TotalResults: 0,
+		}
+	}
+
+	results := make([]models.Movie, 0)
+	for _, film := range kpSearch.Films {
+		movie := mapKPFilmShortToMovie(film)
+		if movie != nil {
+			results = append(results, *movie)
+		}
+	}
+
+	totalPages := kpSearch.PagesCount
+	if totalPages == 0 && len(results) > 0 {
+		totalPages = 1
+	}
+
+	return &models.TMDBResponse{
+		Page:         1,
+		Results:      results,
+		TotalPages:   totalPages,
+		TotalResults: kpSearch.SearchFilmsCountResult,
+	}
+}
+
+func mapKPFilmShortToMovie(film KPFilmShort) *models.Movie {
+	genres := make([]models.Genre, 0)
+	for _, g := range film.Genres {
+		genres = append(genres, models.Genre{
+			ID:   0,
+			Name: g.Genre,
+		})
+	}
+
+	year := 0
+	if film.Year != "" {
+		year, _ = strconv.Atoi(film.Year)
+	}
+
+	releaseDate := ""
+	if year > 0 {
+		releaseDate = fmt.Sprintf("%d-01-01", year)
+	}
+
+	posterPath := film.PosterUrlPreview
+	if posterPath == "" {
+		posterPath = film.PosterUrl
+	}
+
+	title := film.NameRu
+	if title == "" {
+		title = film.NameEn
+	}
+
+	originalTitle := film.NameEn
+	if originalTitle == "" {
+		originalTitle = film.NameRu
+	}
+
+	rating := 0.0
+	if film.Rating != "" {
+		rating, _ = strconv.ParseFloat(film.Rating, 64)
+	}
+
+	return &models.Movie{
+		ID:               film.FilmId,
+		Title:            title,
+		OriginalTitle:    originalTitle,
+		Overview:         film.Description,
+		PosterPath:       posterPath,
+		ReleaseDate:      releaseDate,
+		VoteAverage:      rating,
+		VoteCount:        film.RatingVoteCount,
+		Popularity:       rating * 100,
+		Genres:           genres,
+		KinopoiskID:      film.FilmId,
+	}
+}
+
+func detectLanguage(film *KPFilm) string {
+	if film.NameRu != "" {
+		return "ru"
+	}
+	if film.NameEn != "" {
+		return "en"
+	}
+	return "ru"
+}
+
+func MapKPExternalIDsToTMDB(kpFilm *KPFilm) *models.ExternalIDs {
+	if kpFilm == nil {
+		return &models.ExternalIDs{}
+	}
+
+	return &models.ExternalIDs{
+		ID:          kpFilm.KinopoiskId,
+		IMDbID:      kpFilm.ImdbId,
+		KinopoiskID: kpFilm.KinopoiskId,
+	}
+}
+
+func ShouldUseKinopoisk(language string) bool {
+	if language == "" {
+		return false
+	}
+	lang := strings.ToLower(language)
+	return strings.HasPrefix(lang, "ru")
+}
+
+func NormalizeLanguage(language string) string {
+	if language == "" {
+		return "en-US"
+	}
+	
+	lang := strings.ToLower(language)
+	if strings.HasPrefix(lang, "ru") {
+		return "ru-RU"
+	}
+	
+	return "en-US"
+}
+
+func ConvertKPRatingToTMDB(kpRating float64) float64 {
+	return kpRating
+}
+
+func FormatKPDate(year int) string {
+	if year <= 0 {
+		return time.Now().Format("2006-01-02")
+	}
+	return fmt.Sprintf("%d-01-01", year)
+}
--- a/pkg/services/movie.go
+++ b/pkg/services/movie.go
@@ -1,34 +1,87 @@
 package services

 import (
+	"fmt"
 	"go.mongodb.org/mongo-driver/mongo"

 	"neomovies-api/pkg/models"
 )

 type MovieService struct {
-	tmdb *TMDBService
+	tmdb      *TMDBService
+	kpService *KinopoiskService
 }

-func NewMovieService(db *mongo.Database, tmdb *TMDBService) *MovieService {
+func NewMovieService(db *mongo.Database, tmdb *TMDBService, kpService *KinopoiskService) *MovieService {
 	return &MovieService{
-		tmdb: tmdb,
+		tmdb:      tmdb,
+		kpService: kpService,
 	}
 }

 func (s *MovieService) Search(query string, page int, language, region string, year int) (*models.TMDBResponse, error) {
+	if ShouldUseKinopoisk(language) && s.kpService != nil {
+		kpSearch, err := s.kpService.SearchFilms(query, page)
+		if err == nil {
+			return MapKPSearchToTMDBResponse(kpSearch), nil
+		}
+	}
 	return s.tmdb.SearchMovies(query, page, language, region, year)
 }

-func (s *MovieService) GetByID(id int, language string) (*models.Movie, error) {
-	return s.tmdb.GetMovie(id, language)
+func (s *MovieService) GetByID(id int, language string, idType string) (*models.Movie, error) {
+    // Строго уважаем явный id_type, без скрытого fallback на TMDB
+    switch idType {
+    case "kp":
+        if s.kpService == nil {
+            return nil, fmt.Errorf("kinopoisk service not configured")
+        }
+
+        // Сначала пробуем как Kinopoisk ID
+        if kpFilm, err := s.kpService.GetFilmByKinopoiskId(id); err == nil {
+            return MapKPFilmToTMDBMovie(kpFilm), nil
+        }
+
+        // Возможно пришел TMDB ID — пробуем конвертировать TMDB -> KP
+        if kpId, convErr := TmdbIdToKPId(s.tmdb, s.kpService, id); convErr == nil {
+            if kpFilm, err := s.kpService.GetFilmByKinopoiskId(kpId); err == nil {
+                return MapKPFilmToTMDBMovie(kpFilm), nil
+            }
+        }
+        // Явно указан KP, но ничего не нашли — возвращаем ошибку
+        return nil, fmt.Errorf("film not found in Kinopoisk with id %d", id)
+
+    case "tmdb":
+        return s.tmdb.GetMovie(id, language)
+    }
+
+    // Если id_type не указан — старая логика по языку
+    if ShouldUseKinopoisk(language) && s.kpService != nil {
+        if kpFilm, err := s.kpService.GetFilmByKinopoiskId(id); err == nil {
+            return MapKPFilmToTMDBMovie(kpFilm), nil
+        }
+    }
+
+    return s.tmdb.GetMovie(id, language)
 }

 func (s *MovieService) GetPopular(page int, language, region string) (*models.TMDBResponse, error) {
+	if ShouldUseKinopoisk(language) && s.kpService != nil {
+		kpTop, err := s.kpService.GetTopFilms("TOP_100_POPULAR_FILMS", page)
+		if err == nil {
+			return MapKPSearchToTMDBResponse(kpTop), nil
+		}
+	}
 	return s.tmdb.GetPopularMovies(page, language, region)
 }

 func (s *MovieService) GetTopRated(page int, language, region string) (*models.TMDBResponse, error) {
+	if ShouldUseKinopoisk(language) && s.kpService != nil {
+		kpTop, err := s.kpService.GetTopFilms("TOP_250_BEST_FILMS", page)
+		if err == nil {
+			return MapKPSearchToTMDBResponse(kpTop), nil
+		}
+	}
 	return s.tmdb.GetTopRatedMovies(page, language, region)
 }

@@ -49,5 +102,26 @@ func (s *MovieService) GetSimilar(id, page int, language string) (*models.TMDBRe
 }

 func (s *MovieService) GetExternalIDs(id int) (*models.ExternalIDs, error) {
-	return s.tmdb.GetMovieExternalIDs(id)
+	if s.kpService != nil {
+		kpFilm, err := s.kpService.GetFilmByKinopoiskId(id)
+		if err == nil && kpFilm != nil {
+			externalIDs := MapKPExternalIDsToTMDB(kpFilm)
+			externalIDs.ID = id
+			return externalIDs, nil
+		}
+	}
+	
+	tmdbIDs, err := s.tmdb.GetMovieExternalIDs(id)
+	if err != nil {
+		return nil, err
+	}
+	
+	if s.kpService != nil && tmdbIDs.IMDbID != "" {
+		kpFilm, err := s.kpService.GetFilmByImdbId(tmdbIDs.IMDbID)
+		if err == nil && kpFilm != nil {
+			tmdbIDs.KinopoiskID = kpFilm.KinopoiskId
+		}
+	}
+	
+	return tmdbIDs, nil
 }
--- a/pkg/services/tmdb.go
+++ b/pkg/services/tmdb.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
+	"strings"

 	"neomovies-api/pkg/models"
 )
@@ -179,6 +180,80 @@ func (s *TMDBService) GetTVShow(id int, language string) (*models.TVShow, error)
 	return &tvShow, err
 }

+// Map TMDB movie to unified content with prefixed IDs. Requires optional external IDs for imdbId.
+func MapTMDBToUnifiedMovie(movie *models.Movie, external *models.ExternalIDs) *models.UnifiedContent {
+    if movie == nil {
+        return nil
+    }
+
+    genres := make([]models.UnifiedGenre, 0, len(movie.Genres))
+    for _, g := range movie.Genres {
+        name := strings.TrimSpace(g.Name)
+        id := strings.ToLower(strings.ReplaceAll(name, " ", "-"))
+        if id == "" {
+            id = strconv.Itoa(g.ID)
+        }
+        genres = append(genres, models.UnifiedGenre{ID: id, Name: name})
+    }
+
+    var imdb string
+    if external != nil {
+        imdb = external.IMDbID
+    }
+
+    var budgetPtr *int64
+    if movie.Budget > 0 {
+        v := movie.Budget
+        budgetPtr = &v
+    }
+
+    var revenuePtr *int64
+    if movie.Revenue > 0 {
+        v := movie.Revenue
+        revenuePtr = &v
+    }
+
+    ext := models.UnifiedExternalIDs{
+        KP:   nil,
+        TMDB: &movie.ID,
+        IMDb: imdb,
+    }
+
+    return &models.UnifiedContent{
+        ID:            strconv.Itoa(movie.ID),
+        SourceID:      "tmdb_" + strconv.Itoa(movie.ID),
+        Title:         movie.Title,
+        OriginalTitle: movie.OriginalTitle,
+        Description:   movie.Overview,
+        ReleaseDate:   movie.ReleaseDate,
+        EndDate:       nil,
+        Type:          "movie",
+        Genres:        genres,
+        Rating:        movie.VoteAverage,
+        PosterURL:     movie.PosterPath,
+        BackdropURL:   movie.BackdropPath,
+        Director:      "",
+        Cast:          []models.UnifiedCastMember{},
+        Duration:      movie.Runtime,
+        Country:       firstCountry(movie.ProductionCountries),
+        Language:      movie.OriginalLanguage,
+        Budget:        budgetPtr,
+        Revenue:       revenuePtr,
+        IMDbID:        imdb,
+        ExternalIDs:   ext,
+    }
+}
+
+func firstCountry(countries []models.ProductionCountry) string {
+    if len(countries) == 0 {
+        return ""
+    }
+    if strings.TrimSpace(countries[0].Name) != "" {
+        return countries[0].Name
+    }
+    return countries[0].ISO31661
+}
+
 func (s *TMDBService) GetGenres(mediaType string, language string) (*models.GenresResponse, error) {
 	params := url.Values{}

--- a/pkg/services/tv.go
+++ b/pkg/services/tv.go
@@ -1,20 +1,23 @@
 package services

 import (
+	"fmt"
 	"go.mongodb.org/mongo-driver/mongo"

 	"neomovies-api/pkg/models"
 )

 type TVService struct {
-	db   *mongo.Database
-	tmdb *TMDBService
+	db        *mongo.Database
+	tmdb      *TMDBService
+	kpService *KinopoiskService
 }

-func NewTVService(db *mongo.Database, tmdb *TMDBService) *TVService {
+func NewTVService(db *mongo.Database, tmdb *TMDBService, kpService *KinopoiskService) *TVService {
 	return &TVService{
-		db:   db,
-		tmdb: tmdb,
+		db:        db,
+		tmdb:      tmdb,
+		kpService: kpService,
 	}
 }

@@ -22,8 +25,40 @@ func (s *TVService) Search(query string, page int, language string, year int) (*
 	return s.tmdb.SearchTVShows(query, page, language, year)
 }

-func (s *TVService) GetByID(id int, language string) (*models.TVShow, error) {
-	return s.tmdb.GetTVShow(id, language)
+func (s *TVService) GetByID(id int, language string, idType string) (*models.TVShow, error) {
+    // Строго уважаем явный id_type, без скрытого fallback на TMDB
+    switch idType {
+    case "kp":
+        if s.kpService == nil {
+            return nil, fmt.Errorf("kinopoisk service not configured")
+        }
+
+        // Сначала пробуем как Kinopoisk ID
+        if kpFilm, err := s.kpService.GetFilmByKinopoiskId(id); err == nil && kpFilm != nil {
+            return MapKPFilmToTVShow(kpFilm), nil
+        }
+
+        // Возможно пришел TMDB ID — пробуем конвертировать TMDB -> KP
+        if kpId, convErr := TmdbIdToKPId(s.tmdb, s.kpService, id); convErr == nil {
+            if kpFilm, err := s.kpService.GetFilmByKinopoiskId(kpId); err == nil && kpFilm != nil {
+                return MapKPFilmToTVShow(kpFilm), nil
+            }
+        }
+        // Явно указан KP, но ничего не нашли — возвращаем ошибку
+        return nil, fmt.Errorf("TV show not found in Kinopoisk with id %d", id)
+
+    case "tmdb":
+        return s.tmdb.GetTVShow(id, language)
+    }
+
+    // Если id_type не указан — старая логика по языку
+    if ShouldUseKinopoisk(language) && s.kpService != nil {
+        if kpFilm, err := s.kpService.GetFilmByKinopoiskId(id); err == nil && kpFilm != nil {
+            return MapKPFilmToTVShow(kpFilm), nil
+        }
+    }
+
+    return s.tmdb.GetTVShow(id, language)
 }

 func (s *TVService) GetPopular(page int, language string) (*models.TMDBTVResponse, error) {
Author	SHA1	Message	Date
Erno	c7aa844f49	feat(api): support prefixed IDs in routes and add unified mappers scaffolding - Handlers parse IDs like kp_123 / tmdb_456 and set id_type accordingly - Add KP->Unified and TMDB->Unified movie mappers (basic fields) - Keep backward compatibility for numeric IDs	2025-10-19 08:30:16 +00:00
Erno	0fbf0f0f42	fix(search): force KP for ru language in multi search - MultiSearch returns KP results when lang starts with ru - No fallback to TMDB for ru; KP errors bubble up	2025-10-19 07:47:59 +00:00
Erno	f2f06485fd	fix(api): respect explicit id_type and remove hidden TMDB fallback - Movies/TV: if id_type=kp, fetch only from Kinopoisk (with TMDB->KP conversion) - Movies/TV: if id_type=tmdb, fetch only from TMDB - Default (no id_type): keep language-based behavior - README: redact example tokens/keys with placeholders Prevents wrong provider data when opened from search links with id_type.	2025-10-19 07:40:37 +00:00
Erno	f5a754ddf7	fix: Remove TMDB fallback and add ID conversion for strict id_type handling ПРОБЛЕМА: - При id_type='kp' код делал fallback на TMDB если фильм не найден - Если передан TMDB ID с id_type='kp', возвращались данные из TMDB - Нарушалась явная логика выбора источника РЕШЕНИЕ: 1. Убран автоматический fallback на TMDB при id_type='kp' 2. Добавлена конвертация ID: - Если id_type='kp' и фильм не найден напрямую - Пробуем конвертировать TMDB ID → KP ID через TmdbIdToKPId - Запрашиваем данные по сконвертированному KP ID 3. Если конвертация не удалась → возвращаем ошибку ЛОГИКА: - id_type='kp' + ID=550 (TMDB): 1. Поиск KP фильма с id=550 → не найдено 2. Конвертация 550 (TMDB) → получаем KP ID (например 326) 3. Поиск KP фильма с id=326 → успех 4. Возврат данных из Kinopoisk ✅ - id_type='kp' + несуществующий ID: 1. Поиск KP фильма → не найдено 2. Конвертация → не удалась 3. Возврат ошибки (НЕ fallback на TMDB) ✅ ИЗМЕНЕНИЯ: - pkg/services/movie.go: добавлена конвертация и удален fallback - pkg/services/tv.go: добавлена конвертация и удален fallback - Добавлен import fmt для форматирования ошибок РЕЗУЛЬТАТ: ✅ Строгое соблюдение id_type параметра ✅ Умная конвертация между TMDB и KP ID ✅ Нет неожиданного fallback на другой источник	2025-10-18 23:55:42 +00:00
Erno	be849fd103	feat: Add id_type parameter support for movies and TV shows	2025-10-18 23:41:53 +00:00
Erno	af625c7950	fix: Replace ioutil.ReadAll with io.ReadAll - Fix undefined ioutil error - Use io.ReadAll from io package (Go 1.16+)	2025-10-18 22:27:53 +00:00
Erno	7631e34f2d	fix: HDVB player implementation - Fetch iframe_url from HDVB API instead of direct embed - Parse JSON response to extract iframe_url - Use io.ReadAll instead of direct URL embed - Fixes 'Не передан ни один параметр' error - HDVB API returns JSON with iframe_url field	2025-10-18 22:18:35 +00:00
Erno	18421848c2	fix: Handle Kinopoisk IDs in GetExternalIDs - Try to fetch from KP API first by KP ID - If KP data found, return external IDs directly - Falls back to TMDB if KP ID not found - Fixes 500 error for Russian content external IDs	2025-10-18 22:05:51 +00:00
Erno	fd8e2cccfe	fix: Generate OpenAPI spec inline instead of file reference - Use SpecContent with marshaled JSON instead of SpecURL - Prevents 'open /openapi.json: no such file or directory' error - Documentation now loads properly on all domains	2025-10-18 21:35:34 +00:00
Erno	30c48fbc50	fix: Use relative URL for OpenAPI spec to bypass Cloudflare - Change SpecURL from absolute to relative path - Fixes documentation loading on api.neomovies.ru - Browser will request openapi.json from same domain	2025-10-18 21:19:57 +00:00
Erno	36389f674f	fix: Add additional cache headers for documentation - Add Pragma: no-cache - Add Expires: 0 - Ensure documentation never cached on api.neomovies.ru	2025-10-18 21:16:17 +00:00
Erno	35ceb00217	fix: Update api/index.go and README with new API format - Fix NewSearchHandler call in api/index.go to include kpService - Update README with Kinopoisk API integration details - Document new player API format: /players/{player}/{id_type}/{id} - Add all new environment variables (KPAPI_KEY, HDVB_TOKEN, etc) - Add examples for both kp and imdb ID types	2025-10-18 21:04:46 +00:00
Erno	7b8d92af14	fix: Update api/index.go for Kinopoisk integration - Add kpService initialization - Pass kpService to movieService, tvService, searchHandler - Update player routes to use id_type format - Add HDVB player route	2025-10-18 20:50:31 +00:00
Erno	e5e70a635b	fix: Correct field names ImdbID to IMDbID - Fixed ImdbID to IMDbID in kinopoisk.go - Fixed ImdbID to IMDbID in kp_mapper.go - Removed Tagline field from TVShow mapping - All builds now pass successfully	2025-10-18 20:30:37 +00:00
Erno	28555a83e1	feat: Update player API to use id_type in path All Russian players now use format: /players/{player}/{id_type}/{id} - id_type can be kp (Kinopoisk) or imdb - Alloha, Lumex, Vibix, HDVB support both ID types - Added validation for id_type parameter - Updated handlers to parse id_type from path	2025-10-18 20:21:13 +00:00
Cursor Agent	567b287322	chore: add binary to gitignore	2025-10-05 15:46:44 +00:00
Cursor Agent	03091b0fc3	chore: remove accidentally committed binary	2025-10-05 15:46:26 +00:00
Cursor Agent	42d38ba0d1	fix: use GetLanguage helper in MultiSearch endpoint Problem: - MultiSearch endpoint was reading 'language' parameter only - Frontend sends 'lang' parameter (from interceptor) - Search results were always in Russian Solution: - Replace manual language parameter reading with GetLanguage(r) - GetLanguage checks both 'lang' and 'language' parameters - Defaults to 'ru-RU' if not specified - Converts 'en' to 'en-US' and 'ru' to 'ru-RU' for TMDB Before: language := r.URL.Query().Get("language") if language == "" { language = "ru-RU" } After: language := GetLanguage(r) Result: ✅ Search results now respect ?lang=en parameter ✅ Movie/TV titles in search are localized ✅ Consistent with other endpoints (movies, tv, etc.)	2025-10-05 15:46:06 +00:00
Cursor Agent	859a7fd380	chore: remove binaries from repo and update .gitignore	2025-10-05 14:24:48 +00:00
Cursor Agent	303079740f	feat: add ?lang=en support to API with default ru Language Support: - Create GetLanguage() helper function - Support both 'lang' and 'language' query parameters - Convert short codes (en/ru) to TMDB format (en-US/ru-RU) - Default language: ru-RU Changes: - pkg/handlers/lang_helper.go: new helper for language detection - pkg/handlers/movie.go: use GetLanguage() in all endpoints - pkg/handlers/tv.go: use GetLanguage() in all endpoints How to use: - ?lang=en → returns English content - ?lang=ru → returns Russian content (default) - No param → defaults to Russian All movie/TV endpoints now support multilingual content: GET /api/v1/movies/{id}?lang=en GET /api/v1/movies/popular?lang=en GET /api/v1/tv/{id}?lang=en etc.	2025-10-05 14:24:19 +00:00
Cursor Agent	39c8366ae1	feat: simplify player controls - remove hotkeys - Remove all keyboard shortcuts (not working properly) - Remove play/pause/volume visual controls - Keep only Fullscreen button (actually works) - Keep overlay for click-blocking (protects from ads) - Simpler, cleaner UI - Users should use browser's popup blocker + AdBlocker	2025-10-04 22:53:50 +00:00
Cursor Agent	d47b4fd0a8	feat: add custom controls overlay for English players Remove sandbox completely and add custom solution: - Transparent overlay blocks all clicks on iframe (ad protection) - Custom controls UI with buttons: play/pause, mute, volume, rewind/forward, fullscreen - Keyboard shortcuts (hotkeys): * Space - Play/Pause * M - Mute/Unmute * ← → - Rewind/Forward 10s * ↑ ↓ - Volume Up/Down * F - Fullscreen * ? - Show/Hide hotkeys help - Auto-hide controls after 3s of inactivity - Visual notifications for all actions - Works without sandbox restrictions - Better UX with keyboard control Note: Controls are visual only (cannot actually control cross-origin iframe player) but provide good UX and block unwanted clicks/ads	2025-10-04 22:40:58 +00:00
Cursor Agent	0d54aacc7d	feat: add minimal sandbox restrictions for English players Sandbox attributes for vidsrc and vidlink: - allow-scripts: JavaScript работает (необходимо для плеера) - allow-same-origin: Доступ к своему origin (необходимо для API) - allow-forms: Работа с формами (если плеер использует) - allow-presentation: Fullscreen режим - allow-modals: Модальные окна (если плеер показывает) Что блокируется: - allow-popups (НЕТ) → всплывающие окна заблокированы - allow-top-navigation (НЕТ) → редиректы родительской страницы заблокированы Компромисс: плееры работают + базовая защита от редиректов	2025-10-04 22:28:02 +00:00
Cursor Agent	4e88529e0a	fix: remove parser and fix docs syntax - Fix OpenAPI documentation syntax error (extra indent before vidsrc) - Remove server-side parser (chromedp) - not suitable for Vercel - Client-side scraping not possible due to Same-Origin Policy - Keep simple iframe players as current solution	2025-10-04 22:03:37 +00:00
Cursor Agent	0bd3a8860f	fix: remove season/episode support from Lumex and Vibix - Remove season/episode parameters from Lumex (not supported by API) - Remove season/episode parameters from Vibix (not working properly) - Improve redirect protection for English players: * Block window.close * Override window.location with getters/setters * Add mousedown event blocking * Add location change monitoring (100ms interval) * Prevent all forms of navigation - Update API documentation to reflect changes - Simplify player handlers code	2025-10-04 21:49:07 +00:00
Cursor Agent	5e761dbbc6	feat: add advanced popup and redirect protection Multi-layered protection for English players: - Block window.open with immutable override - Prevent navigation when iframe is focused (beforeunload) - Stop event propagation on iframe clicks - Add overflow:hidden to prevent scrollbar exploits - Keep players functional while reducing popups Note: Some popups may still appear due to iframe cross-origin restrictions	2025-10-04 21:36:15 +00:00
Cursor Agent	5d422231ca	fix: remove sandbox to allow English players to work - Remove sandbox attribute that was blocking player functionality - Add JavaScript popup blocker (limited effectiveness from parent frame) - Add proper iframe permissions: autoplay, encrypted-media, fullscreen - Players now work but may still show some popups - Trade-off: functionality over strict popup blocking	2025-10-04 21:30:15 +00:00
Cursor Agent	b467b7ed1c	fix: use query params for Lumex instead of path - Change from /movie/{id} and /tv-series/{id} to ?imdb_id={id} - Movie: {LUMEX_URL}?imdb_id={imdb_id} - TV: {LUMEX_URL}?imdb_id={imdb_id}&season=1&episode=3 - Now matches actual Lumex API format	2025-10-04 21:28:00 +00:00
Cursor Agent	b76e8f685d	feat: block popups and redirects for English players - Add sandbox attribute to vidsrc and vidlink iframes - Sandbox allows: scripts, same-origin, forms, presentation - Sandbox blocks: popups, top navigation, unwanted redirects - Add referrerpolicy=no-referrer for extra security - Improves user experience by preventing annoying popups	2025-10-04 21:23:13 +00:00
Cursor Agent	3be73ad264	fix: implement Lumex API with correct URL format - Use /movie/{id} for movies - Use /tv-series/{id}?season=X&episode=Y for TV shows - Keep route as /players/lumex/{imdb_id} - Add autoplay=1 parameter - Update API documentation with season/episode params - Keep IMDb ID in route but format URL according to Lumex API	2025-10-04 21:20:39 +00:00
Cursor Agent	c170b2c7fa	debug: add detailed logging for Lumex and Vibix players - Log season/episode query parameters - Log base URLs and final generated URLs - Track query parameter separator logic - Help diagnose why Lumex ignores params and Vibix only processes season	2025-10-04 21:17:37 +00:00
Cursor Agent	52d7e48bdb	fix: restore original Alloha API method with season/episode support - Use Data.Iframe from Alloha API response (original method) - Add season, episode, translation query parameters to iframe URL - Keep season/episode support for Lumex and Vibix - All Russian players now work with episode selection	2025-10-04 21:12:29 +00:00
Cursor Agent	d4e29a8093	feat: add season/episode support for Russian players - Alloha: now uses token_movie API with season/episode params - Lumex: added season/episode query parameters - Vibix: added season/episode to iframe URL - All Russian players now support TV show episode selection - Better control over playback for series	2025-10-04 20:56:19 +00:00
Cursor Agent	6ee4b8cc58	revert: remove server-side parsing (Vercel limits) - Removed client_parser.go with heavy HTTP parsing - Back to simple iframe players for vidsrc and vidlink - Avoids Vercel function timeout limits	2025-10-04 20:39:07 +00:00
Cursor Agent	b20edae256	feat: add client-side parsing players with Video.js - Added client-side parsing for Vidsrc and Vidlink - Custom Video.js player with HLS support - Auto-detection of m3u8/mp4 streams from iframe - New routes: /players/vidsrc-parse, /players/vidlink-parse - Performance API monitoring for stream detection - Fallback to original iframe if parsing fails - Updated API documentation	2025-10-04 20:21:55 +00:00
Cursor Agent	d29dce0afc	fix: correct player routes and IDs, add API documentation - Vidsrc: uses IMDb ID for both movies and TV shows - Vidlink: uses IMDb ID for movies, TMDB ID for TV shows - Updated routes: /players/vidsrc/{media_type}/{imdb_id} - Updated routes: /players/vidlink/movie/{imdb_id} - New route: /players/vidlink/tv/{tmdb_id} - Added comprehensive OpenAPI documentation for new players	2025-10-04 19:52:39 +00:00
Cursor Agent	39eea67323	fix: remove dead players (twoembed, autoembed) and fix unused variable	2025-10-04 19:43:50 +00:00
Cursor Agent	bd853e7f89	add new players: vidsrc, twoembed, autoembed, vidlink	2025-10-04 19:18:44 +00:00
Cursor Agent	4e6e447e79	fix: remove AllowCredentials from CORS to support wildcard origin	2025-10-04 19:07:22 +00:00
Erno	e734e462c4	Merge branch 'feature/add-streaming-players-v2' into 'main' feat: add RgShows and IframeVideo streaming players See merge request foxixus/neomovies-api!4	2025-09-29 10:12:28 +00:00
Erno	c183861491	Merge branch 'feature/remove-webtorrent-fix-issues' into 'main' Remove WebTorrent player documentation from API docs See merge request foxixus/neomovies-api!3	2025-09-29 09:29:52 +00:00
factory-droid[bot]	63b11eb2ad	Remove WebTorrent player documentation from API docs	2025-09-29 08:12:54 +00:00
factory-droid[bot]	321694df9c	feat: add RgShows and IframeVideo streaming players 🎬 New Streaming Players Added: - RgShows player for movies and TV shows via TMDB ID - IframeVideo player using Kinopoisk ID and IMDB ID - Unified players manager for multiple streaming providers - JSON API endpoints for programmatic access 📡 RgShows Player Features: - Direct movie streaming: /api/v1/players/rgshows/{tmdb_id} - TV show episodes: /api/v1/players/rgshows/{tmdb_id}/{season}/{episode} - HTTP API integration with rgshows.com - 40-second timeout for reliability - Proper error handling and logging 🎯 IframeVideo Player Features: - Two-step authentication process (search + token extraction) - Support for both Kinopoisk and IMDB IDs - HTML iframe parsing for token extraction - Multipart form data for video URL requests - Endpoint: /api/v1/players/iframevideo/{kinopoisk_id}/{imdb_id} 🔧 Technical Implementation: - Clean Go architecture with pkg/players package - StreamResult interface for consistent responses - Proper HTTP headers mimicking browser requests - Comprehensive error handling and logging - RESTful API design following existing patterns 🌐 New API Endpoints: - /api/v1/players/rgshows/{tmdb_id} - RgShows movie player - /api/v1/players/rgshows/{tmdb_id}/{season}/{episode} - RgShows TV player - /api/v1/players/iframevideo/{kinopoisk_id}/{imdb_id} - IframeVideo player - /api/v1/stream/{provider}/{tmdb_id} - JSON API for stream info ✅ Quality Assurance: - All code passes go vet without issues - Proper Go formatting applied - Modular design for easy extension - Built from commit `a31cdf0` 'Merge branch feature/jwt-refresh-and-favorites-fix' Ready for production deployment! 🚀	2025-09-28 16:11:09 +00:00
Erno	a31cdf0f75	Merge branch 'feature/jwt-refresh-and-favorites-fix' into 'main' feat: implement JWT refresh token mechanism and improve auth See merge request foxixus/neomovies-api!1	2025-09-28 11:46:20 +00:00
Erno	dfcd9db295	feat: implement JWT refresh token mechanism and improve auth	2025-09-28 11:46:20 +00:00