max/YouTube-Manager
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

[CHANGE] Rework && adding channel fetching

Browse Source
This commit is contained in:
max
2025-09-06 20:40:46 +02:00
parent d0eca248bb
commit c528ad9bb3
10 changed files with 145 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Manager.App/Components/Dialogs/AccountDialog.razor
View File

@@ -20,11 +20,11 @@
</tr>
<tr>
<td>Account name:</td>
<td>@Client.AccountName</td>
<td>@Client.External.Information.AccountName</td>
</tr>
<tr>
<td>Account handle:</td>
<td>@Client.AccountHandle</td>
<td>@Client.External.Information.AccountHandle</td>
</tr>
<tr>
<td>User agent:</td>
@@ -33,26 +33,26 @@
<tr>
<td>Logged in:</td>
<td style="@($"color: {(Client.ClientState?.LoggedIn ?? false ? "green" : "red")}")">@Client.ClientState?.LoggedIn</td>
<td style="@($"color: {(Client.External.State?.LoggedIn ?? false ? "green" : "red")}")">@Client.External.State?.LoggedIn</td>
</tr>
<tr>
<td>InnerTube API key:</td>
<td>@Client.ClientState?.InnertubeApiKey</td>
<td>@Client.External.State?.InnertubeApiKey</td>
</tr>
<tr>
<td>InnerTube client version:</td>
<td>@Client.ClientState?.InnerTubeClientVersion</td>
<td>@Client.External.State?.InnerTubeClientVersion</td>
</tr>
<tr>
<td>Language:</td>
<td>@Client.ClientState?.InnerTubeContext?.InnerTubeClient?.HLanguage</td>
<td>@Client.External.State?.InnerTubeContext?.InnerTubeClient?.HLanguage</td>
</tr>
</tbody>
</MudSimpleTable>
@if (!string.IsNullOrWhiteSpace(Client.AccountImage))
@*@if (!string.IsNullOrWhiteSpace(Client.AccountImage))
{
<MudImage Src="@Client.AccountImage" Elevation="0" ObjectFit="ObjectFit.Contain"/>
}
}*@
</MudStack>
<MudPaper Elevation="0" Outlined Class="pa-2">

4
Manager.App/Components/Dialogs/AccountDialog.razor.cs
View File

@@ -100,7 +100,7 @@ namespace Manager.App.Components.Dialogs
private bool CanSave()
{
if (Client.ClientState == null)
if (Client.External.State == null)
{
return false;
}
@@ -110,7 +110,7 @@ namespace Manager.App.Components.Dialogs
return false;
}
return Client.SapisidCookie != null && Client.ClientState.LoggedIn;
return Client.SapisidCookie != null && Client.External.State.LoggedIn;
}
private async Task ValidateAccount()

31
Manager.App/Services/System/ClientManager.cs
View File

@@ -1,6 +1,3 @@
using System.Net;
using DotBased.Monads;
using Manager.Data.Entities.LibraryContext;
using Manager.YouTube;
namespace Manager.App.Services.System;
@@ -20,32 +17,4 @@ public class ClientManager : BackgroundService
{
// Clear up
}
public async Task<Result<YouTubeClient>> LoadClient(ClientAccountEntity accountEntity)
{
if (_cancellationToken.IsCancellationRequested)
{
return ResultError.Fail("Service is shutting down.");
}
var container = new CookieContainer();
if (accountEntity.HttpCookies.Count != 0)
{
var cookieColl = new CookieCollection();
foreach (var cookieEntity in accountEntity.HttpCookies)
{
cookieColl.Add(new Cookie(cookieEntity.Name, cookieEntity.Value, cookieEntity.Domain));
}
container.Add(cookieColl);
}
var ytClient = new YouTubeClient();
//ytClient.CookieContainer = container;
ytClient.UserAgent = accountEntity.UserAgent;
await ytClient.BuildClientAsync();
return ytClient;
}
}

2
Manager.Data/Entities/LibraryContext/ChannelEntity.cs
View File

@@ -8,6 +8,8 @@ public class ChannelEntity : DateTimeBase
public required string Id { get; set; }
[MaxLength(DataConstants.DbContext.DefaultDbStringSize)]
public string? Name { get; set; }
[MaxLength(DataConstants.DbContext.DefaultDbStringSize)]
public string? Handle { get; set; }
[MaxLength(DataConstants.DbContext.DefaultDbDescriptionStringSize)]
public string? Description { get; set; }
public DateTime JoinedDate { get; set; }

10
Manager.YouTube/Models/AccountMenuInfo.cs
View File

@@ -1,10 +0,0 @@
namespace Manager.YouTube.Models;
public class AccountMenuInfo
{
public string? AccountId { get; set; }
public string? AccountHandle { get; set; }
public string? ImageUrl { get; set; }
public int ImageWidth { get; set; }
public int ImageHeight { get; set; }
}

35
Manager.YouTube/Models/ClientExternalData.cs Normal file
View File

@@ -0,0 +1,35 @@
using Manager.YouTube.Models.Innertube;
namespace Manager.YouTube.Models;
public class ClientExternalData
{
public ClientState? State { get; set; }
public ClientInformation Information { get; set; } = new();
public List<string> DatasyncIds { get; set; } = [];
public string GetDatasyncId()
{
if (!string.IsNullOrWhiteSpace(State?.WebPlayerContextConfig?.WebPlayerContext?.DatasyncId))
{
return State.WebPlayerContextConfig.WebPlayerContext.DatasyncId;
}
var tempDatasyncId = "";
foreach (var datasyncId in DatasyncIds)
{
var split = datasyncId.Split("||", StringSplitOptions.RemoveEmptyEntries);
switch (split.Length)
{
case 0:
case 2 when tempDatasyncId.Equals(split[1]):
continue;
case 2:
tempDatasyncId = split[1];
break;
}
}
return tempDatasyncId;
}
}

8
Manager.YouTube/Models/ClientInformation.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace Manager.YouTube.Models;
public class ClientInformation
{
public string? AccountName { get; set; }
public string? AccountHandle { get; set; }
public string? Description { get; set; }
}

10
Manager.YouTube/Models/Innertube/ChannelFetch.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace Manager.YouTube.Models.Innertube;
public class ChannelFetch
{
public bool NoIndex { get; set; }
public bool Unlisted { get; set; }
public bool FamilyFriendly { get; set; }
public List<string> AvailableCountries { get; set; } = [];
}

94
Manager.YouTube/NetworkService.cs
View File

@@ -1,10 +1,8 @@
using System.Net;
using System.Net.Mime;
using System.Text;
using System.Text.Json;
using System.Text.Json.Nodes;
using DotBased.Monads;
using Manager.YouTube.Models;
using Manager.YouTube.Models.Innertube;
using Manager.YouTube.Parsers;
using Manager.YouTube.Util;
@@ -59,7 +57,7 @@ public static class NetworkService
public static async Task<Result<string[]>> GetDatasyncIds(YouTubeClient client)
{
if (client.ClientState is not { LoggedIn: true } || client.CookieContainer.Count == 0)
if (client.External.State is not { LoggedIn: true } || client.CookieContainer.Count == 0)
{
return ResultError.Fail("Client is not logged in, requires logged in client for this endpoint (/getDatasyncIdsEndpoint).");
}
@@ -98,9 +96,9 @@ public static class NetworkService
return ResultError.Fail("Failed to get datasyncIds!");
}
public static async Task<Result<AccountMenuInfo>> GetCurrentAccountInfoAsync(YouTubeClient client)
public static async Task<Result<string>> GetCurrentAccountIdAsync(YouTubeClient client)
{
if (client.ClientState is not { LoggedIn: true })
if (client.External.State is not { LoggedIn: true })
{
return ResultError.Fail("Client not logged in!");
}
@@ -115,12 +113,12 @@ public static class NetworkService
if (client.SapisidCookie != null)
{
httpRequest.Headers.Authorization = AuthenticationUtilities.GetSapisidHashHeader(client.ClientState.WebPlayerContextConfig?.WebPlayerContext?.DatasyncId ?? "", client.SapisidCookie.Value, Origin);
httpRequest.Headers.Authorization = AuthenticationUtilities.GetSapisidHashHeader(client.External.GetDatasyncId(), client.SapisidCookie.Value, Origin);
}
var serializedContext = JsonSerializer.SerializeToNode(client.ClientState.InnerTubeContext);
var contextJson = new JsonObject { { "context", serializedContext } };
httpRequest.Content = new StringContent(contextJson.ToJsonString(), Encoding.UTF8, MediaTypeNames.Application.Json);
var serializedContext = JsonSerializer.SerializeToNode(client.External.State.InnerTubeContext);
var payload = new JsonObject { { "context", serializedContext } };
httpRequest.Content = new StringContent(payload.ToJsonString(), Encoding.UTF8, MediaTypeNames.Application.Json);
var http = client.GetHttpClient();
if (http == null)
@@ -139,41 +137,75 @@ public static class NetworkService
var json = await response.Content.ReadAsStringAsync();
var jsonDocument = JsonDocument.Parse(json);
var activeAccountHeader = jsonDocument.RootElement
var matRuns = jsonDocument.RootElement
.GetProperty("actions")[0]
.GetProperty("openPopupAction")
.GetProperty("popup")
.GetProperty("multiPageMenuRenderer")
.GetProperty("header")
.GetProperty("activeAccountHeaderRenderer");
var matRuns = activeAccountHeader
.GetProperty("activeAccountHeaderRenderer")
.GetProperty("manageAccountTitle")
.GetProperty("runs");
var accountPhotos = activeAccountHeader
.GetProperty("accountPhoto")
.GetProperty("thumbnails");
var accInfo = new AccountMenuInfo();
var highestImage = accountPhotos.EnumerateArray().OrderBy(x => x.GetProperty("width").Deserialize<int>())
.FirstOrDefault();
accInfo.ImageUrl = highestImage.GetProperty("url").Deserialize<string>();
accInfo.ImageWidth = highestImage.GetProperty("width").Deserialize<int>();
accInfo.ImageHeight = highestImage.GetProperty("height").Deserialize<int>();
foreach (var run in matRuns.EnumerateArray())
var firstElement = matRuns.EnumerateArray().FirstOrDefault();
var id = firstElement.GetProperty("navigationEndpoint").GetProperty("browseEndpoint").GetProperty("browseId").GetString();
if (string.IsNullOrWhiteSpace(id))
{
var browseEndpoint = run.GetProperty("navigationEndpoint").GetProperty("browseEndpoint");
accInfo.AccountId = browseEndpoint.GetProperty("browseId").GetString();
accInfo.AccountHandle = browseEndpoint.GetProperty("canonicalBaseUrl").GetString()?.Replace("/", "");
return ResultError.Fail("Unable to get account id!");
}
return accInfo;
return id;
}
catch (Exception e)
{
return ResultError.Error(e);
}
}
public static async Task<Result> GetChannelAsync(string channelId, YouTubeClient client)
{
if (client.External.State == null)
{
return ResultError.Fail("No client state!");
}
if (string.IsNullOrWhiteSpace(channelId))
{
return ResultError.Fail("Channel id is empty!");
}
var httpClient = client.GetHttpClient();
if (httpClient == null)
{
return ResultError.Fail("Unable to get http client!");
}
var serializedContext = JsonSerializer.SerializeToNode(client.External.State.InnerTubeContext);
var payload = new JsonObject { { "context", serializedContext }, { "browseId", channelId } };
var requestMessage = new HttpRequestMessage
{
Method = HttpMethod.Post,
RequestUri = new Uri($"{Origin}/youtubei/v1/browse?key={client.External.State.InnertubeApiKey}"),
Content = new StringContent(payload.ToJsonString(), Encoding.UTF8, MediaTypeNames.Application.Json)
};
requestMessage.Headers.UserAgent.ParseAdd(client.UserAgent);
requestMessage.Headers.Add("Origin", Origin);
if (client.SapisidCookie != null)
{
requestMessage.Headers.Authorization = AuthenticationUtilities.GetSapisidHashHeader(client.External.GetDatasyncId(), client.SapisidCookie.Value, Origin);
}
var response = await httpClient.SendAsync(requestMessage);
if (!response.IsSuccessStatusCode)
{
var responseResult = await response.Content.ReadAsStringAsync();
return ResultError.Fail(responseResult);
}
var jsonContent = await response.Content.ReadAsStringAsync();
return Result.Fail(ResultError.Fail("Not implemented!"));
}
}

35
Manager.YouTube/YouTubeClient.cs
View File

@@ -1,19 +1,15 @@
using System.Net;
using DotBased.Monads;
using Manager.YouTube.Models.Innertube;
using Manager.YouTube.Models;
namespace Manager.YouTube;
public sealed class YouTubeClient : IDisposable
{
public string Id { get; private set; } = "";
public string AccountName => ClientState?.UserAccountName ?? "";
public string? AccountHandle { get; set; }
public string? AccountImage { get; set; }
public string? UserAgent { get; set; }
public CookieContainer CookieContainer { get; } = new() { PerDomainCapacity = 50 };
public ClientState? ClientState { get; private set; }
public List<string> DatasyncIds { get; set; } = [];
public ClientExternalData External { get; set; } = new();
public Cookie? SapisidCookie => CookieContainer.GetAllCookies()["SAPISID"];
public HttpClient? GetHttpClient() => _httpClient;
@@ -40,17 +36,17 @@ public sealed class YouTubeClient : IDisposable
public async Task<Result> BuildClientAsync()
{
if (ClientState == null || !ClientState.LoggedIn)
if (External.State is not { LoggedIn: true })
{
var state = await NetworkService.GetClientStateAsync(this);
if (!state.IsSuccess)
{
return state;
}
ClientState = state.Value;
External.State = state.Value;
}
if (string.IsNullOrWhiteSpace(ClientState.WebPlayerContextConfig?.WebPlayerContext?.DatasyncId))
if (string.IsNullOrWhiteSpace(External.State.WebPlayerContextConfig?.WebPlayerContext?.DatasyncId))
{
var datasyncResult = await NetworkService.GetDatasyncIds(this);
if (!datasyncResult.IsSuccess)
@@ -60,22 +56,25 @@ public sealed class YouTubeClient : IDisposable
foreach (var id in datasyncResult.Value)
{
if (DatasyncIds.Contains(id))
if (External.DatasyncIds.Contains(id))
continue;
DatasyncIds.Add(id);
External.DatasyncIds.Add(id);
}
}
var accountInfoResult = await NetworkService.GetCurrentAccountInfoAsync(this);
if (!accountInfoResult.IsSuccess)
if (string.IsNullOrWhiteSpace(Id))
{
return accountInfoResult;
}
var accountInfoResult = await NetworkService.GetCurrentAccountIdAsync(this);
if (!accountInfoResult.IsSuccess)
{
return accountInfoResult;
}
Id = accountInfoResult.Value.AccountId ?? "";
AccountHandle = accountInfoResult.Value.AccountHandle;
AccountImage = accountInfoResult.Value.ImageUrl;
Id = accountInfoResult.Value;
}
var accountInfo = await NetworkService.GetChannelAsync(Id, this);
return Result.Success();
}