api_proxy refactored

backend/src/api/api_utils.rs

@@ -12,9 +12,9 @@ use crate::api::model::streams::provider_stream_factory::{create_provider_stream
 use crate::api::model::streams::shared_stream_manager::SharedStreamManager;
 use crate::api::model::streams::throttled_stream::ThrottledStream;
 use crate::auth::Claims;
-use crate::model::{ConfigTarget, ProxyUserCredentials, UserConnectionPermission};
+use crate::model::{ConfigTarget, ProxyUserCredentials};
 use crate::model::{ConfigInput, InputFetchMethod};
-use shared::model::{PlaylistEntry, PlaylistItemType, TargetType, XtreamCluster};
+use shared::model::{PlaylistEntry, PlaylistItemType, TargetType, UserConnectionPermission, XtreamCluster};
 use crate::tools::atomic_once_flag::AtomicOnceFlag;
 use crate::tools::lru_cache::LRUResourceCache;
 use shared::utils::{DASH_EXT, HLS_EXT};

backend/src/api/endpoints/api_playlist_utils.rs

@@ -1,6 +1,6 @@
-use crate::model::{Config, ConfigInput, ConfigTarget, InputType, TargetType};
+use crate::model::{Config, ConfigInput, ConfigTarget, InputType};
 use crate::model::{M3uPlaylistItem, PlaylistGroup};
-use shared::model::{PlaylistItemType, XtreamCluster};
+use shared::model::{PlaylistItemType, TargetType, XtreamCluster};
 use crate::repository::{m3u_repository, xtream_repository};
 use crate::utils::{m3u, xtream};
 use axum::response::IntoResponse;

backend/src/api/endpoints/hdhomerun_api.rs

@@ -1,9 +1,9 @@
 use crate::api::model::app_state::HdHomerunAppState;
 use crate::auth::AuthBasic;
-use crate::model::ProxyUserCredentials;
-use crate::model::{Config, ConfigTarget, TargetType};
+use crate::model::{ConfigTarget, ProxyUserCredentials};
+use crate::model::{Config};
 use crate::model::{M3uPlaylistItem, XtreamPlaylistItem};
-use shared::model::{PlaylistItemType, XtreamCluster};
+use shared::model::{PlaylistItemType, TargetType, XtreamCluster};
 use crate::processing::parser::xtream::get_xtream_url;
 use crate::repository::m3u_playlist_iterator::M3uPlaylistIterator;
 use crate::repository::xtream_playlist_iterator::XtreamPlaylistIterator;

backend/src/api/endpoints/hls_api.rs

@@ -2,9 +2,9 @@ use crate::api::api_utils::{force_provider_stream_response, get_stream_alternati
 use crate::api::api_utils::{try_option_bad_request};
 use crate::api::model::app_state::AppState;
 use crate::api::model::streams::provider_stream::{create_custom_video_stream_response, CustomVideoStreamType};
-use crate::model::{ProxyUserCredentials, UserConnectionPermission};
+use crate::model::{ProxyUserCredentials};
 use crate::model::ConfigInput;
-use shared::model::{PlaylistItemType, XtreamCluster};
+use shared::model::{PlaylistItemType, UserConnectionPermission, XtreamCluster};
 use crate::processing::parser::hls::{get_hls_session_token_and_url_from_token, rewrite_hls, RewriteHlsProps};
 use shared::utils::HLS_EXT;
 use crate::utils::request;

backend/src/api/endpoints/m3u_api.rs

@@ -4,9 +4,7 @@ use crate::api::endpoints::xtream_api::{ApiStreamContext, ApiStreamRequest};
 use crate::api::model::app_state::AppState;
 use crate::api::model::request::UserApiRequest;
 use crate::api::model::streams::provider_stream::{create_custom_video_stream_response, CustomVideoStreamType};
-use crate::model::TargetType;
-use crate::model::UserConnectionPermission;
-use shared::model::{FieldGetAccessor, PlaylistEntry, PlaylistItemType, XtreamCluster};
+use shared::model::{FieldGetAccessor, PlaylistEntry, PlaylistItemType, TargetType, UserConnectionPermission, XtreamCluster};
 use crate::repository::m3u_repository::{m3u_get_item_for_stream_id, m3u_load_rewrite_playlist};
 use crate::repository::storage_const;
 use crate::utils::request::{extract_extension_from_url, sanitize_sensitive_info};

backend/src/api/endpoints/user_api.rs

@@ -1,8 +1,8 @@
 use crate::api::api_utils::{get_user_target_by_username, get_username_from_auth_header};
 use crate::api::model::app_state::AppState;
 use crate::auth::validator_user;
-use crate::model::{Config, ConfigTarget, TargetType};
-use shared::model::XtreamCluster;
+use crate::model::{Config, ConfigTarget};
+use shared::model::{TargetType, XtreamCluster};
 use crate::model::PlaylistBouquetDto;
 use crate::model::PlaylistXtreamCategory;
 use crate::repository::user_repository::{load_user_bouquet_as_json, save_user_bouquet};

backend/src/api/endpoints/v1_api.rs

@@ -7,9 +7,9 @@ use crate::api::model::request::{PlaylistRequest, PlaylistRequestType};
 use crate::auth::create_access_token;
 use crate::auth::validator_admin;
 use shared::error::TuliproxError;
-use crate::model::StatusCheck;
+use crate::model::{ConfigTarget, StatusCheck};
 use crate::model::XtreamPlaylistItem;
-use crate::model::{Config, ConfigDto, ConfigInput, ConfigInputOptions, ConfigSource, ConfigTarget, InputType};
+use crate::model::{Config, ConfigDto, ConfigInput, ConfigInputOptions, ConfigSource,  InputType};
 use crate::model::{ApiProxyConfig, ApiProxyServerInfo, ProxyUserCredentials, TargetUser};
 use crate::processing::processor::playlist;
 use crate::repository::user_repository::store_api_user;

backend/src/api/endpoints/xmltv_api.rs

@@ -12,8 +12,8 @@ use std::sync::Arc;
 use crate::api::api_utils::{get_user_target, serve_file};
 use crate::api::model::app_state::AppState;
 use crate::api::model::request::UserApiRequest;
-use crate::model::ProxyUserCredentials;
-use crate::model::{Config, ConfigTarget, TargetOutput};
+use crate::model::{ConfigTarget, ProxyUserCredentials, TargetOutput};
+use crate::model::{Config};
 use crate::repository::m3u_repository::m3u_get_epg_file_path;
 use crate::repository::storage::get_target_storage_path;
 use crate::repository::xtream_repository::{xtream_get_epg_file_path, xtream_get_storage_path};

backend/src/api/endpoints/xtream_api.rs

@@ -9,10 +9,9 @@ use crate::api::model::app_state::AppState;
 use crate::api::model::request::UserApiRequest;
 use crate::api::model::streams::provider_stream::{create_custom_video_stream_response, CustomVideoStreamType};
 use crate::api::model::xtream::XtreamAuthorizationResponse;
-use crate::model::TargetType;
-use crate::model::{get_backdrop_path_value, XtreamPlaylistItem};
-use crate::model::{Config, ConfigInput, ConfigTarget};
-use crate::model::{ProxyType, ProxyUserCredentials, UserConnectionPermission};
+use crate::model::{get_backdrop_path_value, ConfigTarget, XtreamPlaylistItem};
+use crate::model::{Config, ConfigInput};
+use crate::model::{ProxyUserCredentials};
 use crate::repository::playlist_repository::get_target_id_mapping;
 use crate::repository::storage::{get_target_storage_path};
 use crate::repository::{storage_const, user_repository, xtream_repository};
@@ -41,7 +40,7 @@ use std::fmt::{Display, Formatter};
 use std::path::Path;
 use std::str::FromStr;
 use std::sync::Arc;
-use shared::model::{PlaylistItemType, XtreamCluster, FieldGetAccessor, PlaylistEntry};
+use shared::model::{PlaylistItemType, XtreamCluster, FieldGetAccessor, PlaylistEntry, TargetType, UserConnectionPermission, ProxyType};
 
 #[derive(Serialize, Deserialize, Debug, Copy, Clone, Eq, PartialEq)]
 pub enum ApiStreamContext {

backend/src/api/model/active_user_manager.rs

@@ -1,5 +1,5 @@
 use crate::model::Config;
-use crate::model::{ProxyUserCredentials, UserConnectionPermission};
+use crate::model::{ProxyUserCredentials};
 use crate::utils::request::sanitize_sensitive_info;
 use shared::utils::{current_time_secs, default_grace_period_millis, default_grace_period_timeout_secs};
 use jsonwebtoken::get_current_timestamp;
@@ -8,6 +8,7 @@ use std::collections::HashMap;
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::Arc;
 use tokio::sync::RwLock;
+use shared::model::UserConnectionPermission;
 
 const USER_CON_TTL: u64 = 10_800;  // 3 hours
 const USER_SESSION_LIMIT: usize = 50;

backend/src/api/model/app_state.rs

@@ -1,10 +1,11 @@
 use tokio::sync::{Mutex};
 use std::sync::Arc;
+use shared::model::UserConnectionPermission;
 use crate::api::model::active_provider_manager::ActiveProviderManager;
 use crate::api::model::active_user_manager::ActiveUserManager;
 use crate::api::model::download::DownloadQueue;
 use crate::api::model::streams::shared_stream_manager::SharedStreamManager;
-use crate::model::{Config, UserConnectionPermission, HdHomeRunDeviceConfig};
+use crate::model::{Config, HdHomeRunDeviceConfig};
 use crate::tools::lru_cache::LRUResourceCache;
 
 #[derive(Clone)]

backend/src/api/model/config.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 use shared::model::ProcessingOrder;
-use crate::model::{ApiProxyConfig, ConfigApi, InputType, LogConfig, MessagingConfig, ReverseProxyConfig, ScheduleConfig, VideoConfig, ConfigRename, ConfigSort, ConfigTargetOptions, TargetOutput, WebUiConfig, ProxyConfig, IpCheckConfig};
+use crate::model::{ApiProxyConfig, ConfigApi, InputType, LogConfig, MessagingConfig, ReverseProxyConfig, ScheduleConfig, VideoConfig, ConfigSort, WebUiConfig, ProxyConfig, IpCheckConfig, ConfigTargetOptions, TargetOutput, ConfigRename};
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
 pub struct ServerInputConfig {

backend/src/api/model/xtream.rs

@@ -1,6 +1,7 @@
-use crate::model::{ApiProxyServerInfo, ProxyUserCredentials, ProxyUserStatus};
+use crate::model::{ApiProxyServerInfo, ProxyUserCredentials};
 use chrono::{Duration, Local};
 use serde::{Deserialize, Serialize};
+use shared::model::ProxyUserStatus;
 use shared::utils::CONSTANTS;
 
 #[derive(Serialize, Deserialize, Clone)]