Skip to content

Commit

Permalink
Cosmetic changes
Browse files Browse the repository at this point in the history
  • Loading branch information
nirvana-7777 committed Nov 21, 2023
1 parent 0a73117 commit e5f3a00
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 84 deletions.
61 changes: 54 additions & 7 deletions src/Globals.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ static const std::string EON_USER_AGENT = std::string("Kodi/")
static const std::string GLOBAL_URL = "global.united.cloud/";
static const std::string BROKER_URL = "https://broker." + GLOBAL_URL;
static const std::string PLAYER = "m3u8";

static const std::string CLIENT_ID_WEB = "b8d9ade4-1093-46a7-a4f7-0e47be463c10";
static const std::string CLIENT_SECRET_WEB = "1w4dmww87x1e9l89essqvc81pidrqsa0li1rva23";

static const std::string CLIENT_ID_ATV = "5a3e24b8-70cd-4958-b716-af9ce053e594";
static const std::string CLIENT_SECRET_ATV = "aazy6orsi9elhhs17e47lfb4palgszw6igf4y26z";

static const std::string SS_DOMAIN = "TBA";
static const std::string SS_USER = "webscuser";
static const std::string SS_SECRET = "k4md93!k334f3";
Expand All @@ -38,3 +31,57 @@ static const std::string CONN_TYPE_WIFI = "WI_FI";
static const std::string CONN_TYPE_ETHERNET= "ETHERNET";
static const std::string CONN_TYPE_MOBILE = "MOBILE";
static const std::string CONN_TYPE_BROWSER = "BROWSER";

struct EonParameter
{
std::string api_prefix;
std::string api_selector;
std::string device_type;
std::string device_name;
std::string device_model;
std::string device_platform;
std::string device_mac;
std::string client_sw_version;
std::string client_sw_build;
std::string system_sw;
std::string system_version;
std::string user_agent;
std::string client_id;
std::string client_secret;
};

static const EonParameter EonParameters[2] = {{
//Web Client
"web",
"be",
"web_linux_chrome",
"",
"Chrome 116",
"web",
"",
"",
"",
"Linux",
"x86_64",
"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
"b8d9ade4-1093-46a7-a4f7-0e47be463c10",
"1w4dmww87x1e9l89essqvc81pidrqsa0li1rva23"
},
{
//Android TV
"android-tv",
"af31",
"Android 11",
"Android TV 30",
"SHIELD Android TV",
"android_tv",
"",
"8.1.3",
"8.1.35906",
"Android",
"11",
"Mozilla/5.0 (Linux; Android 11; SHIELD Android TV Build/RQ1A.210105.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/114.0.5735.196 Mobile Safari/537.36; XDKAndroidWebView/3.0.1/XDKWebView NVIDIA NVIDIA/mdarcy/mdarcy:11/RQ1A.210105.003/7825230_3167.5736:user/release-keys NVIDIA AndroidTV 1.00A_ATV SHIELD Android TV Android/11 ExoPlayer ((1.00A_ATV::1.14.1::androidtv::)",
"5a3e24b8-70cd-4958-b716-af9ce053e594",
"aazy6orsi9elhhs17e47lfb4palgszw6igf4y26z"
}
};
50 changes: 25 additions & 25 deletions src/PVREon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ bool CPVREon::GetCDNInfo()

const rapidjson::Value& baseApi = cdnItem["domains"]["baseApi"];

cdn.baseApi = Utils::JsonStringOrEmpty(baseApi, EonParameters[m_params].api_selector.c_str());
cdn.baseApi = Utils::JsonStringOrEmpty(baseApi, EonParameters[m_platform].api_selector.c_str());
m_cdns.emplace_back(cdn);
}

Expand Down Expand Up @@ -311,25 +311,25 @@ bool CPVREon::GetDeviceFromSerial()
{
std::string postData;

if (m_settings->GetPlatform() == PLATFORM_ANDROIDTV) {
postData = "{\"deviceName\":\"" + EonParameters[m_params].device_name +
"\",\"deviceType\":\"" + EonParameters[m_params].device_type +
"\",\"modelName\":\"" + EonParameters[m_params].device_model +
"\",\"platform\":\"" + EonParameters[m_params].device_platform +
if (m_platform == PLATFORM_ANDROIDTV) {
postData = "{\"deviceName\":\"" + EonParameters[m_platform].device_name +
"\",\"deviceType\":\"" + EonParameters[m_platform].device_type +
"\",\"modelName\":\"" + EonParameters[m_platform].device_model +
"\",\"platform\":\"" + EonParameters[m_platform].device_platform +
"\",\"serial\":\"" + m_device_serial +
"\",\"clientSwVersion\":\"" + EonParameters[m_params].client_sw_version +
"\",\"clientSwBuild\":\"" + EonParameters[m_params].client_sw_build +
"\",\"systemSwVersion\":{\"name\":\"" + EonParameters[m_params].system_sw +
"\",\"version\":\"" + EonParameters[m_params].system_version +
"\",\"clientSwVersion\":\"" + EonParameters[m_platform].client_sw_version +
"\",\"clientSwBuild\":\"" + EonParameters[m_platform].client_sw_build +
"\",\"systemSwVersion\":{\"name\":\"" + EonParameters[m_platform].system_sw +
"\",\"version\":\"" + EonParameters[m_platform].system_version +
"\"},\"fcmToken\":\"\"}";
//TODO: implement parameter fcmToken...
} else {
postData = "{\"deviceName\":\"\",\"deviceType\":\"" + EonParameters[m_params].device_type +
"\",\"modelName\":\"" + EonParameters[m_params].device_model +
"\",\"platform\":\"" + EonParameters[m_params].device_platform +
postData = "{\"deviceName\":\"\",\"deviceType\":\"" + EonParameters[m_platform].device_type +
"\",\"modelName\":\"" + EonParameters[m_platform].device_model +
"\",\"platform\":\"" + EonParameters[m_platform].device_platform +
"\",\"serial\":\"" + m_device_serial +
"\",\"clientSwVersion\":\"\",\"systemSwVersion\":{\"name\":\"" + EonParameters[m_params].system_sw +
"\",\"version\":\"" + EonParameters[m_params].system_version + "\"}}";
"\",\"clientSwVersion\":\"\",\"systemSwVersion\":{\"name\":\"" + EonParameters[m_platform].system_sw +
"\",\"version\":\"" + EonParameters[m_platform].system_version + "\"}}";
}

std::string url = m_api + "v1/devices";
Expand Down Expand Up @@ -519,7 +519,7 @@ CPVREon::CPVREon() :
m_settings->Load();
m_httpClient = new HttpClient(m_settings);

m_params = m_settings->GetPlatform();
m_platform = m_settings->GetPlatform();
m_support_web = "API_NOT_SET_YET";
m_httpClient->SetSupportApi(m_support_web);

Expand All @@ -529,11 +529,11 @@ CPVREon::CPVREon() :
std::string cdn_identifier = GetBrandIdentifier();
kodi::Log(ADDON_LOG_DEBUG, "CDN Identifier: %s", cdn_identifier.c_str());
std::string baseApi = GetBaseApi(cdn_identifier);
m_api = "https://api-" + EonParameters[m_params].api_prefix + "." + baseApi + "/";
m_images_api = "https://images-" + EonParameters[m_params].api_prefix + "." + baseApi + "/";
m_api = "https://api-" + EonParameters[m_platform].api_prefix + "." + baseApi + "/";
m_images_api = "https://images-" + EonParameters[m_platform].api_prefix + "." + baseApi + "/";
} else {
m_api = "https://api-" + EonParameters[m_params].api_prefix + "." + GLOBAL_URL;
m_images_api = "https://images-" + EonParameters[m_params].api_prefix + "." + GLOBAL_URL;
m_api = "https://api-" + EonParameters[m_platform].api_prefix + "." + GLOBAL_URL;
m_images_api = "https://images-" + EonParameters[m_platform].api_prefix + "." + GLOBAL_URL;
}
m_httpClient->SetApi(m_api);
kodi::Log(ADDON_LOG_DEBUG, "API set to: %s", m_api.c_str());
Expand Down Expand Up @@ -790,7 +790,7 @@ void CPVREon::SetStreamProperties(std::vector<kodi::addon::PVRStreamProperty>& p
properties.emplace_back("inputstream.adaptive.stream_selection_type", "fixed-res");
properties.emplace_back("inputstream.adaptive.chooser_resolution_max", "4K");
//properties.emplace_back("inputstream.adaptive.stream_selection_type", "fixed-res");
properties.emplace_back("inputstream.adaptive.manifest_headers", "User-Agent=" + EonParameters[m_params].user_agent);
properties.emplace_back("inputstream.adaptive.manifest_headers", "User-Agent=" + EonParameters[m_platform].user_agent);
// properties.emplace_back("inputstream.adaptive.manifest_update_parameter", "full");
} else if (inputstream == INPUTSTREAM_FFMPEGDIRECT)
{
Expand Down Expand Up @@ -1078,7 +1078,7 @@ PVR_ERROR CPVREon::GetStreamProperties(

std::string plain_aes;

if (m_settings->GetPlatform() == PLATFORM_ANDROIDTV) {
if (m_platform == PLATFORM_ANDROIDTV) {
plain_aes = "channel=" + channel.publishingPoints[0].publishingPoint + ";" +
"stream=" + streaming_profile + ";" +
"sp=" + m_service_provider + ";" +
Expand Down Expand Up @@ -1136,14 +1136,14 @@ PVR_ERROR CPVREon::GetStreamProperties(
std::string enc_url = "https://" + currentServer.hostname +
"/stream?i=" + urlsafeencode(base64_encode(iv_str.c_str(), iv_str.length())) +
"&a=" + urlsafeencode(base64_encode(enc_str.c_str(), enc_str.length()));
if (m_settings->GetPlatform() == PLATFORM_ANDROIDTV) {
if (m_platform == PLATFORM_ANDROIDTV) {
enc_url = enc_url + "&lang=eng";
}
enc_url = enc_url + "&sp=" + m_service_provider +
"&u=" + m_settings->GetEonStreamUser() +
"&player=" + PLAYER +
"&session=" + m_session_id;
if (m_settings->GetPlatform() != PLATFORM_ANDROIDTV) {
if (m_platform != PLATFORM_ANDROIDTV) {
enc_url = enc_url + "&sig=" + channel.sig;
}

Expand Down Expand Up @@ -1312,7 +1312,7 @@ bool CPVREon::GetServer(bool isLive, EonServer& myServer)
servers = m_timeshift_servers;
}
int target_server = 2;
if (m_settings->GetPlatform() == PLATFORM_ANDROIDTV) {
if (m_platform == PLATFORM_ANDROIDTV) {
target_server = 3;
}
int count = 0;
Expand Down
50 changes: 1 addition & 49 deletions src/PVREon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,54 +106,6 @@ struct EonCDN
bool isDefault;
};

struct EonParameter
{
std::string api_prefix;
std::string api_selector;
std::string device_type;
std::string device_name;
std::string device_model;
std::string device_platform;
std::string device_mac;
std::string client_sw_version;
std::string client_sw_build;
std::string system_sw;
std::string system_version;
std::string user_agent;
};

EonParameter EonParameters[2] = {{
//Web Client
"web",
"be",
"web_linux_chrome",
"",
"Chrome 116",
"web",
"",
"",
"",
"Linux",
"x86_64",
"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
},
{
//Android TV
"android-tv",
"af31",
"Android 11",
"Android TV 30",
"SHIELD Android TV",
"android_tv",
"",
"8.1.3",
"8.1.35906",
"Android",
"11",
"Mozilla/5.0 (Linux; Android 11; SHIELD Android TV Build/RQ1A.210105.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/114.0.5735.196 Mobile Safari/537.36; XDKAndroidWebView/3.0.1/XDKWebView NVIDIA NVIDIA/mdarcy/mdarcy:11/RQ1A.210105.003/7825230_3167.5736:user/release-keys NVIDIA AndroidTV 1.00A_ATV SHIELD Android TV Android/11 ExoPlayer ((1.00A_ATV::1.14.1::androidtv::)"
}
};

class ATTR_DLL_LOCAL CPVREon : public kodi::addon::CAddonBase,
public kodi::addon::CInstancePVRClient
{
Expand Down Expand Up @@ -246,7 +198,7 @@ class ATTR_DLL_LOCAL CPVREon : public kodi::addon::CAddonBase,

std::string m_api;
std::string m_images_api;
int m_params;
int m_platform;

// std::string m_ss_refresh;
// int m_active_profile_id;
Expand Down
9 changes: 6 additions & 3 deletions src/http/HttpClient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ bool HttpClient::RefreshGenericToken()
std::string url = BROKER_URL + "oauth/token?grant_type=client_credentials";
std::string postData = "{}";

std::string basic_token = client_id + ":" + client_secret;
std::string basic_token = EonParameters[m_platform].client_id + ":" + EonParameters[m_platform].client_secret;
// Copy input data to a buffer that will be encrypted
// Botan::secure_vector<uint8_t> bt(basic_token.data(), basic_token.data() + basic_token.length());
// std::string test1 = base64_encode(basic_token.c_str(), basic_token.length());
Expand Down Expand Up @@ -187,7 +187,7 @@ bool HttpClient::RefreshToken()

int statusCode;

std::string basic_token = client_id + ":" + client_secret;
std::string basic_token = EonParameters[m_platform].client_id + ":" + EonParameters[m_platform].client_secret;
curl_auth.AddHeader("Authorization", "Basic " + base64_encode(basic_token.c_str(), basic_token.length()));

std::string content_auth = HttpRequestToCurl(curl_auth, "POST", url, postData, statusCode);
Expand Down Expand Up @@ -222,13 +222,16 @@ bool HttpClient::RefreshToken()
HttpClient::HttpClient(CSettings* settings):
m_settings(settings)
{
m_platform = m_settings->GetPlatform();
/*
if (m_settings->GetPlatform() == 1) {
client_id = CLIENT_ID_ATV;
client_secret = CLIENT_SECRET_ATV;
} else {
client_id = CLIENT_ID_WEB;
client_secret = CLIENT_SECRET_WEB;
}
*/
}

HttpClient::~HttpClient()
Expand Down Expand Up @@ -331,7 +334,7 @@ std::string HttpClient::HttpRequest(const std::string& action, const std::string
if (!access_token.empty()) {
curl.AddHeader("Authorization", "bearer " + access_token);
} else {
std::string basic_token = client_id + ":" + client_secret;
std::string basic_token = EonParameters[m_platform].client_id + ":" + EonParameters[m_platform].client_secret;
curl.AddHeader("Authorization", "Basic " + base64_encode(basic_token.c_str(), basic_token.length()));
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/http/HttpClient.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ class HttpClient
std::string m_uuid;
std::string m_api;
std::string m_supportApi;
int m_platform;
/*
std::string client_id;
std::string client_secret;
*/
CSettings* m_settings;
HttpStatusCodeHandler *m_statusCodeHandler = nullptr;
};
Expand Down

0 comments on commit e5f3a00

Please sign in to comment.