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

[CHANGE] Reworked parsers/converters. Decipher operation from script do not work!

Browse Source
This commit is contained in:
max
2025-10-24 00:23:09 +02:00
parent de28591d24
commit a84195aefa
18 changed files with 285 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Manager.YouTube/Models/Innertube/ColorInfo.cs
View File

@@ -1,8 +1,13 @@
using System.Text.Json.Serialization;
namespace Manager.YouTube.Models.Innertube;
public class ColorInfo
{
[JsonPropertyName("primaries")]
public string Primaries { get; set; } = "";
[JsonPropertyName("transferCharacteristics")]
public string TransferCharacteristics { get; set; } = "";
[JsonPropertyName("matrixCoefficients")]
public string MatrixCoefficients { get; set; } = "";
}

4
Manager.YouTube/Models/Innertube/Range.cs
View File

@@ -1,7 +1,11 @@
using System.Text.Json.Serialization;
namespace Manager.YouTube.Models.Innertube;
public class Range
{
[JsonPropertyName("start")]
public uint Start { get; set; }
[JsonPropertyName("end")]
public uint End { get; set; }
}

6
Manager.YouTube/Models/Innertube/StreamingData.cs
View File

@@ -1,10 +1,16 @@
using System.Text.Json.Serialization;
namespace Manager.YouTube.Models.Innertube;
public class StreamingData
{
public DateTime FetchedUtc { get; set; } = DateTime.UtcNow;
[JsonPropertyName("expiresInSeconds")]
public int ExpiresInSeconds { get; set; }
[JsonPropertyName("serverAbrStreamingUrl")]
public string ServerAbrStreamingUrl { get; set; } = "";
[JsonPropertyName("formats")]
public List<StreamingFormat> Formats { get; set; } = [];
[JsonPropertyName("adaptiveFormats")]
public List<StreamingFormat> AdaptiveFormats { get; set; } = [];
}

28
Manager.YouTube/Models/Innertube/StreamingFormat.cs
View File

@@ -1,31 +1,59 @@
using System.Text.Json.Serialization;
namespace Manager.YouTube.Models.Innertube;
public class StreamingFormat
{
[JsonPropertyName("itag")]
public int Itag { get; set; }
[JsonPropertyName("url")]
public string? Url { get; set; }
[JsonPropertyName("mimeType")]
public string MimeType { get; set; } = "";
[JsonPropertyName("bitrate")]
public uint Bitrate { get; set; }
[JsonPropertyName("width")]
public uint? Width { get; set; }
[JsonPropertyName("height")]
public uint? Height { get; set; }
[JsonPropertyName("initRange")]
public Range? InitRange { get; set; }
[JsonPropertyName("indexRange")]
public Range? IndexRange { get; set; }
[JsonPropertyName("lastModified")]
public long LastModified { get; set; }
[JsonPropertyName("contentLength")]
public long ContentLength { get; set; }
[JsonPropertyName("quality")]
public string Quality { get; set; } = "";
[JsonPropertyName("xtags")]
public string? Xtags { get; set; }
[JsonPropertyName("fps")]
public uint Fps { get; set; }
[JsonPropertyName("qualityLabel")]
public string QualityLabel { get; set; } = "";
[JsonPropertyName("projectionType")]
public string ProjectionType { get; set; } = "";
[JsonPropertyName("averagebitrate")]
public uint? AverageBitrate { get; set; }
[JsonPropertyName("highReplication")]
public bool? HighReplication { get; set; }
[JsonPropertyName("colorInfo")]
public ColorInfo? ColorInfo { get; set; }
[JsonPropertyName("audioQuality")]
public string? AudioQuality { get; set; } = "";
[JsonPropertyName("approxDurationMs")]
public long ApproxDurationMs { get; set; }
[JsonPropertyName("audioSampleRate")]
public int? AudioSampleRate { get; set; }
[JsonPropertyName("audioChannels")]
public int? AudioChannels { get; set; }
[JsonPropertyName("loudnessDb")]
public double? LoudnessDb { get; set; }
[JsonPropertyName("isDrc")]
public bool? IsDrc { get; set; }
[JsonPropertyName("signatureCipher")]
public string? SignatureCipher { get; set; }
[JsonPropertyName("qualityOrdinal")]
public string QualityOrdinal { get; set; } = "";
}

5
Manager.YouTube/Models/Innertube/WebImage.cs
View File

@@ -1,8 +1,13 @@
using System.Text.Json.Serialization;
namespace Manager.YouTube.Models.Innertube;
public class WebImage
{
[JsonPropertyName("width")]
public int Width { get; set; }
[JsonPropertyName("height")]
public int Height { get; set; }
[JsonPropertyName("url")]
public string Url { get; set; } = "";
}

4
Manager.YouTube/Models/Parser/YouTubeVideoData.cs
View File

@@ -4,6 +4,6 @@ namespace Manager.YouTube.Models.Parser;
public class YouTubeVideoData
{
public JsonObject? YouTubePlayerData { get; set; }
public JsonObject? YouTubeInitialData { get; set; }
public JsonNode? YouTubePlayerData { get; set; }
public JsonNode? YouTubeInitialData { get; set; }
}

4
Manager.YouTube/Parsers/HtmlParser.cs
View File

@@ -74,8 +74,8 @@ public static class HtmlParser
{
return new YouTubeVideoData
{
YouTubePlayerData = parsedPlayerInitialData?.AsObject(),
YouTubeInitialData = parsedInitialData?.AsObject()
YouTubePlayerData = parsedPlayerInitialData,
YouTubeInitialData = parsedInitialData
};
}
catch (Exception e)

58
Manager.YouTube/Parsers/Json/JsonParser.cs
View File

@@ -12,45 +12,58 @@ public static class JsonParser
.Select(image => new WebImage { Width = image.GetProperty("width").GetInt32(), Height = image.GetProperty("height").GetInt32(), Url = image.GetProperty("url").GetString() ?? "" })
.ToList();
public static string ExtractTextOrHtml(JsonElement element)
public static string ExtractTextOrHtml(JsonNode? node)
{
if (node is not JsonObject nodeObj)
{
return "";
}
// Case 1: Simple text (no formatting)
if (element.TryGetProperty("simpleText", out var simpleText))
return simpleText.GetString() ?? string.Empty;
if (nodeObj.TryGetPropertyValue("simpleText", out var simpleText))
return simpleText?.GetValue<string>() ?? string.Empty;
// Case 2: Runs (formatted text segments)
if (element.TryGetProperty("runs", out var runs) && runs.ValueKind == JsonValueKind.Array)
if (nodeObj.TryGetPropertyValue("runs", out var runs) && runs != null && runs.GetValueKind() == JsonValueKind.Array)
{
var sb = new StringBuilder();
foreach (var run in runs.EnumerateArray())
foreach (var runNode in runs.AsArray())
{
var text = run.GetProperty("text").GetString() ?? string.Empty;
if (runNode is not JsonObject run)
{
continue;
}
var text = runNode["text"]?.GetValue<string>() ?? string.Empty;
var formatted = System.Net.WebUtility.HtmlEncode(text);
var bold = run.TryGetProperty("bold", out var boldProp) && boldProp.GetBoolean();
var italic = run.TryGetProperty("italic", out var italicProp) && italicProp.GetBoolean();
var underline = run.TryGetProperty("underline", out var underlineProp) && underlineProp.GetBoolean();
var strikethrough = run.TryGetProperty("strikethrough", out var strikeProp) && strikeProp.GetBoolean();
var bold = run.TryGetPropertyValue("bold", out var boldNode) && boldNode is JsonValue bv && bv.GetValue<bool>();
var italic = run.TryGetPropertyValue("italic", out var italicNode) && italicNode is JsonValue iv && iv.GetValue<bool>();
var underline = run.TryGetPropertyValue("underline", out var underlineNode) && underlineNode is JsonValue uv && uv.GetValue<bool>();
var strikethrough = run.TryGetPropertyValue("strikethrough", out var strikeNode) && strikeNode is JsonValue sv && sv.GetValue<bool>();
if (bold) formatted = $"<b>{formatted}</b>";
if (italic) formatted = $"<i>{formatted}</i>";
if (underline) formatted = $"<u>{formatted}</u>";
if (strikethrough) formatted = $"<s>{formatted}</s>";
if (run.TryGetProperty("navigationEndpoint", out var nav) &&
nav.TryGetProperty("url", out var urlProp))
if (run.TryGetPropertyValue("navigationEndpoint", out var nav) && nav is JsonObject navObj &&
navObj.TryGetPropertyValue("url", out var urlProp))
{
var url = urlProp.GetString();
var url = urlProp?.GetValue<string>();
if (!string.IsNullOrEmpty(url))
formatted = $"<a href=\"{url}\">{formatted}</a>";
}
if (run.TryGetProperty("emoji", out var emoji) && emoji.ValueKind == JsonValueKind.Object)
if (run.TryGetPropertyValue("emoji", out var emoji) && emoji is JsonObject emojiObj)
{
if (emoji.TryGetProperty("url", out var emojiUrl))
if (emojiObj.TryGetPropertyValue("url", out var emojiUrl))
{
var src = emojiUrl.GetString();
var src = emojiUrl?.GetValue<string>();
if (!string.IsNullOrEmpty(src))
formatted = $"<img src=\"{src}\" alt=\"{text}\" class=\"emoji\" />";
}
@@ -64,10 +77,15 @@ public static class JsonParser
return string.Empty;
}
public static List<WebImage> ExtractWebImages(JsonElement element)
public static List<WebImage> ExtractWebImages(JsonNode? node)
{
var thumbnailsArray = element.GetProperty("thumbnail").GetProperty("thumbnails");
return thumbnailsArray.Deserialize<List<WebImage>>() ?? [];
if (node == null)
{
return [];
}
var thumbnailsArray = node["thumbnails"];
return thumbnailsArray?.Deserialize<List<WebImage>>() ?? [];
}
}

4
Manager.YouTube/Parsers/Json/VideoJsonParser.cs
View File

@@ -14,7 +14,7 @@ public static class VideoJsonParser
public static Result<YouTubeVideo> ParseVideoData(YouTubeVideoData videoData)
{
if (videoData.YouTubeInitialData == null || videoData.YouTubeInitialData.Count == 0)
if (videoData.YouTubePlayerData == null)
{
return ResultError.Fail("No initial video data found!");
}
@@ -22,7 +22,7 @@ public static class VideoJsonParser
YouTubeVideo? video;
try
{
video = videoData.YouTubeInitialData.Deserialize<YouTubeVideo>(VideoParserOptions);
video = videoData.YouTubePlayerData.Deserialize<YouTubeVideo>(VideoParserOptions);
}
catch (Exception e)
{

2
Manager.YouTube/Util/Cipher/CipherManager.cs
View File

@@ -39,7 +39,7 @@ public static class CipherManager
private static string GetCipherVersion(string relativePlayerUrl)
{
var split = relativePlayerUrl.Split('/');
var split = relativePlayerUrl.Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
var v = split[2];
var lang = split[4];
return $"{v}_{lang}";

39
Manager.YouTube/Util/Converters/NumericJsonConverter.cs Normal file
View File

@@ -0,0 +1,39 @@
using System.Text.Json;
using System.Text.Json.Serialization;
namespace Manager.YouTube.Util.Converters;
public class NumericJsonConverter<T> : JsonConverter<T> where T : struct, IConvertible
{
public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
try
{
if (reader.TokenType == JsonTokenType.Number)
{
// Direct numeric value
return (T)Convert.ChangeType(reader.GetDouble(), typeof(T));
}
if (reader.TokenType == JsonTokenType.String)
{
var str = reader.GetString();
if (string.IsNullOrWhiteSpace(str))
throw new JsonException("Empty string cannot be converted to a number.");
return (T)Convert.ChangeType(str, typeof(T));
}
throw new JsonException($"Unexpected token {reader.TokenType} for type {typeof(T)}.");
}
catch (Exception ex)
{
throw new JsonException($"Error converting value to {typeof(T)}.", ex);
}
}
public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
{
writer.WriteNumberValue(Convert.ToDouble(value));
}
}

115
Manager.YouTube/Util/Converters/YouTubeVideoJsonConverter.cs
View File

@@ -1,5 +1,6 @@
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Nodes;
using System.Text.Json.Serialization;
using DotBased.Logging;
using Manager.YouTube.Models;
@@ -11,56 +12,74 @@ namespace Manager.YouTube.Util.Converters;
public class YouTubeVideoJsonConverter : JsonConverter<YouTubeVideo>
{
private readonly ILogger _logger = LogService.RegisterLogger<YouTubeVideoJsonConverter>();
private readonly JsonSerializerOptions _serializerOptions = new()
{
Converters = {
new NumericJsonConverter<int>(),
new NumericJsonConverter<uint>(),
new NumericJsonConverter<long>(),
new NumericJsonConverter<double>(),
new NumericJsonConverter<decimal>() },
PropertyNameCaseInsensitive = true
};
public override YouTubeVideo Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
using var document = JsonDocument.ParseValue(ref reader);
var root = document.RootElement;
var node = JsonNode.Parse(ref reader);
if (node == null)
{
throw new SerializationException("Failed to parse JSON reader.");
}
var playabilityStatus = root.GetProperty("playabilityStatus");
var streamingData = root.GetProperty("streamingData");
var videoDetails = root.GetProperty("videoDetails");
var playerConfigJson = root.GetProperty("playerConfig");
var microformat = root.GetProperty("microformat").GetProperty("playerMicroformatRenderer");
var rootObject = node.AsObject();
var videoId = videoDetails.GetProperty("videoId").GetString() ?? microformat.GetProperty("externalVideoId").GetString();
var playabilityStatus = rootObject["playabilityStatus"];
var streamingDataJson = rootObject["streamingData"];
var videoDetails = rootObject["videoDetails"];
var playerConfigJson = rootObject["playerConfig"];
var microformat = rootObject["microformat"]?["playerMicroformatRenderer"];
var videoId = videoDetails?["videoId"]?.GetValue<string>() ?? microformat?["externalVideoId"]?.GetValue<string>();
if (string.IsNullOrEmpty(videoId))
{
throw new SerializationException("Failed to get videoId");
}
var thumbnails = JsonParser.ExtractWebImages(videoDetails?["thumbnail"]);
thumbnails.AddRange(JsonParser.ExtractWebImages(microformat?["thumbnail"]));
var thumbnails = JsonParser.ExtractWebImages(videoDetails.GetProperty("thumbnail"));
thumbnails.AddRange(JsonParser.ExtractWebImages(microformat.GetProperty("thumbnail")));
var streamingData = streamingDataJson.Deserialize<StreamingData>(_serializerOptions);
var playerConfig = ExtractPlayerConfig(playerConfigJson);
var video = new YouTubeVideo
{
VideoId = videoId,
Title = JsonParser.ExtractTextOrHtml(microformat.GetProperty("title")),
Description = JsonParser.ExtractTextOrHtml(microformat.GetProperty("description")),
ViewCount = videoDetails.GetProperty("viewCount").GetInt32(),
LikeCount = videoDetails.GetProperty("likeCount").GetInt32(),
ChannelId = videoDetails.GetProperty("channelId").GetString() ?? "",
Author = JsonParser.ExtractTextOrHtml(videoDetails.GetProperty("author")),
PlayabilityStatus = playabilityStatus.GetProperty("status").GetString() ?? "",
LengthSeconds = videoDetails.GetProperty("lengthSeconds").GetInt32(),
Keywords = videoDetails.GetProperty("keywords").EnumerateArray().Select(v => v.GetString()).Cast<string>().ToArray(),
IsOwnerViewing = videoDetails.GetProperty("isOwnerViewing").GetBoolean(),
AllowRating = videoDetails.GetProperty("allowRating").GetBoolean(),
IsCrawlable = videoDetails.GetProperty("isCrawlable").GetBoolean(),
IsPrivate = videoDetails.GetProperty("isPrivate").GetBoolean(),
IsUnpluggedCorpus = videoDetails.GetProperty("isUnpluggedCorpus").GetBoolean(),
IsLive = videoDetails.GetProperty("isLiveContent").GetBoolean(),
IsFamilySave = microformat.GetProperty("isFamilySave").GetBoolean(),
AvailableCountries = microformat.GetProperty("availableCountries").EnumerateArray().Select(v => v.GetString()).Cast<string>().ToArray(),
IsUnlisted = microformat.GetProperty("isUnlisted").GetBoolean(),
HasYpcMetadata = microformat.GetProperty("hasYpcMetadata").GetBoolean(),
PublishDate = microformat.GetProperty("publishDate").GetDateTime(),
UploadDate = microformat.GetProperty("uploadDate").GetDateTime(),
IsShortsEligible = microformat.GetProperty("isShortsEligible").GetBoolean(),
Category = microformat.GetProperty("category").GetString() ?? "",
StreamingData = streamingData.Deserialize<StreamingData>(),
Title = JsonParser.ExtractTextOrHtml(microformat?["title"]),
Description = JsonParser.ExtractTextOrHtml(microformat?["description"]),
ViewCount = long.TryParse(microformat?["viewCount"]?.GetValue<string>(), out var viewCountParsed) ? viewCountParsed : -1,
LikeCount = long.TryParse(microformat?["likeCount"]?.GetValue<string>(), out var likeCountParsed) ? likeCountParsed : -1,
ChannelId = videoDetails?["channelId"]?.GetValue<string>() ?? "",
Author = videoDetails?["author"]?.GetValue<string>() ?? "",
PlayabilityStatus = playabilityStatus?["status"]?.GetValue<string>() ?? "",
LengthSeconds = long.TryParse(videoDetails?["lengthSeconds"]?.GetValue<string>(), out var lengthSecondsParsed) ? lengthSecondsParsed : -1,
Keywords = videoDetails?["keywords"]?.AsArray().Select(v => v?.GetValue<string>() ?? "").ToArray() ?? [],
IsOwnerViewing = videoDetails?["isOwnerViewing"]?.GetValue<bool>() ?? false,
AllowRating = videoDetails?["allowRating"]?.GetValue<bool>() ?? false,
IsCrawlable = videoDetails?["isCrawlable"]?.GetValue<bool>() ?? false,
IsPrivate = videoDetails?["isPrivate"]?.GetValue<bool>() ?? false,
IsUnpluggedCorpus = videoDetails?["isUnpluggedCorpus"]?.GetValue<bool>() ?? false,
IsLive = videoDetails?["isLiveContent"]?.GetValue<bool>() ?? false,
IsFamilySave = microformat?["isFamilySave"]?.GetValue<bool>() ?? false,
AvailableCountries = microformat?["availableCountries"]?.AsArray().Select(v => v?.GetValue<string>() ?? "").ToArray() ?? [],
IsUnlisted = microformat?["isUnlisted"]?.GetValue<bool>() ?? false,
HasYpcMetadata = microformat?["hasYpcMetadata"]?.GetValue<bool>() ?? false,
PublishDate = DateTime.TryParse(microformat?["publishDate"]?.GetValue<string>(), out var parsedPublishDate) ? parsedPublishDate : DateTime.MinValue,
UploadDate = DateTime.TryParse(microformat?["uploadDate"]?.GetValue<string>(), out var parsedUploadDate) ? parsedUploadDate : DateTime.MinValue,
IsShortsEligible = microformat?["isShortsEligible"]?.GetValue<bool>() ?? false,
Category = microformat?["category"]?.GetValue<string>() ?? "",
StreamingData = streamingData,
Thumbnails = thumbnails,
PlayerConfig = ExtractPlayerConfig(playerConfigJson)
PlayerConfig = playerConfig
};
return video;
@@ -71,23 +90,25 @@ public class YouTubeVideoJsonConverter : JsonConverter<YouTubeVideo>
throw new NotImplementedException("Converter only supports reading.");
}
private PlayerConfig? ExtractPlayerConfig(JsonElement element)
private PlayerConfig? ExtractPlayerConfig(JsonNode? playerConfigNode)
{
if (playerConfigNode == null)
{
return null;
}
try
{
var playerConfigObj = playerConfigNode.AsObject();
var playerConfig = new PlayerConfig
{
AudioLoudnessDb = element.GetProperty("audioConfig").GetProperty("loudnessDb").GetDouble(),
AudioPerceptualLoudnessDb = element.GetProperty("audioConfig").GetProperty("perceptualLoudnessDb").GetDouble(),
AudioEnablePerFormatLoudness = element.GetProperty("audioConfig").GetProperty("enablePerFormatLoudness")
.GetBoolean(),
MaxBitrate = element.GetProperty("streamSelectionConfig").GetProperty("maxBitrate").GetUInt32(),
MaxReadAheadMediaTimeMs = element.GetProperty("mediaCommonConfig").GetProperty("dynamicReadaheadConfig")
.GetProperty("maxReadAheadMediaTimeMs").GetUInt32(),
MinReadAheadMediaTimeMs = element.GetProperty("mediaCommonConfig").GetProperty("dynamicReadaheadConfig")
.GetProperty("minReadAheadMediaTimeMs").GetUInt32(),
ReadAheadGrowthRateMs = element.GetProperty("mediaCommonConfig").GetProperty("dynamicReadaheadConfig")
.GetProperty("readAheadGrowthRateMs").GetUInt32(),
AudioLoudnessDb = playerConfigObj["audioConfig"]?["loudnessDb"]?.GetValue<double>() ?? 0,
AudioPerceptualLoudnessDb = playerConfigObj["audioConfig"]?["perceptualLoudnessDb"]?.GetValue<double>() ?? 0,
AudioEnablePerFormatLoudness = playerConfigObj["audioConfig"]?["enablePerFormatLoudness"]?.GetValue<bool>() ?? false,
MaxBitrate = uint.TryParse(playerConfigObj["streamSelectionConfig"]?["maxBitrate"]?.GetValue<string>(), out var parsedMaxBitrate) ? parsedMaxBitrate : 0,
MaxReadAheadMediaTimeMs = playerConfigObj["mediaCommonConfig"]?["dynamicReadaheadConfig"]?["maxReadAheadMediaTimeMs"]?.GetValue<uint>() ?? 0,
MinReadAheadMediaTimeMs = playerConfigObj["mediaCommonConfig"]?["dynamicReadaheadConfig"]?["minReadAheadMediaTimeMs"]?.GetValue<uint>() ?? 0,
ReadAheadGrowthRateMs = playerConfigObj["mediaCommonConfig"]?["dynamicReadaheadConfig"]?["readAheadGrowthRateMs"]?.GetValue<uint>() ?? 0,
};
return playerConfig;
}

10
Manager.YouTube/YouTubeClient.cs
View File

@@ -175,10 +175,10 @@ public sealed class YouTubeClient : IDisposable
public async Task<Result> RotateCookiesPageAsync(string origin = NetworkService.Origin, int ytPid = 1)
{
if (IsAnonymous)
/*if (IsAnonymous)
{
return ResultError.Fail("Anonymous clients cannot rotate cookies!");
}
}*/
if (string.IsNullOrWhiteSpace(origin))
{
@@ -277,6 +277,12 @@ public sealed class YouTubeClient : IDisposable
return stateResult;
}
if (State is { LoggedIn: false })
{
_logger.Warning("Client is not logged in!");
return ResultError.Fail("Client login failed!");
}
var cookieRotationResult = await RotateCookiesPageAsync();
return !cookieRotationResult.IsSuccess ? cookieRotationResult : Result.Success();
}